diff --git a/code/Cargo.lock b/code/Cargo.lock index 9ffbc75cc45..78e2508d352 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -1772,7 +1772,7 @@ dependencies = [ "derive_more", "frame-support", "frame-system", - "ibc 0.41.0", + "ibc 0.43.1", "num-traits", "orml-tokens", "orml-traits", @@ -3299,7 +3299,7 @@ dependencies = [ "cw-xc-interpreter", "cw2", "cw20", - "ibc 0.41.0", + "ibc 0.43.1", "schemars", "serde", "serde-json-wasm", @@ -3435,8 +3435,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] @@ -3453,17 +3463,42 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.66", + "quote 1.0.31", + "strsim 0.10.0", + "syn 2.0.26", +] + [[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote 1.0.31", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote 1.0.31", + "syn 2.0.26", +] + [[package]] name = "data-encoding" version = "2.4.0" @@ -3576,7 +3611,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro2 1.0.66", "quote 1.0.31", "syn 1.0.109", @@ -5456,7 +5491,7 @@ dependencies = [ "derive_more", "flex-error", "hex", - "ibc-derive", + "ibc-derive 0.1.0", "ibc-proto 0.18.0", "ics23 0.10.0", "log 0.4.19", @@ -5479,16 +5514,15 @@ dependencies = [ [[package]] name = "ibc" -version = "0.41.0" -source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?rev=3589353927cef8a52f610d842bd0f5ab8a2e1a1e#3589353927cef8a52f610d842bd0f5ab8a2e1a1e" +version = "0.43.1" +source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?rev=c305fb9a7f3750e6daa0d9aefa84d53d64cd4fee#c305fb9a7f3750e6daa0d9aefa84d53d64cd4fee" dependencies = [ "bytes 1.4.0", "derive_more", "displaydoc", - "dyn-clone", - "erased-serde", - "ibc-proto 0.30.0", - "ics23 0.9.0", + "ibc-derive 0.2.0", + "ibc-proto 0.32.0", + "ics23 0.10.1", "num-traits", "parity-scale-codec", "primitive-types", @@ -5497,13 +5531,13 @@ dependencies = [ "scale-info", "schemars", "serde", + "serde-json-wasm", "serde_derive", - "serde_json", "sha2 0.10.7", "subtle-encoding", - "tendermint 0.31.1", - "tendermint-light-client-verifier 0.31.1", - "tendermint-proto 0.31.1", + "tendermint 0.32.2", + "tendermint-light-client-verifier 0.32.2", + "tendermint-proto 0.32.2", "time 0.3.20", "tracing", "uint", @@ -5521,6 +5555,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ibc-derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2628857829b03dc5d434d116a0ed865e6634bad684368f466bd1a0431f49d0a6" +dependencies = [ + "darling 0.20.3", + "proc-macro2 1.0.66", + "quote 1.0.31", + "syn 2.0.26", +] + [[package]] name = "ibc-primitives" version = "0.1.0" @@ -5559,19 +5605,19 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f844ebc1ddf70f2ad7cd5981a2feba261fff55e1ad6482c27551ee3c6cec7df4" +version = "0.32.0" +source = "git+https://github.com/cosmos/ibc-proto-rs.git?rev=af385af#af385afa8d7e4c407f5d12242ea1dfc6d273580b" dependencies = [ "base64 0.21.2", "bytes 1.4.0", "flex-error", + "ics23 0.10.1", "parity-scale-codec", "prost", "scale-info", "serde", "subtle-encoding", - "tendermint-proto 0.31.1", + "tendermint-proto 0.32.2", ] [[package]] @@ -5582,7 +5628,7 @@ dependencies = [ "frame-system", "hex-literal", "ibc 0.15.0", - "ibc-derive", + "ibc-derive 0.1.0", "ibc-primitives", "ibc-proto 0.18.0", "ibc-runtime-api", @@ -5703,28 +5749,29 @@ dependencies = [ [[package]] name = "ics23" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca44b684ce1859cff746ff46f5765ab72e12e3c06f76a8356db8f9a2ecf43f17" +version = "0.10.0" +source = "git+https://github.com/cosmos/ics23?rev=74ce807b7be39a7e0afb4e2efb8e28a57965f57b#74ce807b7be39a7e0afb4e2efb8e28a57965f57b" dependencies = [ "anyhow", "bytes 1.4.0", "hex", "prost", - "ripemd", - "sha2 0.10.7", - "sha3", ] [[package]] name = "ics23" -version = "0.10.0" -source = "git+https://github.com/cosmos/ics23?rev=74ce807b7be39a7e0afb4e2efb8e28a57965f57b#74ce807b7be39a7e0afb4e2efb8e28a57965f57b" +version = "0.10.1" +source = "git+https://github.com/cosmos/ics23.git?rev=27868a6#27868a61368e6bcfd922c87f511677717c677f00" dependencies = [ "anyhow", "bytes 1.4.0", "hex", + "informalsystems-pbjson", "prost", + "ripemd", + "serde", + "sha2 0.10.7", + "sha3", ] [[package]] @@ -5886,6 +5933,15 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +[[package]] +name = "informalsystems-pbjson" +version = "0.6.0" +source = "git+https://github.com/informalsystems/pbjson?rev=e54f504#e54f504cb04e429bdb3cf14f0a659965235fd077" +dependencies = [ + "base64 0.13.1", + "serde", +] + [[package]] name = "inout" version = "0.1.3" @@ -9120,7 +9176,7 @@ dependencies = [ "hex", "hex-literal", "ibc 0.15.0", - "ibc-derive", + "ibc-derive 0.1.0", "ibc-primitives", "ibc-proto 0.18.0", "ics07-tendermint", @@ -9352,7 +9408,7 @@ dependencies = [ "frame-support", "frame-system", "hex", - "ibc 0.41.0", + "ibc 0.43.1", "ibc-primitives", "log 0.4.19", "orml-xtokens", @@ -11976,7 +12032,7 @@ dependencies = [ "composable-traits", "cosmwasm-std", "frame-support", - "ibc 0.41.0", + "ibc 0.43.1", "lazy_static", "parity-scale-codec", "scale-info", @@ -16359,7 +16415,7 @@ name = "subxt-codegen" version = "0.25.0" source = "git+https://github.com/paritytech/subxt?rev=2a913a3aa99a07f7acaedbbaeed6925d34627303#2a913a3aa99a07f7acaedbbaeed6925d34627303" dependencies = [ - "darling", + "darling 0.14.4", "frame-metadata", "heck 0.4.1", "hex", @@ -16379,7 +16435,7 @@ name = "subxt-macro" version = "0.25.0" source = "git+https://github.com/paritytech/subxt?rev=2a913a3aa99a07f7acaedbbaeed6925d34627303#2a913a3aa99a07f7acaedbbaeed6925d34627303" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro-error", "subxt-codegen", "syn 1.0.109", @@ -16589,9 +16645,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b58bdb6c44a2621b8b6bd0585d5912ba32546317604130a42410bcc813ef16" +checksum = "3f0a7d05cf78524782337f8edd55cbc578d159a16ad4affe2135c92f7dbac7f0" dependencies = [ "bytes 1.4.0", "digest 0.10.7", @@ -16611,7 +16667,7 @@ dependencies = [ "signature 2.0.0", "subtle", "subtle-encoding", - "tendermint-proto 0.31.1", + "tendermint-proto 0.32.2", "time 0.3.20", "zeroize", ] @@ -16630,14 +16686,14 @@ dependencies = [ [[package]] name = "tendermint-light-client-verifier" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2b81d34aad90a344b0faebb733adbfcd0e1625a070ba5ad6d0dda44a558746" +checksum = "9875dce5c1b08201152eb0860f8fb1dce96c53e37532c310ffc4956d20f90def" dependencies = [ "derive_more", "flex-error", "serde", - "tendermint 0.31.1", + "tendermint 0.32.2", "time 0.3.20", ] @@ -16660,9 +16716,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f15666993e193fa4d2b2479aa1e4f1bbe41283c820812df8dd618f41ca3f7a" +checksum = "c0cec054567d16d85e8c3f6a3139963d1a66d9d3051ed545d31562550e9bcc3d" dependencies = [ "bytes 1.4.0", "flex-error", @@ -19085,7 +19141,7 @@ dependencies = [ "cw-storage-plus", "fixed", "hex", - "ibc 0.41.0", + "ibc 0.43.1", "num", "parity-scale-codec", "prost", diff --git a/code/Cargo.toml b/code/Cargo.toml index 95af38b32f8..8690568bc48 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -132,7 +132,7 @@ pallet-xcm = { git = "https://github.com/paritytech/polkadot", rev = "c22e1c4173 log = { version = "0.4.14", default-features = false } -ibc-rs-scale = { package = "ibc", git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", rev = "3589353927cef8a52f610d842bd0f5ab8a2e1a1e", default-features = false } +ibc-rs-scale = { package = "ibc", git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", rev = "c305fb9a7f3750e6daa0d9aefa84d53d64cd4fee", default-features = false } democracy = { package = "pallet-democracy", git = "https://github.com/ComposableFi/substrate", rev = "c74d73bfe1e4f725b3f7d81c997ba9c940bf6005", default-features = false } executive = { package = "frame-executive", git = "https://github.com/ComposableFi/substrate", rev = "c74d73bfe1e4f725b3f7d81c997ba9c940bf6005", default-features = false } indices = { package = "pallet-indices", git = "https://github.com/ComposableFi/substrate", rev = "c74d73bfe1e4f725b3f7d81c997ba9c940bf6005", default-features = false }