Update Injective to v1.13.1

informalsystems · Aug 6, 2024 · 4517757 · 4517757
1 parent 2da6996
commit 4517757
Show file tree

Hide file tree

Showing 6 changed files with 800 additions and 27 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -146,7 +146,7 @@
     andromeda-src.url = "github:andromedaprotocol/andromedad/andromeda-1";
     andromeda-src.flake = false;
 
-    injective-src.url = "github:OpenDeFiFoundation/injective-core/v1.12.1";
+    injective-src.url = "github:OpenDeFiFoundation/injective-core/v1.13.1";
     injective-src.flake = false;
 
     iris-src.url = "github:irisnet/irishub/v1.1.1";

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -117,11 +117,6 @@
           inherit (self'.packages) libwasmvm_1_3_0;
           inherit cosmosLib;
         };
-        injective = import ../packages/injective.nix {
-          inherit (inputs) injective-src;
-          inherit (self'.packages) libwasmvm_1_5_0;
-          inherit cosmosLib;
-        };
         osmosis = import ../packages/osmosis.nix {
           inherit (inputs) osmosis-src;
           inherit (self'.packages) libwasmvm_1_5_2;
@@ -204,6 +199,14 @@
             inherit (inputs) evmos-src;
             inherit (cosmosLib) mkGenerator;
           })
+          # Injective
+          (import ../packages/injective {
+            inherit pkgs;
+            inherit (inputs) injective-src;
+            inherit (cosmosLib) mkGenerator;
+            inherit cosmosLib;
+            inherit (self'.packages) libwasmvm_2_0_0;
+          })
         ]
         ## Linux only packages
         ++ (lists.optionals pkgs.stdenv.isLinux

diff --git a/packages/injective.nix b/packages/injective.nix
diff --git a/packages/injective/default.nix b/packages/injective/default.nix
@@ -0,0 +1,26 @@
+{
+  mkGenerator,
+  injective-src,
+  pkgs,
+  cosmosLib,
+  libwasmvm_2_0_0,
+}: {
+injective = pkgs.buildGoApplication {
+  # NOTE: this uses `buildGoApplication` from `gomod2nix`. Which requires that you pre-generate
+  # the go.mod dependency hashes. Therefore you need to run `nix run .#gen-injective` which is below
+  pname = "injective";
+  version = "v1.13.1";
+  src = injective-src;
+  goVersion = "1.22";
+  modules = ./gomod2nix.toml;
+  doCheck = false;
+
+  engine = "cometbft/cometbft";
+  preFixup = ''
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "injectived"}
+    ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "client"}
+  '';
+  buildInputs = [libwasmvm_2_0_0];
+  };
+  gen-injective = mkGenerator "gen-injective" injective-src;
+}