Update Provenance from v1.17.0 to v1.19.1 (#259)

informalsystems · Aug 5, 2024 · 2da6996 · 2da6996
1 parent 826b8dd
commit 2da6996
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 12 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -191,6 +191,9 @@
     wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0";
     wasmvm_1-src.flake = false;
 
+    wasmvm_2_1_0-src.url = "github:CosmWasm/wasmvm/v2.1.0";
+    wasmvm_2_1_0-src.flake = false;
+
     wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0";
     wasmvm_2_0_0-src.flake = false;
 
@@ -245,7 +248,7 @@
     neutron-src.url = "github:neutron-org/neutron/v3.0.5";
     neutron-src.flake = false;
 
-    provenance-src.url = "github:/provenance-io/provenance/v1.17.0";
+    provenance-src.url = "github:/provenance-io/provenance/v1.19.1";
     provenance-src.flake = false;
 
     namada-src.url = "github:anoma/namada/v0.28.1";

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -133,7 +133,7 @@
         };
         provenance = import ../packages/provenance.nix {
           inherit (inputs) provenance-src;
-          inherit (self'.packages) libwasmvm_1_2_4;
+          inherit (self'.packages) libwasmvm_2_1_0;
           inherit cosmosLib;
         };
         regen = import ../packages/regen.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_0 = {
+      src = "${inputs.wasmvm_2_1_0-src}/libwasmvm";
+      version = "v2.1.0";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_2_1_0-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-2.1.0" = "sha256-3rCzYh+lNRn4YiRPsFxJ7s4D4QlX+m3Yekz2h22L8vE=";
+        };
+      };
+    };
+
     libwasmvm_2_0_0 = {
       src = "${inputs.wasmvm_2_0_0-src}/libwasmvm";
       version = "v2.0.0";

diff --git a/packages/provenance.nix b/packages/provenance.nix
@@ -1,18 +1,18 @@
 {
   cosmosLib,
   provenance-src,
-  libwasmvm_1_2_4,
+  libwasmvm_2_1_0,
 }:
 cosmosLib.mkCosmosGoApp {
   name = "provenance";
-  version = "v1.17.0";
+  version = "v1.19.1";
   src = provenance-src;
   rev = provenance-src.rev;
-  vendorHash = "sha256-XFU/+lMwg4hLlyYGUvDp0SqGqijrUQZddoH4VkIvqHg=";
+  vendorHash = "sha256-RTGQuDVxK4U+o+P8YJIkQJnjNEfRdFqoDHxXuPpndE8=";
   tags = ["netgo"];
-  engine = "tendermint/tendermint";
+  engine = "cometbft/cometbft";
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_2_4 "provenanced"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_0 "provenanced"}
   '';
   # dbmigrate is problematic as it depends implicitly on the build/ directory being present at runtime,
   # which is not guaranteed to be there.
@@ -31,5 +31,5 @@ cosmosLib.mkCosmosGoApp {
   excludedPackages = [
     "./cmd/dbmigrate"
   ];
-  buildInputs = [libwasmvm_1_2_4];
+  buildInputs = [libwasmvm_2_1_0];
 }