Update Osmosis to v27.0.1 (#280)

informalsystems · Dec 4, 2024 · a615496 · a615496
1 parent 04a2efd
commit a615496
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 15 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -190,7 +190,7 @@
     juno-src.url = "github:CosmosContracts/juno/v25.0.0";
     juno-src.flake = false;
 
-    osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0";
+    osmosis-src.url = "github:osmosis-labs/osmosis/v27.0.1";
     osmosis-src.flake = false;
 
     sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0";
@@ -220,6 +220,9 @@
     wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0";
     wasmvm_1-src.flake = false;
 
+    wasmvm_2_1_3-src.url = "github:CosmWasm/wasmvm/v2.1.3";
+    wasmvm_2_1_3-src.flake = false;
+
     wasmvm_2_1_2-src.url = "github:CosmWasm/wasmvm/v2.1.2";
     wasmvm_2_1_2-src.flake = false;
 

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -119,8 +119,9 @@
         };
         osmosis = import ../packages/osmosis.nix {
           inherit (inputs) osmosis-src;
-          inherit (self'.packages) libwasmvm_1_5_2;
+          inherit (self'.packages) libwasmvm_2_1_3;
           inherit cosmosLib;
+          inherit (pkgs) libiconv;
         };
         osmosis-oci = import ../packages/osmosis-oci.nix {
           inherit (pkgs) nix2container;

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_3 = {
+      src = "${inputs.wasmvm_2_1_3-src}/libwasmvm";
+      version = "v2.1.3";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_2_1_3-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-2.1.4" = "sha256-stKVEC5jJpZhVCPnoeGApKIgpfV8wd+L5hmrhJy9hsU=";
+        };
+      };
+    };
+
     libwasmvm_2_1_2 = {
       src = "${inputs.wasmvm_2_1_2-src}/libwasmvm";
       version = "v2.1.2";

diff --git a/packages/osmosis.nix b/packages/osmosis.nix
@@ -1,24 +1,27 @@
 {
   cosmosLib,
   osmosis-src,
-  libwasmvm_1_5_2,
+  libwasmvm_2_1_3,
+  libiconv,
 }:
 cosmosLib.mkCosmosGoApp {
   name = "osmosis";
-  version = "v25.2.0";
-  goVersion = "1.21";
+  version = "v27.0.1";
+  # nixpkgs latest go version v1.22 is v1.22.5 but Osmosis v27.0.1 requires
+  # v1.22.7 or more so v1.23 is used instead
+  goVersion = "1.23";
   src = osmosis-src;
   rev = osmosis-src.rev;
-  vendorHash = "sha256-ZzgAg7Z7cgJir3rfcrQISoT+Ep5UmMY/uVN985UaPYU=";
+  vendorHash = "sha256-wiEixpZPbnwMdhyNrQvHz3cLZF/GXJRa7ho0YaAnVuc=";
   tags = ["netgo"];
   excludedPackages = ["cl-genesis-positions"];
   engine = "cometbft/cometbft";
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "osmosisd"}
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "chain"}
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "node"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_3 "osmosisd"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_3 "chain"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_3 "node"}
   '';
-  buildInputs = [libwasmvm_1_5_2];
+  buildInputs = [libwasmvm_2_1_3 libiconv];
   proxyVendor = true;
 
   # Test has to be skipped as end-to-end testing requires network access