Add Gaia v19.1.0 (#271)

informalsystems · Aug 28, 2024 · 22efb3f · 22efb3f
1 parent 145ce6c
commit 22efb3f
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -81,6 +81,9 @@
     gaia-main-src.url = "github:cosmos/gaia";
     gaia-main-src.flake = false;
 
+    gaia19-src.url = "github:cosmos/gaia/v19.1.0";
+    gaia19-src.flake = false;
+
     gaia18-src.url = "github:cosmos/gaia/v18.1.0";
     gaia18-src.flake = false;
 

diff --git a/lib/default.nix b/lib/default.nix
@@ -116,6 +116,7 @@ nix-std: {
     buildGoModuleVersion = {
       "1.21" = pkgs.buildGo121Module;
       "1.22" = pkgs.buildGo122Module;
+      "1.23" = pkgs.buildGo123Module;
     };
 
     buildGoModule = buildGoModuleVersion.${goVersion};

diff --git a/modules/apps.nix b/modules/apps.nix
@@ -94,6 +94,10 @@
             type = "app";
             program = "${packages.gaia17}/bin/gaiad";
           };
+          gaia19 = {
+            type = "app";
+            program = "${packages.gaia19}/bin/gaiad";
+          };
           gaia-main = {
             type = "app";
             program = "${packages.gaia-main}/bin/gaiad";

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -176,7 +176,7 @@
           (import ../packages/gaia.nix {
             inherit inputs cosmosLib;
             inherit (cosmosLib) mkCosmosGoApp;
-            inherit (self'.packages) libwasmvm_1_5_0;
+            inherit (self'.packages) libwasmvm_1_5_0 libwasmvm_2_0_0;
           })
           # IBC Go
           (import ../packages/ibc-go.nix {

diff --git a/packages/gaia.nix b/packages/gaia.nix
@@ -2,6 +2,7 @@
   inputs,
   mkCosmosGoApp,
   libwasmvm_1_5_0,
+  libwasmvm_2_0_0,
   cosmosLib,
 }: let
   gaias = with inputs;
@@ -196,6 +197,30 @@
         # Tests have to be disabled because they require Docker to run
         doCheck = false;
       };
+
+      gaia19 = {
+        name = "gaia";
+        vendorHash = "sha256-+9Q5Zcg/WtUPp1AbU9sGh9pxALjJesQ+m2sd4WQYOEs=";
+        version = "v19.1.0";
+        # nixpkgs latest go version v1.22 is v1.22.5 but Gaia v19.1.0 requires
+        # v1.22.6 or more so v1.23 is used instead
+        goVersion = "1.23";
+        src = gaia19-src;
+        rev = gaia19-src.rev;
+        tags = ["netgo"];
+        engine = "cometbft/cometbft";
+        proxyVendor = true;
+
+        preFixup = ''
+          ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "gaiad"}
+        '';
+        buildInputs = [libwasmvm_2_0_0];
+
+        # Tests have to be disabled because they require Docker to run
+        doCheck = false;
+
+        excludedPackages = ["tests/interchain"];
+      };
     };
 in
   gaias // {gaia-main = gaias.gaia8;}