Update 'wasmd' to v0.53.0 (#274)

informalsystems · Aug 30, 2024 · d87f011 · d87f011
1 parent 8963f6b
commit d87f011
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 12 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -211,12 +211,15 @@
     composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88";
     composable-cosmos-src.flake = false;
 
-    wasmd-src.url = "github:CosmWasm/wasmd/v0.52.0";
+    wasmd-src.url = "github:CosmWasm/wasmd/v0.53.0";
     wasmd-src.flake = false;
 
     wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0";
     wasmvm_1-src.flake = false;
 
+    wasmvm_2_1_2-src.url = "github:CosmWasm/wasmvm/v2.1.2";
+    wasmvm_2_1_2-src.flake = false;
+
     wasmvm_2_1_0-src.url = "github:CosmWasm/wasmvm/v2.1.0";
     wasmvm_2_1_0-src.flake = false;
 

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

diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix
@@ -17,6 +17,18 @@
 in
   builtins.mapAttrs (_: libwasmvm: pkgs.rustPlatform.buildRustPackage (libwasmvmCommon // libwasmvm))
   {
+    libwasmvm_2_1_2 = {
+      src = "${inputs.wasmvm_2_1_2-src}/libwasmvm";
+      version = "v2.1.2";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_2_1_2-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-2.1.3" = "sha256-WXhz47cNeSRlUGfiXZkGOvu6WjK26MPJB716DiFqYPY=";
+        };
+      };
+    };
+
     libwasmvm_2_1_0 = {
       src = "${inputs.wasmvm_2_1_0-src}/libwasmvm";
       version = "v2.1.0";

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