From 2da69965064cbc2462507643ca67905e283efe67 Mon Sep 17 00:00:00 2001
From: Luca Joss <43531661+ljoss17@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:40:56 +0200
Subject: [PATCH] Update Provenance from v1.17.0 to v1.19.1 (#259)

---
 flake.lock              | 27 +++++++++++++++++++++++----
 flake.nix               |  5 ++++-
 modules/packages.nix    |  2 +-
 packages/libwasmvm.nix  | 12 ++++++++++++
 packages/provenance.nix | 12 ++++++------
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 91327609..0be79e7b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1302,15 +1302,16 @@
     "provenance-src": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-dTX3kg2QUsC9SwsaommP4IFgIdQgWZrGQNtp/B+fzys=",
+        "lastModified": 1721946876,
+        "narHash": "sha256-4RAyX3ORmbojnmDlMQMWF7mdmbaiBbqegZt0SMd9cXE=",
         "owner": "provenance-io",
         "repo": "provenance",
-        "rev": "91b0813de2f93d03cefe8efb226dc32f02690840",
+        "rev": "d1119ab02c423d86a0f485a8f124e73511ec1b9b",
         "type": "github"
       },
       "original": {
         "owner": "provenance-io",
-        "ref": "v1.17.0",
+        "ref": "v1.19.1",
         "repo": "provenance",
         "type": "github"
       }
@@ -1446,7 +1447,8 @@
         "wasmvm_1_5_0-src": "wasmvm_1_5_0-src",
         "wasmvm_1_5_2-src": "wasmvm_1_5_2-src",
         "wasmvm_1_beta7-src": "wasmvm_1_beta7-src",
-        "wasmvm_2_0_0-src": "wasmvm_2_0_0-src"
+        "wasmvm_2_0_0-src": "wasmvm_2_0_0-src",
+        "wasmvm_2_1_0-src": "wasmvm_2_1_0-src"
       }
     },
     "rust-overlay": {
@@ -1880,6 +1882,23 @@
         "repo": "wasmvm",
         "type": "github"
       }
+    },
+    "wasmvm_2_1_0-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1720688907,
+        "narHash": "sha256-Ev/2cUKT0i9ytvfrzh15Ibja4TBXjoeB7RLHn28yRCY=",
+        "owner": "CosmWasm",
+        "repo": "wasmvm",
+        "rev": "d7906b3030061a959c54ee57c88e3256b8e90a0c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CosmWasm",
+        "ref": "v2.1.0",
+        "repo": "wasmvm",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index c390ed14..d37944a4 100644
--- 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
index a6dc0c21..e22af801 100644
--- 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
index b9131551..b6c0c8f1 100644
--- 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
index cbea2307..aab9a18f 100644
--- 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];
 }