Merge branch 'main' into luca_joss/update-juno-to-v21

informalsystems · Apr 16, 2024 · c50b7d9 · c50b7d9
2 parents 2ca59b6 + ffd8ab2
commit c50b7d9
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 80 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -155,7 +155,7 @@
     juno-src.url = "github:CosmosContracts/juno/v21.0.0";
     juno-src.flake = false;
 
-    osmosis-src.url = "github:osmosis-labs/osmosis/v22.0.5";
+    osmosis-src.url = "github:osmosis-labs/osmosis/v24.0.1";
     osmosis-src.flake = false;
 
     sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0";
@@ -224,12 +224,9 @@
     interchain-security-src.url = "github:cosmos/interchain-security/feat/ics-misbehaviour-handling";
     interchain-security-src.flake = false;
 
-    stride-src.url = "github:Stride-Labs/stride/v8.0.0";
+    stride-src.url = "github:Stride-Labs/stride/v21.0.0";
     stride-src.flake = false;
 
-    stride-consumer-src.url = "github:Stride-Labs/stride/v12.1.0";
-    stride-consumer-src.flake = false;
-
     migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v3.0.2";
     migaloo-src.flake = false;
 
@@ -239,7 +236,7 @@
     celestia-node-src.url = "github:celestiaorg/celestia-node/v0.13.0";
     celestia-node-src.flake = false;
 
-    neutron-src.url = "github:neutron-org/neutron/v2.0.0";
+    neutron-src.url = "github:neutron-org/neutron/v3.0.2";
     neutron-src.flake = false;
 
     provenance-src.url = "github:/provenance-io/provenance/v1.17.0";

diff --git a/modules/apps.nix b/modules/apps.nix
@@ -178,14 +178,6 @@
             type = "app";
             program = "${packages.stride}/bin/strided";
           };
-          stride-consumer = {
-            type = "app";
-            program = "${packages.stride-consumer}/bin/strided";
-          };
-          stride-consumer-no-admin = {
-            type = "app";
-            program = "${packages.stride-consumer-no-admin}/bin/strided";
-          };
           stride-no-admin = {
             type = "app";
             program = "${packages.stride-no-admin}/bin/strided";

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_0;
+          inherit (self'.packages) libwasmvm_1_5_2;
           inherit cosmosLib;
         };
         andromeda = import ../packages/andromeda.nix {
@@ -198,7 +198,9 @@
           # Stride
           (import ../packages/stride.nix {
             inherit inputs;
+            inherit (self'.packages) libwasmvm_1_5_2;
             inherit (cosmosLib) mkCosmosGoApp;
+            inherit cosmosLib;
           })
           # Evmos
           (import ../packages/evmos {

diff --git a/packages/neutron.nix b/packages/neutron.nix
@@ -1,18 +1,18 @@
 {
   neutron-src,
   cosmosLib,
-  libwasmvm_1_5_0,
+  libwasmvm_1_5_2,
 }:
 cosmosLib.mkCosmosGoApp {
-  goVersion = "1.20";
+  goVersion = "1.21";
   name = "neutron";
-  version = "v2.0.0";
+  version = "v3.0.2";
   src = neutron-src;
   rev = neutron-src.rev;
-  vendorHash = "sha256-uLInKbuL886cfXCyQvIDZJHUC8AK9fR39yNBHDO+Qzc=";
+  vendorHash = "sha256-Ao/soQsOw00QZ8c7BF42od303wdiFo30flWSPTm5Mzc=";
   engine = "cometbft/cometbft";
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_0 "neutrond"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "neutrond"}
   '';
-  buildInputs = [libwasmvm_1_5_0];
+  buildInputs = [libwasmvm_1_5_2];
 }
diff --git a/packages/osmosis.nix b/packages/osmosis.nix
@@ -5,10 +5,11 @@
 }:
 cosmosLib.mkCosmosGoApp {
   name = "osmosis";
-  version = "v22.0.5";
+  version = "v24.0.1";
+  goVersion = "1.21";
   src = osmosis-src;
   rev = osmosis-src.rev;
-  vendorHash = "sha256-V+5GwiNrZo4f7JtO6r459+5WTImDaqRu2TFIfeSwAjc=";
+  vendorHash = "sha256-RjBnaHKge3b1CwIFUFsyE/Yv83QC8UsGtx87mgI1PPo=";
   tags = ["netgo"];
   excludedPackages = ["cl-genesis-positions"];
   engine = "cometbft/cometbft";

diff --git a/packages/stride.nix b/packages/stride.nix
@@ -1,51 +1,42 @@
 {
   inputs,
   mkCosmosGoApp,
+  cosmosLib,
+  libwasmvm_1_5_2,
 }:
 with inputs;
   builtins.mapAttrs (_: mkCosmosGoApp)
   {
     stride = {
       name = "stride";
-      version = "v8.0.0";
+      version = "v21.0.0";
+      goVersion = "1.21";
       src = stride-src;
       rev = stride-src.rev;
-      vendorHash = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10=";
-      engine = "tendermint/tendermint";
-
-      doCheck = false;
-    };
-
-    stride-consumer = {
-      name = "stride-consumer";
-      version = "v12.1.0";
-      src = stride-consumer-src;
-      rev = stride-consumer-src.rev;
-      vendorHash = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04=";
+      vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro=";
       engine = "cometbft/cometbft";
 
-      doCheck = false;
-    };
+      preFixup = ''
+        ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "strided"}
+      '';
+      buildInputs = [libwasmvm_1_5_2];
 
-    stride-consumer-no-admin = {
-      name = "stride-consumer-no-admin";
-      version = "v12.1.0";
-      src = stride-consumer-src;
-      rev = stride-consumer-src.rev;
-      vendorHash = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04=";
-      engine = "cometbft/cometbft";
-
-      patches = [../patches/stride-no-admin-check.patch];
       doCheck = false;
     };
 
     stride-no-admin = {
       name = "stride-no-admin";
-      version = "v8.0.0";
+      version = "v21.0.0";
+      goVersion = "1.21";
       src = stride-src;
       rev = stride-src.rev;
-      vendorHash = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10=";
-      engine = "tendermint/tendermint";
+      vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro=";
+      engine = "cometbft/cometbft";
+
+      preFixup = ''
+        ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "strided"}
+      '';
+      buildInputs = [libwasmvm_1_5_2];
 
       patches = [../patches/stride-no-admin-check.patch];
       doCheck = false;

diff --git a/patches/stride-no-admin-check.patch b/patches/stride-no-admin-check.patch
@@ -1,13 +1,13 @@
 diff --git a/utils/utils.go b/utils/utils.go
-index 74ff4794..cb2a6f37 100644
+index 0bce89235..dd24c0f83 100644
 --- a/utils/utils.go
 +++ b/utils/utils.go
-@@ -35,9 +35,6 @@ func Int64ToCoinString(amount int64, denom string) string {
+@@ -37,9 +37,6 @@ func Int64ToCoinString(amount int64, denom string) string {
  }
 
  func ValidateAdminAddress(address string) error {
 -	if !Admins[address] {
--		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, fmt.Sprintf("invalid creator address (%s)", address))
+-		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, fmt.Sprintf("address (%s) is not an admin", address))
 -	}
  	return nil
  }