Merge branch 'main' into luca_joss/update-injective-to-v1-13-0

informalsystems · Aug 14, 2024 · 029bcb9 · 029bcb9
2 parents f6efc83 + 5115762
commit 029bcb9
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 100 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -144,6 +144,9 @@
     ibc-go-v8-src.url = "github:cosmos/ibc-go/v8.3.1";
     ibc-go-v8-src.flake = false;
 
+    ibc-go-v9-src.url = "github:cosmos/ibc-go/v9.0.0-beta.1";
+    ibc-go-v9-src.flake = false;
+
     cosmos-sdk-src.url = "github:cosmos/cosmos-sdk/v0.46.0";
     cosmos-sdk-src.flake = false;
 
@@ -162,10 +165,10 @@
     evmos-src.url = "github:evmos/evmos/v16.0.0-rc4";
     evmos-src.flake = false;
 
-    juno-src.url = "github:CosmosContracts/juno/v22.0.0";
+    juno-src.url = "github:CosmosContracts/juno/v23.0.0";
     juno-src.flake = false;
 
-    osmosis-src.url = "github:osmosis-labs/osmosis/v25.0.0";
+    osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0";
     osmosis-src.flake = false;
 
     sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0";
@@ -189,7 +192,7 @@
     composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88";
     composable-cosmos-src.flake = false;
 
-    wasmd-src.url = "github:CosmWasm/wasmd/v0.51.0";
+    wasmd-src.url = "github:CosmWasm/wasmd/v0.52.0";
     wasmd-src.flake = false;
 
     wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0";
@@ -237,19 +240,19 @@
     interchain-security-src.url = "github:cosmos/interchain-security/feat/ics-misbehaviour-handling";
     interchain-security-src.flake = false;
 
-    stride-src.url = "github:Stride-Labs/stride/v21.0.0";
+    stride-src.url = "github:Stride-Labs/stride/v23.0.1";
     stride-src.flake = false;
 
-    migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v4.1.3";
+    migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v4.2.0";
     migaloo-src.flake = false;
 
-    celestia-app-src.url = "github:celestiaorg/celestia-app/v1.11.0";
+    celestia-app-src.url = "github:celestiaorg/celestia-app/v1.14.0";
     celestia-app-src.flake = false;
 
     celestia-node-src.url = "github:celestiaorg/celestia-node/v0.13.0";
     celestia-node-src.flake = false;
 
-    neutron-src.url = "github:neutron-org/neutron/v3.0.5";
+    neutron-src.url = "github:neutron-org/neutron/v4.1.0";
     neutron-src.flake = false;
 
     provenance-src.url = "github:/provenance-io/provenance/v1.19.1";

diff --git a/modules/apps.nix b/modules/apps.nix
@@ -122,6 +122,10 @@
             type = "app";
             program = "${packages.ibc-go-v8-simapp}/bin/simd";
           };
+          ibc-go-v9-simapp = {
+            type = "app";
+            program = "${packages.ibc-go-v9-simapp}/bin/simd";
+          };
           ignite-cli = {
             type = "app";
             program = "${packages.ignite-cli}/bin/ignite";

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -109,7 +109,7 @@
         };
         neutron = import ../packages/neutron.nix {
           inherit (inputs) neutron-src;
-          inherit (self'.packages) libwasmvm_1_5_2;
+          inherit (self'.packages) libwasmvm_2_0_0;
           inherit cosmosLib;
         };
         andromeda = import ../packages/andromeda.nix {
@@ -161,7 +161,7 @@
         };
         wasmd = import ../packages/wasmd.nix {
           inherit (inputs) wasmd-src;
-          inherit (self'.packages) libwasmvm_2_0_0;
+          inherit (self'.packages) libwasmvm_2_1_0;
           inherit cosmosLib;
         };
         rollapp-evm = import ../packages/rollapp-evm.nix {

diff --git a/packages/celestia-app.nix b/packages/celestia-app.nix
@@ -4,11 +4,11 @@
 }:
 mkCosmosGoApp {
   name = "celestia-app";
-  version = "v1.11.0";
+  version = "v1.14.0";
   src = celestia-app-src;
   rev = celestia-app-src.rev;
   goVersion = "1.22";
-  vendorHash = "sha256-O06yhP0XPD8kMhOYS0YVfs1LWwGsbuzuwbetnZ+GAJ8=";
+  vendorHash = "sha256-xvjdU0GPbqet8L8rvRMZ8AKN7huRn6eDoEYGJYhdJaY=";
   engine = "tendermint/tendermint";
   doCheck = false;
 }
diff --git a/packages/ibc-go.nix b/packages/ibc-go.nix
@@ -84,4 +84,16 @@ with inputs;
       engine = "cometbft/cometbft";
       excludedPackages = ["./e2e" "./modules/apps/callbacks" "./modules/capability"];
     };
+
+    ibc-go-v9-simapp = {
+      name = "simd";
+      version = "v9.0.0-beta.1";
+      src = ibc-go-v9-src;
+      rev = ibc-go-v9-src.rev;
+      sourceRoot = "source/simapp";
+      vendorHash = "sha256-gr5Wre8OoSVBR+JNNCvs9zr6T5TwCgSAnchENEgu9qM=";
+      goVersion = "1.22";
+      tags = ["netgo"];
+      engine = "cometbft/cometbft";
+    };
   }