From 063fb9cddc8f79ef7023fa7da13cc779b867d2e5 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Thu, 15 Feb 2024 09:05:26 -0800 Subject: [PATCH 1/3] imp: get CW client creation work --- .vscode/settings.json | 3 +- Cargo.lock | 729 ++++++++++++++---- Cargo.toml | 18 +- .../src/contexts/client_ctx.rs | 214 +++-- .../sov-celestia-cw/src/contexts/core_ctx.rs | 15 +- .../src/contexts/definition.rs | 37 +- .../sov-celestia-cw/src/types/client_state.rs | 43 -- .../src/types/consensus_state.rs | 12 + clients/sov-celestia-cw/src/types/mod.rs | 2 - clients/sov-celestia/src/client_state.rs | 8 +- mocks/Cargo.toml | 10 +- modules/sov-ibc/src/query/context.rs | 2 +- 12 files changed, 736 insertions(+), 357 deletions(-) delete mode 100644 clients/sov-celestia-cw/src/types/client_state.rs diff --git a/.vscode/settings.json b/.vscode/settings.json index d610dec8..0f291d3b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,8 @@ { "rust-analyzer.linkedProjects": [ + "./clients/sov-celestia-cw/Cargo.toml", "./ci/risc0-check/methods/guest/Cargo.toml", - "./ci/risc0-check/host/Cargo.toml" + "./ci/risc0-check/host/Cargo.toml", ], "cSpell.words": [ "jsonrpsee", diff --git a/Cargo.lock b/Cargo.lock index b8b52d92..7dac88bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -402,7 +402,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basecoin-app" version = "0.1.0" -source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=c2d12cd#c2d12cdd1142c8b3c0478e8c09d008a4427b0912" +source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=cfee5fc#cfee5fc9dcebf744e59c8e7da9fc7fdf6f0f82dd" dependencies = [ "base64 0.21.7", "basecoin-store", @@ -410,7 +410,7 @@ dependencies = [ "cosmrs", "derive_more", "displaydoc", - "ibc", + "ibc 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "ibc-query", "ics23", @@ -420,7 +420,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.8", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", "tendermint 0.34.0", "tendermint-proto 0.34.0", "tendermint-rpc", @@ -437,7 +437,7 @@ dependencies = [ [[package]] name = "basecoin-store" version = "0.1.0" -source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=c2d12cd#c2d12cdd1142c8b3c0478e8c09d008a4427b0912" +source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=cfee5fc#cfee5fc9dcebf744e59c8e7da9fc7fdf6f0f82dd" dependencies = [ "displaydoc", "ics23", @@ -2167,17 +2167,30 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "ibc" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-apps 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-clients 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-cosmos 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", +] + [[package]] name = "ibc" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ - "ibc-apps", - "ibc-clients", - "ibc-core", - "ibc-core-host-cosmos", - "ibc-derive", - "ibc-primitives", + "ibc-apps 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-clients 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-cosmos 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", ] [[package]] @@ -2186,7 +2199,7 @@ version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ "ibc-app-nft-transfer-types", - "ibc-core", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "serde-json-wasm 1.0.1", ] @@ -2200,7 +2213,7 @@ dependencies = [ "derive_more", "displaydoc", "http 1.0.0", - "ibc-core", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "mime", "parity-scale-codec", @@ -2210,25 +2223,35 @@ dependencies = [ "serde-json-wasm 1.0.1", ] +[[package]] +name = "ibc-app-transfer" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "serde-json-wasm 1.0.1", +] + [[package]] name = "ibc-app-transfer" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ - "ibc-app-transfer-types", - "ibc-core", + "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-transfer-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "primitive-types", "schemars", @@ -2236,13 +2259,51 @@ dependencies = [ "uint", ] +[[package]] +name = "ibc-app-transfer-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +dependencies = [ + "derive_more", + "displaydoc", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-proto", + "primitive-types", + "serde", + "uint", +] + +[[package]] +name = "ibc-apps" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", +] + [[package]] name = "ibc-apps" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ "ibc-app-nft-transfer", - "ibc-app-transfer", + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-client-tendermint" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-client-tendermint-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "serde", + "tendermint 0.34.0", + "tendermint-light-client-verifier", ] [[package]] @@ -2250,15 +2311,32 @@ name = "ibc-client-tendermint" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ - "ibc-client-tendermint-types", - "ibc-core-client", - "ibc-core-commitment-types", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-primitives", + "ibc-client-tendermint-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "serde", + "tendermint 0.34.0", + "tendermint-light-client-verifier", +] + +[[package]] +name = "ibc-client-tendermint-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "displaydoc", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", "serde", "tendermint 0.34.0", "tendermint-light-client-verifier", + "tendermint-proto 0.34.0", ] [[package]] @@ -2267,10 +2345,10 @@ version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "serde", "tendermint 0.34.0", @@ -2281,25 +2359,64 @@ dependencies = [ [[package]] name = "ibc-client-wasm-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "base64 0.21.7", "cosmwasm-schema", "displaydoc", - "ibc-core-client", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "serde", ] +[[package]] +name = "ibc-client-wasm-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +dependencies = [ + "base64 0.21.7", + "displaydoc", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-proto", + "serde", +] + +[[package]] +name = "ibc-clients" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", +] + [[package]] name = "ibc-clients" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ - "ibc-client-tendermint", - "ibc-client-wasm-types", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-core" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-core-channel 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", ] [[package]] @@ -2307,15 +2424,30 @@ name = "ibc-core" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" 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 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-core-channel" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", ] [[package]] @@ -2323,14 +2455,35 @@ name = "ibc-core-channel" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" 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", + "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-core-channel-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "schemars", + "serde", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", ] [[package]] @@ -2341,11 +2494,11 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-connection-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2356,17 +2509,46 @@ dependencies = [ "tendermint 0.34.0", ] +[[package]] +name = "ibc-core-client" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", +] + [[package]] name = "ibc-core-client" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ - "ibc-core-client-context", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-primitives", + "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-core-client-context" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "derive_more", + "displaydoc", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "subtle-encoding", + "tendermint 0.34.0", ] [[package]] @@ -2376,11 +2558,29 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599 dependencies = [ "derive_more", "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-handler-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "subtle-encoding", + "tendermint 0.34.0", +] + +[[package]] +name = "ibc-core-client-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "schemars", + "serde", "subtle-encoding", "tendermint 0.34.0", ] @@ -2393,9 +2593,9 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-commitment-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2405,6 +2605,22 @@ dependencies = [ "tendermint 0.34.0", ] +[[package]] +name = "ibc-core-commitment-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "ics23", + "schemars", + "serde", + "subtle-encoding", +] + [[package]] name = "ibc-core-commitment-types" version = "0.50.0" @@ -2413,7 +2629,7 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-primitives", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "ics23", "parity-scale-codec", @@ -2423,16 +2639,47 @@ dependencies = [ "subtle-encoding", ] +[[package]] +name = "ibc-core-connection" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", +] + [[package]] name = "ibc-core-connection" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ - "ibc-core-client", - "ibc-core-connection-types", - "ibc-core-handler-types", - "ibc-core-host", - "ibc-primitives", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-core-connection-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "schemars", + "serde", + "subtle-encoding", + "tendermint 0.34.0", ] [[package]] @@ -2443,10 +2690,10 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-client-types", - "ibc-core-commitment-types", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2456,19 +2703,56 @@ dependencies = [ "tendermint 0.34.0", ] +[[package]] +name = "ibc-core-handler" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "ibc-core-channel 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", +] + [[package]] name = "ibc-core-handler" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" 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.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", +] + +[[package]] +name = "ibc-core-handler-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "schemars", + "serde", + "subtle-encoding", + "tendermint 0.34.0", ] [[package]] @@ -2479,13 +2763,13 @@ dependencies = [ "borsh", "derive_more", "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-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2495,6 +2779,24 @@ dependencies = [ "tendermint 0.34.0", ] +[[package]] +name = "ibc-core-host" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "derive_more", + "displaydoc", + "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "subtle-encoding", +] + [[package]] name = "ibc-core-host" version = "0.50.0" @@ -2502,17 +2804,40 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599 dependencies = [ "derive_more", "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.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "subtle-encoding", ] +[[package]] +name = "ibc-core-host-cosmos" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "derive_more", + "displaydoc", + "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "serde", + "sha2 0.10.8", + "subtle-encoding", + "tendermint 0.34.0", +] + [[package]] name = "ibc-core-host-cosmos" version = "0.50.0" @@ -2520,15 +2845,15 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599 dependencies = [ "derive_more", "displaydoc", - "ibc-app-transfer-types", - "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-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "serde", "sha2 0.10.8", @@ -2536,6 +2861,19 @@ dependencies = [ "tendermint 0.34.0", ] +[[package]] +name = "ibc-core-host-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "schemars", + "serde", +] + [[package]] name = "ibc-core-host-types" version = "0.50.0" @@ -2544,13 +2882,27 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-primitives", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "parity-scale-codec", "scale-info", "schemars", "serde", ] +[[package]] +name = "ibc-core-router" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "derive_more", + "displaydoc", + "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "subtle-encoding", +] + [[package]] name = "ibc-core-router" version = "0.50.0" @@ -2558,13 +2910,30 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599 dependencies = [ "derive_more", "displaydoc", - "ibc-core-channel-types", - "ibc-core-host-types", - "ibc-core-router-types", - "ibc-primitives", + "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "subtle-encoding", ] +[[package]] +name = "ibc-core-router-types" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-proto", + "schemars", + "serde", + "subtle-encoding", + "tendermint 0.34.0", +] + [[package]] name = "ibc-core-router-types" version = "0.50.0" @@ -2573,8 +2942,8 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-host-types", - "ibc-primitives", + "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2584,6 +2953,16 @@ dependencies = [ "tendermint 0.34.0", ] +[[package]] +name = "ibc-derive" +version = "0.6.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "ibc-derive" version = "0.6.0" @@ -2594,6 +2973,22 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "ibc-primitives" +version = "0.50.0" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" +dependencies = [ + "borsh", + "derive_more", + "displaydoc", + "ibc-proto", + "prost", + "schemars", + "serde", + "tendermint 0.34.0", + "time", +] + [[package]] name = "ibc-primitives" version = "0.50.0" @@ -2636,10 +3031,10 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "displaydoc", - "ibc", + "ibc 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "tonic", ] @@ -2651,7 +3046,7 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599 dependencies = [ "derive_more", "displaydoc", - "ibc", + "ibc 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", "ibc-proto", "parking_lot", "subtle-encoding", @@ -4667,8 +5062,8 @@ name = "sov-celestia-client" version = "0.1.0" dependencies = [ "derive_more", - "ibc-client-tendermint", - "ibc-core", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ics23", "prost", "schemars", @@ -4683,15 +5078,15 @@ dependencies = [ [[package]] name = "sov-celestia-client" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d#961696d9a3d6c6ee5e5a2aeee4414e1e2ae34d68" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" dependencies = [ "derive_more", - "ibc-client-tendermint", - "ibc-core", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ics23", "prost", "serde", - "sov-celestia-client-types 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", + "sov-celestia-client-types 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", "tendermint 0.34.0", "tendermint-light-client-verifier", "tendermint-proto 0.34.0", @@ -4705,9 +5100,9 @@ dependencies = [ "cosmwasm-std", "cosmwasm-vm", "derive_more", - "ibc-client-tendermint", - "ibc-client-wasm-types", - "ibc-core", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "prost", "serde", @@ -4724,8 +5119,8 @@ dependencies = [ "base64 0.21.7", "bytes", "derive_more", - "ibc-client-tendermint", - "ibc-core", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "ics23", "prost", @@ -4739,13 +5134,13 @@ dependencies = [ [[package]] name = "sov-celestia-client-types" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d#961696d9a3d6c6ee5e5a2aeee4414e1e2ae34d68" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" dependencies = [ "base64 0.21.7", "bytes", "derive_more", - "ibc-client-tendermint", - "ibc-core", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-proto", "ics23", "prost", @@ -4796,9 +5191,9 @@ dependencies = [ "anyhow", "borsh", "derive_more", - "ibc-app-transfer", - "ibc-client-tendermint", - "ibc-core", + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-query", "jsonrpsee", "prost", @@ -4819,23 +5214,24 @@ dependencies = [ [[package]] name = "sov-ibc" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d#961696d9a3d6c6ee5e5a2aeee4414e1e2ae34d68" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" dependencies = [ + "ahash 0.8.6", "anyhow", "borsh", "derive_more", - "ibc-app-transfer", - "ibc-client-tendermint", - "ibc-core", + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-query", "jsonrpsee", "prost", "schemars", "serde", "serde_json", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", "sov-chain-state", - "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", + "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -4856,11 +5252,11 @@ dependencies = [ "borsh", "const-rollup-config", "hex", - "ibc-app-transfer", - "ibc-client-tendermint", - "ibc-client-wasm-types", - "ibc-core", - "ibc-core-host-cosmos", + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core-host-cosmos 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "ibc-query", "ibc-testkit", "jmt", @@ -4870,10 +5266,10 @@ dependencies = [ "sha2 0.10.8", "sov-bank", "sov-celestia-adapter", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", "sov-chain-state", - "sov-ibc 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", - "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d)", + "sov-ibc 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", "sov-mock-da", "sov-modules-api", "sov-modules-stf-blueprint", @@ -4901,8 +5297,8 @@ dependencies = [ "anyhow", "base64 0.21.7", "borsh", - "ibc-app-transfer", - "ibc-core", + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "jsonrpsee", "prost", "schemars", @@ -4918,13 +5314,13 @@ dependencies = [ [[package]] name = "sov-ibc-transfer" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=961696d#961696d9a3d6c6ee5e5a2aeee4414e1e2ae34d68" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" dependencies = [ "anyhow", "base64 0.21.7", "borsh", - "ibc-app-transfer", - "ibc-core", + "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", "jsonrpsee", "prost", "schemars", @@ -5642,7 +6038,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.4", + "toml_edit 0.22.5", ] [[package]] @@ -5662,20 +6058,20 @@ checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap 2.2.3", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" dependencies = [ "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.1", ] [[package]] @@ -6527,6 +6923,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" diff --git a/Cargo.toml b/Cargo.toml index 0cd699f7..ba773b1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,15 +40,15 @@ tempfile = "3.5" thiserror = "1.0.38" # ibc depedenencies -ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false, features = ["borsh","schema","serde"] } -ibc-core-client = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-core-host-cosmos = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-client-tendermint = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-client-wasm-types = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-app-transfer = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } -ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } +ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false, features = ["borsh","schema","serde"] } +ibc-core-client = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-core-host-cosmos = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-client-tendermint = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-client-wasm-types = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-app-transfer = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } +ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } ibc-proto = { git = "https://github.com/cosmos/ibc-proto-rs.git", rev = "d1daaab", default-features = false } # cosmos dependencies diff --git a/clients/sov-celestia-cw/src/contexts/client_ctx.rs b/clients/sov-celestia-cw/src/contexts/client_ctx.rs index 8eec9d29..6f8e0ef6 100644 --- a/clients/sov-celestia-cw/src/contexts/client_ctx.rs +++ b/clients/sov-celestia-cw/src/contexts/client_ctx.rs @@ -3,14 +3,16 @@ use ibc_core::client::types::error::ClientError; use ibc_core::client::types::Height; use ibc_core::handler::types::error::ContextError; use ibc_core::host::types::identifiers::ClientId; -use ibc_core::host::types::path::{ClientConsensusStatePath, ClientStatePath}; +use ibc_core::host::types::path::{ + iteration_key, ClientConsensusStatePath, ClientStatePath, ClientUpdateHeightPath, + ClientUpdateTimePath, +}; use ibc_core::host::ValidationContext; -use ibc_core::primitives::proto::Any; use ibc_core::primitives::Timestamp; +use sov_celestia_client::client_state::ClientState; -use super::definition::StorageMut; -use super::{Context, StorageRef}; -use crate::types::{AnyClientState, AnyConsensusState, ProcessedStates, ReadonlyProcessedStates}; +use super::Context; +use crate::types::AnyConsensusState; impl ClientValidationContext for Context<'_> { fn update_meta( @@ -18,8 +20,46 @@ impl ClientValidationContext for Context<'_> { client_id: &ClientId, height: &Height, ) -> Result<(Timestamp, Height), ContextError> { - let timestamp = client_update_time(self, client_id, height)?; - let height = client_update_height(self, client_id, height)?; + let client_update_time_path = ClientUpdateTimePath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); + + let path_vec = client_update_time_path.leaf().into_bytes(); + + let timestamp = self + .retrieve(path_vec) + .map(|timestamp| u64::from_be_bytes(timestamp.try_into().expect("invalid timestamp"))); + + let timestamp = match timestamp { + Some(time) => { + Timestamp::from_nanoseconds(time).map_err(ClientError::InvalidPacketTimestamp)? + } + None => Err(ClientError::Other { + description: "problem getting processed time".to_string(), + })?, + }; + + let client_update_height_path = ClientUpdateHeightPath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); + + let path_vec = client_update_height_path.leaf().into_bytes(); + + let revision_height = self + .retrieve(path_vec) + .map(|height| u64::from_be_bytes(height.try_into().expect("invalid height"))); + + let height = match revision_height { + Some(h) => Height::new(0, h)?, + None => Err(ClientError::Other { + description: "problem getting processed time".to_string(), + })?, + }; + Ok((timestamp, height)) } } @@ -31,10 +71,16 @@ impl ClientExecutionContext for Context<'_> { fn store_client_state( &mut self, - client_state_path: ClientStatePath, - client_state: AnyClientState, + _client_state_path: ClientStatePath, + client_state: ClientState, ) -> Result<(), ContextError> { - store_client_state(self, client_state_path, client_state) + let key = ClientStatePath::leaf().into_bytes(); + + let encoded_client_state = self.encode_client_state(client_state)?; + + self.insert(key, encoded_client_state); + + Ok(()) } fn store_consensus_state( @@ -42,7 +88,13 @@ impl ClientExecutionContext for Context<'_> { consensus_state_path: ClientConsensusStatePath, consensus_state: AnyConsensusState, ) -> Result<(), ContextError> { - store_consensus_state(self, consensus_state_path, consensus_state) + let key = consensus_state_path.leaf().into_bytes(); + + let encoded_consensus_state = consensus_state.encode(); + + self.insert(key, encoded_consensus_state); + + Ok(()) } fn delete_consensus_state( @@ -59,8 +111,37 @@ impl ClientExecutionContext for Context<'_> { host_timestamp: Timestamp, host_height: Height, ) -> Result<(), ContextError> { - store_update_time(self, client_id.clone(), height, host_timestamp)?; - store_update_height(self, client_id, height, host_height) + let client_update_time_path = ClientUpdateTimePath::new( + client_id.clone(), + height.revision_number(), + height.revision_height(), + ); + + let path_vec = client_update_time_path.leaf().into_bytes(); + + let time_vec: [u8; 8] = host_timestamp.nanoseconds().to_be_bytes(); + + self.insert(path_vec, time_vec); + + let client_update_height_path = ClientUpdateHeightPath::new( + client_id, + height.revision_number(), + height.revision_height(), + ); + + let path_vec = client_update_height_path.leaf().into_bytes(); + + let revision_height_vec: [u8; 8] = host_height.revision_height().to_be_bytes(); + + self.insert(path_vec, revision_height_vec); + + let iteration_key = iteration_key(height.revision_number(), height.revision_height()); + + let height_vec = height.to_string().into_bytes(); + + self.insert(iteration_key, height_vec); + + Ok(()) } fn delete_update_meta( @@ -71,110 +152,3 @@ impl ClientExecutionContext for Context<'_> { todo!() } } - -fn client_update_time( - ctx: &Ctx, - _client_id: &ClientId, - height: &Height, -) -> Result -where - Ctx: ClientValidationContext + StorageRef, -{ - let processed_state = ReadonlyProcessedStates::new(ctx.storage_ref()); - let timestamp = match processed_state.get_processed_time(*height, &mut Vec::new()) { - Some(time) => { - Timestamp::from_nanoseconds(time).map_err(ClientError::InvalidPacketTimestamp)? - } - None => Err(ClientError::Other { - description: "problem getting processed time".to_string(), - })?, - }; - - Ok(timestamp) -} - -fn client_update_height( - ctx: &Ctx, - _client_id: &ClientId, - height: &Height, -) -> Result -where - Ctx: ClientValidationContext + StorageRef, -{ - let processed_state = ReadonlyProcessedStates::new(ctx.storage_ref()); - - let height = match processed_state.get_processed_height(*height, &mut Vec::new()) { - Some(h) => Height::new(0, h)?, - None => Err(ClientError::Other { - description: "problem getting processed time".to_string(), - })?, - }; - - Ok(height) -} - -fn store_client_state( - ctx: &mut Ctx, - client_state_path: ClientStatePath, - client_state: AnyClientState, -) -> Result<(), ContextError> -where - Ctx: ClientExecutionContext + StorageMut, -{ - let client_state_value = Any::from(client_state).value; - - ctx.storage_mut().set( - client_state_path.to_string().as_bytes(), - client_state_value.as_slice(), - ); - - Ok(()) -} - -fn store_consensus_state( - ctx: &mut Ctx, - consensus_state_path: ClientConsensusStatePath, - consensus_state: AnyConsensusState, -) -> Result<(), ContextError> -where - Ctx: ClientExecutionContext + StorageMut, -{ - let consensus_state_value = Any::from(consensus_state).value; - - ctx.storage_mut().set( - consensus_state_path.to_string().as_bytes(), - consensus_state_value.as_slice(), - ); - - Ok(()) -} - -fn store_update_time( - ctx: &mut Ctx, - _client_id: ClientId, - height: Height, - timestamp: Timestamp, -) -> Result<(), ContextError> -where - Ctx: ClientExecutionContext + StorageMut, -{ - let mut processed_state = ProcessedStates::new(ctx.storage_mut()); - processed_state.set_processed_time(height, timestamp.nanoseconds(), &mut Vec::new()); - - Ok(()) -} - -fn store_update_height( - ctx: &mut Ctx, - _client_id: ClientId, - height: Height, - host_height: Height, -) -> Result<(), ContextError> -where - Ctx: ClientExecutionContext + StorageMut, -{ - let mut processed_state = ProcessedStates::new(ctx.storage_mut()); - processed_state.set_processed_height(height, host_height.revision_height(), &mut Vec::new()); - processed_state.set_iteration_key(height, &mut Vec::new()); - Ok(()) -} diff --git a/clients/sov-celestia-cw/src/contexts/core_ctx.rs b/clients/sov-celestia-cw/src/contexts/core_ctx.rs index 7aac91f7..adaabba3 100644 --- a/clients/sov-celestia-cw/src/contexts/core_ctx.rs +++ b/clients/sov-celestia-cw/src/contexts/core_ctx.rs @@ -17,19 +17,20 @@ use ibc_core::host::types::path::{ use ibc_core::host::{ExecutionContext, ValidationContext}; use ibc_core::primitives::proto::{Any, Protobuf}; use ibc_core::primitives::{Signer, Timestamp}; +use sov_celestia_client::client_state::ClientState; use sov_celestia_client::types::client_state::SOV_TENDERMINT_CLIENT_STATE_TYPE_URL; use sov_celestia_client::types::proto::v1::{ ClientState as RawClientState, ConsensusState as RawConsensusState, }; use super::{Context, StorageRef}; -use crate::types::{AnyClientState, AnyConsensusState}; +use crate::types::AnyConsensusState; impl ValidationContext for Context<'_> { type V = Self; type E = Self; type AnyConsensusState = AnyConsensusState; - type AnyClientState = AnyClientState; + type AnyClientState = ClientState; fn get_client_validation_context(&self) -> &Self::V { self @@ -256,11 +257,11 @@ impl ExecutionContext for Context<'_> { } } -pub fn client_state(ctx: &Ctx, client_id: &ClientId) -> Result +pub fn client_state(ctx: &Ctx, client_id: &ClientId) -> Result where Ctx: ValidationContext + StorageRef, { - let client_state_path = ClientStatePath::new(client_id).to_string(); + let client_state_path = ClientStatePath::new(client_id.clone()).to_string(); let client_state_value = ctx.storage_ref() @@ -274,10 +275,10 @@ where description: e.to_string(), })?; - Ok(AnyClientState::Sovereign(sov_client_state)) + Ok(sov_client_state) } -fn decode_client_state(_ctx: &Ctx, client_state: Any) -> Result +fn decode_client_state(_ctx: &Ctx, client_state: Any) -> Result where Ctx: ValidationContext + StorageRef, { @@ -290,7 +291,7 @@ where } })?; - Ok(AnyClientState::Sovereign(sov_client_state)) + Ok(sov_client_state) } _ => Err(ClientError::Other { description: "Client state type not supported".to_string(), diff --git a/clients/sov-celestia-cw/src/contexts/definition.rs b/clients/sov-celestia-cw/src/contexts/definition.rs index 94cd2bf5..39db51a2 100644 --- a/clients/sov-celestia-cw/src/contexts/definition.rs +++ b/clients/sov-celestia-cw/src/contexts/definition.rs @@ -1,10 +1,12 @@ use std::str::FromStr; use cosmwasm_std::{to_json_binary, Binary, Deps, DepsMut, Env, Storage}; +use ibc_client_wasm_types::client_state::ClientState as WasmClientState; use ibc_core::client::context::client_state::{ ClientStateCommon, ClientStateExecution, ClientStateValidation, }; use ibc_core::client::context::consensus_state::ConsensusState as _; +use ibc_core::client::types::error::ClientError; use ibc_core::client::types::UpdateKind; use ibc_core::handler::types::error::ContextError; use ibc_core::host::types::error::IdentifierError; @@ -23,12 +25,15 @@ use crate::types::{ VerifyNonMembershipMsg, VerifyUpgradeAndUpdateStateMsg, }; +pub type Checksum = Vec; + /// Context is a wrapper around the deps and env that gives access to the /// methods of the ibc-rs Validation and Execution traits. pub struct Context<'a> { deps: Option>, deps_mut: Option>, env: Env, + checksum: Option, } impl<'a> Context<'a> { @@ -37,6 +42,7 @@ impl<'a> Context<'a> { deps: Some(deps), deps_mut: None, env, + checksum: None, } } @@ -45,6 +51,7 @@ impl<'a> Context<'a> { deps: None, deps_mut: Some(deps), env, + checksum: None, } } @@ -60,16 +67,40 @@ impl<'a> Context<'a> { ClientId::from_str(self.env.contract.address.as_str()) } - pub fn instantiate(&mut self, msg: InstantiateMsg) -> Result { - let client_id = self.client_id()?; + pub fn set_checksum(&mut self, checksum: Checksum) { + self.checksum = Some(checksum); + } + + pub fn retrieve(&self, key: impl AsRef<[u8]>) -> Option> { + self.storage_ref().get(key.as_ref()) + } + + pub fn insert(&mut self, key: impl AsRef<[u8]>, value: impl AsRef<[u8]>) { + self.storage_mut().set(key.as_ref(), value.as_ref()); + } + + pub fn encode_client_state(&self, client_state: ClientState) -> Result, ClientError> { + let wasm_client_state = WasmClientState { + data: Any::from(client_state.clone()).encode_to_vec(), + checksum: self.checksum.clone().ok_or(ClientError::Other { + description: "checksum not set".to_string(), + })?, + latest_height: client_state.latest_height(), + }; + Ok(Any::from(wasm_client_state).encode_to_vec()) + } + + pub fn instantiate(&mut self, msg: InstantiateMsg) -> Result { let any = Any::decode(&mut msg.client_state.as_slice())?; let client_state = ClientState::try_from(any)?; let any_consensus_state = Any::decode(&mut msg.consensus_state.as_slice())?; - client_state.initialise(self, &client_id, any_consensus_state)?; + self.set_checksum(msg.checksum); + + client_state.initialise(self, &self.client_id()?, any_consensus_state)?; Ok(to_json_binary(&ContractResult::success())?) } diff --git a/clients/sov-celestia-cw/src/types/client_state.rs b/clients/sov-celestia-cw/src/types/client_state.rs deleted file mode 100644 index 6b702ff1..00000000 --- a/clients/sov-celestia-cw/src/types/client_state.rs +++ /dev/null @@ -1,43 +0,0 @@ -use ibc_core::client::types::error::ClientError; -use ibc_core::derive::ClientState as ClientStateDerive; -use ibc_core::primitives::proto::{Any, Protobuf}; -use sov_celestia_client::client_state::ClientState; -use sov_celestia_client::types::client_state::{ - ClientState as ClientStateType, SOV_TENDERMINT_CLIENT_STATE_TYPE_URL, -}; - -use crate::contexts::Context; - -#[derive(ClientStateDerive, Debug, derive_more::From)] -#[validation(Context<'a>)] -#[execution(Context<'a>)] -pub enum AnyClientState { - Sovereign(ClientState), -} - -impl TryFrom for ClientState { - type Error = ClientError; - - fn try_from(value: AnyClientState) -> Result { - match value { - AnyClientState::Sovereign(state) => Ok(state), - } - } -} - -impl From for AnyClientState { - fn from(value: ClientStateType) -> Self { - AnyClientState::Sovereign(ClientState::from(value)) - } -} - -impl From for Any { - fn from(value: AnyClientState) -> Self { - match value { - AnyClientState::Sovereign(cs) => Any { - type_url: SOV_TENDERMINT_CLIENT_STATE_TYPE_URL.to_string(), - value: Protobuf::::encode_vec(cs), - }, - } - } -} diff --git a/clients/sov-celestia-cw/src/types/consensus_state.rs b/clients/sov-celestia-cw/src/types/consensus_state.rs index 17285e18..116967d2 100644 --- a/clients/sov-celestia-cw/src/types/consensus_state.rs +++ b/clients/sov-celestia-cw/src/types/consensus_state.rs @@ -1,6 +1,8 @@ +use ibc_client_wasm_types::consensus_state::ConsensusState as WasmConsensusState; use ibc_core::client::types::error::ClientError; use ibc_core::derive::ConsensusState as ConsensusStateDerive; use ibc_core::primitives::proto::{Any, Protobuf}; +use prost::Message; use sov_celestia_client::consensus_state::ConsensusState; use sov_celestia_client::types::consensus_state::SOV_TENDERMINT_CONSENSUS_STATE_TYPE_URL; @@ -9,6 +11,16 @@ pub enum AnyConsensusState { Sovereign(ConsensusState), } +impl AnyConsensusState { + pub fn encode(self) -> Vec { + let encoded_cs = Any::from(self).encode_to_vec(); + + let wasm_consensus_state = WasmConsensusState::new(encoded_cs); + + Any::from(wasm_consensus_state).encode_to_vec() + } +} + impl TryFrom for ConsensusState { type Error = ClientError; diff --git a/clients/sov-celestia-cw/src/types/mod.rs b/clients/sov-celestia-cw/src/types/mod.rs index eec974b7..bc8d32af 100644 --- a/clients/sov-celestia-cw/src/types/mod.rs +++ b/clients/sov-celestia-cw/src/types/mod.rs @@ -1,11 +1,9 @@ -mod client_state; mod consensus_state; mod error; mod msgs; mod processed_states; mod response; -pub use client_state::*; pub use consensus_state::*; pub use error::*; pub use msgs::*; diff --git a/clients/sov-celestia/src/client_state.rs b/clients/sov-celestia/src/client_state.rs index 83010c1b..69147816 100644 --- a/clients/sov-celestia/src/client_state.rs +++ b/clients/sov-celestia/src/client_state.rs @@ -226,7 +226,7 @@ where let sov_consensus_state = ConsensusState::try_from(consensus_state)?; - ctx.store_client_state(ClientStatePath::new(client_id), self.clone().into())?; + ctx.store_client_state(ClientStatePath::new(client_id.clone()), self.clone().into())?; ctx.store_consensus_state( ClientConsensusStatePath::new( client_id.clone(), @@ -286,7 +286,7 @@ where ConsensusState::from(new_consensus_state).into(), )?; ctx.store_client_state( - ClientStatePath::new(client_id), + ClientStatePath::new(client_id.clone()), ClientState::from(new_client_state).into(), )?; ctx.store_update_meta( @@ -311,7 +311,7 @@ where let wrapped_frozen_client_state = ClientState::from(frozen_client_state); ctx.store_client_state( - ClientStatePath::new(client_id), + ClientStatePath::new(client_id.clone()), wrapped_frozen_client_state.into(), )?; @@ -367,7 +367,7 @@ where let host_height = CommonContext::host_height(ctx)?; ctx.store_client_state( - ClientStatePath::new(client_id), + ClientStatePath::new(client_id.clone()), ClientState::from(new_client_state).into(), )?; ctx.store_consensus_state( diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml index b5d04ee2..c6a847de 100644 --- a/mocks/Cargo.toml +++ b/mocks/Cargo.toml @@ -29,9 +29,9 @@ tracing = "0.1.36" typed-builder = "0.18.0" # internal dependencies -sov-ibc = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "961696d" } -sov-ibc-transfer = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "961696d" } -sov-celestia-client = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "961696d" } +sov-ibc = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "10f53c1" } +sov-ibc-transfer = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "10f53c1" } +sov-celestia-client = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "10f53c1" } # ibc dependencies ibc-core = { workspace = true } @@ -43,8 +43,8 @@ ibc-query = { workspace = true } ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } # cosmos dependencies -basecoin-app = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "c2d12cd" } -basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "c2d12cd" } +basecoin-app = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "cfee5fc" } +basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "cfee5fc" } tendermint = { workspace = true } tendermint-testgen = { workspace = true } diff --git a/modules/sov-ibc/src/query/context.rs b/modules/sov-ibc/src/query/context.rs index aab69a69..924a510f 100644 --- a/modules/sov-ibc/src/query/context.rs +++ b/modules/sov-ibc/src/query/context.rs @@ -118,7 +118,7 @@ where .ibc .client_connections_map .get( - &ClientConnectionPath::new(client_id), + &ClientConnectionPath::new(client_id.clone()), *self.working_set.borrow_mut(), ) .ok_or(ConnectionError::Other { From 396c9e755c294b3d31b3b8faeffce12e3308af76 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Thu, 15 Feb 2024 09:24:10 -0800 Subject: [PATCH 2/3] deps: update ibc related revisions in sov-ibc-mocks --- Cargo.lock | 709 +++++++++++------------------------------------ mocks/Cargo.toml | 12 +- 2 files changed, 163 insertions(+), 558 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7dac88bb..920916e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -402,7 +402,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basecoin-app" version = "0.1.0" -source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=cfee5fc#cfee5fc9dcebf744e59c8e7da9fc7fdf6f0f82dd" +source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=e5928d0#e5928d0856281917b7d6f95873bc1d39ae703b8b" dependencies = [ "base64 0.21.7", "basecoin-store", @@ -410,7 +410,7 @@ dependencies = [ "cosmrs", "derive_more", "displaydoc", - "ibc 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc", "ibc-proto", "ibc-query", "ics23", @@ -420,7 +420,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.8", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", "tendermint 0.34.0", "tendermint-proto 0.34.0", "tendermint-rpc", @@ -437,7 +437,7 @@ dependencies = [ [[package]] name = "basecoin-store" version = "0.1.0" -source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=cfee5fc#cfee5fc9dcebf744e59c8e7da9fc7fdf6f0f82dd" +source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=e5928d0#e5928d0856281917b7d6f95873bc1d39ae703b8b" dependencies = [ "displaydoc", "ics23", @@ -2172,48 +2172,35 @@ name = "ibc" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-apps 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-clients 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-cosmos 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-apps 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-clients 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-cosmos 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-apps", + "ibc-clients", + "ibc-core", + "ibc-core-host-cosmos", + "ibc-derive", + "ibc-primitives", ] [[package]] name = "ibc-app-nft-transfer" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "ibc-app-nft-transfer-types", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core", "serde-json-wasm 1.0.1", ] [[package]] name = "ibc-app-nft-transfer-types" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "base64 0.21.7", "borsh", "derive_more", "displaydoc", "http 1.0.0", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core", "ibc-proto", "mime", "parity-scale-codec", @@ -2228,18 +2215,8 @@ name = "ibc-app-transfer" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "serde-json-wasm 1.0.1", -] - -[[package]] -name = "ibc-app-transfer" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-app-transfer-types", + "ibc-core", "serde-json-wasm 1.0.1", ] @@ -2251,7 +2228,7 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-core", "ibc-proto", "primitive-types", "schemars", @@ -2259,35 +2236,13 @@ dependencies = [ "uint", ] -[[package]] -name = "ibc-app-transfer-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "derive_more", - "displaydoc", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-proto", - "primitive-types", - "serde", - "uint", -] - [[package]] name = "ibc-apps" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" -dependencies = [ - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-apps" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ "ibc-app-nft-transfer", - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-app-transfer", ] [[package]] @@ -2295,28 +2250,12 @@ name = "ibc-client-tendermint" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-client-tendermint-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "serde", - "tendermint 0.34.0", - "tendermint-light-client-verifier", -] - -[[package]] -name = "ibc-client-tendermint" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-client-tendermint-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-client-tendermint-types", + "ibc-core-client", + "ibc-core-commitment-types", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-primitives", "serde", "tendermint 0.34.0", "tendermint-light-client-verifier", @@ -2328,27 +2267,10 @@ version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "serde", - "tendermint 0.34.0", - "tendermint-light-client-verifier", - "tendermint-proto 0.34.0", -] - -[[package]] -name = "ibc-client-tendermint-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-host-types", + "ibc-primitives", "ibc-proto", "serde", "tendermint 0.34.0", @@ -2364,23 +2286,9 @@ dependencies = [ "base64 0.21.7", "cosmwasm-schema", "displaydoc", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "serde", -] - -[[package]] -name = "ibc-client-wasm-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "base64 0.21.7", - "displaydoc", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client", + "ibc-core-host-types", + "ibc-primitives", "ibc-proto", "serde", ] @@ -2390,17 +2298,8 @@ name = "ibc-clients" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-clients" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-client-tendermint", + "ibc-client-wasm-types", ] [[package]] @@ -2408,31 +2307,15 @@ name = "ibc-core" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-core-channel 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-core" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-core-channel 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-derive 0.6.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "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]] @@ -2440,29 +2323,14 @@ name = "ibc-core-channel" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-core-channel" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "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]] @@ -2473,32 +2341,11 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "schemars", - "serde", - "sha2 0.10.8", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-channel-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "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", @@ -2514,25 +2361,12 @@ name = "ibc-core-client" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-core-client" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-context", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-primitives", ] [[package]] @@ -2542,27 +2376,11 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae dependencies = [ "derive_more", "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-client-context" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "derive_more", - "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-handler-types", + "ibc-core-host-types", + "ibc-primitives", "subtle-encoding", "tendermint 0.34.0", ] @@ -2575,27 +2393,9 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "schemars", - "serde", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-client-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-commitment-types", + "ibc-core-host-types", + "ibc-primitives", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2613,23 +2413,7 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "ics23", - "schemars", - "serde", - "subtle-encoding", -] - -[[package]] -name = "ibc-core-commitment-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives", "ibc-proto", "ics23", "parity-scale-codec", @@ -2644,23 +2428,11 @@ name = "ibc-core-connection" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-core-connection" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client", + "ibc-core-connection-types", + "ibc-core-handler-types", + "ibc-core-host", + "ibc-primitives", ] [[package]] @@ -2671,29 +2443,10 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "schemars", - "serde", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-connection-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-client-types", + "ibc-core-commitment-types", + "ibc-core-host-types", + "ibc-primitives", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2708,29 +2461,14 @@ name = "ibc-core-handler" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ - "ibc-core-channel 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", -] - -[[package]] -name = "ibc-core-handler" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "ibc-core-channel 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-router 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "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]] @@ -2741,35 +2479,13 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "schemars", - "serde", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-handler-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "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", @@ -2786,32 +2502,14 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae dependencies = [ "derive_more", "displaydoc", - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "subtle-encoding", -] - -[[package]] -name = "ibc-core-host" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "derive_more", - "displaydoc", - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "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", ] @@ -2822,38 +2520,15 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae dependencies = [ "derive_more", "displaydoc", - "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "serde", - "sha2 0.10.8", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-host-cosmos" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "derive_more", - "displaydoc", - "ibc-app-transfer-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client-context 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-client-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-commitment-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-connection-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-handler-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-app-transfer-types", + "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", "serde", "sha2 0.10.8", @@ -2869,20 +2544,7 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "schemars", - "serde", -] - -[[package]] -name = "ibc-core-host-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-primitives", "parity-scale-codec", "scale-info", "schemars", @@ -2896,24 +2558,10 @@ source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae dependencies = [ "derive_more", "displaydoc", - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "subtle-encoding", -] - -[[package]] -name = "ibc-core-router" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "derive_more", - "displaydoc", - "ibc-core-channel-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-core-router-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-channel-types", + "ibc-core-host-types", + "ibc-core-router-types", + "ibc-primitives", "subtle-encoding", ] @@ -2925,25 +2573,8 @@ dependencies = [ "borsh", "derive_more", "displaydoc", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-proto", - "schemars", - "serde", - "subtle-encoding", - "tendermint 0.34.0", -] - -[[package]] -name = "ibc-core-router-types" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-core-host-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", - "ibc-primitives 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc-core-host-types", + "ibc-primitives", "ibc-proto", "parity-scale-codec", "scale-info", @@ -2963,36 +2594,10 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "ibc-derive" -version = "0.6.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "ibc-primitives" version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" -dependencies = [ - "borsh", - "derive_more", - "displaydoc", - "ibc-proto", - "prost", - "schemars", - "serde", - "tendermint 0.34.0", - "time", -] - -[[package]] -name = "ibc-primitives" -version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" dependencies = [ "borsh", "derive_more", @@ -3034,7 +2639,7 @@ version = "0.50.0" source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "displaydoc", - "ibc 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc", "ibc-proto", "tonic", ] @@ -3042,11 +2647,11 @@ dependencies = [ [[package]] name = "ibc-testkit" version = "0.50.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868#b25d7d88687599e7b457471c55965b73d8cbe177" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c#74c316c36c8dae87a44f04627e0fb223c3805e3d" dependencies = [ "derive_more", "displaydoc", - "ibc 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=b25d7d8868)", + "ibc", "ibc-proto", "parking_lot", "subtle-encoding", @@ -5062,8 +4667,8 @@ name = "sov-celestia-client" version = "0.1.0" dependencies = [ "derive_more", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint", + "ibc-core", "ics23", "prost", "schemars", @@ -5078,15 +4683,15 @@ dependencies = [ [[package]] name = "sov-celestia-client" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" dependencies = [ "derive_more", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint", + "ibc-core", "ics23", "prost", "serde", - "sov-celestia-client-types 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-celestia-client-types 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", "tendermint 0.34.0", "tendermint-light-client-verifier", "tendermint-proto 0.34.0", @@ -5100,9 +4705,9 @@ dependencies = [ "cosmwasm-std", "cosmwasm-vm", "derive_more", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint", + "ibc-client-wasm-types", + "ibc-core", "ibc-proto", "prost", "serde", @@ -5119,8 +4724,8 @@ dependencies = [ "base64 0.21.7", "bytes", "derive_more", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint", + "ibc-core", "ibc-proto", "ics23", "prost", @@ -5134,13 +4739,13 @@ dependencies = [ [[package]] name = "sov-celestia-client-types" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" dependencies = [ "base64 0.21.7", "bytes", "derive_more", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-client-tendermint", + "ibc-core", "ibc-proto", "ics23", "prost", @@ -5191,9 +4796,9 @@ dependencies = [ "anyhow", "borsh", "derive_more", - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-app-transfer", + "ibc-client-tendermint", + "ibc-core", "ibc-query", "jsonrpsee", "prost", @@ -5214,24 +4819,24 @@ dependencies = [ [[package]] name = "sov-ibc" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" dependencies = [ "ahash 0.8.6", "anyhow", "borsh", "derive_more", - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-app-transfer", + "ibc-client-tendermint", + "ibc-core", "ibc-query", "jsonrpsee", "prost", "schemars", "serde", "serde_json", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", "sov-chain-state", - "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -5252,11 +4857,11 @@ dependencies = [ "borsh", "const-rollup-config", "hex", - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-tendermint 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-client-wasm-types 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core-host-cosmos 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-app-transfer", + "ibc-client-tendermint", + "ibc-client-wasm-types", + "ibc-core", + "ibc-core-host-cosmos", "ibc-query", "ibc-testkit", "jmt", @@ -5266,10 +4871,10 @@ dependencies = [ "sha2 0.10.8", "sov-bank", "sov-celestia-adapter", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", "sov-chain-state", - "sov-ibc 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", - "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1)", + "sov-ibc 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", + "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", "sov-mock-da", "sov-modules-api", "sov-modules-stf-blueprint", @@ -5297,8 +4902,8 @@ dependencies = [ "anyhow", "base64 0.21.7", "borsh", - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-app-transfer", + "ibc-core", "jsonrpsee", "prost", "schemars", @@ -5314,13 +4919,13 @@ dependencies = [ [[package]] name = "sov-ibc-transfer" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=10f53c1#10f53c15ac27de2e97467bc5e177f346145f16be" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" dependencies = [ "anyhow", "base64 0.21.7", "borsh", - "ibc-app-transfer 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", - "ibc-core 0.50.0 (git+https://github.com/cosmos/ibc-rs.git?rev=74c316c36c)", + "ibc-app-transfer", + "ibc-core", "jsonrpsee", "prost", "schemars", diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml index c6a847de..4223b672 100644 --- a/mocks/Cargo.toml +++ b/mocks/Cargo.toml @@ -29,9 +29,9 @@ tracing = "0.1.36" typed-builder = "0.18.0" # internal dependencies -sov-ibc = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "10f53c1" } -sov-ibc-transfer = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "10f53c1" } -sov-celestia-client = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "10f53c1" } +sov-ibc = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "063fb9c" } +sov-ibc-transfer = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "063fb9c" } +sov-celestia-client = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "063fb9c" } # ibc dependencies ibc-core = { workspace = true } @@ -40,11 +40,11 @@ ibc-client-tendermint = { workspace = true } ibc-client-wasm-types = { workspace = true, features = ["cosmwasm"] } ibc-core-host-cosmos = { workspace = true } ibc-query = { workspace = true } -ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "b25d7d8868", default-features = false } +ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } # cosmos dependencies -basecoin-app = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "cfee5fc" } -basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "cfee5fc" } +basecoin-app = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "e5928d0" } +basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "e5928d0" } tendermint = { workspace = true } tendermint-testgen = { workspace = true } From 68b2ec57d8e5dfe7007c7932bea8c52fa8e34657 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Thu, 15 Feb 2024 09:30:34 -0800 Subject: [PATCH 3/3] deps: update sov-ibc revs in mocks --- Cargo.lock | 29 ++++++++++++++++------------- mocks/Cargo.toml | 10 +++++----- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72967a4a..1236990e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -402,7 +402,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basecoin-app" version = "0.1.0" -source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=e5928d0#e5928d0856281917b7d6f95873bc1d39ae703b8b" +source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=4de5278#4de5278cf8bec4399d0104130f9cbee27bd27a67" dependencies = [ "base64 0.21.7", "basecoin-store", @@ -420,7 +420,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.8", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", "tendermint 0.34.0", "tendermint-proto 0.34.0", "tendermint-rpc", @@ -437,7 +437,7 @@ dependencies = [ [[package]] name = "basecoin-store" version = "0.1.0" -source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=e5928d0#e5928d0856281917b7d6f95873bc1d39ae703b8b" +source = "git+https://github.com/informalsystems/basecoin-rs.git?rev=4de5278#4de5278cf8bec4399d0104130f9cbee27bd27a67" dependencies = [ "displaydoc", "ics23", @@ -4693,7 +4693,7 @@ dependencies = [ [[package]] name = "sov-celestia-client" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee#01ed4ee9928d7119c24284a6694916924d332c1d" dependencies = [ "derive_more", "ibc-client-tendermint", @@ -4701,7 +4701,7 @@ dependencies = [ "ics23", "prost", "serde", - "sov-celestia-client-types 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", + "sov-celestia-client-types 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", "tendermint 0.34.0", "tendermint-light-client-verifier", "tendermint-proto 0.34.0", @@ -4752,12 +4752,14 @@ dependencies = [ [[package]] name = "sov-celestia-client-types" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee#01ed4ee9928d7119c24284a6694916924d332c1d" dependencies = [ "base64 0.21.7", "bytes", "derive_more", + "hex", "ibc-client-tendermint", + "ibc-client-wasm-types", "ibc-core", "ibc-proto", "ics23", @@ -4766,6 +4768,7 @@ dependencies = [ "tendermint 0.34.0", "tendermint-light-client-verifier", "tendermint-proto 0.34.0", + "typed-builder", ] [[package]] @@ -4832,7 +4835,7 @@ dependencies = [ [[package]] name = "sov-ibc" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee#01ed4ee9928d7119c24284a6694916924d332c1d" dependencies = [ "ahash 0.8.6", "anyhow", @@ -4847,9 +4850,9 @@ dependencies = [ "schemars", "serde", "serde_json", - "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", "sov-chain-state", - "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", + "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -4882,10 +4885,10 @@ dependencies = [ "sha2 0.10.8", "sov-bank", "sov-celestia-adapter", - "sov-celestia-client 0.1.0", + "sov-celestia-client 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", "sov-chain-state", - "sov-ibc 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", - "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c)", + "sov-ibc 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", + "sov-ibc-transfer 0.1.0 (git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee)", "sov-mock-da", "sov-modules-api", "sov-modules-stf-blueprint", @@ -4930,7 +4933,7 @@ dependencies = [ [[package]] name = "sov-ibc-transfer" version = "0.1.0" -source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=063fb9c#063fb9cddc8f79ef7023fa7da13cc779b867d2e5" +source = "git+https://github.com/informalsystems/sovereign-ibc.git?rev=01ed4ee#01ed4ee9928d7119c24284a6694916924d332c1d" dependencies = [ "anyhow", "base64 0.21.7", diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml index ed75483c..c0e4673f 100644 --- a/mocks/Cargo.toml +++ b/mocks/Cargo.toml @@ -28,9 +28,9 @@ tracing = "0.1.36" typed-builder = "0.18.0" # internal dependencies -sov-ibc = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "063fb9c" } -sov-ibc-transfer = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "063fb9c" } -sov-celestia-client = { path = "../clients/sov-celestia", features = ["test-util"] } +sov-ibc = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "01ed4ee" } +sov-ibc-transfer = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "01ed4ee" } +sov-celestia-client = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "01ed4ee", features = ["test-util"] } # ibc dependencies ibc-core = { workspace = true } @@ -41,8 +41,8 @@ ibc-query = { workspace = true } ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "74c316c36c", default-features = false } # cosmos dependencies -basecoin-app = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "e5928d0" } -basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "e5928d0" } +basecoin-app = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "4de5278" } +basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "4de5278" } tendermint = { workspace = true } tendermint-testgen = { workspace = true }