From 536e2e77a702d0d2be6ba5d2eebf33b4261c58d4 Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Tue, 6 Aug 2024 15:58:18 +0200 Subject: [PATCH 1/3] Update Stride to v23.0.1 (#264) --- flake.lock | 8 ++++---- flake.nix | 2 +- packages/stride.nix | 8 ++++---- patches/stride-no-admin-check.patch | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index af88b263..29a2862b 100644 --- a/flake.lock +++ b/flake.lock @@ -1585,16 +1585,16 @@ "stride-src": { "flake": false, "locked": { - "lastModified": 1711572539, - "narHash": "sha256-WOoaijuB/Xziw3RMzVcLgR1iDWv72StuLL8K5JzcdlA=", + "lastModified": 1721921071, + "narHash": "sha256-EtsK7sjzQ2XfYt3DSV85IbKj7HEMy2Apt0m8kfgCEuk=", "owner": "Stride-Labs", "repo": "stride", - "rev": "093f25e17b1c9fae38a8092f9582af7c84bbaee4", + "rev": "d6e4e686e54a6a3c41d3ca0645f91ee1dc3ec441", "type": "github" }, "original": { "owner": "Stride-Labs", - "ref": "v21.0.0", + "ref": "v23.0.1", "repo": "stride", "type": "github" } diff --git a/flake.nix b/flake.nix index 1d62ca98..f28b2287 100644 --- a/flake.nix +++ b/flake.nix @@ -233,7 +233,7 @@ interchain-security-src.url = "github:cosmos/interchain-security/feat/ics-misbehaviour-handling"; interchain-security-src.flake = false; - stride-src.url = "github:Stride-Labs/stride/v21.0.0"; + stride-src.url = "github:Stride-Labs/stride/v23.0.1"; stride-src.flake = false; migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v4.2.0"; diff --git a/packages/stride.nix b/packages/stride.nix index cd42c33b..e484d123 100644 --- a/packages/stride.nix +++ b/packages/stride.nix @@ -9,11 +9,11 @@ with inputs; { stride = { name = "stride"; - version = "v21.0.0"; + version = "v23.0.1"; goVersion = "1.21"; src = stride-src; rev = stride-src.rev; - vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro="; + vendorHash = "sha256-T1xdcD5ucMuAIMZdLrlBxkdWJF2Uirn7+lBpypf6q98="; engine = "cometbft/cometbft"; preFixup = '' @@ -26,11 +26,11 @@ with inputs; stride-no-admin = { name = "stride-no-admin"; - version = "v21.0.0"; + version = "v23.0.1"; goVersion = "1.21"; src = stride-src; rev = stride-src.rev; - vendorHash = "sha256-N3+H90djql3pqyvKM9nlq2XIxUDw7lt9xtWYiKBabro="; + vendorHash = "sha256-T1xdcD5ucMuAIMZdLrlBxkdWJF2Uirn7+lBpypf6q98="; engine = "cometbft/cometbft"; preFixup = '' diff --git a/patches/stride-no-admin-check.patch b/patches/stride-no-admin-check.patch index 2ab91564..1316d880 100644 --- a/patches/stride-no-admin-check.patch +++ b/patches/stride-no-admin-check.patch @@ -1,5 +1,5 @@ diff --git a/utils/utils.go b/utils/utils.go -index 0bce89235..dd24c0f83 100644 +index 2b78e41f8..7487fe341 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -37,9 +37,6 @@ func Int64ToCoinString(amount int64, denom string) string { From 7f693a2a13dff856f520730a7ac1d46c101e2b5d Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:52:37 +0200 Subject: [PATCH 2/3] Update Neutron to v4.1.0 (#265) --- flake.lock | 8 ++++---- flake.nix | 2 +- modules/packages.nix | 2 +- packages/neutron.nix | 16 ++++++++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 29a2862b..cd57b2d0 100644 --- a/flake.lock +++ b/flake.lock @@ -1042,16 +1042,16 @@ "neutron-src": { "flake": false, "locked": { - "lastModified": 1713877185, - "narHash": "sha256-cslMi835EdyByhSUN1FG9ucXjh5tQxqs3YfCLqGwYLg=", + "lastModified": 1722341371, + "narHash": "sha256-dhBhWytamqp1hRsQH+xqpq1UJmPi6CRHHDQwveCQ2WQ=", "owner": "neutron-org", "repo": "neutron", - "rev": "73f419c3c60a3b811b08788519063560e84d97a8", + "rev": "db33d3302abb45ee3887a97ea3d53923241fc167", "type": "github" }, "original": { "owner": "neutron-org", - "ref": "v3.0.5", + "ref": "v4.1.0", "repo": "neutron", "type": "github" } diff --git a/flake.nix b/flake.nix index f28b2287..70644918 100644 --- a/flake.nix +++ b/flake.nix @@ -245,7 +245,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.5"; + neutron-src.url = "github:neutron-org/neutron/v4.1.0"; neutron-src.flake = false; provenance-src.url = "github:/provenance-io/provenance/v1.19.1"; diff --git a/modules/packages.nix b/modules/packages.nix index e22af801..70b9b0bf 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -109,7 +109,7 @@ }; neutron = import ../packages/neutron.nix { inherit (inputs) neutron-src; - inherit (self'.packages) libwasmvm_1_5_2; + inherit (self'.packages) libwasmvm_2_0_0; inherit cosmosLib; }; andromeda = import ../packages/andromeda.nix { diff --git a/packages/neutron.nix b/packages/neutron.nix index 65f56ed5..d4b9fc72 100644 --- a/packages/neutron.nix +++ b/packages/neutron.nix @@ -1,18 +1,22 @@ { neutron-src, cosmosLib, - libwasmvm_1_5_2, + libwasmvm_2_0_0, }: cosmosLib.mkCosmosGoApp { - goVersion = "1.21"; + goVersion = "1.22"; name = "neutron"; - version = "v3.0.5"; + version = "v4.1.0"; src = neutron-src; rev = neutron-src.rev; - vendorHash = "sha256-6WV7Z0KbvDReCJ7JccPnRWPkR4BMrfxRouTC5cC6PZc="; + vendorHash = "sha256-SKuAOWosHM2tvVAsTu54sAfbiTtCoJap3/LA4zfmuOo="; engine = "cometbft/cometbft"; preFixup = '' - ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "neutrond"} + ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "neutrond"} ''; - buildInputs = [libwasmvm_1_5_2]; + buildInputs = [libwasmvm_2_0_0]; + + # main module (github.com/neutron-org/neutron/v4) does not contain package github.com/neutron-org/neutron/v4/tests/feemarket + # main module (github.com/neutron-org/neutron/v4) does not contain package github.com/neutron-org/neutron/v4/tests/slinky + excludedPackages = ["tests/feemarket" "tests/slinky"]; } From fbece4c8894ff01329f401021a2b8e4c661eb79e Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:37:26 +0200 Subject: [PATCH 3/3] Update wasmd to v0.52.0 (#267) --- flake.lock | 8 ++++---- flake.nix | 2 +- modules/packages.nix | 2 +- packages/wasmd.nix | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index cd57b2d0..c60f656f 100644 --- a/flake.lock +++ b/flake.lock @@ -1690,16 +1690,16 @@ "wasmd-src": { "flake": false, "locked": { - "lastModified": 1713797184, - "narHash": "sha256-k7c8RdLggeM6hSQhJt0UREY/48T3ZRSSijA+TMFKhUc=", + "lastModified": 1720696698, + "narHash": "sha256-b2u3PWtjZAgmTdm/b3UcGn9K9qVQj9DR4FMcqg67T1w=", "owner": "CosmWasm", "repo": "wasmd", - "rev": "7b418de3f6cf8fbac1e9cb11c57983fcc17264d0", + "rev": "1ff818801d4aa5dd6f483571ac7a38660c59c671", "type": "github" }, "original": { "owner": "CosmWasm", - "ref": "v0.51.0", + "ref": "v0.52.0", "repo": "wasmd", "type": "github" } diff --git a/flake.nix b/flake.nix index 70644918..06f1f110 100644 --- a/flake.nix +++ b/flake.nix @@ -185,7 +185,7 @@ composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88"; composable-cosmos-src.flake = false; - wasmd-src.url = "github:CosmWasm/wasmd/v0.51.0"; + wasmd-src.url = "github:CosmWasm/wasmd/v0.52.0"; wasmd-src.flake = false; wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0"; diff --git a/modules/packages.nix b/modules/packages.nix index 70b9b0bf..693ccbd9 100644 --- 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_2_0_0; + inherit (self'.packages) libwasmvm_2_1_0; inherit cosmosLib; }; rollapp-evm = import ../packages/rollapp-evm.nix { diff --git a/packages/wasmd.nix b/packages/wasmd.nix index 5e308d4c..e69080c4 100644 --- a/packages/wasmd.nix +++ b/packages/wasmd.nix @@ -1,20 +1,20 @@ { wasmd-src, cosmosLib, - libwasmvm_2_0_0, + libwasmvm_2_1_0, }: cosmosLib.mkCosmosGoApp { name = "wasm"; - version = "v0.51.0"; + version = "v0.52.0"; goVersion = "1.21"; src = wasmd-src; rev = wasmd-src.rev; - vendorHash = "sha256-hurRN9NUz5Lh1AOpsZNZEKPYAu+6U6GEsYz4ZUh1aAs="; + vendorHash = "sha256-G4SujfIKNlfGUr7mM9C/iXd0Xc0/wEl6tJB02TufeiI="; tags = ["netgo"]; engine = "cometbft/cometbft"; - preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "wasmd"; + preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_0 "wasmd"; dontStrip = true; - buildInputs = [libwasmvm_2_0_0]; + buildInputs = [libwasmvm_2_1_0]; # main module (github.com/CosmWasm/wasmd) does not contain package github.com/CosmWasm/wasmd/tests/system excludedPackages = ["tests/system"];