diff --git a/.changelog/unreleased/improvements/2045-tendermint-0.23.6.md b/.changelog/unreleased/improvements/2045-tendermint-0.23.6.md new file mode 100644 index 0000000000..23784ad668 --- /dev/null +++ b/.changelog/unreleased/improvements/2045-tendermint-0.23.6.md @@ -0,0 +1,2 @@ +- Update tendermint-rs dependencies to v0.23.6 + ([#2045](https://github.com/informalsystems/ibc-rs/issues/2045)) \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 0b809e873e..72bcdcde04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -471,9 +471,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "contracts" -version = "0.4.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9424f2ca1e42776615720e5746eed6efa19866fdbaac2923ab51c294ac4d1f2" +checksum = "f1d1429e3bd78171c65aa010eabcdf8f863ba3254728dbfb0ad4b1545beac15c" dependencies = [ "proc-macro2", "quote", @@ -3201,9 +3201,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8150cb636f400ead6de6f4893824d40ecf71214c5d9f8a1d445b5f38fff7b3" +checksum = "16a3d617db287955b07e4bf1523b831bf5055e7d3ceab8504174181df40cb143" dependencies = [ "async-trait", "bytes", @@ -3232,9 +3232,9 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a5c41141b56f1e0463182d910b8ccb84fd4abe61a4290a89794d44ad3e15a9" +checksum = "a2ef5088b4f2df8e4dc221da2c37b1018c4d104a40da3027bda70c9f01099783" dependencies = [ "flex-error", "serde", @@ -3246,9 +3246,9 @@ dependencies = [ [[package]] name = "tendermint-light-client" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f937884254ac9888dd42fad6c2423f3db85989d3910995867a2064d0b47a2de" +checksum = "571098c7da376550f19554227e16e00e91b8f5b99438615340e4679343ff18d1" dependencies = [ "contracts", "crossbeam-channel 0.4.4", @@ -3268,23 +3268,22 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7679dbd1cc1ad6d723a799b7cd3c55e592de230bc96e23c1ccb8b309bfa61700" +checksum = "26787f3d9a6dc1c5e1e5661d7d70bb53613852b01545730df082128fd98e6529" dependencies = [ "derive_more", "flex-error", "serde", "tendermint", - "tendermint-rpc", "time", ] [[package]] name = "tendermint-proto" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ba5f19afd52d69aa139cbf2a2ad129673a87aebeb66742b852a4d91b482e7b" +checksum = "b8a65da26cc1f24cd53f40d1267372c22d6ce727d9fd40c6c61b879b26154994" dependencies = [ "bytes", "flex-error", @@ -3300,9 +3299,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c4a92790ed1f844984ce78436c9bdd0931034b387ee6158f0f0731956285d6f" +checksum = "47d62bc0bb8f4dfb0c9919f70d1aaa2e40750a5a82bf810aaf6590b40af70f27" dependencies = [ "async-trait", "async-tungstenite", @@ -3334,9 +3333,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.23.5" +version = "0.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91aade187d7b5bb7c6df215d20661411283d32873f7657dd5633590d89cf928b" +checksum = "1514e269ebd2dd1f99e931ac99d96eb9b521a0820d9f03e9b56ac724ca456f19" dependencies = [ "ed25519-dalek", "gumdrop", diff --git a/ci/no-std-check/Cargo.lock b/ci/no-std-check/Cargo.lock index 49d5abc008..a24d08e683 100644 --- a/ci/no-std-check/Cargo.lock +++ b/ci/no-std-check/Cargo.lock @@ -698,7 +698,7 @@ dependencies = [ [[package]] name = "ibc" -version = "0.13.0-rc.0" +version = "0.13.0" dependencies = [ "bytes", "derive_more", @@ -723,7 +723,7 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.16.0" +version = "0.17.0" dependencies = [ "base64", "bytes", @@ -735,9 +735,9 @@ dependencies = [ [[package]] name = "ics23" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce15e4758c46a0453bdf4b3b1dfcce70c43f79d1943c2ee0635b77eb2e7aa233" +checksum = "9d454cc0a22bd556cc3d3c69f9d75a392a36244634840697a4b9eb81bc5c8ae0" dependencies = [ "anyhow", "bytes", @@ -2089,8 +2089,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tendermint" -version = "0.23.5" -source = "git+https://github.com/informalsystems/tendermint-rs?branch=v0.23.x#235480171081fed74de7b3d3c19911304df29831" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16a3d617db287955b07e4bf1523b831bf5055e7d3ceab8504174181df40cb143" dependencies = [ "async-trait", "bytes", @@ -2117,8 +2118,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.23.5" -source = "git+https://github.com/informalsystems/tendermint-rs?branch=v0.23.x#235480171081fed74de7b3d3c19911304df29831" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26787f3d9a6dc1c5e1e5661d7d70bb53613852b01545730df082128fd98e6529" dependencies = [ "derive_more", "flex-error", @@ -2129,8 +2131,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.23.5" -source = "git+https://github.com/informalsystems/tendermint-rs?branch=v0.23.x#235480171081fed74de7b3d3c19911304df29831" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a65da26cc1f24cd53f40d1267372c22d6ce727d9fd40c6c61b879b26154994" dependencies = [ "bytes", "flex-error", @@ -2244,9 +2247,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ "cfg-if", "pin-project-lite", @@ -2256,9 +2259,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", @@ -2534,3 +2537,18 @@ dependencies = [ "syn", "synstructure", ] + +[[patch.unused]] +name = "tendermint" +version = "0.23.5" +source = "git+https://github.com/informalsystems/tendermint-rs?branch=v0.23.x#235480171081fed74de7b3d3c19911304df29831" + +[[patch.unused]] +name = "tendermint-light-client-verifier" +version = "0.23.5" +source = "git+https://github.com/informalsystems/tendermint-rs?branch=v0.23.x#235480171081fed74de7b3d3c19911304df29831" + +[[patch.unused]] +name = "tendermint-proto" +version = "0.23.5" +source = "git+https://github.com/informalsystems/tendermint-rs?branch=v0.23.x#235480171081fed74de7b3d3c19911304df29831" diff --git a/ci/no-std-check/Cargo.toml b/ci/no-std-check/Cargo.toml index fddce0432d..a69a9e71e7 100644 --- a/ci/no-std-check/Cargo.toml +++ b/ci/no-std-check/Cargo.toml @@ -7,9 +7,9 @@ resolver = "2" [dependencies] ibc = { path = "../../modules", default-features = false } ibc-proto = { path = "../../proto", default-features = false } -tendermint = { version = "0.23.5", default-features = false } -tendermint-proto = { version = "0.23.5", default-features = false } -tendermint-light-client-verifier = { version = "0.23.5", default-features = false } +tendermint = { version = "0.23.6", default-features = false } +tendermint-proto = { version = "0.23.6", default-features = false } +tendermint-light-client-verifier = { version = "0.23.6", default-features = false } sp-core = { version = "5.0.0", default-features = false, optional = true } sp-io = { version = "5.0.0", default-features = false, optional = true } diff --git a/modules/Cargo.toml b/modules/Cargo.toml index f16efdcdb1..b75971b10d 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -45,19 +45,19 @@ num-traits = { version = "0.2.14", default-features = false } derive_more = { version = "0.99.17", default-features = false, features = ["from", "display"] } [dependencies.tendermint] -version = "=0.23.5" +version = "=0.23.6" default-features = false [dependencies.tendermint-proto] -version = "=0.23.5" +version = "=0.23.6" default-features = false [dependencies.tendermint-light-client-verifier] -version = "=0.23.5" +version = "=0.23.6" default-features = false [dependencies.tendermint-testgen] -version = "=0.23.5" +version = "=0.23.6" optional = true default-features = false @@ -67,8 +67,8 @@ tracing-subscriber = { version = "0.3.9", features = ["fmt", "env-filter", "json test-log = { version = "0.2.10", features = ["trace"] } modelator = "0.4.2" sha2 = { version = "0.10.2" } -tendermint-rpc = { version = "=0.23.5", features = ["http-client", "websocket-client"] } -tendermint-testgen = { version = "=0.23.5" } # Needed for generating (synthetic) light blocks. +tendermint-rpc = { version = "=0.23.6", features = ["http-client", "websocket-client"] } +tendermint-testgen = { version = "=0.23.6" } # Needed for generating (synthetic) light blocks. [[test]] name = "mbt" diff --git a/proto/Cargo.toml b/proto/Cargo.toml index dfa95ae897..2e9dc99d1c 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -32,7 +32,7 @@ schemars = { version = "0.8", optional = true } base64 = { version = "0.13", default-features = false, features = ["alloc"] } [dependencies.tendermint-proto] -version = "=0.23.5" +version = "=0.23.6" default-features = false [features] diff --git a/relayer-cli/Cargo.toml b/relayer-cli/Cargo.toml index 264cd10715..0d3d9cf17c 100644 --- a/relayer-cli/Cargo.toml +++ b/relayer-cli/Cargo.toml @@ -58,22 +58,22 @@ flex-error = { version = "0.4.4", default-features = false, features = ["std", " signal-hook = "0.3.13" [dependencies.tendermint-proto] -version = "=0.23.5" +version = "=0.23.6" [dependencies.tendermint] -version = "=0.23.5" +version = "=0.23.6" features = ["secp256k1"] [dependencies.tendermint-rpc] -version = "=0.23.5" +version = "=0.23.6" features = ["http-client", "websocket-client"] [dependencies.tendermint-light-client] -version = "=0.23.5" +version = "=0.23.6" features = ["unstable"] [dependencies.tendermint-light-client-verifier] -version = "=0.23.5" +version = "=0.23.6" [dependencies.abscissa_core] version = "=0.6.0" diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index e55abe175e..91a29a2d51 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -73,24 +73,24 @@ version = "0.4.0" features = ["num-bigint", "serde"] [dependencies.tendermint] -version = "=0.23.5" +version = "=0.23.6" features = ["secp256k1"] [dependencies.tendermint-rpc] -version = "=0.23.5" +version = "=0.23.6" features = ["http-client", "websocket-client"] [dependencies.tendermint-light-client] -version = "=0.23.5" +version = "=0.23.6" default-features = false features = ["rpc-client", "secp256k1", "unstable"] [dependencies.tendermint-light-client-verifier] -version = "=0.23.5" +version = "=0.23.6" default-features = false [dependencies.tendermint-proto] -version = "=0.23.5" +version = "=0.23.6" [dev-dependencies] ibc = { version = "0.13.0", path = "../modules", features = ["mocks"] } @@ -100,4 +100,4 @@ tracing-subscriber = { version = "0.3.9", features = ["fmt", "env-filter", "json test-log = { version = "0.2.10", features = ["trace"] } # Needed for generating (synthetic) light blocks. -tendermint-testgen = { version = "=0.23.5" } +tendermint-testgen = { version = "=0.23.6" } diff --git a/relayer/src/chain/cosmos.rs b/relayer/src/chain/cosmos.rs index 496e564cb6..79cde9967b 100644 --- a/relayer/src/chain/cosmos.rs +++ b/relayer/src/chain/cosmos.rs @@ -14,13 +14,10 @@ use bech32::{ToBase32, Variant}; use bitcoin::hashes::hex::ToHex; use ibc_proto::google::protobuf::Any; use itertools::Itertools; +use tendermint::abci::{Code, Event, Path as TendermintABCIPath}; use tendermint::account::Id as AccountId; use tendermint::block::Height; -use tendermint::consensus::Params as ConsensusParams; -use tendermint::{ - abci::{Code, Event, Path as TendermintABCIPath}, - node::info::TxIndexStatus, -}; +use tendermint::node::info::TxIndexStatus; use tendermint_light_client_verifier::types::LightBlock as TMLightBlock; use tendermint_proto::Protobuf; use tendermint_rpc::endpoint::tx::Response as ResultTx; @@ -297,18 +294,6 @@ impl CosmosSdkChain { self.query_staking_params().map(|p| p.historical_entries) } - /// Query the consensus parameters via an RPC query - /// Specific to the SDK and used only for Tendermint client create - pub fn query_consensus_params(&self) -> Result { - crate::time!("query_consensus_params"); - crate::telemetry!(query, self.id(), "query_consensus_params"); - - Ok(self - .block_on(self.rpc_client.genesis()) - .map_err(|e| Error::rpc(self.config.rpc_addr.clone(), e))? - .consensus_params) - } - /// Run a future to completion on the Tokio runtime. fn block_on(&self, f: F) -> F::Output { crate::time!("block_on"); diff --git a/tools/integration-test/Cargo.toml b/tools/integration-test/Cargo.toml index 0bc3b15004..4177c8d833 100644 --- a/tools/integration-test/Cargo.toml +++ b/tools/integration-test/Cargo.toml @@ -19,8 +19,8 @@ ibc-relayer = { path = "../../relayer" } ibc-relayer-cli = { path = "../../relayer-cli" } ibc-proto = { path = "../../proto" } ibc-test-framework = { path = "../test-framework" } -tendermint = { version = "=0.23.5" } -tendermint-rpc = { version = "=0.23.5", features = ["http-client", "websocket-client"] } +tendermint = { version = "=0.23.6" } +tendermint-rpc = { version = "=0.23.6", features = ["http-client", "websocket-client"] } serde_json = "1" time = "0.3" diff --git a/tools/test-framework/Cargo.toml b/tools/test-framework/Cargo.toml index b4f7a80fa1..c47af682d2 100644 --- a/tools/test-framework/Cargo.toml +++ b/tools/test-framework/Cargo.toml @@ -18,8 +18,8 @@ ibc = { path = "../../modules" } ibc-relayer = { path = "../../relayer" } ibc-relayer-cli = { path = "../../relayer-cli" } ibc-proto = { path = "../../proto" } -tendermint = { version = "=0.23.5" } -tendermint-rpc = { version = "=0.23.5", features = ["http-client", "websocket-client"] } +tendermint = { version = "=0.23.6" } +tendermint-rpc = { version = "=0.23.6", features = ["http-client", "websocket-client"] } tokio = { version = "1.0", features = ["full"] } tracing = "0.1.32"