Update Injective to v1.13.1 (#263)

* Update Injective to v1.13.1 * Run nix fmt * Use go 1.22 when building Injective * Update nixpkgs * Attempt to fix mac build * Add libiconv --------- Co-authored-by: Romain Ruetschi <[email protected]>
informalsystems · Aug 14, 2024 · f4e3139 · f4e3139
1 parent 5115762
commit f4e3139
Show file tree

Hide file tree

Showing 7 changed files with 842 additions and 102 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -43,12 +43,16 @@
     sbt-derivation.url = "github:zaninime/sbt-derivation";
     nix-std.url = "github:chessai/nix-std";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    gomod2nix.url = "github:JonathanLorimer/gomod2nix/jonathan/update-go";
     nix2container = {
       url = "github:nlewo/nix2container";
       # just to save size of this flake (assuming that currently containers are optional features)
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    gomod2nix = {
+      url = "github:nix-community/gomod2nix";
+      # just to save size of this flake (assuming that currently containers are optional features)
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # Freshautomations inputs
     stoml-src.url = "github:freshautomations/stoml";
     stoml-src.flake = false;
@@ -149,7 +153,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,15 @@
             inherit (inputs) evmos-src;
             inherit (cosmosLib) mkGenerator;
           })
+          # Injective
+          (import ../packages/injective {
+            inherit pkgs;
+            inherit system;
+            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/evmos/default.nix b/packages/evmos/default.nix
@@ -9,7 +9,8 @@
     pname = "evmos";
     version = "v16.0.0-rc4";
     src = evmos-src;
-    goVersion = "1.21";
+    go = pkgs.go_1_21;
+    pwd = ./.;
     modules = ./gomod2nix.toml;
     doCheck = false;
   };

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,28 @@
+{
+  pkgs,
+  injective-src,
+  system,
+  cosmosLib,
+  libwasmvm_2_0_0,
+  mkGenerator,
+}: {
+  injective = pkgs.gomod2nix.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;
+    go = pkgs.go_1_22;
+    modules = ./gomod2nix.toml;
+    doCheck = false;
+    pwd = ./.;
+
+    engine = "cometbft/cometbft";
+    preFixup = ''
+      ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "injectived"}
+      ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "client"}
+    '';
+    buildInputs = with pkgs; [libwasmvm_2_0_0 libiconv];
+  };
+  gen-injective = mkGenerator "gen-injective" injective-src;
+}