Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history 
Signed-off-by: Naohiro Yoshida <[email protected]>
  • Loading branch information
Naohiro Yoshida committed Jul 3, 2024
2 parents e83810b + 9ba99aa commit 6ae2f8e
Show file tree
Hide file tree
Showing 5 changed files with 263 additions and 52 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions light-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
light-client = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.7", default-features = false, features=["ibc"] }
light-client = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.9", default-features = false, features=["ibc"] }

rlp = { version = "0.5.2", default-features = false }
prost = { version = "0.11", default-features = false }
Expand All @@ -28,7 +28,7 @@ milagro_bls = { git = "https://github.com/datachainlab/milagro_bls", rev = "bc2b
hex-literal = "0.4.1"

[dev-dependencies]
store = { git = "https://github.com/datachainlab/lcp.git", rev = "v0.2.7", default-features = false }
store = { git = "https://github.com/datachainlab/lcp.git", rev = "v0.2.9", default-features = false }
time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
rstest = "0.18"

Expand Down
191 changes: 156 additions & 35 deletions light-client/src/client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::commitment::{
calculate_ibc_commitment_storage_key, decode_eip1184_rlp_proof, verify_proof,
};
use crate::consensus_state::ConsensusState;
use crate::errors::Error;
use crate::errors::{ClientError, Error};

use crate::header::Header;
use crate::message::ClientMessage;
Expand All @@ -38,16 +38,125 @@ impl LightClient for ParliaLightClient {
client_id: &ClientId,
) -> Result<Height, LightClientError> {
let any_client_state = ctx.client_state(client_id)?;
let client_state = ClientState::try_from(any_client_state)?;
let client_state =
ClientState::try_from(any_client_state).map_err(|e| ClientError::LatestHeight {
cause: e,
client_id: client_id.clone(),
})?;
Ok(client_state.latest_height)
}

fn create_client(
&self,
_ctx: &dyn HostClientReader,
ctx: &dyn HostClientReader,
any_client_state: Any,
any_consensus_state: Any,
) -> Result<CreateClientResult, LightClientError> {
InnerLightClient
.create_client(ctx, any_client_state.clone(), any_consensus_state.clone())
.map_err(|e| {
ClientError::CreateClient {
cause: e,
client_state: any_client_state,
consensus_sate: any_consensus_state,
}
.into()
})
}

fn update_client(
&self,
ctx: &dyn HostClientReader,
client_id: ClientId,
any_message: Any,
) -> Result<UpdateClientResult, LightClientError> {
InnerLightClient
.update_client(ctx, client_id.clone(), any_message.clone())
.map_err(|e| {
ClientError::UpdateClient {
cause: e,
client_id,
message: any_message,
}
.into()
})
}

fn verify_membership(
&self,
ctx: &dyn HostClientReader,
client_id: ClientId,
prefix: CommitmentPrefix,
path: String,
value: Vec<u8>,
proof_height: Height,
proof: Vec<u8>,
) -> Result<VerifyMembershipResult, LightClientError> {
InnerLightClient
.verify_membership(
ctx,
client_id.clone(),
prefix.clone(),
path.clone(),
value.clone(),
proof_height,
proof.clone(),
)
.map_err(|e| {
ClientError::VerifyMembership {
cause: e,
client_id,
prefix,
path,
value,
proof_height,
proof,
}
.into()
})
}

fn verify_non_membership(
&self,
ctx: &dyn HostClientReader,
client_id: ClientId,
prefix: CommitmentPrefix,
path: String,
proof_height: Height,
proof: Vec<u8>,
) -> Result<VerifyNonMembershipResult, LightClientError> {
InnerLightClient
.verify_non_membership(
ctx,
client_id.clone(),
prefix.clone(),
path.clone(),
proof_height,
proof.clone(),
)
.map_err(|e| {
ClientError::VerifyNonMembership {
cause: e,
client_id,
prefix,
path,
proof_height,
proof,
}
.into()
})
}
}

struct InnerLightClient;

