From ee7f671c8a2033ac9f7cef31f477019f5177a3b1 Mon Sep 17 00:00:00 2001 From: Rano | Ranadeep Date: Wed, 24 Apr 2024 10:43:36 -0400 Subject: [PATCH] chore(deps): update `ibc-proto` and `tendermint` dependencies (#1192) * update ibc-proto to 0.43.0 * update tendermint to 0.35.0 * update tonic for ibc-proto * changelog entry * boxing large elements in enum variants * update cargo lockfiles --- ...71-update-ibc-proto-and-tendermint-deps.md | 2 + Cargo.toml | 14 +++--- ci/cw-check/Cargo.lock | 47 +++++++------------ ci/no-std-check/Cargo.lock | 30 +++++++----- ci/no-std-check/Cargo.toml | 8 ++-- .../ics07-tendermint/types/src/error.rs | 6 ++- ibc-query/Cargo.toml | 2 +- 7 files changed, 54 insertions(+), 55 deletions(-) create mode 100644 .changelog/unreleased/improvements/1171-update-ibc-proto-and-tendermint-deps.md diff --git a/.changelog/unreleased/improvements/1171-update-ibc-proto-and-tendermint-deps.md b/.changelog/unreleased/improvements/1171-update-ibc-proto-and-tendermint-deps.md new file mode 100644 index 000000000..c4599670b --- /dev/null +++ b/.changelog/unreleased/improvements/1171-update-ibc-proto-and-tendermint-deps.md @@ -0,0 +1,2 @@ +- Update `ibc-proto` to v0.43.0 and `tendermint` dependencies to v0.35.0. + ([#1171](https://github.com/cosmos/ibc-rs/issues/1171)) diff --git a/Cargo.toml b/Cargo.toml index d1abc6906..70c351cd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,15 +102,15 @@ ibc-client-wasm-types = { version = "0.51.0", path = "./ibc-clients/ics08- ibc-app-transfer-types = { version = "0.51.0", path = "./ibc-apps/ics20-transfer/types", default-features = false } ibc-app-nft-transfer-types = { version = "0.51.0", path = "./ibc-apps/ics721-nft-transfer/types", default-features = false } -ibc-proto = { version = "0.42.2", default-features = false } +ibc-proto = { version = "0.43.0", default-features = false } # cosmos dependencies -tendermint = { version = "0.34.0", default-features = false } -tendermint-light-client = { version = "0.34.0", default-features = false } -tendermint-light-client-verifier = { version = "0.34.0", default-features = false } -tendermint-proto = { version = "0.34.0", default-features = false } -tendermint-rpc = { version = "0.34.0", default-features = false } -tendermint-testgen = { version = "0.34.0", default-features = false } +tendermint = { version = "0.35.0", default-features = false } +tendermint-light-client = { version = "0.35.0", default-features = false } +tendermint-light-client-verifier = { version = "0.35.0", default-features = false } +tendermint-proto = { version = "0.35.0", default-features = false } +tendermint-rpc = { version = "0.35.0", default-features = false } +tendermint-testgen = { version = "0.35.0", default-features = false } # cosmwasm dependencies ### Note: Kept at the following version to match the CosmWasm module version diff --git a/ci/cw-check/Cargo.lock b/ci/cw-check/Cargo.lock index 5e715058c..1e15c0efa 100644 --- a/ci/cw-check/Cargo.lock +++ b/ci/cw-check/Cargo.lock @@ -49,6 +49,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -205,7 +211,7 @@ version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712fe58f39d55c812f7b2c84e097cdede3a39d520f89b6dc3153837e31741927" dependencies = [ - "base64", + "base64 0.21.7", "bech32", "bnum", "cosmwasm-crypto", @@ -432,16 +438,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - [[package]] name = "ff" version = "0.13.0" @@ -467,7 +463,6 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b" dependencies = [ - "eyre", "paste", ] @@ -896,11 +891,11 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.42.2" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" +checksum = "af781637b107aa33042426c9d17b181ced05ae97b1d88dba50f40f19ad44e36f" dependencies = [ - "base64", + "base64 0.22.0", "bytes", "flex-error", "ics23", @@ -953,12 +948,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - [[package]] name = "indexmap" version = "2.2.6" @@ -975,7 +964,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d" dependencies = [ - "base64", + "base64 0.21.7", "serde", ] @@ -1037,13 +1026,13 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -1487,9 +1476,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b" +checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" dependencies = [ "bytes", "digest 0.10.7", @@ -1514,9 +1503,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b797dd3d2beaaee91d2f065e7bdf239dc8d80bba4a183a288bc1279dd5a69a1e" +checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" dependencies = [ "bytes", "flex-error", diff --git a/ci/no-std-check/Cargo.lock b/ci/no-std-check/Cargo.lock index 0632fefdd..cad12ee79 100644 --- a/ci/no-std-check/Cargo.lock +++ b/ci/no-std-check/Cargo.lock @@ -289,6 +289,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -1558,11 +1564,11 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.42.2" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a6f2bbf7e1d12f98d8d54d9114231b865418d0f8b619c0873180eafdee07fd" +checksum = "af781637b107aa33042426c9d17b181ced05ae97b1d88dba50f40f19ad44e36f" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "borsh", "bytes", "flex-error", @@ -1928,13 +1934,13 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] @@ -3104,9 +3110,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tendermint" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b" +checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" dependencies = [ "bytes", "digest 0.10.7", @@ -3133,9 +3139,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b8090d0eef9ad57b1b913b5e358e26145c86017e87338136509b94383a4af25" +checksum = "35678b66e819659617c2e83f9662b8544425694441990c07137904a07872d871" dependencies = [ "derive_more", "flex-error", @@ -3146,9 +3152,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b797dd3d2beaaee91d2f065e7bdf239dc8d80bba4a183a288bc1279dd5a69a1e" +checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" dependencies = [ "bytes", "flex-error", diff --git a/ci/no-std-check/Cargo.toml b/ci/no-std-check/Cargo.toml index d7f6f8965..3326ac75c 100644 --- a/ci/no-std-check/Cargo.toml +++ b/ci/no-std-check/Cargo.toml @@ -6,14 +6,14 @@ resolver = "2" [dependencies] ibc = { path = "../../ibc", default-features = false, features = ["serde"] } -ibc-proto = { version = "0.42.2", default-features = false, features = [ +ibc-proto = { version = "0.43", default-features = false, features = [ "parity-scale-codec", "borsh", "serde", ] } -tendermint = { version = "0.34", default-features = false } -tendermint-proto = { version = "0.34", default-features = false } -tendermint-light-client-verifier = { version = "0.34", default-features = false, features = ["rust-crypto"] } +tendermint = { version = "0.35", default-features = false } +tendermint-proto = { version = "0.35", default-features = false } +tendermint-light-client-verifier = { version = "0.35", default-features = false, features = ["rust-crypto"] } sp-core = { version = "28.0.0", default-features = false, optional = true } sp-io = { version = "30.0.0", default-features = false, optional = true } diff --git a/ibc-clients/ics07-tendermint/types/src/error.rs b/ibc-clients/ics07-tendermint/types/src/error.rs index ad53989fb..4376e902e 100644 --- a/ibc-clients/ics07-tendermint/types/src/error.rs +++ b/ibc-clients/ics07-tendermint/types/src/error.rs @@ -76,7 +76,7 @@ pub enum Error { /// not enough trust because insufficient validators overlap: `{reason}` NotEnoughTrustedValsSigned { reason: VotingPowerTally }, /// verification failed: `{detail}` - VerificationError { detail: LightClientErrorDetail }, + VerificationError { detail: Box }, /// Processed time or height for the client `{client_id}` at height `{height}` not found UpdateMetaDataNotFound { client_id: ClientId, height: Height }, /// The given hash of the validators does not matches the given hash in the signed header. Expected: `{signed_header_validators_hash}`, got: `{validators_hash}` @@ -137,7 +137,9 @@ impl IntoResult<(), Error> for Verdict { match self { Verdict::Success => Ok(()), Verdict::NotEnoughTrust(reason) => Err(Error::NotEnoughTrustedValsSigned { reason }), - Verdict::Invalid(detail) => Err(Error::VerificationError { detail }), + Verdict::Invalid(detail) => Err(Error::VerificationError { + detail: Box::new(detail), + }), } } } diff --git a/ibc-query/Cargo.toml b/ibc-query/Cargo.toml index bf6c0de1d..7d71d7424 100644 --- a/ibc-query/Cargo.toml +++ b/ibc-query/Cargo.toml @@ -18,7 +18,7 @@ description = """ displaydoc = { version = "0.2", default-features = false } schemars = { workspace = true , optional = true } serde = { workspace = true, optional = true } -tonic = "0.10" +tonic = { version = "0.11" } # ibc dependencies ibc = { workspace = true }