Skip to content

Commit

Permalink
verify height
Browse files Browse the repository at this point in the history
  • Loading branch information
@yito88
yito88 committed Dec 7, 2021
1 parent df667bb commit 4735aa7
Show file tree
Hide file tree
Showing 8 changed files with 233 additions and 204 deletions.
98 changes: 59 additions & 39 deletions modules/src/clients/ics07_tendermint/client_def.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ use crate::core::ics23_commitment::commitment::{
CommitmentPrefix, CommitmentProofBytes, CommitmentRoot,
};
use crate::core::ics23_commitment::merkle::{apply_prefix, MerkleProof};
use crate::core::ics24_host::identifier::ConnectionId;
use crate::core::ics24_host::identifier::{ChannelId, ClientId, PortId};
use crate::core::ics24_host::identifier::ClientId;
use crate::core::ics24_host::Path;
use crate::prelude::*;
use crate::Height;
use crate::proofs::Proofs;

use crate::downcast;

Expand Down Expand Up @@ -192,71 +191,96 @@ impl ClientDef for TendermintClient {
&self,
client_state: &Self::ClientState,
prefix: &CommitmentPrefix,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
client_id: &ClientId,
consensus_height: Height,
consensus_state_path: &Path,
expected_consensus_state: &AnyConsensusState,
) -> Result<(), Ics02Error> {
let path = Path::ClientConsensusState {
client_id: client_id.clone(),
epoch: consensus_height.revision_number,
height: consensus_height.revision_height,
}
.to_string();
let consensus_proof = proofs
.consensus_proof()
.ok_or_else(Ics02Error::null_consensus_proof)?;
let value = expected_consensus_state.encode_vec().unwrap();
verify_membership(client_state, prefix, proof, root, path, value)
verify_membership(
client_state,
prefix,
consensus_proof.proof(),
root,
consensus_state_path.to_string(),
value,
)
}

fn verify_connection_state(
&self,
client_state: &Self::ClientState,
prefix: &CommitmentPrefix,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
connection_id: &ConnectionId,
connection_path: &Path,
expected_connection_end: &ConnectionEnd,
) -> Result<(), Ics02Error> {
let path = Path::Connections(connection_id.clone()).to_string();
let value = expected_connection_end.encode_vec().unwrap();
verify_membership(client_state, prefix, proof, root, path, value)
verify_membership(
client_state,
prefix,
proofs.object_proof(),
root,
connection_path.to_string(),
value,
)
}

fn verify_channel_state(
&self,
client_state: &Self::ClientState,
prefix: &CommitmentPrefix,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
port_id: &PortId,
channel_id: &ChannelId,
channel_path: &Path,
expected_channel_end: &ChannelEnd,
) -> Result<(), Ics02Error> {
let path = Path::ChannelEnds(port_id.clone(), channel_id.clone()).to_string();
let value = expected_channel_end.encode_vec().unwrap();
verify_membership(client_state, prefix, proof, root, path, value)
verify_membership(
client_state,
prefix,
proofs.object_proof(),
root,
channel_path.to_string(),
value,
)
}

fn verify_client_full_state(
&self,
client_state: &Self::ClientState,
prefix: &CommitmentPrefix,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
client_id: &ClientId,
client_state_path: &Path,
expected_client_state: &AnyClientState,
) -> Result<(), Ics02Error> {
let path = Path::ClientState(client_id.clone()).to_string();
let proof = proofs
.client_proof()
.as_ref()
.ok_or_else(Ics02Error::null_client_proof)?;

let value = expected_client_state.encode_vec().unwrap();
verify_membership(client_state, prefix, proof, root, path, value)
verify_membership(
client_state,
prefix,
proof,
root,
client_state_path.to_string(),
value,
)
}

fn verify_packet_data(
&self,
ctx: &dyn ChannelReader,
client_state: &Self::ClientState,
connection_end: &ConnectionEnd,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
commitment_path: &Path,
commitment: String,
Expand All @@ -266,7 +290,7 @@ impl ClientDef for TendermintClient {
verify_membership(
client_state,
connection_end.counterparty().prefix(),
proof,
proofs.object_proof(),
root,
commitment_path.to_string(),
commitment.encode_to_vec(),
Expand All @@ -278,7 +302,7 @@ impl ClientDef for TendermintClient {
ctx: &dyn ChannelReader,
client_state: &Self::ClientState,
connection_end: &ConnectionEnd,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
ack_path: &Path,
ack: Vec<u8>,
Expand All @@ -288,7 +312,7 @@ impl ClientDef for TendermintClient {
verify_membership(
client_state,
connection_end.counterparty().prefix(),
proof,
proofs.object_proof(),
root,
ack_path.to_string(),
ack,
Expand All @@ -300,7 +324,7 @@ impl ClientDef for TendermintClient {
ctx: &dyn ChannelReader,
client_state: &Self::ClientState,
connection_end: &ConnectionEnd,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
seq_path: &Path,
seq: Sequence,
Expand All @@ -310,7 +334,7 @@ impl ClientDef for TendermintClient {
verify_membership(
client_state,
connection_end.counterparty().prefix(),
proof,
proofs.object_proof(),
root,
seq_path.to_string(),
u64::from(seq).encode_to_vec(),
Expand All @@ -322,7 +346,7 @@ impl ClientDef for TendermintClient {
ctx: &dyn ChannelReader,
client_state: &Self::ClientState,
connection_end: &ConnectionEnd,
proof: &CommitmentProofBytes,
proofs: &Proofs,
root: &CommitmentRoot,
receipt_path: &Path,
) -> Result<(), Ics02Error> {
Expand All @@ -331,7 +355,7 @@ impl ClientDef for TendermintClient {
verify_non_membership(
client_state,
connection_end.counterparty().prefix(),
proof,
proofs.object_proof(),
root,
receipt_path.to_string(),
)
Expand Down Expand Up @@ -385,11 +409,7 @@ fn verify_non_membership(
.into();

merkle_proof
.verify_non_membership(
&client_state.proof_specs,
root.clone().into(),
merkle_path,
)
.verify_non_membership(&client_state.proof_specs, root.clone().into(), merkle_path)
.map_err(|e| Ics02Error::tendermint(Error::ics23_error(e)))
}

Expand Down
Loading

0 comments on commit 4735aa7

Please sign in to comment.