Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Gaia v20 #276

Merged
merged 7 commits into from
Oct 23, 2024
Merged

Add Gaia v20 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
483a52c
Use latest commit on main for Gaia v20
ljoss17 Sep 2, 2024
fc9bea5
Update `interchain-security` with Permissionless ICS
romac Sep 5, 2024
ece770f
Use latest release ICS
romac Sep 24, 2024
ceb93cc
Use Gaia tag v20.0.0
ljoss17 Sep 30, 2024
af8d2cb
Merge branch 'main' into luca_joss/add-gaia-v20-alpha
ljoss17 Sep 30, 2024
302ca94
Merge branch 'main' into luca_joss/add-gaia-v20-alpha
ljoss17 Oct 15, 2024
6abc05a
Bump CometBFT to v0.38.11
ljoss17 Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
sconfig-src.flake = false;

# CometBFT
cometbft-src.url = "github:cometbft/cometbft/v0.38.0";
cometbft-src.url = "github:cometbft/cometbft/v0.38.11";
cometbft-src.flake = false;

# Relayer Sources
Expand All @@ -81,6 +81,9 @@
gaia-main-src.url = "github:cosmos/gaia";
gaia-main-src.flake = false;

gaia20-src.url = "github:cosmos/gaia/v20.0.0";
gaia20-src.flake = false;

gaia19-src.url = "github:cosmos/gaia/v19.1.0";
gaia19-src.flake = false;

Expand Down Expand Up @@ -268,7 +271,7 @@
ignite-cli-src.url = "github:ignite/cli/v0.24.0";
ignite-cli-src.flake = false;

interchain-security-src.url = "github:cosmos/interchain-security/feat/ics-misbehaviour-handling";
interchain-security-src.url = "github:cosmos/interchain-security/v6.1.0";
interchain-security-src.flake = false;

stride-src.url = "github:Stride-Labs/stride/v23.0.1";
Expand Down
4 changes: 4 additions & 0 deletions modules/apps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
type = "app";
program = "${packages.gaia19}/bin/gaiad";
};
gaia20 = {
type = "app";
program = "${packages.gaia20}/bin/gaiad";
};
gaia-main = {
type = "app";
program = "${packages.gaia-main}/bin/gaiad";
Expand Down
2 changes: 1 addition & 1 deletion modules/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
(import ../packages/gaia.nix {
inherit inputs cosmosLib;
inherit (cosmosLib) mkCosmosGoApp;
inherit (self'.packages) libwasmvm_1_5_0 libwasmvm_2_0_0;
inherit (self'.packages) libwasmvm_1_5_0 libwasmvm_2_0_0 libwasmvm_2_1_2;
})
# IBC Go
(import ../packages/ibc-go.nix {
Expand Down
2 changes: 1 addition & 1 deletion packages/cometbft.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
buildGoModule {
name = "cometbft";
src = cometbft-src;
vendorHash = "sha256-rZeC0B5U0bdtZAw/hnMJ7XG73jN0nsociAN8GGdmlUY=";
vendorHash = "sha256-bQseXRiRup7g7TChMRC3K8tjFLgyqzLWxT9LgsXQnqw=";
doCheck = false;
}
25 changes: 25 additions & 0 deletions packages/gaia.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
mkCosmosGoApp,
libwasmvm_1_5_0,
libwasmvm_2_0_0,
libwasmvm_2_1_2,
cosmosLib,
}: let
gaias = with inputs;
Expand Down Expand Up @@ -221,6 +222,30 @@

excludedPackages = ["tests/interchain"];
};

gaia20 = {
name = "gaia";
vendorHash = "sha256-1WErtwmYr3AgY1lFpiFYrosU4leJ+ZC13Vbk8vwmmg8=";
version = "v20.0.0";
# nixpkgs latest go version v1.22 is v1.22.5 but Gaia v20.0.0 requires
# v1.22.6 or more so v1.23 is used instead
goVersion = "1.23";
src = gaia20-src;
rev = gaia20-src.rev;
tags = ["netgo"];
engine = "cometbft/cometbft";
proxyVendor = true;

preFixup = ''
${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_2 "gaiad"}
'';
buildInputs = [libwasmvm_2_1_2];

# Tests have to be disabled because they require Docker to run
doCheck = false;

excludedPackages = ["tests/interchain"];
};
};
in
gaias // {gaia-main = gaias.gaia8;}
5 changes: 3 additions & 2 deletions packages/interchain-security.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
mkCosmosGoApp {
name = "interchain-security";
appName = "interchain-security";
version = "v3.0.0-pre";
version = "v6.1.0";
src = interchain-security-src;
rev = interchain-security-src.rev;
vendorHash = "sha256-j0xus8vN6bnFMUXyvT8r7ONPQyaEBydKQ8qH2BevWPs=";
vendorHash = "sha256-hBKJA5kIw7aHicCcmvzm9pXb+WPjbx5mq7UDPkLLuJ4=";
goVersion = "1.22";
tags = ["netgo"];
engine = "cometbft/cometbft";
doCheck = false; # tests are currently failing
Expand Down