Merge branch 'main' into luca_joss/update-celestia-appd-to-v1.11.0

informalsystems · Jun 10, 2024 · 8612aeb · 8612aeb
2 parents cae2438 + d7f2eac
commit 8612aeb
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 35 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -77,6 +77,9 @@
     gaia-main-src.url = "github:cosmos/gaia";
     gaia-main-src.flake = false;
 
+    gaia17-src.url = "github:cosmos/gaia/v17.2.0";
+    gaia17-src.flake = false;
+
     gaia15-src.url = "github:cosmos/gaia/v15.2.0";
     gaia15-src.flake = false;
 
@@ -155,7 +158,7 @@
     juno-src.url = "github:CosmosContracts/juno/v22.0.0";
     juno-src.flake = false;
 
-    osmosis-src.url = "github:osmosis-labs/osmosis/v24.0.1";
+    osmosis-src.url = "github:osmosis-labs/osmosis/v25.0.0";
     osmosis-src.flake = false;
 
     sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0";
@@ -179,12 +182,15 @@
     composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88";
     composable-cosmos-src.flake = false;
 
-    wasmd-src.url = "github:CosmWasm/wasmd/v0.50.0";
+    wasmd-src.url = "github:CosmWasm/wasmd/v0.51.0";
     wasmd-src.flake = false;
 
     wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0";
     wasmvm_1-src.flake = false;
 
+    wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0";
+    wasmvm_2_0_0-src.flake = false;
+
     wasmvm_1_5_2-src.url = "github:CosmWasm/wasmvm/v1.5.2";
     wasmvm_1_5_2-src.flake = false;
 
@@ -212,7 +218,7 @@
     wasmvm_1_beta7-src.url = "github:CosmWasm/wasmvm/v1.0.0-beta7";
     wasmvm_1_beta7-src.flake = false;
 
-    apalache-src.url = "github:informalsystems/apalache/v0.42.0";
+    apalache-src.url = "github:informalsystems/apalache/v0.44.11";
     apalache-src.flake = false;
 
     ignite-cli-src.url = "github:ignite/cli/v0.24.0";
@@ -233,7 +239,7 @@
     celestia-node-src.url = "github:celestiaorg/celestia-node/v0.13.0";
     celestia-node-src.flake = false;
 
-    neutron-src.url = "github:neutron-org/neutron/v3.0.2";
+    neutron-src.url = "github:neutron-org/neutron/v3.0.5";
     neutron-src.flake = false;
 
     provenance-src.url = "github:/provenance-io/provenance/v1.17.0";

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

