From 69fd0937066725590cdb3e691379580f9ad09f93 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Thu, 29 Feb 2024 07:17:20 -0800 Subject: [PATCH 1/7] chore: track ibc-rs PR1097 (#165) --- Cargo.lock | 55 ++++++++++++++++--------------- Cargo.toml | 4 +-- basecoin/modules/src/ibc/impls.rs | 8 ++++- 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 851f875d..3f82f955 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1037,7 +1037,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-apps", "ibc-clients", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1074,7 +1074,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-app-transfer", ] @@ -1082,8 +1082,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ + "derive_more", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -1098,7 +1099,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1115,7 +1116,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "base64", "displaydoc", @@ -1129,7 +1130,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1138,7 +1139,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1154,7 +1155,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1169,7 +1170,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1188,7 +1189,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1201,7 +1202,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1217,7 +1218,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1233,7 +1234,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1247,7 +1248,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1259,7 +1260,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1276,7 +1277,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1291,7 +1292,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1311,7 +1312,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1329,7 +1330,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1352,7 +1353,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1363,7 +1364,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1377,7 +1378,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1392,7 +1393,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "proc-macro2", "quote", @@ -1402,7 +1403,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "derive_more", "displaydoc", @@ -1434,7 +1435,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c" +source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" dependencies = [ "displaydoc", "ibc", diff --git a/Cargo.toml b/Cargo.toml index 497f4a66..09b036fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,8 @@ tracing = "0.1.26" tracing-subscriber = "0.3.16" # ibc dependencies -ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] } -ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false } +ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4ebe5fe", default-features = false, features = ["serde"] } +ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4ebe5fe", default-features = false } ibc-proto = { version = "0.41.0", default-features = false } ics23 = { version = "0.11", default-features = false } diff --git a/basecoin/modules/src/ibc/impls.rs b/basecoin/modules/src/ibc/impls.rs index 1c476d4d..edb4ed63 100644 --- a/basecoin/modules/src/ibc/impls.rs +++ b/basecoin/modules/src/ibc/impls.rs @@ -75,6 +75,12 @@ pub enum AnyConsensusState { Tendermint(TmConsensusState), } +impl From for AnyConsensusState { + fn from(value: ConsensusStateType) -> Self { + AnyConsensusState::Tendermint(value.into()) + } +} + impl From for Any { fn from(value: AnyConsensusState) -> Self { match value { @@ -733,7 +739,7 @@ where &self, client_id: &ClientId, ) -> Result, ContextError> { - let client_connection_path = ClientConnectionPath::new(client_id); + let client_connection_path = ClientConnectionPath::new(client_id.clone()); Ok(self .connection_ids_store From 5b6dd745736d3cdabbede338ce9175d9befff337 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Fri, 8 Mar 2024 09:31:04 -0800 Subject: [PATCH 2/7] chore: track ibc-rs PR1115 (#166) * chore: track changes in ibc-rs PR 1115 * chore: bring on par with 79b8d70 * chore: sort methods * commit from main branch * rm redundant import * define bounds in one place * use std in basecoin modules * use core in basecoin-store except sync * update lockfile --------- Co-authored-by: Ranadeep Biswas --- Cargo.lock | 351 ++++++++++---------- Cargo.toml | 4 +- basecoin/app/src/abci/v0_38/tendermint.rs | 1 - basecoin/app/src/service.rs | 2 - basecoin/modules/src/auth/account.rs | 2 - basecoin/modules/src/bank/impls.rs | 1 - basecoin/modules/src/ibc/client_contexts.rs | 70 ++-- basecoin/modules/src/ibc/impls.rs | 83 ++--- basecoin/modules/src/ibc/transfer.rs | 2 +- basecoin/modules/src/upgrade/impls.rs | 6 +- basecoin/store/src/avl/node.rs | 6 +- basecoin/store/src/avl/tests.rs | 2 +- basecoin/store/src/avl/tree.rs | 29 +- basecoin/store/src/context.rs | 2 +- basecoin/store/src/impls/shared.rs | 2 +- basecoin/store/src/types/height.rs | 4 +- basecoin/store/src/types/identifier.rs | 6 +- basecoin/store/src/types/path.rs | 6 +- basecoin/store/src/types/store.rs | 4 +- basecoin/store/src/utils/codec.rs | 2 +- 20 files changed, 289 insertions(+), 296 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f82f955..9cc3bf29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayref" @@ -102,7 +102,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -113,7 +113,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "byteorder" @@ -380,12 +380,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -395,9 +392,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.0" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -405,9 +402,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.0" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -425,7 +422,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -608,7 +605,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -808,7 +805,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -894,7 +891,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.2", + "indexmap 2.2.5", "slab", "tokio", "tokio-util 0.7.10", @@ -931,9 +928,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -952,9 +949,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1037,7 +1034,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-apps", "ibc-clients", @@ -1050,7 +1047,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1060,7 +1057,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1074,7 +1071,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-app-transfer", ] @@ -1082,7 +1079,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1099,7 +1096,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1116,7 +1113,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "base64", "displaydoc", @@ -1130,7 +1127,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1139,7 +1136,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1155,7 +1152,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1170,7 +1167,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1189,7 +1186,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1202,7 +1199,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1218,7 +1215,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1234,7 +1231,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1248,7 +1245,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1260,7 +1257,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1277,7 +1274,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1292,7 +1289,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1312,7 +1309,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1330,7 +1327,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1353,7 +1350,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1364,7 +1361,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1378,7 +1375,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1393,17 +1390,17 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "ibc-primitives" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "derive_more", "displaydoc", @@ -1435,7 +1432,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4ebe5fe#4ebe5fe7458bc983301443772ea31b5af60dac66" +source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" dependencies = [ "displaydoc", "ibc", @@ -1499,9 +1496,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1540,9 +1537,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1598,9 +1595,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "matchit" @@ -1631,9 +1628,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -1650,6 +1647,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -1697,9 +1700,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl-probe" @@ -1744,9 +1747,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[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", @@ -1754,9 +1757,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", @@ -1765,9 +1768,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 = "percent-encoding" @@ -1777,22 +1780,22 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1869,7 +1872,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1982,16 +1985,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2073,9 +2077,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -2150,15 +2154,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -2183,20 +2187,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2211,7 +2215,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2314,12 +2318,12 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2384,9 +2388,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -2422,9 +2426,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" +checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b" dependencies = [ "bytes", "digest 0.10.7", @@ -2453,9 +2457,9 @@ dependencies = [ [[package]] name = "tendermint-abci" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642e4ee4af1bb8f8facac4641e74270c4f58a04375fccf3fcc56f23f58e20656" +checksum = "715c41dec864b693237ff73edc0698bd4f53dd779e13f2180702234f609c144d" dependencies = [ "bytes", "flex-error", @@ -2466,9 +2470,9 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a25dbe8b953e80f3d61789fbdb83bf9ad6c0ef16df5ca6546f49912542cc137" +checksum = "e1a02da769166e2052cd537b1a97c78017632c2d9e19266367b27e73910434fc" dependencies = [ "flex-error", "serde", @@ -2480,9 +2484,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74994da9de4b1144837a367ca2c60c650f5526a7c1a54760a3020959b522e474" +checksum = "9b8090d0eef9ad57b1b913b5e358e26145c86017e87338136509b94383a4af25" dependencies = [ "derive_more", "flex-error", @@ -2493,9 +2497,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc728a4f9e891d71adf66af6ecaece146f9c7a11312288a3107b3e1d6979aaf" +checksum = "b797dd3d2beaaee91d2f065e7bdf239dc8d80bba4a183a288bc1279dd5a69a1e" dependencies = [ "bytes", "flex-error", @@ -2511,9 +2515,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.34.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbf0a4753b46a190f367337e0163d0b552a2674a6bac54e74f9f2cdcde2969b" +checksum = "71afae8bb5f6b14ed48d4e1316a643b6c2c3cbad114f510be77b4ed20b7b3e42" dependencies = [ "async-trait", "bytes", @@ -2522,6 +2526,7 @@ dependencies = [ "getrandom", "peg", "pin-project", + "rand", "reqwest", "semver", "serde", @@ -2553,29 +2558,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2583,11 +2588,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", + "num-conv", "powerfmt", "serde", "time-core", @@ -2602,10 +2608,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -2661,7 +2668,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2745,11 +2752,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.2.2", + "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", @@ -2868,7 +2875,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2944,9 +2951,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -2976,9 +2983,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "0.8.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "valuable" @@ -2994,9 +3001,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3019,9 +3026,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3029,24 +3036,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3056,9 +3063,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3066,28 +3073,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3139,7 +3146,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -3159,17 +3166,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -3180,9 +3187,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -3192,9 +3199,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -3204,9 +3211,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -3216,9 +3223,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -3228,9 +3235,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -3240,9 +3247,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -3252,15 +3259,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.39" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -3292,5 +3299,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] diff --git a/Cargo.toml b/Cargo.toml index 09b036fa..3c67a754 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,8 @@ tracing = "0.1.26" tracing-subscriber = "0.3.16" # ibc dependencies -ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4ebe5fe", default-features = false, features = ["serde"] } -ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4ebe5fe", default-features = false } +ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4f0ab6a", default-features = false, features = ["serde"] } +ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4f0ab6a", default-features = false } ibc-proto = { version = "0.41.0", default-features = false } ics23 = { version = "0.11", default-features = false } diff --git a/basecoin/app/src/abci/v0_38/tendermint.rs b/basecoin/app/src/abci/v0_38/tendermint.rs index dbe396ad..7f7f5ad6 100644 --- a/basecoin/app/src/abci/v0_38/tendermint.rs +++ b/basecoin/app/src/abci/v0_38/tendermint.rs @@ -1,4 +1,3 @@ -use std::convert::TryInto; use std::fmt::Debug; use basecoin_modules::error::Error; diff --git a/basecoin/app/src/service.rs b/basecoin/app/src/service.rs index 16843b4d..b7eb0739 100644 --- a/basecoin/app/src/service.rs +++ b/basecoin/app/src/service.rs @@ -1,5 +1,3 @@ -use std::convert::TryInto; - use basecoin_store::context::ProvableStore; use cosmrs::Tx; use ibc_proto::cosmos::base::tendermint::v1beta1::service_server::Service as HealthService; diff --git a/basecoin/modules/src/auth/account.rs b/basecoin/modules/src/auth/account.rs index efda7f22..32dcb534 100644 --- a/basecoin/modules/src/auth/account.rs +++ b/basecoin/modules/src/auth/account.rs @@ -1,5 +1,3 @@ -use std::convert::{TryFrom, TryInto}; - use basecoin_store::types::Path; use cosmrs::AccountId; use ibc_proto::cosmos::auth::v1beta1::BaseAccount; diff --git a/basecoin/modules/src/bank/impls.rs b/basecoin/modules/src/bank/impls.rs index 3abf5d7a..e71f881c 100644 --- a/basecoin/modules/src/bank/impls.rs +++ b/basecoin/modules/src/bank/impls.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -use std::convert::TryInto; use std::fmt::Debug; use std::str::FromStr; diff --git a/basecoin/modules/src/ibc/client_contexts.rs b/basecoin/modules/src/ibc/client_contexts.rs index 50c800b3..aa888c4c 100644 --- a/basecoin/modules/src/ibc/client_contexts.rs +++ b/basecoin/modules/src/ibc/client_contexts.rs @@ -4,7 +4,9 @@ use basecoin_store::context::Store; use basecoin_store::types::Height; use ibc::clients::tendermint::client_state::ClientState as TmClientState; use ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState; -use ibc::clients::tendermint::context::{CommonContext, ValidationContext as TmValidationContext}; +use ibc::clients::tendermint::context::{ + ConsensusStateConverter, ValidationContext as TmValidationContext, +}; use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext}; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as IbcHeight; @@ -20,9 +22,41 @@ impl ClientValidationContext for IbcContext where S: Store + Debug, { + type ClientStateRef = TmClientState; + type ConsensusStateRef = AnyConsensusState; + + fn client_state(&self, client_id: &ClientId) -> Result { + Ok(self + .client_state_store + .get(Height::Pending, &ClientStatePath(client_id.clone())) + .ok_or(ClientError::ClientStateNotFound { + client_id: client_id.clone(), + })?) + } + + fn consensus_state( + &self, + client_cons_state_path: &ClientConsensusStatePath, + ) -> Result { + let height = IbcHeight::new( + client_cons_state_path.revision_number, + client_cons_state_path.revision_height, + ) + .map_err(|_| ClientError::InvalidHeight)?; + let consensus_state = self + .consensus_state_store + .get(Height::Pending, client_cons_state_path) + .ok_or(ClientError::ConsensusStateNotFound { + client_id: client_cons_state_path.client_id.clone(), + height, + })?; + + Ok(consensus_state.into()) + } + /// Returns the time and height when the client state for the given /// [`ClientId`] was updated with a header for the given [`IbcHeight`] - fn update_meta( + fn client_update_meta( &self, client_id: &ClientId, height: &IbcHeight, @@ -51,17 +85,13 @@ impl ClientExecutionContext for IbcContext where S: Store + Debug, { - type V = Self; - - type AnyClientState = TmClientState; - - type AnyConsensusState = AnyConsensusState; + type ClientStateMut = TmClientState; /// Called upon successful client creation and update fn store_client_state( &mut self, client_state_path: ClientStatePath, - client_state: Self::AnyClientState, + client_state: Self::ClientStateMut, ) -> Result<(), ContextError> { self.client_state_store .set(client_state_path, client_state) @@ -76,7 +106,7 @@ where fn store_consensus_state( &mut self, consensus_state_path: ClientConsensusStatePath, - consensus_state: Self::AnyConsensusState, + consensus_state: Self::ConsensusStateRef, ) -> Result<(), ContextError> { let tm_consensus_state: TmConsensusState = consensus_state.try_into().map_err(|_| ClientError::Other { @@ -129,13 +159,11 @@ where } } -impl CommonContext for IbcContext +impl TmValidationContext for IbcContext where S: Store + Debug, + Self::ConsensusStateRef: ConsensusStateConverter, { - type ConversionError = &'static str; - type AnyConsensusState = AnyConsensusState; - fn host_timestamp(&self) -> Result { ValidationContext::host_timestamp(self) } @@ -144,13 +172,6 @@ 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, @@ -180,17 +201,12 @@ where }) .collect() } -} -impl TmValidationContext for IbcContext -where - S: Store + Debug, -{ fn next_consensus_state( &self, client_id: &ClientId, height: &IbcHeight, - ) -> Result, ContextError> { + ) -> Result, ContextError> { let path = format!("clients/{client_id}/consensusStates") .try_into() .unwrap(); // safety - path must be valid since ClientId and height are valid Identifiers @@ -224,7 +240,7 @@ where &self, client_id: &ClientId, height: &IbcHeight, - ) -> Result, ContextError> { + ) -> Result, ContextError> { let path = format!("clients/{client_id}/consensusStates") .try_into() .unwrap(); // safety - path must be valid since ClientId and height are valid Identifiers diff --git a/basecoin/modules/src/ibc/impls.rs b/basecoin/modules/src/ibc/impls.rs index edb4ed63..a0680696 100644 --- a/basecoin/modules/src/ibc/impls.rs +++ b/basecoin/modules/src/ibc/impls.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -use std::convert::{TryFrom, TryInto}; use std::fmt::Debug; use std::ops::Deref; use std::sync::{Arc, RwLock}; @@ -21,7 +20,6 @@ use ibc::core::channel::types::channel::{ChannelEnd, IdentifiedChannelEnd}; use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment}; use ibc::core::channel::types::error::{ChannelError, PacketError}; use ibc::core::channel::types::packet::{PacketState, Receipt}; -use ibc::core::client::context::consensus_state::ConsensusState as _; use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as IbcHeight; use ibc::core::commitment_types::commitment::{CommitmentPrefix, CommitmentRoot}; @@ -38,7 +36,7 @@ use ibc::core::host::types::path::{ CommitmentPath, ConnectionPath, Path as IbcPath, ReceiptPath, SeqAckPath, SeqRecvPath, SeqSendPath, }; -use ibc::core::host::{ExecutionContext, ValidationContext}; +use ibc::core::host::{ClientStateRef, ConsensusStateRef, ExecutionContext, ValidationContext}; use ibc::cosmos_host::IBC_QUERY_PATH; use ibc::derive::ConsensusState; use ibc::primitives::{Signer, Timestamp}; @@ -81,6 +79,18 @@ impl From for AnyConsensusState { } } +impl TryFrom for ConsensusStateType { + type Error = ClientError; + + fn try_from(value: AnyConsensusState) -> Result { + match value { + AnyConsensusState::Tendermint(tm_consensus_state) => { + Ok(tm_consensus_state.inner().clone()) + } + } + } +} + impl From for Any { fn from(value: AnyConsensusState) -> Self { match value { @@ -375,41 +385,11 @@ where S: Store + Debug, { type V = Self; - type E = Self; - type AnyConsensusState = AnyConsensusState; - type AnyClientState = TmClientState; - - fn client_state(&self, client_id: &ClientId) -> Result { - Ok(self - .client_state_store - .get(Height::Pending, &ClientStatePath(client_id.clone())) - .ok_or(ClientError::ClientStateNotFound { - client_id: client_id.clone(), - })?) - } - - fn decode_client_state(&self, client_state: Any) -> Result { - Ok(TmClientState::try_from(client_state)?) - } - - fn consensus_state( - &self, - client_cons_state_path: &ClientConsensusStatePath, - ) -> Result { - let height = IbcHeight::new( - client_cons_state_path.revision_number, - client_cons_state_path.revision_height, - ) - .map_err(|_| ClientError::InvalidHeight)?; - let consensus_state = self - .consensus_state_store - .get(Height::Pending, client_cons_state_path) - .ok_or(ClientError::ConsensusStateNotFound { - client_id: client_cons_state_path.client_id.clone(), - height, - })?; + type HostClientState = TmClientState; + type HostConsensusState = TmConsensusState; - Ok(consensus_state.into()) + fn get_client_validation_context(&self) -> &Self::V { + self } fn host_height(&self) -> Result { @@ -422,19 +402,19 @@ where fn host_timestamp(&self) -> Result { let host_height = self.host_height()?; let host_cons_state = self.host_consensus_state(&host_height)?; - Ok(host_cons_state.timestamp()) + Ok(host_cons_state.timestamp().into()) } fn host_consensus_state( &self, height: &IbcHeight, - ) -> Result { + ) -> Result { let consensus_states_binding = self.consensus_states.read().expect("lock is poisoned"); let consensus_state = consensus_states_binding .get(&height.revision_height()) .ok_or(ClientError::MissingLocalConsensusState { height: *height })?; - Ok(consensus_state.clone().into()) + Ok(consensus_state.clone()) } fn client_counter(&self) -> Result { @@ -450,7 +430,10 @@ where })?) } - fn validate_self_client(&self, _counterparty_client_state: Any) -> Result<(), ContextError> { + fn validate_self_client( + &self, + _counterparty_client_state: Self::HostClientState, + ) -> Result<(), ContextError> { Ok(()) } @@ -585,10 +568,6 @@ where fn validate_message_signer(&self, _signer: &Signer) -> Result<(), ContextError> { Ok(()) } - - fn get_client_validation_context(&self) -> &Self::V { - self - } } /// Trait to provide proofs in gRPC service blanket implementations. @@ -610,7 +589,7 @@ where S: ProvableStore + Debug, { /// Returns the list of all client states. - fn client_states(&self) -> Result, ContextError> { + fn client_states(&self) -> Result)>, ContextError> { let path = "clients".to_owned().into(); self.client_state_store @@ -639,7 +618,7 @@ where fn consensus_states( &self, client_id: &ClientId, - ) -> Result, ContextError> { + ) -> Result)>, ContextError> { let path = format!("clients/{}/consensusStates", client_id) .try_into() .map_err(|_| ClientError::Other { @@ -949,6 +928,12 @@ impl ExecutionContext for IbcContext where S: Store + Debug, { + type E = Self; + + fn get_client_execution_context(&mut self) -> &mut Self::E { + self + } + /// Called upon client creation. /// Increases the counter which keeps track of how many clients have been created. /// Should never fail. @@ -1102,8 +1087,4 @@ where self.logs.push(message); Ok(()) } - - fn get_client_execution_context(&mut self) -> &mut Self::E { - self - } } diff --git a/basecoin/modules/src/ibc/transfer.rs b/basecoin/modules/src/ibc/transfer.rs index 7fa3da72..071852db 100644 --- a/basecoin/modules/src/ibc/transfer.rs +++ b/basecoin/modules/src/ibc/transfer.rs @@ -1,4 +1,4 @@ -use core::fmt::Debug; +use std::fmt::Debug; use cosmrs::AccountId; use ibc::apps::transfer::context::{TokenTransferExecutionContext, TokenTransferValidationContext}; diff --git a/basecoin/modules/src/upgrade/impls.rs b/basecoin/modules/src/upgrade/impls.rs index 6679ff52..9d8e63a9 100644 --- a/basecoin/modules/src/upgrade/impls.rs +++ b/basecoin/modules/src/upgrade/impls.rs @@ -12,6 +12,7 @@ use ibc::core::commitment_types::commitment::CommitmentRoot; use ibc::core::host::types::path::UpgradeClientPath; use ibc::cosmos_host::upgrade_proposal::{ Plan, UpgradeChain, UpgradeExecutionContext, UpgradeValidationContext, + UpgradedConsensusStateRef, }; use ibc::cosmos_host::SDK_UPGRADE_QUERY_PATH; use ibc_proto::cosmos::upgrade::v1beta1::query_server::QueryServer; @@ -209,9 +210,6 @@ where S: Store + Debug, { type V = IbcContext; - type E = IbcContext; - type AnyConsensusState = AnyConsensusState; - type AnyClientState = TmClientState; fn upgrade_plan(&self) -> Result { let upgrade_plan = self @@ -239,7 +237,7 @@ where fn upgraded_consensus_state( &self, upgrade_path: &UpgradeClientPath, - ) -> Result { + ) -> Result, UpgradeClientError> { let upgraded_tm_consensus_state = self .upgraded_consensus_state_store .get(Height::Pending, upgrade_path) diff --git a/basecoin/store/src/avl/node.rs b/basecoin/store/src/avl/node.rs index 776dc0f8..f48cdf50 100644 --- a/basecoin/store/src/avl/node.rs +++ b/basecoin/store/src/avl/node.rs @@ -1,5 +1,5 @@ -use std::borrow::Borrow; -use std::mem; +use core::borrow::Borrow; +use core::mem; use sha2::{Digest, Sha256}; use tendermint::hash::Hash; @@ -102,7 +102,7 @@ where }, Some(right) => match &self.left { None => self.height = right.height + 1, - Some(left) => self.height = std::cmp::max(left.height, right.height) + 1, + Some(left) => self.height = core::cmp::max(left.height, right.height) + 1, }, } } diff --git a/basecoin/store/src/avl/tests.rs b/basecoin/store/src/avl/tests.rs index 9b229a2d..4a28dbc0 100644 --- a/basecoin/store/src/avl/tests.rs +++ b/basecoin/store/src/avl/tests.rs @@ -197,7 +197,7 @@ fn check_integrity(node_ref: &NodeRef) -> bool { return false; } let bonus_height = u32::from(!is_leaf); - if node.height != std::cmp::max(left_height, right_height) + bonus_height { + if node.height != core::cmp::max(left_height, right_height) + bonus_height { println!("[AVL] Heights are inconsistent"); return false; } diff --git a/basecoin/store/src/avl/tree.rs b/basecoin/store/src/avl/tree.rs index a260f0d8..b0f95339 100644 --- a/basecoin/store/src/avl/tree.rs +++ b/basecoin/store/src/avl/tree.rs @@ -1,8 +1,5 @@ use core::borrow::Borrow; -use core::cmp::{Ord, Ordering}; -use core::marker::Sized; -use core::option::Option; -use core::option::Option::{None, Some}; +use core::cmp::Ordering; use ics23::commitment_proof::Proof; use ics23::{CommitmentProof, ExistenceProof, HashOp, InnerOp, LeafOp, LengthOp}; @@ -30,10 +27,10 @@ impl> AvlTree { } /// Return the value corresponding to the key, if it exists. - pub fn get(&self, key: &Q) -> Option<&V> + pub fn get(&self, key: &Q) -> Option<&V> where K: Borrow, - Q: Ord, + Q: Ord + ?Sized, { let mut node_ref = &self.root; while let Some(ref node) = node_ref { @@ -70,10 +67,10 @@ impl> AvlTree { } /// Return an existence proof for the given element, if it exists. - pub fn get_proof(&self, key: &Q) -> Option + pub fn get_proof(&self, key: &Q) -> Option where K: Borrow, - Q: Ord, + Q: Ord + ?Sized, { let proof = Self::get_proof_rec(key, &self.root)?; Some(CommitmentProof { @@ -82,10 +79,10 @@ impl> AvlTree { } /// Recursively build a proof of existence for the desired value. - fn get_proof_rec(key: &Q, node: &NodeRef) -> Option + fn get_proof_rec(key: &Q, node: &NodeRef) -> Option where K: Borrow, - Q: Ord, + Q: Ord + ?Sized, { if let Some(node) = node { let empty_hash = []; @@ -169,11 +166,11 @@ impl> AvlTree { let mut node = root.take().expect("[AVL]: Empty root in right rotation"); let mut left = node.left.take().expect("[AVL]: Unexpected right rotation"); let mut left_right = left.right.take(); - std::mem::swap(&mut node.left, &mut left_right); + core::mem::swap(&mut node.left, &mut left_right); node.update(); - std::mem::swap(&mut left.right, &mut Some(node)); + core::mem::swap(&mut left.right, &mut Some(node)); left.update(); - std::mem::swap(root, &mut Some(left)); + core::mem::swap(root, &mut Some(left)); } /// Perform a left rotation. @@ -181,11 +178,11 @@ impl> AvlTree { let mut node = root.take().expect("[AVL]: Empty root in left rotation"); let mut right = node.right.take().expect("[AVL]: Unexpected left rotation"); let mut right_left = right.left.take(); - std::mem::swap(&mut node.right, &mut right_left); + core::mem::swap(&mut node.right, &mut right_left); node.update(); - std::mem::swap(&mut right.left, &mut Some(node)); + core::mem::swap(&mut right.left, &mut Some(node)); right.update(); - std::mem::swap(root, &mut Some(right)) + core::mem::swap(root, &mut Some(right)) } /// Return a list of the keys present in the tree. diff --git a/basecoin/store/src/context.rs b/basecoin/store/src/context.rs index aa70144a..07980c89 100644 --- a/basecoin/store/src/context.rs +++ b/basecoin/store/src/context.rs @@ -1,4 +1,4 @@ -use std::fmt::Debug; +use core::fmt::Debug; use ics23::CommitmentProof; diff --git a/basecoin/store/src/impls/shared.rs b/basecoin/store/src/impls/shared.rs index c5eb95ed..63c68ce2 100644 --- a/basecoin/store/src/impls/shared.rs +++ b/basecoin/store/src/impls/shared.rs @@ -1,4 +1,4 @@ -use std::ops::{Deref, DerefMut}; +use core::ops::{Deref, DerefMut}; use std::sync::{Arc, RwLock}; use ics23::CommitmentProof; diff --git a/basecoin/store/src/types/height.rs b/basecoin/store/src/types/height.rs index 897dd824..ed6a225c 100644 --- a/basecoin/store/src/types/height.rs +++ b/basecoin/store/src/types/height.rs @@ -1,4 +1,4 @@ -use std::fmt::{Display, Formatter}; +use core::fmt::{Display, Formatter}; /// Block height pub type RawHeight = u64; @@ -12,7 +12,7 @@ pub enum Height { } impl Display for Height { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { match self { Height::Pending => write!(f, "pending"), Height::Latest => write!(f, "latest"), diff --git a/basecoin/store/src/types/identifier.rs b/basecoin/store/src/types/identifier.rs index d53d0e18..0b63d17d 100644 --- a/basecoin/store/src/types/identifier.rs +++ b/basecoin/store/src/types/identifier.rs @@ -1,5 +1,5 @@ -use std::fmt::{Debug, Display, Formatter}; -use std::ops::Deref; +use core::fmt::{Debug, Display, Formatter}; +use core::ops::Deref; /// A new type representing a valid ICS024 identifier. /// Implements `Deref`. @@ -21,7 +21,7 @@ impl From for Identifier { } impl Display for Identifier { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { write!(f, "{}", self.0) } } diff --git a/basecoin/store/src/types/path.rs b/basecoin/store/src/types/path.rs index a74803e6..c843e546 100644 --- a/basecoin/store/src/types/path.rs +++ b/basecoin/store/src/types/path.rs @@ -1,5 +1,5 @@ -use std::fmt::{Display, Formatter}; -use std::str::{from_utf8, FromStr, Utf8Error}; +use core::fmt::{Display, Formatter}; +use core::str::{from_utf8, FromStr, Utf8Error}; use displaydoc::Display as DisplayDoc; @@ -59,7 +59,7 @@ impl From for Path { } impl Display for Path { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result { write!( f, "{}", diff --git a/basecoin/store/src/types/store.rs b/basecoin/store/src/types/store.rs index 37e4c80e..a1d3d0a2 100644 --- a/basecoin/store/src/types/store.rs +++ b/basecoin/store/src/types/store.rs @@ -1,5 +1,5 @@ -use std::fmt::Debug; -use std::marker::PhantomData; +use core::fmt::Debug; +use core::marker::PhantomData; use crate::avl::AvlTree; use crate::context::Store; diff --git a/basecoin/store/src/utils/codec.rs b/basecoin/store/src/utils/codec.rs index 35f84a4f..3d61509b 100644 --- a/basecoin/store/src/utils/codec.rs +++ b/basecoin/store/src/utils/codec.rs @@ -1,4 +1,4 @@ -use std::marker::PhantomData; +use core::marker::PhantomData; use serde::de::DeserializeOwned; use serde::Serialize; From 7c2b2df839c689c14ad7e7ffdb1413f779cefa54 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Mon, 11 Mar 2024 09:39:30 -0700 Subject: [PATCH 3/7] fix: use TypedStore for some other IbcContext fields (#168) --- basecoin/modules/src/ibc/client_contexts.rs | 57 ++++++++-- basecoin/modules/src/ibc/impls.rs | 114 ++++++++++++++++---- 2 files changed, 139 insertions(+), 32 deletions(-) diff --git a/basecoin/modules/src/ibc/client_contexts.rs b/basecoin/modules/src/ibc/client_contexts.rs index aa888c4c..19cf7bbb 100644 --- a/basecoin/modules/src/ibc/client_contexts.rs +++ b/basecoin/modules/src/ibc/client_contexts.rs @@ -12,7 +12,9 @@ use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height as IbcHeight; use ibc::core::handler::types::error::ContextError; use ibc::core::host::types::identifiers::ClientId; -use ibc::core::host::types::path::{ClientConsensusStatePath, ClientStatePath, Path}; +use ibc::core::host::types::path::{ + ClientConsensusStatePath, ClientStatePath, ClientUpdateHeightPath, ClientUpdateTimePath, Path, +}; use ibc::core::host::ValidationContext; use ibc::primitives::Timestamp; @@ -61,22 +63,31 @@ where client_id: &ClientId, height: &IbcHeight, ) -> Result<(Timestamp, IbcHeight), ContextError> { + let client_update_time_path = ClientUpdateTimePath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); let processed_timestamp = self .client_processed_times - .get(&(client_id.clone(), *height)) - .cloned() + .get(Height::Pending, &client_update_time_path) .ok_or(ClientError::UpdateMetaDataNotFound { client_id: client_id.clone(), height: *height, })?; + let client_update_height_path = ClientUpdateHeightPath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); let processed_height = self .client_processed_heights - .get(&(client_id.clone(), *height)) - .cloned() + .get(Height::Pending, &client_update_height_path) .ok_or(ClientError::UpdateMetaDataNotFound { client_id: client_id.clone(), height: *height, })?; + Ok((processed_timestamp, processed_height)) } } @@ -138,10 +149,26 @@ where host_timestamp: Timestamp, host_height: IbcHeight, ) -> Result<(), ContextError> { + let client_update_time_path = ClientUpdateTimePath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); self.client_processed_times - .insert((client_id.clone(), height), host_timestamp); + .set(client_update_time_path, host_timestamp) + .map_err(|_| ClientError::Other { + description: "store update error".into(), + })?; + let client_update_height_path = ClientUpdateHeightPath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); self.client_processed_heights - .insert((client_id, height), host_height); + .set(client_update_height_path, host_height) + .map_err(|_| ClientError::Other { + description: "store update error".into(), + })?; Ok(()) } @@ -152,9 +179,19 @@ where client_id: ClientId, height: IbcHeight, ) -> Result<(), ContextError> { - self.client_processed_times - .remove(&(client_id.clone(), height)); - self.client_processed_heights.remove(&(client_id, height)); + let client_update_time_path = ClientUpdateTimePath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); + self.client_processed_times.delete(client_update_time_path); + let client_update_height_path = ClientUpdateHeightPath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); + self.client_processed_heights + .delete(client_update_height_path); Ok(()) } } diff --git a/basecoin/modules/src/ibc/impls.rs b/basecoin/modules/src/ibc/impls.rs index a0680696..0c601976 100644 --- a/basecoin/modules/src/ibc/impls.rs +++ b/basecoin/modules/src/ibc/impls.rs @@ -33,8 +33,9 @@ use ibc::core::handler::types::msgs::MsgEnvelope; use ibc::core::host::types::identifiers::{ClientId, ConnectionId, Sequence}; use ibc::core::host::types::path::{ AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, ClientStatePath, - CommitmentPath, ConnectionPath, Path as IbcPath, ReceiptPath, SeqAckPath, SeqRecvPath, - SeqSendPath, + ClientUpdateHeightPath, ClientUpdateTimePath, CommitmentPath, ConnectionPath, + NextChannelSequencePath, NextClientSequencePath, NextConnectionSequencePath, Path as IbcPath, + ReceiptPath, SeqAckPath, SeqRecvPath, SeqSendPath, }; use ibc::core::host::{ClientStateRef, ConsensusStateRef, ExecutionContext, ValidationContext}; use ibc::cosmos_host::IBC_QUERY_PATH; @@ -44,6 +45,7 @@ use ibc_proto::google::protobuf::Any; use ibc_proto::ibc::core::channel::v1::query_server::QueryServer as ChannelQueryServer; use ibc_proto::ibc::core::channel::v1::Channel as RawChannelEnd; use ibc_proto::ibc::core::client::v1::query_server::QueryServer as ClientQueryServer; +use ibc_proto::ibc::core::client::v1::Height as RawHeight; use ibc_proto::ibc::core::connection::v1::query_server::QueryServer as ConnectionQueryServer; use ibc_proto::ibc::core::connection::v1::ConnectionEnd as RawConnectionEnd; use ibc_query::core::channel::ChannelQueryService; @@ -297,16 +299,17 @@ where /// Handle to store instance. /// The module is guaranteed exclusive access to all paths in the store key-space. pub store: SharedStore, - /// Counter for clients - client_counter: u64, - /// Counter for connections - conn_counter: u64, - /// Counter for channels - channel_counter: u64, + /// A typed-store for next client counter sequence + client_counter: JsonStore, NextClientSequencePath, u64>, + /// A typed-store for next connection counter sequence + conn_counter: JsonStore, NextConnectionSequencePath, u64>, + /// A typed-store for next channel counter sequence + channel_counter: JsonStore, NextChannelSequencePath, u64>, /// Tracks the processed time for client updates - pub(crate) client_processed_times: HashMap<(ClientId, IbcHeight), Timestamp>, - /// Tracks the processed height for client updates - pub(crate) client_processed_heights: HashMap<(ClientId, IbcHeight), IbcHeight>, + pub(crate) client_processed_times: JsonStore, ClientUpdateTimePath, Timestamp>, + /// A typed-store to track the processed height for client updates + pub(crate) client_processed_heights: + ProtobufStore, ClientUpdateHeightPath, IbcHeight, RawHeight>, /// Map of host consensus states pub(crate) consensus_states: Arc>>, /// A typed-store for AnyClientState @@ -345,12 +348,28 @@ where S: ProvableStore + Debug, { pub fn new(store: SharedStore) -> Self { + let mut client_counter = TypedStore::new(store.clone()); + let mut conn_counter = TypedStore::new(store.clone()); + let mut channel_counter = TypedStore::new(store.clone()); + + client_counter + .set(NextClientSequencePath, 0) + .expect("no error"); + + conn_counter + .set(NextConnectionSequencePath, 0) + .expect("no error"); + + channel_counter + .set(NextChannelSequencePath, 0) + .expect("no error"); + Self { - client_counter: 0, - conn_counter: 0, - channel_counter: 0, - client_processed_times: Default::default(), - client_processed_heights: Default::default(), + client_counter, + conn_counter, + channel_counter, + client_processed_times: TypedStore::new(store.clone()), + client_processed_heights: TypedStore::new(store.clone()), consensus_states: Default::default(), client_state_store: TypedStore::new(store.clone()), consensus_state_store: TypedStore::new(store.clone()), @@ -418,7 +437,12 @@ where } fn client_counter(&self) -> Result { - Ok(self.client_counter) + Ok(self + .client_counter + .get(Height::Pending, &NextClientSequencePath) + .ok_or(ClientError::Other { + description: "client counter not found".into(), + })?) } fn connection_end(&self, conn_id: &ConnectionId) -> Result { @@ -444,7 +468,12 @@ where } fn connection_counter(&self) -> Result { - Ok(self.conn_counter) + Ok(self + .conn_counter + .get(Height::Pending, &NextConnectionSequencePath) + .ok_or(ConnectionError::Other { + description: "connection counter not found".into(), + })?) } fn get_compatible_versions(&self) -> Vec { @@ -557,7 +586,12 @@ where /// The value of this counter should increase only via method /// `ChannelKeeper::increase_channel_counter`. fn channel_counter(&self) -> Result { - Ok(self.channel_counter) + Ok(self + .channel_counter + .get(Height::Pending, &NextChannelSequencePath) + .ok_or(ChannelError::Other { + description: "channel counter not found".into(), + })?) } /// Returns the maximum expected time per block @@ -938,7 +972,19 @@ where /// Increases the counter which keeps track of how many clients have been created. /// Should never fail. fn increase_client_counter(&mut self) -> Result<(), ContextError> { - self.client_counter += 1; + let current_sequence = self + .client_counter + .get(Height::Pending, &NextClientSequencePath) + .ok_or(ClientError::Other { + description: "client counter not found".into(), + })?; + + self.client_counter + .set(NextClientSequencePath, current_sequence + 1) + .map_err(|e| ClientError::Other { + description: format!("client counter update failed: {e:?}"), + })?; + Ok(()) } @@ -979,7 +1025,19 @@ where /// Increases the counter which keeps track of how many connections have been created. /// Should never fail. fn increase_connection_counter(&mut self) -> Result<(), ContextError> { - self.conn_counter += 1; + let current_sequence = self + .conn_counter + .get(Height::Pending, &NextConnectionSequencePath) + .ok_or(ConnectionError::Other { + description: "connection counter not found".into(), + })?; + + self.conn_counter + .set(NextConnectionSequencePath, current_sequence + 1) + .map_err(|e| ConnectionError::Other { + description: format!("connection counter update failed: {e:?}"), + })?; + Ok(()) } @@ -1074,7 +1132,19 @@ where } fn increase_channel_counter(&mut self) -> Result<(), ContextError> { - self.channel_counter += 1; + let current_sequence = self + .channel_counter + .get(Height::Pending, &NextChannelSequencePath) + .ok_or(ChannelError::Other { + description: "channel counter not found".into(), + })?; + + self.channel_counter + .set(NextChannelSequencePath, current_sequence + 1) + .map_err(|e| ChannelError::Other { + description: format!("channel counter update failed: {e:?}"), + })?; + Ok(()) } From a180ee07638963bd6469eb28c175a5cfad866e81 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Fri, 15 Mar 2024 06:27:45 -0700 Subject: [PATCH 4/7] chore: track ibc-rs changes up to PR1125 (#169) --- Cargo.lock | 58 +++++++++++++++---------------- Cargo.toml | 6 ++-- basecoin/modules/src/ibc/impls.rs | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9cc3bf29..7bebd9e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1034,7 +1034,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-apps", "ibc-clients", @@ -1047,7 +1047,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1071,7 +1071,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-app-transfer", ] @@ -1079,7 +1079,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1096,7 +1096,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1113,7 +1113,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "base64", "displaydoc", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1152,7 +1152,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1167,7 +1167,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1215,7 +1215,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1231,7 +1231,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1257,7 +1257,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1274,7 +1274,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1289,7 +1289,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1309,7 +1309,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1327,7 +1327,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1350,7 +1350,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1361,7 +1361,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1375,7 +1375,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1390,7 +1390,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "proc-macro2", "quote", @@ -1400,7 +1400,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "derive_more", "displaydoc", @@ -1413,9 +1413,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", "bytes", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=4f0ab6a#4f0ab6aaee3b4a1014fffbbcc58e87a75ea24c56" +source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" dependencies = [ "displaydoc", "ibc", diff --git a/Cargo.toml b/Cargo.toml index 3c67a754..2763b729 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,9 +35,9 @@ tracing = "0.1.26" tracing-subscriber = "0.3.16" # ibc dependencies -ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4f0ab6a", default-features = false, features = ["serde"] } -ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4f0ab6a", default-features = false } -ibc-proto = { version = "0.41.0", default-features = false } +ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "3b11b12", default-features = false, features = ["serde"] } +ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "3b11b12", default-features = false } +ibc-proto = { version = "0.42.2", default-features = false } ics23 = { version = "0.11", default-features = false } # tendermint dependencies diff --git a/basecoin/modules/src/ibc/impls.rs b/basecoin/modules/src/ibc/impls.rs index 0c601976..d1b18962 100644 --- a/basecoin/modules/src/ibc/impls.rs +++ b/basecoin/modules/src/ibc/impls.rs @@ -477,7 +477,7 @@ where } fn get_compatible_versions(&self) -> Vec { - vec![ConnectionVersion::default()] + ConnectionVersion::compatibles() } fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result { From 7aa5caa3464e17f9d5989fed93f40a1014e7baae Mon Sep 17 00:00:00 2001 From: Rano | Ranadeep Date: Fri, 15 Mar 2024 17:42:52 +0100 Subject: [PATCH 5/7] chore: track ibc-rs pr 1126 (#170) * update git rev * main branch rev * update lockfile --- Cargo.lock | 54 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 4 ++-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7bebd9e6..cced4853 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1034,7 +1034,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-apps", "ibc-clients", @@ -1047,7 +1047,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1057,7 +1057,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1071,7 +1071,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-app-transfer", ] @@ -1079,7 +1079,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1096,7 +1096,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1113,7 +1113,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "base64", "displaydoc", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1152,7 +1152,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1167,7 +1167,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1186,7 +1186,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1199,7 +1199,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1215,7 +1215,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1231,7 +1231,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1257,7 +1257,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1274,7 +1274,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1289,7 +1289,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1309,7 +1309,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1327,7 +1327,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1350,7 +1350,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1361,7 +1361,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1375,7 +1375,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1390,7 +1390,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.6.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "proc-macro2", "quote", @@ -1400,7 +1400,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "derive_more", "displaydoc", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=3b11b12#3b11b12cc7963f8391a547bd2d60744708e91cbd" +source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" dependencies = [ "displaydoc", "ibc", diff --git a/Cargo.toml b/Cargo.toml index 2763b729..9e38e420 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,8 @@ tracing = "0.1.26" tracing-subscriber = "0.3.16" # ibc dependencies -ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "3b11b12", default-features = false, features = ["serde"] } -ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "3b11b12", default-features = false } +ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "bef3683", default-features = false, features = ["serde"] } +ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "bef3683", default-features = false } ibc-proto = { version = "0.42.2", default-features = false } ics23 = { version = "0.11", default-features = false } From ce0d6c77e7421b43126c0dadffb119fd02d08176 Mon Sep 17 00:00:00 2001 From: Rano | Ranadeep Date: Tue, 26 Mar 2024 18:01:45 +0100 Subject: [PATCH 6/7] chore: track ibc-rs `v0.51.0` release (#172) * update rev * update cargo lockfile * use crates-io version * update cargo lockfile --- Cargo.lock | 279 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 4 +- 2 files changed, 155 insertions(+), 128 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cced4853..910115ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arrayref" @@ -102,25 +102,25 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "axum" @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -214,7 +214,7 @@ dependencies = [ "tendermint-abci", "tendermint-rpc", "tokio", - "toml 0.8.10", + "toml 0.8.12", "tonic", "tonic-reflection", "tower-abci", @@ -304,9 +304,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake2" @@ -319,9 +319,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -350,9 +350,9 @@ dependencies = [ [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "sha2 0.10.8", ] @@ -371,9 +371,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -392,9 +392,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.2" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -415,14 +415,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -605,7 +605,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -805,7 +805,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -881,9 +881,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -891,7 +891,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util 0.7.10", @@ -922,9 +922,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1033,8 +1033,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8af2325614ae3274b2e70834bea56c1fa2758d802d364d89992b0fe820847fca" dependencies = [ "ibc-apps", "ibc-clients", @@ -1046,8 +1047,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63113a979118ad1474833bc4f01ad4fe87b17dcdd2f1376a67a2ac59d8c11434" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1056,8 +1058,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ff799a080f5c84316eb0b99f25fbc8b1790ab8c71c0ac465f88e4958e5a949" dependencies = [ "derive_more", "displaydoc", @@ -1070,16 +1073,18 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5325b71c21ea45f8a7f8df412e72a01b50f230b08b4120d6a233aeb4bf7b4a54" dependencies = [ "ibc-app-transfer", ] [[package]] name = "ibc-client-tendermint" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa7a3fc87f5bf15c521ef2d63120173b074874df99198302b32d36fc5874614" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1095,8 +1100,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e24507c8a710df38924981bd087fc52808f12eb5e6fb1e15b49180979a162fe5" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1112,8 +1118,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5beac8a4f0affd642b47d21ac1dfc0d3c5fdccd032789ee40d882d46c1b677e3" dependencies = [ "base64", "displaydoc", @@ -1126,8 +1133,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cf6dce5f55eac4930a6e00808cd91d9eccffcb8b5d7c4717b57e9a11217be90" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1135,8 +1143,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecb68e9669c9946dec7453684b5ab05f9c307d908ebe174178bb63a839187f61" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1151,8 +1160,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee95045592a67c58d3efd045c17a0923ce956f43c344d9673ff5de4d359b5f6c" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1166,8 +1176,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804776a40c68a3624b200a51ff9f9506e74d4eaf4dce482b07e68e7b12e6be7b" dependencies = [ "derive_more", "displaydoc", @@ -1185,8 +1196,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "015b28dbb91d6ec2bb82eb57bb34f65cf56e1111e61b82181ae6fb794aceac06" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1198,8 +1210,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9413a8d97d2c4c5dd0d1b673a09e43c80aabb209355e60681865f608bac0756" dependencies = [ "derive_more", "displaydoc", @@ -1214,8 +1227,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a053bd037d7a0d6d42c92321e4eafbc3a7dba2730a9172cb082ddca0215781a" dependencies = [ "derive_more", "displaydoc", @@ -1230,8 +1244,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4202b39be2ef46a110fbe6c258df8721bc5377878a74b9025deafec2d3495e2" dependencies = [ "derive_more", "displaydoc", @@ -1244,8 +1259,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712bd6ca50a57b98dc514182f8046bb0456311c32950d149d0cc72a1aa07d012" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1256,8 +1272,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86c2819e77deb658886b31cb50629ddca97a688a19cb962336a847305922c43" dependencies = [ "derive_more", "displaydoc", @@ -1273,8 +1290,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf6cfdfacf8664f178a20269bb4f47252ab1c9a57b2530b2602e8b0b4e29c66" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1288,8 +1306,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "032c96b6f1ad4ee17c301335f5d36f0207e837fc351b416fffab9010c63de061" dependencies = [ "derive_more", "displaydoc", @@ -1308,8 +1327,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce0b51ac76f9542530ac531366702f16c732b1ba911890a153f1769e99a7277b" dependencies = [ "derive_more", "displaydoc", @@ -1326,8 +1346,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab6cb1c979d58e146910bca01978c9151cedd2b9eabad7125ae8e14a59695450" dependencies = [ "derive_more", "displaydoc", @@ -1349,8 +1370,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11fac91a80985a15eb3e0847fc962c21379982b6e06968595a4d274b10202eb" dependencies = [ "derive_more", "displaydoc", @@ -1360,8 +1382,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4dc0d4b15127ebf3a31841830b57cbae7f3de1823d2e3f81b402fea4f9054e" dependencies = [ "derive_more", "displaydoc", @@ -1374,8 +1397,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b60996d3dbd3d40a2b01046b4f3edb8e332f8a72c6ab98ad046262ab9a35bbdb" dependencies = [ "derive_more", "displaydoc", @@ -1389,18 +1413,20 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.6.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f5010acf3b7fec09c24d05b946424a9f7884f9647ed837c1a1676d3eabac154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] name = "ibc-primitives" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02bc4f3159464458522624bc2177f4fda02070d56042e652f886a6b738223bd" dependencies = [ "derive_more", "displaydoc", @@ -1431,8 +1457,9 @@ dependencies = [ [[package]] name = "ibc-query" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=bef3683#bef3683a79b69fe648a86e21fd35a717d94c37ec" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f9f34977f9906193439aebe9ba423d0a4db8cba09e4908aefa095c844b773a5" dependencies = [ "displaydoc", "ibc", @@ -1496,9 +1523,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1531,9 +1558,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" @@ -1795,7 +1822,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1845,9 +1872,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1872,7 +1899,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1934,9 +1961,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64", "bytes", @@ -2015,11 +2042,11 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2193,14 +2220,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -2215,7 +2242,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2312,9 +2339,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -2388,9 +2415,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -2558,22 +2585,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2668,7 +2695,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2683,9 +2710,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2731,9 +2758,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", @@ -2752,11 +2779,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -2875,7 +2902,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2983,9 +3010,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "valuable" @@ -3045,7 +3072,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-shared", ] @@ -3079,7 +3106,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3299,5 +3326,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] diff --git a/Cargo.toml b/Cargo.toml index 9e38e420..d941776e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,8 @@ tracing = "0.1.26" tracing-subscriber = "0.3.16" # ibc dependencies -ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "bef3683", default-features = false, features = ["serde"] } -ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "bef3683", default-features = false } +ibc = { version = "0.51.0", default-features = false, features = ["serde"] } +ibc-query = { version = "0.51.0", default-features = false } ibc-proto = { version = "0.42.2", default-features = false } ics23 = { version = "0.11", default-features = false } From 5b4d3a253a9220bd09d430c6442f217c8db2d4b6 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Fri, 12 Apr 2024 22:54:26 -0700 Subject: [PATCH 7/7] chore: track ibc-rs PR 1158 (#174) * chore: track ibc-rs pr 1158 * chore: update ibc revision * fix: impl ProverContext on Upgrade module * use rev in git deps in cargo-toml * update cargo-lock file with correct ibc rev * chore: update ibc revision to point to main --------- Co-authored-by: Ranadeep Biswas --- Cargo.lock | 260 ++++++++++++-------------- Cargo.toml | 3 + basecoin/modules/Cargo.toml | 1 - basecoin/modules/src/gov/impls.rs | 4 +- basecoin/modules/src/upgrade/impls.rs | 17 +- 5 files changed, 141 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 910115ee..d5a81f5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayref" @@ -102,18 +102,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -380,9 +380,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" [[package]] name = "cfg-if" @@ -422,7 +422,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -548,9 +548,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -605,7 +605,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -672,9 +672,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -805,7 +805,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -851,9 +851,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -881,9 +881,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1034,8 +1034,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-apps", "ibc-clients", @@ -1048,8 +1047,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1059,8 +1057,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1074,8 +1071,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-app-transfer", ] @@ -1083,8 +1079,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1101,8 +1096,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1119,8 +1113,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "base64", "displaydoc", @@ -1134,8 +1127,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1144,8 +1136,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1161,8 +1152,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1177,8 +1167,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1197,8 +1186,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1211,8 +1199,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1228,8 +1215,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1245,8 +1231,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1260,8 +1245,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1273,8 +1257,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1291,8 +1274,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1307,8 +1289,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1328,8 +1309,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1347,8 +1327,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1371,8 +1350,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1383,8 +1361,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1398,8 +1375,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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1414,19 +1390,17 @@ 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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[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.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "derive_more", "displaydoc", @@ -1458,8 +1432,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9f34977f9906193439aebe9ba423d0a4db8cba09e4908aefa095c844b773a5" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=c659e210d2#c659e210d202490b69719bc5aa4138aaeb8d82be" dependencies = [ "displaydoc", "ibc", @@ -1549,9 +1522,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -1634,9 +1607,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -1822,14 +1795,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1881,9 +1854,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", "prost-derive", @@ -1891,31 +1864,31 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ "prost", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2098,9 +2071,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -2158,9 +2131,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2171,9 +2144,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -2220,7 +2193,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2236,13 +2209,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2377,9 +2350,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -2415,9 +2388,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -2600,7 +2573,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2660,9 +2633,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2695,7 +2668,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2902,7 +2875,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -3072,7 +3045,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -3106,7 +3079,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3173,7 +3146,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3193,17 +3166,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3214,9 +3188,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3226,9 +3200,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3238,9 +3212,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3250,9 +3230,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3262,9 +3242,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3274,9 +3254,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3286,15 +3266,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] @@ -3326,5 +3306,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] diff --git a/Cargo.toml b/Cargo.toml index d941776e..c02afa5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,4 +46,7 @@ tendermint-abci = { version = "0.34", default-features = false } tendermint-proto = { version = "0.34", default-features = false } tendermint-rpc = { version = "0.34", default-features = false } +[patch.crates-io] +ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "c659e210d2" } +ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "c659e210d2" } diff --git a/basecoin/modules/Cargo.toml b/basecoin/modules/Cargo.toml index 4443e376..775a6de8 100644 --- a/basecoin/modules/Cargo.toml +++ b/basecoin/modules/Cargo.toml @@ -38,4 +38,3 @@ tendermint-rpc = { workspace = true , features = ["http-client"] } # internal dependencies basecoin-store = { path = "../store" } - diff --git a/basecoin/modules/src/gov/impls.rs b/basecoin/modules/src/gov/impls.rs index b4409b40..41faadd8 100644 --- a/basecoin/modules/src/gov/impls.rs +++ b/basecoin/modules/src/gov/impls.rs @@ -8,7 +8,7 @@ use basecoin_store::impls::SharedStore; use basecoin_store::types::{Height, Path, ProtobufStore, TypedStore}; use basecoin_store::utils::{SharedRw, SharedRwExt}; use cosmrs::AccountId; -use ibc::cosmos_host::upgrade_proposal::{upgrade_client_proposal_handler, UpgradeProposal}; +use ibc::cosmos_host::upgrade_proposal::{execute_upgrade_client_proposal, UpgradeProposal}; use ibc_proto::cosmos::gov::v1beta1::query_server::QueryServer; use ibc_proto::google::protobuf::Any; use ibc_proto::Protobuf; @@ -71,7 +71,7 @@ where let mut upgrade_ctx = self.upgrade_ctx.write_access(); - let event = upgrade_client_proposal_handler(upgrade_ctx.deref_mut(), upgrade_proposal) + let event = execute_upgrade_client_proposal(upgrade_ctx.deref_mut(), upgrade_proposal) .map_err(|e| AppError::Custom { reason: format!("Error handling upgrade proposal: {:?}", e), })?; diff --git a/basecoin/modules/src/upgrade/impls.rs b/basecoin/modules/src/upgrade/impls.rs index 9d8e63a9..4464407d 100644 --- a/basecoin/modules/src/upgrade/impls.rs +++ b/basecoin/modules/src/upgrade/impls.rs @@ -8,8 +8,9 @@ use ibc::clients::tendermint::client_state::ClientState as TmClientState; use ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState; use ibc::clients::tendermint::types::ConsensusState as ConsensusStateType; use ibc::core::client::types::error::UpgradeClientError; +use ibc::core::client::types::Height as IbcHeight; use ibc::core::commitment_types::commitment::CommitmentRoot; -use ibc::core::host::types::path::UpgradeClientPath; +use ibc::core::host::types::path::{Path as IbcPath, UpgradeClientPath}; use ibc::cosmos_host::upgrade_proposal::{ Plan, UpgradeChain, UpgradeExecutionContext, UpgradeValidationContext, UpgradedConsensusStateRef, @@ -17,6 +18,7 @@ use ibc::cosmos_host::upgrade_proposal::{ use ibc::cosmos_host::SDK_UPGRADE_QUERY_PATH; use ibc_proto::cosmos::upgrade::v1beta1::query_server::QueryServer; use ibc_proto::google::protobuf::Any; +use ibc_query::core::context::ProvableContext; use prost::Message; use tendermint::abci::Event; use tendermint::merkle::proof::ProofOp; @@ -46,6 +48,19 @@ where ProtobufStore, UpgradeClientPath, TmConsensusState, Any>, } +/// Trait to provide proofs in gRPC service blanket implementations. +impl ProvableContext for Upgrade +where + S: ProvableStore + Debug, +{ + /// Returns the proof for the given [`IbcHeight`] and [`Path`] + fn get_proof(&self, height: IbcHeight, path: &IbcPath) -> Option> { + self.store + .get_proof(height.revision_height().into(), &path.to_string().into()) + .map(|p| p.encode_to_vec()) + } +} + impl Upgrade where S: Store + Debug,