Merge branch 'main' into luca_joss/update-celestia-app-to-v1-14-0

informalsystems · Aug 7, 2024 · 64709ec · 64709ec
2 parents 4e92aaa + fbece4c
commit 64709ec
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 33 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -185,7 +185,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";
@@ -233,7 +233,7 @@
     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.2.0";
@@ -245,7 +245,7 @@
     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/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 {
@@ -166,7 +166,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/neutron.nix b/packages/neutron.nix
@@ -1,18 +1,22 @@
 {
   neutron-src,
   cosmosLib,
-  libwasmvm_1_5_2,
+  libwasmvm_2_0_0,
 }:
 cosmosLib.mkCosmosGoApp {
-  goVersion = "1.21";
+  goVersion = "1.22";
   name = "neutron";
-  version = "v3.0.5";
+  version = "v4.1.0";
   src = neutron-src;
   rev = neutron-src.rev;
-  vendorHash = "sha256-6WV7Z0KbvDReCJ7JccPnRWPkR4BMrfxRouTC5cC6PZc=";
+  vendorHash = "sha256-SKuAOWosHM2tvVAsTu54sAfbiTtCoJap3/LA4zfmuOo=";
   engine = "cometbft/cometbft";
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "neutrond"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "neutrond"}
   '';
-  buildInputs = [libwasmvm_1_5_2];
+  buildInputs = [libwasmvm_2_0_0];
+
+  # main module (github.com/neutron-org/neutron/v4) does not contain package github.com/neutron-org/neutron/v4/tests/feemarket
+  # main module (github.com/neutron-org/neutron/v4) does not contain package github.com/neutron-org/neutron/v4/tests/slinky
+  excludedPackages = ["tests/feemarket" "tests/slinky"];
 }
diff --git a/packages/stride.nix b/packages/stride.nix
@@ -9,11 +9,11 @@ with inputs;
   {
     stride = {
       name = "stride";
-      version = "v21.0.0";
+      version = "v23.0.1";
       goVersion = "1.21";
       src = stride-src;
       rev = stride-src.rev;
-      vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro=";
+      vendorHash = "sha256-T1xdcD5ucMuAIMZdLrlBxkdWJF2Uirn7+lBpypf6q98=";
       engine = "cometbft/cometbft";
 
       preFixup = ''
@@ -26,11 +26,11 @@ with inputs;
 
     stride-no-admin = {
       name = "stride-no-admin";
-      version = "v21.0.0";
+      version = "v23.0.1";
       goVersion = "1.21";
       src = stride-src;
       rev = stride-src.rev;
-      vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro=";
+      vendorHash = "sha256-T1xdcD5ucMuAIMZdLrlBxkdWJF2Uirn7+lBpypf6q98=";
       engine = "cometbft/cometbft";
 
       preFixup = ''

diff --git a/packages/wasmd.nix b/packages/wasmd.nix
@@ -1,20 +1,20 @@
 {
   wasmd-src,
   cosmosLib,
-  libwasmvm_2_0_0,
+  libwasmvm_2_1_0,
 }:
 cosmosLib.mkCosmosGoApp {
   name = "wasm";
-  version = "v0.51.0";
+  version = "v0.52.0";
   goVersion = "1.21";
   src = wasmd-src;
   rev = wasmd-src.rev;
-  vendorHash = "sha256-hurRN9NUz5Lh1AOpsZNZEKPYAu+6U6GEsYz4ZUh1aAs=";
+  vendorHash = "sha256-G4SujfIKNlfGUr7mM9C/iXd0Xc0/wEl6tJB02TufeiI=";
   tags = ["netgo"];
   engine = "cometbft/cometbft";
-  preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "wasmd";
+  preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_0 "wasmd";
   dontStrip = true;
-  buildInputs = [libwasmvm_2_0_0];
+  buildInputs = [libwasmvm_2_1_0];
 
   # main module (github.com/CosmWasm/wasmd) does not contain package github.com/CosmWasm/wasmd/tests/system
   excludedPackages = ["tests/system"];

diff --git a/patches/stride-no-admin-check.patch b/patches/stride-no-admin-check.patch
@@ -1,5 +1,5 @@
 diff --git a/utils/utils.go b/utils/utils.go
-index 0bce89235..dd24c0f83 100644
+index 2b78e41f8..7487fe341 100644
 --- a/utils/utils.go
 +++ b/utils/utils.go
 @@ -37,9 +37,6 @@ func Int64ToCoinString(amount int64, denom string) string {