From 4b82fa92644b14fe158c12b6dd8d285e01c8d373 Mon Sep 17 00:00:00 2001 From: yito88 Date: Tue, 9 Apr 2024 00:39:51 +0200 Subject: [PATCH 1/7] update to 0.51.0 --- Cargo.lock | 125 ++++++------ Cargo.toml | 6 +- crates/apps/src/lib/bench_utils.rs | 2 +- crates/benches/native_vps.rs | 2 +- crates/benches/txs.rs | 2 +- crates/ibc/src/context/client.rs | 186 ++++++++++-------- crates/ibc/src/context/common.rs | 88 ++++----- crates/ibc/src/context/execution.rs | 46 ++--- crates/ibc/src/context/mod.rs | 4 +- crates/ibc/src/context/validation.rs | 113 ++++------- crates/namada/src/ledger/native_vp/ibc/mod.rs | 16 +- crates/tests/src/e2e/ibc_tests.rs | 18 +- crates/tests/src/vm_host_env/ibc.rs | 10 +- wasm/Cargo.lock | 125 ++++++------ wasm_for_tests/Cargo.lock | 125 ++++++------ 15 files changed, 421 insertions(+), 447 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1669b6096..6a9e203046 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2964,9 +2964,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8057203ab04368297a31ecd5d059bec7108c069d636bcfc9ab20e82d89b480b8" +checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" dependencies = [ "ibc-apps", "ibc-clients", @@ -2978,9 +2978,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e931737b69129ae417598fe29eace3e41a9ce32b8649abe3937495973e5843f" +checksum = "640bf8485d3b25ba08632438af56f334290387c13db9441ad5389936c1d8218e" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2989,9 +2989,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2019d3a6adf6b333c55630f52ca71ad8f61702ca1cf291aaf5ee40b7c6c27ba2" +checksum = "4051c417a011a459080a58066a98f2c0b488171a8bf913af6a53bd34277f1b0b" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -3010,9 +3010,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2595e4cc14828a4141a28b86777040d8bfbabea43838a425137202cff0ee6329" +checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -3021,9 +3021,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0106c87ddcc619a6a5eac05da2b77287e3958f89dddf951daf9a2dfc470cb5f4" +checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" dependencies = [ "derive_more", "displaydoc", @@ -3036,9 +3036,9 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5738d8c842abce233f41d3be825d01e6ee075251b509c6947d05c75477eaeec" +checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -3046,10 +3046,11 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ef4eefb4fd88167335fee4d212b1ff2fa4dd4e4ce87a58bda1798be1d128ac" +checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" dependencies = [ + "derive_more", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -3063,9 +3064,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a224a98b193810e1ef86316e9a08e677eeff6f98b22b9eb9806bd993d3753a" +checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -3081,9 +3082,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1ea3be7ae201c99b6589c112a253f2fb3c9ae7322d8937a7303d1fbfe76d27" +checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" dependencies = [ "base64 0.21.7", "displaydoc", @@ -3096,9 +3097,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fef481dd1ebe5ef69ee8e095c225cb3e51cd3895096ba2884b3f5b827a6ed6" +checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3106,9 +3107,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aedd421bae80115f44b198bec9af45f234e1c8ff81ee9d5e7f60444d526d2b6" +checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3123,9 +3124,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535048a8fe64101263e35a6a4503474811e379a115db72ee449df882b0f11b45" +checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -3139,9 +3140,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d97396ccb1840f4ea6021bbf049a4a7e30a8f5b126f00023ec44b2a48d4dabc" +checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3163,9 +3164,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bcf0c59eaa935fa410497a56862f28c4df68317ea556724f0d0764b6c0307e" +checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -3177,9 +3178,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d37d88be3dc7fd82d45418c257d826244a6b29b7902c76cf9e68fd61f1e9173" +checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" dependencies = [ "derive_more", "displaydoc", @@ -3194,9 +3195,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb717b1296e6cda0990346ba5203fadd043d5159d7d7173b3765f72f263c29db" +checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3215,9 +3216,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10ff34bf57bf4bc668b55208dbfdf312d7907adc6a0e39da2377883f12efada" +checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3234,9 +3235,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de7f4f1e78e9ed5a63b09b1405f42713f3d076ba5e7889ec31a520cad4970344" +checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -3247,9 +3248,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230d7f547e121147d136c563ae71707a9e3477a9bc1bc6c1dc29051e1408a381" +checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3269,9 +3270,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60a2d072d8f7d8d64503bbf3fb69ffcd973b92667af053617a36682fadddea5" +checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3285,9 +3286,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fae38340bffa42a74563a12703c994515cca4bab755a0c83089c18c3c1e481a" +checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3310,9 +3311,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abaa0e2143855d12c19e814dab72a5e28daf5e31780afb1302e983614b248668" +checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" dependencies = [ "derive_more", "displaydoc", @@ -3329,9 +3330,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3c792be21a340e42344e5bede1695c2d21d62abcc21bbfc7662b5950ffe8d4" +checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" dependencies = [ "derive_more", "displaydoc", @@ -3353,9 +3354,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c25ce3082e036836d60aea3cc24f46dfb248d7718516a9a48e1feb466ce10c1" +checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3369,9 +3370,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c261fb7e9a7de7daafb6a38cb9abdce6e912230e30246eb2ef1bb5db32ba10f" +checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" dependencies = [ "derive_more", "displaydoc", @@ -3384,9 +3385,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3b37bc4c11fdc60a328488f4be205106666edda20a4080484d599a8b0978d2" +checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3404,9 +3405,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de1e69ff9d7d6094b720a36bb26fc8078b5e1b0e216e2d0a92f602e6dc8016e" +checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" dependencies = [ "proc-macro2", "quote", @@ -3415,9 +3416,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5524046e645bdfbd96ef932c8ceab6bb2391dc31dee626e274d13e7ac25ec2" +checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3434,9 +3435,9 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553" +checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -3455,9 +3456,9 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3443c6ccc7551266dce6e842aa10c472bf73d7cc0c3140aafc55c942e85f530a" +checksum = "7992f580ec52490178c5439ae5e23d2e539c7995f7db939f0aaba23262eb5085" dependencies = [ "derive_more", "displaydoc", @@ -6899,9 +6900,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c37d03f3b0f6b5f77c11af1e7c772de1c9af83e50bef7bb6069601900ba67b" +checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" dependencies = [ "serde 1.0.193", ] diff --git a/Cargo.toml b/Cargo.toml index 24b09c5dab..5a322c09ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,9 +104,9 @@ flate2 = "1.0.22" fs_extra = "1.2.0" futures = "0.3" git2 = { version = "0.18.1", default-features = false } -ibc = {version = "0.50.0", features = ["serde"]} -ibc-derive = "0.6.0" -ibc-testkit = {version = "0.50.0", default-features = false} +ibc = {version = "0.51.0", features = ["serde"]} +ibc-derive = "0.6.1" +ibc-testkit = {version = "0.51.0", default-features = false} ics23 = "0.11.0" index-set = { git = "https://github.com/heliaxdev/index-set", tag = "v0.8.1", features = ["serialize-borsh", "serialize-serde"] } indexmap = { git = "https://github.com/heliaxdev/indexmap", tag = "2.2.4-heliax-1", features = ["borsh-schema", "serde"] } diff --git a/crates/apps/src/lib/bench_utils.rs b/crates/apps/src/lib/bench_utils.rs index cc72bddb48..6487a38632 100644 --- a/crates/apps/src/lib/bench_utils.rs +++ b/crates/apps/src/lib/bench_utils.rs @@ -499,7 +499,7 @@ impl BenchShell { Some(ConnectionId::new(1)), CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(), ), - vec![Version::default()], + Version::compatibles(), std::time::Duration::new(100, 0), ) .unwrap(); diff --git a/crates/benches/native_vps.rs b/crates/benches/native_vps.rs index dfa2863c93..8cc95bbf5f 100644 --- a/crates/benches/native_vps.rs +++ b/crates/benches/native_vps.rs @@ -329,7 +329,7 @@ fn prepare_ibc_tx_and_ctx(bench_name: &str) -> (BenchShieldedCtx, Tx) { None, CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(), ), - version: Some(Version::default()), + version: Some(Version::compatibles().first().unwrap().clone()), delay_period: std::time::Duration::new(100, 0), signer: defaults::albert_address().to_string().into(), }; diff --git a/crates/benches/txs.rs b/crates/benches/txs.rs index 881aa16010..056d060e9b 100644 --- a/crates/benches/txs.rs +++ b/crates/benches/txs.rs @@ -771,7 +771,7 @@ fn ibc(c: &mut Criterion) { None, CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(), ), - version: Some(Version::default()), + version: Some(Version::compatibles().first().unwrap().clone()), delay_period: std::time::Duration::new(100, 0), signer: defaults::albert_address().to_string().into(), }; diff --git a/crates/ibc/src/context/client.rs b/crates/ibc/src/context/client.rs index 9d3783279c..1f95680f71 100644 --- a/crates/ibc/src/context/client.rs +++ b/crates/ibc/src/context/client.rs @@ -2,6 +2,8 @@ use ibc_derive::IbcConsensusState; #[cfg(feature = "testing")] +use ibc_testkit::testapp::ibc::clients::mock::client_state::ConsensusStateConverter as MockConsensusStateConverter; +#[cfg(feature = "testing")] use ibc_testkit::testapp::ibc::clients::mock::client_state::MockClientContext; #[cfg(feature = "testing")] use ibc_testkit::testapp::ibc::clients::mock::client_state::MockClientState; @@ -10,9 +12,13 @@ use ibc_testkit::testapp::ibc::clients::mock::consensus_state::MockConsensusStat use namada_core::ibc::clients::tendermint::client_state::ClientState as TmClientState; use namada_core::ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState; use namada_core::ibc::clients::tendermint::context::{ - CommonContext, ExecutionContext as TmExecutionContext, + ConsensusStateConverter as TmConsensusStateConverter, + ExecutionContext as TmExecutionContext, ValidationContext as TmValidationContext, }; +use namada_core::ibc::clients::tendermint::types::{ + ClientState as TmClientStateType, ConsensusState as TmConsensusStateType, +}; use namada_core::ibc::core::client::context::client_state::{ ClientStateCommon, ClientStateExecution, ClientStateValidation, }; @@ -20,13 +26,12 @@ use namada_core::ibc::core::client::context::{ ClientExecutionContext, ClientValidationContext, }; use namada_core::ibc::core::client::types::error::ClientError; -use namada_core::ibc::core::client::types::{Height, Status, UpdateKind}; +use namada_core::ibc::core::client::types::{Height, Status}; use namada_core::ibc::core::commitment_types::commitment::{ CommitmentPrefix, CommitmentProofBytes, CommitmentRoot, }; use namada_core::ibc::core::host::types::identifiers::{ClientId, ClientType}; use namada_core::ibc::core::host::types::path::Path; -use namada_core::ibc::core::host::ExecutionContext; use namada_core::ibc::primitives::proto::Any; use prost::Message; @@ -49,6 +54,28 @@ impl From for AnyClientState { } } +impl From for AnyClientState { + fn from(cs: TmClientStateType) -> Self { + Self::Tendermint(cs.into()) + } +} + +impl TryFrom for TmClientState { + type Error = ClientError; + + fn try_from(any: AnyClientState) -> Result { + match any { + AnyClientState::Tendermint(cs) => Ok(cs), + #[cfg(feature = "testing")] + AnyClientState::Mock(_) => { + Err(ClientError::UnknownConsensusStateType { + consensus_state_type: "mock".to_string(), + }) + } + } + } +} + #[cfg(feature = "testing")] impl From for AnyClientState { fn from(cs: MockClientState) -> Self { @@ -56,6 +83,22 @@ impl From for AnyClientState { } } +#[cfg(feature = "testing")] +impl TryFrom for MockClientState { + type Error = ClientError; + + fn try_from(any: AnyClientState) -> Result { + match any { + AnyClientState::Tendermint(_) => { + Err(ClientError::UnknownConsensusStateType { + consensus_state_type: "tendermint".to_string(), + }) + } + AnyClientState::Mock(cs) => Ok(cs), + } + } +} + impl From for Any { fn from(client_state: AnyClientState) -> Self { match client_state { @@ -101,6 +144,28 @@ impl From for AnyConsensusState { } } +impl From for AnyConsensusState { + fn from(cs: TmConsensusStateType) -> Self { + Self::Tendermint(cs.into()) + } +} + +impl TryInto for AnyConsensusState { + type Error = ClientError; + + fn try_into(self) -> Result { + match self { + AnyConsensusState::Tendermint(c) => Ok(c.inner().clone()), + #[cfg(feature = "testing")] + AnyConsensusState::Mock(_) => { + Err(ClientError::UnknownConsensusStateType { + consensus_state_type: "mock".to_string(), + }) + } + } + } +} + #[cfg(feature = "testing")] impl From for AnyConsensusState { fn from(cs: MockConsensusState) -> Self { @@ -283,22 +348,19 @@ impl ClientStateCommon for AnyClientState { impl ClientStateValidation for AnyClientState where V: ClientValidationContext + TmValidationContext, - ClientError: From<::ConversionError>, + ::ConsensusStateRef: + TmConsensusStateConverter, { fn verify_client_message( &self, ctx: &V, client_id: &ClientId, client_message: Any, - update_kind: &UpdateKind, ) -> Result<(), ClientError> { match self { - AnyClientState::Tendermint(cs) => cs.verify_client_message( - ctx, - client_id, - client_message, - update_kind, - ), + AnyClientState::Tendermint(cs) => { + cs.verify_client_message(ctx, client_id, client_message) + } } } @@ -307,15 +369,11 @@ where ctx: &V, client_id: &ClientId, client_message: Any, - update_kind: &UpdateKind, ) -> Result { match self { - AnyClientState::Tendermint(cs) => cs.check_for_misbehaviour( - ctx, - client_id, - client_message, - update_kind, - ), + AnyClientState::Tendermint(cs) => { + cs.check_for_misbehaviour(ctx, client_id, client_message) + } } } @@ -334,33 +392,22 @@ where impl ClientStateValidation for AnyClientState where V: ClientValidationContext + TmValidationContext + MockClientContext, - ClientError: From<::ConversionError> - + From< - <::AnyConsensusState as TryInto< - MockConsensusState, - >>::Error, - >, + ::ConsensusStateRef: + TmConsensusStateConverter + MockConsensusStateConverter, { fn verify_client_message( &self, ctx: &V, client_id: &ClientId, client_message: Any, - update_kind: &UpdateKind, ) -> Result<(), ClientError> { match self { - AnyClientState::Tendermint(cs) => cs.verify_client_message( - ctx, - client_id, - client_message, - update_kind, - ), - AnyClientState::Mock(cs) => cs.verify_client_message( - ctx, - client_id, - client_message, - update_kind, - ), + AnyClientState::Tendermint(cs) => { + cs.verify_client_message(ctx, client_id, client_message) + } + AnyClientState::Mock(cs) => { + cs.verify_client_message(ctx, client_id, client_message) + } } } @@ -369,21 +416,14 @@ where ctx: &V, client_id: &ClientId, client_message: Any, - update_kind: &UpdateKind, ) -> Result { match self { - AnyClientState::Tendermint(cs) => cs.check_for_misbehaviour( - ctx, - client_id, - client_message, - update_kind, - ), - AnyClientState::Mock(cs) => cs.check_for_misbehaviour( - ctx, - client_id, - client_message, - update_kind, - ), + AnyClientState::Tendermint(cs) => { + cs.check_for_misbehaviour(ctx, client_id, client_message) + } + AnyClientState::Mock(cs) => { + cs.check_for_misbehaviour(ctx, client_id, client_message) + } } } @@ -402,9 +442,10 @@ where #[cfg(not(feature = "testing"))] impl ClientStateExecution for AnyClientState where - E: ExecutionContext + TmExecutionContext, - ::AnyClientState: From, - ::AnyConsensusState: From, + E: ClientExecutionContext + TmExecutionContext, + ::ConsensusStateRef: + TmConsensusStateConverter, + ::ClientStateMut: From, { fn initialise( &self, @@ -437,15 +478,11 @@ where ctx: &mut E, client_id: &ClientId, client_message: Any, - update_kind: &UpdateKind, ) -> Result<(), ClientError> { match self { - AnyClientState::Tendermint(cs) => cs.update_state_on_misbehaviour( - ctx, - client_id, - client_message, - update_kind, - ), + AnyClientState::Tendermint(cs) => { + cs.update_state_on_misbehaviour(ctx, client_id, client_message) + } } } @@ -470,11 +507,11 @@ where #[cfg(feature = "testing")] impl ClientStateExecution for AnyClientState where - E: ExecutionContext + TmExecutionContext + MockClientContext, - ::AnyClientState: - From + From, - ::AnyConsensusState: - From + From, + E: ClientExecutionContext + TmExecutionContext + MockClientContext, + ::ConsensusStateRef: + TmConsensusStateConverter + MockConsensusStateConverter, + ::ClientStateMut: + From + From, { fn initialise( &self, @@ -511,21 +548,14 @@ where ctx: &mut E, client_id: &ClientId, client_message: Any, - update_kind: &UpdateKind, ) -> Result<(), ClientError> { match self { - AnyClientState::Tendermint(cs) => cs.update_state_on_misbehaviour( - ctx, - client_id, - client_message, - update_kind, - ), - AnyClientState::Mock(cs) => cs.update_state_on_misbehaviour( - ctx, - client_id, - client_message, - update_kind, - ), + AnyClientState::Tendermint(cs) => { + cs.update_state_on_misbehaviour(ctx, client_id, client_message) + } + AnyClientState::Mock(cs) => { + cs.update_state_on_misbehaviour(ctx, client_id, client_message) + } } } diff --git a/crates/ibc/src/context/common.rs b/crates/ibc/src/context/common.rs index 8d7f6137e0..aa5daba0c1 100644 --- a/crates/ibc/src/context/common.rs +++ b/crates/ibc/src/context/common.rs @@ -208,7 +208,10 @@ pub trait IbcCommonContext: IbcStorageContext { } /// Get the client update time - fn client_update_time(&self, client_id: &ClientId) -> Result { + fn client_update_meta( + &self, + client_id: &ClientId, + ) -> Result<(Timestamp, Height)> { let key = storage::client_update_timestamp_key(client_id); let value = self.read_bytes(&key)?.ok_or(ClientError::ClientSpecific { @@ -216,55 +219,61 @@ pub trait IbcCommonContext: IbcStorageContext { "The client update time doesn't exist: ID {client_id}", ), })?; - let time = - TmTime::decode_vec(&value).map_err(|_| ClientError::Other { + let time = TmTime::decode_vec(&value) + .map_err(|_| ClientError::Other { description: format!( "Decoding the client update time failed: ID {client_id}", ), - })?; - Ok(time.into()) + })? + .into(); + + let key = storage::client_update_height_key(client_id); + let value = self.read_bytes(&key)?.ok_or({ + ClientError::ClientSpecific { + description: format!( + "The client update height doesn't exist: ID {client_id}", + ), + } + })?; + let height = Height::decode_vec(&value).map_err(|_| { + ContextError::ClientError(ClientError::Other { + description: format!( + "Decoding the client update height failed: ID {client_id}", + ), + }) + })?; + + Ok((time, height)) } - /// Store the client update time - fn store_update_time( + /// Store the client update time and height + fn store_update_meta( &mut self, client_id: &ClientId, - timestamp: Timestamp, + host_timestamp: Timestamp, + host_height: Height, ) -> Result<()> { let key = storage::client_update_timestamp_key(client_id); - let time = timestamp.into_tm_time().ok_or(ClientError::Other { + let time = host_timestamp.into_tm_time().ok_or(ClientError::Other { description: format!( "The client timestamp is invalid: ID {client_id}", ), })?; self.write_bytes(&key, time.encode_vec()) - .map_err(ContextError::from) + .map_err(ContextError::from)?; + + let key = storage::client_update_height_key(client_id); + let bytes = host_height.encode_vec(); + self.write_bytes(&key, bytes).map_err(ContextError::from) } - /// Delete the client update time - fn delete_update_time(&mut self, client_id: &ClientId) -> Result<()> { + /// Delete the client update time and height + fn delete_update_meta(&mut self, client_id: &ClientId) -> Result<()> { let key = storage::client_update_timestamp_key(client_id); - self.delete(&key).map_err(ContextError::from) - } + self.delete(&key).map_err(ContextError::from)?; - /// Get the client update height - fn client_update_height(&self, client_id: &ClientId) -> Result { let key = storage::client_update_height_key(client_id); - let value = self.read_bytes(&key)?.ok_or({ - ClientError::ClientSpecific { - description: format!( - "The client update height doesn't exist: ID {client_id}", - ), - } - })?; - Height::decode_vec(&value).map_err(|_| { - ClientError::Other { - description: format!( - "Decoding the client update height failed: ID {client_id}", - ), - } - .into() - }) + self.delete(&key).map_err(ContextError::from) } /// Get the timestamp on this chain @@ -331,23 +340,6 @@ pub trait IbcCommonContext: IbcStorageContext { } } - /// Store the client update height - fn store_update_height( - &mut self, - client_id: &ClientId, - host_height: Height, - ) -> Result<()> { - let key = storage::client_update_height_key(client_id); - let bytes = host_height.encode_vec(); - self.write_bytes(&key, bytes).map_err(ContextError::from) - } - - /// Delete the client update height - fn delete_update_height(&mut self, client_id: &ClientId) -> Result<()> { - let key = storage::client_update_height_key(client_id); - self.delete(&key).map_err(ContextError::from) - } - /// Get the ConnectionEnd fn connection_end(&self, conn_id: &ConnectionId) -> Result { let key = storage::connection_key(conn_id); diff --git a/crates/ibc/src/context/execution.rs b/crates/ibc/src/context/execution.rs index 8b38d66761..955228edfe 100644 --- a/crates/ibc/src/context/execution.rs +++ b/crates/ibc/src/context/execution.rs @@ -21,7 +21,7 @@ use namada_core::ibc::core::host::types::path::{ use namada_core::ibc::core::host::ExecutionContext; use namada_core::ibc::primitives::Timestamp; -use super::client::{AnyClientState, AnyConsensusState}; +use super::client::AnyClientState; use super::common::IbcCommonContext; use super::IbcContext; use crate::storage; @@ -30,14 +30,12 @@ impl ClientExecutionContext for IbcContext where C: IbcCommonContext, { - type AnyClientState = AnyClientState; - type AnyConsensusState = AnyConsensusState; - type V = Self; + type ClientStateMut = AnyClientState; fn store_client_state( &mut self, client_state_path: ClientStatePath, - client_state: Self::AnyClientState, + client_state: Self::ClientStateRef, ) -> Result<(), ContextError> { self.inner .borrow_mut() @@ -47,7 +45,7 @@ where fn store_consensus_state( &mut self, consensus_state_path: ClientConsensusStatePath, - consensus_state: Self::AnyConsensusState, + consensus_state: Self::ConsensusStateRef, ) -> Result<(), ContextError> { let client_id = consensus_state_path.client_id; let height = Height::new( @@ -75,42 +73,26 @@ where .delete_consensus_state(&client_id, height) } - fn store_update_time( - &mut self, - client_id: ClientId, - _height: Height, - timestamp: Timestamp, - ) -> Result<(), ContextError> { - self.inner - .borrow_mut() - .store_update_time(&client_id, timestamp) - } - - fn store_update_height( + fn store_update_meta( &mut self, client_id: ClientId, _height: Height, + host_timestamp: Timestamp, host_height: Height, ) -> Result<(), ContextError> { - self.inner - .borrow_mut() - .store_update_height(&client_id, host_height) - } - - fn delete_update_time( - &mut self, - client_id: ClientId, - _height: Height, - ) -> Result<(), ContextError> { - self.inner.borrow_mut().delete_update_time(&client_id) + self.inner.borrow_mut().store_update_meta( + &client_id, + host_timestamp, + host_height, + ) } - fn delete_update_height( + fn delete_update_meta( &mut self, client_id: ClientId, _height: Height, ) -> Result<(), ContextError> { - self.inner.borrow_mut().delete_update_height(&client_id) + self.inner.borrow_mut().delete_update_meta(&client_id) } } @@ -118,6 +100,8 @@ impl ExecutionContext for IbcContext where C: IbcCommonContext, { + type E = Self; + fn get_client_execution_context(&mut self) -> &mut Self::E { self } diff --git a/crates/ibc/src/context/mod.rs b/crates/ibc/src/context/mod.rs index 47bf76606d..159fc37e12 100644 --- a/crates/ibc/src/context/mod.rs +++ b/crates/ibc/src/context/mod.rs @@ -16,8 +16,10 @@ use std::fmt::Debug; use std::rc::Rc; use std::time::Duration; +use namada_core::hash::Sha256Hasher; use namada_core::ibc::core::commitment_types::specs::ProofSpecs; use namada_core::ibc::core::host::types::identifiers::ChainId as IbcChainId; +use namada_state::merkle_tree::ics23_specs::proof_specs; /// IBC context to handle IBC-related data #[derive(Debug)] @@ -62,7 +64,7 @@ impl Default for ValidationParams { Self { chain_id: IbcChainId::new("non-init-chain") .expect("Convert the default chain ID shouldn't fail"), - proof_specs: ProofSpecs::default(), + proof_specs: proof_specs::().into(), unbonding_period: Duration::default(), upgrade_path: Vec::default(), } diff --git a/crates/ibc/src/context/validation.rs b/crates/ibc/src/context/validation.rs index b65b8c640f..d17191063c 100644 --- a/crates/ibc/src/context/validation.rs +++ b/crates/ibc/src/context/validation.rs @@ -2,16 +2,14 @@ #[cfg(feature = "testing")] use ibc_testkit::testapp::ibc::clients::mock::client_state::MockClientState; -use namada_core::ibc::clients::tendermint::context::{ - CommonContext as TmCommonContext, ValidationContext as TmValidationContext, -}; +use namada_core::ibc::clients::tendermint::client_state::ClientState as TmClientState; +use namada_core::ibc::clients::tendermint::context::ValidationContext as TmValidationContext; use namada_core::ibc::core::channel::types::channel::ChannelEnd; use namada_core::ibc::core::channel::types::commitment::{ AcknowledgementCommitment, PacketCommitment, }; use namada_core::ibc::core::channel::types::packet::Receipt; use namada_core::ibc::core::client::context::ClientValidationContext; -use namada_core::ibc::core::client::types::error::ClientError; use namada_core::ibc::core::client::types::Height; use namada_core::ibc::core::commitment_types::commitment::CommitmentPrefix; use namada_core::ibc::core::commitment_types::specs::ProofSpecs; @@ -26,7 +24,6 @@ use namada_core::ibc::core::host::types::path::{ }; use namada_core::ibc::core::host::ValidationContext; use namada_core::ibc::cosmos_host::ValidateSelfClientContext; -use namada_core::ibc::primitives::proto::Any; use namada_core::ibc::primitives::{Signer, Timestamp}; use super::client::{AnyClientState, AnyConsensusState}; @@ -36,13 +33,10 @@ use crate::storage; const COMMITMENT_PREFIX: &[u8] = b"ibc"; -impl TmCommonContext for IbcContext +impl TmValidationContext for IbcContext where C: IbcCommonContext, { - type AnyConsensusState = AnyConsensusState; - type ConversionError = ClientError; - fn host_timestamp(&self) -> Result { ValidationContext::host_timestamp(self) } @@ -51,30 +45,18 @@ where ValidationContext::host_height(self) } - fn consensus_state( - &self, - client_cons_state_path: &ClientConsensusStatePath, - ) -> Result { - ValidationContext::consensus_state(self, client_cons_state_path) - } - fn consensus_state_heights( &self, client_id: &ClientId, ) -> Result, ContextError> { self.inner.borrow().consensus_state_heights(client_id) } -} -impl TmValidationContext for IbcContext -where - C: IbcCommonContext, -{ fn next_consensus_state( &self, client_id: &ClientId, height: &Height, - ) -> Result, ContextError> { + ) -> Result, ContextError> { self.inner.borrow().next_consensus_state(client_id, height) } @@ -82,7 +64,7 @@ where &self, client_id: &ClientId, height: &Height, - ) -> Result, ContextError> { + ) -> Result, ContextError> { self.inner.borrow().prev_consensus_state(client_id, height) } } @@ -94,16 +76,6 @@ impl MockClientContext for IbcContext where C: IbcCommonContext, { - type AnyConsensusState = AnyConsensusState; - type ConversionError = ClientError; - - fn consensus_state( - &self, - client_cons_state_path: &ClientConsensusStatePath, - ) -> Result { - ValidationContext::consensus_state(self, client_cons_state_path) - } - fn host_timestamp(&self) -> Result { ValidationContext::host_timestamp(self) } @@ -117,20 +89,35 @@ impl ClientValidationContext for IbcContext where C: IbcCommonContext, { - fn client_update_time( + type ClientStateRef = AnyClientState; + type ConsensusStateRef = AnyConsensusState; + + fn client_state( &self, client_id: &ClientId, - _height: &Height, - ) -> Result { - self.inner.borrow().client_update_time(client_id) + ) -> Result { + self.inner.borrow().client_state(client_id) + } + + fn consensus_state( + &self, + client_cons_state_path: &ClientConsensusStatePath, + ) -> Result { + let height = Height::new( + client_cons_state_path.revision_number, + client_cons_state_path.revision_height, + )?; + self.inner + .borrow() + .consensus_state(&client_cons_state_path.client_id, height) } - fn client_update_height( + fn client_update_meta( &self, client_id: &ClientId, _height: &Height, - ) -> Result { - self.inner.borrow().client_update_height(client_id) + ) -> Result<(Timestamp, Height), ContextError> { + self.inner.borrow().client_update_meta(client_id) } } @@ -138,42 +125,14 @@ impl ValidationContext for IbcContext where C: IbcCommonContext, { - type AnyClientState = AnyClientState; - type AnyConsensusState = AnyConsensusState; - type E = Self; + type HostClientState = AnyClientState; + type HostConsensusState = AnyConsensusState; type V = Self; fn get_client_validation_context(&self) -> &Self::V { self } - fn client_state( - &self, - client_id: &ClientId, - ) -> Result { - self.inner.borrow().client_state(client_id) - } - - fn decode_client_state( - &self, - client_state: Any, - ) -> Result { - client_state.try_into().map_err(ContextError::from) - } - - fn consensus_state( - &self, - client_cons_state_path: &ClientConsensusStatePath, - ) -> Result { - let height = Height::new( - client_cons_state_path.revision_number, - client_cons_state_path.revision_height, - )?; - self.inner - .borrow() - .consensus_state(&client_cons_state_path.client_id, height) - } - fn host_height(&self) -> Result { let height = self.inner.borrow().get_block_height()?; // the revision number is always 0 @@ -187,7 +146,7 @@ where fn host_consensus_state( &self, height: &Height, - ) -> Result { + ) -> Result { self.inner.borrow().host_consensus_state(height) } @@ -205,20 +164,24 @@ where fn validate_self_client( &self, - counterparty_client_state: Any, + client_state_of_host_on_counterparty: Self::HostClientState, ) -> Result<(), ContextError> { #[cfg(feature = "testing")] { - if MockClientState::try_from(counterparty_client_state.clone()) - .is_ok() + if MockClientState::try_from( + client_state_of_host_on_counterparty.clone(), + ) + .is_ok() { return Ok(()); } } + let tm_client_state = + TmClientState::try_from(client_state_of_host_on_counterparty)?; ValidateSelfClientContext::validate_self_tendermint_client( self, - counterparty_client_state, + tm_client_state.inner().clone(), ) } diff --git a/crates/namada/src/ledger/native_vp/ibc/mod.rs b/crates/namada/src/ledger/native_vp/ibc/mod.rs index 5160671e3f..3826c428f5 100644 --- a/crates/namada/src/ledger/native_vp/ibc/mod.rs +++ b/crates/namada/src/ledger/native_vp/ibc/mod.rs @@ -623,7 +623,7 @@ mod tests { conn_state, get_client_id(), get_conn_counterparty(), - vec![ConnVersion::default()], + ConnVersion::compatibles(), Duration::new(0, 0), ) .unwrap() @@ -1130,7 +1130,7 @@ mod tests { let msg = MsgConnectionOpenInit { client_id_on_a: get_client_id(), counterparty, - version: Some(ConnVersion::default()), + version: Some(ConnVersion::compatibles().first().unwrap().clone()), delay_period: Duration::new(100, 0), signer: "account0".to_string().into(), }; @@ -1237,7 +1237,7 @@ mod tests { let msg = MsgConnectionOpenInit { client_id_on_a: get_client_id(), counterparty, - version: Some(ConnVersion::default()), + version: Some(ConnVersion::compatibles().first().unwrap().clone()), delay_period: Duration::new(100, 0), signer: "account0".to_string().into(), }; @@ -1335,7 +1335,7 @@ mod tests { client_id_on_b: get_client_id(), client_state_of_b_on_a: client_state.into(), counterparty: get_conn_counterparty(), - versions_on_a: vec![ConnVersion::default()], + versions_on_a: ConnVersion::compatibles(), proofs_height_on_a: proof_height, proof_conn_end_on_a: dummy_proof(), proof_client_state_of_b_on_a: dummy_proof(), @@ -1344,7 +1344,7 @@ mod tests { delay_period: Duration::from_secs(0), signer: "account0".to_string().into(), proof_consensus_state_of_b: Some(dummy_proof()), - previous_connection_id: ConnectionId::default().to_string(), + previous_connection_id: ConnectionId::zero().to_string(), }; // insert a TryOpen connection @@ -1474,7 +1474,7 @@ mod tests { proof_consensus_state_of_a_on_b: dummy_proof(), proofs_height_on_b: proof_height, consensus_height_of_a_on_b: client_state.latest_height(), - version: ConnVersion::default(), + version: ConnVersion::compatibles().first().unwrap().clone(), signer: "account0".to_string().into(), proof_consensus_state_of_a: None, }; @@ -1782,7 +1782,7 @@ mod tests { proof_height_on_a: proof_height, ordering: Order::Unordered, signer: "account0".to_string().into(), - version_proposal: ChanVersion::default(), + version_proposal: ChanVersion::empty(), }; // insert a TryOpen channel @@ -2992,7 +2992,7 @@ mod tests { receiver: msg.packet_data.receiver.clone(), class: msg.packet_data.class_id.clone(), tokens: msg.packet_data.token_ids.clone(), - memo: msg.packet_data.memo.clone().unwrap_or_default(), + memo: msg.packet_data.memo.clone().unwrap_or("".into()), }; let event = RawIbcEvent::Module(ModuleEvent::from(transfer_event)); state diff --git a/crates/tests/src/e2e/ibc_tests.rs b/crates/tests/src/e2e/ibc_tests.rs index 1e34120586..093b13582f 100644 --- a/crates/tests/src/e2e/ibc_tests.rs +++ b/crates/tests/src/e2e/ibc_tests.rs @@ -948,7 +948,7 @@ fn make_client_state(test: &Test, height: Height) -> TmClientState { TmClientStateType::new( chain_id, - TrustThreshold::default(), + TrustThreshold::TWO_THIRDS, Duration::from_secs(trusting_period), Duration::from_secs(unbonding_period), max_clock_drift, @@ -1079,7 +1079,7 @@ fn connection_handshake( None, commitment_prefix(), ), - version: Some(ConnVersion::default()), + version: Some(ConnVersion::compatibles().first().unwrap().clone()), delay_period: Duration::new(0, 0), signer: signer(), }; @@ -1110,7 +1110,7 @@ fn connection_handshake( client_id_on_b: client_id_b.clone(), client_state_of_b_on_a: client_state.clone().into(), counterparty, - versions_on_a: vec![ConnVersion::default()], + versions_on_a: ConnVersion::compatibles(), proofs_height_on_a: height_a, proof_conn_end_on_a: conn_proof, proof_client_state_of_b_on_a: client_state_proof, @@ -1119,7 +1119,7 @@ fn connection_handshake( delay_period: Duration::from_secs(0), signer: "test".to_string().into(), proof_consensus_state_of_b: None, - previous_connection_id: ConnectionId::default().to_string(), + previous_connection_id: ConnectionId::zero().to_string(), }; // Update the client state of Chain A on Chain B update_client_with_height(test_a, test_b, client_id_b, height_a)?; @@ -1150,7 +1150,7 @@ fn connection_handshake( proof_consensus_state_of_a_on_b: consensus_proof, proofs_height_on_b: height_b, consensus_height_of_a_on_b, - version: ConnVersion::default(), + version: ConnVersion::compatibles().first().unwrap().clone(), signer: signer(), proof_consensus_state_of_a: None, }; @@ -2384,12 +2384,12 @@ fn get_packet_from_events(events: &Vec) -> Option { let mut packet = Packet { seq_on_a: 0.into(), port_id_on_a: PortId::transfer(), - chan_id_on_a: ChannelId::default(), + chan_id_on_a: ChannelId::zero(), port_id_on_b: PortId::transfer(), - chan_id_on_b: ChannelId::default(), + chan_id_on_b: ChannelId::zero(), data: vec![], - timeout_height_on_b: TimeoutHeight::default(), - timeout_timestamp_on_b: Timestamp::default(), + timeout_height_on_b: TimeoutHeight::Never, + timeout_timestamp_on_b: Timestamp::none(), }; for (key, val) in attributes { match key.as_str() { diff --git a/crates/tests/src/vm_host_env/ibc.rs b/crates/tests/src/vm_host_env/ibc.rs index a328246afa..6bd322bb2f 100644 --- a/crates/tests/src/vm_host_env/ibc.rs +++ b/crates/tests/src/vm_host_env/ibc.rs @@ -361,7 +361,7 @@ pub fn prepare_opened_connection( ConnState::Open, client_id.clone(), dummy_connection_counterparty(), - vec![ConnVersion::default()], + ConnVersion::compatibles(), Duration::new(0, 0), ) .expect("invalid connection"); @@ -467,7 +467,7 @@ pub fn msg_connection_open_try( client_id_on_b: client_id, client_state_of_b_on_a: client_state, counterparty: dummy_connection_counterparty(), - versions_on_a: vec![ConnVersion::default()], + versions_on_a: ConnVersion::compatibles(), proofs_height_on_a: dummy_proof_height(), proof_conn_end_on_a: dummy_proof(), proof_client_state_of_b_on_a: dummy_proof(), @@ -476,7 +476,7 @@ pub fn msg_connection_open_try( delay_period: Duration::from_secs(0), signer: "test".to_string().into(), proof_consensus_state_of_b: Some(dummy_proof()), - previous_connection_id: ConnectionId::default().to_string(), + previous_connection_id: ConnectionId::zero().to_string(), } } @@ -495,7 +495,7 @@ pub fn msg_connection_open_ack( proof_consensus_state_of_a_on_b: dummy_proof(), proofs_height_on_b: dummy_proof_height(), consensus_height_of_a_on_b: consensus_height, - version: ConnVersion::default(), + version: ConnVersion::compatibles().first().unwrap().clone(), signer: "test".to_string().into(), proof_consensus_state_of_a: None, } @@ -560,7 +560,7 @@ pub fn msg_channel_open_try( proof_height_on_a: dummy_proof_height(), ordering: Order::Unordered, signer: "test".to_string().into(), - version_proposal: ChanVersion::default(), + version_proposal: ChanVersion::empty(), } } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index a59b5ba551..e87a353d15 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -2385,9 +2385,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8057203ab04368297a31ecd5d059bec7108c069d636bcfc9ab20e82d89b480b8" +checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" dependencies = [ "ibc-apps", "ibc-clients", @@ -2399,9 +2399,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e931737b69129ae417598fe29eace3e41a9ce32b8649abe3937495973e5843f" +checksum = "640bf8485d3b25ba08632438af56f334290387c13db9441ad5389936c1d8218e" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2410,9 +2410,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2019d3a6adf6b333c55630f52ca71ad8f61702ca1cf291aaf5ee40b7c6c27ba2" +checksum = "4051c417a011a459080a58066a98f2c0b488171a8bf913af6a53bd34277f1b0b" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -2431,9 +2431,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2595e4cc14828a4141a28b86777040d8bfbabea43838a425137202cff0ee6329" +checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2442,9 +2442,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0106c87ddcc619a6a5eac05da2b77287e3958f89dddf951daf9a2dfc470cb5f4" +checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" dependencies = [ "derive_more", "displaydoc", @@ -2457,9 +2457,9 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5738d8c842abce233f41d3be825d01e6ee075251b509c6947d05c75477eaeec" +checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2467,10 +2467,11 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ef4eefb4fd88167335fee4d212b1ff2fa4dd4e4ce87a58bda1798be1d128ac" +checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" dependencies = [ + "derive_more", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -2484,9 +2485,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a224a98b193810e1ef86316e9a08e677eeff6f98b22b9eb9806bd993d3753a" +checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2502,9 +2503,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1ea3be7ae201c99b6589c112a253f2fb3c9ae7322d8937a7303d1fbfe76d27" +checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" dependencies = [ "base64 0.21.7", "displaydoc", @@ -2517,9 +2518,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fef481dd1ebe5ef69ee8e095c225cb3e51cd3895096ba2884b3f5b827a6ed6" +checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2527,9 +2528,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aedd421bae80115f44b198bec9af45f234e1c8ff81ee9d5e7f60444d526d2b6" +checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2544,9 +2545,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535048a8fe64101263e35a6a4503474811e379a115db72ee449df882b0f11b45" +checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2560,9 +2561,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d97396ccb1840f4ea6021bbf049a4a7e30a8f5b126f00023ec44b2a48d4dabc" +checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2584,9 +2585,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bcf0c59eaa935fa410497a56862f28c4df68317ea556724f0d0764b6c0307e" +checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2598,9 +2599,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d37d88be3dc7fd82d45418c257d826244a6b29b7902c76cf9e68fd61f1e9173" +checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" dependencies = [ "derive_more", "displaydoc", @@ -2615,9 +2616,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb717b1296e6cda0990346ba5203fadd043d5159d7d7173b3765f72f263c29db" +checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2636,9 +2637,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10ff34bf57bf4bc668b55208dbfdf312d7907adc6a0e39da2377883f12efada" +checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2655,9 +2656,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de7f4f1e78e9ed5a63b09b1405f42713f3d076ba5e7889ec31a520cad4970344" +checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -2668,9 +2669,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230d7f547e121147d136c563ae71707a9e3477a9bc1bc6c1dc29051e1408a381" +checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2690,9 +2691,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60a2d072d8f7d8d64503bbf3fb69ffcd973b92667af053617a36682fadddea5" +checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2706,9 +2707,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fae38340bffa42a74563a12703c994515cca4bab755a0c83089c18c3c1e481a" +checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2731,9 +2732,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abaa0e2143855d12c19e814dab72a5e28daf5e31780afb1302e983614b248668" +checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" dependencies = [ "derive_more", "displaydoc", @@ -2750,9 +2751,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3c792be21a340e42344e5bede1695c2d21d62abcc21bbfc7662b5950ffe8d4" +checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" dependencies = [ "derive_more", "displaydoc", @@ -2774,9 +2775,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c25ce3082e036836d60aea3cc24f46dfb248d7718516a9a48e1feb466ce10c1" +checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2790,9 +2791,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c261fb7e9a7de7daafb6a38cb9abdce6e912230e30246eb2ef1bb5db32ba10f" +checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" dependencies = [ "derive_more", "displaydoc", @@ -2805,9 +2806,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3b37bc4c11fdc60a328488f4be205106666edda20a4080484d599a8b0978d2" +checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2825,9 +2826,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de1e69ff9d7d6094b720a36bb26fc8078b5e1b0e216e2d0a92f602e6dc8016e" +checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" dependencies = [ "proc-macro2", "quote", @@ -2836,9 +2837,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5524046e645bdfbd96ef932c8ceab6bb2391dc31dee626e274d13e7ac25ec2" +checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2855,9 +2856,9 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553" +checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -2876,9 +2877,9 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3443c6ccc7551266dce6e842aa10c472bf73d7cc0c3140aafc55c942e85f530a" +checksum = "7992f580ec52490178c5439ae5e23d2e539c7995f7db939f0aaba23262eb5085" dependencies = [ "derive_more", "displaydoc", @@ -5595,9 +5596,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c37d03f3b0f6b5f77c11af1e7c772de1c9af83e50bef7bb6069601900ba67b" +checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" dependencies = [ "serde", ] diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 630b6bcca2..330d95f411 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -2385,9 +2385,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8057203ab04368297a31ecd5d059bec7108c069d636bcfc9ab20e82d89b480b8" +checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" dependencies = [ "ibc-apps", "ibc-clients", @@ -2399,9 +2399,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e931737b69129ae417598fe29eace3e41a9ce32b8649abe3937495973e5843f" +checksum = "640bf8485d3b25ba08632438af56f334290387c13db9441ad5389936c1d8218e" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2410,9 +2410,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2019d3a6adf6b333c55630f52ca71ad8f61702ca1cf291aaf5ee40b7c6c27ba2" +checksum = "4051c417a011a459080a58066a98f2c0b488171a8bf913af6a53bd34277f1b0b" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -2431,9 +2431,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2595e4cc14828a4141a28b86777040d8bfbabea43838a425137202cff0ee6329" +checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2442,9 +2442,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0106c87ddcc619a6a5eac05da2b77287e3958f89dddf951daf9a2dfc470cb5f4" +checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" dependencies = [ "derive_more", "displaydoc", @@ -2457,9 +2457,9 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5738d8c842abce233f41d3be825d01e6ee075251b509c6947d05c75477eaeec" +checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2467,10 +2467,11 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ef4eefb4fd88167335fee4d212b1ff2fa4dd4e4ce87a58bda1798be1d128ac" +checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" dependencies = [ + "derive_more", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -2484,9 +2485,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a224a98b193810e1ef86316e9a08e677eeff6f98b22b9eb9806bd993d3753a" +checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2502,9 +2503,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1ea3be7ae201c99b6589c112a253f2fb3c9ae7322d8937a7303d1fbfe76d27" +checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" dependencies = [ "base64 0.21.7", "displaydoc", @@ -2517,9 +2518,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fef481dd1ebe5ef69ee8e095c225cb3e51cd3895096ba2884b3f5b827a6ed6" +checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2527,9 +2528,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aedd421bae80115f44b198bec9af45f234e1c8ff81ee9d5e7f60444d526d2b6" +checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2544,9 +2545,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535048a8fe64101263e35a6a4503474811e379a115db72ee449df882b0f11b45" +checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2560,9 +2561,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d97396ccb1840f4ea6021bbf049a4a7e30a8f5b126f00023ec44b2a48d4dabc" +checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2584,9 +2585,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bcf0c59eaa935fa410497a56862f28c4df68317ea556724f0d0764b6c0307e" +checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2598,9 +2599,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d37d88be3dc7fd82d45418c257d826244a6b29b7902c76cf9e68fd61f1e9173" +checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" dependencies = [ "derive_more", "displaydoc", @@ -2615,9 +2616,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb717b1296e6cda0990346ba5203fadd043d5159d7d7173b3765f72f263c29db" +checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2636,9 +2637,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10ff34bf57bf4bc668b55208dbfdf312d7907adc6a0e39da2377883f12efada" +checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2655,9 +2656,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de7f4f1e78e9ed5a63b09b1405f42713f3d076ba5e7889ec31a520cad4970344" +checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -2668,9 +2669,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230d7f547e121147d136c563ae71707a9e3477a9bc1bc6c1dc29051e1408a381" +checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2690,9 +2691,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60a2d072d8f7d8d64503bbf3fb69ffcd973b92667af053617a36682fadddea5" +checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2706,9 +2707,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fae38340bffa42a74563a12703c994515cca4bab755a0c83089c18c3c1e481a" +checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2731,9 +2732,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abaa0e2143855d12c19e814dab72a5e28daf5e31780afb1302e983614b248668" +checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" dependencies = [ "derive_more", "displaydoc", @@ -2750,9 +2751,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3c792be21a340e42344e5bede1695c2d21d62abcc21bbfc7662b5950ffe8d4" +checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" dependencies = [ "derive_more", "displaydoc", @@ -2774,9 +2775,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c25ce3082e036836d60aea3cc24f46dfb248d7718516a9a48e1feb466ce10c1" +checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2790,9 +2791,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c261fb7e9a7de7daafb6a38cb9abdce6e912230e30246eb2ef1bb5db32ba10f" +checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" dependencies = [ "derive_more", "displaydoc", @@ -2805,9 +2806,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3b37bc4c11fdc60a328488f4be205106666edda20a4080484d599a8b0978d2" +checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2825,9 +2826,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de1e69ff9d7d6094b720a36bb26fc8078b5e1b0e216e2d0a92f602e6dc8016e" +checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" dependencies = [ "proc-macro2", "quote", @@ -2836,9 +2837,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5524046e645bdfbd96ef932c8ceab6bb2391dc31dee626e274d13e7ac25ec2" +checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2855,9 +2856,9 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553" +checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -2876,9 +2877,9 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.50.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3443c6ccc7551266dce6e842aa10c472bf73d7cc0c3140aafc55c942e85f530a" +checksum = "7992f580ec52490178c5439ae5e23d2e539c7995f7db939f0aaba23262eb5085" dependencies = [ "derive_more", "displaydoc", @@ -5533,9 +5534,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c37d03f3b0f6b5f77c11af1e7c772de1c9af83e50bef7bb6069601900ba67b" +checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5" dependencies = [ "serde", ] From 1df9fd0175b27c47f86d6bb1ea958ebef8693028 Mon Sep 17 00:00:00 2001 From: yito88 Date: Tue, 9 Apr 2024 17:18:38 +0200 Subject: [PATCH 2/7] update to the current main --- Cargo.lock | 87 +++++++++++--------------------- Cargo.toml | 9 ++-- crates/ibc/src/context/client.rs | 62 +++++++++++++++++++++++ wasm/Cargo.lock | 87 +++++++++++--------------------- wasm_for_tests/Cargo.lock | 87 +++++++++++--------------------- 5 files changed, 155 insertions(+), 177 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a9e203046..88291db754 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2965,8 +2965,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-apps", "ibc-clients", @@ -2979,8 +2978,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640bf8485d3b25ba08632438af56f334290387c13db9441ad5389936c1d8218e" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2990,8 +2988,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051c417a011a459080a58066a98f2c0b488171a8bf913af6a53bd34277f1b0b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -3011,8 +3008,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -3022,8 +3018,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -3037,8 +3032,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -3047,8 +3041,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -3065,8 +3058,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -3083,8 +3075,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "base64 0.21.7", "displaydoc", @@ -3098,8 +3089,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3108,8 +3098,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3125,8 +3114,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -3141,8 +3129,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3165,8 +3152,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -3179,8 +3165,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -3196,8 +3181,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3217,8 +3201,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3236,8 +3219,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -3249,8 +3231,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3271,8 +3252,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3287,8 +3267,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3312,8 +3291,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -3331,8 +3309,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -3355,8 +3332,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3371,8 +3347,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -3386,8 +3361,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3406,8 +3380,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "proc-macro2", "quote", @@ -3417,8 +3390,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3457,8 +3429,7 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7992f580ec52490178c5439ae5e23d2e539c7995f7db939f0aaba23262eb5085" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", diff --git a/Cargo.toml b/Cargo.toml index 5a322c09ba..38156d283f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,9 +104,12 @@ flate2 = "1.0.22" fs_extra = "1.2.0" futures = "0.3" git2 = { version = "0.18.1", default-features = false } -ibc = {version = "0.51.0", features = ["serde"]} -ibc-derive = "0.6.1" -ibc-testkit = {version = "0.51.0", default-features = false} +#ibc = {version = "0.51.0", features = ["serde"]} +#ibc-derive = "0.6.1" +#ibc-testkit = {version = "0.51.0", default-features = false} +ibc = {git = "https://github.com/cosmos/ibc-rs", rev = "f7a3c2b23f42977392b2f2ca908cc98d00765ff5", features = ["serde"]} +ibc-derive = {git = "https://github.com/cosmos/ibc-rs", rev = "f7a3c2b23f42977392b2f2ca908cc98d00765ff5"} +ibc-testkit = {git = "https://github.com/cosmos/ibc-rs", rev = "f7a3c2b23f42977392b2f2ca908cc98d00765ff5", default-features = false} ics23 = "0.11.0" index-set = { git = "https://github.com/heliaxdev/index-set", tag = "v0.8.1", features = ["serialize-borsh", "serialize-serde"] } indexmap = { git = "https://github.com/heliaxdev/indexmap", tag = "2.2.4-heliax-1", features = ["borsh-schema", "serde"] } diff --git a/crates/ibc/src/context/client.rs b/crates/ibc/src/context/client.rs index 1f95680f71..1be0dec9e9 100644 --- a/crates/ibc/src/context/client.rs +++ b/crates/ibc/src/context/client.rs @@ -386,6 +386,18 @@ where AnyClientState::Tendermint(cs) => cs.status(ctx, client_id), } } + + fn check_substitute( + &self, + ctx: &V, + substitute_client_state: Any, + ) -> Result<(), ClientError> { + match self { + AnyClientState::Tendermint(cs) => { + cs.check_substitute(ctx, substitute_client_state) + } + } + } } #[cfg(feature = "testing")] @@ -437,6 +449,21 @@ where AnyClientState::Mock(cs) => cs.status(ctx, client_id), } } + + fn check_substitute( + &self, + ctx: &V, + substitute_client_state: Any, + ) -> Result<(), ClientError> { + match self { + AnyClientState::Tendermint(cs) => { + cs.check_substitute(ctx, substitute_client_state) + } + AnyClientState::Mock(cs) => { + cs.check_substitute(ctx, substitute_client_state) + } + } + } } #[cfg(not(feature = "testing"))] @@ -502,6 +529,21 @@ where ), } } + + fn update_on_recovery( + &self, + ctx: &mut E, + subject_client_id: &ClientId, + substitute_client_state: Any, + ) -> Result<(), ClientError> { + match self { + AnyClientState::Tendermint(cs) => cs.update_on_recovery( + ctx, + subject_client_id, + substitute_client_state, + ), + } + } } #[cfg(feature = "testing")] @@ -581,4 +623,24 @@ where ), } } + + fn update_on_recovery( + &self, + ctx: &mut E, + subject_client_id: &ClientId, + substitute_client_state: Any, + ) -> Result<(), ClientError> { + match self { + AnyClientState::Tendermint(cs) => cs.update_on_recovery( + ctx, + subject_client_id, + substitute_client_state, + ), + AnyClientState::Mock(cs) => cs.update_on_recovery( + ctx, + subject_client_id, + substitute_client_state, + ), + } + } } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index e87a353d15..42adc2fc67 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -2386,8 +2386,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-apps", "ibc-clients", @@ -2400,8 +2399,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640bf8485d3b25ba08632438af56f334290387c13db9441ad5389936c1d8218e" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2411,8 +2409,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051c417a011a459080a58066a98f2c0b488171a8bf913af6a53bd34277f1b0b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -2432,8 +2429,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2443,8 +2439,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2458,8 +2453,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2468,8 +2462,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -2486,8 +2479,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2504,8 +2496,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "base64 0.21.7", "displaydoc", @@ -2519,8 +2510,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2529,8 +2519,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2546,8 +2535,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2562,8 +2550,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2586,8 +2573,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2600,8 +2586,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2617,8 +2602,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2638,8 +2622,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2657,8 +2640,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -2670,8 +2652,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2692,8 +2673,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2708,8 +2688,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2733,8 +2712,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2752,8 +2730,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2776,8 +2753,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2792,8 +2768,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2807,8 +2782,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2827,8 +2801,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "proc-macro2", "quote", @@ -2838,8 +2811,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2878,8 +2850,7 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7992f580ec52490178c5439ae5e23d2e539c7995f7db939f0aaba23262eb5085" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 330d95f411..682a3355c7 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -2386,8 +2386,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-apps", "ibc-clients", @@ -2400,8 +2399,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "640bf8485d3b25ba08632438af56f334290387c13db9441ad5389936c1d8218e" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2411,8 +2409,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051c417a011a459080a58066a98f2c0b488171a8bf913af6a53bd34277f1b0b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "base64 0.21.7", "borsh 0.10.3", @@ -2432,8 +2429,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2443,8 +2439,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2458,8 +2453,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2468,8 +2462,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -2486,8 +2479,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2504,8 +2496,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "base64 0.21.7", "displaydoc", @@ -2519,8 +2510,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2529,8 +2519,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2546,8 +2535,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2562,8 +2550,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2586,8 +2573,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2600,8 +2586,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2617,8 +2602,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2638,8 +2622,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2657,8 +2640,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -2670,8 +2652,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2692,8 +2673,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2708,8 +2688,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2733,8 +2712,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2752,8 +2730,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2776,8 +2753,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2792,8 +2768,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", @@ -2807,8 +2782,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2827,8 +2801,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "proc-macro2", "quote", @@ -2838,8 +2811,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2878,8 +2850,7 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7992f580ec52490178c5439ae5e23d2e539c7995f7db939f0aaba23262eb5085" +source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" dependencies = [ "derive_more", "displaydoc", From 5efcecf22dffc614eec47dc39b75b989bca1a667 Mon Sep 17 00:00:00 2001 From: yito88 Date: Tue, 9 Apr 2024 23:42:55 +0200 Subject: [PATCH 3/7] fix tests --- crates/tests/src/vm_host_env/ibc.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/tests/src/vm_host_env/ibc.rs b/crates/tests/src/vm_host_env/ibc.rs index 6bd322bb2f..3c995d43cb 100644 --- a/crates/tests/src/vm_host_env/ibc.rs +++ b/crates/tests/src/vm_host_env/ibc.rs @@ -344,7 +344,8 @@ fn dummy_client() -> (MockClientState, MockConsensusState) { // for a past block on the counterparty chain timestamp: (Timestamp::now() - Duration::from_secs(10)).unwrap(), }; - let client_state = MockClientState::new(header); + let client_state = MockClientState::new(header) + .with_trusting_period(Duration::from_secs(30)); let consensus_state = MockConsensusState::new(header); (client_state, consensus_state) From 16f61c7bd796b77f45083840885bf87cb0b8e1cc Mon Sep 17 00:00:00 2001 From: yito88 Date: Sat, 27 Apr 2024 00:06:53 +0200 Subject: [PATCH 4/7] ibc-rs 0.52.0 tendermint-rs 0.35 --- Cargo.lock | 549 ++++++++++++------ Cargo.toml | 23 +- .../src/lib/node/ledger/shell/testing/node.rs | 1 + crates/ibc/src/context/client.rs | 41 +- crates/ibc/src/context/common.rs | 3 +- crates/ibc/src/context/mod.rs | 6 +- crates/ibc/src/context/validation.rs | 7 +- crates/namada/src/ledger/native_vp/ibc/mod.rs | 4 +- crates/tests/src/e2e/ibc_tests.rs | 2 +- wasm/Cargo.lock | 444 ++++++++++---- wasm_for_tests/Cargo.lock | 442 ++++++++++---- 11 files changed, 1048 insertions(+), 474 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88291db754..7c8c502190 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,7 +43,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", ] @@ -381,7 +381,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object 0.32.1", @@ -418,6 +418,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.0.1" @@ -445,7 +451,7 @@ dependencies = [ "bitvec", "blake2s_simd", "byteorder", - "crossbeam-channel 0.5.12", + "crossbeam-channel", "ff", "group", "lazy_static", @@ -484,7 +490,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.11.0", "lazy_static", "lazycell", "proc-macro2", @@ -592,7 +598,7 @@ dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", - "cfg-if 1.0.0", + "cfg-if", "constant_time_eq", ] @@ -648,6 +654,12 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "bnum" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" + [[package]] name = "borsh" version = "0.10.3" @@ -888,12 +900,6 @@ dependencies = [ "nom 7.1.3", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -912,7 +918,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", ] @@ -1158,7 +1164,7 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5104de16b218eddf8e34ffe2f86f74bfa4e61e95a1b89732fccf6325efd0557" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "hex", "proptest", @@ -1220,12 +1226,81 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", ] +[[package]] +name = "cosmwasm-crypto" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b4c3f9c4616d6413d4b5fc4c270a4cc32a374b9be08671e80e1a019f805d8f" +dependencies = [ + "digest 0.10.7", + "ecdsa", + "ed25519-zebra", + "k256", + "rand_core 0.6.4", + "thiserror", +] + +[[package]] +name = "cosmwasm-derive" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c586ced10c3b00e809ee664a895025a024f60d65d34fe4c09daed4a4db68a3f3" +dependencies = [ + "syn 1.0.109", +] + +[[package]] +name = "cosmwasm-schema" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8467874827d384c131955ff6f4d47d02e72a956a08eb3c0ff24f8c903a5517b4" +dependencies = [ + "cosmwasm-schema-derive", + "schemars", + "serde 1.0.193", + "serde_json", + "thiserror", +] + +[[package]] +name = "cosmwasm-schema-derive" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6db85d98ac80922aef465e564d5b21fa9cfac5058cb62df7f116c3682337393" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmwasm-std" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712fe58f39d55c812f7b2c84e097cdede3a39d520f89b6dc3153837e31741927" +dependencies = [ + "base64 0.21.7", + "bech32 0.9.1", + "bnum", + "cosmwasm-crypto", + "cosmwasm-derive", + "derivative", + "forward_ref", + "hex", + "schemars", + "serde 1.0.193", + "serde-json-wasm 0.5.2", + "sha2 0.10.8", + "static_assertions", + "thiserror", +] + [[package]] name = "cpufeatures" version = "0.2.11" @@ -1300,7 +1375,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1339,23 +1414,13 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-channel" version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils", ] [[package]] @@ -1364,9 +1429,9 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", - "crossbeam-utils 0.8.19", + "crossbeam-utils", ] [[package]] @@ -1376,23 +1441,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.19", + "cfg-if", + "crossbeam-utils", "memoffset 0.9.0", "scopeguard", ] -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -1468,13 +1522,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "curve25519-dalek" version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", @@ -1509,6 +1576,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cw-storage-plus" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c" +dependencies = [ + "cosmwasm-std", + "schemars", + "serde 1.0.193", +] + [[package]] name = "darling" version = "0.20.3" @@ -1695,9 +1773,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.17" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "dynasm" @@ -1784,7 +1862,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 4.1.2", "ed25519", "serde 1.0.193", "sha2 0.10.8", @@ -1792,6 +1870,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +dependencies = [ + "curve25519-dalek 3.2.0", + "hashbrown 0.12.3", + "hex", + "rand_core 0.6.4", + "serde 1.0.193", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "either" version = "1.9.0" @@ -1824,7 +1917,7 @@ version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2282,7 +2375,7 @@ version = "3.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "rustix", "windows-sys 0.48.0", ] @@ -2310,7 +2403,7 @@ version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "windows-sys 0.52.0", @@ -2350,7 +2443,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b" dependencies = [ - "eyre", "paste", ] @@ -2384,6 +2476,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forward_ref" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" + [[package]] name = "fpe" version = "0.6.1" @@ -2554,7 +2652,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", @@ -2567,7 +2665,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -2844,9 +2942,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" dependencies = [ "bytes", "fnv", @@ -2964,8 +3062,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77899819613084813b296c25b94664ef1b694e360dcda859c6539b7be312800d" dependencies = [ "ibc-apps", "ibc-clients", @@ -2977,24 +3076,27 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c54d20d72ea072b055bfdffae600809dc9127be616a080d6b1c61a5d5771c15" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-nft-transfer-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5db8af24d777cddea22069ee11caabf532c0a5d8a78a109a79dfb9c3b667b3d" dependencies = [ "base64 0.21.7", "borsh 0.10.3", "derive_more", "displaydoc", - "http 1.1.0", + "http 1.0.0", + "ibc-app-transfer-types", "ibc-core", "ibc-proto", "mime", @@ -3002,46 +3104,70 @@ dependencies = [ "scale-info", "schemars", "serde 1.0.193", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f808c6d10accee3f1b786143c4bc3575743040882c153d63d1a99b8ddb4ba48" dependencies = [ "ibc-app-transfer-types", "ibc-core", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca9b5766ef8593521a7f89249fa47a059dc421464efc42e65e5a910c5a3e26dd" dependencies = [ + "borsh 0.10.3", "derive_more", "displaydoc", "ibc-core", "ibc-proto", + "parity-scale-codec", "primitive-types", + "scale-info", + "schemars", "serde 1.0.193", "uint", ] [[package]] name = "ibc-apps" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fea66502b68c3e9787f1e972711dd5e2c53d209d263303cd443ce0d8f715507" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", ] +[[package]] +name = "ibc-client-cw" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970c87e7a8ae27b5d63f4dc9212aba47966f5f569536528c60013c43d0d3f028" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "derive_more", + "ibc-client-wasm-types", + "ibc-core", + "prost 0.12.3", + "serde 1.0.193", +] + [[package]] name = "ibc-client-tendermint" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1596a61bd932a81921d3b0339af4d48d338e08dcf6a8133084a2bf6e5e40c5c" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -3055,10 +3181,23 @@ dependencies = [ "tendermint-light-client-verifier", ] +[[package]] +name = "ibc-client-tendermint-cw" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c5843e6fb5c9ecfafd2c4e79f618d449d95837e2c62ab21debb149dace9d2b" +dependencies = [ + "cosmwasm-std", + "ibc-client-cw", + "ibc-client-tendermint", + "ibc-core", +] + [[package]] name = "ibc-client-tendermint-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6beec2755f1a0c1f12b9aebd1c12dd12323bc6c67d2aff14c4c3cdd6c90798e6" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -3074,10 +3213,12 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5055ed514b42a00f0f10af0aa57a1dcae141a84ed903ede39c52f154f3cb54b4" dependencies = [ "base64 0.21.7", + "cosmwasm-schema", "displaydoc", "ibc-core-client", "ibc-core-host-types", @@ -3088,8 +3229,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d936313372f811c9168ea64f816dc35b84eb408b1edcfaed40af52869250e88f" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3097,8 +3239,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10ff88fd5e9bf2548f6bf4bee44fc27e7ae33978ef301db13b853d6a9d63d7f" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3113,8 +3256,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba8757f313753f98f1d81746a644f6460e429c4df32df94269c4664a86a58e46" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -3128,8 +3272,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8017de3542cc82af54deec0a29717d967fe3c1a6d7b7a80648dad8fa038dd730" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3151,8 +3296,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119fb1b49223fe710a125e29af61081499f8fca76e2bfd55e5ed613c8e51b31a" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -3164,8 +3310,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1d8eb140289b7907a1f7490612cb3e559a9c0c626b88d32c5967828607c9f4" dependencies = [ "derive_more", "displaydoc", @@ -3180,8 +3327,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832b88028bf7e746d613a49164418210b2adfac68694964717d8e4b2179f8abc" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3200,8 +3348,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d76a67b31a86daa9108af29943de93553e9bf3c4a755735871d8eaaee1e5bc" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3218,8 +3367,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b93f8705a670389c577d44982bd98df08c9d21668af24963d3b325f91074" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -3230,8 +3380,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5ea65690f0dde0e4ccee035dc65d3fd70e4c690e4cce4141e0722e288a01aa" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3251,8 +3402,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8826a3b9ccd481b3c5d73bfe7b698bfc0ccb6ef657459f3700cf056196d2391" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3266,8 +3418,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7840bda3079c822461efa7cf35f08049292fe69e26dd82ed01e94468a4832a" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3290,8 +3443,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193d03a019722dbcb840b80d78186b3099ca211b89f688189df7e2b5c808dbd5" dependencies = [ "derive_more", "displaydoc", @@ -3308,8 +3462,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "274df08714ef159c0e6d0747a50150706953331b728c96bf108540b268ed97c7" dependencies = [ "derive_more", "displaydoc", @@ -3331,8 +3486,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190732c993c27964d50a051e09e4df92c814112351606f5e648f137e377253d6" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3346,8 +3502,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "424e5e18dbed8bf113fc0f50f5276af908589b120e933d1db5485d9028dfc6dd" dependencies = [ "derive_more", "displaydoc", @@ -3360,8 +3517,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2fe7a64c4e6819b3ea209cfe747f8152523f36d73d4bfdaebfd5cb9f18fa0e" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3379,8 +3537,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d961d2194fd5229961835d2eb78091906ef8afbaaa55bce7ad41bf3ead8aa9" dependencies = [ "proc-macro2", "quote", @@ -3389,8 +3548,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e4b7970505c22113b1a074f582d3f8f6ffcbeed4b1ab5d4590048471def235" dependencies = [ "borsh 0.10.3", "derive_more", @@ -3407,11 +3567,11 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.42.2" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" +checksum = "af781637b107aa33042426c9d17b181ced05ae97b1d88dba50f40f19ad44e36f" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "borsh 0.10.3", "bytes", "flex-error", @@ -3428,12 +3588,15 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bf2fd531c1ca786f69501d6a86df05e80d1c2c5529ee0ebe854b255ec83905" dependencies = [ "derive_more", "displaydoc", "ibc", + "ibc-client-cw", + "ibc-client-tendermint-cw", "ibc-proto", "parking_lot", "subtle-encoding", @@ -3616,7 +3779,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3726,11 +3889,11 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", "once_cell", @@ -3811,7 +3974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45ba81a1f5f24396b37211478aff7fbcd605dd4544df8dbed07b9da3c2057aee" dependencies = [ "byteorder", - "cfg-if 1.0.0", + "cfg-if", "hex", "hidapi", "ledger-transport", @@ -3840,7 +4003,7 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec 0.5.2", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "ryu", "static_assertions", ] @@ -3869,7 +4032,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] @@ -3944,18 +4107,18 @@ dependencies = [ [[package]] name = "linkme" -version = "0.3.25" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" +checksum = "7ca16377a6dae364fb00769699ba440899f1a720d4f5abf2667d0a8a95f933dd" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.25" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" +checksum = "1e5ac81de04bf8215501c50a436632c3789b22ef1625fe0bf8927dd4ba3696c5" dependencies = [ "proc-macro2", "quote", @@ -4109,12 +4272,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.6.4" @@ -5001,7 +5158,7 @@ dependencies = [ "namada_gas", "namada_macros", "namada_migrations", - "num-derive", + "num-derive 0.3.3", "num-traits 0.2.17", "proptest", "prost 0.12.3", @@ -5126,7 +5283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.7.1", "pin-utils", @@ -5264,6 +5421,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -5336,7 +5504,7 @@ checksum = "aa9b5179e82f0867b23e0b9b822493821f9345561f271364f409c8e4a058367d" dependencies = [ "lazy_static", "num 0.4.1", - "num-derive", + "num-derive 0.3.3", "num-traits 0.2.17", "serde 1.0.193", "serde_derive", @@ -5450,7 +5618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.5.0", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -5568,7 +5736,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -5656,9 +5824,9 @@ dependencies = [ [[package]] name = "peg" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" dependencies = [ "peg-macros", "peg-runtime", @@ -5666,9 +5834,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" dependencies = [ "peg-runtime", "proc-macro2", @@ -5677,9 +5845,9 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "pem" @@ -6229,7 +6397,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.19", + "crossbeam-utils", ] [[package]] @@ -6674,7 +6842,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "derive_more", "parity-scale-codec", "scale-info-derive", @@ -6869,6 +7037,15 @@ dependencies = [ "serde 0.8.23", ] +[[package]] +name = "serde-json-wasm" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7" +dependencies = [ + "serde 1.0.193", +] + [[package]] name = "serde-json-wasm" version = "1.0.1" @@ -6990,7 +7167,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -7014,7 +7191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -7026,7 +7203,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -7093,9 +7270,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple-error" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc47a29ce97772ca5c927f75bac34866b16d64e07f330c3248e2d7226623901b" +checksum = "8542b68b8800c3cda649d2c72d688b6907b30f1580043135d61669d4aad1c175" [[package]] name = "simple_asn1" @@ -7182,7 +7359,7 @@ source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=bab8cb96872db2 dependencies = [ "blake2b-rs", "borsh 1.2.1", - "cfg-if 1.0.0", + "cfg-if", "ics23", "itertools 0.12.1", "sha2 0.9.9", @@ -7345,7 +7522,7 @@ version = "0.27.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys", "libc", "ntapi", @@ -7403,7 +7580,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "redox_syscall", "rustix", @@ -7412,9 +7589,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" +checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" dependencies = [ "bytes", "digest 0.10.7", @@ -7443,26 +7620,26 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a25dbe8b953e80f3d61789fbdb83bf9ad6c0ef16df5ca6546f49912542cc137" +checksum = "ac6bf36c613bb113737c333e3c1d6dfd3c99f8ac679e84feb58dd6456d77fb2e" dependencies = [ "flex-error", "serde 1.0.193", "serde_json", "tendermint", - "toml 0.5.11", + "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94aecbdccbc4b557649b2d1b1a4bfc27ec85205e00fb8020fce044245a4c9e3f" +checksum = "240dbb4b281ab279aa6537bd5000ccf6c8e17d9a076d2af5d27766452c7efb16" dependencies = [ "contracts", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "derive_more", "flex-error", "futures", @@ -7482,9 +7659,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74994da9de4b1144837a367ca2c60c650f5526a7c1a54760a3020959b522e474" +checksum = "35678b66e819659617c2e83f9662b8544425694441990c07137904a07872d871" dependencies = [ "derive_more", "flex-error", @@ -7495,13 +7672,13 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc728a4f9e891d71adf66af6ecaece146f9c7a11312288a3107b3e1d6979aaf" +checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" dependencies = [ "bytes", "flex-error", - "num-derive", + "num-derive 0.4.2", "num-traits 0.2.17", "prost 0.12.3", "prost-types 0.12.3", @@ -7513,9 +7690,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbf0a4753b46a190f367337e0163d0b552a2674a6bac54e74f9f2cdcde2969b" +checksum = "2d8fe61b1772cd50038bdeeadf53773bb37a09e639dd8e6d996668fd220ddb29" dependencies = [ "async-trait", "bytes", @@ -7524,6 +7701,7 @@ dependencies = [ "getrandom 0.2.11", "peg", "pin-project", + "rand 0.8.5", "reqwest", "semver 1.0.20", "serde 1.0.193", @@ -7539,15 +7717,15 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 0.8.2", + "uuid 1.8.0", "walkdir", ] [[package]] name = "tendermint-testgen" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19d4f02b7e38ce790da973fdc9edc71a0e35340ac57737bf278c8379037c1f5" +checksum = "9921053646fe51d03ebd0c642871b734e2f28437233529d4aa6fbff5e477e924" dependencies = [ "ed25519-consensus 2.1.0", "gumdrop", @@ -7612,7 +7790,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -7966,9 +8144,8 @@ dependencies = [ [[package]] name = "tower-abci" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4826f3df3e9a37083d978cae73f020bcdf6143956b7dfc1bd6050b4e16367c" +version = "0.12.0" +source = "git+https://github.com/penumbra-zone/tower-abci.git?rev=4b7306578b93a4def9d76abae8e2a46c8ee6952f#4b7306578b93a4def9d76abae8e2a46c8ee6952f" dependencies = [ "bytes", "futures", @@ -8013,7 +8190,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ - "crossbeam-channel 0.5.12", + "crossbeam-channel", "thiserror", "time", "tracing-subscriber", @@ -8391,7 +8568,7 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -8416,7 +8593,7 @@ version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -8474,7 +8651,7 @@ name = "wasmer" version = "2.3.0" source = "git+https://github.com/heliaxdev/wasmer?rev=255054f7f58b7b4a525f2fee6b9b86422d1ca15b#255054f7f58b7b4a525f2fee6b9b86422d1ca15b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "indexmap 1.9.3", "js-sys", "loupe", @@ -8612,7 +8789,7 @@ name = "wasmer-engine-dylib" version = "2.3.0" source = "git+https://github.com/heliaxdev/wasmer?rev=255054f7f58b7b4a525f2fee6b9b86422d1ca15b#255054f7f58b7b4a525f2fee6b9b86422d1ca15b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "leb128", @@ -8637,7 +8814,7 @@ name = "wasmer-engine-universal" version = "2.3.0" source = "git+https://github.com/heliaxdev/wasmer?rev=255054f7f58b7b4a525f2fee6b9b86422d1ca15b#255054f7f58b7b4a525f2fee6b9b86422d1ca15b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "enumset", "leb128", "loupe", @@ -8698,7 +8875,7 @@ source = "git+https://github.com/heliaxdev/wasmer?rev=255054f7f58b7b4a525f2fee6b dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "enum-iterator", "indexmap 1.9.3", @@ -9093,7 +9270,7 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-sys 0.48.0", ] diff --git a/Cargo.toml b/Cargo.toml index 38156d283f..51f7fda6f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,12 +104,9 @@ flate2 = "1.0.22" fs_extra = "1.2.0" futures = "0.3" git2 = { version = "0.18.1", default-features = false } -#ibc = {version = "0.51.0", features = ["serde"]} -#ibc-derive = "0.6.1" -#ibc-testkit = {version = "0.51.0", default-features = false} -ibc = {git = "https://github.com/cosmos/ibc-rs", rev = "f7a3c2b23f42977392b2f2ca908cc98d00765ff5", features = ["serde"]} -ibc-derive = {git = "https://github.com/cosmos/ibc-rs", rev = "f7a3c2b23f42977392b2f2ca908cc98d00765ff5"} -ibc-testkit = {git = "https://github.com/cosmos/ibc-rs", rev = "f7a3c2b23f42977392b2f2ca908cc98d00765ff5", default-features = false} +ibc = {version = "0.52.0", features = ["serde"]} +ibc-derive = "0.7.0" +ibc-testkit = {version = "0.52.0", default-features = false} ics23 = "0.11.0" index-set = { git = "https://github.com/heliaxdev/index-set", tag = "v0.8.1", features = ["serialize-borsh", "serialize-serde"] } indexmap = { git = "https://github.com/heliaxdev/indexmap", tag = "2.2.4-heliax-1", features = ["borsh-schema", "serde"] } @@ -161,11 +158,11 @@ slip10_ed25519 = "0.1.3" sysinfo = {version = "0.27.8", default-features = false} tar = "0.4.37" tempfile = {version = "3.2.0"} -tendermint = {version = "0.34.0", features = ["secp256k1"]} -tendermint-config = "0.34.0" -tendermint-light-client = "0.34.0" -tendermint-proto = "0.34.0" -tendermint-rpc = {version = "0.34.0", default-features = false} +tendermint = {version = "0.35.0", features = ["secp256k1"]} +tendermint-config = "0.35.0" +tendermint-light-client = "0.35.0" +tendermint-proto = "0.35.0" +tendermint-rpc = {version = "0.35.0", default-features = false} test-log = {version = "0.2.14", default-features = false, features = ["trace"]} tiny-bip39 = {git = "https://github.com/anoma/tiny-bip39.git", rev = "bf0f6d8713589b83af7a917366ec31f5275c0e57"} tiny-hderive = "0.3.0" @@ -178,7 +175,9 @@ tonic = "0.8.3" tonic-build = "0.8.4" tower = "0.4" # Also, using the same version of tendermint-rs as we do here. -tower-abci = "0.11.1" +# for tendermint-rs v0.35 +#tower-abci = "0.11.1" +tower-abci = {git = "https://github.com/penumbra-zone/tower-abci.git", rev = "4b7306578b93a4def9d76abae8e2a46c8ee6952f"} tracing = "0.1.30" tracing-appender = "0.2.2" tracing-log = "0.1.2" diff --git a/crates/apps/src/lib/node/ledger/shell/testing/node.rs b/crates/apps/src/lib/node/ledger/shell/testing/node.rs index 21887b98de..3bcefeef19 100644 --- a/crates/apps/src/lib/node/ledger/shell/testing/node.rs +++ b/crates/apps/src/lib/node/ledger/shell/testing/node.rs @@ -768,6 +768,7 @@ impl<'a> Client for &'a MockNode { { self.drive_mock_services_bg().await; let mut resp = tendermint_rpc::endpoint::broadcast::tx_sync::Response { + codespace: Default::default(), code: Default::default(), data: Default::default(), log: Default::default(), diff --git a/crates/ibc/src/context/client.rs b/crates/ibc/src/context/client.rs index 1be0dec9e9..87d48283c6 100644 --- a/crates/ibc/src/context/client.rs +++ b/crates/ibc/src/context/client.rs @@ -11,11 +11,6 @@ use ibc_testkit::testapp::ibc::clients::mock::client_state::MockClientState; use ibc_testkit::testapp::ibc::clients::mock::consensus_state::MockConsensusState; use namada_core::ibc::clients::tendermint::client_state::ClientState as TmClientState; use namada_core::ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState; -use namada_core::ibc::clients::tendermint::context::{ - ConsensusStateConverter as TmConsensusStateConverter, - ExecutionContext as TmExecutionContext, - ValidationContext as TmValidationContext, -}; use namada_core::ibc::clients::tendermint::types::{ ClientState as TmClientStateType, ConsensusState as TmConsensusStateType, }; @@ -23,7 +18,8 @@ use namada_core::ibc::core::client::context::client_state::{ ClientStateCommon, ClientStateExecution, ClientStateValidation, }; use namada_core::ibc::core::client::context::{ - ClientExecutionContext, ClientValidationContext, + ClientExecutionContext, ClientValidationContext, Convertible, + ExtClientExecutionContext, ExtClientValidationContext, }; use namada_core::ibc::core::client::types::error::ClientError; use namada_core::ibc::core::client::types::{Height, Status}; @@ -204,6 +200,16 @@ impl TryFrom for MockConsensusState { } } +impl From for Any { + fn from(consensus_state: AnyConsensusState) -> Self { + match consensus_state { + AnyConsensusState::Tendermint(cs) => cs.into(), + #[cfg(feature = "testing")] + AnyConsensusState::Mock(cs) => cs.into(), + } + } +} + impl TryFrom for AnyConsensusState { type Error = ClientError; @@ -347,9 +353,9 @@ impl ClientStateCommon for AnyClientState { #[cfg(not(feature = "testing"))] impl ClientStateValidation for AnyClientState where - V: ClientValidationContext + TmValidationContext, + V: ExtClientValidationContext, ::ConsensusStateRef: - TmConsensusStateConverter, + Convertible, { fn verify_client_message( &self, @@ -403,9 +409,10 @@ where #[cfg(feature = "testing")] impl ClientStateValidation for AnyClientState where - V: ClientValidationContext + TmValidationContext + MockClientContext, + V: ExtClientValidationContext + MockClientContext, ::ConsensusStateRef: - TmConsensusStateConverter + MockConsensusStateConverter, + Convertible + + MockConsensusStateConverter, { fn verify_client_message( &self, @@ -469,9 +476,9 @@ where #[cfg(not(feature = "testing"))] impl ClientStateExecution for AnyClientState where - E: ClientExecutionContext + TmExecutionContext, + E: ExtClientExecutionContext, ::ConsensusStateRef: - TmConsensusStateConverter, + Convertible, ::ClientStateMut: From, { fn initialise( @@ -535,12 +542,14 @@ where ctx: &mut E, subject_client_id: &ClientId, substitute_client_state: Any, + substitute_consensus_state: Any, ) -> Result<(), ClientError> { match self { AnyClientState::Tendermint(cs) => cs.update_on_recovery( ctx, subject_client_id, substitute_client_state, + substitute_consensus_state, ), } } @@ -549,9 +558,10 @@ where #[cfg(feature = "testing")] impl ClientStateExecution for AnyClientState where - E: ClientExecutionContext + TmExecutionContext + MockClientContext, + E: ExtClientExecutionContext + MockClientContext, ::ConsensusStateRef: - TmConsensusStateConverter + MockConsensusStateConverter, + Convertible + + MockConsensusStateConverter, ::ClientStateMut: From + From, { @@ -629,17 +639,20 @@ where ctx: &mut E, subject_client_id: &ClientId, substitute_client_state: Any, + substitute_consensus_state: Any, ) -> Result<(), ClientError> { match self { AnyClientState::Tendermint(cs) => cs.update_on_recovery( ctx, subject_client_id, substitute_client_state, + substitute_consensus_state, ), AnyClientState::Mock(cs) => cs.update_on_recovery( ctx, subject_client_id, substitute_client_state, + substitute_consensus_state, ), } } diff --git a/crates/ibc/src/context/common.rs b/crates/ibc/src/context/common.rs index aa5daba0c1..6bd82c86ed 100644 --- a/crates/ibc/src/context/common.rs +++ b/crates/ibc/src/context/common.rs @@ -15,7 +15,6 @@ use namada_core::ibc::core::channel::types::error::{ }; use namada_core::ibc::core::channel::types::packet::Receipt; use namada_core::ibc::core::channel::types::timeout::TimeoutHeight; -use namada_core::ibc::core::client::context::consensus_state::ConsensusState; use namada_core::ibc::core::client::types::error::ClientError; use namada_core::ibc::core::client::types::Height; use namada_core::ibc::core::connection::types::error::ConnectionError; @@ -103,7 +102,7 @@ pub trait IbcCommonContext: IbcStorageContext { consensus_state: AnyConsensusState, ) -> Result<()> { let key = storage::consensus_state_key(client_id, height); - let bytes = consensus_state.encode_vec(); + let bytes = Any::from(consensus_state).encode_to_vec(); self.write_bytes(&key, bytes).map_err(ContextError::from) } diff --git a/crates/ibc/src/context/mod.rs b/crates/ibc/src/context/mod.rs index 159fc37e12..be3190813e 100644 --- a/crates/ibc/src/context/mod.rs +++ b/crates/ibc/src/context/mod.rs @@ -63,8 +63,10 @@ impl Default for ValidationParams { fn default() -> Self { Self { chain_id: IbcChainId::new("non-init-chain") - .expect("Convert the default chain ID shouldn't fail"), - proof_specs: proof_specs::().into(), + .expect("Converting the default chain ID shouldn't fail"), + proof_specs: proof_specs::() + .try_into() + .expect("Converting the proof specs shouldn't fail"), unbonding_period: Duration::default(), upgrade_path: Vec::default(), } diff --git a/crates/ibc/src/context/validation.rs b/crates/ibc/src/context/validation.rs index d17191063c..e063ccc772 100644 --- a/crates/ibc/src/context/validation.rs +++ b/crates/ibc/src/context/validation.rs @@ -3,13 +3,14 @@ #[cfg(feature = "testing")] use ibc_testkit::testapp::ibc::clients::mock::client_state::MockClientState; use namada_core::ibc::clients::tendermint::client_state::ClientState as TmClientState; -use namada_core::ibc::clients::tendermint::context::ValidationContext as TmValidationContext; use namada_core::ibc::core::channel::types::channel::ChannelEnd; use namada_core::ibc::core::channel::types::commitment::{ AcknowledgementCommitment, PacketCommitment, }; use namada_core::ibc::core::channel::types::packet::Receipt; -use namada_core::ibc::core::client::context::ClientValidationContext; +use namada_core::ibc::core::client::context::{ + ClientValidationContext, ExtClientValidationContext, +}; use namada_core::ibc::core::client::types::Height; use namada_core::ibc::core::commitment_types::commitment::CommitmentPrefix; use namada_core::ibc::core::commitment_types::specs::ProofSpecs; @@ -33,7 +34,7 @@ use crate::storage; const COMMITMENT_PREFIX: &[u8] = b"ibc"; -impl TmValidationContext for IbcContext +impl ExtClientValidationContext for IbcContext where C: IbcCommonContext, { diff --git a/crates/namada/src/ledger/native_vp/ibc/mod.rs b/crates/namada/src/ledger/native_vp/ibc/mod.rs index 3826c428f5..769ef40134 100644 --- a/crates/namada/src/ledger/native_vp/ibc/mod.rs +++ b/crates/namada/src/ledger/native_vp/ibc/mod.rs @@ -193,7 +193,9 @@ where Ok(ValidationParams { chain_id: IbcChainId::from_str(&chain_id) .map_err(ActionError::ChainId)?, - proof_specs: proof_specs.into(), + proof_specs: proof_specs + .try_into() + .expect("Converting the proof specs shouldn't fail"), unbonding_period: Duration::from_secs(unbonding_period_secs), upgrade_path: Vec::new(), }) diff --git a/crates/tests/src/e2e/ibc_tests.rs b/crates/tests/src/e2e/ibc_tests.rs index 093b13582f..eb24fb7fad 100644 --- a/crates/tests/src/e2e/ibc_tests.rs +++ b/crates/tests/src/e2e/ibc_tests.rs @@ -953,7 +953,7 @@ fn make_client_state(test: &Test, height: Height) -> TmClientState { Duration::from_secs(unbonding_period), max_clock_drift, height, - ibc_proof_specs::().into(), + ibc_proof_specs::().try_into().unwrap(), vec![], AllowUpdate { after_expiry: true, diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 42adc2fc67..0de7c6c570 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -313,6 +313,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.0.1" @@ -499,6 +505,12 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "bnum" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" + [[package]] name = "borsh" version = "0.10.3" @@ -939,6 +951,75 @@ dependencies = [ "windows-sys 0.33.0", ] +[[package]] +name = "cosmwasm-crypto" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b4c3f9c4616d6413d4b5fc4c270a4cc32a374b9be08671e80e1a019f805d8f" +dependencies = [ + "digest 0.10.7", + "ecdsa", + "ed25519-zebra", + "k256", + "rand_core 0.6.4", + "thiserror", +] + +[[package]] +name = "cosmwasm-derive" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c586ced10c3b00e809ee664a895025a024f60d65d34fe4c09daed4a4db68a3f3" +dependencies = [ + "syn 1.0.109", +] + +[[package]] +name = "cosmwasm-schema" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8467874827d384c131955ff6f4d47d02e72a956a08eb3c0ff24f8c903a5517b4" +dependencies = [ + "cosmwasm-schema-derive", + "schemars", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cosmwasm-schema-derive" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6db85d98ac80922aef465e564d5b21fa9cfac5058cb62df7f116c3682337393" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmwasm-std" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712fe58f39d55c812f7b2c84e097cdede3a39d520f89b6dc3153837e31741927" +dependencies = [ + "base64 0.21.7", + "bech32 0.9.1", + "bnum", + "cosmwasm-crypto", + "cosmwasm-derive", + "derivative", + "forward_ref", + "hex", + "schemars", + "serde", + "serde-json-wasm 0.5.2", + "sha2 0.10.8", + "static_assertions", + "thiserror", +] + [[package]] name = "cpufeatures" version = "0.2.11" @@ -1018,12 +1099,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] @@ -1034,7 +1114,7 @@ checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.16", + "crossbeam-utils", ] [[package]] @@ -1045,30 +1125,16 @@ checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", + "crossbeam-utils", "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1133,6 +1199,19 @@ dependencies = [ "cipher", ] +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -1146,6 +1225,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cw-storage-plus" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c" +dependencies = [ + "cosmwasm-std", + "schemars", + "serde", +] + [[package]] name = "darling" version = "0.20.3" @@ -1385,6 +1475,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +dependencies = [ + "curve25519-dalek", + "hashbrown 0.12.3", + "hex", + "rand_core 0.6.4", + "serde", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "either" version = "1.9.0" @@ -1882,7 +1987,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b" dependencies = [ - "eyre", "paste", ] @@ -1901,6 +2005,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forward_ref" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" + [[package]] name = "fpe" version = "0.6.1" @@ -2385,8 +2495,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77899819613084813b296c25b94664ef1b694e360dcda859c6539b7be312800d" dependencies = [ "ibc-apps", "ibc-clients", @@ -2398,24 +2509,27 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c54d20d72ea072b055bfdffae600809dc9127be616a080d6b1c61a5d5771c15" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-nft-transfer-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5db8af24d777cddea22069ee11caabf532c0a5d8a78a109a79dfb9c3b667b3d" dependencies = [ "base64 0.21.7", "borsh 0.10.3", "derive_more", "displaydoc", "http 1.0.0", + "ibc-app-transfer-types", "ibc-core", "ibc-proto", "mime", @@ -2423,46 +2537,70 @@ dependencies = [ "scale-info", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f808c6d10accee3f1b786143c4bc3575743040882c153d63d1a99b8ddb4ba48" dependencies = [ "ibc-app-transfer-types", "ibc-core", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca9b5766ef8593521a7f89249fa47a059dc421464efc42e65e5a910c5a3e26dd" dependencies = [ + "borsh 0.10.3", "derive_more", "displaydoc", "ibc-core", "ibc-proto", + "parity-scale-codec", "primitive-types", + "scale-info", + "schemars", "serde", "uint", ] [[package]] name = "ibc-apps" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fea66502b68c3e9787f1e972711dd5e2c53d209d263303cd443ce0d8f715507" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", ] +[[package]] +name = "ibc-client-cw" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970c87e7a8ae27b5d63f4dc9212aba47966f5f569536528c60013c43d0d3f028" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "derive_more", + "ibc-client-wasm-types", + "ibc-core", + "prost 0.12.3", + "serde", +] + [[package]] name = "ibc-client-tendermint" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1596a61bd932a81921d3b0339af4d48d338e08dcf6a8133084a2bf6e5e40c5c" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -2476,10 +2614,23 @@ dependencies = [ "tendermint-light-client-verifier", ] +[[package]] +name = "ibc-client-tendermint-cw" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c5843e6fb5c9ecfafd2c4e79f618d449d95837e2c62ab21debb149dace9d2b" +dependencies = [ + "cosmwasm-std", + "ibc-client-cw", + "ibc-client-tendermint", + "ibc-core", +] + [[package]] name = "ibc-client-tendermint-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6beec2755f1a0c1f12b9aebd1c12dd12323bc6c67d2aff14c4c3cdd6c90798e6" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2495,10 +2646,12 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5055ed514b42a00f0f10af0aa57a1dcae141a84ed903ede39c52f154f3cb54b4" dependencies = [ "base64 0.21.7", + "cosmwasm-schema", "displaydoc", "ibc-core-client", "ibc-core-host-types", @@ -2509,8 +2662,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d936313372f811c9168ea64f816dc35b84eb408b1edcfaed40af52869250e88f" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2518,8 +2672,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10ff88fd5e9bf2548f6bf4bee44fc27e7ae33978ef301db13b853d6a9d63d7f" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2534,8 +2689,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba8757f313753f98f1d81746a644f6460e429c4df32df94269c4664a86a58e46" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2549,8 +2705,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8017de3542cc82af54deec0a29717d967fe3c1a6d7b7a80648dad8fa038dd730" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2572,8 +2729,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119fb1b49223fe710a125e29af61081499f8fca76e2bfd55e5ed613c8e51b31a" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2585,8 +2743,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1d8eb140289b7907a1f7490612cb3e559a9c0c626b88d32c5967828607c9f4" dependencies = [ "derive_more", "displaydoc", @@ -2601,8 +2760,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832b88028bf7e746d613a49164418210b2adfac68694964717d8e4b2179f8abc" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2621,8 +2781,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d76a67b31a86daa9108af29943de93553e9bf3c4a755735871d8eaaee1e5bc" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2639,8 +2800,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b93f8705a670389c577d44982bd98df08c9d21668af24963d3b325f91074" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -2651,8 +2813,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5ea65690f0dde0e4ccee035dc65d3fd70e4c690e4cce4141e0722e288a01aa" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2672,8 +2835,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8826a3b9ccd481b3c5d73bfe7b698bfc0ccb6ef657459f3700cf056196d2391" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2687,8 +2851,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7840bda3079c822461efa7cf35f08049292fe69e26dd82ed01e94468a4832a" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2711,8 +2876,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193d03a019722dbcb840b80d78186b3099ca211b89f688189df7e2b5c808dbd5" dependencies = [ "derive_more", "displaydoc", @@ -2729,8 +2895,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "274df08714ef159c0e6d0747a50150706953331b728c96bf108540b268ed97c7" dependencies = [ "derive_more", "displaydoc", @@ -2752,8 +2919,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190732c993c27964d50a051e09e4df92c814112351606f5e648f137e377253d6" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2767,8 +2935,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "424e5e18dbed8bf113fc0f50f5276af908589b120e933d1db5485d9028dfc6dd" dependencies = [ "derive_more", "displaydoc", @@ -2781,8 +2950,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2fe7a64c4e6819b3ea209cfe747f8152523f36d73d4bfdaebfd5cb9f18fa0e" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2800,8 +2970,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d961d2194fd5229961835d2eb78091906ef8afbaaa55bce7ad41bf3ead8aa9" dependencies = [ "proc-macro2", "quote", @@ -2810,8 +2981,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e4b7970505c22113b1a074f582d3f8f6ffcbeed4b1ab5d4590048471def235" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2828,11 +3000,11 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.42.2" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" +checksum = "af781637b107aa33042426c9d17b181ced05ae97b1d88dba50f40f19ad44e36f" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "borsh 0.10.3", "bytes", "flex-error", @@ -2849,12 +3021,15 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bf2fd531c1ca786f69501d6a86df05e80d1c2c5529ee0ebe854b255ec83905" dependencies = [ "derive_more", "displaydoc", "ibc", + "ibc-client-cw", + "ibc-client-tendermint-cw", "ibc-proto", "parking_lot", "subtle-encoding", @@ -3127,9 +3302,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if 1.0.0", "ecdsa", @@ -3357,12 +3532,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.6.4" @@ -3983,7 +4152,7 @@ dependencies = [ "namada_gas", "namada_macros", "namada_migrations", - "num-derive", + "num-derive 0.3.3", "num-traits", "proptest", "prost 0.12.3", @@ -4167,6 +4336,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -4230,7 +4410,7 @@ checksum = "aa9b5179e82f0867b23e0b9b822493821f9345561f271364f409c8e4a058367d" dependencies = [ "lazy_static", "num 0.4.1", - "num-derive", + "num-derive 0.3.3", "num-traits", "serde", "serde_derive", @@ -4261,7 +4441,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.52", @@ -4500,9 +4680,9 @@ dependencies = [ [[package]] name = "peg" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" dependencies = [ "peg-macros", "peg-runtime", @@ -4510,9 +4690,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" dependencies = [ "peg-runtime", "proc-macro2", @@ -4521,9 +4701,9 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "pem" @@ -4986,7 +5166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.16", + "crossbeam-utils", ] [[package]] @@ -5218,7 +5398,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.6.1", + "uuid 1.8.0", ] [[package]] @@ -5565,6 +5745,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-json-wasm" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7" +dependencies = [ + "serde", +] + [[package]] name = "serde-json-wasm" version = "1.0.1" @@ -5750,9 +5939,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple-error" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc47a29ce97772ca5c927f75bac34866b16d64e07f330c3248e2d7226623901b" +checksum = "8542b68b8800c3cda649d2c72d688b6907b30f1580043135d61669d4aad1c175" [[package]] name = "simple_asn1" @@ -6015,9 +6204,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" +checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" dependencies = [ "bytes", "digest 0.10.7", @@ -6046,23 +6235,23 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a25dbe8b953e80f3d61789fbdb83bf9ad6c0ef16df5ca6546f49912542cc137" +checksum = "ac6bf36c613bb113737c333e3c1d6dfd3c99f8ac679e84feb58dd6456d77fb2e" dependencies = [ "flex-error", "serde", "serde_json", "tendermint", - "toml 0.5.11", + "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94aecbdccbc4b557649b2d1b1a4bfc27ec85205e00fb8020fce044245a4c9e3f" +checksum = "240dbb4b281ab279aa6537bd5000ccf6c8e17d9a076d2af5d27766452c7efb16" dependencies = [ "contracts", "crossbeam-channel", @@ -6085,9 +6274,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74994da9de4b1144837a367ca2c60c650f5526a7c1a54760a3020959b522e474" +checksum = "35678b66e819659617c2e83f9662b8544425694441990c07137904a07872d871" dependencies = [ "derive_more", "flex-error", @@ -6098,13 +6287,13 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc728a4f9e891d71adf66af6ecaece146f9c7a11312288a3107b3e1d6979aaf" +checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" dependencies = [ "bytes", "flex-error", - "num-derive", + "num-derive 0.4.2", "num-traits", "prost 0.12.3", "prost-types 0.12.3", @@ -6116,9 +6305,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbf0a4753b46a190f367337e0163d0b552a2674a6bac54e74f9f2cdcde2969b" +checksum = "2d8fe61b1772cd50038bdeeadf53773bb37a09e639dd8e6d996668fd220ddb29" dependencies = [ "async-trait", "bytes", @@ -6127,6 +6316,7 @@ dependencies = [ "getrandom 0.2.11", "peg", "pin-project", + "rand 0.8.5", "reqwest", "semver 1.0.20", "serde", @@ -6142,15 +6332,15 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 0.8.2", + "uuid 1.8.0", "walkdir", ] [[package]] name = "tendermint-testgen" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19d4f02b7e38ce790da973fdc9edc71a0e35340ac57737bf278c8379037c1f5" +checksum = "9921053646fe51d03ebd0c642871b734e2f28437233529d4aa6fbff5e477e924" dependencies = [ "ed25519-consensus 2.1.0", "gumdrop", @@ -6870,9 +7060,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "version_check" diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 682a3355c7..3ad8efdc4c 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -313,6 +313,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.0.1" @@ -499,6 +505,12 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "bnum" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" + [[package]] name = "borsh" version = "0.10.3" @@ -939,6 +951,75 @@ dependencies = [ "windows-sys 0.33.0", ] +[[package]] +name = "cosmwasm-crypto" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b4c3f9c4616d6413d4b5fc4c270a4cc32a374b9be08671e80e1a019f805d8f" +dependencies = [ + "digest 0.10.7", + "ecdsa", + "ed25519-zebra", + "k256", + "rand_core 0.6.4", + "thiserror", +] + +[[package]] +name = "cosmwasm-derive" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c586ced10c3b00e809ee664a895025a024f60d65d34fe4c09daed4a4db68a3f3" +dependencies = [ + "syn 1.0.109", +] + +[[package]] +name = "cosmwasm-schema" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8467874827d384c131955ff6f4d47d02e72a956a08eb3c0ff24f8c903a5517b4" +dependencies = [ + "cosmwasm-schema-derive", + "schemars", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cosmwasm-schema-derive" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6db85d98ac80922aef465e564d5b21fa9cfac5058cb62df7f116c3682337393" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmwasm-std" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712fe58f39d55c812f7b2c84e097cdede3a39d520f89b6dc3153837e31741927" +dependencies = [ + "base64 0.21.7", + "bech32 0.9.1", + "bnum", + "cosmwasm-crypto", + "cosmwasm-derive", + "derivative", + "forward_ref", + "hex", + "schemars", + "serde", + "serde-json-wasm 0.5.2", + "sha2 0.10.8", + "static_assertions", + "thiserror", +] + [[package]] name = "cpufeatures" version = "0.2.11" @@ -1018,12 +1099,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] @@ -1034,7 +1114,7 @@ checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.16", + "crossbeam-utils", ] [[package]] @@ -1045,30 +1125,16 @@ checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", + "crossbeam-utils", "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1133,6 +1199,19 @@ dependencies = [ "cipher", ] +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -1146,6 +1225,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cw-storage-plus" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c" +dependencies = [ + "cosmwasm-std", + "schemars", + "serde", +] + [[package]] name = "darling" version = "0.20.3" @@ -1385,6 +1475,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +dependencies = [ + "curve25519-dalek", + "hashbrown 0.12.3", + "hex", + "rand_core 0.6.4", + "serde", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "either" version = "1.9.0" @@ -1882,7 +1987,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b" dependencies = [ - "eyre", "paste", ] @@ -1901,6 +2005,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forward_ref" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" + [[package]] name = "fpe" version = "0.6.1" @@ -2385,8 +2495,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77899819613084813b296c25b94664ef1b694e360dcda859c6539b7be312800d" dependencies = [ "ibc-apps", "ibc-clients", @@ -2398,24 +2509,27 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c54d20d72ea072b055bfdffae600809dc9127be616a080d6b1c61a5d5771c15" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-nft-transfer-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5db8af24d777cddea22069ee11caabf532c0a5d8a78a109a79dfb9c3b667b3d" dependencies = [ "base64 0.21.7", "borsh 0.10.3", "derive_more", "displaydoc", "http 1.0.0", + "ibc-app-transfer-types", "ibc-core", "ibc-proto", "mime", @@ -2423,46 +2537,70 @@ dependencies = [ "scale-info", "schemars", "serde", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f808c6d10accee3f1b786143c4bc3575743040882c153d63d1a99b8ddb4ba48" dependencies = [ "ibc-app-transfer-types", "ibc-core", - "serde-json-wasm", + "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca9b5766ef8593521a7f89249fa47a059dc421464efc42e65e5a910c5a3e26dd" dependencies = [ + "borsh 0.10.3", "derive_more", "displaydoc", "ibc-core", "ibc-proto", + "parity-scale-codec", "primitive-types", + "scale-info", + "schemars", "serde", "uint", ] [[package]] name = "ibc-apps" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fea66502b68c3e9787f1e972711dd5e2c53d209d263303cd443ce0d8f715507" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", ] +[[package]] +name = "ibc-client-cw" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970c87e7a8ae27b5d63f4dc9212aba47966f5f569536528c60013c43d0d3f028" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "derive_more", + "ibc-client-wasm-types", + "ibc-core", + "prost 0.12.3", + "serde", +] + [[package]] name = "ibc-client-tendermint" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1596a61bd932a81921d3b0339af4d48d338e08dcf6a8133084a2bf6e5e40c5c" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -2476,10 +2614,23 @@ dependencies = [ "tendermint-light-client-verifier", ] +[[package]] +name = "ibc-client-tendermint-cw" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c5843e6fb5c9ecfafd2c4e79f618d449d95837e2c62ab21debb149dace9d2b" +dependencies = [ + "cosmwasm-std", + "ibc-client-cw", + "ibc-client-tendermint", + "ibc-core", +] + [[package]] name = "ibc-client-tendermint-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6beec2755f1a0c1f12b9aebd1c12dd12323bc6c67d2aff14c4c3cdd6c90798e6" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2495,10 +2646,12 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5055ed514b42a00f0f10af0aa57a1dcae141a84ed903ede39c52f154f3cb54b4" dependencies = [ "base64 0.21.7", + "cosmwasm-schema", "displaydoc", "ibc-core-client", "ibc-core-host-types", @@ -2509,8 +2662,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d936313372f811c9168ea64f816dc35b84eb408b1edcfaed40af52869250e88f" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2518,8 +2672,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10ff88fd5e9bf2548f6bf4bee44fc27e7ae33978ef301db13b853d6a9d63d7f" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2534,8 +2689,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba8757f313753f98f1d81746a644f6460e429c4df32df94269c4664a86a58e46" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2549,8 +2705,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8017de3542cc82af54deec0a29717d967fe3c1a6d7b7a80648dad8fa038dd730" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2572,8 +2729,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119fb1b49223fe710a125e29af61081499f8fca76e2bfd55e5ed613c8e51b31a" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2585,8 +2743,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1d8eb140289b7907a1f7490612cb3e559a9c0c626b88d32c5967828607c9f4" dependencies = [ "derive_more", "displaydoc", @@ -2601,8 +2760,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832b88028bf7e746d613a49164418210b2adfac68694964717d8e4b2179f8abc" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2621,8 +2781,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d76a67b31a86daa9108af29943de93553e9bf3c4a755735871d8eaaee1e5bc" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2639,8 +2800,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b93f8705a670389c577d44982bd98df08c9d21668af24963d3b325f91074" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -2651,8 +2813,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5ea65690f0dde0e4ccee035dc65d3fd70e4c690e4cce4141e0722e288a01aa" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2672,8 +2835,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8826a3b9ccd481b3c5d73bfe7b698bfc0ccb6ef657459f3700cf056196d2391" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2687,8 +2851,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7840bda3079c822461efa7cf35f08049292fe69e26dd82ed01e94468a4832a" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2711,8 +2876,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193d03a019722dbcb840b80d78186b3099ca211b89f688189df7e2b5c808dbd5" dependencies = [ "derive_more", "displaydoc", @@ -2729,8 +2895,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "274df08714ef159c0e6d0747a50150706953331b728c96bf108540b268ed97c7" dependencies = [ "derive_more", "displaydoc", @@ -2752,8 +2919,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190732c993c27964d50a051e09e4df92c814112351606f5e648f137e377253d6" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2767,8 +2935,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "424e5e18dbed8bf113fc0f50f5276af908589b120e933d1db5485d9028dfc6dd" dependencies = [ "derive_more", "displaydoc", @@ -2781,8 +2950,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2fe7a64c4e6819b3ea209cfe747f8152523f36d73d4bfdaebfd5cb9f18fa0e" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2800,8 +2970,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d961d2194fd5229961835d2eb78091906ef8afbaaa55bce7ad41bf3ead8aa9" dependencies = [ "proc-macro2", "quote", @@ -2810,8 +2981,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e4b7970505c22113b1a074f582d3f8f6ffcbeed4b1ab5d4590048471def235" dependencies = [ "borsh 0.10.3", "derive_more", @@ -2828,11 +3000,11 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.42.2" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" +checksum = "af781637b107aa33042426c9d17b181ced05ae97b1d88dba50f40f19ad44e36f" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "borsh 0.10.3", "bytes", "flex-error", @@ -2849,12 +3021,15 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.51.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=f7a3c2b23f42977392b2f2ca908cc98d00765ff5#f7a3c2b23f42977392b2f2ca908cc98d00765ff5" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bf2fd531c1ca786f69501d6a86df05e80d1c2c5529ee0ebe854b255ec83905" dependencies = [ "derive_more", "displaydoc", "ibc", + "ibc-client-cw", + "ibc-client-tendermint-cw", "ibc-proto", "parking_lot", "subtle-encoding", @@ -3127,9 +3302,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if 1.0.0", "ecdsa", @@ -3337,12 +3512,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.6.4" @@ -3931,7 +4100,7 @@ dependencies = [ "namada_core", "namada_gas", "namada_macros", - "num-derive", + "num-derive 0.3.3", "num-traits", "proptest", "prost 0.12.3", @@ -4113,6 +4282,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -4176,7 +4356,7 @@ checksum = "aa9b5179e82f0867b23e0b9b822493821f9345561f271364f409c8e4a058367d" dependencies = [ "lazy_static", "num 0.4.1", - "num-derive", + "num-derive 0.3.3", "num-traits", "serde", "serde_derive", @@ -4446,9 +4626,9 @@ dependencies = [ [[package]] name = "peg" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" dependencies = [ "peg-macros", "peg-runtime", @@ -4456,9 +4636,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" dependencies = [ "peg-runtime", "proc-macro2", @@ -4467,9 +4647,9 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "pem" @@ -4924,7 +5104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.16", + "crossbeam-utils", ] [[package]] @@ -5156,7 +5336,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.6.1", + "uuid 1.8.0", ] [[package]] @@ -5503,6 +5683,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-json-wasm" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7" +dependencies = [ + "serde", +] + [[package]] name = "serde-json-wasm" version = "1.0.1" @@ -5688,9 +5877,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple-error" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc47a29ce97772ca5c927f75bac34866b16d64e07f330c3248e2d7226623901b" +checksum = "8542b68b8800c3cda649d2c72d688b6907b30f1580043135d61669d4aad1c175" [[package]] name = "simple_asn1" @@ -5953,9 +6142,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" +checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" dependencies = [ "bytes", "digest 0.10.7", @@ -5984,23 +6173,23 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a25dbe8b953e80f3d61789fbdb83bf9ad6c0ef16df5ca6546f49912542cc137" +checksum = "ac6bf36c613bb113737c333e3c1d6dfd3c99f8ac679e84feb58dd6456d77fb2e" dependencies = [ "flex-error", "serde", "serde_json", "tendermint", - "toml 0.5.11", + "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94aecbdccbc4b557649b2d1b1a4bfc27ec85205e00fb8020fce044245a4c9e3f" +checksum = "240dbb4b281ab279aa6537bd5000ccf6c8e17d9a076d2af5d27766452c7efb16" dependencies = [ "contracts", "crossbeam-channel", @@ -6023,9 +6212,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74994da9de4b1144837a367ca2c60c650f5526a7c1a54760a3020959b522e474" +checksum = "35678b66e819659617c2e83f9662b8544425694441990c07137904a07872d871" dependencies = [ "derive_more", "flex-error", @@ -6036,13 +6225,13 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc728a4f9e891d71adf66af6ecaece146f9c7a11312288a3107b3e1d6979aaf" +checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" dependencies = [ "bytes", "flex-error", - "num-derive", + "num-derive 0.4.2", "num-traits", "prost 0.12.3", "prost-types 0.12.3", @@ -6054,9 +6243,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbf0a4753b46a190f367337e0163d0b552a2674a6bac54e74f9f2cdcde2969b" +checksum = "2d8fe61b1772cd50038bdeeadf53773bb37a09e639dd8e6d996668fd220ddb29" dependencies = [ "async-trait", "bytes", @@ -6065,6 +6254,7 @@ dependencies = [ "getrandom 0.2.11", "peg", "pin-project", + "rand 0.8.5", "reqwest", "semver 1.0.20", "serde", @@ -6080,15 +6270,15 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 0.8.2", + "uuid 1.8.0", "walkdir", ] [[package]] name = "tendermint-testgen" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19d4f02b7e38ce790da973fdc9edc71a0e35340ac57737bf278c8379037c1f5" +checksum = "9921053646fe51d03ebd0c642871b734e2f28437233529d4aa6fbff5e477e924" dependencies = [ "ed25519-consensus 2.1.0", "gumdrop", @@ -6735,9 +6925,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "version_check" From e6461981b691b80fca158c79284e3a081827d30b Mon Sep 17 00:00:00 2001 From: yito88 Date: Mon, 29 Apr 2024 17:09:31 +0200 Subject: [PATCH 5/7] fix unit tests --- crates/core/src/ibc.rs | 3 +++ crates/namada/src/ledger/native_vp/ibc/mod.rs | 25 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/crates/core/src/ibc.rs b/crates/core/src/ibc.rs index 1b880b779d..7daacb631a 100644 --- a/crates/core/src/ibc.rs +++ b/crates/core/src/ibc.rs @@ -358,6 +358,9 @@ impl TryFrom for IbcEvent { /// Returns the trace path and the token string if the denom is an IBC /// denom. pub fn is_ibc_denom(denom: impl AsRef) -> Option<(TracePath, String)> { + if is_nft_trace(denom.as_ref()).is_some() { + return None; + } let prefixed_denom = PrefixedDenom::from_str(denom.as_ref()).ok()?; if prefixed_denom.trace_path.is_empty() { return None; diff --git a/crates/namada/src/ledger/native_vp/ibc/mod.rs b/crates/namada/src/ledger/native_vp/ibc/mod.rs index 769ef40134..5e2f4906d7 100644 --- a/crates/namada/src/ledger/native_vp/ibc/mod.rs +++ b/crates/namada/src/ledger/native_vp/ibc/mod.rs @@ -867,7 +867,30 @@ mod tests { let client_counter_key = client_counter_key(); increment_counter(&mut state, &client_counter_key); keys_changed.insert(client_counter_key); - + // client update time + let client_update_time_key = client_update_timestamp_key(&client_id); + let time = StateRead::get_block_header(&state, None) + .unwrap() + .0 + .unwrap() + .time; + let bytes = TmTime::try_from(time).unwrap().encode_vec(); + state + .write_log_mut() + .write(&client_update_time_key, bytes) + .expect("write failed"); + keys_changed.insert(client_update_time_key); + // client update height + let client_update_height_key = client_update_height_key(&client_id); + let host_height = state.in_mem().get_block_height().0; + let host_height = + Height::new(0, host_height.0).expect("invalid height"); + state + .write_log_mut() + .write(&client_update_height_key, host_height.encode_vec()) + .expect("write failed"); + keys_changed.insert(client_update_height_key); + // event let event = RawIbcEvent::CreateClient(CreateClient::new( client_id, client_type(), From 1360956b0059dda46586e0f14354e1d5a6fc5883 Mon Sep 17 00:00:00 2001 From: yito88 Date: Mon, 29 Apr 2024 21:31:31 +0200 Subject: [PATCH 6/7] fix is_ibc_denom --- .../unreleased/bug-fixes/3011-fix-ibc-client-frozen.md | 2 ++ crates/core/src/ibc.rs | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .changelog/unreleased/bug-fixes/3011-fix-ibc-client-frozen.md diff --git a/.changelog/unreleased/bug-fixes/3011-fix-ibc-client-frozen.md b/.changelog/unreleased/bug-fixes/3011-fix-ibc-client-frozen.md new file mode 100644 index 0000000000..accf06a884 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/3011-fix-ibc-client-frozen.md @@ -0,0 +1,2 @@ +- Resolved the frozen IBC client issue by updating ibc-rs to 0.52 + ([\#3011](https://github.com/anoma/namada/issues/3011)) \ No newline at end of file diff --git a/crates/core/src/ibc.rs b/crates/core/src/ibc.rs index 7daacb631a..1a75b2a04b 100644 --- a/crates/core/src/ibc.rs +++ b/crates/core/src/ibc.rs @@ -358,11 +358,11 @@ impl TryFrom for IbcEvent { /// Returns the trace path and the token string if the denom is an IBC /// denom. pub fn is_ibc_denom(denom: impl AsRef) -> Option<(TracePath, String)> { - if is_nft_trace(denom.as_ref()).is_some() { - return None; - } let prefixed_denom = PrefixedDenom::from_str(denom.as_ref()).ok()?; - if prefixed_denom.trace_path.is_empty() { + if prefixed_denom.trace_path.is_empty() + || prefixed_denom.base_denom.to_string().contains('/') + { + // The denom is just a token or an NFT trace return None; } // The base token isn't decoded because it could be non Namada token From babaeabe57334f981a20149ce37a5fac925efbe1 Mon Sep 17 00:00:00 2001 From: yito88 Date: Thu, 2 May 2024 17:29:37 +0200 Subject: [PATCH 7/7] reuse base_denom --- crates/core/src/ibc.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/crates/core/src/ibc.rs b/crates/core/src/ibc.rs index 1a75b2a04b..e43c9b2b43 100644 --- a/crates/core/src/ibc.rs +++ b/crates/core/src/ibc.rs @@ -359,17 +359,13 @@ impl TryFrom for IbcEvent { /// denom. pub fn is_ibc_denom(denom: impl AsRef) -> Option<(TracePath, String)> { let prefixed_denom = PrefixedDenom::from_str(denom.as_ref()).ok()?; - if prefixed_denom.trace_path.is_empty() - || prefixed_denom.base_denom.to_string().contains('/') - { + let base_denom = prefixed_denom.base_denom.to_string(); + if prefixed_denom.trace_path.is_empty() || base_denom.contains('/') { // The denom is just a token or an NFT trace return None; } // The base token isn't decoded because it could be non Namada token - Some(( - prefixed_denom.trace_path, - prefixed_denom.base_denom.to_string(), - )) + Some((prefixed_denom.trace_path, base_denom)) } /// Returns the trace path and the token string if the trace is an NFT one