impl InnerLightClient {
fn create_client(
&self,
_ctx: &dyn HostClientReader,
any_client_state: Any,
any_consensus_state: Any,
) -> Result<CreateClientResult, Error> {
let client_state = ClientState::try_from(any_client_state.clone())?;
let consensus_state = ConsensusState::try_from(any_consensus_state)?;

Expand Down Expand Up @@ -77,7 +186,7 @@ impl LightClient for ParliaLightClient {
ctx: &dyn HostClientReader,
client_id: ClientId,
any_message: Any,
) -> Result<UpdateClientResult, LightClientError> {
) -> Result<UpdateClientResult, Error> {
match ClientMessage::try_from(any_message.clone())? {
ClientMessage::Header(header) => Ok(self.update_state(ctx, client_id, header)?.into()),
ClientMessage::Misbehaviour(misbehavior) => {
Expand All @@ -96,6 +205,7 @@ impl LightClient for ParliaLightClient {
}
}

#[allow(clippy::too_many_arguments)]
fn verify_membership(
&self,
ctx: &dyn HostClientReader,
Expand All @@ -105,7 +215,7 @@ impl LightClient for ParliaLightClient {
value: Vec<u8>,
proof_height: Height,
proof: Vec<u8>,
) -> Result<VerifyMembershipResult, LightClientError> {
) -> Result<VerifyMembershipResult, Error> {
let value = keccak_256(&value);
let state_id = self.verify_commitment(
ctx,
Expand Down Expand Up @@ -136,33 +246,33 @@ impl LightClient for ParliaLightClient {
path: String,
proof_height: Height,
proof: Vec<u8>,
) -> Result<VerifyNonMembershipResult, LightClientError> {
) -> Result<VerifyNonMembershipResult, Error> {
let state_id =
self.verify_commitment(ctx, client_id, &prefix, &path, None, &proof_height, proof)?;
Ok(VerifyNonMembershipResult {
message: VerifyMembershipProxyMessage::new(prefix, path, None, proof_height, state_id),
})
}
}

impl ParliaLightClient {
pub fn update_state(
&self,
ctx: &dyn HostClientReader,
client_id: ClientId,
header: Header,
) -> Result<UpdateStateData, LightClientError> {
) -> Result<UpdateStateData, Error> {
//Ensure header can be verified.
let height = header.height();
let timestamp = header.timestamp()?;
let trusted_height = header.trusted_height();
let any_client_state = ctx.client_state(&client_id)?;
let any_consensus_state = ctx.consensus_state(&client_id, &trusted_height)?;
let any_client_state = ctx.client_state(&client_id).map_err(Error::LCPError)?;
let any_consensus_state = ctx
.consensus_state(&client_id, &trusted_height)
.map_err(Error::LCPError)?;

//Ensure client is not frozen
let client_state = ClientState::try_from(any_client_state)?;
if client_state.frozen {
return Err(Error::ClientFrozen(client_id).into());
return Err(Error::ClientFrozen(client_id));
}

// Create new state and ensure header is valid
Expand Down Expand Up @@ -207,16 +317,18 @@ impl ParliaLightClient {
ctx: &dyn HostClientReader,
client_id: ClientId,
misbehaviour: Misbehaviour,
) -> Result<(ClientState, Vec<PrevState>, ValidationContext), LightClientError> {
let any_client_state = ctx.client_state(&client_id)?;
let any_consensus_state1 =
ctx.consensus_state(&client_id, &misbehaviour.header_1.trusted_height())?;
let any_consensus_state2 =
ctx.consensus_state(&client_id, &misbehaviour.header_2.trusted_height())?;
) -> Result<(ClientState, Vec<PrevState>, ValidationContext), Error> {
let any_client_state = ctx.client_state(&client_id).map_err(Error::LCPError)?;
let any_consensus_state1 = ctx
.consensus_state(&client_id, &misbehaviour.header_1.trusted_height())
.map_err(Error::LCPError)?;
let any_consensus_state2 = ctx
.consensus_state(&client_id, &misbehaviour.header_2.trusted_height())
.map_err(Error::LCPError)?;

let client_state = ClientState::try_from(any_client_state)?;
if client_state.frozen {
return Err(Error::ClientFrozen(client_id).into());
return Err(Error::ClientFrozen(client_id));
}

let trusted_consensus_state1 = ConsensusState::try_from(any_consensus_state1)?;
Expand Down Expand Up @@ -266,20 +378,24 @@ impl ParliaLightClient {
value: Option<Vec<u8>>,
proof_height: &Height,
storage_proof_rlp: Vec<u8>,
) -> Result<StateID, LightClientError> {
let client_state = ClientState::try_from(ctx.client_state(&client_id)?)?;
) -> Result<StateID, Error> {
let client_state =
ClientState::try_from(ctx.client_state(&client_id).map_err(Error::LCPError)?)?;
if client_state.frozen {
return Err(Error::ClientFrozen(client_id).into());
return Err(Error::ClientFrozen(client_id));
}
let proof_height = *proof_height;
if client_state.latest_height < proof_height {
return Err(
Error::UnexpectedProofHeight(proof_height, client_state.latest_height).into(),
);
return Err(Error::UnexpectedProofHeight(
proof_height,
client_state.latest_height,
));
}

let consensus_state =
ConsensusState::try_from(ctx.consensus_state(&client_id, &proof_height)?)?;
let consensus_state = ConsensusState::try_from(
ctx.consensus_state(&client_id, &proof_height)
.map_err(Error::LCPError)?,
)?;
let storage_root = consensus_state.state_root;
let storage_proof = decode_eip1184_rlp_proof(&storage_proof_rlp)?;
verify_proof(
Expand All @@ -299,11 +415,13 @@ impl ParliaLightClient {
client_id: &ClientId,
client_state: &ClientState,
heights: Vec<Height>,
) -> Result<Vec<PrevState>, LightClientError> {
) -> Result<Vec<PrevState>, Error> {
let mut prev_states = Vec::new();
for height in heights {
let consensus_state: ConsensusState =
ctx.consensus_state(client_id, &height)?.try_into()?;
let consensus_state: ConsensusState = ctx
.consensus_state(client_id, &height)
.map_err(Error::LCPError)?
.try_into()?;
prev_states.push(PrevState {
height,
state_id: gen_state_id(client_state.clone(), consensus_state)?,
Expand All @@ -316,10 +434,12 @@ impl ParliaLightClient {
fn gen_state_id(
client_state: ClientState,
consensus_state: ConsensusState,
) -> Result<StateID, LightClientError> {
) -> Result<StateID, Error> {
let client_state = Any::try_from(client_state.canonicalize())?;
let consensus_state = Any::try_from(consensus_state.canonicalize())?;
gen_state_id_from_any(&client_state, &consensus_state).map_err(LightClientError::commitment)
gen_state_id_from_any(&client_state, &consensus_state)
.map_err(LightClientError::commitment)
.map_err(Error::LCPError)
}

#[cfg(test)]
Expand Down Expand Up @@ -415,7 +535,7 @@ mod test {
.client_state
.clone()
.ok_or_else(|| light_client::Error::client_state_not_found(client_id.clone()))?;
Ok(Any::try_from(cs)?)
Ok(Any::try_from(cs).unwrap())
}

fn consensus_state(
Expand All @@ -430,7 +550,7 @@ mod test {
light_client::Error::consensus_state_not_found(client_id.clone(), *height)
})?
.clone();
Ok(Any::try_from(state)?)
Ok(Any::try_from(state).unwrap())
}
}

Expand Down Expand Up @@ -767,7 +887,8 @@ mod test {
true,
)
.unwrap_err();
assert_err(err, "ClientFrozen: xx-parlia-0");
let expected = format!("{:?}", err).contains("ClientFrozen: xx-parlia-0");
assert!(expected, "{}", err);
}

fn do_test_verify_membership(
Expand Down
Loading

0 comments on commit 6ae2f8e

Please sign in to comment.