Merge branch 'main' into luca_joss/demo-cli-send-packet-to-ics20

informalsystems · Jan 28, 2025 · aa9fac1 · aa9fac1
2 parents a105d20 + 34457fa
commit aa9fac1
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 117 deletions.
diff --git a/flake.nix b/flake.nix
@@ -59,7 +59,7 @@
 
           rust-1_79 = nixpkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain-1.79.toml;
 
-          wasm-simapp = cosmos-nix.ibc-go-v9-wasm-simapp;
+          wasm-simapp = cosmos-nix.ibc-go-v8-wasm-simapp;
 
           osmosis = cosmos-nix.osmosis;
 

diff --git a/light-client/Cargo.lock b/light-client/Cargo.lock
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
@@ -63,6 +63,17 @@ ibc-client-starknet-types = { path = "./ibc-client-starknet-types" }
 
 ibc-client-cw = { git = "https://github.com/informalsystems/cosmwasm-ibc.git", branch = "luca_joss/add-cw-client-extension-trait" }
 
+ibc                         = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-core                    = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-core-client-types       = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-core-host-cosmos        = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-client-tendermint       = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-client-tendermint-types = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-client-wasm-types       = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-core-client             = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-core-channel-types      = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+ibc-core-handler-types      = { git = "https://github.com/cosmos/ibc-rs", branch = "main" }
+
 cgp                     = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-core                = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-extra               = { git = "https://github.com/contextgeneric/cgp.git" }

diff --git a/nix/ibc-starknet-cw.nix b/nix/ibc-starknet-cw.nix
@@ -13,6 +13,7 @@ let
         "hermes-cosmos-encoding-components-0.1.0" = "sha256-uxXpzxVc89DkAC4VqC/Au3cpBzUbxiSS2KiFKZ+rqdg=";
         "cgp-0.3.1" = "sha256-AOQ+WVQWPlF2ZfYYc5Eq3t7XAljd5P2qExWLYZWNnd8=";
         "ibc-client-cw-0.56.0" = "sha256-EkLxuJfr3vf0busmSZD7DwOS9GfgfhT+sdopi1nNiCs=";
+        "ibc-0.56.0" = "sha256-7DPIqu/zs0szjmtJTfXI2eQ0HEkRyvGjArcMZsFWMT4=";
       };
     };