diff --git a/.changelog/unreleased/improvements/3735-update-tendermint-rs.md b/.changelog/unreleased/improvements/3735-update-tendermint-rs.md new file mode 100644 index 0000000000..11f2f34e0a --- /dev/null +++ b/.changelog/unreleased/improvements/3735-update-tendermint-rs.md @@ -0,0 +1,2 @@ +- Update tendermint-rs, ibc-rs and tower-abci + ([\#3735](https://github.com/anoma/namada/issues/3735)) \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 0aab5e5b4e..fbf14cfafd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -347,6 +347,12 @@ dependencies = [ "critical-section", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto_impl" version = "1.1.0" @@ -367,18 +373,17 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.11", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -387,7 +392,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -395,17 +400,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.11", - "http-body", + "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", ] @@ -463,17 +471,17 @@ checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" [[package]] name = "basecoin-store" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba52d2e35c5bdd0ec8cee00da32a0b89720e36e6363ac95965a5d8c61e59ac7" +checksum = "dd18cd9983aad2c7dbe0552c597c1a2a8373c6e88ba327dce73860975554b3db" dependencies = [ "displaydoc", "ics23", - "prost 0.12.3", + "prost 0.13.2", "serde", "serde_json", "sha2 0.10.8", - "tendermint 0.35.0", + "tendermint", "tracing", ] @@ -604,6 +612,15 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "blake2b-rs" version = "0.2.0" @@ -2937,6 +2954,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util 0.7.10", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -3134,6 +3170,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.8.0" @@ -3156,9 +3215,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.11", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -3170,6 +3229,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.6", + "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" @@ -3178,7 +3258,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.27", "rustls", "tokio", "tokio-rustls", @@ -3186,14 +3266,15 @@ 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]] @@ -3203,12 +3284,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -3234,8 +3335,8 @@ dependencies = [ [[package]] name = "ibc" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-apps", "ibc-clients", @@ -3247,8 +3348,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -3257,8 +3358,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3279,8 +3380,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -3289,8 +3390,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3308,8 +3409,8 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -3317,8 +3418,8 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -3328,14 +3429,14 @@ dependencies = [ "ibc-core-host", "ibc-primitives", "serde", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", ] [[package]] name = "ibc-client-tendermint-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -3344,15 +3445,15 @@ dependencies = [ "ibc-primitives", "ibc-proto", "serde", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", - "tendermint-proto 0.37.0", + "tendermint-proto", ] [[package]] name = "ibc-client-wasm-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "base64 0.22.1", "displaydoc", @@ -3365,8 +3466,8 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3374,8 +3475,8 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3390,8 +3491,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -3405,8 +3506,8 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3424,13 +3525,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-client" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -3442,8 +3543,8 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -3453,13 +3554,13 @@ dependencies = [ "ibc-core-host-types", "ibc-primitives", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-client-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3474,13 +3575,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-commitment-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3499,8 +3600,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -3508,13 +3609,13 @@ dependencies = [ "ibc-core-handler-types", "ibc-core-host", "ibc-primitives", - "prost 0.12.3", + "prost 0.13.2", ] [[package]] name = "ibc-core-connection-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3530,13 +3631,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-handler" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3550,8 +3651,8 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3570,13 +3671,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-host" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -3593,8 +3694,8 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -3611,13 +3712,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-host-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3632,8 +3733,8 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -3646,8 +3747,8 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -3660,13 +3761,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-derive" -version = "0.7.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "proc-macro2", "quote", @@ -3675,8 +3776,8 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "arbitrary", "borsh", @@ -3684,40 +3785,40 @@ dependencies = [ "displaydoc", "ibc-proto", "parity-scale-codec", - "prost 0.12.3", + "prost 0.13.2", "scale-info", "schemars", "serde", - "tendermint 0.37.0", + "tendermint", "time", ] [[package]] name = "ibc-proto" -version = "0.46.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65" +checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733" dependencies = [ "base64 0.22.1", "borsh", "bytes", "flex-error", "ics23", - "informalsystems-pbjson 0.7.0", + "informalsystems-pbjson", "parity-scale-codec", - "prost 0.12.3", + "prost 0.13.2", "scale-info", "schemars", "serde", "subtle-encoding", - "tendermint-proto 0.37.0", + "tendermint-proto", "tonic", ] [[package]] name = "ibc-query" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "displaydoc", "ibc", @@ -3727,8 +3828,8 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "basecoin-store", "derive_more", @@ -3738,22 +3839,24 @@ dependencies = [ "ibc-query", "parking_lot", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", "tendermint-testgen", "typed-builder", ] [[package]] name = "ics23" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" +checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12" dependencies = [ "anyhow", + "blake2", + "blake3", "bytes", "hex", - "informalsystems-pbjson 0.6.0", - "prost 0.12.3", + "informalsystems-pbjson", + "prost 0.13.2", "ripemd", "serde", "sha2 0.10.8", @@ -3883,16 +3986,6 @@ dependencies = [ "serde", ] -[[package]] -name = "informalsystems-pbjson" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eecd90f87bea412eac91c6ef94f6b1e390128290898cbe14f2b926787ae1fb" -dependencies = [ - "base64 0.13.1", - "serde", -] - [[package]] name = "informalsystems-pbjson" version = "0.7.0" @@ -4692,7 +4785,7 @@ dependencies = [ "namada_wallet", "pretty_assertions", "proptest", - "prost 0.12.3", + "prost 0.13.2", "rand 0.8.5", "rand_core 0.6.4", "reqwest", @@ -4729,7 +4822,7 @@ dependencies = [ "namada_node", "namada_vm", "namada_vp", - "prost 0.12.3", + "prost 0.13.2", "rand 0.8.5", "rand_core 0.6.4", "sha2 0.9.9", @@ -4781,7 +4874,7 @@ dependencies = [ "num_enum 0.7.1", "primitive-types", "proptest", - "prost-types 0.12.3", + "prost-types 0.13.2", "rand 0.8.5", "rand_core 0.6.4", "rayon", @@ -4791,8 +4884,8 @@ dependencies = [ "sha2 0.9.9", "smooth-operator", "sparse-merkle-tree", - "tendermint 0.37.0", - "tendermint-proto 0.37.0", + "tendermint", + "tendermint-proto", "thiserror", "tiny-keccak", "tokio", @@ -4906,7 +4999,7 @@ dependencies = [ "namada_node", "namada_sdk", "namada_tx", - "prost 0.12.3", + "prost 0.13.2", ] [[package]] @@ -4988,7 +5081,7 @@ dependencies = [ "namada_vp", "primitive-types", "proptest", - "prost 0.12.3", + "prost 0.13.2", "serde", "serde_json", "sha2 0.9.9", @@ -5016,7 +5109,7 @@ dependencies = [ "borsh", "borsh-ext", "namada_sdk", - "prost 0.12.3", + "prost 0.13.2", "serde_json", "tendermint-config", "tendermint-rpc", @@ -5049,7 +5142,7 @@ dependencies = [ "namada_macros", "namada_migrations", "proptest", - "prost 0.12.3", + "prost 0.13.2", "sparse-merkle-tree", "thiserror", ] @@ -5104,7 +5197,7 @@ dependencies = [ "num_cpus", "once_cell", "proptest", - "prost 0.12.3", + "prost 0.13.2", "rand 0.8.5", "rand_core 0.6.4", "rayon", @@ -5241,7 +5334,7 @@ dependencies = [ "paste", "patricia_tree", "proptest", - "prost 0.12.3", + "prost 0.13.2", "rand 0.8.5", "rand_core 0.6.4", "rayon", @@ -5376,7 +5469,7 @@ dependencies = [ "borsh", "namada_core", "namada_state", - "prost 0.12.3", + "prost 0.13.2", "strum 0.24.1", ] @@ -5397,7 +5490,7 @@ dependencies = [ "eyre", "flate2", "fs_extra", - "hyper", + "hyper 0.14.27", "ibc-testkit", "ics23", "itertools 0.12.1", @@ -5415,7 +5508,7 @@ dependencies = [ "once_cell", "proptest", "proptest-state-machine", - "prost 0.12.3", + "prost 0.13.2", "rand 0.8.5", "regex", "serde", @@ -5494,8 +5587,8 @@ dependencies = [ "num-derive 0.4.2", "num-traits 0.2.17", "proptest", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.13.2", + "prost-types 0.13.2", "rand 0.8.5", "rand_core 0.6.4", "serde", @@ -6589,6 +6682,16 @@ dependencies = [ "prost-derive 0.12.3", ] +[[package]] +name = "prost" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" +dependencies = [ + "bytes", + "prost-derive 0.13.2", +] + [[package]] name = "prost-build" version = "0.12.3" @@ -6637,6 +6740,19 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "prost-derive" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "prost-types" version = "0.11.9" @@ -6655,6 +6771,15 @@ dependencies = [ "prost 0.12.3", ] +[[package]] +name = "prost-types" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519" +dependencies = [ + "prost 0.13.2", +] + [[package]] name = "ptr_meta" version = "0.1.4" @@ -6946,10 +7071,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "hyper-tls", "ipnet", @@ -6966,7 +7091,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -7740,9 +7865,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -7813,7 +7938,7 @@ dependencies = [ [[package]] name = "sparse-merkle-tree" version = "0.3.1-pre" -source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=bab8cb96872db22cc9a139b2d3dfc4e00521d097#bab8cb96872db22cc9a139b2d3dfc4e00521d097" +source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" dependencies = [ "blake2b-rs", "borsh", @@ -7977,6 +8102,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 = "sysinfo" version = "0.27.8" @@ -8050,36 +8181,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" -dependencies = [ - "bytes", - "digest 0.10.7", - "ed25519", - "flex-error", - "futures", - "num-traits 0.2.17", - "once_cell", - "prost 0.12.3", - "prost-types 0.12.3", - "serde", - "serde_bytes", - "serde_json", - "serde_repr", - "signature", - "subtle", - "subtle-encoding", - "tendermint-proto 0.35.0", - "time", - "zeroize", -] - -[[package]] -name = "tendermint" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42" +checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" dependencies = [ "bytes", "digest 0.10.7", @@ -8090,8 +8194,8 @@ dependencies = [ "k256", "num-traits 0.2.17", "once_cell", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.13.2", + "prost-types 0.13.2", "ripemd", "serde", "serde_bytes", @@ -8101,30 +8205,30 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto 0.37.0", + "tendermint-proto", "time", "zeroize", ] [[package]] name = "tendermint-config" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84b11b57d20ee4492a1452faff85f5c520adc36ca9fe5e701066935255bb89f" +checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" dependencies = [ "flex-error", "serde", "serde_json", - "tendermint 0.37.0", + "tendermint", "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4faf208913acf562b8703e8e1e5eabdc57efa88c1404f9df20338a9969f08d6b" +checksum = "d91e5abb448c65e8abdfe0e17a3a189e005a71b4169b89f36aaa2053ff239577" dependencies = [ "contracts", "crossbeam-channel", @@ -8137,7 +8241,7 @@ dependencies = [ "serde_derive", "serde_json", "static_assertions", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", "tendermint-rpc", "time", @@ -8147,45 +8251,27 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e" +checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" dependencies = [ "derive_more", "flex-error", "serde", - "tendermint 0.37.0", + "tendermint", "time", ] [[package]] name = "tendermint-proto" -version = "0.35.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" +checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" dependencies = [ "bytes", "flex-error", - "num-derive 0.4.2", - "num-traits 0.2.17", - "prost 0.12.3", - "prost-types 0.12.3", - "serde", - "serde_bytes", - "subtle-encoding", - "time", -] - -[[package]] -name = "tendermint-proto" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87" -dependencies = [ - "bytes", - "flex-error", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.13.2", + "prost-types 0.13.2", "serde", "serde_bytes", "subtle-encoding", @@ -8194,9 +8280,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdc2281e271277fda184d96d874a6fe59f569b130b634289257baacfc95aa85" +checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" dependencies = [ "async-trait", "bytes", @@ -8213,9 +8299,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", "tendermint-config", - "tendermint-proto 0.37.0", + "tendermint-proto", "thiserror", "time", "tokio", @@ -8227,9 +8313,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318a0e38b3b7b36b4078d78446d4284088aa9b173d519fc804c3ee4683972934" +checksum = "ae007e2918414ae96e4835426aace7538d23b8ddf96d71e23d241f58f386e877" dependencies = [ "ed25519-consensus", "gumdrop", @@ -8237,7 +8323,7 @@ dependencies = [ "serde_json", "simple-error", "tempfile", - "tendermint 0.37.0", + "tendermint", "time", ] @@ -8462,16 +8548,6 @@ dependencies = [ "windows-sys 0.52.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.4.0" @@ -8648,23 +8724,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", - "h2", - "http 0.2.11", - "http-body", - "hyper", + "h2 0.4.6", + "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 0.12.3", + "prost 0.13.2", + "socket2 0.5.5", "tokio", "tokio-stream", "tower", @@ -8709,16 +8788,15 @@ dependencies = [ [[package]] name = "tower-abci" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b3ff634b4d50f220d9dd8bc21ca086d978ae327bb31ef4fd1c6682c897b0f0" +version = "0.16.0" +source = "git+https://github.com/heliaxdev/tower-abci?rev=30d2a8cdf8321b599ae13ba74f4c78217a64ce58#30d2a8cdf8321b599ae13ba74f4c78217a64ce58" dependencies = [ "bytes", "futures", "pin-project", - "prost 0.12.3", - "tendermint 0.37.0", - "tendermint-proto 0.37.0", + "prost 0.13.2", + "tendermint", + "tendermint-proto", "tokio", "tokio-stream", "tokio-util 0.6.10", @@ -9131,7 +9209,7 @@ dependencies = [ "futures-util", "headers", "http 0.2.11", - "hyper", + "hyper 0.14.27", "log", "mime", "mime_guess", diff --git a/Cargo.toml b/Cargo.toml index 10cb44fa03..33e4fa2980 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ ark-bls12-381 = {version = "0.3"} ark-serialize = {version = "0.3"} ark-std = "0.3.0" # branch = "bat/feat/validate-root" -arse-merkle-tree = {package = "sparse-merkle-tree", git = "https://github.com/heliaxdev/sparse-merkle-tree", rev = "bab8cb96872db22cc9a139b2d3dfc4e00521d097", default-features = false, features = ["std", "borsh"]} +arse-merkle-tree = {package = "sparse-merkle-tree", git = "https://github.com/heliaxdev/sparse-merkle-tree", rev = "a93c55ccd47840ee0967eee237e47d9245478594", default-features = false, features = ["std", "borsh"]} assert_cmd = "1.0.7" assert_matches = "1.5.0" async-trait = {version = "0.1.51"} @@ -117,10 +117,11 @@ flume = "0.11.0" fs_extra = "1.2.0" futures = "0.3" git2 = { version = "0.18.1", default-features = false } -ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "0c3b3c0ab598e1e627089d06941efe0e39b61cd7", features = ["serde"] } -ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "0c3b3c0ab598e1e627089d06941efe0e39b61cd7" } -ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "0c3b3c0ab598e1e627089d06941efe0e39b61cd7", default-features = false } -ics23 = "0.11.0" +# branch yuji/derive-arbitrary +ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38bd2a32f35117d4d9165a3c68c64ccd87ad56dd", features = ["serde"] } +ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" } +ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38bd2a32f35117d4d9165a3c68c64ccd87ad56dd", default-features = false } +ics23 = "0.12.0" index-set = { git = "https://github.com/heliaxdev/index-set", tag = "v0.8.1", features = ["serialize-borsh", "serialize-serde"] } indexmap = { git = "https://github.com/heliaxdev/indexmap", tag = "2.2.4-heliax-1", features = ["borsh-schema", "serde"] } init-once = "0.6.0" @@ -156,8 +157,8 @@ pretty_assertions = "1.4.0" primitive-types = "0.12.1" proptest = "1.4.0" proptest-state-machine = "0.3.0" -prost = "0.12.0" -prost-types = "0.12.0" +prost = "0.13.1" +prost-types = "0.13.1" rand = {version = "0.8", default-features = false} rand_core = {version = "0.6", default-features = false} rayon = "1.5.3" @@ -181,11 +182,11 @@ smooth-operator = {git = "https://github.com/heliaxdev/smooth-operator", tag = " sysinfo = {version = "0.27.8", default-features = false} tar = "0.4.37" tempfile = {version = "3.2.0"} -tendermint = {version = "0.37.0", features = ["secp256k1"]} -tendermint-config = "0.37.0" -tendermint-light-client = "0.37.0" -tendermint-proto = "0.37.0" -tendermint-rpc = {version = "0.37.0", default-features = false} +tendermint = {version = "0.38.0", features = ["secp256k1"]} +tendermint-config = "0.38.0" +tendermint-light-client = "0.38.0" +tendermint-proto = "0.38.0" +tendermint-rpc = {version = "0.38.0", default-features = false} test-log = {version = "0.2.14", default-features = false, features = ["trace"]} tiny-bip39 = {git = "https://github.com/anoma/tiny-bip39.git", rev = "bf0f6d8713589b83af7a917366ec31f5275c0e57"} tiny-hderive = {git = "https://github.com/heliaxdev/tiny-hderive.git", rev = "173ae03abed0cd25d88a5a13efac00af96b75b87"} @@ -197,7 +198,8 @@ toml = "0.5.8" tonic = "0.8.3" tonic-build = "0.11.0" tower = "0.4" -tower-abci = "0.15.0" +# branch yuji/tendermint-0.38 +tower-abci = { git = "https://github.com/heliaxdev/tower-abci", rev = "30d2a8cdf8321b599ae13ba74f4c78217a64ce58" } tracing = "0.1.30" tracing-appender = "0.2.2" tracing-log = "0.2.0" diff --git a/crates/ibc/src/actions.rs b/crates/ibc/src/actions.rs index f5ce305ace..a266c69370 100644 --- a/crates/ibc/src/actions.rs +++ b/crates/ibc/src/actions.rs @@ -10,7 +10,7 @@ use borsh::BorshDeserialize; use ibc::apps::transfer::types::msgs::transfer::MsgTransfer as IbcMsgTransfer; use ibc::apps::transfer::types::packet::PacketData; use ibc::apps::transfer::types::PrefixedCoin; -use ibc::core::channel::types::timeout::TimeoutHeight; +use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; use namada_core::address::Address; use namada_core::borsh::{BorshSerialize, BorshSerializeExt}; use namada_core::chain::ChainId; @@ -231,12 +231,15 @@ where + min_duration; let timeout_timestamp = TmTime::try_from(timeout_timestamp).into_storage_result()?; + let timeout_timestamp = TimeoutTimestamp::At( + timeout_timestamp.try_into().into_storage_result()?, + ); let message = IbcMsgTransfer { port_id_on_a: target.port_id.clone(), chan_id_on_a: target.channel_id.clone(), packet_data, timeout_height_on_b: TimeoutHeight::Never, - timeout_timestamp_on_b: timeout_timestamp.into(), + timeout_timestamp_on_b: timeout_timestamp, }; let data = MsgTransfer:: { message, diff --git a/crates/ibc/src/context/common.rs b/crates/ibc/src/context/common.rs index aeba84a332..7f920d8cb3 100644 --- a/crates/ibc/src/context/common.rs +++ b/crates/ibc/src/context/common.rs @@ -222,7 +222,13 @@ pub trait IbcCommonContext: IbcStorageContext { "Decoding the client update time failed: ID {client_id}", ), })? - .into(); + .try_into() + .map_err(|_| ClientError::Other { + description: format!( + "Conversion of the client update time failed: ID \ + {client_id}", + ), + })?; let key = storage::client_update_height_key(client_id); let value = self.storage().read_bytes(&key)?.ok_or({ @@ -251,11 +257,7 @@ pub trait IbcCommonContext: IbcStorageContext { host_height: Height, ) -> Result<()> { let key = storage::client_update_timestamp_key(client_id); - let time = host_timestamp.into_tm_time().ok_or(ClientError::Other { - description: format!( - "The client timestamp is invalid: ID {client_id}", - ), - })?; + let time = host_timestamp.into_tm_time(); self.storage_mut() .write_bytes(&key, time.encode_vec()) .map_err(ContextError::from)?; @@ -301,12 +303,18 @@ pub trait IbcCommonContext: IbcStorageContext { description: "No host block header".to_string(), }) })?; - let time = TmTime::try_from(header.time).map_err(|_| { - ContextError::ClientError(ClientError::Other { - description: "Converting to Tendermint time failed".to_string(), - }) - })?; - Ok(time.into()) + let time = TmTime::try_from(header.time) + .map_err(|_| { + ContextError::ClientError(ClientError::Other { + description: "Converting to Tendermint time failed" + .to_string(), + }) + })? + .try_into() + .map_err(|_| ClientError::Other { + description: "Converting to timestamp failed".to_string(), + })?; + Ok(time) } /// Get the consensus state of this chain diff --git a/crates/ibc/src/event.rs b/crates/ibc/src/event.rs index 51c81fe2b7..0fd68c4dba 100644 --- a/crates/ibc/src/event.rs +++ b/crates/ibc/src/event.rs @@ -4,7 +4,9 @@ use std::cmp::Ordering; use std::str::FromStr; use ibc::core::channel::types::packet::Packet; -use ibc::core::channel::types::timeout::TimeoutHeight as IbcTimeoutHeight; +use ibc::core::channel::types::timeout::{ + TimeoutHeight as IbcTimeoutHeight, TimeoutTimestamp as IbcTimeoutTimestamp, +}; use ibc::core::client::types::events::{ CLIENT_ID_ATTRIBUTE_KEY, CONSENSUS_HEIGHTS_ATTRIBUTE_KEY, }; @@ -14,7 +16,7 @@ use ibc::core::host::types::identifiers::{ ChannelId as IbcChannelId, ClientId as IbcClientId, ConnectionId as IbcConnectionId, PortId, Sequence, }; -use ibc::primitives::Timestamp; +use ibc::primitives::{Timestamp, TimestampError}; use namada_core::borsh::*; use namada_core::collections::HashMap; use namada_core::tendermint::abci::Event as AbciEvent; @@ -366,11 +368,39 @@ impl EventAttributeEntry<'static> for PacketTimeoutHeight { } } +/// Represents an IBC timeout timestamp. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct TimeoutTimestamp(pub IbcTimeoutTimestamp); + +impl FromStr for TimeoutTimestamp { + type Err = TimestampError; + + fn from_str(s: &str) -> Result { + let timestamp = Timestamp::from_str(s)?; + if timestamp.nanoseconds() == 0 { + Ok(TimeoutTimestamp(IbcTimeoutTimestamp::Never)) + } else { + Ok(TimeoutTimestamp(IbcTimeoutTimestamp::At(timestamp))) + } + } +} + +impl std::fmt::Display for TimeoutTimestamp { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match &self.0 { + IbcTimeoutTimestamp::Never => { + write!(f, "{}", Timestamp::from_nanoseconds(0)) + } + IbcTimeoutTimestamp::At(h) => write!(f, "{h}"), + } + } +} + /// Extend an [`Event`] with packet timeout timestamp data. -pub struct PacketTimeoutTimestamp(pub Timestamp); +pub struct PacketTimeoutTimestamp(pub TimeoutTimestamp); impl EventAttributeEntry<'static> for PacketTimeoutTimestamp { - type Value = Timestamp; + type Value = TimeoutTimestamp; type ValueOwned = Self::Value; const KEY: &'static str = "packet_timeout_timestamp"; @@ -424,7 +454,7 @@ pub fn packet_from_event_attributes( )? .0, timeout_timestamp_on_b: - PacketTimeoutTimestamp::read_from_event_attributes(attributes)?, + PacketTimeoutTimestamp::read_from_event_attributes(attributes)?.0, }) } diff --git a/crates/ibc/src/lib.rs b/crates/ibc/src/lib.rs index b2b99a7cf6..b77fef8da4 100644 --- a/crates/ibc/src/lib.rs +++ b/crates/ibc/src/lib.rs @@ -66,7 +66,7 @@ use ibc::core::channel::types::commitment::compute_ack_commitment; use ibc::core::channel::types::msgs::{ MsgRecvPacket as IbcMsgRecvPacket, PacketMsg, }; -use ibc::core::channel::types::timeout::TimeoutHeight; +use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; use ibc::core::entrypoint::{execute, validate}; use ibc::core::handler::types::error::ContextError; use ibc::core::handler::types::events::Error as RawIbcEventError; @@ -96,7 +96,6 @@ use namada_state::{ use namada_systems::ibc::ChangedBalances; use namada_systems::trans_token; pub use nft::*; -use primitives::Timestamp; use prost::Message; use thiserror::Error; use trace::{ @@ -152,7 +151,7 @@ struct IbcTransferInfo { src_port_id: PortId, src_channel_id: ChannelId, timeout_height: TimeoutHeight, - timeout_timestamp: Timestamp, + timeout_timestamp: TimeoutTimestamp, packet_data: Vec, ibc_traces: Vec, amount: Amount, @@ -956,7 +955,7 @@ pub mod testing { Amount, BaseDenom, Memo, PrefixedCoin, PrefixedDenom, TracePath, TracePrefix, }; - use ibc::core::channel::types::timeout::TimeoutHeight; + use ibc::core::channel::types::timeout::{TimeoutHeight, TimeoutTimestamp}; use ibc::core::client::types::Height; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::Signer; @@ -1000,8 +999,8 @@ pub mod testing { prop_compose! { /// Generate an arbitrary IBC timestamp - pub fn arb_ibc_timestamp()(nanoseconds: u64) -> Timestamp { - Timestamp::from_nanoseconds(nanoseconds).expect("generated invalid IBC timestamp") + pub fn arb_ibc_timestamp()(nanoseconds: u64) -> TimeoutTimestamp { + TimeoutTimestamp::At(Timestamp::from_nanoseconds(nanoseconds)) } } diff --git a/crates/ibc/src/vp/mod.rs b/crates/ibc/src/vp/mod.rs index c6eeb1b0d2..c1a4870b5c 100644 --- a/crates/ibc/src/vp/mod.rs +++ b/crates/ibc/src/vp/mod.rs @@ -458,6 +458,7 @@ mod tests { use std::str::FromStr; use assert_matches::assert_matches; + use ibc::core::channel::types::timeout::TimeoutTimestamp; use ibc_testkit::testapp::ibc::clients::mock::client_state::{ client_type, MockClientState, MOCK_CLIENT_TYPE, }; @@ -1147,7 +1148,7 @@ mod tests { let time = (TmTime::now() - std::time::Duration::new(100, 0)).unwrap(); let header = MockHeader { height, - timestamp: time.into(), + timestamp: time.try_into().unwrap(), }; let msg = MsgUpdateClient { client_id: client_id.clone(), @@ -2286,7 +2287,7 @@ mod tests { memo: "memo".to_string().into(), }, timeout_height_on_b: TimeoutHeight::At(Height::new(0, 10).unwrap()), - timeout_timestamp_on_b: Timestamp::none(), + timeout_timestamp_on_b: TimeoutTimestamp::Never, }; // the sequence send @@ -2433,7 +2434,7 @@ mod tests { memo: "memo".to_string().into(), }, timeout_height_on_b: TimeoutHeight::At(Height::new(0, 10).unwrap()), - timeout_timestamp_on_b: Timestamp::none(), + timeout_timestamp_on_b: TimeoutTimestamp::Never, }; let counterparty = get_channel_counterparty(); let packet = @@ -2634,7 +2635,7 @@ mod tests { memo: "memo".to_string().into(), }, timeout_height_on_b: TimeoutHeight::At(Height::new(0, 10).unwrap()), - timeout_timestamp_on_b: Timestamp::none(), + timeout_timestamp_on_b: TimeoutTimestamp::Never, }; let sequence = 1.into(); let packet = packet_from_message( @@ -2796,8 +2797,9 @@ mod tests { memo: "memo".to_string().into(), }, timeout_height_on_b: TimeoutHeight::Never, - timeout_timestamp_on_b: (Timestamp::now() - Duration::new(10, 0)) - .unwrap(), + timeout_timestamp_on_b: TimeoutTimestamp::At( + (Timestamp::now() - Duration::new(10, 0)).unwrap(), + ), }; let sequence = 1.into(); let packet = packet_from_message( @@ -2954,7 +2956,7 @@ mod tests { memo: "memo".to_string().into(), }, timeout_height_on_b: TimeoutHeight::At(Height::new(0, 10).unwrap()), - timeout_timestamp_on_b: Timestamp::none(), + timeout_timestamp_on_b: TimeoutTimestamp::Never, }; let sequence = 1.into(); let packet = packet_from_message( @@ -3140,7 +3142,7 @@ mod tests { memo: Some("memo".to_string().into()), }, timeout_height_on_b: TimeoutHeight::At(Height::new(0, 10).unwrap()), - timeout_timestamp_on_b: Timestamp::none(), + timeout_timestamp_on_b: TimeoutTimestamp::Never, }; // the sequence send @@ -3296,7 +3298,7 @@ mod tests { memo: Some("memo".to_string().into()), }, timeout_height_on_b: TimeoutHeight::At(Height::new(0, 10).unwrap()), - timeout_timestamp_on_b: Timestamp::none(), + timeout_timestamp_on_b: TimeoutTimestamp::Never, }; let counterparty = get_channel_counterparty_for_nft(); let packet = diff --git a/crates/node/src/bench_utils.rs b/crates/node/src/bench_utils.rs index 2ae4950568..8a50e3142a 100644 --- a/crates/node/src/bench_utils.rs +++ b/crates/node/src/bench_utils.rs @@ -44,7 +44,9 @@ use namada_sdk::ibc::clients::tendermint::types::{ use namada_sdk::ibc::core::channel::types::channel::{ ChannelEnd, Counterparty as ChannelCounterparty, Order, State, }; -use namada_sdk::ibc::core::channel::types::timeout::TimeoutHeight; +use namada_sdk::ibc::core::channel::types::timeout::{ + TimeoutHeight, TimeoutTimestamp, +}; use namada_sdk::ibc::core::channel::types::Version as ChannelVersion; use namada_sdk::ibc::core::client::types::Height as IbcHeight; use namada_sdk::ibc::core::commitment_types::commitment::{ @@ -237,7 +239,7 @@ impl BenchShellInner { #[allow(clippy::disallowed_methods)] let now: namada_sdk::tendermint::Time = DateTimeUtc::now().try_into().unwrap(); - let now: IbcTimestamp = now.into(); + let now: IbcTimestamp = now.try_into().unwrap(); let timeout_timestamp = (now + std::time::Duration::new(3600, 0)).unwrap(); @@ -251,7 +253,7 @@ impl BenchShellInner { memo: "".parse().unwrap(), }, timeout_height_on_b: timeout_height, - timeout_timestamp_on_b: timeout_timestamp, + timeout_timestamp_on_b: TimeoutTimestamp::At(timeout_timestamp), }; let msg = MsgTransfer:: { @@ -983,8 +985,7 @@ impl Client for BenchShell { .collect(), tendermint::evidence::List::default(), None, - ) - .unwrap(), + ), }) } @@ -1319,7 +1320,7 @@ impl BenchShieldedCtx { #[allow(clippy::disallowed_methods)] let now: namada_sdk::tendermint::Time = DateTimeUtc::now().try_into().unwrap(); - let now: IbcTimestamp = now.into(); + let now: IbcTimestamp = now.try_into().unwrap(); let timeout_timestamp = (now + std::time::Duration::new(3600, 0)).unwrap(); let msg = IbcMsgTransfer { @@ -1332,7 +1333,7 @@ impl BenchShieldedCtx { memo: "".parse().unwrap(), }, timeout_height_on_b: timeout_height, - timeout_timestamp_on_b: timeout_timestamp, + timeout_timestamp_on_b: TimeoutTimestamp::At(timeout_timestamp), }; let vectorized_transfer = diff --git a/crates/node/src/shell/testing/node.rs b/crates/node/src/shell/testing/node.rs index 1799e28d93..a804b2a641 100644 --- a/crates/node/src/shell/testing/node.rs +++ b/crates/node/src/shell/testing/node.rs @@ -561,8 +561,7 @@ impl MockNode { txs.into_iter().map(|tx| tx.tx.to_vec()).collect(), tendermint::evidence::List::default(), None, - ) - .unwrap(), + ), }, ); } @@ -695,8 +694,7 @@ impl MockNode { txs, tendermint::evidence::List::default(), None, - ) - .unwrap(), + ), }, ); locked.commit(); diff --git a/crates/sdk/src/signing.rs b/crates/sdk/src/signing.rs index 7c180ec9bc..8d10bef5f7 100644 --- a/crates/sdk/src/signing.rs +++ b/crates/sdk/src/signing.rs @@ -1317,12 +1317,7 @@ pub async fn to_ledger_vector( ), format!( "Timeout timestamp : {}", - transfer - .message - .timeout_timestamp_on_b - .into_tm_time() - .map_or("no timestamp".to_string(), |time| time - .to_rfc3339()) + transfer.message.timeout_timestamp_on_b, ), ]); tv.output_expert.extend(vec![ @@ -1351,12 +1346,7 @@ pub async fn to_ledger_vector( ), format!( "Timeout timestamp : {}", - transfer - .message - .timeout_timestamp_on_b - .into_tm_time() - .map_or("no timestamp".to_string(), |time| time - .to_rfc3339()) + transfer.message.timeout_timestamp_on_b, ), ]); if let Some(transfer) = transfer.transfer { @@ -1449,12 +1439,7 @@ pub async fn to_ledger_vector( ), format!( "Timeout timestamp : {}", - transfer - .message - .timeout_timestamp_on_b - .into_tm_time() - .map_or("no timestamp".to_string(), |time| time - .to_rfc3339()) + transfer.message.timeout_timestamp_on_b, ), ]); tv.output_expert.extend(vec![ @@ -1522,12 +1507,7 @@ pub async fn to_ledger_vector( ), format!( "Timeout timestamp : {}", - transfer - .message - .timeout_timestamp_on_b - .into_tm_time() - .map_or("no timestamp".to_string(), |time| time - .to_rfc3339()) + transfer.message.timeout_timestamp_on_b, ), ]); if let Some(transfer) = transfer.transfer { diff --git a/crates/sdk/src/tx.rs b/crates/sdk/src/tx.rs index f8f7c62c2b..21343a00d4 100644 --- a/crates/sdk/src/tx.rs +++ b/crates/sdk/src/tx.rs @@ -31,7 +31,9 @@ use namada_core::ibc::apps::nft_transfer::types::PrefixedClassId; use namada_core::ibc::apps::transfer::types::msgs::transfer::MsgTransfer as IbcMsgTransfer; use namada_core::ibc::apps::transfer::types::packet::PacketData; use namada_core::ibc::apps::transfer::types::PrefixedCoin; -use namada_core::ibc::core::channel::types::timeout::TimeoutHeight; +use namada_core::ibc::core::channel::types::timeout::{ + TimeoutHeight, TimeoutTimestamp, +}; use namada_core::ibc::core::client::types::Height as IbcHeight; use namada_core::ibc::core::host::types::identifiers::{ChannelId, PortId}; use namada_core::ibc::primitives::Timestamp as IbcTimestamp; @@ -2637,16 +2639,20 @@ pub async fn build_ibc_transfer( } .try_into(); let now = now.map_err(|e| Error::Other(e.to_string()))?; - let now: IbcTimestamp = now.into(); + let now: IbcTimestamp = now.try_into().map_err(|e| { + Error::Other(format!("Timestamp conversion failed: {e}")) + })?; let timeout_timestamp = if let Some(offset) = args.timeout_sec_offset { - (now + Duration::new(offset, 0)) - .map_err(|e| Error::Other(e.to_string()))? + let timestamp = (now + Duration::new(offset, 0)) + .map_err(|e| Error::Other(e.to_string()))?; + TimeoutTimestamp::At(timestamp) } else if timeout_height == TimeoutHeight::Never { // we cannot set 0 to both the height and the timestamp - (now + Duration::new(3600, 0)) - .map_err(|e| Error::Other(e.to_string()))? + let timestamp = (now + Duration::new(3600, 0)) + .map_err(|e| Error::Other(e.to_string()))?; + TimeoutTimestamp::At(timestamp) } else { - IbcTimestamp::none() + TimeoutTimestamp::Never }; let chain_id = args.tx.chain_id.clone().unwrap(); diff --git a/crates/tests/src/vm_host_env/ibc.rs b/crates/tests/src/vm_host_env/ibc.rs index d96eacfc2e..b11526f0b7 100644 --- a/crates/tests/src/vm_host_env/ibc.rs +++ b/crates/tests/src/vm_host_env/ibc.rs @@ -30,7 +30,9 @@ use namada_sdk::ibc::core::channel::types::msgs::{ MsgChannelOpenTry, MsgRecvPacket, MsgTimeout, MsgTimeoutOnClose, }; pub use namada_sdk::ibc::core::channel::types::packet::Packet; -use namada_sdk::ibc::core::channel::types::timeout::TimeoutHeight; +use namada_sdk::ibc::core::channel::types::timeout::{ + TimeoutHeight, TimeoutTimestamp, +}; use namada_sdk::ibc::core::channel::types::Version as ChanVersion; use namada_sdk::ibc::core::client::types::msgs::{ MsgCreateClient, MsgUpdateClient, @@ -621,7 +623,7 @@ pub fn msg_transfer( memo: "memo".to_string().into(), }, timeout_height_on_b: TimeoutHeight::Never, - timeout_timestamp_on_b: timestamp, + timeout_timestamp_on_b: TimeoutTimestamp::At(timestamp), }; MsgTransfer { message, @@ -682,7 +684,7 @@ pub fn received_packet( chan_id_on_b: channel_id, data: serde_json::to_vec(&data).unwrap(), timeout_height_on_b: TimeoutHeight::Never, - timeout_timestamp_on_b: timestamp, + timeout_timestamp_on_b: TimeoutTimestamp::At(timestamp), } } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index cf82316996..caa7f23b94 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -236,6 +236,12 @@ dependencies = [ "rustc_version 0.4.0", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto_impl" version = "1.1.0" @@ -256,18 +262,17 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.11", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -276,7 +281,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -284,17 +289,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.11", - "http-body", + "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", ] @@ -352,17 +360,17 @@ checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" [[package]] name = "basecoin-store" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba52d2e35c5bdd0ec8cee00da32a0b89720e36e6363ac95965a5d8c61e59ac7" +checksum = "dd18cd9983aad2c7dbe0552c597c1a2a8373c6e88ba327dce73860975554b3db" dependencies = [ "displaydoc", "ics23", - "prost", + "prost 0.13.1", "serde", "serde_json", "sha2 0.10.8", - "tendermint 0.35.0", + "tendermint", "tracing", ] @@ -459,6 +467,15 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "blake2b_simd" version = "1.0.2" @@ -2251,6 +2268,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" @@ -2289,9 +2325,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2366,6 +2402,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.8.0" @@ -2388,9 +2447,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.11", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -2402,16 +2461,38 @@ 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-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]] @@ -2421,12 +2502,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -2452,8 +2553,8 @@ dependencies = [ [[package]] name = "ibc" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-apps", "ibc-clients", @@ -2465,8 +2566,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2475,8 +2576,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "base64 0.22.1", "borsh", @@ -2496,8 +2597,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2506,8 +2607,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2524,8 +2625,8 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2533,8 +2634,8 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -2544,14 +2645,14 @@ dependencies = [ "ibc-core-host", "ibc-primitives", "serde", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", ] [[package]] name = "ibc-client-tendermint-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2560,15 +2661,15 @@ dependencies = [ "ibc-primitives", "ibc-proto", "serde", - "tendermint 0.37.0", + "tendermint", "tendermint-light-client-verifier", - "tendermint-proto 0.37.0", + "tendermint-proto", ] [[package]] name = "ibc-client-wasm-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "base64 0.22.1", "displaydoc", @@ -2581,8 +2682,8 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2590,8 +2691,8 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2606,8 +2707,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2621,8 +2722,8 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2639,13 +2740,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-client" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2657,8 +2758,8 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -2668,13 +2769,13 @@ dependencies = [ "ibc-core-host-types", "ibc-primitives", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-client-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2688,13 +2789,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-commitment-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2712,8 +2813,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -2721,13 +2822,13 @@ dependencies = [ "ibc-core-handler-types", "ibc-core-host", "ibc-primitives", - "prost", + "prost 0.13.1", ] [[package]] name = "ibc-core-connection-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2742,13 +2843,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-handler" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2762,8 +2863,8 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2781,13 +2882,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-host" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -2804,8 +2905,8 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -2822,13 +2923,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-core-host-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2842,8 +2943,8 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -2856,8 +2957,8 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -2870,13 +2971,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", ] [[package]] name = "ibc-derive" -version = "0.7.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "proc-macro2", "quote", @@ -2885,48 +2986,48 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", "displaydoc", "ibc-proto", "parity-scale-codec", - "prost", + "prost 0.13.1", "scale-info", "schemars", "serde", - "tendermint 0.37.0", + "tendermint", "time", ] [[package]] name = "ibc-proto" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65" +checksum = "1678333cf68c9094ca66aaf9a271269f1f6bf5c26881161def8bd88cee831a23" dependencies = [ "base64 0.22.1", "borsh", "bytes", "flex-error", "ics23", - "informalsystems-pbjson 0.7.0", + "informalsystems-pbjson", "parity-scale-codec", - "prost", + "prost 0.13.1", "scale-info", "schemars", "serde", "subtle-encoding", - "tendermint-proto 0.37.0", + "tendermint-proto", "tonic", ] [[package]] name = "ibc-query" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "displaydoc", "ibc", @@ -2936,8 +3037,8 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "basecoin-store", "derive_more", @@ -2947,22 +3048,24 @@ dependencies = [ "ibc-query", "parking_lot", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", "tendermint-testgen", "typed-builder", ] [[package]] name = "ics23" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" +checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12" dependencies = [ "anyhow", + "blake2", + "blake3", "bytes", "hex", - "informalsystems-pbjson 0.6.0", - "prost", + "informalsystems-pbjson", + "prost 0.13.1", "ripemd", "serde", "sha2 0.10.8", @@ -3091,16 +3194,6 @@ dependencies = [ "serde", ] -[[package]] -name = "informalsystems-pbjson" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eecd90f87bea412eac91c6ef94f6b1e390128290898cbe14f2b926787ae1fb" -dependencies = [ - "base64 0.13.1", - "serde", -] - [[package]] name = "informalsystems-pbjson" version = "0.7.0" @@ -3509,13 +3602,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3580,7 +3674,7 @@ dependencies = [ "num_enum", "primitive-types", "proptest", - "prost-types", + "prost-types 0.13.1", "rand 0.8.5", "rand_core 0.6.4", "rayon", @@ -3590,8 +3684,8 @@ dependencies = [ "sha2 0.9.9", "smooth-operator", "sparse-merkle-tree", - "tendermint 0.37.0", - "tendermint-proto 0.37.0", + "tendermint", + "tendermint-proto", "thiserror", "tiny-keccak", "tokio", @@ -3700,7 +3794,7 @@ dependencies = [ "namada_vp", "primitive-types", "proptest", - "prost", + "prost 0.13.1", "serde", "serde_json", "sha2 0.9.9", @@ -3741,7 +3835,7 @@ dependencies = [ "ics23", "namada_core", "namada_macros", - "prost", + "prost 0.13.1", "sparse-merkle-tree", "thiserror", ] @@ -3840,7 +3934,7 @@ dependencies = [ "paste", "patricia_tree", "proptest", - "prost", + "prost 0.13.1", "rand 0.8.5", "rand_core 0.6.4", "rayon", @@ -3958,7 +4052,7 @@ dependencies = [ "borsh", "namada_core", "namada_state", - "prost", + "prost 0.13.1", "strum 0.24.1", ] @@ -3968,7 +4062,7 @@ version = "0.43.0" dependencies = [ "concat-idents", "derivative", - "hyper", + "hyper 0.14.27", "ibc-testkit", "ics23", "itertools 0.12.1", @@ -3981,7 +4075,7 @@ dependencies = [ "namada_vp", "namada_vp_prelude", "proptest", - "prost", + "prost 0.13.1", "regex", "serde", "serde_json", @@ -4042,8 +4136,8 @@ dependencies = [ "num-derive 0.4.2", "num-traits 0.2.17", "proptest", - "prost", - "prost-types", + "prost 0.13.1", + "prost-types 0.13.1", "rand_core 0.6.4", "serde", "serde_json", @@ -4358,16 +4452,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_enum" version = "0.7.1" @@ -4881,7 +4965,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.3", +] + +[[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]] @@ -4898,8 +4992,8 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", - "prost-types", + "prost 0.12.3", + "prost-types 0.12.3", "regex", "syn 2.0.52", "tempfile", @@ -4919,13 +5013,35 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "prost-types" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost", + "prost 0.12.3", +] + +[[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]] @@ -5210,10 +5326,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-tls", "ipnet", "js-sys", @@ -5904,9 +6020,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smooth-operator" @@ -5949,7 +6065,7 @@ dependencies = [ [[package]] name = "sparse-merkle-tree" version = "0.3.1-pre" -source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=bab8cb96872db22cc9a139b2d3dfc4e00521d097#bab8cb96872db22cc9a139b2d3dfc4e00521d097" +source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" dependencies = [ "borsh", "cfg-if", @@ -6119,6 +6235,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 = "system-configuration" version = "0.5.1" @@ -6178,36 +6300,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.35.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f8a10105d0a7c4af0a242e23ed5a12519afe5cc0e68419da441bb5981a6802" -dependencies = [ - "bytes", - "digest 0.10.7", - "ed25519", - "flex-error", - "futures", - "num-traits 0.2.17", - "once_cell", - "prost", - "prost-types", - "serde", - "serde_bytes", - "serde_json", - "serde_repr", - "signature", - "subtle", - "subtle-encoding", - "tendermint-proto 0.35.0", - "time", - "zeroize", -] - -[[package]] -name = "tendermint" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42" +checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" dependencies = [ "bytes", "digest 0.10.7", @@ -6218,8 +6313,8 @@ dependencies = [ "k256", "num-traits 0.2.17", "once_cell", - "prost", - "prost-types", + "prost 0.13.1", + "prost-types 0.13.1", "ripemd", "serde", "serde_bytes", @@ -6229,66 +6324,48 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto 0.37.0", + "tendermint-proto", "time", "zeroize", ] [[package]] name = "tendermint-config" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84b11b57d20ee4492a1452faff85f5c520adc36ca9fe5e701066935255bb89f" +checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" dependencies = [ "flex-error", "serde", "serde_json", - "tendermint 0.37.0", + "tendermint", "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client-verifier" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e" +checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" dependencies = [ "derive_more", "flex-error", "serde", - "tendermint 0.37.0", + "tendermint", "time", ] [[package]] name = "tendermint-proto" -version = "0.35.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff525d5540a9fc535c38dc0d92a98da3ee36fcdfbda99cecb9f3cce5cd4d41d7" +checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" dependencies = [ "bytes", "flex-error", - "num-derive 0.4.2", - "num-traits 0.2.17", - "prost", - "prost-types", - "serde", - "serde_bytes", - "subtle-encoding", - "time", -] - -[[package]] -name = "tendermint-proto" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87" -dependencies = [ - "bytes", - "flex-error", - "prost", - "prost-types", + "prost 0.13.1", + "prost-types 0.13.1", "serde", "serde_bytes", "subtle-encoding", @@ -6297,9 +6374,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdc2281e271277fda184d96d874a6fe59f569b130b634289257baacfc95aa85" +checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" dependencies = [ "async-trait", "bytes", @@ -6314,9 +6391,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.37.0", + "tendermint", "tendermint-config", - "tendermint-proto 0.37.0", + "tendermint-proto", "thiserror", "time", "url", @@ -6326,9 +6403,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318a0e38b3b7b36b4078d78446d4284088aa9b173d519fc804c3ee4683972934" +checksum = "ae007e2918414ae96e4835426aace7538d23b8ddf96d71e23d241f58f386e877" dependencies = [ "ed25519-consensus", "gumdrop", @@ -6336,7 +6413,7 @@ dependencies = [ "serde_json", "simple-error", "tempfile", - "tendermint 0.37.0", + "tendermint", "time", ] @@ -6486,38 +6563,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", "tokio-macros", - "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", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -6640,23 +6706,26 @@ 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", + "base64 0.22.1", "bytes", - "h2", - "http 0.2.11", - "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", + "socket2 0.5.5", "tokio", "tokio-stream", "tower", diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index ce21bd71b6..5edf14667d 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -260,6 +260,15 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "blake2b_simd" version = "1.0.2" @@ -282,6 +291,19 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -393,11 +415,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ - "libc", + "shlex", ] [[package]] @@ -1083,8 +1105,8 @@ dependencies = [ [[package]] name = "ibc" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-apps", "ibc-clients", @@ -1096,8 +1118,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -1106,8 +1128,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "base64 0.22.1", "borsh", @@ -1127,8 +1149,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1137,8 +1159,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1155,8 +1177,8 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -1164,8 +1186,8 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1181,8 +1203,8 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1198,8 +1220,8 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1212,8 +1234,8 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1221,8 +1243,8 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1237,8 +1259,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1252,8 +1274,8 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1275,8 +1297,8 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1288,8 +1310,8 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -1304,8 +1326,8 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1324,8 +1346,8 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1343,8 +1365,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -1352,13 +1374,13 @@ dependencies = [ "ibc-core-handler-types", "ibc-core-host", "ibc-primitives", - "prost", + "prost 0.13.2", ] [[package]] name = "ibc-core-connection-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1378,8 +1400,8 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1393,8 +1415,8 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1417,8 +1439,8 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -1435,8 +1457,8 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -1458,8 +1480,8 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1473,8 +1495,8 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "derive_more", "displaydoc", @@ -1487,8 +1509,8 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", @@ -1506,8 +1528,8 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.7.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "proc-macro2", "quote", @@ -1516,15 +1538,15 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.53.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd" dependencies = [ "borsh", "derive_more", "displaydoc", "ibc-proto", "parity-scale-codec", - "prost", + "prost 0.13.2", "scale-info", "schemars", "serde", @@ -1534,18 +1556,18 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.46.0" +version = "0.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65" +checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733" dependencies = [ "base64 0.22.1", "borsh", "bytes", "flex-error", "ics23", - "informalsystems-pbjson 0.7.0", + "informalsystems-pbjson", "parity-scale-codec", - "prost", + "prost 0.13.2", "scale-info", "schemars", "serde", @@ -1555,15 +1577,17 @@ dependencies = [ [[package]] name = "ics23" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" +checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12" dependencies = [ "anyhow", + "blake2", + "blake3", "bytes", "hex", - "informalsystems-pbjson 0.6.0", - "prost", + "informalsystems-pbjson", + "prost 0.13.2", "ripemd", "serde", "sha2 0.10.8", @@ -1664,16 +1688,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "informalsystems-pbjson" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eecd90f87bea412eac91c6ef94f6b1e390128290898cbe14f2b926787ae1fb" -dependencies = [ - "base64 0.13.1", - "serde", -] - [[package]] name = "informalsystems-pbjson" version = "0.7.0" @@ -1981,7 +1995,7 @@ dependencies = [ "num256", "num_enum", "primitive-types", - "prost-types", + "prost-types 0.13.2", "rayon", "ripemd", "serde", @@ -2065,7 +2079,7 @@ dependencies = [ "namada_tx", "namada_vp", "primitive-types", - "prost", + "prost 0.13.2", "serde", "serde_json", "sha2 0.9.9", @@ -2094,7 +2108,7 @@ dependencies = [ "ics23", "namada_core", "namada_macros", - "prost", + "prost 0.13.2", "sparse-merkle-tree", "thiserror", ] @@ -2234,7 +2248,7 @@ dependencies = [ "borsh", "namada_core", "namada_state", - "prost", + "prost 0.13.2", "strum", ] @@ -2285,8 +2299,8 @@ dependencies = [ "namada_macros", "num-derive 0.4.2", "num-traits 0.2.17", - "prost", - "prost-types", + "prost 0.13.2", + "prost-types 0.13.2", "rand_core", "serde", "serde_json", @@ -2770,7 +2784,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.3", +] + +[[package]] +name = "prost" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" +dependencies = [ + "bytes", + "prost-derive 0.13.2", ] [[package]] @@ -2787,8 +2811,8 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", - "prost-types", + "prost 0.12.3", + "prost-types 0.12.3", "regex", "syn 2.0.65", "tempfile", @@ -2808,13 +2832,35 @@ dependencies = [ "syn 2.0.65", ] +[[package]] +name = "prost-derive" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.65", +] + [[package]] name = "prost-types" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost", + "prost 0.12.3", +] + +[[package]] +name = "prost-types" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519" +dependencies = [ + "prost 0.13.2", ] [[package]] @@ -3239,6 +3285,12 @@ dependencies = [ "keccak", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signature" version = "2.2.0" @@ -3279,7 +3331,7 @@ dependencies = [ [[package]] name = "sparse-merkle-tree" version = "0.3.1-pre" -source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=bab8cb96872db22cc9a139b2d3dfc4e00521d097#bab8cb96872db22cc9a139b2d3dfc4e00521d097" +source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" dependencies = [ "borsh", "cfg-if", @@ -3415,9 +3467,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42" +checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" dependencies = [ "bytes", "digest 0.10.7", @@ -3428,8 +3480,8 @@ dependencies = [ "k256", "num-traits 0.2.17", "once_cell", - "prost", - "prost-types", + "prost 0.13.2", + "prost-types 0.13.2", "ripemd", "serde", "serde_bytes", @@ -3446,9 +3498,9 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e" +checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" dependencies = [ "derive_more", "flex-error", @@ -3459,14 +3511,14 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87" +checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" dependencies = [ "bytes", "flex-error", - "prost", - "prost-types", + "prost 0.13.2", + "prost-types 0.13.2", "serde", "serde_bytes", "subtle-encoding",