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

Update Consumer chains #245

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Update Consumer chains #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
671d43d
Update Stride and Neutron
ljoss17 Apr 16, 2024
f0d7c35
Remove 'consumer' suffix from Stride chain
ljoss17 Apr 16, 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
31 changes: 8 additions & 23 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: 2 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,9 @@
interchain-security-src.url = "github:cosmos/interchain-security/feat/ics-misbehaviour-handling";
interchain-security-src.flake = false;

stride-src.url = "github:Stride-Labs/stride/v8.0.0";
stride-src.url = "github:Stride-Labs/stride/v21.0.0";
stride-src.flake = false;

stride-consumer-src.url = "github:Stride-Labs/stride/v12.1.0";
stride-consumer-src.flake = false;

migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v3.0.2";
migaloo-src.flake = false;

Expand All @@ -239,7 +236,7 @@
celestia-node-src.url = "github:celestiaorg/celestia-node/v0.13.0";
celestia-node-src.flake = false;

neutron-src.url = "github:neutron-org/neutron/v2.0.0";
neutron-src.url = "github:neutron-org/neutron/v3.0.2";
neutron-src.flake = false;

provenance-src.url = "github:/provenance-io/provenance/v1.17.0";
Expand Down
8 changes: 0 additions & 8 deletions modules/apps.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,6 @@
type = "app";
program = "${packages.stride}/bin/strided";
};
stride-consumer = {
type = "app";
program = "${packages.stride-consumer}/bin/strided";
};
stride-consumer-no-admin = {
type = "app";
program = "${packages.stride-consumer-no-admin}/bin/strided";
};
stride-no-admin = {
type = "app";
program = "${packages.stride-no-admin}/bin/strided";
Expand Down
4 changes: 3 additions & 1 deletion modules/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
};
neutron = import ../packages/neutron.nix {
inherit (inputs) neutron-src;
inherit (self'.packages) libwasmvm_1_5_0;
inherit (self'.packages) libwasmvm_1_5_2;
inherit cosmosLib;
};
andromeda = import ../packages/andromeda.nix {
Expand Down Expand Up @@ -198,7 +198,9 @@
# Stride
(import ../packages/stride.nix {
inherit inputs;
inherit (self'.packages) libwasmvm_1_5_2;
inherit (cosmosLib) mkCosmosGoApp;
inherit cosmosLib;
})
# Evmos
(import ../packages/evmos {
Expand Down
12 changes: 6 additions & 6 deletions packages/neutron.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
neutron-src,
cosmosLib,
libwasmvm_1_5_0,
libwasmvm_1_5_2,
}:
cosmosLib.mkCosmosGoApp {
goVersion = "1.20";
goVersion = "1.21";
name = "neutron";
version = "v2.0.0";
version = "v3.0.2";
src = neutron-src;
rev = neutron-src.rev;
vendorHash = "sha256-uLInKbuL886cfXCyQvIDZJHUC8AK9fR39yNBHDO+Qzc=";
vendorHash = "sha256-Ao/soQsOw00QZ8c7BF42od303wdiFo30flWSPTm5Mzc=";
engine = "cometbft/cometbft";
preFixup = ''
${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_0 "neutrond"}
${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "neutrond"}
'';
buildInputs = [libwasmvm_1_5_0];
buildInputs = [libwasmvm_1_5_2];
}
45 changes: 18 additions & 27 deletions packages/stride.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,42 @@
{
inputs,
mkCosmosGoApp,
cosmosLib,
libwasmvm_1_5_2,
}:
with inputs;
builtins.mapAttrs (_: mkCosmosGoApp)
{
stride = {
name = "stride";
version = "v8.0.0";
version = "v21.0.0";
goVersion = "1.21";
src = stride-src;
rev = stride-src.rev;
vendorHash = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10=";
engine = "tendermint/tendermint";

doCheck = false;
};

stride-consumer = {
name = "stride-consumer";
version = "v12.1.0";
src = stride-consumer-src;
rev = stride-consumer-src.rev;
vendorHash = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04=";
vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro=";
engine = "cometbft/cometbft";

doCheck = false;
};
preFixup = ''
${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "strided"}
'';
buildInputs = [libwasmvm_1_5_2];

stride-consumer-no-admin = {
name = "stride-consumer-no-admin";
version = "v12.1.0";
src = stride-consumer-src;
rev = stride-consumer-src.rev;
vendorHash = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04=";
engine = "cometbft/cometbft";

patches = [../patches/stride-no-admin-check.patch];
doCheck = false;
};

stride-no-admin = {
name = "stride-no-admin";
version = "v8.0.0";
version = "v21.0.0";
goVersion = "1.21";
src = stride-src;
rev = stride-src.rev;
vendorHash = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10=";
engine = "tendermint/tendermint";
vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro=";
engine = "cometbft/cometbft";

preFixup = ''
${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "strided"}
'';
buildInputs = [libwasmvm_1_5_2];

patches = [../patches/stride-no-admin-check.patch];
doCheck = false;
Expand Down
6 changes: 3 additions & 3 deletions patches/stride-no-admin-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/utils/utils.go b/utils/utils.go
index 74ff4794..cb2a6f37 100644
index 0bce89235..dd24c0f83 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -35,9 +35,6 @@ func Int64ToCoinString(amount int64, denom string) string {
@@ -37,9 +37,6 @@ func Int64ToCoinString(amount int64, denom string) string {
}

func ValidateAdminAddress(address string) error {
- if !Admins[address] {
- return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, fmt.Sprintf("invalid creator address (%s)", address))
- return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, fmt.Sprintf("address (%s) is not an admin", address))
- }
return nil
}
Expand Down