Merge branch 'luca_joss/update-stride-to-v24' of github.com:informalsystems/cosmos.nix into luca_joss/update-stride-to-v24

Author: ljoss17

flake.lock

@@ -288,7 +288,7 @@
     interchain-security-src.url = "github:cosmos/interchain-security/v6.1.0";
     interchain-security-src.flake = false;
 
-    stride-src.url = "github:Stride-Labs/stride/v23.0.1";
+    stride-src.url = "github:Stride-Labs/stride/v24.0.0";
     stride-src.flake = false;
 
     migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v4.2.0";

flake.nix

@@ -191,7 +191,7 @@
           # Stride
           (import ../packages/stride.nix {
             inherit inputs;
-            inherit (self'.packages) libwasmvm_1_5_2;
+            inherit (self'.packages) libwasmvm_1_5_4;
             inherit (cosmosLib) mkCosmosGoApp;
             inherit cosmosLib;
           })

modules/packages.nix

@@ -2,41 +2,41 @@
   inputs,
   mkCosmosGoApp,
   cosmosLib,
-  libwasmvm_1_5_2,
+  libwasmvm_1_5_4,
 }:
 with inputs;
   builtins.mapAttrs (_: mkCosmosGoApp)
   {
     stride = {
       name = "stride";
-      version = "v23.0.1";
+      version = "v24.0.0";
       goVersion = "1.21";
       src = stride-src;
       rev = stride-src.rev;
-      vendorHash = "sha256-T1xdcD5ucMuAIMZdLrlBxkdWJF2Uirn7+lBpypf6q98=";
+      vendorHash = "sha256-Tg96wuqgS08GGorY5Hbq3eJvJ7ZngI7XCqOIw84isSI=";
       engine = "cometbft/cometbft";
 
       preFixup = ''
-        ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "strided"}
+        ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_4 "strided"}
       '';
-      buildInputs = [libwasmvm_1_5_2];
+      buildInputs = [libwasmvm_1_5_4];
 
       doCheck = false;
     };
 
     stride-no-admin = {
       name = "stride-no-admin";
-      version = "v23.0.1";
+      version = "v24.0.0";
       goVersion = "1.21";
       src = stride-src;
       rev = stride-src.rev;
-      vendorHash = "sha256-T1xdcD5ucMuAIMZdLrlBxkdWJF2Uirn7+lBpypf6q98=";
+      vendorHash = "sha256-Tg96wuqgS08GGorY5Hbq3eJvJ7ZngI7XCqOIw84isSI=";
       engine = "cometbft/cometbft";
 
       preFixup = ''
-        ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "strided"}
+        ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_4 "strided"}
       '';
-      buildInputs = [libwasmvm_1_5_2];
+      buildInputs = [libwasmvm_1_5_4];
 
       patches = [../patches/stride-no-admin-check.patch];
       doCheck = false;

packages/stride.nix

@@ -1,13 +1,13 @@
 diff --git a/utils/utils.go b/utils/utils.go
-index 2b78e41f8..7487fe341 100644
+index 0a3995160..89b0d31c3 100644
 --- a/utils/utils.go
 +++ b/utils/utils.go
 @@ -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("address (%s) is not an admin", address))
+-		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "address (%s) is not an admin", address)
 -	}
  	return nil
  }