diff --git a/modules/devshells.nix b/modules/devshells.nix
@@ -12,6 +12,7 @@
     devShells = {
       default = pkgs.mkShell {
         buildInputs = with pkgs; [
+          nil
           alejandra
         ];
       };

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -166,7 +166,7 @@
         };
         wasmd = import ../packages/wasmd.nix {
           inherit (inputs) wasmd-src;
-          inherit (self'.packages) libwasmvm_1_5_0;
+          inherit (self'.packages) libwasmvm_2_0_0;
           inherit cosmosLib;
         };
         rollapp-evm = import ../packages/rollapp-evm.nix {

diff --git a/packages/apalache.nix b/packages/apalache.nix
@@ -2,7 +2,7 @@
   apalache-src,
   pkgs,
 }: let
-  version = "v0.42.0";
+  version = "v0.44.11 ";
 
   postPatch = ''
     # Patch the build.sbt file so that it does not call the `git describe` command.
@@ -11,20 +11,20 @@
     # not available, hence the dependency resolution would fail. As a workaround,
     # we use the version string provided in Nix as the build version.
     substituteInPlace ./build.sbt \
-      --replace 'Process("git describe --tags --always").!!.trim' '"${version}"'
+      --replace-warn 'Process("git describe --tags --always").!!.trim' '"${version}"'
 
     # Patch the wrapper script to use a JRE from the Nix store,
     # and to load the JAR from the Nix store by default.
     substituteInPlace ./src/universal/bin/apalache-mc \
-      --replace 'exec java' 'exec ${pkgs.jre}/bin/java' \
-      --replace '$DIR/../lib/apalache.jar' "$out/lib/apalache.jar"
+      --replace-warn 'exec java' 'exec ${pkgs.jre}/bin/java' \
+      --replace-warn '$DIR/../lib/apalache.jar' "$out/lib/apalache.jar"
   '';
 in
   pkgs.mkSbtDerivation {
     inherit version postPatch;
     pname = "apalache";
 
-    depsSha256 = "sha256-1/cI5JK1/uYVK7ihoyZwR4cHJqzsNW9eVaF7OKu92IE=";
+    depsSha256 = "sha256-Bkw/ZV4xYPBR1bx31otb6j14ivg995MsVNEXbYha7B0=";
     src = apalache-src;
     buildPhase = "make dist";
     installPhase = ''

diff --git a/packages/gaia.nix b/packages/gaia.nix
@@ -159,6 +159,21 @@
         # Tests have to be disabled because they require Docker to run
         doCheck = false;
       };
+
+      gaia17 = {
+        name = "gaia";
+        vendorHash = "sha256-gDzq+Jfs5EyH0tbeBzkz3xR75t324yaWLRhw59U8aRI=";
+        version = "v17.2.0";
+        goVersion = "1.21";
+        src = gaia17-src;
+        rev = gaia17-src.rev;
+        tags = ["netgo"];
+        engine = "cometbft/cometbft";
+        proxyVendor = true;
+
+        # Tests have to be disabled because they require Docker to run
+        doCheck = false;
+      };
     };
 in
   gaias // {gaia-main = gaias.gaia8;}
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_0_0 = {
+      src = "${inputs.wasmvm_2_0_0-src}/libwasmvm";
+      version = "v2.0.0";
+      cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4=";
+      cargoLock = {
+        lockFile = "${inputs.wasmvm_2_0_0-src}/libwasmvm/Cargo.lock";
+        outputHashes = {
+          "cosmwasm-crypto-2.0.0" = "sha256-wXBWwc1jZsO0kfrh0jkl4+TeFsM/8ZkptCEJSpgsLG8=";
+        };
+      };
+    };
+
     libwasmvm_1_5_2 = {
       src = "${inputs.wasmvm_1_5_2-src}/libwasmvm";
       version = "v1.5.2";

diff --git a/packages/neutron.nix b/packages/neutron.nix
@@ -6,10 +6,10 @@
 cosmosLib.mkCosmosGoApp {
   goVersion = "1.21";
   name = "neutron";
-  version = "v3.0.2";
+  version = "v3.0.5";
   src = neutron-src;
   rev = neutron-src.rev;
-  vendorHash = "sha256-Ao/soQsOw00QZ8c7BF42od303wdiFo30flWSPTm5Mzc=";
+  vendorHash = "sha256-6WV7Z0KbvDReCJ7JccPnRWPkR4BMrfxRouTC5cC6PZc=";
   engine = "cometbft/cometbft";
   preFixup = ''
     ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "neutrond"}

diff --git a/packages/osmosis.nix b/packages/osmosis.nix
@@ -5,11 +5,11 @@
 }:
 cosmosLib.mkCosmosGoApp {
   name = "osmosis";
-  version = "v24.0.1";
+  version = "v25.0.0";
   goVersion = "1.21";
   src = osmosis-src;
   rev = osmosis-src.rev;
-  vendorHash = "sha256-RjBnaHKge3b1CwIFUFsyE/Yv83QC8UsGtx87mgI1PPo=";
+  vendorHash = "sha256-G/LIUpwWDIwB8oGBnNQ00Y7knoZSYjnON+3+VgIHSQQ=";
   tags = ["netgo"];
   excludedPackages = ["cl-genesis-positions"];
   engine = "cometbft/cometbft";

diff --git a/packages/wasmd.nix b/packages/wasmd.nix
@@ -1,20 +1,20 @@
 {
   wasmd-src,
   cosmosLib,
-  libwasmvm_1_5_0,
+  libwasmvm_2_0_0,
 }:
 cosmosLib.mkCosmosGoApp {
   name = "wasm";
-  version = "v0.50.0";
+  version = "v0.51.0";
   goVersion = "1.21";
   src = wasmd-src;
   rev = wasmd-src.rev;
-  vendorHash = "sha256-IS+WupPaOZgx1iJTHKbX8r6z3/9TsWamTEZCJbVpCOg=";
+  vendorHash = "sha256-hurRN9NUz5Lh1AOpsZNZEKPYAu+6U6GEsYz4ZUh1aAs=";
   tags = ["netgo"];
   engine = "cometbft/cometbft";
-  preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_0 "wasmd";
+  preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "wasmd";
   dontStrip = true;
-  buildInputs = [libwasmvm_1_5_0];
+  buildInputs = [libwasmvm_2_0_0];
 
   # main module (github.com/CosmWasm/wasmd) does not contain package github.com/CosmWasm/wasmd/tests/system
   excludedPackages = ["tests/system"];