Update tendermint-rs to v0.34, prost to v0.12 and tonic to v0.10 (#3651)

* Update tendermint-rs to v0.34, prost to v0.12 and tonic to v0.10 * Update `ibc-proto` to v0.37.0 and `ics23` to v0.11.0
informalsystems · Oct 4, 2023 · 9e27e1e · 9e27e1e
1 parent c6a80cb
commit 9e27e1e
Show file tree

Hide file tree

Showing 13 changed files with 237 additions and 483 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,6 @@ exclude = [
 overflow-checks = true
 
 [patch.crates-io]
-# ibc-proto                        = { git = "https://github.com/cosmos/ibc-proto-rs.git",       branch = "main" }
 # tendermint                       = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
 # tendermint-rpc                   = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }
 # tendermint-proto                 = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }

diff --git a/crates/chain-registry/Cargo.toml b/crates/chain-registry/Cargo.toml
@@ -12,9 +12,9 @@ description  = """
 """
 
 [dependencies]
-ibc-proto         = { version = "0.34.0", features = ["serde"] }
+ibc-proto         = { version = "0.37.0", features = ["serde"] }
 ibc-relayer-types = { version = "0.25.0", path = "../relayer-types" }
-tendermint-rpc = { version = "0.33.0", features = [
+tendermint-rpc = { version = "0.34.0", features = [
     "http-client",
     "websocket-client",
 ] }

diff --git a/crates/relayer-cli/Cargo.toml b/crates/relayer-cli/Cargo.toml
@@ -56,15 +56,15 @@ tracing                  = "0.1.36"
 tracing-subscriber       = { version = "0.3.14", features = ["fmt", "env-filter", "json"]}
 time                     = "0.3"
 [dependencies.tendermint]
-version = "0.33.0"
+version = "0.34.0"
 features = ["secp256k1"]
 
 [dependencies.tendermint-rpc]
-version = "0.33.0"
+version = "0.34.0"
 features = ["http-client", "websocket-client"]
 
 [dependencies.tendermint-light-client-verifier]
-version = "0.33.0"
+version = "0.34.0"
 
 [dependencies.abscissa_core]
 version = "=0.6.0"

diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml
@@ -24,14 +24,14 @@ mocks = ["tendermint-testgen", "clock"]
 
 [dependencies]
 # Proto definitions for all IBC-related interfaces, e.g., connections or channels.
-ibc-proto = { version = "0.34.0" }
-ics23 = { version = "0.10.2", features = ["std", "host-functions"] }
+ibc-proto = { version = "0.37.0" }
+ics23 = { version = "0.11.0", features = ["std", "host-functions"] }
 time = { version = "0.3" }
 serde_derive = { version = "1.0.104" }
 serde = { version = "1.0" }
 serde_json = { version = "1" }
 erased-serde = { version = "0.3" }
-prost = { version = "0.11" }
+prost = { version = "0.12" }
 bytes = { version = "1.4.0" }
 subtle-encoding = { version = "0.5" }
 flex-error = { version = "0.4.4" }
@@ -44,24 +44,24 @@ num-rational = "0.4.1"
 regex = "1"
 
 [dependencies.tendermint]
-version = "0.33.0"
+version = "0.34.0"
 features = ["clock"]
 
 [dependencies.tendermint-proto]
-version = "0.33.0"
+version = "0.34.0"
 
 [dependencies.tendermint-light-client-verifier]
-version = "0.33.0"
+version = "0.34.0"
 features = ["rust-crypto"]
 
 [dependencies.tendermint-testgen]
-version = "0.33.0"
+version = "0.34.0"
 optional = true
 
 [dev-dependencies]
 env_logger = "0.10.0"
 tracing = { version = "0.1.36", default-features = false }
 tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"] }
 test-log = { version = "0.2.10", features = ["trace"] }
-tendermint-rpc = { version = "0.33.0", features = ["http-client", "websocket-client"] }
-tendermint-testgen = { version = "0.33.0" } # Needed for generating (synthetic) light blocks.
+tendermint-rpc = { version = "0.34.0", features = ["http-client", "websocket-client"] }
+tendermint-testgen = { version = "0.34.0" } # Needed for generating (synthetic) light blocks.
diff --git a/crates/relayer-types/src/core/ics02_client/msgs/misbehaviour.rs b/crates/relayer-types/src/core/ics02_client/msgs/misbehaviour.rs
@@ -38,6 +38,9 @@ impl Protobuf<RawMsgSubmitMisbehaviour> for MsgSubmitMisbehaviour {}
 impl TryFrom<RawMsgSubmitMisbehaviour> for MsgSubmitMisbehaviour {
     type Error = Error;
 
+    // NOTE: The `MsgSubmitMisbehaviour` message is has been deprecated in IBC-Go v7 in favor of a
+    // regular `MsgUpdateClient`, but will keep working for the foreseeable future.
+    #[allow(deprecated)]
     fn try_from(raw: RawMsgSubmitMisbehaviour) -> Result<Self, Self::Error> {
         let raw_misbehaviour = raw
             .misbehaviour
@@ -55,6 +58,9 @@ impl TryFrom<RawMsgSubmitMisbehaviour> for MsgSubmitMisbehaviour {
 }
 
 impl From<MsgSubmitMisbehaviour> for RawMsgSubmitMisbehaviour {
+    // NOTE: The `MsgSubmitMisbehaviour` message is has been deprecated in IBC-Go v7 in favor of a
+    // regular `MsgUpdateClient`, but will keep working for the foreseeable future.
+    #[allow(deprecated)]
     fn from(ics_msg: MsgSubmitMisbehaviour) -> Self {
         RawMsgSubmitMisbehaviour {
             client_id: ics_msg.client_id.to_string(),

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -20,7 +20,7 @@ default   = ["flex-error/std", "flex-error/eyre_tracer"]
 telemetry = ["ibc-telemetry"]
 
 [dependencies]
-ibc-proto         = { version = "0.34.0", features = ["serde"] }
+ibc-proto         = { version = "0.37.0", features = ["serde"] }
 ibc-telemetry     = { version = "0.25.0", path = "../telemetry", optional = true }
 ibc-relayer-types = { version = "0.25.0", path = "../relayer-types", features = ["mocks"] }
 
@@ -34,8 +34,8 @@ tracing = "0.1.36"
 tokio = { version = "1.0", features = ["rt-multi-thread", "time", "sync"] }
 serde_json = { version = "1" }
 bytes = "1.4.0"
-prost = { version = "0.11" }
-tonic = { version = "0.9", features = ["tls", "tls-roots"] }
+prost = { version = "0.12" }
+tonic = { version = "0.10", features = ["tls", "tls-roots"] }
 futures = "0.3.27"
 crossbeam-channel = "0.5.8"
 hex = "0.4"
@@ -84,20 +84,20 @@ version = "0.4.1"
 features = ["num-bigint", "serde"]
 
 [dependencies.tendermint]
-version = "0.33.0"
+version = "0.34.0"
 features = ["secp256k1"]
 
 [dependencies.tendermint-rpc]
-version = "0.33.0"
+version = "0.34.0"
 features = ["http-client", "websocket-client"]
 
 [dependencies.tendermint-light-client]
-version = "0.33.0"
+version = "0.34.0"
 default-features = false
 features = ["rpc-client", "secp256k1", "unstable"]
 
 [dependencies.tendermint-light-client-detector]
-version = "0.33.0"
+version = "0.34.0"
 default-features = false
 
 [dev-dependencies]
@@ -108,4 +108,4 @@ tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "jso
 test-log = { version = "0.2.10", features = ["trace"] }
 
 # Needed for generating (synthetic) light blocks.
-tendermint-testgen = { version = "0.33.0" }
+tendermint-testgen = { version = "0.34.0" }
diff --git a/crates/relayer/src/chain/cosmos/query/balance.rs b/crates/relayer/src/chain/cosmos/query/balance.rs
@@ -55,7 +55,6 @@ pub async fn query_all_balances(
 
     let request = tonic::Request::new(QueryAllBalancesRequest {
         address: account_address.to_string(),
-        resolve_denom: false,
         pagination: None,
     });
 

diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml
@@ -28,5 +28,5 @@ tokio                    = "1.26.0"
 tracing                  = "0.1.36"
 
 [dependencies.tendermint]
-version = "0.33.0"
+version = "0.34.0"
 default-features = false