Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
deps: update ibc rev
Browse files Browse the repository at this point in the history
  • Loading branch information
Farhad-Shabani committed Apr 17, 2024
1 parent dabd74b commit 57b2cca
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 51 deletions.
22 changes: 11 additions & 11 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ sov-ibc-transfer = { path = "modules/sov-ibc-transfer" }
sov-consensus-state-tracker = { path = "modules/sov-consensus-state-tracker" }
sov-celestia-client = { path = "clients/sov-celestia" }

ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-core-client = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-core-host-cosmos = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-client-tendermint = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-client-wasm-types = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-client-cw = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-app-transfer = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "293de1546f" }
ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core-client = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core-host-cosmos = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-tendermint = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-wasm-types = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-cw = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-app-transfer = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }

basecoin = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "ea1abe3" }
jmt = { git = "https://github.com/penumbra-zone/jmt.git", rev = "1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" }
Expand Down
62 changes: 31 additions & 31 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions clients/sov-celestia/cw-contract/src/tests/fixture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ impl Fixture {
let sov_consensus_state = dummy_sov_consensus_state(self.trusted_timestamp);

InstantiateMsg {
client_state: SovTmClientState::encode_thru_any(sov_client_state),
consensus_state: SovTmConsensusState::encode_thru_any(sov_consensus_state),
client_state: SovTmClientState::encode_to_any_vec(sov_client_state),
consensus_state: SovTmConsensusState::encode_to_any_vec(sov_consensus_state),
checksum: dummy_checksum(),
}
}
Expand Down Expand Up @@ -152,7 +152,7 @@ impl Fixture {
Root::from([0; 32]),
);

SovTmHeader::encode_thru_any(sov_header)
SovTmHeader::encode_to_any_vec(sov_header)
}

pub fn dummy_client_message(&self) -> Vec<u8> {
Expand Down
2 changes: 1 addition & 1 deletion clients/sov-celestia/src/client_state/misbehaviour.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use ibc_client_tendermint::client_state::verify_misbehaviour_header;
use ibc_client_tendermint::verifier::TmVerifier;
use ibc_core::client::context::{Convertible, ExtClientValidationContext};
use ibc_core::client::types::error::ClientError;
use ibc_core::host::types::identifiers::ClientId;
Expand All @@ -9,6 +8,7 @@ use sov_celestia_client_types::client_state::SovTmClientState;
use sov_celestia_client_types::consensus_state::SovTmConsensusState;
use tendermint::crypto::Sha256;
use tendermint::merkle::MerkleHash;
use tendermint_light_client_verifier::Verifier as TmVerifier;

/// Determines whether or not two conflicting headers at the same height would
/// have convinced the light client.
Expand Down
4 changes: 1 addition & 3 deletions clients/sov-celestia/src/client_state/update_client.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use ibc_client_tendermint::types::error::IntoResult;
use ibc_client_tendermint::types::Header as TmHeader;
use ibc_client_tendermint::verifier::TmVerifier;
use ibc_core::client::context::{Convertible, ExtClientValidationContext};
use ibc_core::client::types::error::ClientError;
use ibc_core::client::types::Height;
Expand All @@ -13,7 +12,7 @@ use sov_celestia_client_types::sovereign::{AggregatedProof, CodeCommitment, Root
use tendermint::crypto::Sha256;
use tendermint::merkle::MerkleHash;
use tendermint_light_client_verifier::types::{TrustedBlockState, UntrustedBlockState};
use tendermint_light_client_verifier::Verifier;
use tendermint_light_client_verifier::Verifier as TmVerifier;

/// Verifies the IBC header type for the Sovereign SDK rollups, which consists
/// of the DA header and the aggregated proof date validation.
Expand Down Expand Up @@ -125,7 +124,6 @@ where

// main header verification, delegated to the tendermint-light-client crate.
verifier
.verifier()
.verify_update_header(
untrusted_state,
trusted_state,
Expand Down
4 changes: 2 additions & 2 deletions clients/sov-celestia/src/client_state/validation.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use ibc_client_tendermint::client_state::check_for_misbehaviour_on_misbehavior;
use ibc_client_tendermint::verifier::{DefaultVerifier, TmVerifier};
use ibc_core::client::context::client_state::ClientStateValidation;
use ibc_core::client::context::{Convertible, ExtClientValidationContext};
use ibc_core::client::types::error::ClientError;
Expand All @@ -17,6 +16,7 @@ use sov_celestia_client_types::consensus_state::SovTmConsensusState;
use tendermint::crypto::default::Sha256 as DefaultSha256;
use tendermint::crypto::Sha256;
use tendermint::merkle::MerkleHash;
use tendermint_light_client_verifier::{ProdVerifier, Verifier as TmVerifier};

use super::ClientState;
use crate::client_state::{check_da_misbehaviour_on_update, verify_header, verify_misbehaviour};
Expand All @@ -37,7 +37,7 @@ where
ctx,
client_id,
client_message,
&DefaultVerifier,
&ProdVerifier::default(),
)
}

Expand Down

0 comments on commit 57b2cca

Please sign in to comment.