From 6240ef3f956c53e671768e2fb15b63f15fc4469a Mon Sep 17 00:00:00 2001 From: yito88 Date: Thu, 16 Jan 2025 11:23:47 +0100 Subject: [PATCH 1/9] WIP: upgrade ibc-rs --- Cargo.lock | 597 +++++++++++++++++++++++++++++---------------- Cargo.toml | 27 +- clippy.toml | 2 +- crates/tx/build.rs | 2 +- 4 files changed, 398 insertions(+), 230 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90970e6e90..830882190d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,9 +164,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -481,7 +481,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "tendermint", + "tendermint 0.38.1", "tracing", ] @@ -695,6 +695,31 @@ dependencies = [ "subtle", ] +[[package]] +name = "bon" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" +dependencies = [ + "bon-macros", + "rustversion", +] + +[[package]] +name = "bon-macros" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" +dependencies = [ + "darling 0.20.10", + "ident_case", + "prettyplease", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.96", +] + [[package]] name = "borsh" version = "1.2.1" @@ -1290,6 +1315,18 @@ dependencies = [ "windows-sys 0.33.0", ] +[[package]] +name = "cosmos-sdk-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427" +dependencies = [ + "informalsystems-pbjson", + "prost 0.13.2", + "serde", + "tendermint-proto 0.40.1", +] + [[package]] name = "cpufeatures" version = "0.2.11" @@ -1583,12 +1620,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1607,14 +1644,18 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", +<<<<<<< HEAD +======= + "strsim 0.11.1", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) "syn 2.0.96", ] @@ -1631,11 +1672,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.10", "quote", "syn 2.0.96", ] @@ -1714,9 +1755,9 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", @@ -1763,6 +1804,30 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.96", +<<<<<<< HEAD +======= +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "unicode-xid", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -1892,16 +1957,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" -[[package]] -name = "dur" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5b6c91b5e394b75cd96c36393fc938496c030220207a0ccf34d6cd313d3b49" -dependencies = [ - "nom", - "rust_decimal", -] - [[package]] name = "duration-str" version = "0.10.0" @@ -2131,7 +2186,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.3", + "darling 0.20.10", "proc-macro2", "quote", "syn 2.0.96", @@ -2200,8 +2255,13 @@ dependencies = [ "serde", "serde_json", "sha3", +<<<<<<< HEAD "thiserror 1.0.50", "uint", +======= + "thiserror", + "uint 0.9.5", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -2212,9 +2272,9 @@ checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" dependencies = [ "crunchy", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", "scale-info", "tiny-keccak", ] @@ -2272,12 +2332,12 @@ checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" dependencies = [ "ethbloom", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", - "primitive-types", + "impl-serde 0.4.0", + "primitive-types 0.12.2", "scale-info", - "uint", + "uint 0.9.5", ] [[package]] @@ -3142,15 +3202,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e806677ce663d0a199541030c816847b36e8dc095f70dae4a4f4ad63da5383" -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "http" version = "0.2.11" @@ -3349,8 +3400,8 @@ dependencies = [ [[package]] name = "ibc" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-apps", "ibc-clients", @@ -3362,8 +3413,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -3372,13 +3423,13 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "base64 0.22.1", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "http 1.1.0", "ibc-app-transfer-types", @@ -3394,8 +3445,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -3404,27 +3455,27 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core", "ibc-proto", "parity-scale-codec", - "primitive-types", + "primitive-types 0.13.1", "scale-info", "schemars", "serde", - "uint", + "uint 0.10.0", ] [[package]] name = "ibc-apps" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -3432,10 +3483,10 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ - "derive_more", + "derive_more 1.0.0", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -3443,14 +3494,14 @@ dependencies = [ "ibc-core-host", "ibc-primitives", "serde", - "tendermint", + "tendermint 0.40.1", "tendermint-light-client-verifier", ] [[package]] name = "ibc-client-tendermint-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -3459,15 +3510,15 @@ dependencies = [ "ibc-primitives", "ibc-proto", "serde", - "tendermint", + "tendermint 0.40.1", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.40.1", ] [[package]] name = "ibc-client-wasm-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "base64 0.22.1", "displaydoc", @@ -3480,8 +3531,8 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3489,8 +3540,8 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3505,8 +3556,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -3520,12 +3571,12 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -3539,13 +3590,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-client" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -3557,10 +3608,10 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -3568,17 +3619,17 @@ dependencies = [ "ibc-core-host-types", "ibc-primitives", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-client-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-commitment-types", "ibc-core-host-types", @@ -3589,17 +3640,17 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-commitment-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-host-types", "ibc-primitives", @@ -3614,8 +3665,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -3628,12 +3679,12 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -3645,13 +3696,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-handler" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3665,12 +3716,12 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-client-types", @@ -3685,15 +3736,15 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-host" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-client-context", @@ -3708,10 +3759,10 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-app-transfer-types", "ibc-client-tendermint", @@ -3726,20 +3777,22 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-host-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", + "base64 0.22.1", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-primitives", "parity-scale-codec", + "prost 0.13.2", "scale-info", "schemars", "serde", @@ -3747,10 +3800,10 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-host-types", @@ -3761,11 +3814,11 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-host-types", "ibc-primitives", @@ -3775,17 +3828,18 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-derive" -version = "0.8.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "proc-macro2", "quote", "syn 2.0.96", +<<<<<<< HEAD ] [[package]] @@ -3887,16 +3941,18 @@ dependencies = [ "ibc-primitives", "serde", "serde_json", +======= +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] name = "ibc-primitives" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "arbitrary", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-proto", "parity-scale-codec", @@ -3904,36 +3960,33 @@ dependencies = [ "scale-info", "schemars", "serde", - "tendermint", "time", ] [[package]] name = "ibc-proto" -version = "0.47.1" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733" +checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca" dependencies = [ "base64 0.22.1", - "borsh", "bytes", + "cosmos-sdk-proto", "flex-error", "ics23", "informalsystems-pbjson", - "parity-scale-codec", "prost 0.13.2", - "scale-info", "schemars", "serde", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.40.1", "tonic", ] [[package]] name = "ibc-query" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "displaydoc", "ibc", @@ -3943,20 +3996,20 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" dependencies = [ "basecoin-store", - "derive_more", + "bon", + "derive_more 1.0.0", "displaydoc", "ibc", "ibc-proto", "ibc-query", "parking_lot", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", "tendermint-testgen", - "typed-builder", ] [[package]] @@ -4003,6 +4056,15 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "impl-codec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "impl-num-traits" version = "0.1.2" @@ -4010,8 +4072,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", +<<<<<<< HEAD "num-traits", "uint", +======= + "num-traits 0.2.17", + "uint 0.9.5", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -4032,6 +4099,15 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-serde" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a143eada6a1ec4aefa5049037a26a6d597bfd64f8c026d07b77133e02b7dd0b" +dependencies = [ + "serde", +] + [[package]] name = "impl-trait-for-tuples" version = "0.2.2" @@ -5084,8 +5160,13 @@ dependencies = [ "num-rational", "num-traits", "num256", +<<<<<<< HEAD "num_enum", "primitive-types", +======= + "num_enum 0.7.1", + "primitive-types 0.13.1", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) "proptest", "prost-types 0.13.2", "rand", @@ -5096,14 +5177,21 @@ dependencies = [ "serde_json", "sha2 0.9.9", "smooth-operator", +<<<<<<< HEAD "tendermint", "tendermint-proto", "thiserror 1.0.50", +======= + "sparse-merkle-tree", + "tendermint 0.40.1", + "tendermint-proto 0.40.1", + "thiserror", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) "tiny-keccak", "tokio", "toml 0.5.11", "tracing", - "uint", + "uint 0.9.5", "usize-set", "wasmtimer", "zeroize", @@ -5273,13 +5361,15 @@ dependencies = [ "assert_matches", "borsh", "data-encoding", - "dur", "ibc", "ibc-derive", +<<<<<<< HEAD "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0)", "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0)", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", +======= +>>>>>>> b73473752 (WIP: upgrade ibc-rs) "ibc-testkit", "ics23", "konst", @@ -5299,7 +5389,7 @@ dependencies = [ "namada_tx", "namada_vm", "namada_vp", - "primitive-types", + "primitive-types 0.13.1", "proptest", "prost 0.13.2", "serde", @@ -5710,14 +5800,12 @@ dependencies = [ "concat-idents", "data-encoding", "derivative", - "dur", "escargot", "expectrl", "eyre", "flate2", "fs_extra", "hyper 0.14.27", - "ibc-middleware-packet-forward", "ibc-testkit", "ics23", "itertools 0.12.1", @@ -6224,7 +6312,22 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ +<<<<<<< HEAD "num_enum_derive", +======= + "num_enum_derive 0.7.1", +] + +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -6788,11 +6891,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", "scale-info", - "uint", + "uint 0.9.5", +] + +[[package]] +name = "primitive-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" +dependencies = [ + "fixed-hash", + "impl-codec 0.7.0", + "impl-serde 0.5.0", + "uint 0.10.0", ] [[package]] @@ -6891,16 +7006,6 @@ dependencies = [ "prost-derive 0.11.9", ] -[[package]] -name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes", - "prost-derive 0.12.3", -] - [[package]] name = "prost" version = "0.13.2" @@ -6913,24 +7018,28 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", +<<<<<<< HEAD "heck 0.4.1", "itertools 0.11.0", +======= + "heck", + "itertools 0.12.1", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.13.2", + "prost-types 0.13.2", "regex", "syn 2.0.96", "tempfile", - "which", ] [[package]] @@ -6948,6 +7057,7 @@ dependencies = [ [[package]] name = "prost-derive" +<<<<<<< HEAD version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" @@ -6961,6 +7071,8 @@ dependencies = [ [[package]] name = "prost-derive" +======= +>>>>>>> b73473752 (WIP: upgrade ibc-rs) version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" @@ -6981,15 +7093,6 @@ dependencies = [ "prost 0.11.9", ] -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -dependencies = [ - "prost 0.12.3", -] - [[package]] name = "prost-types" version = "0.13.2" @@ -7403,11 +7506,12 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.36.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", +<<<<<<< HEAD "borsh", "bytes", "num-traits", @@ -7415,6 +7519,9 @@ dependencies = [ "rkyv", "serde", "serde_json", +======= + "num-traits 0.2.17", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -7558,7 +7665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -7804,12 +7911,17 @@ dependencies = [ [[package]] name = "serde_json" +<<<<<<< HEAD version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +======= +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +>>>>>>> b73473752 (WIP: upgrade ibc-rs) dependencies = [ "itoa", - "memchr", "ryu", "serde", ] @@ -8213,6 +8325,7 @@ dependencies = [ "quote", "rustversion", "syn 2.0.96", +<<<<<<< HEAD ] [[package]] @@ -8226,6 +8339,8 @@ dependencies = [ "quote", "rustversion", "syn 2.0.96", +======= +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -8371,6 +8486,33 @@ name = "tendermint" version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" +dependencies = [ + "bytes", + "digest 0.10.7", + "ed25519", + "flex-error", + "futures", + "num-traits 0.2.17", + "once_cell", + "prost 0.13.2", + "prost-types 0.13.2", + "serde", + "serde_bytes", + "serde_json", + "serde_repr", + "signature", + "subtle", + "subtle-encoding", + "tendermint-proto 0.38.1", + "time", + "zeroize", +] + +[[package]] +name = "tendermint" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2" dependencies = [ "bytes", "digest 0.10.7", @@ -8382,7 +8524,6 @@ dependencies = [ "num-traits", "once_cell", "prost 0.13.2", - "prost-types 0.13.2", "ripemd", "serde", "serde_bytes", @@ -8392,34 +8533,34 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.40.1", "time", "zeroize", ] [[package]] name = "tendermint-config" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" +checksum = "89cc3ea9a39b7ee34eefcff771cc067ecaa0c988c1c5ac08defd878471a06f76" dependencies = [ "flex-error", "serde", "serde_json", - "tendermint", + "tendermint 0.40.1", "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91e5abb448c65e8abdfe0e17a3a189e005a71b4169b89f36aaa2053ff239577" +checksum = "a803ff14b11827772f696ba3a1873a5f24598121872c924a764011fc58fc22a0" dependencies = [ "contracts", "crossbeam-channel", - "derive_more", + "derive_more 0.99.18", "flex-error", "futures", "regex", @@ -8428,7 +8569,7 @@ dependencies = [ "serde_derive", "serde_json", "static_assertions", - "tendermint", + "tendermint 0.40.1", "tendermint-light-client-verifier", "tendermint-rpc", "time", @@ -8438,14 +8579,14 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" +checksum = "f0cda4a449fc70985a95f892a67286f13afa4e048d90b8d04a2bf6341e88d1c2" dependencies = [ - "derive_more", + "derive_more 0.99.18", "flex-error", "serde", - "tendermint", + "tendermint 0.40.1", "time", ] @@ -8465,11 +8606,30 @@ dependencies = [ "time", ] +[[package]] +name = "tendermint-proto" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb" +dependencies = [ + "borsh", + "bytes", + "flex-error", + "parity-scale-codec", + "prost 0.13.2", + "scale-info", + "schemars", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + [[package]] name = "tendermint-rpc" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" +checksum = "835a52aa504c63ec05519e31348d3f4ba2fe79493c588e2cad5323d5e81b161a" dependencies = [ "async-trait", "bytes", @@ -8486,10 +8646,15 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", "tendermint-config", +<<<<<<< HEAD "tendermint-proto", "thiserror 1.0.50", +======= + "tendermint-proto 0.40.1", + "thiserror", +>>>>>>> b73473752 (WIP: upgrade ibc-rs) "time", "tokio", "tracing", @@ -8500,9 +8665,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae007e2918414ae96e4835426aace7538d23b8ddf96d71e23d241f58f386e877" +checksum = "3fbbef28bac7b5b68f44416ef16d072ee8ea4af829aaf2fa259eee1c09237c36" dependencies = [ "ed25519-consensus", "gumdrop", @@ -8510,7 +8675,7 @@ dependencies = [ "serde_json", "simple-error", "tempfile", - "tendermint", + "tendermint 0.40.1", "time", ] @@ -8611,6 +8776,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.96", +<<<<<<< HEAD ] [[package]] @@ -8642,6 +8808,8 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.96", +======= +>>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -8797,9 +8965,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -8940,9 +9108,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", @@ -8970,13 +9138,14 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", "prost-build", + "prost-types 0.13.2", "quote", "syn 2.0.96", ] @@ -9004,16 +9173,16 @@ dependencies = [ [[package]] name = "tower-abci" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c31da2537c5f13b67d3f6aa9e5552a1a81a681debbcb3ce9ac6a34876cbcb2" +checksum = "4f3458c29aae68bfc21edc8482ee7ecce8e5dfbb0d07a8034f96fa304525391f" dependencies = [ "bytes", "futures", "pin-project", "prost 0.13.2", - "tendermint", - "tendermint-proto", + "tendermint 0.40.1", + "tendermint-proto 0.40.1", "tokio", "tokio-stream", "tokio-util 0.6.10", @@ -9224,6 +9393,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" @@ -9838,18 +10019,6 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index e82d041688..823ecb91df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ repository = "https://github.com/anoma/namada" version = "0.47.0" [workspace.dependencies] -arbitrary = {version = "1.3", features = ["derive"]} +arbitrary = {version = "1.4", features = ["derive"]} ark-bls12-381 = {version = "0.3"} ark-serialize = {version = "0.3"} ark-std = "0.3.0" @@ -118,14 +118,13 @@ flume = "0.11.1" fs_extra = "1.2.0" futures = "0.3" git2 = { version = "0.18.1", default-features = false } -# branch tiago/optional-ack -ibc = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1", features = ["serde"] } -ibc-derive = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1" } +ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", features = ["serde"] } +ibc-derive = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" } ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module/v0.1.0" } ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module-macros/v0.1.0" } ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "orm/v0.4.0" } ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.9.0", features = ["borsh"] } -ibc-testkit = { git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "38489943c4e75206eaffeeeec6153c039c2499d1", default-features = false } +ibc-testkit = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", default-features = false } ics23 = "0.12.0" usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] } indexmap = { package = "nam-indexmap", version = "2.7.1-nam.0", features = ["borsh-schema", "serde"] } @@ -156,7 +155,7 @@ owo-colors = "3.5.0" paste = "1.0.9" patricia_tree = "0.8.0" pretty_assertions = "1.4.0" -primitive-types = "0.12.1" +primitive-types = "0.13.1" proptest = "1.4.0" proptest-state-machine = "0.3.0" prost = "0.13.1" @@ -184,11 +183,11 @@ smooth-operator = "0.7.2" sysinfo = {version = "0.27.8", default-features = false} tar = "0.4.37" tempfile = {version = "3.2.0"} -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} +tendermint = {version = "0.40.1", features = ["secp256k1"]} +tendermint-config = "0.40.1" +tendermint-light-client = "0.40.1" +tendermint-proto = "0.40.1" +tendermint-rpc = {version = "0.40.1", default-features = false} test-log = {version = "0.2.14", default-features = false, features = ["trace"]} tiny-bip39 = {version = "2.0"} tiny-hderive = {package = "nam-tiny-hderive", version = "0.3.1-nam.0"} @@ -197,10 +196,10 @@ thiserror = "1.0.38" tokio = {version = "1.8.2", default-features = false} tokio-test = "0.4.2" toml = "0.5.8" -tonic = "0.8.3" -tonic-build = "0.11.0" +tonic = "0.12.3" +tonic-build = "0.12.3" tower = "0.4" -tower-abci = "0.16.0" +tower-abci = "0.18.0" tracing = "0.1.30" tracing-appender = "0.2.2" tracing-log = "0.2.0" diff --git a/clippy.toml b/clippy.toml index 2fc50cebd1..46e22b51fe 100644 --- a/clippy.toml +++ b/clippy.toml @@ -8,7 +8,7 @@ disallowed-methods = [ { path = "chrono::Utc::now", reason = "Do not use current date/time in code that must be deterministic" }, { path = "namada_core::time::DateTimeUtc::now", reason = "Do not use current date/time in code that must be deterministic" }, { path = "wasmtimer::std::Instant", reason = "Do not use current date/time in code that must be deterministic" }, - { path = "std::result::Result::unwrap_or_default", reason = "Do not silently ignore an error that could be caused by gas" }, + #{ path = "std::result::Result::unwrap_or_default", reason = "Do not silently ignore an error that could be caused by gas" }, ] allow-dbg-in-tests = true allow-print-in-tests = true diff --git a/crates/tx/build.rs b/crates/tx/build.rs index ff6f1f37ca..99efa6b49a 100644 --- a/crates/tx/build.rs +++ b/crates/tx/build.rs @@ -17,6 +17,6 @@ fn main() { tonic_build::configure() .out_dir("src/proto/generated") .protoc_arg("--experimental_allow_proto3_optional") - .compile(&[format!("{}/types.proto", PROTO_SRC)], &[PROTO_SRC]) + .compile_protos(&[format!("{}/types.proto", PROTO_SRC)], &[PROTO_SRC]) .unwrap(); } From 416302458a081a198b9c15a8df67c8e08fe0c796 Mon Sep 17 00:00:00 2001 From: yito88 Date: Fri, 17 Jan 2025 11:00:09 +0100 Subject: [PATCH 2/9] WIP: replaced errors --- crates/ibc/src/actions.rs | 3 +- crates/ibc/src/context/client.rs | 62 +- crates/ibc/src/context/common.rs | 222 ++- crates/ibc/src/context/execution.rs | 68 +- crates/ibc/src/context/nft_transfer.rs | 149 +- crates/ibc/src/context/nft_transfer_mod.rs | 34 +- crates/ibc/src/context/token_transfer.rs | 117 +- crates/ibc/src/context/transfer_mod.rs | 34 +- crates/ibc/src/context/validation.rs | 70 +- crates/ibc/src/event.rs | 19 +- crates/ibc/src/lib.rs | 63 +- crates/ibc/src/nft.rs | 16 +- crates/ibc/src/vp/mod.rs | 3 +- crates/node/src/bench_utils.rs | 6 +- crates/sdk/src/signing.rs | 6 +- crates/sdk/src/tx.rs | 4 +- crates/storage/src/error.rs | 11 +- crates/tests/src/vm_host_env/ibc.rs | 2 +- crates/tests/src/vm_host_env/mod.rs | 2 +- wasm/Cargo.lock | 1626 +++++++++----------- 20 files changed, 1162 insertions(+), 1355 deletions(-) diff --git a/crates/ibc/src/actions.rs b/crates/ibc/src/actions.rs index a266c69370..cdc3495d84 100644 --- a/crates/ibc/src/actions.rs +++ b/crates/ibc/src/actions.rs @@ -11,6 +11,7 @@ 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, TimeoutTimestamp}; +use ibc::primitives::IntoTimestamp; use namada_core::address::Address; use namada_core::borsh::{BorshSerialize, BorshSerializeExt}; use namada_core::chain::ChainId; @@ -232,7 +233,7 @@ where let timeout_timestamp = TmTime::try_from(timeout_timestamp).into_storage_result()?; let timeout_timestamp = TimeoutTimestamp::At( - timeout_timestamp.try_into().into_storage_result()?, + timeout_timestamp.into_timestamp().into_storage_result()?, ); let message = IbcMsgTransfer { port_id_on_a: target.port_id.clone(), diff --git a/crates/ibc/src/context/client.rs b/crates/ibc/src/context/client.rs index 32a7e43935..dfb1ecc73e 100644 --- a/crates/ibc/src/context/client.rs +++ b/crates/ibc/src/context/client.rs @@ -5,7 +5,7 @@ use ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusStat use ibc::clients::tendermint::types::{ ClientState as TmClientStateType, ConsensusState as TmConsensusStateType, }; -use ibc::core::client::types::error::ClientError; +use ibc::core::host::types::error::HostError; use ibc::primitives::proto::Any; use ibc_derive::{IbcClientState, IbcConsensusState}; #[cfg(any(test, feature = "testing"))] @@ -44,17 +44,15 @@ impl From for AnyClientState { } impl TryFrom for TmClientState { - type Error = ClientError; + type Error = HostError; fn try_from(any: AnyClientState) -> Result { match any { AnyClientState::Tendermint(cs) => Ok(cs), #[cfg(any(test, feature = "testing"))] - AnyClientState::Mock(_) => { - Err(ClientError::UnknownConsensusStateType { - consensus_state_type: "mock".to_string(), - }) - } + AnyClientState::Mock(_) => Err(HostError::Other { + description: "Unexpected client state type: Mock".to_string(), + }), } } } @@ -68,15 +66,14 @@ impl From for AnyClientState { #[cfg(any(test, feature = "testing"))] impl TryFrom for MockClientState { - type Error = ClientError; + type Error = HostError; fn try_from(any: AnyClientState) -> Result { match any { - AnyClientState::Tendermint(_) => { - Err(ClientError::UnknownConsensusStateType { - consensus_state_type: "tendermint".to_string(), - }) - } + AnyClientState::Tendermint(_) => Err(HostError::Other { + description: "Unexpected client state type: Tendermint" + .to_string(), + }), AnyClientState::Mock(cs) => Ok(cs), } } @@ -93,7 +90,7 @@ impl From for Any { } impl TryFrom for AnyClientState { - type Error = ClientError; + type Error = HostError; fn try_from(client_state: Any) -> Result { #[cfg(any(test, feature = "testing"))] @@ -102,7 +99,7 @@ impl TryFrom for AnyClientState { } let cs = TmClientState::try_from(client_state).map_err(|_| { - ClientError::ClientSpecific { + HostError::Other { description: "Unknown client state".to_string(), } })?; @@ -134,17 +131,15 @@ impl From for AnyConsensusState { } impl TryFrom for TmConsensusStateType { - type Error = ClientError; + type Error = HostError; fn try_from(any: AnyConsensusState) -> Result { match any { AnyConsensusState::Tendermint(c) => Ok(c.inner().clone()), #[cfg(any(test, feature = "testing"))] - AnyConsensusState::Mock(_) => { - Err(ClientError::UnknownConsensusStateType { - consensus_state_type: "mock".to_string(), - }) - } + _ => Err(HostError::Other { + description: "Unexpected consensus state type".to_string(), + }), } } } @@ -157,16 +152,14 @@ impl From for AnyConsensusState { } impl TryFrom for TmConsensusState { - type Error = ClientError; + type Error = HostError; fn try_from(any: AnyConsensusState) -> Result { match any { AnyConsensusState::Tendermint(cs) => Ok(cs), #[cfg(any(test, feature = "testing"))] - _ => Err(ClientError::UnknownConsensusStateType { - consensus_state_type: "Only Tendermint client state type is \ - supported" - .to_string(), + _ => Err(HostError::Other { + description: "Unexpected consensus state".to_string(), }), } } @@ -174,14 +167,13 @@ impl TryFrom for TmConsensusState { #[cfg(any(test, feature = "testing"))] impl TryFrom for MockConsensusState { - type Error = ClientError; + type Error = HostError; fn try_from(any: AnyConsensusState) -> Result { match any { AnyConsensusState::Mock(cs) => Ok(cs), - _ => Err(ClientError::UnknownConsensusStateType { - consensus_state_type: "The type should be MockConsensusState" - .to_string(), + _ => Err(HostError::Other { + description: "Unexpected consensus state".to_string(), }), } } @@ -198,7 +190,7 @@ impl From for Any { } impl TryFrom for AnyConsensusState { - type Error = ClientError; + type Error = HostError; fn try_from(consensus_state: Any) -> Result { #[cfg(any(test, feature = "testing"))] @@ -207,7 +199,7 @@ impl TryFrom for AnyConsensusState { } let cs = TmConsensusState::try_from(consensus_state).map_err(|_| { - ClientError::ClientSpecific { + HostError::Other { description: "Unknown consensus state".to_string(), } })?; @@ -216,12 +208,12 @@ impl TryFrom for AnyConsensusState { } impl TryFrom> for AnyConsensusState { - type Error = ClientError; + type Error = HostError; fn try_from(bytes: Vec) -> Result { Any::decode(&bytes[..]) - .map_err(|e| ClientError::Other { - description: e.to_string(), + .map_err(|e| HostError::Other { + description: format!("Decoding AnyConsensusState failed: {e}"), })? .try_into() } diff --git a/crates/ibc/src/context/common.rs b/crates/ibc/src/context/common.rs index 35233fd70e..9c35b7e036 100644 --- a/crates/ibc/src/context/common.rs +++ b/crates/ibc/src/context/common.rs @@ -7,24 +7,21 @@ use ibc::core::channel::types::channel::ChannelEnd; use ibc::core::channel::types::commitment::{ AcknowledgementCommitment, PacketCommitment, }; -use ibc::core::channel::types::error::{ChannelError, PacketError}; use ibc::core::channel::types::packet::Receipt; -use ibc::core::client::types::error::ClientError; use ibc::core::client::types::Height; -use ibc::core::connection::types::error::ConnectionError; use ibc::core::connection::types::ConnectionEnd; -use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::error::HostError; use ibc::core::host::types::identifiers::{ ChannelId, ClientId, ConnectionId, PortId, Sequence, }; use ibc::primitives::proto::{Any, Protobuf}; -use ibc::primitives::Timestamp; +use ibc::primitives::{IntoHostTime, IntoTimestamp, Timestamp}; use namada_core::address::Address; use namada_core::chain::BlockHeight; use namada_core::storage::Key; use namada_core::tendermint::Time as TmTime; use namada_core::token::Amount; -use namada_state::{Error, StorageRead, StorageWrite}; +use namada_state::{Error as StorageError, StorageRead, StorageWrite}; use namada_systems::trans_token; use prost::Message; @@ -33,7 +30,7 @@ use super::storage::IbcStorageContext; use crate::{storage, trace, NftClass, NftMetadata}; /// Result of IBC common function call -pub type Result = std::result::Result; +pub type Result = std::result::Result; /// Context to handle typical IBC data pub trait IbcCommonContext: IbcStorageContext { @@ -42,15 +39,16 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::client_state_key(client_id); match self.storage().read_bytes(&key)? { Some(value) => Any::decode(&value[..]) - .map_err(|e| ClientError::Other { - description: e.to_string(), + .map_err(|e| HostError::FailedToRetrieve { + description: format!( + "Decoding client state failed: ID {client_id}, error \ + {e}" + ), })? - .try_into() - .map_err(ContextError::from), - None => Err(ClientError::ClientStateNotFound { - client_id: client_id.clone(), - } - .into()), + .try_into(), + None => Err(HostError::FailedToRetrieve { + description: format!("No client state: ID {client_id}"), + }), } } @@ -64,7 +62,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = Any::from(client_state).encode_to_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Get the ConsensusState @@ -76,16 +74,18 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::consensus_state_key(client_id, height); match self.storage().read_bytes(&key)? { Some(value) => Any::decode(&value[..]) - .map_err(|e| ClientError::Other { - description: e.to_string(), + .map_err(|e| HostError::FailedToRetrieve { + description: format!( + "Decoding consensus state failed: ID {client_id}, \ + height {height} error {e}" + ), })? - .try_into() - .map_err(ContextError::from), - None => Err(ClientError::ConsensusStateNotFound { - client_id: client_id.clone(), - height, - } - .into()), + .try_into(), + None => Err(HostError::FailedToRetrieve { + description: format!( + "No consensus state: ID {client_id}, height {height}" + ), + }), } } @@ -100,7 +100,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = Any::from(consensus_state).encode_to_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Delete the ConsensusState @@ -110,7 +110,7 @@ pub trait IbcCommonContext: IbcStorageContext { height: Height, ) -> Result<()> { let key = storage::consensus_state_key(client_id, height); - self.storage_mut().delete(&key).map_err(ContextError::from) + self.storage_mut().delete(&key).map_err(HostError::from) } /// Decode ConsensusState from bytes @@ -119,11 +119,10 @@ pub trait IbcCommonContext: IbcStorageContext { consensus_state: Vec, ) -> Result { Any::decode(&consensus_state[..]) - .map_err(|e| ClientError::Other { + .map_err(|e| HostError::Other { description: e.to_string(), })? .try_into() - .map_err(ContextError::from) } /// Get heights of all consensus states @@ -137,8 +136,8 @@ pub trait IbcCommonContext: IbcStorageContext { while let Some((key, _)) = self.storage().iter_next(&mut iter)? { let key = Key::parse(key).expect("the key should be parsable"); let height = storage::consensus_height(&key).map_err(|e| { - ClientError::Other { - description: e.to_string(), + HostError::FailedToRetrieve { + description: format!("Invalid key: key {key}, error {e}"), } })?; heights.push(height); @@ -170,7 +169,7 @@ pub trait IbcCommonContext: IbcStorageContext { } } lowest_height_value - .map(|(_, value)| value.try_into().map_err(ContextError::from)) + .map(|(_, value)| value.try_into().map_err(HostError::from)) .transpose() } @@ -199,7 +198,7 @@ pub trait IbcCommonContext: IbcStorageContext { } } highest_height_value - .map(|(_, value)| value.try_into().map_err(ContextError::from)) + .map(|(_, value)| value.try_into().map_err(HostError::from)) .transpose() } @@ -210,20 +209,20 @@ pub trait IbcCommonContext: IbcStorageContext { ) -> Result<(Timestamp, Height)> { let key = storage::client_update_timestamp_key(client_id); let value = self.storage().read_bytes(&key)?.ok_or( - ClientError::ClientSpecific { + HostError::FailedToRetrieve { description: format!( "The client update time doesn't exist: ID {client_id}", ), }, )?; let time = TmTime::decode_vec(&value) - .map_err(|_| ClientError::Other { + .map_err(|_| HostError::Other { description: format!( "Decoding the client update time failed: ID {client_id}", ), })? - .try_into() - .map_err(|_| ClientError::Other { + .into_timestamp() + .map_err(|_| HostError::Other { description: format!( "Conversion of the client update time failed: ID \ {client_id}", @@ -232,18 +231,18 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::client_update_height_key(client_id); let value = self.storage().read_bytes(&key)?.ok_or({ - ClientError::ClientSpecific { + HostError::FailedToRetrieve { description: format!( "The client update height doesn't exist: ID {client_id}", ), } })?; let height = Height::decode_vec(&value).map_err(|_| { - ContextError::ClientError(ClientError::Other { + HostError::FailedToRetrieve { description: format!( "Decoding the client update height failed: ID {client_id}", ), - }) + } })?; Ok((time, height)) @@ -257,27 +256,31 @@ pub trait IbcCommonContext: IbcStorageContext { host_height: Height, ) -> Result<()> { let key = storage::client_update_timestamp_key(client_id); - let time = host_timestamp.into_tm_time(); + let time: TmTime = host_timestamp.into_host_time().map_err(|e| { + HostError::FailedToStore { + description: format!( + "Converting to tendermint Time failed: {e}" + ), + } + })?; self.storage_mut() .write_bytes(&key, time.encode_vec()) - .map_err(ContextError::from)?; + .map_err(HostError::from)?; let key = storage::client_update_height_key(client_id); let bytes = host_height.encode_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Delete the client update time and height fn delete_update_meta(&mut self, client_id: &ClientId) -> Result<()> { let key = storage::client_update_timestamp_key(client_id); - self.storage_mut() - .delete(&key) - .map_err(ContextError::from)?; + self.storage_mut().delete(&key).map_err(HostError::from)?; let key = storage::client_update_height_key(client_id); - self.storage_mut().delete(&key).map_err(ContextError::from) + self.storage_mut().delete(&key).map_err(HostError::from) } /// Get the timestamp on this chain @@ -298,20 +301,15 @@ pub trait IbcCommonContext: IbcStorageContext { None } }) - .ok_or_else(|| { - ContextError::from(ClientError::Other { - description: "No host block header".to_string(), - }) + .ok_or_else(|| HostError::FailedToRetrieve { + 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(), - }) + .map_err(|_| HostError::FailedToRetrieve { + description: "Converting to Tendermint time failed".to_string(), })? - .try_into() - .map_err(|_| ClientError::Other { + .into_timestamp() + .map_err(|_| HostError::FailedToRetrieve { description: "Converting to timestamp failed".to_string(), })?; Ok(time) @@ -325,9 +323,9 @@ pub trait IbcCommonContext: IbcStorageContext { let height = BlockHeight(height.revision_height()); let header = self.storage().get_block_header(height)?.ok_or_else(|| { - ContextError::from(ClientError::Other { + HostError::FailedToRetrieve { description: "No host header".to_string(), - }) + } })?; let commitment_root = header.hash.to_vec().into(); let time = header @@ -348,17 +346,16 @@ pub trait IbcCommonContext: IbcStorageContext { fn connection_end(&self, conn_id: &ConnectionId) -> Result { let key = storage::connection_key(conn_id); let value = self.storage().read_bytes(&key)?.ok_or( - ConnectionError::ConnectionNotFound { - connection_id: conn_id.clone(), + HostError::FailedToRetrieve { + description: format!("No connection end: ID {conn_id}"), }, )?; ConnectionEnd::decode_vec(&value).map_err(|_| { - ConnectionError::Other { + HostError::FailedToRetrieve { description: format!( "Decoding the connection end failed: ID {conn_id}", ), } - .into() }) } @@ -372,7 +369,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = connection_end.encode_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Append the connection ID to the connection list of the client @@ -388,7 +385,7 @@ pub trait IbcCommonContext: IbcStorageContext { }; self.storage_mut() .write(&key, list) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Get the ChannelEnd @@ -399,18 +396,19 @@ pub trait IbcCommonContext: IbcStorageContext { ) -> Result { let key = storage::channel_key(port_id, channel_id); let value = self.storage().read_bytes(&key)?.ok_or( - ChannelError::ChannelNotFound { - port_id: port_id.clone(), - channel_id: channel_id.clone(), + HostError::FailedToRetrieve { + description: format!( + "No channel end: port {port_id}, channel {channel_id}" + ), }, )?; ChannelEnd::decode_vec(&value).map_err(|_| { - ChannelError::Other { + HostError::FailedToRetrieve { description: format!( - "Decoding the channel end failed: Key {key}", + "Decoding the channel end failed: port {port_id}, channel \ + {channel_id}", ), } - .into() }) } @@ -425,7 +423,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = channel_end.encode_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Get the NextSequenceSend @@ -435,7 +433,7 @@ pub trait IbcCommonContext: IbcStorageContext { channel_id: &ChannelId, ) -> Result { let key = storage::next_sequence_send_key(port_id, channel_id); - read_sequence(self.storage(), &key).map_err(ContextError::from) + read_sequence(self.storage(), &key).map_err(HostError::from) } /// Store the NextSequenceSend @@ -456,7 +454,7 @@ pub trait IbcCommonContext: IbcStorageContext { channel_id: &ChannelId, ) -> Result { let key = storage::next_sequence_recv_key(port_id, channel_id); - read_sequence(self.storage(), &key).map_err(ContextError::from) + read_sequence(self.storage(), &key).map_err(HostError::from) } /// Store the NextSequenceRecv @@ -477,7 +475,7 @@ pub trait IbcCommonContext: IbcStorageContext { channel_id: &ChannelId, ) -> Result { let key = storage::next_sequence_ack_key(port_id, channel_id); - read_sequence(self.storage(), &key).map_err(ContextError::from) + read_sequence(self.storage(), &key).map_err(HostError::from) } /// Store the NextSequenceAck @@ -496,7 +494,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = u64::from(sequence).to_be_bytes().to_vec(); self.storage_mut() .write_bytes(key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Get the packet commitment @@ -509,9 +507,12 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::commitment_key(port_id, channel_id, sequence); match self.storage().read_bytes(&key)? { Some(value) => Ok(value.into()), - None => { - Err(PacketError::PacketCommitmentNotFound { sequence }.into()) - } + None => Err(HostError::FailedToRetrieve { + description: format!( + "No packet commitment: port {port_id}, channel \ + {channel_id}, sequence {sequence}" + ), + }), } } @@ -527,7 +528,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = commitment.into_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Delete the packet commitment @@ -538,7 +539,7 @@ pub trait IbcCommonContext: IbcStorageContext { sequence: Sequence, ) -> Result<()> { let key = storage::commitment_key(port_id, channel_id, sequence); - self.storage_mut().delete(&key).map_err(ContextError::from) + self.storage_mut().delete(&key).map_err(HostError::from) } /// Get the packet receipt @@ -551,7 +552,12 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::receipt_key(port_id, channel_id, sequence); match self.storage().read_bytes(&key)? { Some(_) => Ok(Receipt::Ok), - None => Err(PacketError::PacketReceiptNotFound { sequence }.into()), + None => Err(HostError::FailedToRetrieve { + description: format!( + "No packet receipt: port {port_id}, channel {channel_id}, \ + sequence {sequence}" + ), + }), } } @@ -567,7 +573,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = [1_u8].to_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Get the packet acknowledgement @@ -596,7 +602,7 @@ pub trait IbcCommonContext: IbcStorageContext { let bytes = ack_commitment.into_vec(); self.storage_mut() .write_bytes(&key, bytes) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Delete the packet acknowledgement @@ -607,7 +613,7 @@ pub trait IbcCommonContext: IbcStorageContext { sequence: Sequence, ) -> Result<()> { let key = storage::ack_key(port_id, channel_id, sequence); - self.storage_mut().delete(&key).map_err(ContextError::from) + self.storage_mut().delete(&key).map_err(HostError::from) } /// Read a counter @@ -621,13 +627,14 @@ pub trait IbcCommonContext: IbcStorageContext { /// Increment the counter fn increment_counter(&mut self, key: &Key) -> Result<()> { let count = self.read_counter(key)?; - let count = - u64::checked_add(count, 1).ok_or_else(|| ClientError::Other { + let count = u64::checked_add(count, 1).ok_or_else(|| { + HostError::FailedToStore { description: format!("The counter overflow: Key {key}"), - })?; + } + })?; self.storage_mut() .write(key, count) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Write the IBC trace. The given address could be a non-Namada token. @@ -638,22 +645,9 @@ pub trait IbcCommonContext: IbcStorageContext { trace: impl AsRef, ) -> Result<()> { let key = storage::ibc_trace_key(addr, trace_hash.as_ref()); - let has_key = - self.storage() - .has_key(&key) - .map_err(|_| ChannelError::Other { - description: format!( - "Reading the IBC trace failed: Key {key}" - ), - })?; + let has_key = self.storage().has_key(&key)?; if !has_key { - self.storage_mut().write(&key, trace.as_ref()).map_err(|_| { - ChannelError::Other { - description: format!( - "Writing the trace failed: Key {key}", - ), - } - })?; + self.storage_mut().write(&key, trace.as_ref())?; } Ok(()) } @@ -664,7 +658,7 @@ pub trait IbcCommonContext: IbcStorageContext { class_id: &PrefixedClassId, ) -> Result> { let key = storage::nft_class_key(class_id); - self.storage().read(&key).map_err(ContextError::from) + self.storage().read(&key).map_err(HostError::from) } /// Store the NFT class @@ -672,7 +666,7 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::nft_class_key(&class.class_id); self.storage_mut() .write(&key, class) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Get the NFT metadata @@ -682,7 +676,7 @@ pub trait IbcCommonContext: IbcStorageContext { token_id: &TokenId, ) -> Result> { let key = storage::nft_metadata_key(class_id, token_id); - self.storage().read(&key).map_err(ContextError::from) + self.storage().read(&key).map_err(HostError::from) } /// Store the NFT metadata @@ -691,7 +685,7 @@ pub trait IbcCommonContext: IbcStorageContext { storage::nft_metadata_key(&metadata.class_id, &metadata.token_id); self.storage_mut() .write(&key, metadata) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Return true if the NFT is owned by the owner @@ -725,7 +719,7 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::mint_amount_key(token); self.storage_mut() .write(&key, amount) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Read the per-epoch deposit of the given token @@ -739,7 +733,7 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::deposit_key(token); self.storage_mut() .write(&key, amount) - .map_err(ContextError::from) + .map_err(HostError::from) } /// Read the per-epoch withdraw of the given token @@ -757,7 +751,7 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::withdraw_key(token); self.storage_mut() .write(&key, amount) - .map_err(ContextError::from) + .map_err(HostError::from) } } @@ -765,11 +759,11 @@ pub trait IbcCommonContext: IbcStorageContext { pub fn read_sequence( storage: &S, key: &Key, -) -> std::result::Result { +) -> std::result::Result { match storage.read_bytes(key)? { Some(value) => { let value: [u8; 8] = value.try_into().map_err(|_| { - Error::new_alloc(format!( + StorageError::new_alloc(format!( "The sequence value wasn't u64: Key {key}", )) })?; diff --git a/crates/ibc/src/context/execution.rs b/crates/ibc/src/context/execution.rs index 1701261dec..73a6a69934 100644 --- a/crates/ibc/src/context/execution.rs +++ b/crates/ibc/src/context/execution.rs @@ -8,8 +8,8 @@ use ibc::core::channel::types::packet::Receipt; use ibc::core::client::context::ClientExecutionContext; use ibc::core::client::types::Height; use ibc::core::connection::types::ConnectionEnd; -use ibc::core::handler::types::error::ContextError; use ibc::core::handler::types::events::IbcEvent; +use ibc::core::host::types::error::HostError; use ibc::core::host::types::identifiers::{ClientId, ConnectionId, Sequence}; use ibc::core::host::types::path::{ AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, @@ -36,7 +36,7 @@ where &mut self, client_state_path: ClientStatePath, client_state: Self::ClientStateRef, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .store_client_state(&client_state_path.0, client_state) @@ -46,14 +46,19 @@ where &mut self, consensus_state_path: ClientConsensusStatePath, consensus_state: Self::ConsensusStateRef, - ) -> Result<(), ContextError> { - let client_id = consensus_state_path.client_id; + ) -> Result<(), HostError> { + let client_id = &consensus_state_path.client_id; let height = Height::new( consensus_state_path.revision_number, consensus_state_path.revision_height, - )?; + ) + .map_err(|_| HostError::FailedToStore { + description: format!( + "Invalid consensus state path: {consensus_state_path}" + ), + })?; self.inner.borrow_mut().store_consensus_state( - &client_id, + client_id, height, consensus_state, ) @@ -62,15 +67,20 @@ where fn delete_consensus_state( &mut self, consensus_state_path: ClientConsensusStatePath, - ) -> Result<(), ContextError> { - let client_id = consensus_state_path.client_id; + ) -> Result<(), HostError> { + let client_id = &consensus_state_path.client_id; let height = Height::new( consensus_state_path.revision_number, consensus_state_path.revision_height, - )?; + ) + .map_err(|_| HostError::FailedToStore { + description: format!( + "Invalid consensus state path: {consensus_state_path}" + ), + })?; self.inner .borrow_mut() - .delete_consensus_state(&client_id, height) + .delete_consensus_state(client_id, height) } fn store_update_meta( @@ -79,7 +89,7 @@ where _height: Height, host_timestamp: Timestamp, host_height: Height, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().store_update_meta( &client_id, host_timestamp, @@ -91,7 +101,7 @@ where &mut self, client_id: ClientId, _height: Height, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().delete_update_meta(&client_id) } } @@ -107,7 +117,7 @@ where self } - fn increase_client_counter(&mut self) -> Result<(), ContextError> { + fn increase_client_counter(&mut self) -> Result<(), HostError> { let key = storage::client_counter_key(); self.inner.borrow_mut().increment_counter(&key) } @@ -116,7 +126,7 @@ where &mut self, connection_path: &ConnectionPath, connection_end: ConnectionEnd, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .store_connection(&connection_path.0, connection_end) @@ -126,13 +136,13 @@ where &mut self, client_connection_path: &ClientConnectionPath, conn_id: ConnectionId, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .append_connection(&client_connection_path.0, conn_id) } - fn increase_connection_counter(&mut self) -> Result<(), ContextError> { + fn increase_connection_counter(&mut self) -> Result<(), HostError> { let key = storage::connection_counter_key(); self.inner.borrow_mut().increment_counter(&key) } @@ -141,7 +151,7 @@ where &mut self, path: &CommitmentPath, commitment: PacketCommitment, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().store_packet_commitment( &path.port_id, &path.channel_id, @@ -153,7 +163,7 @@ where fn delete_packet_commitment( &mut self, path: &CommitmentPath, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().delete_packet_commitment( &path.port_id, &path.channel_id, @@ -165,7 +175,7 @@ where &mut self, path: &ReceiptPath, _receipt: Receipt, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().store_packet_receipt( &path.port_id, &path.channel_id, @@ -177,7 +187,7 @@ where &mut self, path: &AckPath, ack_commitment: AcknowledgementCommitment, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().store_packet_ack( &path.port_id, &path.channel_id, @@ -189,7 +199,7 @@ where fn delete_packet_acknowledgement( &mut self, path: &AckPath, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner.borrow_mut().delete_packet_ack( &path.port_id, &path.channel_id, @@ -201,7 +211,7 @@ where &mut self, path: &ChannelEndPath, channel_end: ChannelEnd, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .store_channel(&path.0, &path.1, channel_end) @@ -211,7 +221,7 @@ where &mut self, path: &SeqSendPath, seq: Sequence, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .store_next_sequence_send(&path.0, &path.1, seq) @@ -221,7 +231,7 @@ where &mut self, path: &SeqRecvPath, seq: Sequence, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .store_next_sequence_recv(&path.0, &path.1, seq) @@ -231,26 +241,26 @@ where &mut self, path: &SeqAckPath, seq: Sequence, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { self.inner .borrow_mut() .store_next_sequence_ack(&path.0, &path.1, seq) } - fn increase_channel_counter(&mut self) -> Result<(), ContextError> { + fn increase_channel_counter(&mut self) -> Result<(), HostError> { let key = storage::channel_counter_key(); self.inner.borrow_mut().increment_counter(&key) } - fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), ContextError> { + fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), HostError> { let event = event.try_into().expect("The event should be converted"); self.inner .borrow_mut() .emit_ibc_event(event) - .map_err(ContextError::from) + .map_err(HostError::from) } - fn log_message(&mut self, message: String) -> Result<(), ContextError> { + fn log_message(&mut self, message: String) -> Result<(), HostError> { self.inner.borrow().log_string(message); Ok(()) } diff --git a/crates/ibc/src/context/nft_transfer.rs b/crates/ibc/src/context/nft_transfer.rs index d2c50e90b1..7924f169cf 100644 --- a/crates/ibc/src/context/nft_transfer.rs +++ b/crates/ibc/src/context/nft_transfer.rs @@ -7,12 +7,11 @@ use std::rc::Rc; use ibc::apps::nft_transfer::context::{ NftTransferExecutionContext, NftTransferValidationContext, }; -use ibc::apps::nft_transfer::types::error::NftTransferError; use ibc::apps::nft_transfer::types::{ ClassData, ClassUri, Memo, PrefixedClassId, TokenData, TokenId, TokenUri, PORT_ID_STR, }; -use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::error::HostError; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use namada_core::address::{Address, MASP}; use namada_core::token::Amount; @@ -56,51 +55,44 @@ where &self, token: &Address, is_minted: bool, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let mint = self.inner.borrow().mint_amount(token)?; let updated_mint = if is_minted && mint.is_zero() { Amount::from_u64(1) } else if !is_minted && mint == Amount::from_u64(1) { Amount::zero() } else { - return Err(NftTransferError::Other( - "The mint amount was invalid".to_string(), - )); + return Err(HostError::Other { + description: "The mint amount was invalid".to_string(), + }); }; self.inner .borrow_mut() .store_mint_amount(token, updated_mint) - .map_err(NftTransferError::from) } /// Add the amount to the per-epoch withdraw of the token - fn add_deposit(&self, token: &Address) -> Result<(), NftTransferError> { + fn add_deposit(&self, token: &Address) -> Result<(), HostError> { let deposit = self.inner.borrow().deposit(token)?; - let added_deposit = - deposit.checked_add(Amount::from_u64(1)).ok_or_else(|| { - NftTransferError::Other( - "The per-epoch deposit overflowed".to_string(), - ) + let added_deposit = deposit + .checked_add(Amount::from_u64(1)) + .ok_or_else(|| HostError::Other { + description: "The per-epoch deposit overflowed".to_string(), })?; - self.inner - .borrow_mut() - .store_deposit(token, added_deposit) - .map_err(NftTransferError::from) + self.inner.borrow_mut().store_deposit(token, added_deposit) } /// Add the amount to the per-epoch withdraw of the token - fn add_withdraw(&self, token: &Address) -> Result<(), NftTransferError> { + fn add_withdraw(&self, token: &Address) -> Result<(), HostError> { let withdraw = self.inner.borrow().withdraw(token)?; - let added_withdraw = - withdraw.checked_add(Amount::from_u64(1)).ok_or_else(|| { - NftTransferError::Other( - "The per-epoch withdraw overflowed".to_string(), - ) + let added_withdraw = withdraw + .checked_add(Amount::from_u64(1)) + .ok_or_else(|| HostError::Other { + description: "The per-epoch withdraw overflowed".to_string(), })?; self.inner .borrow_mut() .store_withdraw(token, added_withdraw) - .map_err(NftTransferError::from) } fn store_ibc_trace( @@ -108,19 +100,21 @@ where owner: &Address, class_id: &PrefixedClassId, token_id: &TokenId, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let ibc_trace = trace::ibc_trace_for_nft(class_id, token_id); let trace_hash = trace::calc_hash(&ibc_trace); - self.inner - .borrow_mut() - .store_ibc_trace(owner.to_string(), &trace_hash, &ibc_trace) - .map_err(NftTransferError::from)?; + self.inner.borrow_mut().store_ibc_trace( + owner.to_string(), + &trace_hash, + &ibc_trace, + )?; - self.inner - .borrow_mut() - .store_ibc_trace(token_id, &trace_hash, &ibc_trace) - .map_err(NftTransferError::from) + self.inner.borrow_mut().store_ibc_trace( + token_id, + &trace_hash, + &ibc_trace, + ) } } @@ -133,15 +127,15 @@ where type Nft = NftMetadata; type NftClass = NftClass; - fn get_port(&self) -> Result { + fn get_port(&self) -> Result { Ok(PORT_ID_STR.parse().expect("the ID should be parsable")) } - fn can_send_nft(&self) -> Result<(), NftTransferError> { + fn can_send_nft(&self) -> Result<(), HostError> { Ok(()) } - fn can_receive_nft(&self) -> Result<(), NftTransferError> { + fn can_receive_nft(&self) -> Result<(), HostError> { Ok(()) } @@ -151,9 +145,9 @@ where class_id: &PrefixedClassId, _class_uri: Option<&ClassUri>, _class_data: Option<&ClassData>, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { match self.get_nft_class(class_id) { - Ok(_) | Err(NftTransferError::NftClassNotFound) => Ok(()), + Ok(_) | Err(HostError::MissingState { .. }) => Ok(()), Err(e) => Err(e), } } @@ -166,7 +160,7 @@ where class_id: &PrefixedClassId, token_id: &TokenId, _memo: &Memo, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { // The metadata should exist self.get_nft(class_id, token_id)?; @@ -184,10 +178,12 @@ where )? { Ok(()) } else { - Err(NftTransferError::Other(format!( - "The sender balance is invalid: sender {from_account}, \ - class_id {class_id}, token_id {token_id}" - ))) + Err(HostError::InvalidState { + description: format!( + "The sender balance is invalid: sender {from_account}, \ + class_id {class_id}, token_id {token_id}" + ), + }) } // Balance changes will be validated by Multitoken VP } @@ -199,7 +195,7 @@ where _channel_id: &ChannelId, class_id: &PrefixedClassId, token_id: &TokenId, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { // The metadata should exist self.get_nft(class_id, token_id)?; @@ -211,10 +207,12 @@ where )? { Ok(()) } else { - Err(NftTransferError::Other(format!( - "The escrow balance is invalid: class_id {class_id}, token_id \ - {token_id}" - ))) + Err(HostError::InvalidState { + description: format!( + "The escrow balance is invalid: class_id {class_id}, \ + token_id {token_id}" + ), + }) } // Balance changes will be validated by Multitoken VP } @@ -226,7 +224,7 @@ where _token_id: &TokenId, _token_uri: Option<&TokenUri>, _token_data: Option<&TokenData>, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { // Balance changes will be validated by Multitoken VP Ok(()) } @@ -237,7 +235,7 @@ where class_id: &PrefixedClassId, token_id: &TokenId, _memo: &Memo, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { // Metadata should exist self.get_nft(class_id, token_id)?; @@ -251,10 +249,12 @@ where { Ok(()) } else { - Err(NftTransferError::Other(format!( - "The sender balance is invalid: sender {account}, class_id \ - {class_id}, token_id {token_id}" - ))) + Err(HostError::InvalidState { + description: format!( + "The sender balance is invalid: sender {account}, \ + class_id {class_id}, token_id {token_id}" + ), + }) } // Balance changes will be validated by Multitoken VP } @@ -272,11 +272,15 @@ where &self, class_id: &PrefixedClassId, token_id: &TokenId, - ) -> Result { + ) -> Result { match self.inner.borrow().nft_metadata(class_id, token_id) { Ok(Some(nft)) => Ok(nft), - Ok(None) => Err(NftTransferError::NftNotFound), - Err(e) => Err(NftTransferError::ContextError(e)), + Ok(None) => Err(HostError::MissingState { + description: format!( + "No NFT: class ID {class_id}, token ID {token_id}" + ), + }), + Err(e) => Err(e), } } @@ -284,11 +288,13 @@ where fn get_nft_class( &self, class_id: &PrefixedClassId, - ) -> Result { + ) -> Result { match self.inner.borrow().nft_class(class_id) { Ok(Some(class)) => Ok(class), - Ok(None) => Err(NftTransferError::NftClassNotFound), - Err(e) => Err(NftTransferError::ContextError(e)), + Ok(None) => Err(HostError::MissingState { + description: format!("No NFT class: class ID {class_id}"), + }), + Err(e) => Err(e), } } } @@ -303,16 +309,13 @@ where class_id: &PrefixedClassId, class_uri: Option<&ClassUri>, class_data: Option<&ClassData>, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let class = NftClass { class_id: class_id.clone(), class_uri: class_uri.cloned(), class_data: class_data.cloned(), }; - self.inner - .borrow_mut() - .store_nft_class(class) - .map_err(|e| e.into()) + self.inner.borrow_mut().store_nft_class(class) } fn escrow_nft_execute( @@ -323,7 +326,7 @@ where class_id: &PrefixedClassId, token_id: &TokenId, _memo: &Memo, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let ibc_token = trace::ibc_token_for_nft(class_id, token_id); self.add_withdraw(&ibc_token)?; @@ -342,7 +345,7 @@ where &ibc_token, Amount::from_u64(1), ) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } /// Executes the unescrow of the NFT in a user account. @@ -353,7 +356,7 @@ where _channel_id: &ChannelId, class_id: &PrefixedClassId, token_id: &TokenId, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let ibc_token = trace::ibc_token_for_nft(class_id, token_id); self.add_deposit(&ibc_token)?; @@ -366,7 +369,7 @@ where &ibc_token, Amount::from_u64(1), ) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } fn mint_nft_execute( @@ -376,7 +379,7 @@ where token_id: &TokenId, token_uri: Option<&TokenUri>, token_data: Option<&TokenData>, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let ibc_token = trace::ibc_token_for_nft(class_id, token_id); // create or update the metadata @@ -398,7 +401,7 @@ where self.inner .borrow_mut() .mint_token(account, &ibc_token, Amount::from_u64(1)) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } fn burn_nft_execute( @@ -407,7 +410,7 @@ where class_id: &PrefixedClassId, token_id: &TokenId, _memo: &Memo, - ) -> Result<(), NftTransferError> { + ) -> Result<(), HostError> { let ibc_token = trace::ibc_token_for_nft(class_id, token_id); self.update_mint_amount(&ibc_token, false)?; @@ -418,6 +421,6 @@ where self.inner .borrow_mut() .burn_token(account, &ibc_token, Amount::from_u64(1)) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } } diff --git a/crates/ibc/src/context/nft_transfer_mod.rs b/crates/ibc/src/context/nft_transfer_mod.rs index b8450468ce..005a700e80 100644 --- a/crates/ibc/src/context/nft_transfer_mod.rs +++ b/crates/ibc/src/context/nft_transfer_mod.rs @@ -20,7 +20,7 @@ use ibc::apps::nft_transfer::types::error::NftTransferError; use ibc::apps::nft_transfer::types::MODULE_ID_STR; use ibc::core::channel::types::acknowledgement::Acknowledgement; use ibc::core::channel::types::channel::{Counterparty, Order}; -use ibc::core::channel::types::error::{ChannelError, PacketError}; +use ibc::core::channel::types::error::ChannelError; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::Version; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; @@ -270,14 +270,14 @@ where packet: &Packet, acknowledgement: &Acknowledgement, relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { on_acknowledgement_packet_validate( &self.ctx, packet, acknowledgement, relayer, ) - .map_err(into_packet_error) + .map_err(into_channel_error) } fn on_acknowledgement_packet_execute( @@ -285,44 +285,38 @@ where packet: &Packet, acknowledgement: &Acknowledgement, relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { let (extras, result) = on_acknowledgement_packet_execute( &mut self.ctx, packet, acknowledgement, relayer, ); - (extras, result.map_err(into_packet_error)) + (extras, result.map_err(into_channel_error)) } fn on_timeout_packet_validate( &self, packet: &Packet, relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { on_timeout_packet_validate(&self.ctx, packet, relayer) - .map_err(into_packet_error) + .map_err(into_channel_error) } fn on_timeout_packet_execute( &mut self, packet: &Packet, relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { let (extras, result) = on_timeout_packet_execute(&mut self.ctx, packet, relayer); - (extras, result.map_err(into_packet_error)) + (extras, result.map_err(into_channel_error)) } } fn into_channel_error(error: NftTransferError) -> ChannelError { - ChannelError::AppModule { - description: error.to_string(), - } -} - -fn into_packet_error(error: NftTransferError) -> PacketError { - PacketError::AppModule { + ChannelError::AppSpecific { description: error.to_string(), } } @@ -494,7 +488,7 @@ pub mod testing { _packet: &Packet, _acknowledgement: &Acknowledgement, _relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { Ok(()) } @@ -503,7 +497,7 @@ pub mod testing { _packet: &Packet, _acknowledgement: &Acknowledgement, _relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { (ModuleExtras::empty(), Ok(())) } @@ -511,7 +505,7 @@ pub mod testing { &self, _packet: &Packet, _relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { Ok(()) } @@ -519,7 +513,7 @@ pub mod testing { &mut self, _packet: &Packet, _relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { (ModuleExtras::empty(), Ok(())) } } diff --git a/crates/ibc/src/context/token_transfer.rs b/crates/ibc/src/context/token_transfer.rs index 789d7ca635..5489051b49 100644 --- a/crates/ibc/src/context/token_transfer.rs +++ b/crates/ibc/src/context/token_transfer.rs @@ -7,10 +7,8 @@ use std::rc::Rc; use ibc::apps::transfer::context::{ TokenTransferExecutionContext, TokenTransferValidationContext, }; -use ibc::apps::transfer::types::error::TokenTransferError; use ibc::apps::transfer::types::{Memo, PrefixedCoin, PrefixedDenom}; -use ibc::core::channel::types::error::ChannelError; -use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::error::HostError; use ibc::core::host::types::identifiers::{ChannelId, PortId}; use ibc::core::primitives::Signer; use namada_core::address::{Address, InternalAddress, MASP}; @@ -74,7 +72,7 @@ where fn get_token_amount( &self, coin: &PrefixedCoin, - ) -> Result<(Address, Amount), TokenTransferError> { + ) -> Result<(Address, Amount), HostError> { let token = match Address::decode(coin.denom.base_denom.as_str()) { Ok(token_addr) if coin.denom.trace_path.is_empty() => token_addr, _ => trace::ibc_token(coin.denom.to_string()), @@ -83,14 +81,11 @@ where // Convert IBC amount to Namada amount for the token let uint_amount = Uint(primitive_types::U256::from(coin.amount).0); let amount = Amount::from_uint(uint_amount, 0).map_err(|e| { - TokenTransferError::ContextError( - ChannelError::Other { - description: format!( - "The IBC amount is invalid: Coin {coin}, Error {e}", - ), - } - .into(), - ) + HostError::Other { + description: format!( + "The IBC amount is invalid: Coin {coin}, Error {e}", + ), + } })?; Ok((token, amount)) @@ -102,25 +97,20 @@ where token: &Address, amount: Amount, is_minted: bool, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { let mint = self.inner.borrow().mint_amount(token)?; let updated_mint = if is_minted { - mint.checked_add(amount).ok_or_else(|| { - TokenTransferError::Other( - "The mint amount overflowed".to_string(), - ) + mint.checked_add(amount).ok_or_else(|| HostError::Other { + description: "The mint amount overflowed".to_string(), })? } else { - mint.checked_sub(amount).ok_or_else(|| { - TokenTransferError::Other( - "The mint amount underflowed".to_string(), - ) + mint.checked_sub(amount).ok_or_else(|| HostError::Other { + description: "The mint amount underflowed".to_string(), })? }; self.inner .borrow_mut() .store_mint_amount(token, updated_mint) - .map_err(TokenTransferError::from) } /// Add the amount to the per-epoch withdraw of the token @@ -128,17 +118,15 @@ where &self, token: &Address, amount: Amount, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { let deposit = self.inner.borrow().deposit(token)?; - let added_deposit = deposit.checked_add(amount).ok_or_else(|| { - TokenTransferError::Other( - "The per-epoch deposit overflowed".to_string(), - ) - })?; - self.inner - .borrow_mut() - .store_deposit(token, added_deposit) - .map_err(TokenTransferError::from) + let added_deposit = + deposit + .checked_add(amount) + .ok_or_else(|| HostError::Other { + description: "The per-epoch deposit overflowed".to_string(), + })?; + self.inner.borrow_mut().store_deposit(token, added_deposit) } /// Add the amount to the per-epoch withdraw of the token @@ -146,24 +134,25 @@ where &self, token: &Address, amount: Amount, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { let withdraw = self.inner.borrow().withdraw(token)?; - let added_withdraw = withdraw.checked_add(amount).ok_or_else(|| { - TokenTransferError::Other( - "The per-epoch withdraw overflowed".to_string(), - ) - })?; + let added_withdraw = + withdraw + .checked_add(amount) + .ok_or_else(|| HostError::Other { + description: "The per-epoch withdraw overflowed" + .to_string(), + })?; self.inner .borrow_mut() .store_withdraw(token, added_withdraw) - .map_err(TokenTransferError::from) } fn maybe_store_ibc_denom( &self, owner: &Address, coin: &PrefixedCoin, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { if coin.denom.trace_path.is_empty() { // It isn't an IBC denom return Ok(()); @@ -171,18 +160,20 @@ where let ibc_denom = coin.denom.to_string(); let trace_hash = trace::calc_hash(&ibc_denom); - self.inner - .borrow_mut() - .store_ibc_trace(owner.to_string(), &trace_hash, &ibc_denom) - .map_err(TokenTransferError::from)?; + self.inner.borrow_mut().store_ibc_trace( + owner.to_string(), + &trace_hash, + &ibc_denom, + )?; let base_token = Address::decode(coin.denom.base_denom.as_str()) .map(|a| a.to_string()) .unwrap_or(coin.denom.base_denom.to_string()); - self.inner - .borrow_mut() - .store_ibc_trace(base_token, &trace_hash, &ibc_denom) - .map_err(TokenTransferError::from) + self.inner.borrow_mut().store_ibc_trace( + base_token, + &trace_hash, + &ibc_denom, + ) } } @@ -210,15 +201,15 @@ where } } - fn get_port(&self) -> Result { + fn get_port(&self) -> Result { Ok(PortId::transfer()) } - fn can_send_coins(&self) -> Result<(), TokenTransferError> { + fn can_send_coins(&self) -> Result<(), HostError> { Ok(()) } - fn can_receive_coins(&self) -> Result<(), TokenTransferError> { + fn can_receive_coins(&self) -> Result<(), HostError> { Ok(()) } @@ -229,7 +220,7 @@ where _channel_id: &ChannelId, _coin: &PrefixedCoin, _memo: &Memo, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { // validated by Multitoken VP Ok(()) } @@ -240,7 +231,7 @@ where _port_id: &PortId, _channel_id: &ChannelId, _coin: &PrefixedCoin, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { // validated by Multitoken VP Ok(()) } @@ -249,7 +240,7 @@ where &self, _account: &Self::AccountId, _coin: &PrefixedCoin, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { // validated by Multitoken VP Ok(()) } @@ -259,7 +250,7 @@ where _account: &Self::AccountId, _coin: &PrefixedCoin, _memo: &Memo, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { // validated by Multitoken VP Ok(()) } @@ -280,7 +271,7 @@ where _channel_id: &ChannelId, coin: &PrefixedCoin, _memo: &Memo, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { let (ibc_token, amount) = self.get_token_amount(coin)?; self.add_withdraw(&ibc_token, amount)?; @@ -306,7 +297,7 @@ where &ibc_token, amount, ) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } fn unescrow_coins_execute( @@ -315,7 +306,7 @@ where _port_id: &PortId, _channel_id: &ChannelId, coin: &PrefixedCoin, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { let (ibc_token, amount) = self.get_token_amount(coin)?; self.add_deposit(&ibc_token, amount)?; @@ -323,14 +314,14 @@ where self.inner .borrow_mut() .transfer_token(&IBC_ESCROW_ADDRESS, to_account, &ibc_token, amount) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } fn mint_coins_execute( &mut self, account: &Self::AccountId, coin: &PrefixedCoin, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { // The trace path of the denom is already updated if receiving the token let (ibc_token, amount) = self.get_token_amount(coin)?; @@ -351,7 +342,7 @@ where self.inner .borrow_mut() .mint_token(account, &ibc_token, amount) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } fn burn_coins_execute( @@ -359,7 +350,7 @@ where account: &Self::AccountId, coin: &PrefixedCoin, _memo: &Memo, - ) -> Result<(), TokenTransferError> { + ) -> Result<(), HostError> { let (ibc_token, amount) = self.get_token_amount(coin)?; self.update_mint_amount(&ibc_token, amount, false)?; @@ -378,6 +369,6 @@ where self.inner .borrow_mut() .burn_token(account, &ibc_token, amount) - .map_err(|e| ContextError::from(e).into()) + .map_err(HostError::from) } } diff --git a/crates/ibc/src/context/transfer_mod.rs b/crates/ibc/src/context/transfer_mod.rs index a30826514d..0d08a85a86 100644 --- a/crates/ibc/src/context/transfer_mod.rs +++ b/crates/ibc/src/context/transfer_mod.rs @@ -21,7 +21,7 @@ use ibc::apps::transfer::types::error::TokenTransferError; use ibc::apps::transfer::types::MODULE_ID_STR; use ibc::core::channel::types::acknowledgement::Acknowledgement; use ibc::core::channel::types::channel::{Counterparty, Order}; -use ibc::core::channel::types::error::{ChannelError, PacketError}; +use ibc::core::channel::types::error::ChannelError; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::Version; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; @@ -285,14 +285,14 @@ where packet: &Packet, acknowledgement: &Acknowledgement, relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { on_acknowledgement_packet_validate( &self.ctx, packet, acknowledgement, relayer, ) - .map_err(into_packet_error) + .map_err(into_channel_error) } fn on_acknowledgement_packet_execute( @@ -300,44 +300,38 @@ where packet: &Packet, acknowledgement: &Acknowledgement, relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { let (extras, result) = on_acknowledgement_packet_execute( &mut self.ctx, packet, acknowledgement, relayer, ); - (extras, result.map_err(into_packet_error)) + (extras, result.map_err(into_channel_error)) } fn on_timeout_packet_validate( &self, packet: &Packet, relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { on_timeout_packet_validate(&self.ctx, packet, relayer) - .map_err(into_packet_error) + .map_err(into_channel_error) } fn on_timeout_packet_execute( &mut self, packet: &Packet, relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { let (extras, result) = on_timeout_packet_execute(&mut self.ctx, packet, relayer); - (extras, result.map_err(into_packet_error)) + (extras, result.map_err(into_channel_error)) } } fn into_channel_error(error: TokenTransferError) -> ChannelError { - ChannelError::AppModule { - description: error.to_string(), - } -} - -fn into_packet_error(error: TokenTransferError) -> PacketError { - PacketError::AppModule { + ChannelError::AppSpecific { description: error.to_string(), } } @@ -509,7 +503,7 @@ pub mod testing { _packet: &Packet, _acknowledgement: &Acknowledgement, _relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { Ok(()) } @@ -518,7 +512,7 @@ pub mod testing { _packet: &Packet, _acknowledgement: &Acknowledgement, _relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { (ModuleExtras::empty(), Ok(())) } @@ -526,7 +520,7 @@ pub mod testing { &self, _packet: &Packet, _relayer: &Signer, - ) -> Result<(), PacketError> { + ) -> Result<(), ChannelError> { Ok(()) } @@ -534,7 +528,7 @@ pub mod testing { &mut self, _packet: &Packet, _relayer: &Signer, - ) -> (ModuleExtras, Result<(), PacketError>) { + ) -> (ModuleExtras, Result<(), ChannelError>) { (ModuleExtras::empty(), Ok(())) } } diff --git a/crates/ibc/src/context/validation.rs b/crates/ibc/src/context/validation.rs index 7173a14a82..bdc01a4e51 100644 --- a/crates/ibc/src/context/validation.rs +++ b/crates/ibc/src/context/validation.rs @@ -14,7 +14,7 @@ use ibc::core::client::types::Height; use ibc::core::commitment_types::commitment::CommitmentPrefix; use ibc::core::commitment_types::specs::ProofSpecs; use ibc::core::connection::types::ConnectionEnd; -use ibc::core::handler::types::error::ContextError; +use ibc::core::host::types::error::HostError; use ibc::core::host::types::identifiers::{ ChainId, ClientId, ConnectionId, Sequence, }; @@ -40,18 +40,18 @@ where C: IbcCommonContext, Params: parameters::Read, { - fn host_timestamp(&self) -> Result { + fn host_timestamp(&self) -> Result { ValidationContext::host_timestamp(self) } - fn host_height(&self) -> Result { + fn host_height(&self) -> Result { ValidationContext::host_height(self) } fn consensus_state_heights( &self, client_id: &ClientId, - ) -> Result, ContextError> { + ) -> Result, HostError> { self.inner.borrow().consensus_state_heights(client_id) } @@ -59,7 +59,7 @@ where &self, client_id: &ClientId, height: &Height, - ) -> Result, ContextError> { + ) -> Result, HostError> { self.inner.borrow().next_consensus_state(client_id, height) } @@ -67,7 +67,7 @@ where &self, client_id: &ClientId, height: &Height, - ) -> Result, ContextError> { + ) -> Result, HostError> { self.inner.borrow().prev_consensus_state(client_id, height) } } @@ -80,11 +80,11 @@ where C: IbcCommonContext, Params: parameters::Read<::Storage>, { - fn host_timestamp(&self) -> Result { + fn host_timestamp(&self) -> Result { ValidationContext::host_timestamp(self) } - fn host_height(&self) -> Result { + fn host_height(&self) -> Result { ValidationContext::host_height(self) } } @@ -100,18 +100,23 @@ where fn client_state( &self, client_id: &ClientId, - ) -> Result { + ) -> Result { self.inner.borrow().client_state(client_id) } fn consensus_state( &self, client_cons_state_path: &ClientConsensusStatePath, - ) -> Result { + ) -> Result { let height = Height::new( client_cons_state_path.revision_number, client_cons_state_path.revision_height, - )?; + ) + .map_err(|_| HostError::FailedToRetrieve { + description: format!( + "Invalid consensus state path: {client_cons_state_path}" + ), + })?; self.inner .borrow() .consensus_state(&client_cons_state_path.client_id, height) @@ -121,7 +126,7 @@ where &self, client_id: &ClientId, _height: &Height, - ) -> Result<(Timestamp, Height), ContextError> { + ) -> Result<(Timestamp, Height), HostError> { self.inner.borrow().client_update_meta(client_id) } } @@ -139,24 +144,26 @@ where self } - fn host_height(&self) -> Result { + fn host_height(&self) -> Result { let height = self.inner.borrow().storage().get_block_height()?; // the revision number is always 0 - Height::new(0, height.0).map_err(ContextError::ClientError) + Height::new(0, height.0).map_err(|_| HostError::FailedToRetrieve { + description: format!("Invalid height {height}"), + }) } - fn host_timestamp(&self) -> Result { + fn host_timestamp(&self) -> Result { self.inner.borrow().host_timestamp() } fn host_consensus_state( &self, height: &Height, - ) -> Result { + ) -> Result { self.inner.borrow().host_consensus_state(height) } - fn client_counter(&self) -> Result { + fn client_counter(&self) -> Result { let key = storage::client_counter_key(); self.inner.borrow().read_counter(&key) } @@ -164,14 +171,14 @@ where fn connection_end( &self, connection_id: &ConnectionId, - ) -> Result { + ) -> Result { self.inner.borrow().connection_end(connection_id) } fn validate_self_client( &self, client_state_of_host_on_counterparty: Self::HostClientState, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { #[cfg(any(test, feature = "testing"))] { if MockClientState::try_from( @@ -195,7 +202,7 @@ where CommitmentPrefix::from(crate::COMMITMENT_PREFIX.as_bytes().to_vec()) } - fn connection_counter(&self) -> Result { + fn connection_counter(&self) -> Result { let key = storage::connection_counter_key(); self.inner.borrow().read_counter(&key) } @@ -203,35 +210,35 @@ where fn channel_end( &self, path: &ChannelEndPath, - ) -> Result { + ) -> Result { self.inner.borrow().channel_end(&path.0, &path.1) } fn get_next_sequence_send( &self, path: &SeqSendPath, - ) -> Result { + ) -> Result { self.inner.borrow().get_next_sequence_send(&path.0, &path.1) } fn get_next_sequence_recv( &self, path: &SeqRecvPath, - ) -> Result { + ) -> Result { self.inner.borrow().get_next_sequence_recv(&path.0, &path.1) } fn get_next_sequence_ack( &self, path: &SeqAckPath, - ) -> Result { + ) -> Result { self.inner.borrow().get_next_sequence_ack(&path.0, &path.1) } fn get_packet_commitment( &self, path: &CommitmentPath, - ) -> Result { + ) -> Result { self.inner.borrow().packet_commitment( &path.port_id, &path.channel_id, @@ -242,7 +249,7 @@ where fn get_packet_receipt( &self, path: &ReceiptPath, - ) -> Result { + ) -> Result { self.inner.borrow().packet_receipt( &path.port_id, &path.channel_id, @@ -253,7 +260,7 @@ where fn get_packet_acknowledgement( &self, path: &AckPath, - ) -> Result { + ) -> Result { let maybe_ack = self.inner.borrow().packet_ack( &path.port_id, &path.channel_id, @@ -261,14 +268,13 @@ where )?; maybe_ack.ok_or_else(|| { - PacketError::PacketAcknowledgementNotFound { - sequence: path.sequence, + HostError::Other { + description: format!("No packet acknowledgement: port {}, channel {}, sequence {}" path.port_id, path.channel_id, path.sequence) } - .into() }) } - fn channel_counter(&self) -> Result { + fn channel_counter(&self) -> Result { let key = storage::channel_counter_key(); self.inner.borrow().read_counter(&key) } @@ -301,7 +307,7 @@ where fn validate_message_signer( &self, _signer: &Signer, - ) -> Result<(), ContextError> { + ) -> Result<(), HostError> { // The signer of a transaction should be validated Ok(()) } diff --git a/crates/ibc/src/event.rs b/crates/ibc/src/event.rs index 0fd68c4dba..532323baf7 100644 --- a/crates/ibc/src/event.rs +++ b/crates/ibc/src/event.rs @@ -10,8 +10,9 @@ use ibc::core::channel::types::timeout::{ use ibc::core::client::types::events::{ CLIENT_ID_ATTRIBUTE_KEY, CONSENSUS_HEIGHTS_ATTRIBUTE_KEY, }; -use ibc::core::client::types::{Height as IbcHeight, HeightError}; +use ibc::core::client::types::Height as IbcHeight; use ibc::core::handler::types::events::IbcEvent as RawIbcEvent; +use ibc::core::host::types::error::DecodingError; use ibc::core::host::types::identifiers::{ ChannelId as IbcChannelId, ClientId as IbcClientId, ConnectionId as IbcConnectionId, PortId, Sequence, @@ -330,18 +331,14 @@ impl<'data> EventAttributeEntry<'data> for PacketData<'data> { pub struct TimeoutHeight(pub IbcTimeoutHeight); impl FromStr for TimeoutHeight { - type Err = HeightError; + type Err = DecodingError; fn from_str(s: &str) -> Result { - ibc::core::client::types::Height::from_str(s).map_or_else( - |err| match err { - HeightError::ZeroHeight => { - Ok(TimeoutHeight(IbcTimeoutHeight::Never)) - } - err => Err(err), - }, - |height| Ok(TimeoutHeight(IbcTimeoutHeight::At(height))), - ) + if s == "0-0" { + return Ok(TimeoutHeight(IbcTimeoutHeight::Never)); + } + IbcHeight::from_str(s) + .map(|height| TimeoutHeight(IbcTimeoutHeight::At(height))) } } diff --git a/crates/ibc/src/lib.rs b/crates/ibc/src/lib.rs index ea03869024..1b376a1fda 100644 --- a/crates/ibc/src/lib.rs +++ b/crates/ibc/src/lib.rs @@ -72,10 +72,11 @@ use ibc::core::channel::types::msgs::{ }; 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; +use ibc::core::handler::types::error::HandlerError; use ibc::core::handler::types::msgs::MsgEnvelope; -use ibc::core::host::types::error::IdentifierError; +use ibc::core::host::types::error::{ + DecodingError, HostError, IdentifierError, +}; use ibc::core::host::types::identifiers::{ChannelId, PortId, Sequence}; use ibc::core::router::types::error::RouterError; use ibc::primitives::proto::Any; @@ -127,13 +128,13 @@ pub const COMMITMENT_PREFIX: &str = "ibc"; #[derive(Error, Debug)] pub enum Error { #[error("IBC event error: {0}")] - IbcEvent(RawIbcEventError), + IbcEvent(DecodingError), #[error("Decoding IBC data error")] DecodingData, #[error("Decoding message error: {0}")] DecodingMessage(RouterError), - #[error("IBC context error: {0}")] - Context(Box), + #[error("IBC handler error: {0}")] + Handler(Box), #[error("IBC token transfer error: {0}")] TokenTransfer(TokenTransferError), #[error("IBC NFT transfer error: {0}")] @@ -627,12 +628,15 @@ where self.verifiers.borrow_mut().insert( Address::from_str(msg.message.packet_data.sender.as_ref()) .map_err(|_| { - Error::TokenTransfer(TokenTransferError::Other( - format!( - "Cannot convert the sender address {}", - msg.message.packet_data.sender - ), - )) + Error::TokenTransfer( + HostError::Other { + description: format!( + "Cannot convert the sender address {}", + msg.message.packet_data.sender + ), + } + .into(), + ) })?, ); if msg.transfer.is_some() { @@ -656,12 +660,15 @@ where self.verifiers.borrow_mut().insert( Address::from_str(msg.message.packet_data.sender.as_ref()) .map_err(|_| { - Error::NftTransfer(NftTransferError::Other( - format!( - "Cannot convert the sender address {}", - msg.message.packet_data.sender - ), - )) + Error::NftTransfer( + HostError::Other { + description: format!( + "Cannot convert the sender address {}", + msg.message.packet_data.sender + ), + } + .into(), + ) })?, ); send_nft_transfer_execute( @@ -685,7 +692,7 @@ where ); } execute(&mut self.ctx, &mut self.router, *envelope.clone()) - .map_err(|e| Error::Context(Box::new(e)))?; + .map_err(|e| Error::Handler(Box::new(e)))?; // Extract MASP tx from the memo in the packet if needed let masp_tx = match &*envelope { @@ -727,7 +734,7 @@ where &msg.packet.chan_id_on_b, msg.packet.seq_on_a, ) - .map_err(|e| Error::Context(Box::new(e)))? + .map_err(|e| Error::Other(e.to_string()))? else { return Ok(None); }; @@ -778,7 +785,7 @@ where } IbcMessage::Envelope(envelope) => { validate(&self.ctx, &self.router, *envelope) - .map_err(|e| Error::Context(Box::new(e))) + .map_err(|e| Error::Handler(Box::new(e))) } }; self.insert_verifiers()?; @@ -932,8 +939,10 @@ fn received_ibc_trace( dest_channel_id: &ChannelId, ) -> Result { if *dest_port_id == PortId::transfer() { - let mut prefixed_denom = - base_trace.as_ref().parse().map_err(Error::TokenTransfer)?; + let mut prefixed_denom = base_trace + .as_ref() + .parse() + .map_err(|e: DecodingError| Error::Trace(e.to_string()))?; if is_receiver_chain_source( src_port_id.clone(), src_channel_id.clone(), @@ -955,7 +964,9 @@ fn received_ibc_trace( { let mut class_id = PrefixedClassId { trace_path, - base_class_id: base_class_id.parse().map_err(Error::NftTransfer)?, + base_class_id: base_class_id + .parse() + .map_err(|e: DecodingError| Error::Trace(e.to_string()))?, }; if is_nft_receiver_chain_source( src_port_id.clone(), @@ -974,7 +985,9 @@ fn received_ibc_trace( ); class_id.add_trace_prefix(prefix); } - let token_id: TokenId = token_id.parse().map_err(Error::NftTransfer)?; + let token_id: TokenId = token_id + .parse() + .map_err(|e: DecodingError| Error::Trace(e.to_string()))?; return Ok(format!("{class_id}/{token_id}")); } diff --git a/crates/ibc/src/nft.rs b/crates/ibc/src/nft.rs index a1f05502a9..ddead2d009 100644 --- a/crates/ibc/src/nft.rs +++ b/crates/ibc/src/nft.rs @@ -1,9 +1,9 @@ use borsh::{BorshDeserialize, BorshSerialize}; use ibc::apps::nft_transfer::context::{NftClassContext, NftContext}; -use ibc::apps::nft_transfer::types::error::NftTransferError; use ibc::apps::nft_transfer::types::{ ClassData, ClassId, ClassUri, PrefixedClassId, TokenData, TokenId, TokenUri, }; +use ibc::core::host::types::error::DecodingError; /// NFT class #[derive(Clone, Debug)] @@ -45,14 +45,14 @@ impl BorshDeserialize for NftClass { ) -> std::io::Result { use std::io::{Error, ErrorKind}; let class_id: String = BorshDeserialize::deserialize_reader(reader)?; - let class_id = class_id.parse().map_err(|e: NftTransferError| { + let class_id = class_id.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?; let is_uri: bool = BorshDeserialize::deserialize_reader(reader)?; let class_uri = if is_uri { let uri_str: String = BorshDeserialize::deserialize_reader(reader)?; - Some(uri_str.parse().map_err(|e: NftTransferError| { + Some(uri_str.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?) } else { @@ -63,7 +63,7 @@ impl BorshDeserialize for NftClass { let class_data = if is_data { let data_str: String = BorshDeserialize::deserialize_reader(reader)?; - Some(data_str.parse().map_err(|e: NftTransferError| { + Some(data_str.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?) } else { @@ -135,19 +135,19 @@ impl BorshDeserialize for NftMetadata { ) -> std::io::Result { use std::io::{Error, ErrorKind}; let class_id: String = BorshDeserialize::deserialize_reader(reader)?; - let class_id = class_id.parse().map_err(|e: NftTransferError| { + let class_id = class_id.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?; let token_id: String = BorshDeserialize::deserialize_reader(reader)?; - let token_id = token_id.parse().map_err(|e: NftTransferError| { + let token_id = token_id.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?; let is_uri: bool = BorshDeserialize::deserialize_reader(reader)?; let token_uri = if is_uri { let uri_str: String = BorshDeserialize::deserialize_reader(reader)?; - Some(uri_str.parse().map_err(|e: NftTransferError| { + Some(uri_str.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?) } else { @@ -158,7 +158,7 @@ impl BorshDeserialize for NftMetadata { let token_data = if is_data { let data_str: String = BorshDeserialize::deserialize_reader(reader)?; - Some(data_str.parse().map_err(|e: NftTransferError| { + Some(data_str.parse().map_err(|e: DecodingError| { Error::new(ErrorKind::InvalidData, e.to_string()) })?) } else { diff --git a/crates/ibc/src/vp/mod.rs b/crates/ibc/src/vp/mod.rs index 54444ef543..5545d1287a 100644 --- a/crates/ibc/src/vp/mod.rs +++ b/crates/ibc/src/vp/mod.rs @@ -464,6 +464,7 @@ mod tests { use assert_matches::assert_matches; use ibc::core::channel::types::timeout::TimeoutTimestamp; + use ibc::primitives::IntoTimestamp; use ibc_testkit::testapp::ibc::clients::mock::client_state::{ client_type, MockClientState, MOCK_CLIENT_TYPE, }; @@ -1156,7 +1157,7 @@ mod tests { let time = (TmTime::now() - std::time::Duration::new(100, 0)).unwrap(); let header = MockHeader { height, - timestamp: time.try_into().unwrap(), + timestamp: time.into_timestamp().unwrap(), }; let msg = MsgUpdateClient { client_id: client_id.clone(), diff --git a/crates/node/src/bench_utils.rs b/crates/node/src/bench_utils.rs index c02fdd0cf8..2e4b13af25 100644 --- a/crates/node/src/bench_utils.rs +++ b/crates/node/src/bench_utils.rs @@ -68,7 +68,7 @@ use namada_sdk::ibc::core::host::types::path::{ ClientConsensusStatePath, ClientStatePath, Path as IbcPath, }; use namada_sdk::ibc::primitives::proto::{Any, Protobuf}; -use namada_sdk::ibc::primitives::Timestamp as IbcTimestamp; +use namada_sdk::ibc::primitives::{IntoTimestamp, Timestamp as IbcTimestamp}; use namada_sdk::ibc::storage::{ channel_key, connection_key, mint_limit_key, port_key, throughput_limit_key, }; @@ -239,7 +239,7 @@ impl BenchShellInner { #[allow(clippy::disallowed_methods)] let now: namada_sdk::tendermint::Time = DateTimeUtc::now().try_into().unwrap(); - let now: IbcTimestamp = now.try_into().unwrap(); + let now: IbcTimestamp = now.into_timestamp().unwrap(); let timeout_timestamp = (now + std::time::Duration::new(3600, 0)).unwrap(); @@ -1327,7 +1327,7 @@ impl BenchShieldedCtx { #[allow(clippy::disallowed_methods)] let now: namada_sdk::tendermint::Time = DateTimeUtc::now().try_into().unwrap(); - let now: IbcTimestamp = now.try_into().unwrap(); + let now: IbcTimestamp = now.into_timestamp().unwrap(); let timeout_timestamp = (now + std::time::Duration::new(3600, 0)).unwrap(); let msg = IbcMsgTransfer { diff --git a/crates/sdk/src/signing.rs b/crates/sdk/src/signing.rs index 1252373faa..8c1ecda842 100644 --- a/crates/sdk/src/signing.rs +++ b/crates/sdk/src/signing.rs @@ -16,10 +16,12 @@ use namada_account::{AccountPublicKeysMap, InitAccount, UpdateAccount}; use namada_core::address::{Address, ImplicitAddress, InternalAddress, MASP}; use namada_core::arith::checked; use namada_core::collections::{HashMap, HashSet}; +use namada_core::ibc::primitives::IntoHostTime; use namada_core::key::*; use namada_core::masp::{ AssetData, ExtendedViewingKey, MaspTxId, PaymentAddress, }; +use namada_core::tendermint::Time as TmTime; use namada_core::time::DateTimeUtc; use namada_core::token::{Amount, DenominatedAmount}; use namada_governance::storage::proposal::{ @@ -1109,7 +1111,9 @@ fn format_timeout_timestamp(timestamp: &TimeoutTimestamp) -> String { match timestamp { TimeoutTimestamp::Never => "no timestamp".to_string(), TimeoutTimestamp::At(timestamp) => { - timestamp.into_tm_time().to_rfc3339() + let tm_time: TmTime = + timestamp.into_host_time().expect("invalid timestamp"); + tm_time.to_rfc3339() } } } diff --git a/crates/sdk/src/tx.rs b/crates/sdk/src/tx.rs index a6b4547477..0e73bcf394 100644 --- a/crates/sdk/src/tx.rs +++ b/crates/sdk/src/tx.rs @@ -39,7 +39,7 @@ use namada_core::ibc::core::channel::types::timeout::{ }; 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; +use namada_core::ibc::primitives::{IntoTimestamp, Timestamp as IbcTimestamp}; use namada_core::key::{self, *}; use namada_core::masp::{AssetData, MaspEpoch, TransferSource, TransferTarget}; use namada_core::storage; @@ -2742,7 +2742,7 @@ pub async fn build_ibc_transfer( } .try_into(); let now = now.map_err(|e| Error::Other(e.to_string()))?; - let now: IbcTimestamp = now.try_into().map_err(|e| { + let now: IbcTimestamp = now.into_timestamp().map_err(|e| { Error::Other(format!("Timestamp conversion failed: {e}")) })?; let timeout_timestamp = if let Some(offset) = args.timeout_sec_offset { diff --git a/crates/storage/src/error.rs b/crates/storage/src/error.rs index a5b2e76c87..50115ce012 100644 --- a/crates/storage/src/error.rs +++ b/crates/storage/src/error.rs @@ -148,17 +148,14 @@ impl OptionExt for Option { } } -/// Convert `namada_storage::Error` into IBC `ContextError`. -/// It always returns `ClientError::Other` though the storage error could happen +/// Convert `namada_storage::Error` into IBC `HandlerError`. +/// It always returns `HostError::Other` though the storage error could happen /// in any storage access. -impl From - for namada_core::ibc::core::handler::types::error::ContextError -{ +impl From for namada_core::ibc::core::host::types::error::HostError { fn from(error: Error) -> Self { - namada_core::ibc::core::client::types::error::ClientError::Other { + namada_core::ibc::core::host::types::error::HostError::Other { description: format!("Storage error: {error}"), } - .into() } } diff --git a/crates/tests/src/vm_host_env/ibc.rs b/crates/tests/src/vm_host_env/ibc.rs index 88b9f723b5..d04fbb5423 100644 --- a/crates/tests/src/vm_host_env/ibc.rs +++ b/crates/tests/src/vm_host_env/ibc.rs @@ -735,7 +735,7 @@ pub fn balance_key_with_ibc_prefix(denom: String, owner: &Address) -> Key { pub fn transfer_ack_with_error() -> AcknowledgementStatus { AcknowledgementStatus::error( StatusValue::new( - TokenTransferError::PacketDataDeserialization.to_string(), + TokenTransferError::FailedToDeserializePacketData.to_string(), ) .expect("Empty message"), ) diff --git a/crates/tests/src/vm_host_env/mod.rs b/crates/tests/src/vm_host_env/mod.rs index 07054ea203..680a048b3f 100644 --- a/crates/tests/src/vm_host_env/mod.rs +++ b/crates/tests/src/vm_host_env/mod.rs @@ -1112,7 +1112,7 @@ mod tests { result .expect_err("validation succeeded unexpectedly") .downcast_ref::(), - Some(IbcActionError::Context(_)), + Some(IbcActionError::Handler(_)), )); } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index f760c674bc..ca5a4d4658 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -54,7 +54,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -116,7 +116,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "num-traits", + "num-traits 0.2.17", "zeroize", ] @@ -132,7 +132,7 @@ dependencies = [ "ark-std", "derivative", "num-bigint", - "num-traits", + "num-traits 0.2.17", "paste", "rustc_version 0.3.3", "zeroize", @@ -155,7 +155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", - "num-traits", + "num-traits 0.2.17", "quote", "syn 1.0.109", ] @@ -176,8 +176,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ - "num-traits", - "rand", + "num-traits 0.2.17", + "rand 0.8.5", ] [[package]] @@ -236,15 +236,6 @@ dependencies = [ "rustc_version 0.4.0", ] -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -375,11 +366,11 @@ checksum = "dd18cd9983aad2c7dbe0552c597c1a2a8373c6e88ba327dce73860975554b3db" dependencies = [ "displaydoc", "ics23", - "prost 0.13.1", + "prost", "serde", "serde_json", "sha2 0.10.8", - "tendermint", + "tendermint 0.38.1", "tracing", ] @@ -407,7 +398,7 @@ dependencies = [ "ff", "group", "pairing", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -426,9 +417,9 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "568b6890865156d9043af490d4c4081c385dd68ea10acd6ca15733d511e6b51c" dependencies = [ - "hmac", + "hmac 0.12.1", "pbkdf2 0.12.2", - "rand", + "rand 0.8.5", "sha2 0.10.8", "unicode-normalization", "zeroize", @@ -545,10 +536,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" dependencies = [ "ff", - "rand_core", + "rand_core 0.6.4", "subtle", ] +[[package]] +name = "bls12_381" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838#d3ebe9dd6488fac1923db120a7498079e55dd838" +dependencies = [ + "ff", + "group", + "pairing", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "bon" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" +dependencies = [ + "bon-macros", + "rustversion", +] + +[[package]] +name = "bon-macros" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" +dependencies = [ + "darling 0.20.10", + "ident_case", + "prettyplease", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.96", +] + [[package]] name = "borsh" version = "1.4.0" @@ -670,7 +698,7 @@ dependencies = [ "semver 1.0.20", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -736,7 +764,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits", + "num-traits 0.2.17", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -792,12 +820,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - [[package]] name = "coins-bip32" version = "0.8.7" @@ -807,11 +829,11 @@ dependencies = [ "bs58", "coins-core", "digest 0.10.7", - "hmac", + "hmac 0.12.1", "k256", "serde", "sha2 0.10.8", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -822,12 +844,12 @@ checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" dependencies = [ "bitvec", "coins-bip32", - "hmac", + "hmac 0.12.1", "once_cell", "pbkdf2 0.12.2", - "rand", + "rand 0.8.5", "sha2 0.10.8", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -847,7 +869,7 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -860,12 +882,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "const-crc32-nostd" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808ac43170e95b11dd23d78aa9eaac5bea45776a602955552c4e833f3f0f823d" - [[package]] name = "const-default" version = "1.0.0" @@ -919,15 +935,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" -dependencies = [ - "memchr", -] - [[package]] name = "corosensei" version = "0.1.4" @@ -941,6 +948,18 @@ dependencies = [ "windows-sys 0.33.0", ] +[[package]] +name = "cosmos-sdk-proto" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427" +dependencies = [ + "informalsystems-pbjson", + "prost", + "serde", + "tendermint-proto 0.40.1", +] + [[package]] name = "cpufeatures" version = "0.2.11" @@ -1042,12 +1061,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -1100,7 +1113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1115,6 +1128,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array", + "subtle", +] + [[package]] name = "ct-codecs" version = "1.1.1" @@ -1138,7 +1161,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core", + "rand_core 0.6.4", "subtle-ng", "zeroize", ] @@ -1155,12 +1178,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1173,20 +1196,21 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", + "strsim 0.11.1", "syn 2.0.96", ] @@ -1203,11 +1227,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.10", "quote", "syn 2.0.96", ] @@ -1231,12 +1255,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "debugless-unwrap" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f400d0750c0c069e8493f2256cb4da6f604b6d2eeb69a0ca8863acde352f8400" - [[package]] name = "der" version = "0.7.8" @@ -1273,17 +1291,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-getters" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "derive_builder" version = "0.12.0" @@ -1326,6 +1333,27 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -1349,23 +1377,22 @@ dependencies = [ [[package]] name = "directories" -version = "5.0.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.4.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "option-ext", "redox_users", - "windows-sys 0.48.0", + "winapi", ] [[package]] @@ -1394,16 +1421,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" -[[package]] -name = "dur" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5b6c91b5e394b75cd96c36393fc938496c030220207a0ccf34d6cd313d3b49" -dependencies = [ - "nom", - "rust_decimal", -] - [[package]] name = "duration-str" version = "0.10.0" @@ -1413,7 +1430,7 @@ dependencies = [ "chrono", "rust_decimal", "serde", - "thiserror 1.0.50", + "thiserror", "time", "winnow 0.6.8", ] @@ -1483,10 +1500,10 @@ checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b" dependencies = [ "curve25519-dalek-ng", "hex", - "rand_core", + "rand_core 0.6.4", "serde", "sha2 0.9.9", - "thiserror 1.0.50", + "thiserror", "zeroize", ] @@ -1509,25 +1526,13 @@ dependencies = [ "generic-array", "group", "pkcs8", - "rand_core", + "rand_core 0.6.4", "sec1", "serdect", "subtle", "zeroize", ] -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "embedded-io" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" - [[package]] name = "encoding_rs" version = "0.8.33" @@ -1548,7 +1553,7 @@ dependencies = [ "hex", "k256", "log", - "rand", + "rand 0.8.5", "rlp", "serde", "sha3", @@ -1590,7 +1595,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.3", + "darling 0.20.10", "proc-macro2", "quote", "syn 2.0.96", @@ -1622,15 +1627,15 @@ dependencies = [ "ctr", "digest 0.10.7", "hex", - "hmac", + "hmac 0.12.1", "pbkdf2 0.11.0", - "rand", + "rand 0.8.5", "scrypt", "serde", "serde_json", "sha2 0.10.8", "sha3", - "thiserror 1.0.50", + "thiserror", "uuid 0.8.2", ] @@ -1647,8 +1652,8 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror 1.0.50", - "uint", + "thiserror", + "uint 0.9.5", ] [[package]] @@ -1659,9 +1664,9 @@ checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" dependencies = [ "crunchy", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", "scale-info", "tiny-keccak", ] @@ -1709,12 +1714,12 @@ checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" dependencies = [ "ethbloom", "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", - "primitive-types", + "impl-serde 0.4.0", + "primitive-types 0.12.2", "scale-info", - "uint", + "uint 0.9.5", ] [[package]] @@ -1760,7 +1765,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -1819,14 +1824,14 @@ dependencies = [ "num_enum", "once_cell", "open-fastrlp", - "rand", + "rand 0.8.5", "rlp", "serde", "serde_json", "strum 0.25.0", "syn 2.0.96", "tempfile", - "thiserror 1.0.50", + "thiserror", "tiny-keccak", "unicode-xid", ] @@ -1843,7 +1848,7 @@ dependencies = [ "semver 1.0.20", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -1866,7 +1871,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", "tokio", "tracing", "tracing-futures", @@ -1898,7 +1903,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", "tokio", "tracing", "tracing-futures", @@ -1922,9 +1927,9 @@ dependencies = [ "elliptic-curve", "eth-keystore", "ethers-core", - "rand", + "rand 0.8.5", "sha2 0.10.8", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -1968,7 +1973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -1991,7 +1996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -2074,43 +2079,7 @@ dependencies = [ "libm", "num-bigint", "num-integer", - "num-traits", -] - -[[package]] -name = "frost-core" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5afd375261c34d31ff24dad068382f4bc3c95010c919d4fb8d483dc3d85c023" -dependencies = [ - "byteorder", - "const-crc32-nostd", - "debugless-unwrap", - "derive-getters", - "document-features", - "hex", - "itertools 0.13.0", - "postcard", - "rand_core", - "serde", - "serdect", - "thiserror 1.0.50", - "thiserror-nostd-notrait", - "visibility", - "zeroize", -] - -[[package]] -name = "frost-rerandomized" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9d77595060546b53543d96b83dbeacaf3907e40a89763a8bb22124812b0cb6" -dependencies = [ - "derive-getters", - "document-features", - "frost-core", - "hex", - "rand_core", + "num-traits 0.2.17", ] [[package]] @@ -2248,6 +2217,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + [[package]] name = "getrandom" version = "0.2.15" @@ -2257,7 +2239,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -2298,7 +2280,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "memuse", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -2366,15 +2348,6 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2390,12 +2363,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" - [[package]] name = "hashers" version = "1.0.1" @@ -2405,20 +2372,6 @@ dependencies = [ "fxhash", ] -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version 0.4.0", - "serde", - "spin 0.9.8", - "stable_deref_trait", -] - [[package]] name = "heck" version = "0.4.1" @@ -2437,6 +2390,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hmac" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" +dependencies = [ + "crypto-mac", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.12.1" @@ -2452,15 +2415,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e806677ce663d0a199541030c816847b36e8dc095f70dae4a4f4ad63da5383" -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "http" version = "0.2.11" @@ -2645,8 +2599,8 @@ dependencies = [ [[package]] name = "ibc" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-apps", "ibc-clients", @@ -2658,8 +2612,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2668,12 +2622,12 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "base64 0.22.1", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "http 1.1.0", "ibc-app-transfer-types", @@ -2689,8 +2643,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2699,26 +2653,26 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core", "ibc-proto", "parity-scale-codec", - "primitive-types", + "primitive-types 0.13.1", "scale-info", "schemars", "serde", - "uint", + "uint 0.10.0", ] [[package]] name = "ibc-apps" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2726,10 +2680,10 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ - "derive_more", + "derive_more 1.0.0", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -2737,14 +2691,14 @@ dependencies = [ "ibc-core-host", "ibc-primitives", "serde", - "tendermint", + "tendermint 0.40.1", "tendermint-light-client-verifier", ] [[package]] name = "ibc-client-tendermint-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2753,15 +2707,15 @@ dependencies = [ "ibc-primitives", "ibc-proto", "serde", - "tendermint", + "tendermint 0.40.1", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.40.1", ] [[package]] name = "ibc-client-wasm-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "base64 0.22.1", "displaydoc", @@ -2774,8 +2728,8 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2783,8 +2737,8 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2799,8 +2753,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2814,11 +2768,11 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -2832,13 +2786,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-client" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2850,10 +2804,10 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -2861,16 +2815,16 @@ dependencies = [ "ibc-core-host-types", "ibc-primitives", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-client-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-commitment-types", "ibc-core-host-types", @@ -2881,16 +2835,16 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-commitment-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-host-types", "ibc-primitives", @@ -2905,8 +2859,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -2914,16 +2868,16 @@ dependencies = [ "ibc-core-handler-types", "ibc-core-host", "ibc-primitives", - "prost 0.13.1", + "prost", ] [[package]] name = "ibc-core-connection-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -2935,13 +2889,13 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-handler" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2955,11 +2909,11 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-client-types", @@ -2974,15 +2928,15 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-host" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-client-context", @@ -2997,10 +2951,10 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-app-transfer-types", "ibc-client-tendermint", @@ -3015,19 +2969,21 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-host-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ + "base64 0.22.1", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-primitives", "parity-scale-codec", + "prost", "scale-info", "schemars", "serde", @@ -3035,10 +2991,10 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-host-types", @@ -3049,11 +3005,11 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-host-types", "ibc-primitives", @@ -3063,164 +3019,60 @@ dependencies = [ "schemars", "serde", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", ] [[package]] name = "ibc-derive" -version = "0.8.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "proc-macro2", "quote", "syn 2.0.96", ] -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-overflow-receive" -version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "ibc-app-transfer-types", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-primitives", - "serde", - "serde_json", -] - -[[package]] -name = "ibc-middleware-packet-forward" -version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "borsh", - "dur", - "either", - "ibc-app-transfer-types", - "ibc-core-channel", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0)", - "ibc-primitives", - "serde", - "serde_json", -] - [[package]] name = "ibc-primitives" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-proto", "parity-scale-codec", - "prost 0.13.1", + "prost", "scale-info", "schemars", "serde", - "tendermint", "time", ] [[package]] name = "ibc-proto" -version = "0.47.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1678333cf68c9094ca66aaf9a271269f1f6bf5c26881161def8bd88cee831a23" +checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca" dependencies = [ "base64 0.22.1", - "borsh", "bytes", + "cosmos-sdk-proto", "flex-error", "ics23", "informalsystems-pbjson", - "parity-scale-codec", - "prost 0.13.1", - "scale-info", + "prost", "schemars", "serde", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.40.1", "tonic", ] [[package]] name = "ibc-query" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "displaydoc", "ibc", @@ -3230,20 +3082,20 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" dependencies = [ "basecoin-store", - "derive_more", + "bon", + "derive_more 1.0.0", "displaydoc", "ibc", "ibc-proto", "ibc-query", "parking_lot", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", "tendermint-testgen", - "typed-builder", ] [[package]] @@ -3258,7 +3110,7 @@ dependencies = [ "bytes", "hex", "informalsystems-pbjson", - "prost 0.13.1", + "prost", "ripemd", "serde", "sha2 0.10.8", @@ -3290,6 +3142,15 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "impl-codec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "impl-num-traits" version = "0.1.2" @@ -3297,8 +3158,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", - "num-traits", - "uint", + "num-traits 0.2.17", + "uint 0.9.5", ] [[package]] @@ -3319,6 +3180,15 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-serde" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a143eada6a1ec4aefa5049037a26a6d597bfd64f8c026d07b77133e02b7dd0b" +dependencies = [ + "serde", +] + [[package]] name = "impl-trait-for-tuples" version = "0.2.2" @@ -3356,6 +3226,17 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.2.4" +source = "git+https://github.com/heliaxdev/indexmap?tag=2.2.4-heliax-1#b5b5b547bd6ab04bbb16e060326a50ddaeb6c909" +dependencies = [ + "borsh", + "equivalent", + "hashbrown 0.14.3", + "serde", +] + [[package]] name = "indexmap" version = "2.2.6" @@ -3410,7 +3291,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -3437,24 +3318,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.9" @@ -3491,10 +3354,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8499f7a74008aafbecb2a2e608a3e13e4dd3e84df198b604451efe93f2de6e61" dependencies = [ "bitvec", - "bls12_381", + "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "ff", "group", - "rand_core", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "jubjub" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c#a373686962f4e9d0edb3b4716f86ff6bbd9aa86c" +dependencies = [ + "bitvec", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", + "ff", + "group", + "rand_core 0.6.4", "subtle", ] @@ -3626,29 +3502,28 @@ dependencies = [ [[package]] name = "masp_note_encryption" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9736dbd86140a9d6711b464297a87af9cc0ae485d73a956c595f1bc1f6a7920" +version = "1.0.0" +source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" dependencies = [ "borsh", "chacha20", "chacha20poly1305", "cipher", - "rand_core", + "rand_core 0.6.4", "subtle", ] [[package]] name = "masp_primitives" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb184254ca5cd5fb12e11b81a6a0d6b955d98c7263eae11057f669c31c7123c" +version = "1.0.0" +source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" dependencies = [ "aes", "bip0039", "bitvec", "blake2b_simd", "blake2s_simd", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "borsh", "byteorder", "ff", @@ -3656,16 +3531,15 @@ dependencies = [ "group", "hex", "incrementalmerkletree", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_note_encryption", "memuse", - "nam-bls12_381", - "nam-jubjub", - "nam-num-traits", - "nonempty 0.11.0", + "nonempty", + "num-traits 0.2.19", "proptest", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "sha2 0.10.8", "subtle", "zcash_encoding", @@ -3673,23 +3547,22 @@ dependencies = [ [[package]] name = "masp_proofs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833eb23ccc5e4781636f6a7b2e720f60f31e53e534d1abb2b0ac5e86eb099c14" +version = "1.0.0" +source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" dependencies = [ "bellman", "blake2b_simd", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "directories", - "getrandom", + "getrandom 0.2.15", "group", - "itertools 0.14.0", + "itertools 0.11.0", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_primitives", "minreq", - "nam-bls12_381", - "nam-jubjub", - "nam-redjubjub", - "rand_core", + "rand_core 0.6.4", + "redjubjub", "tracing", ] @@ -3759,12 +3632,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3795,7 +3662,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -3811,112 +3678,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "nam-bls12_381" -version = "0.8.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e768b0e2383163f2f4bbce1112d6454b2cb515950b0a9177733f0d71254d2c68" -dependencies = [ - "ff", - "group", - "pairing", - "rand_core", - "subtle", -] - -[[package]] -name = "nam-indexmap" -version = "2.7.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b40876708764895b63bb5a1e9f102d3813cb16baeb9f12932b7c8f2df4248e" -dependencies = [ - "borsh", - "equivalent", - "hashbrown 0.15.2", - "serde", -] - -[[package]] -name = "nam-jubjub" -version = "0.10.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdced0f5975d8f80cb82a84d464481acb7b586d22f447dda86947d6a572997b9" -dependencies = [ - "bitvec", - "ff", - "group", - "nam-bls12_381", - "rand_core", - "subtle", -] - -[[package]] -name = "nam-num-traits" -version = "0.2.20-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687832a07242b76ab2760bc95180240954bf77e06bf8d9e825473c373146dc4a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nam-reddsa" -version = "0.5.2-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d102b4311bf60c03405350e976d17f5df155d2cb588f6401995a29ae8c1565" -dependencies = [ - "blake2b_simd", - "byteorder", - "frost-rerandomized", - "group", - "hex", - "jubjub", - "pasta_curves", - "rand_core", - "serde", - "thiserror 2.0.11", - "zeroize", -] - -[[package]] -name = "nam-redjubjub" -version = "0.7.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e457988762db7daad8d79f8a837a07295f5cc178d9236ba77db7339072ffb61e" -dependencies = [ - "nam-reddsa", - "rand_core", - "serde", - "thiserror 1.0.50", - "zeroize", -] - -[[package]] -name = "nam-sparse-merkle-tree" -version = "0.3.2-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae108a0f6aabf789e34d6d447c1184608d1c70c087f957b720042226a47ab63" -dependencies = [ - "borsh", - "cfg-if", - "ics23", - "itertools 0.14.0", - "sha2 0.10.8", -] - -[[package]] -name = "nam-tiny-hderive" -version = "0.3.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfd77f274636f722e966c394b381a70233ed4c25150864a4c53d398028a6818" -dependencies = [ - "base58", - "hmac", - "k256", - "memzero", - "sha2 0.10.8", -] - [[package]] name = "namada_account" version = "0.47.0" @@ -3935,7 +3696,7 @@ version = "0.47.0" dependencies = [ "namada_core", "smooth-operator", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -3953,35 +3714,35 @@ dependencies = [ "ibc", "ics23", "impl-num-traits", + "indexmap 2.2.4", "k256", "lazy_static", "masp_primitives", - "nam-indexmap", - "nam-sparse-merkle-tree", "namada_macros", "num-integer", "num-rational", - "num-traits", + "num-traits 0.2.17", "num256", "num_enum", - "primitive-types", + "primitive-types 0.13.1", "proptest", - "prost-types 0.13.1", - "rand", - "rand_core", + "prost-types", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "ripemd", "serde", "serde_json", "sha2 0.9.9", "smooth-operator", - "tendermint", - "tendermint-proto", - "thiserror 1.0.50", + "sparse-merkle-tree", + "tendermint 0.40.1", + "tendermint-proto 0.40.1", + "thiserror", "tiny-keccak", "tokio", "tracing", - "uint", + "uint 0.9.5", "usize-set", "wasmtimer", "zeroize", @@ -4012,7 +3773,7 @@ dependencies = [ "namada_vp_env", "serde", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4025,7 +3786,7 @@ dependencies = [ "namada_macros", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4038,7 +3799,7 @@ dependencies = [ "namada_events", "namada_macros", "serde", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -4060,7 +3821,7 @@ dependencies = [ "serde", "serde_json", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4070,13 +3831,8 @@ version = "0.47.0" dependencies = [ "borsh", "data-encoding", - "dur", "ibc", "ibc-derive", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0)", - "ibc-middleware-overflow-receive", - "ibc-middleware-packet-forward", "ibc-testkit", "ics23", "konst", @@ -4089,14 +3845,14 @@ dependencies = [ "namada_systems", "namada_tx", "namada_vp", - "primitive-types", + "primitive-types 0.13.1", "proptest", - "prost 0.13.1", + "prost", "serde", "serde_json", "sha2 0.9.9", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4108,7 +3864,7 @@ dependencies = [ "kdam", "namada_core", "tendermint-rpc", - "thiserror 1.0.50", + "thiserror", "tokio", ] @@ -4130,11 +3886,11 @@ dependencies = [ "borsh", "eyre", "ics23", - "nam-sparse-merkle-tree", "namada_core", "namada_macros", - "prost 0.13.1", - "thiserror 1.0.50", + "prost", + "sparse-merkle-tree", + "thiserror", ] [[package]] @@ -4148,7 +3904,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -4171,7 +3927,7 @@ dependencies = [ "proptest", "serde", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4187,7 +3943,6 @@ name = "namada_sdk" version = "0.47.0" dependencies = [ "async-trait", - "bech32 0.8.1", "bimap", "borsh", "circular-queue", @@ -4202,10 +3957,10 @@ dependencies = [ "futures", "init-once", "itertools 0.12.1", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_primitives", "masp_proofs", - "nam-jubjub", "namada_account", "namada_core", "namada_ethereum_bridge", @@ -4225,15 +3980,15 @@ dependencies = [ "namada_vote_ext", "namada_vp", "namada_wallet", - "num-traits", + "num-traits 0.2.17", "num256", "owo-colors", "paste", "patricia_tree", "proptest", - "prost 0.13.1", - "rand", - "rand_core", + "prost", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "regex", "reqwest", @@ -4244,7 +3999,7 @@ dependencies = [ "smooth-operator", "tempfile", "tendermint-rpc", - "thiserror 1.0.50", + "thiserror", "tiny-bip39", "tokio", "toml 0.5.11", @@ -4279,8 +4034,8 @@ dependencies = [ "namada_vp_env", "namada_wallet", "proptest", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "rayon", "ripemd", "serde", @@ -4288,7 +4043,7 @@ dependencies = [ "sha2 0.9.9", "smooth-operator", "tempfile", - "thiserror 1.0.50", + "thiserror", "tracing", "typed-builder", "xorf", @@ -4313,7 +4068,7 @@ dependencies = [ "patricia_tree", "proptest", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4331,7 +4086,7 @@ dependencies = [ "regex", "serde", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4351,7 +4106,7 @@ dependencies = [ "borsh", "namada_core", "namada_state", - "prost 0.13.1", + "prost", "strum 0.24.1", ] @@ -4361,9 +4116,7 @@ version = "0.47.0" dependencies = [ "concat-idents", "derivative", - "dur", "hyper 0.14.27", - "ibc-middleware-packet-forward", "ibc-testkit", "ics23", "itertools 0.12.1", @@ -4376,7 +4129,7 @@ dependencies = [ "namada_vp", "namada_vp_prelude", "proptest", - "prost 0.13.1", + "prost", "regex", "serde", "serde_json", @@ -4419,7 +4172,7 @@ dependencies = [ "namada_tx", "namada_tx_env", "namada_vp_env", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4440,15 +4193,15 @@ dependencies = [ "namada_gas", "namada_macros", "num-derive 0.4.2", - "num-traits", + "num-traits 0.2.17", "proptest", - "prost 0.13.1", - "prost-types 0.13.1", - "rand_core", + "prost", + "prost-types", + "rand_core 0.6.4", "serde", "serde_json", "sha2 0.9.9", - "thiserror 1.0.50", + "thiserror", "tonic-build", ] @@ -4501,7 +4254,7 @@ dependencies = [ "rayon", "smooth-operator", "tempfile", - "thiserror 1.0.50", + "thiserror", "tracing", "wasm-instrument", "wasmer", @@ -4540,7 +4293,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -4591,18 +4344,18 @@ dependencies = [ "fd-lock", "itertools 0.12.1", "masp_primitives", - "nam-tiny-hderive", "namada_core", "namada_ibc", "namada_macros", "orion", - "rand", - "rand_core", + "rand 0.8.5", + "rand_core 0.6.4", "serde", "slip10_ed25519", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tiny-bip39", + "tiny-hderive", "toml 0.5.11", "zeroize", ] @@ -4613,7 +4366,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -4633,28 +4386,12 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nonempty" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" -[[package]] -name = "nonempty" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549e471b99ccaf2f89101bec68f4d244457d5a95a9c3d0672e9564124397741d" - [[package]] name = "num" version = "0.4.1" @@ -4666,7 +4403,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4677,7 +4414,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4686,7 +4423,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4724,7 +4461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4735,7 +4472,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4747,19 +4484,27 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.19" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", ] +[[package]] +name = "num-traits" +version = "0.2.19" +source = "git+https://github.com/heliaxdev/num-traits?rev=3f3657caa34b8e116fdf3f8a3519c4ac29f012fe#3f3657caa34b8e116fdf3f8a3519c4ac29f012fe" +dependencies = [ + "autocfg", +] + [[package]] name = "num256" version = "0.3.5" @@ -4769,7 +4514,7 @@ dependencies = [ "lazy_static", "num", "num-derive 0.3.3", - "num-traits", + "num-traits 0.2.17", "serde", "serde_derive", ] @@ -4882,14 +4627,8 @@ dependencies = [ "cc", "libc", "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + "vcpkg", +] [[package]] name = "orion" @@ -4898,7 +4637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6624905ddd92e460ff0685567539ed1ac985b2dee4c92c7edcd64fce905b00c" dependencies = [ "ct-codecs", - "getrandom", + "getrandom 0.2.15", "subtle", "zeroize", ] @@ -4980,7 +4719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core", + "rand_core 0.6.4", "subtle", ] @@ -4992,7 +4731,7 @@ checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" dependencies = [ "ff", "group", - "rand", + "rand 0.8.5", "static_assertions", "subtle", ] @@ -5012,6 +4751,15 @@ dependencies = [ "bitflags 2.5.0", ] +[[package]] +name = "pbkdf2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +dependencies = [ + "crypto-mac", +] + [[package]] name = "pbkdf2" version = "0.11.0" @@ -5028,7 +4776,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac", + "hmac 0.12.1", "password-hash", ] @@ -5081,7 +4829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", - "thiserror 1.0.50", + "thiserror", "ucd-trie", ] @@ -5170,19 +4918,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" -[[package]] -name = "postcard" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" -dependencies = [ - "cobs", - "embedded-io 0.4.0", - "embedded-io 0.6.1", - "heapless", - "serde", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -5212,11 +4947,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", "scale-info", - "uint", + "uint 0.9.5", +] + +[[package]] +name = "primitive-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" +dependencies = [ + "fixed-hash", + "impl-codec 0.7.0", + "impl-serde 0.5.0", + "uint 0.10.0", ] [[package]] @@ -5280,9 +5027,9 @@ dependencies = [ "bit-vec", "bitflags 2.5.0", "lazy_static", - "num-traits", - "rand", - "rand_chacha", + "num-traits 0.2.17", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax 0.8.2", "rusty-fork", @@ -5292,88 +5039,55 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes", - "prost-derive 0.12.3", -] - -[[package]] -name = "prost" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" dependencies = [ "bytes", - "prost-derive 0.13.1", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" dependencies = [ "bytes", "heck", - "itertools 0.11.0", + "itertools 0.12.1", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", - "prost-types 0.12.3", + "prost", + "prost-types", "regex", "syn 2.0.96", "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.96", ] [[package]] name = "prost-derive" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.96", ] -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -dependencies = [ - "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", + "prost", ] [[package]] @@ -5404,9 +5118,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.38" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -5417,6 +5131,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -5424,8 +5151,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] @@ -5435,7 +5172,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", ] [[package]] @@ -5444,7 +5190,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -5453,7 +5208,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -5478,6 +5233,37 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "reddsa" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78a5191930e84973293aa5f532b513404460cd2216c1cfb76d08748c15b40b02" +dependencies = [ + "blake2b_simd", + "byteorder", + "group", + "hex", + "jubjub 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pasta_curves", + "rand_core 0.6.4", + "serde", + "thiserror", + "zeroize", +] + +[[package]] +name = "redjubjub" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a60db2c3bc9c6fd1e8631fee75abc008841d27144be744951d6b9b75f9b569c" +dependencies = [ + "rand_core 0.6.4", + "reddsa", + "serde", + "thiserror", + "zeroize", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -5493,9 +5279,9 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -5619,7 +5405,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac", + "hmac 0.12.1", "subtle", ] @@ -5645,7 +5431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -5726,18 +5512,12 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.36.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand", - "rkyv", - "serde", - "serde_json", + "num-traits 0.2.17", ] [[package]] @@ -5860,7 +5640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -5923,7 +5703,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" dependencies = [ - "hmac", + "hmac 0.12.1", "pbkdf2 0.11.0", "salsa20", "sha2 0.10.8", @@ -6100,12 +5880,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", - "memchr", "ryu", "serde", ] @@ -6255,7 +6034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -6277,8 +6056,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", - "num-traits", - "thiserror 1.0.50", + "num-traits 0.2.17", + "thiserror", "time", ] @@ -6352,6 +6131,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "sparse-merkle-tree" +version = "0.3.1-pre" +source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" +dependencies = [ + "borsh", + "cfg-if", + "ics23", + "itertools 0.12.1", + "sha2 0.9.9", +] + [[package]] name = "spin" version = "0.5.2" @@ -6395,6 +6186,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" @@ -6581,6 +6378,33 @@ name = "tendermint" version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" +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.38.1", + "time", + "zeroize", +] + +[[package]] +name = "tendermint" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2" dependencies = [ "bytes", "digest 0.10.7", @@ -6589,10 +6413,9 @@ dependencies = [ "flex-error", "futures", "k256", - "num-traits", + "num-traits 0.2.17", "once_cell", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", "ripemd", "serde", "serde_bytes", @@ -6602,35 +6425,35 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.40.1", "time", "zeroize", ] [[package]] name = "tendermint-config" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" +checksum = "89cc3ea9a39b7ee34eefcff771cc067ecaa0c988c1c5ac08defd878471a06f76" dependencies = [ "flex-error", "serde", "serde_json", - "tendermint", + "tendermint 0.40.1", "toml 0.8.2", "url", ] [[package]] name = "tendermint-light-client-verifier" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" +checksum = "f0cda4a449fc70985a95f892a67286f13afa4e048d90b8d04a2bf6341e88d1c2" dependencies = [ - "derive_more", + "derive_more 0.99.18", "flex-error", "serde", - "tendermint", + "tendermint 0.40.1", "time", ] @@ -6642,8 +6465,27 @@ checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" dependencies = [ "bytes", "flex-error", - "prost 0.13.1", - "prost-types 0.13.1", + "prost", + "prost-types", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + +[[package]] +name = "tendermint-proto" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb" +dependencies = [ + "borsh", + "bytes", + "flex-error", + "parity-scale-codec", + "prost", + "scale-info", + "schemars", "serde", "serde_bytes", "subtle-encoding", @@ -6652,27 +6494,27 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" +checksum = "835a52aa504c63ec05519e31348d3f4ba2fe79493c588e2cad5323d5e81b161a" dependencies = [ "async-trait", "bytes", "flex-error", - "getrandom", + "getrandom 0.2.15", "peg", "pin-project", - "rand", + "rand 0.8.5", "semver 1.0.20", "serde", "serde_bytes", "serde_json", "subtle", "subtle-encoding", - "tendermint", + "tendermint 0.40.1", "tendermint-config", - "tendermint-proto", - "thiserror 1.0.50", + "tendermint-proto 0.40.1", + "thiserror", "time", "url", "uuid 1.8.0", @@ -6681,9 +6523,9 @@ dependencies = [ [[package]] name = "tendermint-testgen" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae007e2918414ae96e4835426aace7538d23b8ddf96d71e23d241f58f386e877" +checksum = "3fbbef28bac7b5b68f44416ef16d072ee8ea4af829aaf2fa259eee1c09237c36" dependencies = [ "ed25519-consensus", "gumdrop", @@ -6691,7 +6533,7 @@ dependencies = [ "serde_json", "simple-error", "tempfile", - "tendermint", + "tendermint 0.40.1", "time", ] @@ -6732,16 +6574,7 @@ version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ - "thiserror-impl 1.0.50", -] - -[[package]] -name = "thiserror" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" -dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl", ] [[package]] @@ -6755,37 +6588,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "thiserror-impl" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "thiserror-nostd-notrait" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8444e638022c44d2a9337031dee8acb732bcc7fbf52ac654edc236b26408b61" -dependencies = [ - "thiserror-nostd-notrait-impl", -] - -[[package]] -name = "thiserror-nostd-notrait-impl" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585e5ef40a784ce60b49c67d762110688d211d395d39e096be204535cf64590e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "thread_local" version = "1.1.7" @@ -6829,21 +6631,34 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30fd743a02bf35236f6faf99adb03089bb77e91c998dac2c2ad76bb424f668c" +version = "0.8.2" +source = "git+https://github.com/anoma/tiny-bip39.git?rev=bf0f6d8713589b83af7a917366ec31f5275c0e57#bf0f6d8713589b83af7a917366ec31f5275c0e57" dependencies = [ + "anyhow", + "hmac 0.8.1", "once_cell", - "pbkdf2 0.12.2", - "rand", + "pbkdf2 0.4.0", + "rand 0.7.3", "rustc-hash", - "sha2 0.10.8", - "thiserror 1.0.50", + "sha2 0.9.9", + "thiserror", "unicode-normalization", "wasm-bindgen", "zeroize", ] +[[package]] +name = "tiny-hderive" +version = "0.3.0" +source = "git+https://github.com/heliaxdev/tiny-hderive.git?rev=173ae03abed0cd25d88a5a13efac00af96b75b87#173ae03abed0cd25d88a5a13efac00af96b75b87" +dependencies = [ + "base58", + "hmac 0.12.1", + "k256", + "memzero", + "sha2 0.10.8", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -6909,9 +6724,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -7013,9 +6828,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", @@ -7031,7 +6846,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost 0.13.1", + "prost", "socket2 0.5.5", "tokio", "tokio-stream", @@ -7043,13 +6858,14 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", "prost-build", + "prost-types", "quote", "syn 2.0.96", ] @@ -7065,7 +6881,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand", + "rand 0.8.5", "slab", "tokio", "tokio-util", @@ -7152,7 +6968,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" name = "tx_become_validator" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7161,7 +6977,7 @@ dependencies = [ name = "tx_bond" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7177,7 +6993,7 @@ dependencies = [ name = "tx_bridge_pool" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7186,7 +7002,7 @@ dependencies = [ name = "tx_change_consensus_key" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7195,7 +7011,7 @@ dependencies = [ name = "tx_change_validator_commission" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7211,7 +7027,7 @@ dependencies = [ name = "tx_change_validator_metadata" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7220,7 +7036,7 @@ dependencies = [ name = "tx_claim_rewards" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7229,7 +7045,7 @@ dependencies = [ name = "tx_deactivate_validator" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7238,7 +7054,7 @@ dependencies = [ name = "tx_ibc" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7247,7 +7063,7 @@ dependencies = [ name = "tx_init_account" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7256,7 +7072,7 @@ dependencies = [ name = "tx_init_proposal" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7265,7 +7081,7 @@ dependencies = [ name = "tx_reactivate_validator" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7274,7 +7090,7 @@ dependencies = [ name = "tx_redelegate" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7290,7 +7106,7 @@ dependencies = [ name = "tx_resign_steward" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7299,7 +7115,7 @@ dependencies = [ name = "tx_reveal_pk" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7308,7 +7124,7 @@ dependencies = [ name = "tx_transfer" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7317,7 +7133,7 @@ dependencies = [ name = "tx_unbond" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7333,7 +7149,7 @@ dependencies = [ name = "tx_unjail_validator" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7342,7 +7158,7 @@ dependencies = [ name = "tx_update_account" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7351,7 +7167,7 @@ dependencies = [ name = "tx_update_steward_commission" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7360,7 +7176,7 @@ dependencies = [ name = "tx_vote_proposal" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_tx_prelude", "rlsf", ] @@ -7369,7 +7185,7 @@ dependencies = [ name = "tx_withdraw" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7440,6 +7256,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" @@ -7535,7 +7363,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom", + "getrandom 0.2.15", "serde", ] @@ -7557,22 +7385,11 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "visibility" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "vp_implicit" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7588,7 +7405,7 @@ dependencies = [ name = "vp_user" version = "0.47.0" dependencies = [ - "getrandom", + "getrandom 0.2.15", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7628,6 +7445,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7735,7 +7558,7 @@ dependencies = [ "serde-wasm-bindgen", "shared-buffer", "target-lexicon", - "thiserror 1.0.50", + "thiserror", "tracing", "wasm-bindgen", "wasmer-compiler", @@ -7755,7 +7578,7 @@ checksum = "79fd0889f8844b7c70b8ee8fbf1d1f6ccff99399c6f3d3627048cde04b1ac493" dependencies = [ "blake3", "hex", - "thiserror 1.0.50", + "thiserror", "wasmer", ] @@ -7780,7 +7603,7 @@ dependencies = [ "self_cell", "shared-buffer", "smallvec", - "thiserror 1.0.50", + "thiserror", "wasmer-types", "wasmer-vm", "wasmparser 0.121.2", @@ -7843,7 +7666,7 @@ dependencies = [ "serde_cbor", "serde_json", "serde_yaml", - "thiserror 1.0.50", + "thiserror", "toml 0.8.2", "url", ] @@ -7869,14 +7692,14 @@ dependencies = [ "bytecheck", "enum-iterator", "enumset", - "getrandom", + "getrandom 0.2.15", "hex", "indexmap 1.9.3", "more-asserts", "rkyv", "sha2 0.10.8", "target-lexicon", - "thiserror 1.0.50", + "thiserror", "webc", "xxhash-rust", ] @@ -7904,7 +7727,7 @@ dependencies = [ "more-asserts", "region", "scopeguard", - "thiserror 1.0.50", + "thiserror", "wasmer-types", "winapi", ] @@ -7998,7 +7821,7 @@ dependencies = [ "shared-buffer", "tar", "tempfile", - "thiserror 1.0.50", + "thiserror", "toml 0.7.8", "url", "wasmer-config", @@ -8010,18 +7833,6 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -8278,7 +8089,7 @@ dependencies = [ "pharos", "rustc_version 0.4.0", "send_wrapper 0.6.0", - "thiserror 1.0.50", + "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -8311,7 +8122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf24c008fe464f5d8f58b8d16a1ab7e930bd73b2a6933ff8704c414b2bed7f92" dependencies = [ "libm", - "rand", + "rand 0.8.5", "serde", ] @@ -8323,12 +8134,11 @@ checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" [[package]] name = "zcash_encoding" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3654116ae23ab67dd1f849b01f8821a8a156f884807ff665eac109bf28306c4d" +version = "0.2.0" +source = "git+https://github.com/zcash/librustzcash?rev=bd7f9d7#bd7f9d7c3ce5cfd14af169ffe0e1c5c903162f46" dependencies = [ - "core2", - "nonempty 0.7.0", + "byteorder", + "nonempty", ] [[package]] From d12d63d407bd50897b391f8028d8a28140521956 Mon Sep 17 00:00:00 2001 From: yito88 Date: Fri, 17 Jan 2025 16:00:24 +0100 Subject: [PATCH 3/9] updete ibc-middleware --- Cargo.lock | 1104 ++++++++++++----- Cargo.toml | 2 +- crates/ibc/src/context/common.rs | 7 +- crates/ibc/src/context/middlewares/pfm_mod.rs | 12 +- crates/ibc/src/context/nft_transfer_mod.rs | 3 +- crates/ibc/src/context/transfer_mod.rs | 3 +- crates/ibc/src/context/validation.rs | 10 +- crates/tests/src/e2e/ibc_tests.rs | 2 +- crates/tests/src/e2e/setup.rs | 2 +- wasm/Cargo.lock | 151 ++- wasm_for_tests/Cargo.lock | 1066 ++++++---------- 11 files changed, 1305 insertions(+), 1057 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 830882190d..1240cac8c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1652,10 +1652,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", -<<<<<<< HEAD -======= "strsim 0.11.1", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) "syn 2.0.96", ] @@ -1804,8 +1801,6 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.96", -<<<<<<< HEAD -======= ] [[package]] @@ -1827,7 +1822,6 @@ dependencies = [ "quote", "syn 2.0.96", "unicode-xid", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -1957,6 +1951,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dur" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce5b6c91b5e394b75cd96c36393fc938496c030220207a0ccf34d6cd313d3b49" +dependencies = [ + "nom", + "rust_decimal", +] + [[package]] name = "duration-str" version = "0.10.0" @@ -2255,13 +2259,8 @@ dependencies = [ "serde", "serde_json", "sha3", -<<<<<<< HEAD "thiserror 1.0.50", - "uint", -======= - "thiserror", "uint 0.9.5", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -2720,9 +2719,9 @@ dependencies = [ [[package]] name = "frost-core" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5afd375261c34d31ff24dad068382f4bc3c95010c919d4fb8d483dc3d85c023" +checksum = "1858230cabb6792a5020daf4b0074f57b7d1e2a520ac544c77f102babee62ff4" dependencies = [ "byteorder", "const-crc32-nostd", @@ -2730,12 +2729,12 @@ dependencies = [ "derive-getters", "document-features", "hex", - "itertools 0.13.0", + "itertools 0.14.0", "postcard", "rand_core", "serde", "serdect", - "thiserror 1.0.50", + "thiserror 2.0.11", "thiserror-nostd-notrait", "visibility", "zeroize", @@ -2743,9 +2742,9 @@ dependencies = [ [[package]] name = "frost-rerandomized" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9d77595060546b53543d96b83dbeacaf3907e40a89763a8bb22124812b0cb6" +checksum = "e8a3b10d9c1e9f298522510940b5b8c3d55040420517ec8d2bb86c4c2d1ae3ee" dependencies = [ "derive-getters", "document-features", @@ -3401,30 +3400,30 @@ dependencies = [ [[package]] name = "ibc" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-apps", "ibc-clients", - "ibc-core", + "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "ibc-core-host-cosmos", - "ibc-derive", - "ibc-primitives", + "ibc-derive 0.10.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", ] [[package]] name = "ibc-app-nft-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer-types", - "ibc-core", + "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "serde-json-wasm", ] [[package]] name = "ibc-app-nft-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3432,9 +3431,9 @@ dependencies = [ "derive_more 1.0.0", "displaydoc", "http 1.1.0", - "ibc-app-transfer-types", - "ibc-core", - "ibc-proto", + "ibc-app-transfer-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "mime", "parity-scale-codec", "scale-info", @@ -3446,24 +3445,54 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ - "ibc-app-transfer-types", - "ibc-core", + "ibc-app-transfer-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "serde-json-wasm", ] +[[package]] +name = "ibc-app-transfer-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core 0.54.0", + "ibc-proto 0.47.1", + "primitive-types 0.12.2", + "serde", + "uint 0.9.5", +] + [[package]] name = "ibc-app-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-core 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "primitive-types 0.13.1", + "serde", + "uint 0.10.0", +] + +[[package]] +name = "ibc-app-transfer-types" +version = "0.56.0" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core", - "ibc-proto", + "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "parity-scale-codec", "primitive-types 0.13.1", "scale-info", @@ -3475,7 +3504,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -3484,15 +3513,15 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", - "ibc-core-client", - "ibc-core-commitment-types", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-primitives", + "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "serde", "tendermint 0.40.1", "tendermint-light-client-verifier", @@ -3501,14 +3530,14 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "serde", "tendermint 0.40.1", "tendermint-light-client-verifier", @@ -3518,21 +3547,21 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "displaydoc", - "ibc-core-client", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "serde", ] [[package]] name = "ibc-clients" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3540,50 +3569,152 @@ dependencies = [ [[package]] name = "ibc-core" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "ibc-core-channel 0.54.0", + "ibc-core-client 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-connection 0.54.0", + "ibc-core-handler 0.54.0", + "ibc-core-host 0.54.0", + "ibc-core-router 0.54.0", + "ibc-derive 0.8.0", + "ibc-primitives 0.54.0", +] + +[[package]] +name = "ibc-core" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "ibc-core-channel 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-derive 0.10.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", +] + +[[package]] +name = "ibc-core" +version = "0.56.0" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "ibc-core-channel 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-router 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-derive 0.10.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", +] + +[[package]] +name = "ibc-core-channel" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "ibc-core-channel-types 0.54.0", + "ibc-core-client 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-connection 0.54.0", + "ibc-core-handler-types 0.54.0", + "ibc-core-host 0.54.0", + "ibc-core-router 0.54.0", + "ibc-primitives 0.54.0", +] + +[[package]] +name = "ibc-core-channel" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "ibc-core-channel", - "ibc-core-client", - "ibc-core-commitment-types", - "ibc-core-connection", - "ibc-core-handler", - "ibc-core-host", - "ibc-core-router", - "ibc-derive", - "ibc-primitives", + "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", ] [[package]] name = "ibc-core-channel" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-router 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", +] + +[[package]] +name = "ibc-core-channel-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core-client-types 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-connection-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "ibc-proto 0.47.1", + "serde", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.38.1", +] + +[[package]] +name = "ibc-core-channel-types" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "ibc-core-channel-types", - "ibc-core-client", - "ibc-core-commitment-types", - "ibc-core-connection", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-core-router", - "ibc-primitives", + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "serde", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-channel-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-connection-types", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "parity-scale-codec", "scale-info", "schemars", @@ -3595,29 +3726,121 @@ dependencies = [ [[package]] name = "ibc-core-client" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "ibc-core-client-context 0.54.0", + "ibc-core-client-types 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-handler-types 0.54.0", + "ibc-core-host 0.54.0", + "ibc-primitives 0.54.0", +] + +[[package]] +name = "ibc-core-client" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "ibc-core-client-context 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", +] + +[[package]] +name = "ibc-core-client" +version = "0.56.0" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "ibc-core-client-context 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", +] + +[[package]] +name = "ibc-core-client-context" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "derive_more 0.99.18", + "displaydoc", + "ibc-core-client-types 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-handler-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "subtle-encoding", + "tendermint 0.38.1", +] + +[[package]] +name = "ibc-core-client-context" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "ibc-core-client-context", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-primitives", + "derive_more 1.0.0", + "displaydoc", + "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "subtle-encoding", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-client-context" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "derive_more 1.0.0", + "displaydoc", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "subtle-encoding", + "tendermint 0.40.1", +] + +[[package]] +name = "ibc-core-client-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core-commitment-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "ibc-proto 0.47.1", + "serde", + "subtle-encoding", + "tendermint 0.38.1", +] + +[[package]] +name = "ibc-core-client-types" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ + "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-handler-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "serde", "subtle-encoding", "tendermint 0.40.1", ] @@ -3625,16 +3848,16 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-commitment-types", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "parity-scale-codec", "scale-info", "schemars", @@ -3643,18 +3866,50 @@ dependencies = [ "tendermint 0.40.1", ] +[[package]] +name = "ibc-core-commitment-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "ibc-proto 0.47.1", + "ics23", + "serde", + "subtle-encoding", +] + +[[package]] +name = "ibc-core-commitment-types" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "ics23", + "serde", + "subtle-encoding", +] + [[package]] name = "ibc-core-commitment-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "ics23", "parity-scale-codec", "scale-info", @@ -3663,34 +3918,94 @@ dependencies = [ "subtle-encoding", ] +[[package]] +name = "ibc-core-connection" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "ibc-core-client 0.54.0", + "ibc-core-connection-types 0.54.0", + "ibc-core-handler-types 0.54.0", + "ibc-core-host 0.54.0", + "ibc-primitives 0.54.0", +] + +[[package]] +name = "ibc-core-connection" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", +] + [[package]] name = "ibc-core-connection" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-wasm-types", - "ibc-core-client", - "ibc-core-connection-types", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-primitives", + "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "prost 0.13.2", ] +[[package]] +name = "ibc-core-connection-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core-client-types 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "ibc-proto 0.47.1", + "serde", + "subtle-encoding", + "tendermint 0.38.1", +] + +[[package]] +name = "ibc-core-connection-types" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "serde", + "subtle-encoding", + "tendermint 0.40.1", +] + [[package]] name = "ibc-core-connection-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "parity-scale-codec", "scale-info", "schemars", @@ -3699,38 +4014,110 @@ dependencies = [ "tendermint 0.40.1", ] +[[package]] +name = "ibc-core-handler" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "ibc-core-channel 0.54.0", + "ibc-core-client 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-connection 0.54.0", + "ibc-core-handler-types 0.54.0", + "ibc-core-host 0.54.0", + "ibc-core-router 0.54.0", + "ibc-primitives 0.54.0", +] + [[package]] name = "ibc-core-handler" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "ibc-core-channel", - "ibc-core-client", - "ibc-core-commitment-types", - "ibc-core-connection", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-core-router", - "ibc-primitives", + "ibc-core-channel 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", +] + +[[package]] +name = "ibc-core-handler" +version = "0.56.0" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "ibc-core-channel 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-router 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", +] + +[[package]] +name = "ibc-core-handler-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core-channel-types 0.54.0", + "ibc-core-client-types 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-connection-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-core-router-types 0.54.0", + "ibc-primitives 0.54.0", + "ibc-proto 0.47.1", + "serde", + "subtle-encoding", + "tendermint 0.38.1", +] + +[[package]] +name = "ibc-core-handler-types" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "serde", + "subtle-encoding", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-handler-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-channel-types", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-connection-types", - "ibc-core-host-types", - "ibc-core-router-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-router-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "parity-scale-codec", "scale-info", "schemars", @@ -3739,58 +4126,120 @@ dependencies = [ "tendermint 0.40.1", ] +[[package]] +name = "ibc-core-host" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "derive_more 0.99.18", + "displaydoc", + "ibc-core-channel-types 0.54.0", + "ibc-core-client-context 0.54.0", + "ibc-core-client-types 0.54.0", + "ibc-core-commitment-types 0.54.0", + "ibc-core-connection-types 0.54.0", + "ibc-core-handler-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "subtle-encoding", +] + [[package]] name = "ibc-core-host" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "derive_more 1.0.0", "displaydoc", - "ibc-core-channel-types", - "ibc-core-client-context", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-connection-types", - "ibc-core-handler-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client-context 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "subtle-encoding", +] + +[[package]] +name = "ibc-core-host" +version = "0.56.0" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "derive_more 1.0.0", + "displaydoc", + "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client-context 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "subtle-encoding", ] [[package]] name = "ibc-core-host-cosmos" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", - "ibc-app-transfer-types", + "ibc-app-transfer-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "ibc-client-tendermint", - "ibc-core-client-context", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-connection-types", - "ibc-core-handler-types", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-client-context 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "serde", "sha2 0.10.8", "subtle-encoding", "tendermint 0.40.1", ] +[[package]] +name = "ibc-core-host-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-primitives 0.54.0", + "serde", +] + +[[package]] +name = "ibc-core-host-types" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "base64 0.22.1", + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "prost 0.13.2", + "serde", +] + [[package]] name = "ibc-core-host-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "base64 0.22.1", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-primitives", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "parity-scale-codec", "prost 0.13.2", "scale-info", @@ -3800,29 +4249,89 @@ dependencies = [ [[package]] name = "ibc-core-router" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "derive_more 0.99.18", + "displaydoc", + "ibc-core-channel-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-core-router-types 0.54.0", + "ibc-primitives 0.54.0", + "subtle-encoding", +] + +[[package]] +name = "ibc-core-router" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "derive_more 1.0.0", + "displaydoc", + "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "subtle-encoding", +] + +[[package]] +name = "ibc-core-router" +version = "0.56.0" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +dependencies = [ + "derive_more 1.0.0", + "displaydoc", + "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-router-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "subtle-encoding", +] + +[[package]] +name = "ibc-core-router-types" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-core-host-types 0.54.0", + "ibc-primitives 0.54.0", + "ibc-proto 0.47.1", + "serde", + "subtle-encoding", + "tendermint 0.38.1", +] + +[[package]] +name = "ibc-core-router-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ + "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router-types", - "ibc-primitives", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-proto 0.51.1", + "serde", "subtle-encoding", + "tendermint 0.40.1", ] [[package]] name = "ibc-core-router-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-host-types", - "ibc-primitives", - "ibc-proto", + "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-proto 0.51.1", "parity-scale-codec", "scale-info", "schemars", @@ -3831,15 +4340,34 @@ dependencies = [ "tendermint 0.40.1", ] +[[package]] +name = "ibc-derive" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "ibc-derive" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "ibc-derive" version = "0.10.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "proc-macro2", "quote", "syn 2.0.96", -<<<<<<< HEAD ] [[package]] @@ -3847,11 +4375,11 @@ name = "ibc-middleware-module" version = "0.1.0" source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", + "ibc-core-channel-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-core-router 0.54.0", + "ibc-core-router-types 0.54.0", + "ibc-primitives 0.54.0", ] [[package]] @@ -3859,23 +4387,23 @@ name = "ibc-middleware-module" version = "0.1.0" source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", + "ibc-core-channel-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-core-router 0.54.0", + "ibc-core-router-types 0.54.0", + "ibc-primitives 0.54.0", ] [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", + "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", ] [[package]] @@ -3899,7 +4427,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" dependencies = [ "proc-macro2", "quote", @@ -3910,14 +4438,14 @@ name = "ibc-middleware-overflow-receive" version = "0.4.0" source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" dependencies = [ - "ibc-app-transfer-types", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", + "ibc-app-transfer-types 0.54.0", + "ibc-core-channel-types 0.54.0", + "ibc-core-host-types 0.54.0", + "ibc-core-router 0.54.0", + "ibc-core-router-types 0.54.0", "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-primitives", + "ibc-primitives 0.54.0", "serde", "serde_json", ] @@ -3925,36 +4453,63 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" dependencies = [ "borsh", "dur", "either", - "ibc-app-transfer-types", - "ibc-core-channel", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0)", - "ibc-primitives", + "ibc-app-transfer-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-channel 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs)", + "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", "serde", "serde_json", -======= ->>>>>>> b73473752 (WIP: upgrade ibc-rs) +] + +[[package]] +name = "ibc-primitives" +version = "0.54.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +dependencies = [ + "borsh", + "derive_more 0.99.18", + "displaydoc", + "ibc-proto 0.47.1", + "prost 0.13.2", + "serde", + "tendermint 0.38.1", + "time", +] + +[[package]] +name = "ibc-primitives" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +dependencies = [ + "borsh", + "derive_more 1.0.0", + "displaydoc", + "ibc-proto 0.51.1", + "prost 0.13.2", + "serde", + "time", ] [[package]] name = "ibc-primitives" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "arbitrary", "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-proto", + "ibc-proto 0.51.1", "parity-scale-codec", "prost 0.13.2", "scale-info", @@ -3963,6 +4518,24 @@ dependencies = [ "time", ] +[[package]] +name = "ibc-proto" +version = "0.47.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733" +dependencies = [ + "base64 0.22.1", + "borsh", + "bytes", + "flex-error", + "ics23", + "informalsystems-pbjson", + "prost 0.13.2", + "serde", + "subtle-encoding", + "tendermint-proto 0.38.1", +] + [[package]] name = "ibc-proto" version = "0.51.1" @@ -3986,25 +4559,25 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "displaydoc", "ibc", - "ibc-proto", + "ibc-proto 0.51.1", "tonic", ] [[package]] name = "ibc-testkit" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#b388e853718859fb004cdb5684758d68d4ce42a1" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "basecoin-store", "bon", "derive_more 1.0.0", "displaydoc", "ibc", - "ibc-proto", + "ibc-proto 0.51.1", "ibc-query", "parking_lot", "subtle-encoding", @@ -4072,13 +4645,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", -<<<<<<< HEAD "num-traits", - "uint", -======= - "num-traits 0.2.17", "uint 0.9.5", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -4234,15 +4802,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -4252,15 +4811,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -5160,13 +5710,8 @@ dependencies = [ "num-rational", "num-traits", "num256", -<<<<<<< HEAD "num_enum", - "primitive-types", -======= - "num_enum 0.7.1", "primitive-types 0.13.1", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) "proptest", "prost-types 0.13.2", "rand", @@ -5177,16 +5722,9 @@ dependencies = [ "serde_json", "sha2 0.9.9", "smooth-operator", -<<<<<<< HEAD - "tendermint", - "tendermint-proto", - "thiserror 1.0.50", -======= - "sparse-merkle-tree", "tendermint 0.40.1", "tendermint-proto 0.40.1", - "thiserror", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) + "thiserror 1.0.50", "tiny-keccak", "tokio", "toml 0.5.11", @@ -5361,15 +5899,13 @@ dependencies = [ "assert_matches", "borsh", "data-encoding", + "dur", "ibc", - "ibc-derive", -<<<<<<< HEAD + "ibc-derive 0.10.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0)", "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0)", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", -======= ->>>>>>> b73473752 (WIP: upgrade ibc-rs) "ibc-testkit", "ics23", "konst", @@ -5800,12 +6336,14 @@ dependencies = [ "concat-idents", "data-encoding", "derivative", + "dur", "escargot", "expectrl", "eyre", "flate2", "fs_extra", "hyper 0.14.27", + "ibc-middleware-packet-forward", "ibc-testkit", "ics23", "itertools 0.12.1", @@ -6204,9 +6742,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -6251,9 +6789,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", @@ -6312,22 +6850,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ -<<<<<<< HEAD "num_enum_derive", -======= - "num_enum_derive 0.7.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -7023,13 +7546,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", -<<<<<<< HEAD "heck 0.4.1", - "itertools 0.11.0", -======= - "heck", "itertools 0.12.1", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) "log", "multimap", "once_cell", @@ -7057,28 +7575,12 @@ dependencies = [ [[package]] name = "prost-derive" -<<<<<<< HEAD -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "prost-derive" -======= ->>>>>>> b73473752 (WIP: upgrade ibc-rs) version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.96", @@ -7506,12 +8008,11 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", -<<<<<<< HEAD "borsh", "bytes", "num-traits", @@ -7519,9 +8020,6 @@ dependencies = [ "rkyv", "serde", "serde_json", -======= - "num-traits 0.2.17", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -7911,17 +8409,12 @@ dependencies = [ [[package]] name = "serde_json" -<<<<<<< HEAD -version = "1.0.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" -======= -version = "1.0.108" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" ->>>>>>> b73473752 (WIP: upgrade ibc-rs) +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -8325,7 +8818,6 @@ dependencies = [ "quote", "rustversion", "syn 2.0.96", -<<<<<<< HEAD ] [[package]] @@ -8339,8 +8831,6 @@ dependencies = [ "quote", "rustversion", "syn 2.0.96", -======= ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] @@ -8492,7 +8982,7 @@ dependencies = [ "ed25519", "flex-error", "futures", - "num-traits 0.2.17", + "num-traits", "once_cell", "prost 0.13.2", "prost-types 0.13.2", @@ -8648,13 +9138,8 @@ dependencies = [ "subtle-encoding", "tendermint 0.40.1", "tendermint-config", -<<<<<<< HEAD - "tendermint-proto", - "thiserror 1.0.50", -======= "tendermint-proto 0.40.1", - "thiserror", ->>>>>>> b73473752 (WIP: upgrade ibc-rs) + "thiserror 1.0.50", "time", "tokio", "tracing", @@ -8776,7 +9261,6 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.96", -<<<<<<< HEAD ] [[package]] @@ -8808,8 +9292,6 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.96", -======= ->>>>>>> b73473752 (WIP: upgrade ibc-rs) ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 823ecb91df..7fbcb35e50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -123,7 +123,7 @@ ibc-derive = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module/v0.1.0" } ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module-macros/v0.1.0" } ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "orm/v0.4.0" } -ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.9.0", features = ["borsh"] } +ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs", features = ["borsh"] } ibc-testkit = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", default-features = false } ics23 = "0.12.0" usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] } diff --git a/crates/ibc/src/context/common.rs b/crates/ibc/src/context/common.rs index 9c35b7e036..733dde3bef 100644 --- a/crates/ibc/src/context/common.rs +++ b/crates/ibc/src/context/common.rs @@ -552,12 +552,7 @@ pub trait IbcCommonContext: IbcStorageContext { let key = storage::receipt_key(port_id, channel_id, sequence); match self.storage().read_bytes(&key)? { Some(_) => Ok(Receipt::Ok), - None => Err(HostError::FailedToRetrieve { - description: format!( - "No packet receipt: port {port_id}, channel {channel_id}, \ - sequence {sequence}" - ), - }), + None => Ok(Receipt::None), } } diff --git a/crates/ibc/src/context/middlewares/pfm_mod.rs b/crates/ibc/src/context/middlewares/pfm_mod.rs index f414695a5f..eb101ba591 100644 --- a/crates/ibc/src/context/middlewares/pfm_mod.rs +++ b/crates/ibc/src/context/middlewares/pfm_mod.rs @@ -16,7 +16,7 @@ use ibc::core::channel::handler::{ }; use ibc::core::channel::types::acknowledgement::Acknowledgement; use ibc::core::channel::types::channel::{Counterparty, Order}; -use ibc::core::channel::types::error::{ChannelError, PacketError}; +use ibc::core::channel::types::error::ChannelError; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::timeout::TimeoutTimestamp; use ibc::core::channel::types::Version; @@ -124,7 +124,7 @@ where .inner .borrow() .get_next_sequence_send(&msg.port_id_on_a, &msg.chan_id_on_a) - .map_err(|e| Error::Context(Box::new(e)))?; + .map_err(|e| Error::TokenTransfer(e.into()))?; tracing::debug!(?seq, ?msg, "PFM send_transfer_execute"); let mut ctx = IbcContext::::new( @@ -199,7 +199,7 @@ where &coin, &String::new().into(), ) - .map_err(Error::TokenTransfer) + .map_err(|e| Error::TokenTransfer(e.into())) } else { let coin = { let mut c = packet_data.token; @@ -212,7 +212,7 @@ where token_transfer_ctx .burn_coins_execute(&IBC_ADDRESS, &coin, &String::new().into()) - .map_err(Error::TokenTransfer) + .map_err(|e| Error::TokenTransfer(e.into())) } } @@ -226,13 +226,13 @@ where self.transfer_module.ctx.inner.clone(), ); commit_packet_acknowledgment(&mut ctx, packet, acknowledgement) - .map_err(|e| Error::Context(Box::new(e)))?; + .map_err(|e| Error::TokenTransfer(e.into()))?; emit_packet_acknowledgement_event( &mut ctx, packet.clone(), acknowledgement.clone(), ) - .map_err(|e| Error::Context(Box::new(e))) + .map_err(|e| Error::TokenTransfer(e.into())) } fn override_receiver( diff --git a/crates/ibc/src/context/nft_transfer_mod.rs b/crates/ibc/src/context/nft_transfer_mod.rs index 005a700e80..adc2d548d7 100644 --- a/crates/ibc/src/context/nft_transfer_mod.rs +++ b/crates/ibc/src/context/nft_transfer_mod.rs @@ -262,7 +262,8 @@ where packet: &Packet, _relayer: &Signer, ) -> (ModuleExtras, Option) { - on_recv_packet_execute(&mut self.ctx, packet) + let (extras, ack) = on_recv_packet_execute(&mut self.ctx, packet); + (extras, Some(ack)) } fn on_acknowledgement_packet_validate( diff --git a/crates/ibc/src/context/transfer_mod.rs b/crates/ibc/src/context/transfer_mod.rs index 0d08a85a86..87866dfa8d 100644 --- a/crates/ibc/src/context/transfer_mod.rs +++ b/crates/ibc/src/context/transfer_mod.rs @@ -277,7 +277,8 @@ where packet: &Packet, _relayer: &Signer, ) -> (ModuleExtras, Option) { - on_recv_packet_execute(&mut self.ctx, packet) + let (extras, ack) = on_recv_packet_execute(&mut self.ctx, packet); + (extras, Some(ack)) } fn on_acknowledgement_packet_validate( diff --git a/crates/ibc/src/context/validation.rs b/crates/ibc/src/context/validation.rs index bdc01a4e51..340a362c91 100644 --- a/crates/ibc/src/context/validation.rs +++ b/crates/ibc/src/context/validation.rs @@ -5,7 +5,6 @@ use ibc::core::channel::types::channel::ChannelEnd; use ibc::core::channel::types::commitment::{ AcknowledgementCommitment, PacketCommitment, }; -use ibc::core::channel::types::error::PacketError; use ibc::core::channel::types::packet::Receipt; use ibc::core::client::context::{ ClientValidationContext, ExtClientValidationContext, @@ -267,10 +266,11 @@ where path.sequence, )?; - maybe_ack.ok_or_else(|| { - HostError::Other { - description: format!("No packet acknowledgement: port {}, channel {}, sequence {}" path.port_id, path.channel_id, path.sequence) - } + maybe_ack.ok_or_else(|| HostError::Other { + description: format!( + "No packet acknowledgement: port {}, channel {}, sequence {}", + path.port_id, path.channel_id, path.sequence + ), }) } diff --git a/crates/tests/src/e2e/ibc_tests.rs b/crates/tests/src/e2e/ibc_tests.rs index bf51ccb3f4..2603876da2 100644 --- a/crates/tests/src/e2e/ibc_tests.rs +++ b/crates/tests/src/e2e/ibc_tests.rs @@ -2488,7 +2488,7 @@ fn try_invalid_transfers( &"channel-42".parse().unwrap(), None, None, - Some("IBC token transfer error: context error: `ICS04 Channel error"), + Some("No channel end: port transfer, channel channel-42"), None, false, )?; diff --git a/crates/tests/src/e2e/setup.rs b/crates/tests/src/e2e/setup.rs index 4eec9b69be..6e4db4bcf1 100644 --- a/crates/tests/src/e2e/setup.rs +++ b/crates/tests/src/e2e/setup.rs @@ -1140,7 +1140,7 @@ where // Root cargo workspace manifest path let (bin_name, log_level) = match bin { Bin::Namada => ("namada", "info"), - Bin::Node => ("namadan", "info"), + Bin::Node => ("namadan", "debug"), Bin::Client => ( "namadac", if is_shielded_sync { diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index ca5a4d4658..2de241d0a3 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -1421,6 +1421,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "dur" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce5b6c91b5e394b75cd96c36393fc938496c030220207a0ccf34d6cd313d3b49" +dependencies = [ + "nom", + "rust_decimal", +] + [[package]] name = "duration-str" version = "0.10.0" @@ -2600,7 +2610,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-apps", "ibc-clients", @@ -2613,7 +2623,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2623,7 +2633,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "base64 0.22.1", "borsh", @@ -2644,7 +2654,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2654,7 +2664,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2672,7 +2682,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2681,7 +2691,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", @@ -2698,7 +2708,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2715,7 +2725,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "base64 0.22.1", "displaydoc", @@ -2729,7 +2739,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2738,7 +2748,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2754,7 +2764,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2769,7 +2779,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2792,7 +2802,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2805,7 +2815,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2821,7 +2831,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2841,7 +2851,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2860,7 +2870,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -2874,7 +2884,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2895,7 +2905,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2910,7 +2920,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2934,7 +2944,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2952,7 +2962,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2975,7 +2985,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "base64 0.22.1", "borsh", @@ -2992,7 +3002,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3006,7 +3016,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3025,17 +3035,59 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.10.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "proc-macro2", "quote", "syn 2.0.96", ] +[[package]] +name = "ibc-middleware-module" +version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-packet-forward" +version = "0.9.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +dependencies = [ + "borsh", + "dur", + "either", + "ibc-app-transfer-types", + "ibc-core-channel", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-primitives", + "serde", + "serde_json", +] + [[package]] name = "ibc-primitives" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3072,7 +3124,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "displaydoc", "ibc", @@ -3083,7 +3135,7 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?branch=tiago/optional-ack-rebased#2bfea0b1e400808a15ad0d9223e89665d0fad205" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "basecoin-store", "bon", @@ -3632,6 +3684,12 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3831,8 +3889,10 @@ version = "0.47.0" dependencies = [ "borsh", "data-encoding", + "dur", "ibc", "ibc-derive", + "ibc-middleware-packet-forward", "ibc-testkit", "ics23", "konst", @@ -4116,7 +4176,9 @@ version = "0.47.0" dependencies = [ "concat-idents", "derivative", + "dur", "hyper 0.14.27", + "ibc-middleware-packet-forward", "ibc-testkit", "ics23", "itertools 0.12.1", @@ -4386,6 +4448,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "nonempty" version = "0.7.0" @@ -5118,9 +5190,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -5512,12 +5584,18 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", + "borsh", + "bytes", "num-traits 0.2.17", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", ] [[package]] @@ -5880,11 +5958,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 7460e9e925..fde5efae34 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -85,7 +85,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "num-traits", + "num-traits 0.2.17", "zeroize", ] @@ -101,9 +101,9 @@ dependencies = [ "ark-std", "derivative", "num-bigint", - "num-traits", + "num-traits 0.2.17", "paste", - "rustc_version 0.3.3", + "rustc_version", "zeroize", ] @@ -124,7 +124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", - "num-traits", + "num-traits 0.2.17", "quote", "syn 1.0.109", ] @@ -145,7 +145,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ - "num-traits", + "num-traits 0.2.17", "rand", ] @@ -172,15 +172,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -353,6 +344,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "bls12_381" +version = "0.8.0" +source = "git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838#d3ebe9dd6488fac1923db120a7498079e55dd838" +dependencies = [ + "ff", + "group", + "pairing", + "rand_core", + "subtle", +] + [[package]] name = "borsh" version = "1.2.1" @@ -488,7 +491,7 @@ checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", - "num-traits", + "num-traits 0.2.17", "windows-targets 0.48.5", ] @@ -509,18 +512,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "const-crc32-nostd" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808ac43170e95b11dd23d78aa9eaac5bea45776a602955552c4e833f3f0f823d" - [[package]] name = "const-default" version = "1.0.0" @@ -552,12 +543,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] -name = "core2" -version = "0.3.3" +name = "cosmos-sdk-proto" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" +checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427" dependencies = [ - "memchr", + "informalsystems-pbjson", + "prost", + "serde", + "tendermint-proto", ] [[package]] @@ -569,12 +563,6 @@ dependencies = [ "libc", ] -[[package]] -name = "critical-section" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -647,12 +635,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "debugless-unwrap" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f400d0750c0c069e8493f2256cb4da6f604b6d2eeb69a0ca8863acde352f8400" - [[package]] name = "der" version = "0.7.8" @@ -684,10 +666,10 @@ dependencies = [ ] [[package]] -name = "derive-getters" -version = "0.5.0" +name = "derive_more" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", @@ -696,13 +678,23 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", "syn 2.0.96", + "unicode-xid", ] [[package]] @@ -728,23 +720,22 @@ dependencies = [ [[package]] name = "directories" -version = "5.0.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.4.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "option-ext", "redox_users", - "windows-sys 0.48.0", + "winapi", ] [[package]] @@ -758,15 +749,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - [[package]] name = "dur" version = "0.5.3" @@ -819,7 +801,7 @@ dependencies = [ "rand_core", "serde", "sha2 0.9.9", - "thiserror 1.0.50", + "thiserror", "zeroize", ] @@ -849,18 +831,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "embedded-io" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" - [[package]] name = "equivalent" version = "1.0.1" @@ -890,8 +860,8 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror 1.0.50", - "uint", + "thiserror", + "uint 0.9.5", ] [[package]] @@ -903,7 +873,7 @@ dependencies = [ "crunchy", "fixed-hash", "impl-rlp", - "impl-serde", + "impl-serde 0.4.0", "tiny-keccak", ] @@ -925,9 +895,9 @@ dependencies = [ "ethbloom", "fixed-hash", "impl-rlp", - "impl-serde", - "primitive-types", - "uint", + "impl-serde 0.4.0", + "primitive-types 0.12.2", + "uint 0.9.5", ] [[package]] @@ -1001,43 +971,7 @@ dependencies = [ "libm", "num-bigint", "num-integer", - "num-traits", -] - -[[package]] -name = "frost-core" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5afd375261c34d31ff24dad068382f4bc3c95010c919d4fb8d483dc3d85c023" -dependencies = [ - "byteorder", - "const-crc32-nostd", - "debugless-unwrap", - "derive-getters", - "document-features", - "hex", - "itertools 0.13.0", - "postcard", - "rand_core", - "serde", - "serdect", - "thiserror 1.0.50", - "thiserror-nostd-notrait", - "visibility", - "zeroize", -] - -[[package]] -name = "frost-rerandomized" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9d77595060546b53543d96b83dbeacaf3907e40a89763a8bb22124812b0cb6" -dependencies = [ - "derive-getters", - "document-features", - "frost-core", - "hex", - "rand_core", + "num-traits 0.2.17", ] [[package]] @@ -1169,15 +1103,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -1193,26 +1118,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version 0.4.1", - "serde", - "spin", - "stable_deref_trait", -] - [[package]] name = "heck" version = "0.4.1" @@ -1234,15 +1139,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "http" version = "1.1.0" @@ -1279,8 +1175,8 @@ dependencies = [ [[package]] name = "ibc" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-apps", "ibc-clients", @@ -1292,8 +1188,8 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -1302,12 +1198,12 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "base64 0.22.1", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "http", "ibc-app-transfer-types", @@ -1323,8 +1219,8 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1333,26 +1229,26 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core", "ibc-proto", "parity-scale-codec", - "primitive-types", + "primitive-types 0.13.1", "scale-info", "schemars", "serde", - "uint", + "uint 0.10.0", ] [[package]] name = "ibc-apps" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -1360,10 +1256,10 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "derive_more", + "derive_more 1.0.0", "ibc-client-tendermint-types", "ibc-core-client", "ibc-core-commitment-types", @@ -1377,8 +1273,8 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1394,8 +1290,8 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1408,8 +1304,8 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1417,8 +1313,8 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1433,8 +1329,8 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1448,11 +1344,11 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -1471,8 +1367,8 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1484,10 +1380,10 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -1500,11 +1396,11 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-commitment-types", "ibc-core-host-types", @@ -1520,11 +1416,11 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-host-types", "ibc-primitives", @@ -1539,8 +1435,8 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -1548,16 +1444,16 @@ dependencies = [ "ibc-core-handler-types", "ibc-core-host", "ibc-primitives", - "prost 0.13.2", + "prost", ] [[package]] name = "ibc-core-connection-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-client-types", "ibc-core-commitment-types", @@ -1574,8 +1470,8 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1589,11 +1485,11 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-client-types", @@ -1613,10 +1509,10 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-client-context", @@ -1631,10 +1527,10 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-app-transfer-types", "ibc-client-tendermint", @@ -1654,14 +1550,16 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ + "base64 0.22.1", "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-primitives", "parity-scale-codec", + "prost", "scale-info", "schemars", "serde", @@ -1669,10 +1567,10 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-channel-types", "ibc-core-host-types", @@ -1683,11 +1581,11 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-core-host-types", "ibc-primitives", @@ -1702,8 +1600,8 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.8.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "proc-macro2", "quote", @@ -1713,31 +1611,6 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -1749,51 +1622,14 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" dependencies = [ "proc-macro2", "quote", ] -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-overflow-receive" -version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "ibc-app-transfer-types", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-primitives", - "serde", - "serde_json", -] - [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0#3d3b436f7c58000c7498d68e88c15a955433a619" dependencies = [ "borsh", "dur", @@ -1804,8 +1640,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.9.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -1813,37 +1649,34 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" +version = "0.56.0" +source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" dependencies = [ "borsh", - "derive_more", + "derive_more 1.0.0", "displaydoc", "ibc-proto", "parity-scale-codec", - "prost 0.13.2", + "prost", "scale-info", "schemars", "serde", - "tendermint", "time", ] [[package]] name = "ibc-proto" -version = "0.47.1" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733" +checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca" dependencies = [ "base64 0.22.1", - "borsh", "bytes", + "cosmos-sdk-proto", "flex-error", "ics23", "informalsystems-pbjson", - "parity-scale-codec", - "prost 0.13.2", - "scale-info", + "prost", "schemars", "serde", "subtle-encoding", @@ -1862,7 +1695,7 @@ dependencies = [ "bytes", "hex", "informalsystems-pbjson", - "prost 0.13.2", + "prost", "ripemd", "serde", "sha2 0.10.8", @@ -1878,6 +1711,15 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "impl-codec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67aa010c1e3da95bf151bd8b4c059b2ed7e75387cdb969b4f8f2723a43f9941" +dependencies = [ + "parity-scale-codec", +] + [[package]] name = "impl-num-traits" version = "0.1.2" @@ -1885,8 +1727,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", - "num-traits", - "uint", + "num-traits 0.2.17", + "uint 0.9.5", ] [[package]] @@ -1907,6 +1749,15 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-serde" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a143eada6a1ec4aefa5049037a26a6d597bfd64f8c026d07b77133e02b7dd0b" +dependencies = [ + "serde", +] + [[package]] name = "impl-trait-for-tuples" version = "0.2.2" @@ -1933,6 +1784,17 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "indexmap" +version = "2.2.4" +source = "git+https://github.com/heliaxdev/indexmap?tag=2.2.4-heliax-1#b5b5b547bd6ab04bbb16e060326a50ddaeb6c909" +dependencies = [ + "borsh", + "equivalent", + "hashbrown 0.14.3", + "serde", +] + [[package]] name = "indexmap" version = "2.2.6" @@ -1968,7 +1830,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -1989,24 +1851,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.9" @@ -2029,7 +1873,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8499f7a74008aafbecb2a2e608a3e13e4dd3e84df198b604451efe93f2de6e61" dependencies = [ "bitvec", - "bls12_381", + "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ff", + "group", + "rand_core", + "subtle", +] + +[[package]] +name = "jubjub" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c#a373686962f4e9d0edb3b4716f86ff6bbd9aa86c" +dependencies = [ + "bitvec", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "ff", "group", "rand_core", @@ -2114,22 +1971,6 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.20" @@ -2138,9 +1979,8 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "masp_note_encryption" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9736dbd86140a9d6711b464297a87af9cc0ae485d73a956c595f1bc1f6a7920" +version = "1.0.0" +source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" dependencies = [ "borsh", "chacha20", @@ -2152,15 +1992,15 @@ dependencies = [ [[package]] name = "masp_primitives" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb184254ca5cd5fb12e11b81a6a0d6b955d98c7263eae11057f669c31c7123c" +version = "1.0.0" +source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" dependencies = [ "aes", "bip0039", "bitvec", "blake2b_simd", "blake2s_simd", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "borsh", "byteorder", "ff", @@ -2168,13 +2008,12 @@ dependencies = [ "group", "hex", "incrementalmerkletree", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_note_encryption", "memuse", - "nam-bls12_381", - "nam-jubjub", - "nam-num-traits", - "nonempty 0.11.0", + "nonempty", + "num-traits 0.2.19", "rand", "rand_core", "sha2 0.10.8", @@ -2184,22 +2023,21 @@ dependencies = [ [[package]] name = "masp_proofs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833eb23ccc5e4781636f6a7b2e720f60f31e53e534d1abb2b0ac5e86eb099c14" +version = "1.0.0" +source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" dependencies = [ "bellman", "blake2b_simd", + "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "directories", "getrandom", "group", - "itertools 0.14.0", + "itertools 0.11.0", + "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_primitives", - "nam-bls12_381", - "nam-jubjub", - "nam-redjubjub", "rand_core", + "redjubjub", "tracing", ] @@ -2233,99 +2071,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "nam-bls12_381" -version = "0.8.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e768b0e2383163f2f4bbce1112d6454b2cb515950b0a9177733f0d71254d2c68" -dependencies = [ - "ff", - "group", - "pairing", - "rand_core", - "subtle", -] - -[[package]] -name = "nam-indexmap" -version = "2.7.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b40876708764895b63bb5a1e9f102d3813cb16baeb9f12932b7c8f2df4248e" -dependencies = [ - "borsh", - "equivalent", - "hashbrown 0.15.2", - "serde", -] - -[[package]] -name = "nam-jubjub" -version = "0.10.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdced0f5975d8f80cb82a84d464481acb7b586d22f447dda86947d6a572997b9" -dependencies = [ - "bitvec", - "ff", - "group", - "nam-bls12_381", - "rand_core", - "subtle", -] - -[[package]] -name = "nam-num-traits" -version = "0.2.20-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687832a07242b76ab2760bc95180240954bf77e06bf8d9e825473c373146dc4a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nam-reddsa" -version = "0.5.2-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d102b4311bf60c03405350e976d17f5df155d2cb588f6401995a29ae8c1565" -dependencies = [ - "blake2b_simd", - "byteorder", - "frost-rerandomized", - "group", - "hex", - "jubjub", - "pasta_curves", - "rand_core", - "serde", - "thiserror 2.0.11", - "zeroize", -] - -[[package]] -name = "nam-redjubjub" -version = "0.7.1-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e457988762db7daad8d79f8a837a07295f5cc178d9236ba77db7339072ffb61e" -dependencies = [ - "nam-reddsa", - "rand_core", - "serde", - "thiserror 1.0.50", - "zeroize", -] - -[[package]] -name = "nam-sparse-merkle-tree" -version = "0.3.2-nam.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae108a0f6aabf789e34d6d447c1184608d1c70c087f957b720042226a47ab63" -dependencies = [ - "borsh", - "cfg-if", - "ics23", - "itertools 0.14.0", - "sha2 0.10.8", -] - [[package]] name = "namada_account" version = "0.47.0" @@ -2343,7 +2088,7 @@ version = "0.47.0" dependencies = [ "namada_core", "smooth-operator", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -2361,30 +2106,30 @@ dependencies = [ "ibc", "ics23", "impl-num-traits", + "indexmap 2.2.4", "k256", "masp_primitives", - "nam-indexmap", - "nam-sparse-merkle-tree", "namada_macros", "num-integer", "num-rational", - "num-traits", + "num-traits 0.2.17", "num256", "num_enum", - "primitive-types", - "prost-types 0.13.2", + "primitive-types 0.13.1", + "prost-types", "rayon", "ripemd", "serde", "serde_json", "sha2 0.9.9", "smooth-operator", + "sparse-merkle-tree", "tendermint", "tendermint-proto", - "thiserror 1.0.50", + "thiserror", "tiny-keccak", "tracing", - "uint", + "uint 0.9.5", "usize-set", "zeroize", ] @@ -2398,7 +2143,7 @@ dependencies = [ "namada_macros", "serde", "serde_json", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2411,7 +2156,7 @@ dependencies = [ "namada_events", "namada_macros", "serde", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -2432,7 +2177,7 @@ dependencies = [ "serde", "serde_json", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2445,9 +2190,6 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0)", - "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ics23", "konst", @@ -2460,13 +2202,13 @@ dependencies = [ "namada_systems", "namada_tx", "namada_vp", - "primitive-types", - "prost 0.13.2", + "primitive-types 0.13.1", + "prost", "serde", "serde_json", "sha2 0.9.9", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2488,11 +2230,11 @@ dependencies = [ "borsh", "eyre", "ics23", - "nam-sparse-merkle-tree", "namada_core", "namada_macros", - "prost 0.13.2", - "thiserror 1.0.50", + "prost", + "sparse-merkle-tree", + "thiserror", ] [[package]] @@ -2506,7 +2248,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -2528,7 +2270,7 @@ dependencies = [ "once_cell", "serde", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2569,7 +2311,7 @@ dependencies = [ "sha2 0.9.9", "smooth-operator", "tempfile", - "thiserror 1.0.50", + "thiserror", "tracing", "typed-builder", "xorf", @@ -2593,7 +2335,7 @@ dependencies = [ "namada_tx", "patricia_tree", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2611,7 +2353,7 @@ dependencies = [ "regex", "serde", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2631,7 +2373,7 @@ dependencies = [ "borsh", "namada_core", "namada_state", - "prost 0.13.2", + "prost", "strum", ] @@ -2664,7 +2406,7 @@ dependencies = [ "namada_tx", "namada_tx_env", "namada_vp_env", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2685,14 +2427,14 @@ dependencies = [ "namada_gas", "namada_macros", "num-derive 0.4.2", - "num-traits", - "prost 0.13.2", - "prost-types 0.13.2", + "num-traits 0.2.17", + "prost", + "prost-types", "rand_core", "serde", "serde_json", "sha2 0.9.9", - "thiserror 1.0.50", + "thiserror", "tonic-build", ] @@ -2744,7 +2486,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror 1.0.50", + "thiserror", "tracing", ] @@ -2800,12 +2542,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" -[[package]] -name = "nonempty" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549e471b99ccaf2f89101bec68f4d244457d5a95a9c3d0672e9564124397741d" - [[package]] name = "num" version = "0.4.1" @@ -2817,7 +2553,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -2828,7 +2564,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -2837,7 +2573,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -2875,7 +2611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -2886,7 +2622,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -2898,14 +2634,22 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.19" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "git+https://github.com/heliaxdev/num-traits?rev=3f3657caa34b8e116fdf3f8a3519c4ac29f012fe#3f3657caa34b8e116fdf3f8a3519c4ac29f012fe" dependencies = [ "autocfg", ] @@ -2919,7 +2663,7 @@ dependencies = [ "lazy_static", "num", "num-derive 0.3.3", - "num-traits", + "num-traits 0.2.17", "serde", "serde_derive", ] @@ -2957,12 +2701,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "pairing" version = "0.23.0" @@ -3054,7 +2792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", - "thiserror 1.0.50", + "thiserror", "ucd-trie", ] @@ -3065,7 +2803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.2.6", ] [[package]] @@ -3101,19 +2839,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "postcard" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" -dependencies = [ - "cobs", - "embedded-io 0.4.0", - "embedded-io 0.6.1", - "heapless", - "serde", -] - [[package]] name = "powerfmt" version = "0.2.0" @@ -3143,10 +2868,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", + "impl-codec 0.6.0", "impl-rlp", - "impl-serde", - "uint", + "impl-serde 0.4.0", + "uint 0.9.5", +] + +[[package]] +name = "primitive-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15600a7d856470b7d278b3fe0e311fe28c2526348549f8ef2ff7db3299c87f5" +dependencies = [ + "fixed-hash", + "impl-codec 0.7.0", + "impl-serde 0.5.0", + "uint 0.10.0", ] [[package]] @@ -3199,16 +2936,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes", - "prost-derive 0.12.3", -] - [[package]] name = "prost" version = "0.13.2" @@ -3216,42 +2943,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" dependencies = [ "bytes", - "prost-derive 0.13.2", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", "heck", - "itertools 0.11.0", + "itertools 0.12.1", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", - "prost-types 0.12.3", + "prost", + "prost-types", "regex", "syn 2.0.96", "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.96", ] [[package]] @@ -3261,28 +2974,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.96", ] -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -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", + "prost", ] [[package]] @@ -3370,6 +3074,37 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "reddsa" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78a5191930e84973293aa5f532b513404460cd2216c1cfb76d08748c15b40b02" +dependencies = [ + "blake2b_simd", + "byteorder", + "group", + "hex", + "jubjub 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pasta_curves", + "rand_core", + "serde", + "thiserror", + "zeroize", +] + +[[package]] +name = "redjubjub" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a60db2c3bc9c6fd1e8631fee75abc008841d27144be744951d6b9b75f9b569c" +dependencies = [ + "rand_core", + "reddsa", + "serde", + "thiserror", + "zeroize", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -3387,7 +3122,7 @@ checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", "libredox", - "thiserror 1.0.50", + "thiserror", ] [[package]] @@ -3507,7 +3242,7 @@ dependencies = [ "arrayvec", "borsh", "bytes", - "num-traits", + "num-traits 0.2.17", "rand", "rkyv", "serde", @@ -3526,16 +3261,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver 1.0.24", + "semver", ] [[package]] @@ -3570,7 +3296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -3611,12 +3337,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "seahash" version = "4.1.0" @@ -3647,12 +3367,6 @@ dependencies = [ "semver-parser", ] -[[package]] -name = "semver" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" - [[package]] name = "semver-parser" version = "0.10.2" @@ -3664,9 +3378,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.202" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -3691,9 +3405,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -3713,9 +3427,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -3830,12 +3544,15 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +name = "sparse-merkle-tree" +version = "0.3.1-pre" +source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" dependencies = [ - "lock_api", + "borsh", + "cfg-if", + "ics23", + "itertools 0.12.1", + "sha2 0.9.9", ] [[package]] @@ -3848,12 +3565,6 @@ dependencies = [ "der", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -3971,9 +3682,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" +checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2" dependencies = [ "bytes", "digest 0.10.7", @@ -3982,10 +3693,9 @@ dependencies = [ "flex-error", "futures", "k256", - "num-traits", + "num-traits 0.2.17", "once_cell", - "prost 0.13.2", - "prost-types 0.13.2", + "prost", "ripemd", "serde", "serde_bytes", @@ -4002,11 +3712,11 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90" +checksum = "f0cda4a449fc70985a95f892a67286f13afa4e048d90b8d04a2bf6341e88d1c2" dependencies = [ - "derive_more", + "derive_more 0.99.18", "flex-error", "serde", "tendermint", @@ -4015,14 +3725,17 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" +checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb" dependencies = [ + "borsh", "bytes", "flex-error", - "prost 0.13.2", - "prost-types 0.13.2", + "parity-scale-codec", + "prost", + "scale-info", + "schemars", "serde", "serde_bytes", "subtle-encoding", @@ -4035,16 +3748,7 @@ version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ - "thiserror-impl 1.0.50", -] - -[[package]] -name = "thiserror" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" -dependencies = [ - "thiserror-impl 2.0.11", + "thiserror-impl", ] [[package]] @@ -4058,37 +3762,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "thiserror-impl" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "thiserror-nostd-notrait" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8444e638022c44d2a9337031dee8acb732bcc7fbf52ac654edc236b26408b61" -dependencies = [ - "thiserror-nostd-notrait-impl", -] - -[[package]] -name = "thiserror-nostd-notrait-impl" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585e5ef40a784ce60b49c67d762110688d211d395d39e096be204535cf64590e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "time" version = "0.3.36" @@ -4155,7 +3828,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap", + "indexmap 2.2.6", "toml_datetime", "winnow", ] @@ -4166,20 +3839,21 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap", + "indexmap 2.2.6", "toml_datetime", "winnow", ] [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", "prost-build", + "prost-types", "quote", "syn 2.0.96", ] @@ -4402,6 +4076,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + [[package]] name = "unicode-ident" version = "1.0.12" @@ -4423,6 +4109,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" version = "0.5.1" @@ -4445,9 +4137,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "version_check" @@ -4455,17 +4147,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "visibility" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "vp_always_false" version = "0.47.0" @@ -4601,17 +4282,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] -name = "which" -version = "4.4.2" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "either", - "home", - "once_cell", - "rustix", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-core" version = "0.51.1" @@ -4784,12 +4475,11 @@ dependencies = [ [[package]] name = "zcash_encoding" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3654116ae23ab67dd1f849b01f8821a8a156f884807ff665eac109bf28306c4d" +version = "0.2.0" +source = "git+https://github.com/zcash/librustzcash?rev=bd7f9d7#bd7f9d7c3ce5cfd14af169ffe0e1c5c903162f46" dependencies = [ - "core2", - "nonempty 0.7.0", + "byteorder", + "nonempty", ] [[package]] From 523a89168454b173cc4507307464734bbe836776 Mon Sep 17 00:00:00 2001 From: yito88 Date: Thu, 23 Jan 2025 17:43:17 +0100 Subject: [PATCH 4/9] upstream ibc-rs --- Cargo.lock | 917 +++------------- Cargo.toml | 6 +- .../src/context/middlewares/shielded_recv.rs | 7 +- crates/ibc/src/context/nft_transfer.rs | 23 + crates/ibc/src/context/token_transfer.rs | 22 +- wasm/Cargo.lock | 989 ++++++++++-------- wasm_for_tests/Cargo.lock | 699 +++++++++---- 7 files changed, 1252 insertions(+), 1411 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1240cac8c2..2ac1d038fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3404,10 +3404,10 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "ibc-apps", "ibc-clients", - "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core", "ibc-core-host-cosmos", - "ibc-derive 0.10.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-derive", + "ibc-primitives", ] [[package]] @@ -3416,7 +3416,7 @@ version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer-types", - "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core", "serde-json-wasm", ] @@ -3431,9 +3431,9 @@ dependencies = [ "derive_more 1.0.0", "displaydoc", "http 1.1.0", - "ibc-app-transfer-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-app-transfer-types", + "ibc-core", + "ibc-proto", "mime", "parity-scale-codec", "scale-info", @@ -3447,41 +3447,11 @@ name = "ibc-app-transfer" version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ - "ibc-app-transfer-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-app-transfer-types", + "ibc-core", "serde-json-wasm", ] -[[package]] -name = "ibc-app-transfer-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core 0.54.0", - "ibc-proto 0.47.1", - "primitive-types 0.12.2", - "serde", - "uint 0.9.5", -] - -[[package]] -name = "ibc-app-transfer-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "primitive-types 0.13.1", - "serde", - "uint 0.10.0", -] - [[package]] name = "ibc-app-transfer-types" version = "0.56.0" @@ -3491,8 +3461,8 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core", + "ibc-proto", "parity-scale-codec", "primitive-types 0.13.1", "scale-info", @@ -3517,11 +3487,11 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", - "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client", + "ibc-core-commitment-types", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-primitives", "serde", "tendermint 0.40.1", "tendermint-light-client-verifier", @@ -3533,11 +3503,11 @@ version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "serde", "tendermint 0.40.1", "tendermint-light-client-verifier", @@ -3551,10 +3521,10 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "base64 0.22.1", "displaydoc", - "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-client", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "serde", ] @@ -3567,82 +3537,20 @@ dependencies = [ "ibc-client-wasm-types", ] -[[package]] -name = "ibc-core" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "ibc-core-channel 0.54.0", - "ibc-core-client 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-connection 0.54.0", - "ibc-core-handler 0.54.0", - "ibc-core-host 0.54.0", - "ibc-core-router 0.54.0", - "ibc-derive 0.8.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-core" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "ibc-core-channel 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-derive 0.10.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", -] - [[package]] name = "ibc-core" version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ - "ibc-core-channel 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-router 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-derive 0.10.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", -] - -[[package]] -name = "ibc-core-channel" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "ibc-core-channel-types 0.54.0", - "ibc-core-client 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-connection 0.54.0", - "ibc-core-handler-types 0.54.0", - "ibc-core-host 0.54.0", - "ibc-core-router 0.54.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-core-channel" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-core-channel", + "ibc-core-client", + "ibc-core-commitment-types", + "ibc-core-connection", + "ibc-core-handler", + "ibc-core-host", + "ibc-core-router", + "ibc-derive", + "ibc-primitives", ] [[package]] @@ -3650,54 +3558,14 @@ name = "ibc-core-channel" version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ - "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-router 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", -] - -[[package]] -name = "ibc-core-channel-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core-client-types 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-connection-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "ibc-proto 0.47.1", - "serde", - "sha2 0.10.8", - "subtle-encoding", - "tendermint 0.38.1", -] - -[[package]] -name = "ibc-core-channel-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "serde", - "sha2 0.10.8", - "subtle-encoding", - "tendermint 0.40.1", + "ibc-core-channel-types", + "ibc-core-client", + "ibc-core-commitment-types", + "ibc-core-connection", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-core-router", + "ibc-primitives", ] [[package]] @@ -3709,12 +3577,12 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-connection-types", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "parity-scale-codec", "scale-info", "schemars", @@ -3724,75 +3592,17 @@ dependencies = [ "tendermint 0.40.1", ] -[[package]] -name = "ibc-core-client" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "ibc-core-client-context 0.54.0", - "ibc-core-client-types 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-handler-types 0.54.0", - "ibc-core-host 0.54.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-core-client" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "ibc-core-client-context 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", -] - [[package]] name = "ibc-core-client" version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ - "ibc-core-client-context 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", -] - -[[package]] -name = "ibc-core-client-context" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "derive_more 0.99.18", - "displaydoc", - "ibc-core-client-types 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-handler-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "subtle-encoding", - "tendermint 0.38.1", -] - -[[package]] -name = "ibc-core-client-context" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "derive_more 1.0.0", - "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "subtle-encoding", - "tendermint 0.40.1", + "ibc-core-client-context", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-primitives", ] [[package]] @@ -3802,45 +3612,11 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "derive_more 1.0.0", "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "subtle-encoding", - "tendermint 0.40.1", -] - -[[package]] -name = "ibc-core-client-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core-commitment-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "ibc-proto 0.47.1", - "serde", - "subtle-encoding", - "tendermint 0.38.1", -] - -[[package]] -name = "ibc-core-client-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "serde", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-handler-types", + "ibc-core-host-types", + "ibc-primitives", "subtle-encoding", "tendermint 0.40.1", ] @@ -3854,10 +3630,10 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-commitment-types", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "parity-scale-codec", "scale-info", "schemars", @@ -3866,38 +3642,6 @@ dependencies = [ "tendermint 0.40.1", ] -[[package]] -name = "ibc-core-commitment-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "ibc-proto 0.47.1", - "ics23", - "serde", - "subtle-encoding", -] - -[[package]] -name = "ibc-core-commitment-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "ics23", - "serde", - "subtle-encoding", -] - [[package]] name = "ibc-core-commitment-types" version = "0.56.0" @@ -3907,9 +3651,9 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "ics23", "parity-scale-codec", "scale-info", @@ -3918,80 +3662,20 @@ dependencies = [ "subtle-encoding", ] -[[package]] -name = "ibc-core-connection" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "ibc-core-client 0.54.0", - "ibc-core-connection-types 0.54.0", - "ibc-core-handler-types 0.54.0", - "ibc-core-host 0.54.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-core-connection" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", -] - [[package]] name = "ibc-core-connection" version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-wasm-types", - "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-client", + "ibc-core-connection-types", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-primitives", "prost 0.13.2", ] -[[package]] -name = "ibc-core-connection-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core-client-types 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "ibc-proto 0.47.1", - "serde", - "subtle-encoding", - "tendermint 0.38.1", -] - -[[package]] -name = "ibc-core-connection-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "serde", - "subtle-encoding", - "tendermint 0.40.1", -] - [[package]] name = "ibc-core-connection-types" version = "0.56.0" @@ -4001,11 +3685,11 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "parity-scale-codec", "scale-info", "schemars", @@ -4014,91 +3698,19 @@ dependencies = [ "tendermint 0.40.1", ] -[[package]] -name = "ibc-core-handler" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "ibc-core-channel 0.54.0", - "ibc-core-client 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-connection 0.54.0", - "ibc-core-handler-types 0.54.0", - "ibc-core-host 0.54.0", - "ibc-core-router 0.54.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-core-handler" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "ibc-core-channel 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", -] - [[package]] name = "ibc-core-handler" version = "0.56.0" source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ - "ibc-core-channel 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-router 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", -] - -[[package]] -name = "ibc-core-handler-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core-channel-types 0.54.0", - "ibc-core-client-types 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-connection-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-core-router-types 0.54.0", - "ibc-primitives 0.54.0", - "ibc-proto 0.47.1", - "serde", - "subtle-encoding", - "tendermint 0.38.1", -] - -[[package]] -name = "ibc-core-handler-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "serde", - "subtle-encoding", - "tendermint 0.40.1", + "ibc-core-channel", + "ibc-core-client", + "ibc-core-commitment-types", + "ibc-core-connection", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-core-router", + "ibc-primitives", ] [[package]] @@ -4110,14 +3722,14 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-router-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-channel-types", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-connection-types", + "ibc-core-host-types", + "ibc-core-router-types", + "ibc-primitives", + "ibc-proto", "parity-scale-codec", "scale-info", "schemars", @@ -4126,42 +3738,6 @@ dependencies = [ "tendermint 0.40.1", ] -[[package]] -name = "ibc-core-host" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "derive_more 0.99.18", - "displaydoc", - "ibc-core-channel-types 0.54.0", - "ibc-core-client-context 0.54.0", - "ibc-core-client-types 0.54.0", - "ibc-core-commitment-types 0.54.0", - "ibc-core-connection-types 0.54.0", - "ibc-core-handler-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "subtle-encoding", -] - -[[package]] -name = "ibc-core-host" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "derive_more 1.0.0", - "displaydoc", - "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client-context 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-client-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "subtle-encoding", -] - [[package]] name = "ibc-core-host" version = "0.56.0" @@ -4169,14 +3745,14 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "derive_more 1.0.0", "displaydoc", - "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client-context 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-channel-types", + "ibc-core-client-context", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-connection-types", + "ibc-core-handler-types", + "ibc-core-host-types", + "ibc-primitives", "subtle-encoding", ] @@ -4187,48 +3763,22 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "derive_more 1.0.0", "displaydoc", - "ibc-app-transfer-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-app-transfer-types", "ibc-client-tendermint", - "ibc-core-client-context 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-client-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-commitment-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-connection-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-handler-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-client-context", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-connection-types", + "ibc-core-handler-types", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "serde", "sha2 0.10.8", "subtle-encoding", "tendermint 0.40.1", ] -[[package]] -name = "ibc-core-host-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-primitives 0.54.0", - "serde", -] - -[[package]] -name = "ibc-core-host-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "base64 0.22.1", - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "prost 0.13.2", - "serde", -] - [[package]] name = "ibc-core-host-types" version = "0.56.0" @@ -4239,7 +3789,7 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-primitives", "parity-scale-codec", "prost 0.13.2", "scale-info", @@ -4247,34 +3797,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ibc-core-router" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "derive_more 0.99.18", - "displaydoc", - "ibc-core-channel-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-core-router-types 0.54.0", - "ibc-primitives 0.54.0", - "subtle-encoding", -] - -[[package]] -name = "ibc-core-router" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "derive_more 1.0.0", - "displaydoc", - "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "subtle-encoding", -] - [[package]] name = "ibc-core-router" version = "0.56.0" @@ -4282,45 +3804,13 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "derive_more 1.0.0", "displaydoc", - "ibc-core-channel-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-core-router-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router-types", + "ibc-primitives", "subtle-encoding", ] -[[package]] -name = "ibc-core-router-types" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-core-host-types 0.54.0", - "ibc-primitives 0.54.0", - "ibc-proto 0.47.1", - "serde", - "subtle-encoding", - "tendermint 0.38.1", -] - -[[package]] -name = "ibc-core-router-types" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-proto 0.51.1", - "serde", - "subtle-encoding", - "tendermint 0.40.1", -] - [[package]] name = "ibc-core-router-types" version = "0.56.0" @@ -4329,9 +3819,9 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-core-host-types 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-primitives 0.56.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-proto 0.51.1", + "ibc-core-host-types", + "ibc-primitives", + "ibc-proto", "parity-scale-codec", "scale-info", "schemars", @@ -4340,26 +3830,6 @@ dependencies = [ "tendermint 0.40.1", ] -[[package]] -name = "ibc-derive" -version = "0.8.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "ibc-derive" -version = "0.10.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "ibc-derive" version = "0.10.0" @@ -4373,61 +3843,19 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "ibc-core-channel-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-core-router 0.54.0", - "ibc-core-router-types 0.54.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" -dependencies = [ - "ibc-core-channel-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-core-router 0.54.0", - "ibc-core-router-types 0.54.0", - "ibc-primitives 0.54.0", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" -dependencies = [ - "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0#3d3b436f7c58000c7498d68e88c15a955433a619" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ - "proc-macro2", - "quote", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", ] [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "proc-macro2", "quote", @@ -4436,16 +3864,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0#8d341de14ff5e2a637699796cffbf0fbbaee001f" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ - "ibc-app-transfer-types 0.54.0", - "ibc-core-channel-types 0.54.0", - "ibc-core-host-types 0.54.0", - "ibc-core-router 0.54.0", - "ibc-core-router-types 0.54.0", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.4.0)", - "ibc-primitives 0.54.0", + "ibc-app-transfer-types", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-primitives", "serde", "serde_json", ] @@ -4453,53 +3881,24 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "borsh", "dur", "either", - "ibc-app-transfer-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-channel 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-channel-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-host-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-core-router-types 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs)", - "ibc-primitives 0.56.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500)", + "ibc-app-transfer-types", + "ibc-core-channel", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-primitives", "serde", "serde_json", ] -[[package]] -name = "ibc-primitives" -version = "0.54.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38489943c4e75206eaffeeeec6153c039c2499d1#38489943c4e75206eaffeeeec6153c039c2499d1" -dependencies = [ - "borsh", - "derive_more 0.99.18", - "displaydoc", - "ibc-proto 0.47.1", - "prost 0.13.2", - "serde", - "tendermint 0.38.1", - "time", -] - -[[package]] -name = "ibc-primitives" -version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" -dependencies = [ - "borsh", - "derive_more 1.0.0", - "displaydoc", - "ibc-proto 0.51.1", - "prost 0.13.2", - "serde", - "time", -] - [[package]] name = "ibc-primitives" version = "0.56.0" @@ -4509,7 +3908,7 @@ dependencies = [ "borsh", "derive_more 1.0.0", "displaydoc", - "ibc-proto 0.51.1", + "ibc-proto", "parity-scale-codec", "prost 0.13.2", "scale-info", @@ -4518,24 +3917,6 @@ dependencies = [ "time", ] -[[package]] -name = "ibc-proto" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733" -dependencies = [ - "base64 0.22.1", - "borsh", - "bytes", - "flex-error", - "ics23", - "informalsystems-pbjson", - "prost 0.13.2", - "serde", - "subtle-encoding", - "tendermint-proto 0.38.1", -] - [[package]] name = "ibc-proto" version = "0.51.1" @@ -4563,7 +3944,7 @@ source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43 dependencies = [ "displaydoc", "ibc", - "ibc-proto 0.51.1", + "ibc-proto", "tonic", ] @@ -4577,7 +3958,7 @@ dependencies = [ "derive_more 1.0.0", "displaydoc", "ibc", - "ibc-proto 0.51.1", + "ibc-proto", "ibc-query", "parking_lot", "subtle-encoding", @@ -5901,9 +5282,9 @@ dependencies = [ "data-encoding", "dur", "ibc", - "ibc-derive 0.10.0 (git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4)", - "ibc-middleware-module 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.1.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.1.0)", + "ibc-derive", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ibc-testkit", diff --git a/Cargo.toml b/Cargo.toml index 7fbcb35e50..e2af3eb683 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,9 +120,9 @@ futures = "0.3" git2 = { version = "0.18.1", default-features = false } ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", features = ["serde"] } ibc-derive = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" } -ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module/v0.1.0" } -ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module-macros/v0.1.0" } -ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "orm/v0.4.0" } +ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs" } +ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs" } +ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs" } ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs", features = ["borsh"] } ibc-testkit = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", default-features = false } ics23 = "0.12.0" diff --git a/crates/ibc/src/context/middlewares/shielded_recv.rs b/crates/ibc/src/context/middlewares/shielded_recv.rs index 56aa5d42d0..8f420b89bc 100644 --- a/crates/ibc/src/context/middlewares/shielded_recv.rs +++ b/crates/ibc/src/context/middlewares/shielded_recv.rs @@ -13,13 +13,14 @@ use std::fmt::{Debug, Formatter}; use std::rc::Rc; use ibc::apps::transfer::context::TokenTransferExecutionContext; +use ibc::apps::transfer::types::error::TokenTransferError; use ibc::apps::transfer::types::packet::PacketData; use ibc::apps::transfer::types::{Coin, PrefixedDenom}; use ibc::core::channel::types::acknowledgement::{ Acknowledgement, AcknowledgementStatus, StatusValue as AckStatusValue, }; use ibc::core::channel::types::channel::{Counterparty, Order}; -use ibc::core::channel::types::error::{ChannelError, PacketError}; +use ibc::core::channel::types::error::ChannelError; use ibc::core::channel::types::packet::Packet; use ibc::core::channel::types::Version; use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId}; @@ -192,7 +193,7 @@ where TokenTransferContext::new(ctx, verifiers); token_transfer_context .mint_coins_execute(receiver, coin) - .map_err(Error::TokenTransfer) + .map_err(|e| Error::TokenTransfer(TokenTransferError::Host(e))) } fn unescrow_coins_execute( @@ -208,6 +209,6 @@ where TokenTransferContext::new(ctx, verifiers); token_transfer_context .unescrow_coins_execute(receiver, port, channel, coin) - .map_err(Error::TokenTransfer) + .map_err(|e| Error::TokenTransfer(TokenTransferError::Host(e))) } } diff --git a/crates/ibc/src/context/nft_transfer.rs b/crates/ibc/src/context/nft_transfer.rs index 7924f169cf..04a7cae4bb 100644 --- a/crates/ibc/src/context/nft_transfer.rs +++ b/crates/ibc/src/context/nft_transfer.rs @@ -13,6 +13,7 @@ use ibc::apps::nft_transfer::types::{ }; use ibc::core::host::types::error::HostError; use ibc::core::host::types::identifiers::{ChannelId, PortId}; +use ibc::core::primitives::Signer; use namada_core::address::{Address, MASP}; use namada_core::token::Amount; use namada_systems::trans_token; @@ -127,6 +128,28 @@ where type Nft = NftMetadata; type NftClass = NftClass; + fn sender_account( + &self, + signer: &Signer, + ) -> Result { + Address::decode(signer.as_ref()).map_err(|e| HostError::Other { + description: format!( + "Decoding the signer failed: {signer}, error {e}" + ), + }) + } + + fn receiver_account( + &self, + signer: &Signer, + ) -> Result { + Address::try_from(signer).map_err(|e| HostError::Other { + description: format!( + "Decoding the signer failed: {signer}, error {e}" + ), + }) + } + fn get_port(&self) -> Result { Ok(PORT_ID_STR.parse().expect("the ID should be parsable")) } diff --git a/crates/ibc/src/context/token_transfer.rs b/crates/ibc/src/context/token_transfer.rs index 5489051b49..77b1838e6d 100644 --- a/crates/ibc/src/context/token_transfer.rs +++ b/crates/ibc/src/context/token_transfer.rs @@ -183,21 +183,29 @@ where { type AccountId = Address; - fn sender_account_from_signer( + fn sender_account( &self, signer: &Signer, - ) -> Option { - Address::decode(signer.as_ref()).ok() + ) -> Result { + Address::decode(signer.as_ref()).map_err(|e| HostError::Other { + description: format!( + "Decoding the signer failed: {signer}, error {e}" + ), + }) } - fn receiver_account_from_signer( + fn receiver_account( &self, signer: &Signer, - ) -> Option { + ) -> Result { if self.parse_addr_as_governance { - Some(namada_core::address::GOV) + Ok(namada_core::address::GOV) } else { - Address::try_from(signer).ok() + Address::try_from(signer).map_err(|e| HostError::Other { + description: format!( + "Decoding the signer failed: {signer}, error {e}" + ), + }) } } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 2de241d0a3..879f204660 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -54,7 +54,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.15", + "getrandom", "once_cell", "version_check", ] @@ -116,7 +116,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "num-traits 0.2.17", + "num-traits", "zeroize", ] @@ -132,7 +132,7 @@ dependencies = [ "ark-std", "derivative", "num-bigint", - "num-traits 0.2.17", + "num-traits", "paste", "rustc_version 0.3.3", "zeroize", @@ -155,7 +155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", - "num-traits 0.2.17", + "num-traits", "quote", "syn 1.0.109", ] @@ -176,8 +176,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ - "num-traits 0.2.17", - "rand 0.8.5", + "num-traits", + "rand", ] [[package]] @@ -236,6 +236,15 @@ dependencies = [ "rustc_version 0.4.0", ] +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -398,7 +407,7 @@ dependencies = [ "ff", "group", "pairing", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -417,9 +426,9 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "568b6890865156d9043af490d4c4081c385dd68ea10acd6ca15733d511e6b51c" dependencies = [ - "hmac 0.12.1", + "hmac", "pbkdf2 0.12.2", - "rand 0.8.5", + "rand", "sha2 0.10.8", "unicode-normalization", "zeroize", @@ -536,19 +545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" dependencies = [ "ff", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "bls12_381" -version = "0.8.0" -source = "git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838#d3ebe9dd6488fac1923db120a7498079e55dd838" -dependencies = [ - "ff", - "group", - "pairing", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -698,7 +695,7 @@ dependencies = [ "semver 1.0.20", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -764,7 +761,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.17", + "num-traits", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -820,6 +817,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "coins-bip32" version = "0.8.7" @@ -829,11 +832,11 @@ dependencies = [ "bs58", "coins-core", "digest 0.10.7", - "hmac 0.12.1", + "hmac", "k256", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -844,12 +847,12 @@ checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" dependencies = [ "bitvec", "coins-bip32", - "hmac 0.12.1", + "hmac", "once_cell", "pbkdf2 0.12.2", - "rand 0.8.5", + "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -869,7 +872,7 @@ dependencies = [ "serde_derive", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -882,6 +885,12 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "const-crc32-nostd" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808ac43170e95b11dd23d78aa9eaac5bea45776a602955552c4e833f3f0f823d" + [[package]] name = "const-default" version = "1.0.0" @@ -935,6 +944,15 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +[[package]] +name = "core2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" +dependencies = [ + "memchr", +] + [[package]] name = "corosensei" version = "0.1.4" @@ -1061,6 +1079,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -1113,7 +1137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -1128,16 +1152,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "ct-codecs" version = "1.1.1" @@ -1161,7 +1175,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core 0.6.4", + "rand_core", "subtle-ng", "zeroize", ] @@ -1255,6 +1269,12 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +[[package]] +name = "debugless-unwrap" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f400d0750c0c069e8493f2256cb4da6f604b6d2eeb69a0ca8863acde352f8400" + [[package]] name = "der" version = "0.7.8" @@ -1291,6 +1311,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-getters" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "derive_builder" version = "0.12.0" @@ -1377,22 +1408,23 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1440,7 +1472,7 @@ dependencies = [ "chrono", "rust_decimal", "serde", - "thiserror", + "thiserror 1.0.50", "time", "winnow 0.6.8", ] @@ -1510,10 +1542,10 @@ checksum = "3c8465edc8ee7436ffea81d21a019b16676ee3db267aa8d5a8d729581ecf998b" dependencies = [ "curve25519-dalek-ng", "hex", - "rand_core 0.6.4", + "rand_core", "serde", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.50", "zeroize", ] @@ -1536,13 +1568,25 @@ dependencies = [ "generic-array", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "serdect", "subtle", "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "encoding_rs" version = "0.8.33" @@ -1563,7 +1607,7 @@ dependencies = [ "hex", "k256", "log", - "rand 0.8.5", + "rand", "rlp", "serde", "sha3", @@ -1637,15 +1681,15 @@ dependencies = [ "ctr", "digest 0.10.7", "hex", - "hmac 0.12.1", + "hmac", "pbkdf2 0.11.0", - "rand 0.8.5", + "rand", "scrypt", "serde", "serde_json", "sha2 0.10.8", "sha3", - "thiserror", + "thiserror 1.0.50", "uuid 0.8.2", ] @@ -1662,7 +1706,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.50", "uint 0.9.5", ] @@ -1775,7 +1819,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -1834,14 +1878,14 @@ dependencies = [ "num_enum", "once_cell", "open-fastrlp", - "rand 0.8.5", + "rand", "rlp", "serde", "serde_json", "strum 0.25.0", "syn 2.0.96", "tempfile", - "thiserror", + "thiserror 1.0.50", "tiny-keccak", "unicode-xid", ] @@ -1858,7 +1902,7 @@ dependencies = [ "semver 1.0.20", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -1881,7 +1925,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", "tokio", "tracing", "tracing-futures", @@ -1913,7 +1957,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", "tokio", "tracing", "tracing-futures", @@ -1937,9 +1981,9 @@ dependencies = [ "elliptic-curve", "eth-keystore", "ethers-core", - "rand 0.8.5", + "rand", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -1983,7 +2027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2006,7 +2050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -2089,7 +2133,43 @@ dependencies = [ "libm", "num-bigint", "num-integer", - "num-traits 0.2.17", + "num-traits", +] + +[[package]] +name = "frost-core" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1858230cabb6792a5020daf4b0074f57b7d1e2a520ac544c77f102babee62ff4" +dependencies = [ + "byteorder", + "const-crc32-nostd", + "debugless-unwrap", + "derive-getters", + "document-features", + "hex", + "itertools 0.14.0", + "postcard", + "rand_core", + "serde", + "serdect", + "thiserror 2.0.11", + "thiserror-nostd-notrait", + "visibility", + "zeroize", +] + +[[package]] +name = "frost-rerandomized" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3b10d9c1e9f298522510940b5b8c3d55040420517ec8d2bb86c4c2d1ae3ee" +dependencies = [ + "derive-getters", + "document-features", + "frost-core", + "hex", + "rand_core", ] [[package]] @@ -2227,19 +2307,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -2249,7 +2316,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2290,7 +2357,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "memuse", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2358,6 +2425,15 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2373,6 +2449,12 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashers" version = "1.0.1" @@ -2382,6 +2464,20 @@ dependencies = [ "fxhash", ] +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.0", + "serde", + "spin 0.9.8", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -2400,16 +2496,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" @@ -2610,7 +2696,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-apps", "ibc-clients", @@ -2623,7 +2709,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2633,7 +2719,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "borsh", @@ -2654,7 +2740,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2664,7 +2750,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2682,7 +2768,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2691,7 +2777,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", @@ -2708,7 +2794,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2725,7 +2811,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "displaydoc", @@ -2739,7 +2825,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2748,7 +2834,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2764,7 +2850,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2779,7 +2865,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2802,7 +2888,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2815,7 +2901,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2831,7 +2917,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2851,7 +2937,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2870,7 +2956,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -2884,7 +2970,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2905,7 +2991,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2920,7 +3006,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2944,7 +3030,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2962,7 +3048,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2985,7 +3071,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "borsh", @@ -3002,7 +3088,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3016,7 +3102,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3035,7 +3121,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.10.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "proc-macro2", "quote", @@ -3045,7 +3131,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3057,16 +3143,33 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "proc-macro2", "quote", ] +[[package]] +name = "ibc-middleware-overflow-receive" +version = "0.4.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +dependencies = [ + "ibc-app-transfer-types", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-primitives", + "serde", + "serde_json", +] + [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#89e394130f7c4bfba6c067f5ab89d1297b7fabc9" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "borsh", "dur", @@ -3087,7 +3190,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3124,7 +3227,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "displaydoc", "ibc", @@ -3135,7 +3238,7 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "basecoin-store", "bon", @@ -3210,7 +3313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", - "num-traits 0.2.17", + "num-traits", "uint 0.9.5", ] @@ -3278,17 +3381,6 @@ dependencies = [ "serde", ] -[[package]] -name = "indexmap" -version = "2.2.4" -source = "git+https://github.com/heliaxdev/indexmap?tag=2.2.4-heliax-1#b5b5b547bd6ab04bbb16e060326a50ddaeb6c909" -dependencies = [ - "borsh", - "equivalent", - "hashbrown 0.14.3", - "serde", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -3343,7 +3435,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -3354,18 +3446,18 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -3406,23 +3498,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8499f7a74008aafbecb2a2e608a3e13e4dd3e84df198b604451efe93f2de6e61" dependencies = [ "bitvec", - "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bls12_381", "ff", "group", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "jubjub" -version = "0.10.0" -source = "git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c#a373686962f4e9d0edb3b4716f86ff6bbd9aa86c" -dependencies = [ - "bitvec", - "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", - "ff", - "group", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -3554,28 +3633,29 @@ dependencies = [ [[package]] name = "masp_note_encryption" -version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9736dbd86140a9d6711b464297a87af9cc0ae485d73a956c595f1bc1f6a7920" dependencies = [ "borsh", "chacha20", "chacha20poly1305", "cipher", - "rand_core 0.6.4", + "rand_core", "subtle", ] [[package]] name = "masp_primitives" -version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb184254ca5cd5fb12e11b81a6a0d6b955d98c7263eae11057f669c31c7123c" dependencies = [ "aes", "bip0039", "bitvec", "blake2b_simd", "blake2s_simd", - "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "borsh", "byteorder", "ff", @@ -3583,15 +3663,16 @@ dependencies = [ "group", "hex", "incrementalmerkletree", - "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_note_encryption", "memuse", - "nonempty", - "num-traits 0.2.19", + "nam-bls12_381", + "nam-jubjub", + "nam-num-traits", + "nonempty 0.11.0", "proptest", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "sha2 0.10.8", "subtle", "zcash_encoding", @@ -3599,22 +3680,23 @@ dependencies = [ [[package]] name = "masp_proofs" -version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833eb23ccc5e4781636f6a7b2e720f60f31e53e534d1abb2b0ac5e86eb099c14" dependencies = [ "bellman", "blake2b_simd", - "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "directories", - "getrandom 0.2.15", + "getrandom", "group", - "itertools 0.11.0", - "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", + "itertools 0.14.0", "lazy_static", "masp_primitives", "minreq", - "rand_core 0.6.4", - "redjubjub", + "nam-bls12_381", + "nam-jubjub", + "nam-redjubjub", + "rand_core", "tracing", ] @@ -3720,7 +3802,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.52.0", ] @@ -3736,6 +3818,112 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "nam-bls12_381" +version = "0.8.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e768b0e2383163f2f4bbce1112d6454b2cb515950b0a9177733f0d71254d2c68" +dependencies = [ + "ff", + "group", + "pairing", + "rand_core", + "subtle", +] + +[[package]] +name = "nam-indexmap" +version = "2.7.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b40876708764895b63bb5a1e9f102d3813cb16baeb9f12932b7c8f2df4248e" +dependencies = [ + "borsh", + "equivalent", + "hashbrown 0.15.2", + "serde", +] + +[[package]] +name = "nam-jubjub" +version = "0.10.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdced0f5975d8f80cb82a84d464481acb7b586d22f447dda86947d6a572997b9" +dependencies = [ + "bitvec", + "ff", + "group", + "nam-bls12_381", + "rand_core", + "subtle", +] + +[[package]] +name = "nam-num-traits" +version = "0.2.20-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "687832a07242b76ab2760bc95180240954bf77e06bf8d9e825473c373146dc4a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nam-reddsa" +version = "0.5.2-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d102b4311bf60c03405350e976d17f5df155d2cb588f6401995a29ae8c1565" +dependencies = [ + "blake2b_simd", + "byteorder", + "frost-rerandomized", + "group", + "hex", + "jubjub", + "pasta_curves", + "rand_core", + "serde", + "thiserror 2.0.11", + "zeroize", +] + +[[package]] +name = "nam-redjubjub" +version = "0.7.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e457988762db7daad8d79f8a837a07295f5cc178d9236ba77db7339072ffb61e" +dependencies = [ + "nam-reddsa", + "rand_core", + "serde", + "thiserror 1.0.50", + "zeroize", +] + +[[package]] +name = "nam-sparse-merkle-tree" +version = "0.3.2-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fae108a0f6aabf789e34d6d447c1184608d1c70c087f957b720042226a47ab63" +dependencies = [ + "borsh", + "cfg-if", + "ics23", + "itertools 0.14.0", + "sha2 0.10.8", +] + +[[package]] +name = "nam-tiny-hderive" +version = "0.3.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dfd77f274636f722e966c394b381a70233ed4c25150864a4c53d398028a6818" +dependencies = [ + "base58", + "hmac", + "k256", + "memzero", + "sha2 0.10.8", +] + [[package]] name = "namada_account" version = "0.47.0" @@ -3754,7 +3942,7 @@ version = "0.47.0" dependencies = [ "namada_core", "smooth-operator", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -3772,31 +3960,31 @@ dependencies = [ "ibc", "ics23", "impl-num-traits", - "indexmap 2.2.4", "k256", "lazy_static", "masp_primitives", + "nam-indexmap", + "nam-sparse-merkle-tree", "namada_macros", "num-integer", "num-rational", - "num-traits 0.2.17", + "num-traits", "num256", "num_enum", "primitive-types 0.13.1", "proptest", "prost-types", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "rayon", "ripemd", "serde", "serde_json", "sha2 0.9.9", "smooth-operator", - "sparse-merkle-tree", "tendermint 0.40.1", "tendermint-proto 0.40.1", - "thiserror", + "thiserror 1.0.50", "tiny-keccak", "tokio", "tracing", @@ -3831,7 +4019,7 @@ dependencies = [ "namada_vp_env", "serde", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -3844,7 +4032,7 @@ dependencies = [ "namada_macros", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -3857,7 +4045,7 @@ dependencies = [ "namada_events", "namada_macros", "serde", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -3879,7 +4067,7 @@ dependencies = [ "serde", "serde_json", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -3892,6 +4080,9 @@ dependencies = [ "dur", "ibc", "ibc-derive", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ibc-testkit", "ics23", @@ -3912,7 +4103,7 @@ dependencies = [ "serde_json", "sha2 0.9.9", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -3924,7 +4115,7 @@ dependencies = [ "kdam", "namada_core", "tendermint-rpc", - "thiserror", + "thiserror 1.0.50", "tokio", ] @@ -3946,11 +4137,11 @@ dependencies = [ "borsh", "eyre", "ics23", + "nam-sparse-merkle-tree", "namada_core", "namada_macros", "prost", - "sparse-merkle-tree", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -3964,7 +4155,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -3987,7 +4178,7 @@ dependencies = [ "proptest", "serde", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -4003,6 +4194,7 @@ name = "namada_sdk" version = "0.47.0" dependencies = [ "async-trait", + "bech32 0.8.1", "bimap", "borsh", "circular-queue", @@ -4017,10 +4209,10 @@ dependencies = [ "futures", "init-once", "itertools 0.12.1", - "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_primitives", "masp_proofs", + "nam-jubjub", "namada_account", "namada_core", "namada_ethereum_bridge", @@ -4040,15 +4232,15 @@ dependencies = [ "namada_vote_ext", "namada_vp", "namada_wallet", - "num-traits 0.2.17", + "num-traits", "num256", "owo-colors", "paste", "patricia_tree", "proptest", "prost", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "rayon", "regex", "reqwest", @@ -4059,7 +4251,7 @@ dependencies = [ "smooth-operator", "tempfile", "tendermint-rpc", - "thiserror", + "thiserror 1.0.50", "tiny-bip39", "tokio", "toml 0.5.11", @@ -4094,8 +4286,8 @@ dependencies = [ "namada_vp_env", "namada_wallet", "proptest", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "rayon", "ripemd", "serde", @@ -4103,7 +4295,7 @@ dependencies = [ "sha2 0.9.9", "smooth-operator", "tempfile", - "thiserror", + "thiserror 1.0.50", "tracing", "typed-builder", "xorf", @@ -4128,7 +4320,7 @@ dependencies = [ "patricia_tree", "proptest", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -4146,7 +4338,7 @@ dependencies = [ "regex", "serde", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -4234,7 +4426,7 @@ dependencies = [ "namada_tx", "namada_tx_env", "namada_vp_env", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -4255,15 +4447,15 @@ dependencies = [ "namada_gas", "namada_macros", "num-derive 0.4.2", - "num-traits 0.2.17", + "num-traits", "proptest", "prost", "prost-types", - "rand_core 0.6.4", + "rand_core", "serde", "serde_json", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.50", "tonic-build", ] @@ -4316,7 +4508,7 @@ dependencies = [ "rayon", "smooth-operator", "tempfile", - "thiserror", + "thiserror 1.0.50", "tracing", "wasm-instrument", "wasmer", @@ -4355,7 +4547,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -4406,18 +4598,18 @@ dependencies = [ "fd-lock", "itertools 0.12.1", "masp_primitives", + "nam-tiny-hderive", "namada_core", "namada_ibc", "namada_macros", "orion", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "serde", "slip10_ed25519", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tiny-bip39", - "tiny-hderive", "toml 0.5.11", "zeroize", ] @@ -4428,7 +4620,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] @@ -4464,6 +4656,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" +[[package]] +name = "nonempty" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549e471b99ccaf2f89101bec68f4d244457d5a95a9c3d0672e9564124397741d" + [[package]] name = "num" version = "0.4.1" @@ -4475,7 +4673,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -4486,7 +4684,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -4495,7 +4693,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -4533,7 +4731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -4544,7 +4742,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -4556,27 +4754,19 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.17", + "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", ] -[[package]] -name = "num-traits" -version = "0.2.19" -source = "git+https://github.com/heliaxdev/num-traits?rev=3f3657caa34b8e116fdf3f8a3519c4ac29f012fe#3f3657caa34b8e116fdf3f8a3519c4ac29f012fe" -dependencies = [ - "autocfg", -] - [[package]] name = "num256" version = "0.3.5" @@ -4586,7 +4776,7 @@ dependencies = [ "lazy_static", "num", "num-derive 0.3.3", - "num-traits 0.2.17", + "num-traits", "serde", "serde_derive", ] @@ -4702,6 +4892,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "orion" version = "0.16.1" @@ -4709,7 +4905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6624905ddd92e460ff0685567539ed1ac985b2dee4c92c7edcd64fce905b00c" dependencies = [ "ct-codecs", - "getrandom 0.2.15", + "getrandom", "subtle", "zeroize", ] @@ -4791,7 +4987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -4803,7 +4999,7 @@ checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" dependencies = [ "ff", "group", - "rand 0.8.5", + "rand", "static_assertions", "subtle", ] @@ -4823,15 +5019,6 @@ dependencies = [ "bitflags 2.5.0", ] -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -4848,7 +5035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", + "hmac", "password-hash", ] @@ -4901,7 +5088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.50", "ucd-trie", ] @@ -4990,6 +5177,19 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +[[package]] +name = "postcard" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +dependencies = [ + "cobs", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "heapless", + "serde", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -5099,9 +5299,9 @@ dependencies = [ "bit-vec", "bitflags 2.5.0", "lazy_static", - "num-traits 0.2.17", - "rand 0.8.5", - "rand_chacha 0.3.1", + "num-traits", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax 0.8.2", "rusty-fork", @@ -5203,19 +5403,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -5223,18 +5410,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -5244,16 +5421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -5262,16 +5430,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -5280,7 +5439,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -5305,37 +5464,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "reddsa" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a5191930e84973293aa5f532b513404460cd2216c1cfb76d08748c15b40b02" -dependencies = [ - "blake2b_simd", - "byteorder", - "group", - "hex", - "jubjub 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pasta_curves", - "rand_core 0.6.4", - "serde", - "thiserror", - "zeroize", -] - -[[package]] -name = "redjubjub" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a60db2c3bc9c6fd1e8631fee75abc008841d27144be744951d6b9b75f9b569c" -dependencies = [ - "rand_core 0.6.4", - "reddsa", - "serde", - "thiserror", - "zeroize", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -5351,9 +5479,9 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.15", + "getrandom", "libredox", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -5477,7 +5605,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", + "hmac", "subtle", ] @@ -5503,7 +5631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.15", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -5591,8 +5719,8 @@ dependencies = [ "arrayvec", "borsh", "bytes", - "num-traits 0.2.17", - "rand 0.8.5", + "num-traits", + "rand", "rkyv", "serde", "serde_json", @@ -5781,7 +5909,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" dependencies = [ - "hmac 0.12.1", + "hmac", "pbkdf2 0.11.0", "salsa20", "sha2 0.10.8", @@ -6113,7 +6241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -6135,8 +6263,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", - "num-traits 0.2.17", - "thiserror", + "num-traits", + "thiserror 1.0.50", "time", ] @@ -6210,18 +6338,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "sparse-merkle-tree" -version = "0.3.1-pre" -source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" -dependencies = [ - "borsh", - "cfg-if", - "ics23", - "itertools 0.12.1", - "sha2 0.9.9", -] - [[package]] name = "spin" version = "0.5.2" @@ -6463,7 +6579,7 @@ dependencies = [ "ed25519", "flex-error", "futures", - "num-traits 0.2.17", + "num-traits", "once_cell", "prost", "prost-types", @@ -6492,7 +6608,7 @@ dependencies = [ "flex-error", "futures", "k256", - "num-traits 0.2.17", + "num-traits", "once_cell", "prost", "ripemd", @@ -6580,10 +6696,10 @@ dependencies = [ "async-trait", "bytes", "flex-error", - "getrandom 0.2.15", + "getrandom", "peg", "pin-project", - "rand 0.8.5", + "rand", "semver 1.0.20", "serde", "serde_bytes", @@ -6593,7 +6709,7 @@ dependencies = [ "tendermint 0.40.1", "tendermint-config", "tendermint-proto 0.40.1", - "thiserror", + "thiserror 1.0.50", "time", "url", "uuid 1.8.0", @@ -6653,7 +6769,16 @@ version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.50", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -6667,6 +6792,37 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "thiserror-nostd-notrait" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8444e638022c44d2a9337031dee8acb732bcc7fbf52ac654edc236b26408b61" +dependencies = [ + "thiserror-nostd-notrait-impl", +] + +[[package]] +name = "thiserror-nostd-notrait-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585e5ef40a784ce60b49c67d762110688d211d395d39e096be204535cf64590e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "thread_local" version = "1.1.7" @@ -6710,34 +6866,21 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.2" -source = "git+https://github.com/anoma/tiny-bip39.git?rev=bf0f6d8713589b83af7a917366ec31f5275c0e57#bf0f6d8713589b83af7a917366ec31f5275c0e57" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a30fd743a02bf35236f6faf99adb03089bb77e91c998dac2c2ad76bb424f668c" dependencies = [ - "anyhow", - "hmac 0.8.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.12.2", + "rand", "rustc-hash", - "sha2 0.9.9", - "thiserror", + "sha2 0.10.8", + "thiserror 1.0.50", "unicode-normalization", "wasm-bindgen", "zeroize", ] -[[package]] -name = "tiny-hderive" -version = "0.3.0" -source = "git+https://github.com/heliaxdev/tiny-hderive.git?rev=173ae03abed0cd25d88a5a13efac00af96b75b87#173ae03abed0cd25d88a5a13efac00af96b75b87" -dependencies = [ - "base58", - "hmac 0.12.1", - "k256", - "memzero", - "sha2 0.10.8", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -6960,7 +7103,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -7047,7 +7190,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" name = "tx_become_validator" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7056,7 +7199,7 @@ dependencies = [ name = "tx_bond" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7072,7 +7215,7 @@ dependencies = [ name = "tx_bridge_pool" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7081,7 +7224,7 @@ dependencies = [ name = "tx_change_consensus_key" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7090,7 +7233,7 @@ dependencies = [ name = "tx_change_validator_commission" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7106,7 +7249,7 @@ dependencies = [ name = "tx_change_validator_metadata" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7115,7 +7258,7 @@ dependencies = [ name = "tx_claim_rewards" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7124,7 +7267,7 @@ dependencies = [ name = "tx_deactivate_validator" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7133,7 +7276,7 @@ dependencies = [ name = "tx_ibc" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7142,7 +7285,7 @@ dependencies = [ name = "tx_init_account" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7151,7 +7294,7 @@ dependencies = [ name = "tx_init_proposal" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7160,7 +7303,7 @@ dependencies = [ name = "tx_reactivate_validator" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7169,7 +7312,7 @@ dependencies = [ name = "tx_redelegate" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7185,7 +7328,7 @@ dependencies = [ name = "tx_resign_steward" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7194,7 +7337,7 @@ dependencies = [ name = "tx_reveal_pk" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7203,7 +7346,7 @@ dependencies = [ name = "tx_transfer" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7212,7 +7355,7 @@ dependencies = [ name = "tx_unbond" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7228,7 +7371,7 @@ dependencies = [ name = "tx_unjail_validator" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7237,7 +7380,7 @@ dependencies = [ name = "tx_update_account" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7246,7 +7389,7 @@ dependencies = [ name = "tx_update_steward_commission" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7255,7 +7398,7 @@ dependencies = [ name = "tx_vote_proposal" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_tx_prelude", "rlsf", ] @@ -7264,7 +7407,7 @@ dependencies = [ name = "tx_withdraw" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7442,7 +7585,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.15", + "getrandom", "serde", ] @@ -7464,11 +7607,22 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "visibility" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "vp_implicit" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7484,7 +7638,7 @@ dependencies = [ name = "vp_user" version = "0.47.0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "namada_test_utils", "namada_tests", "namada_tx_prelude", @@ -7524,12 +7678,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7637,7 +7785,7 @@ dependencies = [ "serde-wasm-bindgen", "shared-buffer", "target-lexicon", - "thiserror", + "thiserror 1.0.50", "tracing", "wasm-bindgen", "wasmer-compiler", @@ -7657,7 +7805,7 @@ checksum = "79fd0889f8844b7c70b8ee8fbf1d1f6ccff99399c6f3d3627048cde04b1ac493" dependencies = [ "blake3", "hex", - "thiserror", + "thiserror 1.0.50", "wasmer", ] @@ -7682,7 +7830,7 @@ dependencies = [ "self_cell", "shared-buffer", "smallvec", - "thiserror", + "thiserror 1.0.50", "wasmer-types", "wasmer-vm", "wasmparser 0.121.2", @@ -7745,7 +7893,7 @@ dependencies = [ "serde_cbor", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.50", "toml 0.8.2", "url", ] @@ -7771,14 +7919,14 @@ dependencies = [ "bytecheck", "enum-iterator", "enumset", - "getrandom 0.2.15", + "getrandom", "hex", "indexmap 1.9.3", "more-asserts", "rkyv", "sha2 0.10.8", "target-lexicon", - "thiserror", + "thiserror 1.0.50", "webc", "xxhash-rust", ] @@ -7806,7 +7954,7 @@ dependencies = [ "more-asserts", "region", "scopeguard", - "thiserror", + "thiserror 1.0.50", "wasmer-types", "winapi", ] @@ -7900,7 +8048,7 @@ dependencies = [ "shared-buffer", "tar", "tempfile", - "thiserror", + "thiserror 1.0.50", "toml 0.7.8", "url", "wasmer-config", @@ -8168,7 +8316,7 @@ dependencies = [ "pharos", "rustc_version 0.4.0", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.50", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -8201,7 +8349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf24c008fe464f5d8f58b8d16a1ab7e930bd73b2a6933ff8704c414b2bed7f92" dependencies = [ "libm", - "rand 0.8.5", + "rand", "serde", ] @@ -8213,11 +8361,12 @@ checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" [[package]] name = "zcash_encoding" -version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash?rev=bd7f9d7#bd7f9d7c3ce5cfd14af169ffe0e1c5c903162f46" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3654116ae23ab67dd1f849b01f8821a8a156f884807ff665eac109bf28306c4d" dependencies = [ - "byteorder", - "nonempty", + "core2", + "nonempty 0.7.0", ] [[package]] diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index fde5efae34..2bd17d1457 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -85,7 +85,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "num-traits 0.2.17", + "num-traits", "zeroize", ] @@ -101,9 +101,9 @@ dependencies = [ "ark-std", "derivative", "num-bigint", - "num-traits 0.2.17", + "num-traits", "paste", - "rustc_version", + "rustc_version 0.3.3", "zeroize", ] @@ -124,7 +124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", - "num-traits 0.2.17", + "num-traits", "quote", "syn 1.0.109", ] @@ -145,7 +145,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ - "num-traits 0.2.17", + "num-traits", "rand", ] @@ -172,6 +172,15 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -344,18 +353,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "bls12_381" -version = "0.8.0" -source = "git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838#d3ebe9dd6488fac1923db120a7498079e55dd838" -dependencies = [ - "ff", - "group", - "pairing", - "rand_core", - "subtle", -] - [[package]] name = "borsh" version = "1.2.1" @@ -491,7 +488,7 @@ checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", - "num-traits 0.2.17", + "num-traits", "windows-targets 0.48.5", ] @@ -512,6 +509,18 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "const-crc32-nostd" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808ac43170e95b11dd23d78aa9eaac5bea45776a602955552c4e833f3f0f823d" + [[package]] name = "const-default" version = "1.0.0" @@ -542,6 +551,15 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +[[package]] +name = "core2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" +dependencies = [ + "memchr", +] + [[package]] name = "cosmos-sdk-proto" version = "0.26.1" @@ -563,6 +581,12 @@ dependencies = [ "libc", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -635,6 +659,12 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +[[package]] +name = "debugless-unwrap" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f400d0750c0c069e8493f2256cb4da6f604b6d2eeb69a0ca8863acde352f8400" + [[package]] name = "der" version = "0.7.8" @@ -665,6 +695,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-getters" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "derive_more" version = "0.99.18" @@ -720,22 +761,23 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -749,6 +791,15 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "dur" version = "0.5.3" @@ -801,7 +852,7 @@ dependencies = [ "rand_core", "serde", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.50", "zeroize", ] @@ -831,6 +882,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "equivalent" version = "1.0.1" @@ -860,7 +923,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.50", "uint 0.9.5", ] @@ -971,7 +1034,43 @@ dependencies = [ "libm", "num-bigint", "num-integer", - "num-traits 0.2.17", + "num-traits", +] + +[[package]] +name = "frost-core" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1858230cabb6792a5020daf4b0074f57b7d1e2a520ac544c77f102babee62ff4" +dependencies = [ + "byteorder", + "const-crc32-nostd", + "debugless-unwrap", + "derive-getters", + "document-features", + "hex", + "itertools 0.14.0", + "postcard", + "rand_core", + "serde", + "serdect", + "thiserror 2.0.11", + "thiserror-nostd-notrait", + "visibility", + "zeroize", +] + +[[package]] +name = "frost-rerandomized" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3b10d9c1e9f298522510940b5b8c3d55040420517ec8d2bb86c4c2d1ae3ee" +dependencies = [ + "derive-getters", + "document-features", + "frost-core", + "hex", + "rand_core", ] [[package]] @@ -1103,6 +1202,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1118,6 +1226,26 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version 0.4.1", + "serde", + "spin", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -1176,7 +1304,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-apps", "ibc-clients", @@ -1189,7 +1317,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -1199,7 +1327,7 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "borsh", @@ -1220,7 +1348,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1230,7 +1358,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1248,7 +1376,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -1257,7 +1385,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", @@ -1274,7 +1402,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1291,7 +1419,7 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1305,7 +1433,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1314,7 +1442,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1330,7 +1458,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1345,7 +1473,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1368,7 +1496,7 @@ dependencies = [ [[package]] name = "ibc-core-client" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1381,7 +1509,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1397,7 +1525,7 @@ dependencies = [ [[package]] name = "ibc-core-client-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1417,7 +1545,7 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1436,7 +1564,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -1450,7 +1578,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1471,7 +1599,7 @@ dependencies = [ [[package]] name = "ibc-core-handler" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1486,7 +1614,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1510,7 +1638,7 @@ dependencies = [ [[package]] name = "ibc-core-host" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1528,7 +1656,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1551,7 +1679,7 @@ dependencies = [ [[package]] name = "ibc-core-host-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "base64 0.22.1", "borsh", @@ -1568,7 +1696,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1582,7 +1710,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1601,7 +1729,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.10.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "proc-macro2", "quote", @@ -1611,6 +1739,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -1622,14 +1751,33 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "proc-macro2", "quote", ] +[[package]] +name = "ibc-middleware-overflow-receive" +version = "0.4.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +dependencies = [ + "ibc-app-transfer-types", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-primitives", + "serde", + "serde_json", +] + [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" dependencies = [ "borsh", "dur", @@ -1650,7 +1798,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.56.0" -source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=12ffb4bd01e962b86e2db00b10ef60921a9b8500#12ffb4bd01e962b86e2db00b10ef60921a9b8500" +source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1727,7 +1875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", - "num-traits 0.2.17", + "num-traits", "uint 0.9.5", ] @@ -1784,17 +1932,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" -[[package]] -name = "indexmap" -version = "2.2.4" -source = "git+https://github.com/heliaxdev/indexmap?tag=2.2.4-heliax-1#b5b5b547bd6ab04bbb16e060326a50ddaeb6c909" -dependencies = [ - "borsh", - "equivalent", - "hashbrown 0.14.3", - "serde", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -1830,23 +1967,23 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits 0.2.17", + "num-traits", ] [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -1873,20 +2010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8499f7a74008aafbecb2a2e608a3e13e4dd3e84df198b604451efe93f2de6e61" dependencies = [ "bitvec", - "bls12_381 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ff", - "group", - "rand_core", - "subtle", -] - -[[package]] -name = "jubjub" -version = "0.10.0" -source = "git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c#a373686962f4e9d0edb3b4716f86ff6bbd9aa86c" -dependencies = [ - "bitvec", - "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", + "bls12_381", "ff", "group", "rand_core", @@ -1971,6 +2095,22 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.20" @@ -1979,8 +2119,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "masp_note_encryption" -version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9736dbd86140a9d6711b464297a87af9cc0ae485d73a956c595f1bc1f6a7920" dependencies = [ "borsh", "chacha20", @@ -1992,15 +2133,15 @@ dependencies = [ [[package]] name = "masp_primitives" -version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb184254ca5cd5fb12e11b81a6a0d6b955d98c7263eae11057f669c31c7123c" dependencies = [ "aes", "bip0039", "bitvec", "blake2b_simd", "blake2s_simd", - "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "borsh", "byteorder", "ff", @@ -2008,12 +2149,13 @@ dependencies = [ "group", "hex", "incrementalmerkletree", - "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", "lazy_static", "masp_note_encryption", "memuse", - "nonempty", - "num-traits 0.2.19", + "nam-bls12_381", + "nam-jubjub", + "nam-num-traits", + "nonempty 0.11.0", "rand", "rand_core", "sha2 0.10.8", @@ -2023,21 +2165,22 @@ dependencies = [ [[package]] name = "masp_proofs" -version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe#0d0da3507a6f9ad135f00fd8201dc54c2f1d9efe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833eb23ccc5e4781636f6a7b2e720f60f31e53e534d1abb2b0ac5e86eb099c14" dependencies = [ "bellman", "blake2b_simd", - "bls12_381 0.8.0 (git+https://github.com/heliaxdev/bls12_381.git?rev=d3ebe9dd6488fac1923db120a7498079e55dd838)", "directories", "getrandom", "group", - "itertools 0.11.0", - "jubjub 0.10.0 (git+https://github.com/heliaxdev/jubjub.git?rev=a373686962f4e9d0edb3b4716f86ff6bbd9aa86c)", + "itertools 0.14.0", "lazy_static", "masp_primitives", + "nam-bls12_381", + "nam-jubjub", + "nam-redjubjub", "rand_core", - "redjubjub", "tracing", ] @@ -2071,6 +2214,99 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "nam-bls12_381" +version = "0.8.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e768b0e2383163f2f4bbce1112d6454b2cb515950b0a9177733f0d71254d2c68" +dependencies = [ + "ff", + "group", + "pairing", + "rand_core", + "subtle", +] + +[[package]] +name = "nam-indexmap" +version = "2.7.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b40876708764895b63bb5a1e9f102d3813cb16baeb9f12932b7c8f2df4248e" +dependencies = [ + "borsh", + "equivalent", + "hashbrown 0.15.2", + "serde", +] + +[[package]] +name = "nam-jubjub" +version = "0.10.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdced0f5975d8f80cb82a84d464481acb7b586d22f447dda86947d6a572997b9" +dependencies = [ + "bitvec", + "ff", + "group", + "nam-bls12_381", + "rand_core", + "subtle", +] + +[[package]] +name = "nam-num-traits" +version = "0.2.20-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "687832a07242b76ab2760bc95180240954bf77e06bf8d9e825473c373146dc4a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nam-reddsa" +version = "0.5.2-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d102b4311bf60c03405350e976d17f5df155d2cb588f6401995a29ae8c1565" +dependencies = [ + "blake2b_simd", + "byteorder", + "frost-rerandomized", + "group", + "hex", + "jubjub", + "pasta_curves", + "rand_core", + "serde", + "thiserror 2.0.11", + "zeroize", +] + +[[package]] +name = "nam-redjubjub" +version = "0.7.1-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e457988762db7daad8d79f8a837a07295f5cc178d9236ba77db7339072ffb61e" +dependencies = [ + "nam-reddsa", + "rand_core", + "serde", + "thiserror 1.0.50", + "zeroize", +] + +[[package]] +name = "nam-sparse-merkle-tree" +version = "0.3.2-nam.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fae108a0f6aabf789e34d6d447c1184608d1c70c087f957b720042226a47ab63" +dependencies = [ + "borsh", + "cfg-if", + "ics23", + "itertools 0.14.0", + "sha2 0.10.8", +] + [[package]] name = "namada_account" version = "0.47.0" @@ -2088,7 +2324,7 @@ version = "0.47.0" dependencies = [ "namada_core", "smooth-operator", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -2106,13 +2342,14 @@ dependencies = [ "ibc", "ics23", "impl-num-traits", - "indexmap 2.2.4", "k256", "masp_primitives", + "nam-indexmap", + "nam-sparse-merkle-tree", "namada_macros", "num-integer", "num-rational", - "num-traits 0.2.17", + "num-traits", "num256", "num_enum", "primitive-types 0.13.1", @@ -2123,10 +2360,9 @@ dependencies = [ "serde_json", "sha2 0.9.9", "smooth-operator", - "sparse-merkle-tree", "tendermint", "tendermint-proto", - "thiserror", + "thiserror 1.0.50", "tiny-keccak", "tracing", "uint 0.9.5", @@ -2143,7 +2379,7 @@ dependencies = [ "namada_macros", "serde", "serde_json", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2156,7 +2392,7 @@ dependencies = [ "namada_events", "namada_macros", "serde", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -2177,7 +2413,7 @@ dependencies = [ "serde", "serde_json", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2190,6 +2426,9 @@ dependencies = [ "dur", "ibc", "ibc-derive", + "ibc-middleware-module", + "ibc-middleware-module-macros", + "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ics23", "konst", @@ -2208,7 +2447,7 @@ dependencies = [ "serde_json", "sha2 0.9.9", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2230,11 +2469,11 @@ dependencies = [ "borsh", "eyre", "ics23", + "nam-sparse-merkle-tree", "namada_core", "namada_macros", "prost", - "sparse-merkle-tree", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -2248,7 +2487,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -2270,7 +2509,7 @@ dependencies = [ "once_cell", "serde", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2311,7 +2550,7 @@ dependencies = [ "sha2 0.9.9", "smooth-operator", "tempfile", - "thiserror", + "thiserror 1.0.50", "tracing", "typed-builder", "xorf", @@ -2335,7 +2574,7 @@ dependencies = [ "namada_tx", "patricia_tree", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2353,7 +2592,7 @@ dependencies = [ "regex", "serde", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2406,7 +2645,7 @@ dependencies = [ "namada_tx", "namada_tx_env", "namada_vp_env", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2427,14 +2666,14 @@ dependencies = [ "namada_gas", "namada_macros", "num-derive 0.4.2", - "num-traits 0.2.17", + "num-traits", "prost", "prost-types", "rand_core", "serde", "serde_json", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.50", "tonic-build", ] @@ -2486,7 +2725,7 @@ dependencies = [ "namada_tx", "namada_vp_env", "smooth-operator", - "thiserror", + "thiserror 1.0.50", "tracing", ] @@ -2542,6 +2781,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" +[[package]] +name = "nonempty" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549e471b99ccaf2f89101bec68f4d244457d5a95a9c3d0672e9564124397741d" + [[package]] name = "num" version = "0.4.1" @@ -2553,7 +2798,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -2564,7 +2809,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -2573,7 +2818,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -2611,7 +2856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -2622,7 +2867,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits", ] [[package]] @@ -2634,22 +2879,14 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.17", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", + "num-traits", ] [[package]] name = "num-traits" version = "0.2.19" -source = "git+https://github.com/heliaxdev/num-traits?rev=3f3657caa34b8e116fdf3f8a3519c4ac29f012fe#3f3657caa34b8e116fdf3f8a3519c4ac29f012fe" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2663,7 +2900,7 @@ dependencies = [ "lazy_static", "num", "num-derive 0.3.3", - "num-traits 0.2.17", + "num-traits", "serde", "serde_derive", ] @@ -2701,6 +2938,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "pairing" version = "0.23.0" @@ -2792,7 +3035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.50", "ucd-trie", ] @@ -2803,7 +3046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap", ] [[package]] @@ -2839,6 +3082,19 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "postcard" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +dependencies = [ + "cobs", + "embedded-io 0.4.0", + "embedded-io 0.6.1", + "heapless", + "serde", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3074,37 +3330,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "reddsa" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a5191930e84973293aa5f532b513404460cd2216c1cfb76d08748c15b40b02" -dependencies = [ - "blake2b_simd", - "byteorder", - "group", - "hex", - "jubjub 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pasta_curves", - "rand_core", - "serde", - "thiserror", - "zeroize", -] - -[[package]] -name = "redjubjub" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a60db2c3bc9c6fd1e8631fee75abc008841d27144be744951d6b9b75f9b569c" -dependencies = [ - "rand_core", - "reddsa", - "serde", - "thiserror", - "zeroize", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3122,7 +3347,7 @@ checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.50", ] [[package]] @@ -3242,7 +3467,7 @@ dependencies = [ "arrayvec", "borsh", "bytes", - "num-traits 0.2.17", + "num-traits", "rand", "rkyv", "serde", @@ -3261,7 +3486,16 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver", + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver 1.0.25", ] [[package]] @@ -3337,6 +3571,12 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "seahash" version = "4.1.0" @@ -3367,6 +3607,12 @@ dependencies = [ "semver-parser", ] +[[package]] +name = "semver" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" + [[package]] name = "semver-parser" version = "0.10.2" @@ -3544,15 +3790,12 @@ dependencies = [ ] [[package]] -name = "sparse-merkle-tree" -version = "0.3.1-pre" -source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594" +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "borsh", - "cfg-if", - "ics23", - "itertools 0.12.1", - "sha2 0.9.9", + "lock_api", ] [[package]] @@ -3565,6 +3808,12 @@ dependencies = [ "der", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3693,7 +3942,7 @@ dependencies = [ "flex-error", "futures", "k256", - "num-traits 0.2.17", + "num-traits", "once_cell", "prost", "ripemd", @@ -3748,7 +3997,16 @@ version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.50", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -3762,6 +4020,37 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "thiserror-nostd-notrait" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8444e638022c44d2a9337031dee8acb732bcc7fbf52ac654edc236b26408b61" +dependencies = [ + "thiserror-nostd-notrait-impl", +] + +[[package]] +name = "thiserror-nostd-notrait-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585e5ef40a784ce60b49c67d762110688d211d395d39e096be204535cf64590e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "time" version = "0.3.36" @@ -3828,7 +4117,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.2.6", + "indexmap", "toml_datetime", "winnow", ] @@ -3839,7 +4128,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap", "toml_datetime", "winnow", ] @@ -4147,6 +4436,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "visibility" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "vp_always_false" version = "0.47.0" @@ -4281,28 +4581,6 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.51.1" @@ -4475,11 +4753,12 @@ dependencies = [ [[package]] name = "zcash_encoding" -version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash?rev=bd7f9d7#bd7f9d7c3ce5cfd14af169ffe0e1c5c903162f46" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3654116ae23ab67dd1f849b01f8821a8a156f884807ff665eac109bf28306c4d" dependencies = [ - "byteorder", - "nonempty", + "core2", + "nonempty 0.7.0", ] [[package]] From 3d916f2a4fe390169d26dfe3d21a89ec551d7d44 Mon Sep 17 00:00:00 2001 From: yito88 Date: Thu, 30 Jan 2025 11:13:50 +0100 Subject: [PATCH 5/9] ibc-rs 0.57.0 --- Cargo.lock | 160 ++++++++++++++++++++++---------------- Cargo.toml | 14 ++-- wasm/Cargo.lock | 158 ++++++++++++++++++++++--------------- wasm_for_tests/Cargo.lock | 148 +++++++++++++++++++++-------------- 4 files changed, 284 insertions(+), 196 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ac1d038fa..e4fc754791 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3399,8 +3399,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50aebe83b772ecd2020ad1654b09abfb387f5ddc07db01ed23defb04a9a7fde8" dependencies = [ "ibc-apps", "ibc-clients", @@ -3412,8 +3413,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95bbdca1dab5e007633af6d9ee070a2f35749336239804c42ff7fad444c10b2e" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -3422,8 +3424,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e654dd72dc2df2dd1f232b0599331ff1519fc2c0d346f12e5e319a97c33b330c" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3444,8 +3447,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57cad93b5e1074c1f7b8dcea6099640b5a725a8a1dde957b00e89685eb2c0151" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -3454,8 +3458,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "364c7eb9dc122a279cafb5cd9eb1c459a1902a3c9a1e107f8d3037ca97ab4a5c" dependencies = [ "arbitrary", "borsh", @@ -3473,8 +3478,9 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb5ecc814492ac9349b27d7f119f0b0f3b9f94ffd156df35eaf6adb53b7831f3" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -3482,8 +3488,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11225e842c5e3bf0787a36cf10d16b954dafbef357533fa2a87c7ac1bb2739f7" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", @@ -3499,8 +3506,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa16efb7dc6d7b73d483e55553e6c69eeaf0b82384b464514c52fe813d3c55d2" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -3516,8 +3524,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e897b268e2f496e4a66c068a6146576a8b5a8243c5d3f1ab157505a715f22dc8" dependencies = [ "base64 0.22.1", "displaydoc", @@ -3530,8 +3539,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464b3c5061092ea25298443d3554c405f78d31e4928060167a216bb8cdc02708" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -3539,8 +3549,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f37c8c56ee649ba0ddf64268d4b8b35287937d4aaaf69877f922a4adc2eb29e" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3555,8 +3566,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111523dd75048898dcf3806484b2615a97d186725f1df8fe2de2862c6849034e" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -3570,8 +3582,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681d986a6943683ef16fbaab8295125bf795ab4e15a1909eccb8574bb4567f10" dependencies = [ "arbitrary", "borsh", @@ -3594,8 +3607,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e95616bda7fa163c1ed5e96aa2a5c902d07b31fddbcd756ebaca7a004bc078e8" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -3607,8 +3621,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540ce861ac8fe7ce6ff14de043d8a3e8e239875c058f0b5baa9fe9b0a31ac94" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3623,8 +3638,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f741122f7504846a6099d41244687e5db3235b7ce5f651de8a552489c1f5c9a" dependencies = [ "arbitrary", "borsh", @@ -3644,8 +3660,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ba35d2bde395cff6ddbf550d604c3098903e661430588995b1e5f8db1f2e1d1" dependencies = [ "arbitrary", "borsh", @@ -3664,8 +3681,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debe3ecdf3a0d59b011c963164974d6d924fb7e5580ce8262b1e64e2a0088cd7" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -3678,8 +3696,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2eed5ea03d3900f89b3b498c7f2ff83ca50c2f4f76cebc339bfa5ecb2f0ffc1" dependencies = [ "arbitrary", "borsh", @@ -3700,8 +3719,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26219873baa090be293308e45be9eb09a4ad5eb27b9cedbca3fa9552e90e6163" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3715,8 +3735,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426cdb98d683cf8f65b1ebb7638fd4e8a35e1718aa143bcf895636ee34c68385" dependencies = [ "arbitrary", "borsh", @@ -3740,8 +3761,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff10f831f430b02462e71852bcbc947dde972762ee26dce1202f861003366f2" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3758,8 +3780,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06697cc443a9ad99a6063e10ae08bf0aa78a72ba9e4e46fd6db8ee1c511b66f" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3781,8 +3804,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5879fb43b0789f42919b7965a93f8a18a08eaa39bf624fbaf837d8673ef1ecdc" dependencies = [ "arbitrary", "base64 0.22.1", @@ -3799,8 +3823,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d50640473900acca78039d01246bbfec827153eb7d7f294dc08dee58ca2be4f" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3813,8 +3838,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61cdfb5f8f7986ac50941f556c16d46e81cdf3529b257be1ab3beca8281f953e" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3832,8 +3858,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.10.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27e93e76ce4da46027a59a5f2c3152e6d4adc4a9d541c782ff69b89e7fa2ccb8" dependencies = [ "proc-macro2", "quote", @@ -3843,7 +3870,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3855,7 +3882,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "proc-macro2", "quote", @@ -3864,7 +3891,7 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", @@ -3881,7 +3908,7 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "borsh", "dur", @@ -3901,8 +3928,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff3dab00855e9ab99fa7276814bd29b0350f2da70b3e9f67f1d86f4e269655b" dependencies = [ "arbitrary", "borsh", @@ -3939,8 +3967,9 @@ dependencies = [ [[package]] name = "ibc-query" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d4180842b5fcfb2742cb070b7bde35ee46ccfa7b8ea6c3ac9f209351aae9ba" dependencies = [ "displaydoc", "ibc", @@ -3950,8 +3979,9 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c78d1c298f8bae59d39734c457ca0200a3830b56986d353fc5074b8f48bb262e" dependencies = [ "basecoin-store", "bon", @@ -6927,7 +6957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", - "heck 0.4.1", + "heck 0.5.0", "itertools 0.12.1", "log", "multimap", diff --git a/Cargo.toml b/Cargo.toml index e2af3eb683..45d264fec0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,13 +118,13 @@ flume = "0.11.1" fs_extra = "1.2.0" futures = "0.3" git2 = { version = "0.18.1", default-features = false } -ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", features = ["serde"] } -ibc-derive = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" } -ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs" } -ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs" } -ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs" } -ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", branch = "yuji/upgrade-ibc-rs", features = ["borsh"] } -ibc-testkit = { git = "https://github.com/cosmos/ibc-rs", rev = "a5f9fbf236cb26db3a76cde20ba43382de2d1ba4", default-features = false } +ibc = { version = "0.57.0", features = ["serde"] } +ibc-derive = "0.10.1" +ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc" } +ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc" } +ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc" } +ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc", features = ["borsh"] } +ibc-testkit = { version = "0.57.0", default-features = false } ics23 = "0.12.0" usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] } indexmap = { package = "nam-indexmap", version = "2.7.1-nam.0", features = ["borsh-schema", "serde"] } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 879f204660..6a9e80b614 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -2695,8 +2695,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50aebe83b772ecd2020ad1654b09abfb387f5ddc07db01ed23defb04a9a7fde8" dependencies = [ "ibc-apps", "ibc-clients", @@ -2708,8 +2709,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95bbdca1dab5e007633af6d9ee070a2f35749336239804c42ff7fad444c10b2e" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -2718,8 +2720,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e654dd72dc2df2dd1f232b0599331ff1519fc2c0d346f12e5e319a97c33b330c" dependencies = [ "base64 0.22.1", "borsh", @@ -2739,8 +2742,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57cad93b5e1074c1f7b8dcea6099640b5a725a8a1dde957b00e89685eb2c0151" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -2749,8 +2753,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "364c7eb9dc122a279cafb5cd9eb1c459a1902a3c9a1e107f8d3037ca97ab4a5c" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2767,8 +2772,9 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb5ecc814492ac9349b27d7f119f0b0f3b9f94ffd156df35eaf6adb53b7831f3" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -2776,8 +2782,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11225e842c5e3bf0787a36cf10d16b954dafbef357533fa2a87c7ac1bb2739f7" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", @@ -2793,8 +2800,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa16efb7dc6d7b73d483e55553e6c69eeaf0b82384b464514c52fe813d3c55d2" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -2810,8 +2818,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e897b268e2f496e4a66c068a6146576a8b5a8243c5d3f1ab157505a715f22dc8" dependencies = [ "base64 0.22.1", "displaydoc", @@ -2824,8 +2833,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464b3c5061092ea25298443d3554c405f78d31e4928060167a216bb8cdc02708" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -2833,8 +2843,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f37c8c56ee649ba0ddf64268d4b8b35287937d4aaaf69877f922a4adc2eb29e" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -2849,8 +2860,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111523dd75048898dcf3806484b2615a97d186725f1df8fe2de2862c6849034e" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -2864,8 +2876,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681d986a6943683ef16fbaab8295125bf795ab4e15a1909eccb8574bb4567f10" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2887,8 +2900,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e95616bda7fa163c1ed5e96aa2a5c902d07b31fddbcd756ebaca7a004bc078e8" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -2900,8 +2914,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540ce861ac8fe7ce6ff14de043d8a3e8e239875c058f0b5baa9fe9b0a31ac94" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -2916,8 +2931,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f741122f7504846a6099d41244687e5db3235b7ce5f651de8a552489c1f5c9a" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2936,8 +2952,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ba35d2bde395cff6ddbf550d604c3098903e661430588995b1e5f8db1f2e1d1" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2955,8 +2972,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debe3ecdf3a0d59b011c963164974d6d924fb7e5580ce8262b1e64e2a0088cd7" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -2969,8 +2987,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2eed5ea03d3900f89b3b498c7f2ff83ca50c2f4f76cebc339bfa5ecb2f0ffc1" dependencies = [ "borsh", "derive_more 1.0.0", @@ -2990,8 +3009,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26219873baa090be293308e45be9eb09a4ad5eb27b9cedbca3fa9552e90e6163" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -3005,8 +3025,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426cdb98d683cf8f65b1ebb7638fd4e8a35e1718aa143bcf895636ee34c68385" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3029,8 +3050,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff10f831f430b02462e71852bcbc947dde972762ee26dce1202f861003366f2" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3047,8 +3069,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06697cc443a9ad99a6063e10ae08bf0aa78a72ba9e4e46fd6db8ee1c511b66f" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3070,8 +3093,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5879fb43b0789f42919b7965a93f8a18a08eaa39bf624fbaf837d8673ef1ecdc" dependencies = [ "base64 0.22.1", "borsh", @@ -3087,8 +3111,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d50640473900acca78039d01246bbfec827153eb7d7f294dc08dee58ca2be4f" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -3101,8 +3126,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61cdfb5f8f7986ac50941f556c16d46e81cdf3529b257be1ab3beca8281f953e" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3120,8 +3146,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.10.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27e93e76ce4da46027a59a5f2c3152e6d4adc4a9d541c782ff69b89e7fa2ccb8" dependencies = [ "proc-macro2", "quote", @@ -3131,7 +3158,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3143,7 +3170,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "proc-macro2", "quote", @@ -3152,7 +3179,7 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", @@ -3169,7 +3196,7 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "borsh", "dur", @@ -3189,8 +3216,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff3dab00855e9ab99fa7276814bd29b0350f2da70b3e9f67f1d86f4e269655b" dependencies = [ "borsh", "derive_more 1.0.0", @@ -3226,8 +3254,9 @@ dependencies = [ [[package]] name = "ibc-query" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d4180842b5fcfb2742cb070b7bde35ee46ccfa7b8ea6c3ac9f209351aae9ba" dependencies = [ "displaydoc", "ibc", @@ -3237,8 +3266,9 @@ dependencies = [ [[package]] name = "ibc-testkit" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c78d1c298f8bae59d39734c457ca0200a3830b56986d353fc5074b8f48bb262e" dependencies = [ "basecoin-store", "bon", diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 2bd17d1457..02d43b1dd2 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -1303,8 +1303,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50aebe83b772ecd2020ad1654b09abfb387f5ddc07db01ed23defb04a9a7fde8" dependencies = [ "ibc-apps", "ibc-clients", @@ -1316,8 +1317,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95bbdca1dab5e007633af6d9ee070a2f35749336239804c42ff7fad444c10b2e" dependencies = [ "ibc-app-nft-transfer-types", "ibc-core", @@ -1326,8 +1328,9 @@ dependencies = [ [[package]] name = "ibc-app-nft-transfer-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e654dd72dc2df2dd1f232b0599331ff1519fc2c0d346f12e5e319a97c33b330c" dependencies = [ "base64 0.22.1", "borsh", @@ -1347,8 +1350,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57cad93b5e1074c1f7b8dcea6099640b5a725a8a1dde957b00e89685eb2c0151" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1357,8 +1361,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "364c7eb9dc122a279cafb5cd9eb1c459a1902a3c9a1e107f8d3037ca97ab4a5c" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1375,8 +1380,9 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb5ecc814492ac9349b27d7f119f0b0f3b9f94ffd156df35eaf6adb53b7831f3" dependencies = [ "ibc-app-nft-transfer", "ibc-app-transfer", @@ -1384,8 +1390,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11225e842c5e3bf0787a36cf10d16b954dafbef357533fa2a87c7ac1bb2739f7" dependencies = [ "derive_more 1.0.0", "ibc-client-tendermint-types", @@ -1401,8 +1408,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa16efb7dc6d7b73d483e55553e6c69eeaf0b82384b464514c52fe813d3c55d2" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1418,8 +1426,9 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e897b268e2f496e4a66c068a6146576a8b5a8243c5d3f1ab157505a715f22dc8" dependencies = [ "base64 0.22.1", "displaydoc", @@ -1432,8 +1441,9 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464b3c5061092ea25298443d3554c405f78d31e4928060167a216bb8cdc02708" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1441,8 +1451,9 @@ dependencies = [ [[package]] name = "ibc-core" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f37c8c56ee649ba0ddf64268d4b8b35287937d4aaaf69877f922a4adc2eb29e" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1457,8 +1468,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111523dd75048898dcf3806484b2615a97d186725f1df8fe2de2862c6849034e" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1472,8 +1484,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681d986a6943683ef16fbaab8295125bf795ab4e15a1909eccb8574bb4567f10" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1495,8 +1508,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e95616bda7fa163c1ed5e96aa2a5c902d07b31fddbcd756ebaca7a004bc078e8" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1508,8 +1522,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540ce861ac8fe7ce6ff14de043d8a3e8e239875c058f0b5baa9fe9b0a31ac94" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1524,8 +1539,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f741122f7504846a6099d41244687e5db3235b7ce5f651de8a552489c1f5c9a" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1544,8 +1560,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ba35d2bde395cff6ddbf550d604c3098903e661430588995b1e5f8db1f2e1d1" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1563,8 +1580,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debe3ecdf3a0d59b011c963164974d6d924fb7e5580ce8262b1e64e2a0088cd7" dependencies = [ "ibc-client-wasm-types", "ibc-core-client", @@ -1577,8 +1595,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2eed5ea03d3900f89b3b498c7f2ff83ca50c2f4f76cebc339bfa5ecb2f0ffc1" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1598,8 +1617,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26219873baa090be293308e45be9eb09a4ad5eb27b9cedbca3fa9552e90e6163" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1613,8 +1633,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426cdb98d683cf8f65b1ebb7638fd4e8a35e1718aa143bcf895636ee34c68385" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1637,8 +1658,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff10f831f430b02462e71852bcbc947dde972762ee26dce1202f861003366f2" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1655,8 +1677,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06697cc443a9ad99a6063e10ae08bf0aa78a72ba9e4e46fd6db8ee1c511b66f" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1678,8 +1701,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5879fb43b0789f42919b7965a93f8a18a08eaa39bf624fbaf837d8673ef1ecdc" dependencies = [ "base64 0.22.1", "borsh", @@ -1695,8 +1719,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d50640473900acca78039d01246bbfec827153eb7d7f294dc08dee58ca2be4f" dependencies = [ "derive_more 1.0.0", "displaydoc", @@ -1709,8 +1734,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61cdfb5f8f7986ac50941f556c16d46e81cdf3529b257be1ab3beca8281f953e" dependencies = [ "borsh", "derive_more 1.0.0", @@ -1728,8 +1754,9 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.10.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27e93e76ce4da46027a59a5f2c3152e6d4adc4a9d541c782ff69b89e7fa2ccb8" dependencies = [ "proc-macro2", "quote", @@ -1739,7 +1766,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -1751,7 +1778,7 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "proc-macro2", "quote", @@ -1760,7 +1787,7 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", @@ -1777,7 +1804,7 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?branch=yuji/upgrade-ibc-rs#2c979856e6a242fad41697a66642645a67c78ddc" +source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" dependencies = [ "borsh", "dur", @@ -1797,8 +1824,9 @@ dependencies = [ [[package]] name = "ibc-primitives" -version = "0.56.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=a5f9fbf236cb26db3a76cde20ba43382de2d1ba4#a5f9fbf236cb26db3a76cde20ba43382de2d1ba4" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff3dab00855e9ab99fa7276814bd29b0350f2da70b3e9f67f1d86f4e269655b" dependencies = [ "borsh", "derive_more 1.0.0", From c309a3e8be1e72ee891f338f1665bc03adcaa420 Mon Sep 17 00:00:00 2001 From: yito88 Date: Thu, 30 Jan 2025 15:32:10 +0100 Subject: [PATCH 6/9] update middleware --- Cargo.lock | 68 +++++++++++++++++++++++++++++++-------- Cargo.toml | 8 ++--- wasm/Cargo.lock | 68 +++++++++++++++++++++++++++++++-------- wasm_for_tests/Cargo.lock | 68 +++++++++++++++++++++++++++++++-------- 4 files changed, 169 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4fc754791..673fd202de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3869,8 +3869,32 @@ dependencies = [ [[package]] name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3882,7 +3906,25 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.2.0#3dca5354609af33e0aaba3f582a28447410d637f" dependencies = [ "proc-macro2", "quote", @@ -3890,16 +3932,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" -version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.5.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", "ibc-primitives", "serde", "serde_json", @@ -3907,8 +3949,8 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" -version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "borsh", "dur", @@ -3919,8 +3961,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", "ibc-primitives", "serde", "serde_json", @@ -5313,8 +5355,8 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0)", + "ibc-middleware-module-macros 0.2.0", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ibc-testkit", diff --git a/Cargo.toml b/Cargo.toml index 45d264fec0..5641023449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,10 +120,10 @@ futures = "0.3" git2 = { version = "0.18.1", default-features = false } ibc = { version = "0.57.0", features = ["serde"] } ibc-derive = "0.10.1" -ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc" } -ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc" } -ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc" } -ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", rev = "e723d8465d9ed8185ea08debc01cd4d18af140bc", features = ["borsh"] } +ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module/v0.2.0" } +ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module-macros/v0.2.0" } +ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "orm/v0.5.0" } +ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.10.0", features = ["borsh"] } ibc-testkit = { version = "0.57.0", default-features = false } ics23 = "0.12.0" usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 6a9e80b614..96dcc7a4a2 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -3157,8 +3157,32 @@ dependencies = [ [[package]] name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3170,7 +3194,25 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.2.0#3dca5354609af33e0aaba3f582a28447410d637f" dependencies = [ "proc-macro2", "quote", @@ -3178,16 +3220,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" -version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.5.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", "ibc-primitives", "serde", "serde_json", @@ -3195,8 +3237,8 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" -version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "borsh", "dur", @@ -3207,8 +3249,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", "ibc-primitives", "serde", "serde_json", @@ -4110,8 +4152,8 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0)", + "ibc-middleware-module-macros 0.2.0", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ibc-testkit", diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 02d43b1dd2..4c83ca64d2 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -1765,8 +1765,32 @@ dependencies = [ [[package]] name = "ibc-middleware-module" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router", + "ibc-core-router-types", + "ibc-primitives", +] + +[[package]] +name = "ibc-middleware-module" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -1778,7 +1802,25 @@ dependencies = [ [[package]] name = "ibc-middleware-module-macros" version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.1.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ibc-middleware-module-macros" +version = "0.2.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.2.0#3dca5354609af33e0aaba3f582a28447410d637f" dependencies = [ "proc-macro2", "quote", @@ -1786,16 +1828,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" -version = "0.4.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.5.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", "ibc-primitives", "serde", "serde_json", @@ -1803,8 +1845,8 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" -version = "0.9.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?rev=e723d8465d9ed8185ea08debc01cd4d18af140bc#e723d8465d9ed8185ea08debc01cd4d18af140bc" +version = "0.10.0" +source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" dependencies = [ "borsh", "dur", @@ -1815,8 +1857,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", + "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", "ibc-primitives", "serde", "serde_json", @@ -2454,8 +2496,8 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module", - "ibc-middleware-module-macros", + "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0)", + "ibc-middleware-module-macros 0.2.0", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ics23", From 12a0b0df518ede47d05248f62a3b48ab3b96579f Mon Sep 17 00:00:00 2001 From: Tomas Zemanovic Date: Mon, 3 Feb 2025 12:48:23 +0000 Subject: [PATCH 7/9] Update crates/tests/src/e2e/setup.rs Co-authored-by: Tiago Carvalho --- crates/tests/src/e2e/setup.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/tests/src/e2e/setup.rs b/crates/tests/src/e2e/setup.rs index 6e4db4bcf1..4eec9b69be 100644 --- a/crates/tests/src/e2e/setup.rs +++ b/crates/tests/src/e2e/setup.rs @@ -1140,7 +1140,7 @@ where // Root cargo workspace manifest path let (bin_name, log_level) = match bin { Bin::Namada => ("namada", "info"), - Bin::Node => ("namadan", "debug"), + Bin::Node => ("namadan", "info"), Bin::Client => ( "namadac", if is_shielded_sync { From 98cc5a9af465f752da3ba79fa3a0905d6857f632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Mon, 3 Feb 2025 13:52:13 +0100 Subject: [PATCH 8/9] deps: switch to published ibc-middleware crates --- Cargo.lock | 66 +++++++++------------------------------ Cargo.toml | 8 ++--- wasm/Cargo.lock | 66 +++++++++------------------------------ wasm_for_tests/Cargo.lock | 66 +++++++++------------------------------ 4 files changed, 46 insertions(+), 160 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 673fd202de..ff9c2da9be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3870,31 +3870,8 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64aa34a2890898b88c6f1e0b505b7d092b569492885cdc145ac5e23e816cc308" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3903,28 +3880,11 @@ dependencies = [ "ibc-primitives", ] -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "ibc-middleware-module-macros" version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.2.0#3dca5354609af33e0aaba3f582a28447410d637f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73055ad46ad031f010ac66ac185fd2e4cee456d5e0e8bec21ea6caf55de7d63a" dependencies = [ "proc-macro2", "quote", @@ -3933,15 +3893,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.5.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b33fe36be073b32abe9b262134cc2a2fbbd689f9a532f6700533324ff279af8b" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -3950,7 +3911,8 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.10.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9da9cb134fa631c50659f58fb6f5356c724709048107b976548daad8860e7361" dependencies = [ "borsh", "dur", @@ -3961,8 +3923,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -5355,8 +5317,8 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0)", - "ibc-middleware-module-macros 0.2.0", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ibc-testkit", diff --git a/Cargo.toml b/Cargo.toml index 5641023449..580a42b6e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,10 +120,10 @@ futures = "0.3" git2 = { version = "0.18.1", default-features = false } ibc = { version = "0.57.0", features = ["serde"] } ibc-derive = "0.10.1" -ibc-middleware-module = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module/v0.2.0" } -ibc-middleware-module-macros = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "module-macros/v0.2.0" } -ibc-middleware-overflow-receive = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "orm/v0.5.0" } -ibc-middleware-packet-forward = { git = "https://github.com/heliaxdev/ibc-middleware", tag = "pfm/v0.10.0", features = ["borsh"] } +ibc-middleware-module = { version = "0.2.0" } +ibc-middleware-module-macros = { version = "0.2.0" } +ibc-middleware-overflow-receive = { version = "0.5.0" } +ibc-middleware-packet-forward = { version = "0.10.0", features = ["borsh"] } ibc-testkit = { version = "0.57.0", default-features = false } ics23 = "0.12.0" usize-set = { version = "0.10.3", features = ["serialize-borsh", "serialize-serde"] } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index 96dcc7a4a2..30ac45439c 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -3158,31 +3158,8 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64aa34a2890898b88c6f1e0b505b7d092b569492885cdc145ac5e23e816cc308" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -3191,28 +3168,11 @@ dependencies = [ "ibc-primitives", ] -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "ibc-middleware-module-macros" version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.2.0#3dca5354609af33e0aaba3f582a28447410d637f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73055ad46ad031f010ac66ac185fd2e4cee456d5e0e8bec21ea6caf55de7d63a" dependencies = [ "proc-macro2", "quote", @@ -3221,15 +3181,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.5.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b33fe36be073b32abe9b262134cc2a2fbbd689f9a532f6700533324ff279af8b" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -3238,7 +3199,8 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.10.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9da9cb134fa631c50659f58fb6f5356c724709048107b976548daad8860e7361" dependencies = [ "borsh", "dur", @@ -3249,8 +3211,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -4152,8 +4114,8 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0)", - "ibc-middleware-module-macros 0.2.0", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ibc-testkit", diff --git a/wasm_for_tests/Cargo.lock b/wasm_for_tests/Cargo.lock index 4c83ca64d2..ef96ab11be 100644 --- a/wasm_for_tests/Cargo.lock +++ b/wasm_for_tests/Cargo.lock @@ -1766,31 +1766,8 @@ dependencies = [ [[package]] name = "ibc-middleware-module" version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router", - "ibc-core-router-types", - "ibc-primitives", -] - -[[package]] -name = "ibc-middleware-module" -version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64aa34a2890898b88c6f1e0b505b7d092b569492885cdc145ac5e23e816cc308" dependencies = [ "ibc-core-channel-types", "ibc-core-host-types", @@ -1799,28 +1776,11 @@ dependencies = [ "ibc-primitives", ] -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ibc-middleware-module-macros" -version = "0.1.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "ibc-middleware-module-macros" version = "0.2.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=module-macros/v0.2.0#3dca5354609af33e0aaba3f582a28447410d637f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73055ad46ad031f010ac66ac185fd2e4cee456d5e0e8bec21ea6caf55de7d63a" dependencies = [ "proc-macro2", "quote", @@ -1829,15 +1789,16 @@ dependencies = [ [[package]] name = "ibc-middleware-overflow-receive" version = "0.5.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b33fe36be073b32abe9b262134cc2a2fbbd689f9a532f6700533324ff279af8b" dependencies = [ "ibc-app-transfer-types", "ibc-core-channel-types", "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=orm/v0.5.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -1846,7 +1807,8 @@ dependencies = [ [[package]] name = "ibc-middleware-packet-forward" version = "0.10.0" -source = "git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0#bd89960566b52d8e141308c72bb4f95e69f2c643" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9da9cb134fa631c50659f58fb6f5356c724709048107b976548daad8860e7361" dependencies = [ "borsh", "dur", @@ -1857,8 +1819,8 @@ dependencies = [ "ibc-core-host-types", "ibc-core-router", "ibc-core-router-types", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", - "ibc-middleware-module-macros 0.1.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=pfm/v0.10.0)", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-primitives", "serde", "serde_json", @@ -2496,8 +2458,8 @@ dependencies = [ "dur", "ibc", "ibc-derive", - "ibc-middleware-module 0.2.0 (git+https://github.com/heliaxdev/ibc-middleware?tag=module/v0.2.0)", - "ibc-middleware-module-macros 0.2.0", + "ibc-middleware-module", + "ibc-middleware-module-macros", "ibc-middleware-overflow-receive", "ibc-middleware-packet-forward", "ics23", From 759fcfcaaf8a4fd22b5b304770d6298d3d36e44a Mon Sep 17 00:00:00 2001 From: yito88 Date: Mon, 3 Feb 2025 14:02:59 +0100 Subject: [PATCH 9/9] changelog --- .changelog/unreleased/improvements/4247-bump-ibc-rs.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/unreleased/improvements/4247-bump-ibc-rs.md diff --git a/.changelog/unreleased/improvements/4247-bump-ibc-rs.md b/.changelog/unreleased/improvements/4247-bump-ibc-rs.md new file mode 100644 index 0000000000..f7349ecfbf --- /dev/null +++ b/.changelog/unreleased/improvements/4247-bump-ibc-rs.md @@ -0,0 +1 @@ +- bump ibc-rs to v0.57.0 ([\#4247](https://github.com/anoma/namada/issues/4247)) \ No newline at end of file