diff --git a/flake.lock b/flake.lock index 6c5679dd..9f195d2c 100644 --- a/flake.lock +++ b/flake.lock @@ -68,16 +68,16 @@ "celestia-app-src": { "flake": false, "locked": { - "lastModified": 1717487173, - "narHash": "sha256-/17ysw5QX8hHdMPkp05eNqJFPYKU7NIn1jTFw688Fjg=", + "lastModified": 1722019080, + "narHash": "sha256-NN3O1nN+LTxDzYBzXjksfKl9DMCbFy+MsuxPBKgv9Dc=", "owner": "celestiaorg", "repo": "celestia-app", - "rev": "21b5bc747c8500e4888474df7d828e66c33f332d", + "rev": "b6db108a444c234e4b4656031d876bc45421c5f3", "type": "github" }, "original": { "owner": "celestiaorg", - "ref": "v1.11.0", + "ref": "v1.14.0", "repo": "celestia-app", "type": "github" } @@ -183,10 +183,7 @@ "inputs": { "flake-compat": "flake-compat", "nix": "nix", - "nixpkgs": [ - "haqq-src", - "nixpkgs-unstable" - ], + "nixpkgs": ["haqq-src", "nixpkgs-unstable"], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -644,12 +641,7 @@ }, "gitignore": { "inputs": { - "nixpkgs": [ - "haqq-src", - "devenv", - "pre-commit-hooks", - "nixpkgs" - ] + "nixpkgs": ["haqq-src", "devenv", "pre-commit-hooks", "nixpkgs"] }, "locked": { "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", @@ -667,9 +659,7 @@ "gomod2nix": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": ["nixpkgs"] }, "locked": { "lastModified": 1722589758, @@ -687,14 +677,8 @@ }, "gomod2nix_2": { "inputs": { - "flake-utils": [ - "haqq-src", - "flake-utils" - ], - "nixpkgs": [ - "haqq-src", - "nixpkgs-unstable" - ] + "flake-utils": ["haqq-src", "flake-utils"], + "nixpkgs": ["haqq-src", "nixpkgs-unstable"] }, "locked": { "narHash": "sha256-yfQQ67dLejP0FLK76LKHbkzcQqNIrux6MFe32MMFGNQ=", @@ -865,6 +849,23 @@ "type": "github" } }, + "ibc-go-v9-src": { + "flake": false, + "locked": { + "lastModified": 1723037346, + "narHash": "sha256-ba8gbJ0l4l8ZRT9XVN3hTcnxZSb5Fn20p1xiEG4/54c=", + "owner": "cosmos", + "repo": "ibc-go", + "rev": "66ebf864d7bfe2193a96c972a9e74196b2ddf104", + "type": "github" + }, + "original": { + "owner": "cosmos", + "ref": "v9.0.0-beta.1", + "repo": "ibc-go", + "type": "github" + } + }, "ibc-rs-src": { "flake": false, "locked": { @@ -981,16 +982,16 @@ "juno-src": { "flake": false, "locked": { - "lastModified": 1713701044, - "narHash": "sha256-AN9g1t/zOZVs5S/ZXP4/MrIC9kN6nUGG/wLNJz5fL6E=", + "lastModified": 1720542396, + "narHash": "sha256-niG12wn49bt184zqctrGsT73mgKfZUPTZAzSKX+ZLVs=", "owner": "CosmosContracts", "repo": "juno", - "rev": "b0faafbd6df4bb03940d99df13030af7f7bc315b", + "rev": "bf140aa60045ba92b83d0cb7f3bc47a2661a4e7e", "type": "github" }, "original": { "owner": "CosmosContracts", - "ref": "v22.0.0", + "ref": "v23.0.0", "repo": "juno", "type": "github" } @@ -1013,16 +1014,16 @@ "migaloo-src": { "flake": false, "locked": { - "lastModified": 1710414169, - "narHash": "sha256-BGOUAw48c92KGpUMvzStiJfd+tgJpTBYk0bAvvUNYL8=", + "lastModified": 1720168667, + "narHash": "sha256-vOzOBNGaIOhTjTnycLp6sQKGAklkPVZdJLPPqdjufnM=", "owner": "White-Whale-Defi-Platform", "repo": "migaloo-chain", - "rev": "5382bfc56173a0f57dcaef34e99c59c99cf70dda", + "rev": "076c6d12ecadcf4db42592a8340cb3be2ed23349", "type": "github" }, "original": { "owner": "White-Whale-Defi-Platform", - "ref": "v4.1.3", + "ref": "v4.2.0", "repo": "migaloo-chain", "type": "github" } @@ -1046,16 +1047,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" } @@ -1063,11 +1064,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": [ - "haqq-src", - "devenv", - "nixpkgs" - ], + "nixpkgs": ["haqq-src", "devenv", "nixpkgs"], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -1102,9 +1099,7 @@ "nix2container": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": ["nixpkgs"] }, "locked": { "lastModified": 1712990762, @@ -1245,34 +1240,26 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1715157587, - "narHash": "sha256-D/CymboICWe73MBGF036W5NT/pyaV8Wvll2bJmYNmHg=", + "lastModified": 1719537675, + "narHash": "sha256-8Lb2SppNfq3+JwP3uanmCxuCek6tXOO/GcG27XGxRrE=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "15566f1f2945a16af9243dd376ee58a0d691b66a", + "rev": "b973bffdf127866f45624d7e5a81f31fdc8e8e0b", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v25.0.0", + "ref": "v25.2.0", "repo": "osmosis", "type": "github" } }, "pre-commit-hooks": { "inputs": { - "flake-compat": [ - "haqq-src", - "devenv", - "flake-compat" - ], + "flake-compat": ["haqq-src", "devenv", "flake-compat"], "flake-utils": "flake-utils_2", "gitignore": "gitignore", - "nixpkgs": [ - "haqq-src", - "devenv", - "nixpkgs" - ], + "nixpkgs": ["haqq-src", "devenv", "nixpkgs"], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1396,6 +1383,7 @@ "ibc-go-v6-src": "ibc-go-v6-src", "ibc-go-v7-src": "ibc-go-v7-src", "ibc-go-v8-src": "ibc-go-v8-src", + "ibc-go-v9-src": "ibc-go-v9-src", "ibc-rs-src": "ibc-rs-src", "ica-src": "ica-src", "ignite-cli-src": "ignite-cli-src", @@ -1574,16 +1562,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" } @@ -1680,16 +1668,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 524b9950..fb73e276 100644 --- a/flake.nix +++ b/flake.nix @@ -144,6 +144,9 @@ ibc-go-v8-src.url = "github:cosmos/ibc-go/v8.3.1"; ibc-go-v8-src.flake = false; + ibc-go-v9-src.url = "github:cosmos/ibc-go/v9.0.0-beta.1"; + ibc-go-v9-src.flake = false; + cosmos-sdk-src.url = "github:cosmos/cosmos-sdk/v0.46.0"; cosmos-sdk-src.flake = false; @@ -162,10 +165,10 @@ evmos-src.url = "github:evmos/evmos/v16.0.0-rc4"; evmos-src.flake = false; - juno-src.url = "github:CosmosContracts/juno/v22.0.0"; + juno-src.url = "github:CosmosContracts/juno/v23.0.0"; juno-src.flake = false; - osmosis-src.url = "github:osmosis-labs/osmosis/v25.0.0"; + osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0"; osmosis-src.flake = false; sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0"; @@ -189,7 +192,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"; @@ -237,19 +240,19 @@ 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.1.3"; + migaloo-src.url = "github:White-Whale-Defi-Platform/migaloo-chain/v4.2.0"; migaloo-src.flake = false; - celestia-app-src.url = "github:celestiaorg/celestia-app/v1.11.0"; + celestia-app-src.url = "github:celestiaorg/celestia-app/v1.14.0"; celestia-app-src.flake = false; 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/apps.nix b/modules/apps.nix index 732295fe..99c100f6 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -122,6 +122,10 @@ type = "app"; program = "${packages.ibc-go-v8-simapp}/bin/simd"; }; + ibc-go-v9-simapp = { + type = "app"; + program = "${packages.ibc-go-v9-simapp}/bin/simd"; + }; ignite-cli = { type = "app"; program = "${packages.ignite-cli}/bin/ignite"; diff --git a/modules/packages.nix b/modules/packages.nix index 5ef81f9d..788034f0 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 { @@ -161,7 +161,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/celestia-app.nix b/packages/celestia-app.nix index 67e593d8..0b6382f9 100644 --- a/packages/celestia-app.nix +++ b/packages/celestia-app.nix @@ -4,11 +4,11 @@ }: mkCosmosGoApp { name = "celestia-app"; - version = "v1.11.0"; + version = "v1.14.0"; src = celestia-app-src; rev = celestia-app-src.rev; goVersion = "1.22"; - vendorHash = "sha256-O06yhP0XPD8kMhOYS0YVfs1LWwGsbuzuwbetnZ+GAJ8="; + vendorHash = "sha256-xvjdU0GPbqet8L8rvRMZ8AKN7huRn6eDoEYGJYhdJaY="; engine = "tendermint/tendermint"; doCheck = false; } diff --git a/packages/ibc-go.nix b/packages/ibc-go.nix index 57973a9d..8b01406b 100644 --- a/packages/ibc-go.nix +++ b/packages/ibc-go.nix @@ -84,4 +84,16 @@ with inputs; engine = "cometbft/cometbft"; excludedPackages = ["./e2e" "./modules/apps/callbacks" "./modules/capability"]; }; + + ibc-go-v9-simapp = { + name = "simd"; + version = "v9.0.0-beta.1"; + src = ibc-go-v9-src; + rev = ibc-go-v9-src.rev; + sourceRoot = "source/simapp"; + vendorHash = "sha256-gr5Wre8OoSVBR+JNNCvs9zr6T5TwCgSAnchENEgu9qM="; + goVersion = "1.22"; + tags = ["netgo"]; + engine = "cometbft/cometbft"; + }; } diff --git a/packages/juno.nix b/packages/juno.nix index 25afd201..3480147f 100644 --- a/packages/juno.nix +++ b/packages/juno.nix @@ -5,11 +5,11 @@ }: cosmosLib.mkCosmosGoApp { name = "juno"; - version = "v22.0.0"; + version = "v23.0.0"; goVersion = "1.22"; src = juno-src; rev = juno-src.rev; - vendorHash = "sha256-5TTW7ftC5bQgdKOQJtmAQ8GyAuAtTmeFIl+hh12WX4M="; + vendorHash = "sha256-oyxW/xvZne3Ybf+1tUUk2qP2gkjGuzdHjWYunXQB8g8="; tags = ["netgo"]; engine = "cometbft/cometbft"; excludedPackages = ["interchaintest"]; diff --git a/packages/migaloo.nix b/packages/migaloo.nix index e69ded6c..9da5a6b7 100644 --- a/packages/migaloo.nix +++ b/packages/migaloo.nix @@ -5,10 +5,11 @@ }: cosmosLib.mkCosmosGoApp { name = "migaloo"; - version = "v4.1.3"; + version = "v4.2.0"; + goVersion = "1.22"; src = migaloo-src; rev = migaloo-src.rev; - vendorHash = "sha256-2rQm+pVniubKXkH3rXlQUOtgXm2Vp0faaqvU7QpEXN4="; + vendorHash = "sha256-ZmQk9o9tqysfz65Lr9bjT0DwZhVTNMmvO8j13sMXGk8="; engine = "cometbft/cometbft"; preFixup = '' ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "migalood"} 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"]; } diff --git a/packages/osmosis.nix b/packages/osmosis.nix index bbc1325a..6853d24d 100644 --- a/packages/osmosis.nix +++ b/packages/osmosis.nix @@ -5,11 +5,11 @@ }: cosmosLib.mkCosmosGoApp { name = "osmosis"; - version = "v25.0.0"; + version = "v25.2.0"; goVersion = "1.21"; src = osmosis-src; rev = osmosis-src.rev; - vendorHash = "sha256-G/LIUpwWDIwB8oGBnNQ00Y7knoZSYjnON+3+VgIHSQQ="; + vendorHash = "sha256-ZzgAg7Z7cgJir3rfcrQISoT+Ep5UmMY/uVN985UaPYU="; tags = ["netgo"]; excludedPackages = ["cl-genesis-positions"]; engine = "cometbft/cometbft"; 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/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"]; 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 {