From ea96b3154736c76fcadbfeeaa666f5907dd8f356 Mon Sep 17 00:00:00 2001 From: Luca Joss Date: Thu, 18 Jul 2024 11:08:06 +0200 Subject: [PATCH 1/6] Bump tendermint-rs and ibc-proto versions and required dependencies --- Cargo.lock | 344 ++++++++++++++---- Cargo.toml | 23 +- .../src/core/ics04_channel/upgrade.rs | 2 +- .../src/chain/cosmos/query/consensus_state.rs | 2 +- 4 files changed, 282 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9b32d7433..4761bfcf74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -188,6 +188,12 @@ dependencies = [ "tungstenite", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atty" version = "0.2.14" @@ -212,13 +218,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.29", "itoa", "matchit", "memchr", @@ -230,13 +236,40 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tower", "tower-layer", "tower-service", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -247,13 +280,33 @@ dependencies = [ "bytes", "futures-util", "http 0.2.12", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.71" @@ -1182,6 +1235,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.3" @@ -1290,6 +1362,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.9.4" @@ -1328,9 +1423,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1342,6 +1437,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1350,7 +1466,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.29", "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", @@ -1358,14 +1474,35 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper", + "hyper 1.4.1", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1375,7 +1512,7 @@ dependencies = [ "async-trait", "flex-error", "futures", - "http 0.2.12", + "http 1.1.0", "ibc-proto", "ibc-relayer", "ibc-relayer-types", @@ -1393,11 +1530,11 @@ name = "ibc-integration-test" version = "0.29.0" dependencies = [ "byte-unit", - "http 0.2.12", + "http 1.1.0", "ibc-relayer", "ibc-relayer-types", "ibc-test-framework", - "prost", + "prost 0.13.1", "serde", "serde_json", "tempfile", @@ -1411,15 +1548,14 @@ dependencies = [ [[package]] name = "ibc-proto" version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65" +source = "git+https://github.com/cosmos/ibc-proto-rs.git?branch=romac/prost-0.13-tonic-0.12#371e3c849d2631a9f8cf761921d55f8c2126872d" dependencies = [ "base64 0.22.1", "bytes", "flex-error", "ics23", "informalsystems-pbjson", - "prost", + "prost 0.13.1", "serde", "subtle-encoding", "tendermint-proto", @@ -1449,7 +1585,7 @@ dependencies = [ "generic-array", "hdpath", "hex", - "http 0.2.12", + "http 1.1.0", "humantime", "humantime-serde", "ibc-proto", @@ -1460,7 +1596,7 @@ dependencies = [ "num-bigint", "num-rational", "once_cell", - "prost", + "prost 0.13.1", "regex", "reqwest", "retry", @@ -1511,7 +1647,7 @@ dependencies = [ "flex-error", "futures", "hdpath", - "http 0.2.12", + "http 1.1.0", "humantime", "ibc-chain-registry", "ibc-relayer", @@ -1540,7 +1676,7 @@ dependencies = [ name = "ibc-relayer-rest" version = "0.29.0" dependencies = [ - "axum", + "axum 0.6.20", "crossbeam-channel", "ibc-relayer", "ibc-relayer-types", @@ -1564,7 +1700,7 @@ dependencies = [ "itertools", "num-rational", "primitive-types", - "prost", + "prost 0.13.1", "regex", "serde", "serde_derive", @@ -1586,7 +1722,7 @@ dependencies = [ name = "ibc-telemetry" version = "0.29.0" dependencies = [ - "axum", + "axum 0.6.20", "dashmap", "ibc-relayer-types", "moka", @@ -1611,14 +1747,14 @@ dependencies = [ "flex-error", "hdpath", "hex", - "http 0.2.12", + "http 1.1.0", "ibc-proto", "ibc-relayer", "ibc-relayer-cli", "ibc-relayer-types", "itertools", "once_cell", - "prost", + "prost 0.13.1", "rand", "semver", "serde", @@ -1636,9 +1772,9 @@ dependencies = [ [[package]] name = "ics23" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc3b8be84e7285c73b88effdc3294b552277d6b0ec728ee016c861b7b9a2c19c" +checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12" dependencies = [ "anyhow", "blake2", @@ -1646,7 +1782,7 @@ dependencies = [ "bytes", "hex", "informalsystems-pbjson", - "prost", + "prost 0.13.1", "ripemd", "serde", "sha2 0.10.8", @@ -2251,7 +2387,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive 0.13.1", ] [[package]] @@ -2267,13 +2413,35 @@ dependencies = [ "syn 2.0.67", ] +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 2.0.67", +] + [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost", + "prost 0.12.6", +] + +[[package]] +name = "prost-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +dependencies = [ + "prost 0.13.1", ] [[package]] @@ -2420,10 +2588,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.29", "hyper-rustls", "ipnet", "js-sys", @@ -2438,7 +2606,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls 0.24.1", @@ -2550,6 +2718,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -3108,6 +3291,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.12.6" @@ -3161,9 +3350,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42" +checksum = "e662ae0a3a5fa3c8f4347e5635b63066bdd9db591e9e17169d99e8ae77eb80cf" dependencies = [ "bytes", "digest 0.10.7", @@ -3174,8 +3363,8 @@ dependencies = [ "k256", "num-traits", "once_cell", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.12.6", "ripemd", "serde", "serde_bytes", @@ -3192,9 +3381,9 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84b11b57d20ee4492a1452faff85f5c520adc36ca9fe5e701066935255bb89f" +checksum = "6830b90f6eca3eca86a3dc40da863b3855b417d1a92d54befe6f2ff4e4572b41" dependencies = [ "flex-error", "serde", @@ -3206,9 +3395,9 @@ dependencies = [ [[package]] name = "tendermint-light-client" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4faf208913acf562b8703e8e1e5eabdc57efa88c1404f9df20338a9969f08d6b" +checksum = "7d8202a717d75411d5858d94d5a20e480c5ccd0405f91baa588457e435e6cfb4" dependencies = [ "contracts", "crossbeam-channel", @@ -3231,9 +3420,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-detector" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e7c930960f72741f9baa7fb0bb12c1cf3e4bd687e2eb2cbd7996555e9799e2" +checksum = "9ef161d1f1173efefb87a10478c4492c919bd8a15813d0cc8ab880206293be20" dependencies = [ "crossbeam-channel", "derive_more", @@ -3254,9 +3443,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e" +checksum = "ec2ba2177c643ef3a570b64358b6d390fdf143e82a063535bad44c915e0d275b" dependencies = [ "derive_more", "flex-error", @@ -3267,14 +3456,14 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87" +checksum = "0d4fb3c04c9ceff97b4f4a96351bf6ec20a3656eff9df2ad908f63da6c67e7da" dependencies = [ "bytes", "flex-error", - "prost", - "prost-types", + "prost 0.13.1", + "prost-types 0.13.1", "serde", "serde_bytes", "subtle-encoding", @@ -3283,9 +3472,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdc2281e271277fda184d96d874a6fe59f569b130b634289257baacfc95aa85" +checksum = "6b9900ff9d51d7d6cd0855bf92944e4e8980eb6da028efd4d46259b928acd7f8" dependencies = [ "async-trait", "async-tungstenite", @@ -3317,9 +3506,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318a0e38b3b7b36b4078d78446d4284088aa9b173d519fc804c3ee4683972934" +checksum = "cf559213262d9882b87e4e0d4845e1607a0a35dfe4c1dd1fecc347b2fe879161" dependencies = [ "ed25519-consensus", "gumdrop", @@ -3490,16 +3679,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.3.0" @@ -3532,6 +3711,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.10", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.15" @@ -3601,28 +3791,30 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ "async-stream", "async-trait", - "axum", - "base64 0.21.7", + "axum 0.7.5", + "base64 0.22.1", "bytes", - "h2", - "http 0.2.12", - "http-body", - "hyper", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.1", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.2", - "rustls-pki-types", + "socket2", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-stream", "tower", "tower-layer", diff --git a/Cargo.toml b/Cargo.toml index 469b2798d4..14873a331b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,13 +30,13 @@ ibc-test-framework = { version = "0.29.0", path = "tools/test-framework" } ibc-integration-test = { version = "0.29.0", path = "tools/integration-test" } # Tendermint dependencies -tendermint = { version = "0.37.0", default-features = false } -tendermint-light-client = { version = "0.37.0", default-features = false } -tendermint-light-client-detector = { version = "0.37.0", default-features = false } -tendermint-light-client-verifier = { version = "0.37.0", default-features = false } -tendermint-proto = { version = "0.37.0" } -tendermint-rpc = { version = "0.37.0" } -tendermint-testgen = { version = "0.37.0" } +tendermint = { version = "0.38.0", default-features = false } +tendermint-light-client = { version = "0.38.0", default-features = false } +tendermint-light-client-detector = { version = "0.38.0", default-features = false } +tendermint-light-client-verifier = { version = "0.38.0", default-features = false } +tendermint-proto = { version = "0.38.0" } +tendermint-rpc = { version = "0.38.0" } +tendermint-testgen = { version = "0.38.0" } # Other dependencies abscissa_core = "=0.6.0" @@ -69,11 +69,11 @@ futures = "0.3.27" generic-array = "0.14.7" hdpath = "0.6.3" hex = "0.4.3" -http = "0.2.9" +http = "1.0.0" humantime = "2.1.0" humantime-serde = "1.1.1" ibc-proto = "0.46.0" -ics23 = "0.11.1" +ics23 = "0.12.0" itertools = "0.12.1" moka = "0.12.8" num-bigint = "0.4" @@ -84,7 +84,7 @@ opentelemetry = "0.19.0" opentelemetry-prometheus = "0.12.0" primitive-types = { version = "0.12.1", default-features = false } prometheus = "0.13.4" -prost = "0.12" +prost = "0.13" rand = "0.8.5" regex = "1.10.5" reqwest = { version = "0.11.27", default-features = false } @@ -111,7 +111,7 @@ tiny-keccak = { version = "2.0.2", default-features = false } tokio = "1.26.0" tokio-stream = "0.1.14" toml = "0.8.14" -tonic = "0.11" +tonic = "0.12" tracing = { version = "0.1.36", default-features = false } tracing-subscriber = "0.3.14" uint = "0.9" @@ -121,6 +121,7 @@ uuid = "1.10.0" overflow-checks = true [patch.crates-io] +ibc-proto = { git = "https://github.com/cosmos/ibc-proto-rs.git", branch = "romac/prost-0.13-tonic-0.12" } # 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/relayer-types/src/core/ics04_channel/upgrade.rs b/crates/relayer-types/src/core/ics04_channel/upgrade.rs index a909859cf5..6eb5b9bea2 100644 --- a/crates/relayer-types/src/core/ics04_channel/upgrade.rs +++ b/crates/relayer-types/src/core/ics04_channel/upgrade.rs @@ -27,7 +27,7 @@ impl TryFrom for Upgrade { .try_into()?; let timeout = value .timeout - .filter(|tm| Timeout::try_from(tm.clone()).is_ok()) + .filter(|tm| Timeout::try_from(*tm).is_ok()) .map(|tm| Timeout::try_from(tm).unwrap()); let next_sequence_send = value.next_sequence_send.into(); diff --git a/crates/relayer/src/chain/cosmos/query/consensus_state.rs b/crates/relayer/src/chain/cosmos/query/consensus_state.rs index 54c9f7905d..538b5cb140 100644 --- a/crates/relayer/src/chain/cosmos/query/consensus_state.rs +++ b/crates/relayer/src/chain/cosmos/query/consensus_state.rs @@ -72,7 +72,7 @@ pub async fn query_consensus_state_heights( .consensus_state_heights .into_iter() .filter_map(|h| { - Height::try_from(h.clone()) + Height::try_from(h) .map_err(|e| { warn!( "failed to parse consensus state height {}. Error: {}", From 606959db2a49a19dc5799b827530d1ecb1e40fe6 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Fri, 19 Jul 2024 12:52:16 +0200 Subject: [PATCH 2/6] Remove patch on `ibc-proto` --- Cargo.lock | 28 +++++++++++++++++++--------- Cargo.toml | 5 ++--- crates/relayer/src/worker/packet.rs | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4761bfcf74..968937a8e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1516,7 +1516,7 @@ dependencies = [ "ibc-proto", "ibc-relayer", "ibc-relayer-types", - "itertools", + "itertools 0.13.0", "reqwest", "serde", "serde_json", @@ -1547,8 +1547,9 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.46.0" -source = "git+https://github.com/cosmos/ibc-proto-rs.git?branch=romac/prost-0.13-tonic-0.12#371e3c849d2631a9f8cf761921d55f8c2126872d" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1678333cf68c9094ca66aaf9a271269f1f6bf5c26881161def8bd88cee831a23" dependencies = [ "base64 0.22.1", "bytes", @@ -1591,7 +1592,7 @@ dependencies = [ "ibc-proto", "ibc-relayer-types", "ibc-telemetry", - "itertools", + "itertools 0.13.0", "moka", "num-bigint", "num-rational", @@ -1654,7 +1655,7 @@ dependencies = [ "ibc-relayer-rest", "ibc-relayer-types", "ibc-telemetry", - "itertools", + "itertools 0.13.0", "once_cell", "oneline-eyre", "regex", @@ -1697,7 +1698,7 @@ dependencies = [ "flex-error", "ibc-proto", "ics23", - "itertools", + "itertools 0.13.0", "num-rational", "primitive-types", "prost 0.13.1", @@ -1752,7 +1753,7 @@ dependencies = [ "ibc-relayer", "ibc-relayer-cli", "ibc-relayer-types", - "itertools", + "itertools 0.13.0", "once_cell", "prost 0.13.1", "rand", @@ -1871,6 +1872,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2407,7 +2417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.67", @@ -2420,7 +2430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.67", diff --git a/Cargo.toml b/Cargo.toml index 14873a331b..e3a45ac718 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,9 +72,9 @@ hex = "0.4.3" http = "1.0.0" humantime = "2.1.0" humantime-serde = "1.1.1" -ibc-proto = "0.46.0" +ibc-proto = "0.47.0" ics23 = "0.12.0" -itertools = "0.12.1" +itertools = "0.13.0" moka = "0.12.8" num-bigint = "0.4" num-rational = "0.4.1" @@ -121,7 +121,6 @@ uuid = "1.10.0" overflow-checks = true [patch.crates-io] -ibc-proto = { git = "https://github.com/cosmos/ibc-proto-rs.git", branch = "romac/prost-0.13-tonic-0.12" } # 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/relayer/src/worker/packet.rs b/crates/relayer/src/worker/packet.rs index 98fe15c3e3..30da317290 100644 --- a/crates/relayer/src/worker/packet.rs +++ b/crates/relayer/src/worker/packet.rs @@ -377,7 +377,7 @@ fn retrieve_all_fees_from_incentivized_packet( incentivized_packet .total_recv_fee .iter() - .group_by(|a| &a.denom) + .chunk_by(|a| &a.denom) .into_iter() .map(|(key, group)| { let total_amount: Amount = group.map(|v| v.amount).sum::(); From 9d65dfdc8c05196dc96119906246a2a6f67b5feb Mon Sep 17 00:00:00 2001 From: Luca Joss Date: Mon, 22 Jul 2024 09:39:22 +0200 Subject: [PATCH 3/6] Add changelog entry --- .../4093-update-ibc-proto-and-tendermint-rs.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md diff --git a/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md b/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md new file mode 100644 index 0000000000..2f40bdf04a --- /dev/null +++ b/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md @@ -0,0 +1,3 @@ +- Bump version of `ibc-proto` from `v0.46.0` to `v0.47.0` and + version of `tendermint-rs` from `v0.37.0` to `v0.38.0`. + ([\#4093](https://github.com/informalsystems/hermes/issues/4093)) \ No newline at end of file From bfcfd3ebd99a729ad674aa28d11ce6d48af7f16a Mon Sep 17 00:00:00 2001 From: Luca Joss Date: Mon, 22 Jul 2024 09:40:59 +0200 Subject: [PATCH 4/6] Ignore folder generated by wasm contract --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index bdda50d8a7..f46e505cd9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ mc.log # Ignore tooling Cargo.lock tools/check-guide/Cargo.lock + +# Ignore data generated from wasm contract +ibc_08-wasm_client_data \ No newline at end of file From 02e66b51a77700813a585e0baa599c51db44f4bc Mon Sep 17 00:00:00 2001 From: Luca Joss Date: Tue, 23 Jul 2024 15:02:58 +0200 Subject: [PATCH 5/6] Update tendermint-rs to v0.38.1 --- Cargo.lock | 111 +++++++++++++++++------------------------------------ Cargo.toml | 14 +++---- 2 files changed, 42 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 968937a8e1..a062c7885a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1516,7 +1516,7 @@ dependencies = [ "ibc-proto", "ibc-relayer", "ibc-relayer-types", - "itertools 0.13.0", + "itertools", "reqwest", "serde", "serde_json", @@ -1534,7 +1534,7 @@ dependencies = [ "ibc-relayer", "ibc-relayer-types", "ibc-test-framework", - "prost 0.13.1", + "prost", "serde", "serde_json", "tempfile", @@ -1556,7 +1556,7 @@ dependencies = [ "flex-error", "ics23", "informalsystems-pbjson", - "prost 0.13.1", + "prost", "serde", "subtle-encoding", "tendermint-proto", @@ -1592,12 +1592,12 @@ dependencies = [ "ibc-proto", "ibc-relayer-types", "ibc-telemetry", - "itertools 0.13.0", + "itertools", "moka", "num-bigint", "num-rational", "once_cell", - "prost 0.13.1", + "prost", "regex", "reqwest", "retry", @@ -1655,7 +1655,7 @@ dependencies = [ "ibc-relayer-rest", "ibc-relayer-types", "ibc-telemetry", - "itertools 0.13.0", + "itertools", "once_cell", "oneline-eyre", "regex", @@ -1698,10 +1698,10 @@ dependencies = [ "flex-error", "ibc-proto", "ics23", - "itertools 0.13.0", + "itertools", "num-rational", "primitive-types", - "prost 0.13.1", + "prost", "regex", "serde", "serde_derive", @@ -1753,9 +1753,9 @@ dependencies = [ "ibc-relayer", "ibc-relayer-cli", "ibc-relayer-types", - "itertools 0.13.0", + "itertools", "once_cell", - "prost 0.13.1", + "prost", "rand", "semver", "serde", @@ -1783,7 +1783,7 @@ dependencies = [ "bytes", "hex", "informalsystems-pbjson", - "prost 0.13.1", + "prost", "ripemd", "serde", "sha2 0.10.8", @@ -1863,15 +1863,6 @@ version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2390,16 +2381,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.1" @@ -2407,20 +2388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", - "prost-derive 0.13.1", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.67", + "prost-derive", ] [[package]] @@ -2430,28 +2398,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools", "proc-macro2", "quote", "syn 2.0.67", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", -] - [[package]] name = "prost-types" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ - "prost 0.13.1", + "prost", ] [[package]] @@ -3360,9 +3319,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e662ae0a3a5fa3c8f4347e5635b63066bdd9db591e9e17169d99e8ae77eb80cf" +checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" dependencies = [ "bytes", "digest 0.10.7", @@ -3373,8 +3332,8 @@ dependencies = [ "k256", "num-traits", "once_cell", - "prost 0.12.6", - "prost-types 0.12.6", + "prost", + "prost-types", "ripemd", "serde", "serde_bytes", @@ -3391,9 +3350,9 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6830b90f6eca3eca86a3dc40da863b3855b417d1a92d54befe6f2ff4e4572b41" +checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" dependencies = [ "flex-error", "serde", @@ -3405,9 +3364,9 @@ dependencies = [ [[package]] name = "tendermint-light-client" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d8202a717d75411d5858d94d5a20e480c5ccd0405f91baa588457e435e6cfb4" +checksum = "d91e5abb448c65e8abdfe0e17a3a189e005a71b4169b89f36aaa2053ff239577" dependencies = [ "contracts", "crossbeam-channel", @@ -3430,9 +3389,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-detector" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef161d1f1173efefb87a10478c4492c919bd8a15813d0cc8ab880206293be20" +checksum = "eb1ac1607eb7a3393313558b339c36eebeba15aa7f2d101d1d47299e65825152" dependencies = [ "crossbeam-channel", "derive_more", @@ -3453,9 +3412,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2ba2177c643ef3a570b64358b6d390fdf143e82a063535bad44c915e0d275b" +checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" dependencies = [ "derive_more", "flex-error", @@ -3466,14 +3425,14 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4fb3c04c9ceff97b4f4a96351bf6ec20a3656eff9df2ad908f63da6c67e7da" +checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" dependencies = [ "bytes", "flex-error", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", "serde", "serde_bytes", "subtle-encoding", @@ -3482,9 +3441,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9900ff9d51d7d6cd0855bf92944e4e8980eb6da028efd4d46259b928acd7f8" +checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" dependencies = [ "async-trait", "async-tungstenite", @@ -3516,9 +3475,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf559213262d9882b87e4e0d4845e1607a0a35dfe4c1dd1fecc347b2fe879161" +checksum = "ae007e2918414ae96e4835426aace7538d23b8ddf96d71e23d241f58f386e877" dependencies = [ "ed25519-consensus", "gumdrop", @@ -3819,7 +3778,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.1", + "prost", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.2", "socket2", diff --git a/Cargo.toml b/Cargo.toml index e3a45ac718..fe0799ba7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,13 +30,13 @@ ibc-test-framework = { version = "0.29.0", path = "tools/test-framework" } ibc-integration-test = { version = "0.29.0", path = "tools/integration-test" } # Tendermint dependencies -tendermint = { version = "0.38.0", default-features = false } -tendermint-light-client = { version = "0.38.0", default-features = false } -tendermint-light-client-detector = { version = "0.38.0", default-features = false } -tendermint-light-client-verifier = { version = "0.38.0", default-features = false } -tendermint-proto = { version = "0.38.0" } -tendermint-rpc = { version = "0.38.0" } -tendermint-testgen = { version = "0.38.0" } +tendermint = { version = "0.38.1", default-features = false } +tendermint-light-client = { version = "0.38.1", default-features = false } +tendermint-light-client-detector = { version = "0.38.1", default-features = false } +tendermint-light-client-verifier = { version = "0.38.1", default-features = false } +tendermint-proto = { version = "0.38.1" } +tendermint-rpc = { version = "0.38.1" } +tendermint-testgen = { version = "0.38.1" } # Other dependencies abscissa_core = "=0.6.0" From 72313ea8eabd14e01c7f0da06ba6924f70806f55 Mon Sep 17 00:00:00 2001 From: Luca Joss Date: Tue, 23 Jul 2024 15:03:56 +0200 Subject: [PATCH 6/6] Update changelog entry --- .../breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md b/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md index 2f40bdf04a..f87427d3a2 100644 --- a/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md +++ b/.changelog/unreleased/breaking-changes/4093-update-ibc-proto-and-tendermint-rs.md @@ -1,3 +1,3 @@ - Bump version of `ibc-proto` from `v0.46.0` to `v0.47.0` and - version of `tendermint-rs` from `v0.37.0` to `v0.38.0`. + version of `tendermint-rs` from `v0.37.0` to `v0.38.1`. ([\#4093](https://github.com/informalsystems/hermes/issues/4093)) \ No newline at end of file