Update wasmd from v0.50.0 to v0.51.0

informalsystems · Jun 10, 2024 · 6daee9e · 6daee9e
1 parent 8515f69
commit 6daee9e
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
@@ -179,12 +179,15 @@
     composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88";
     composable-cosmos-src.flake = false;
 
-    wasmd-src.url = "github:CosmWasm/wasmd/v0.50.0";
+    wasmd-src.url = "github:CosmWasm/wasmd/v0.51.0";
     wasmd-src.flake = false;
 
     wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0";
     wasmvm_1-src.flake = false;
 
+    wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0";
+    wasmvm_2_0_0-src.flake = false;
+
     wasmvm_1_5_2-src.url = "github:CosmWasm/wasmvm/v1.5.2";
     wasmvm_1_5_2-src.flake = false;
 

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -166,7 +166,7 @@
         };
         wasmd = import ../packages/wasmd.nix {
           inherit (inputs) wasmd-src;
-          inherit (self'.packages) libwasmvm_1_5_0;
+          inherit (self'.packages) libwasmvm_2_0_0;
           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_0_0 = {
+      src = "${inputs.wasmvm_2_0_0-src}/libwasmvm";
+      version = "v2.0.0";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_2_0_0-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-2.0.0" = "sha256-wXBWwc1jZsO0kfrh0jkl4+TeFsM/8ZkptCEJSpgsLG8=";
+        };
+      };
+    };
+
     libwasmvm_1_5_2 = {
       src = "${inputs.wasmvm_1_5_2-src}/libwasmvm";
       version = "v1.5.2";

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