Merge branch 'main' into luca_joss/add-gaia-v20-alpha

informalsystems · Oct 15, 2024 · 302ca94 · 302ca94
2 parents af8d2cb + 8b7f6e8
commit 302ca94
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 11 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -187,7 +187,7 @@
     evmos-src.url = "github:evmos/evmos/v16.0.0-rc4";
     evmos-src.flake = false;
 
-    juno-src.url = "github:CosmosContracts/juno/v24.0.0";
+    juno-src.url = "github:CosmosContracts/juno/v25.0.0";
     juno-src.flake = false;
 
     osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0";
@@ -232,6 +232,9 @@
     wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0";
     wasmvm_2_0_0-src.flake = false;
 
+    wasmvm_1_5_5-src.url = "github:CosmWasm/wasmvm/v1.5.5";
+    wasmvm_1_5_5-src.flake = false;
+
     wasmvm_1_5_4-src.url = "github:CosmWasm/wasmvm/v1.5.4";
     wasmvm_1_5_4-src.flake = false;
 

diff --git 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_4;
+          inherit (self'.packages) libwasmvm_1_5_5;
           inherit cosmosLib;
         };
         migaloo = import ../packages/migaloo.nix {

diff --git a/packages/juno.nix b/packages/juno.nix
@@ -1,21 +1,21 @@
 {
   cosmosLib,
   juno-src,
-  libwasmvm_1_5_4,
+  libwasmvm_1_5_5,
 }:
 cosmosLib.mkCosmosGoApp {
   name = "juno";
-  version = "v24.0.0";
+  version = "v25.0.0";
   goVersion = "1.22";
   src = juno-src;
   rev = juno-src.rev;
-  vendorHash = "sha256-srBwnVyOx6Zt6n2e6WhZd+uHWNnpyv6fQTi1A9jsVd0=";
+  vendorHash = "sha256-HDHsBuuJ+ta3ynYv8NVqEdd0h4UNWBelUA8j+YoEf4E=";
   tags = ["netgo"];
   engine = "cometbft/cometbft";
   excludedPackages = ["interchaintest"];
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_4 "junod"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_5 "junod"}
   '';
   dontStrip = true;
-  buildInputs = [libwasmvm_1_5_4];
+  buildInputs = [libwasmvm_1_5_5];
 }
diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix
@@ -65,6 +65,18 @@ in
       };
     };
 
+    libwasmvm_1_5_5 = {
+      src = "${inputs.wasmvm_1_5_5-src}/libwasmvm";
+      version = "v1.5.5";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_1_5_5-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-1.5.8" = "sha256-H5PXdAInZIgzkAUQlqXp7KSQhgy3mGN5WQeumRKoNc4=";
+        };
+      };
+    };
+
     libwasmvm_1_5_4 = {
       src = "${inputs.wasmvm_1_5_4-src}/libwasmvm";
       version = "v1.5.4";