From 76cf200deaf72b02a03327b2b64dcfc695ed8dfd Mon Sep 17 00:00:00 2001
From: Luca Joss <43531661+ljoss17@users.noreply.github.com>
Date: Wed, 28 Aug 2024 10:56:14 +0200
Subject: [PATCH] Update Juno to v24.0.0 (#272)

---
 flake.lock             | 26 ++++++++++++++++++++++----
 flake.nix              |  5 ++++-
 modules/packages.nix   |  2 +-
 packages/juno.nix      | 10 +++++-----
 packages/libwasmvm.nix | 12 ++++++++++++
 5 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index ba05a68..de583f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1049,16 +1049,16 @@
     "juno-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1720542396,
-        "narHash": "sha256-niG12wn49bt184zqctrGsT73mgKfZUPTZAzSKX+ZLVs=",
+        "lastModified": 1724278445,
+        "narHash": "sha256-XvJqp36HSYqm6OMLQqJPX5sCT52GxSLFDMO+fJovh+0=",
         "owner": "CosmosContracts",
         "repo": "juno",
-        "rev": "bf140aa60045ba92b83d0cb7f3bc47a2661a4e7e",
+        "rev": "2f119adacca3a1668ff150c225a3f423501e748c",
         "type": "github"
       },
       "original": {
         "owner": "CosmosContracts",
-        "ref": "v23.0.0",
+        "ref": "v24.0.0",
         "repo": "juno",
         "type": "github"
       }
@@ -1507,6 +1507,7 @@
         "wasmvm_1_3_0-src": "wasmvm_1_3_0-src",
         "wasmvm_1_5_0-src": "wasmvm_1_5_0-src",
         "wasmvm_1_5_2-src": "wasmvm_1_5_2-src",
+        "wasmvm_1_5_4-src": "wasmvm_1_5_4-src",
         "wasmvm_1_beta7-src": "wasmvm_1_beta7-src",
         "wasmvm_2_0_0-src": "wasmvm_2_0_0-src",
         "wasmvm_2_1_0-src": "wasmvm_2_1_0-src"
@@ -1912,6 +1913,23 @@
         "type": "github"
       }
     },
+    "wasmvm_1_5_4-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723135235,
+        "narHash": "sha256-DGQHC20eMa1CDIx9fWYTTBxdFDCPoS/SsEDJnWJ+7bA=",
+        "owner": "CosmWasm",
+        "repo": "wasmvm",
+        "rev": "9f85c0f44fb8a5573be8e461cad12f784c544c4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CosmWasm",
+        "ref": "v1.5.4",
+        "repo": "wasmvm",
+        "type": "github"
+      }
+    },
     "wasmvm_1_beta7-src": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index be6047d..7749fcd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -184,7 +184,7 @@
     evmos-src.url = "github:evmos/evmos/v16.0.0-rc4";
     evmos-src.flake = false;
 
-    juno-src.url = "github:CosmosContracts/juno/v23.0.0";
+    juno-src.url = "github:CosmosContracts/juno/v24.0.0";
     juno-src.flake = false;
 
     osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0";
@@ -223,6 +223,9 @@
     wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0";
     wasmvm_2_0_0-src.flake = false;
 
+    wasmvm_1_5_4-src.url = "github:CosmWasm/wasmvm/v1.5.4";
+    wasmvm_1_5_4-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
index 16eb4f7..38dff2b 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -99,7 +99,7 @@
         };
         juno = import ../packages/juno.nix {
           inherit (inputs) juno-src;
-          inherit (self'.packages) libwasmvm_1_5_2;
+          inherit (self'.packages) libwasmvm_1_5_4;
           inherit cosmosLib;
         };
         migaloo = import ../packages/migaloo.nix {
diff --git a/packages/juno.nix b/packages/juno.nix
index 3480147..20af967 100644
--- a/packages/juno.nix
+++ b/packages/juno.nix
@@ -1,21 +1,21 @@
 {
   cosmosLib,
   juno-src,
-  libwasmvm_1_5_2,
+  libwasmvm_1_5_4,
 }:
 cosmosLib.mkCosmosGoApp {
   name = "juno";
-  version = "v23.0.0";
+  version = "v24.0.0";
   goVersion = "1.22";
   src = juno-src;
   rev = juno-src.rev;
-  vendorHash = "sha256-oyxW/xvZne3Ybf+1tUUk2qP2gkjGuzdHjWYunXQB8g8=";
+  vendorHash = "sha256-srBwnVyOx6Zt6n2e6WhZd+uHWNnpyv6fQTi1A9jsVd0=";
   tags = ["netgo"];
   engine = "cometbft/cometbft";
   excludedPackages = ["interchaintest"];
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "junod"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_4 "junod"}
   '';
   dontStrip = true;
-  buildInputs = [libwasmvm_1_5_2];
+  buildInputs = [libwasmvm_1_5_4];
 }
diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix
index b6c0c8f..970f9e5 100644
--- a/packages/libwasmvm.nix
+++ b/packages/libwasmvm.nix
@@ -41,6 +41,18 @@ in
       };
     };
 
+    libwasmvm_1_5_4 = {
+      src = "${inputs.wasmvm_1_5_4-src}/libwasmvm";
+      version = "v1.5.4";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_1_5_4-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-1.5.7" = "sha256-wQ0nejbnGih/xn/d47CnSZPEJzR9zWxqF8LcYdbkk0o=";
+        };
+      };
+    };
+
     libwasmvm_1_5_2 = {
       src = "${inputs.wasmvm_1_5_2-src}/libwasmvm";
       version = "v1.5.2";