Update Neutron to v4.2.2 (#273)

informalsystems · Aug 28, 2024 · 8963f6b · 8963f6b
1 parent 76cf200
commit 8963f6b
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 12 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -220,6 +220,9 @@
     wasmvm_2_1_0-src.url = "github:CosmWasm/wasmvm/v2.1.0";
     wasmvm_2_1_0-src.flake = false;
 
+    wasmvm_2_0_3-src.url = "github:CosmWasm/wasmvm/v2.0.3";
+    wasmvm_2_0_3-src.flake = false;
+
     wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0";
     wasmvm_2_0_0-src.flake = false;
 
@@ -274,7 +277,7 @@
     celestia-node-src.url = "github:celestiaorg/celestia-node/v0.13.0";
     celestia-node-src.flake = false;
 
-    neutron-src.url = "github:neutron-org/neutron/v4.1.0";
+    neutron-src.url = "github:neutron-org/neutron/v4.2.2";
     neutron-src.flake = false;
 
     provenance-src.url = "github:/provenance-io/provenance/v1.19.1";

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -109,7 +109,7 @@
         };
         neutron = import ../packages/neutron.nix {
           inherit (inputs) neutron-src;
-          inherit (self'.packages) libwasmvm_2_0_0;
+          inherit (self'.packages) libwasmvm_2_0_3;
           inherit cosmosLib;
         };
         andromeda = import ../packages/andromeda.nix {

diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix
@@ -29,6 +29,18 @@ in
       };
     };
 
+    libwasmvm_2_0_3 = {
+      src = "${inputs.wasmvm_2_0_3-src}/libwasmvm";
+      version = "v2.0.3";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_2_0_3-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-2.0.6" = "sha256-gGrbTeHzVn+9T82R6nsq2VIm1armIS/e1TP9w8z0aQ4=";
+        };
+      };
+    };
+
     libwasmvm_2_0_0 = {
       src = "${inputs.wasmvm_2_0_0-src}/libwasmvm";
       version = "v2.0.0";

diff --git a/packages/neutron.nix b/packages/neutron.nix
@@ -1,20 +1,22 @@
 {
   neutron-src,
   cosmosLib,
-  libwasmvm_2_0_0,
+  libwasmvm_2_0_3,
 }:
 cosmosLib.mkCosmosGoApp {
-  goVersion = "1.22";
+  # nixpkgs latest go version v1.22 is v1.22.5 but Neutron v4.2.2 requires
+  # v1.22.6 or more so v1.23 is used instead
+  goVersion = "1.23";
   name = "neutron";
-  version = "v4.1.0";
+  version = "v4.2.2";
   src = neutron-src;
   rev = neutron-src.rev;
-  vendorHash = "sha256-SKuAOWosHM2tvVAsTu54sAfbiTtCoJap3/LA4zfmuOo=";
+  vendorHash = "sha256-5yjri/9QCSnHieWu/v9AYcktP+kXFEyWE7IbhkoNFXs=";
   engine = "cometbft/cometbft";
   preFixup = ''
-    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "neutrond"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_3 "neutrond"}
   '';
-  buildInputs = [libwasmvm_2_0_0];
+  buildInputs = [libwasmvm_2_0_3];
 
   # main module (github.com/neutron-org/neutron/v4) does not contain package github.com/neutron-org/neutron/v4/tests/feemarket
   # main module (github.com/neutron-org/neutron/v4) does not contain package github.com/neutron-org/neutron/v4/tests/slinky