diff --git a/flake.lock b/flake.lock index fbd9beb4..cd93d281 100644 --- a/flake.lock +++ b/flake.lock @@ -153,12 +153,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1692792214, + "narHash": "sha256-voZDQOvqHsaReipVd3zTKSBwN7LZcUwi3/ThMxRZToU=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "1721b3e7c882f75f2301b00d48a2884af8c448ae", "type": "github" }, "original": { @@ -169,7 +172,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -185,14 +188,29 @@ "type": "github" } }, + "flake-utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gaia-main-src": { "flake": false, "locked": { - "lastModified": 1664958609, - "narHash": "sha256-w9tJJXimf0AhYhgColCjdHGh14sAId0Svtz/hHNYNlI=", + "lastModified": 1692777545, + "narHash": "sha256-Gg6pqITR+aqq4FBE0h/HvXpG+whtli2gJXw+dsyoKEE=", "owner": "cosmos", "repo": "gaia", - "rev": "4d3a104f6ce6f441e6588cdb8fa6e600396ad3ac", + "rev": "97d0a1359716c5c534053a6a15a007b740d34780", "type": "github" }, "original": { @@ -480,16 +498,50 @@ "ibc-go-v7-src": { "flake": false, "locked": { - "lastModified": 1687464721, - "narHash": "sha256-UsCzjLKyedW2h3PQDNUNNL7KZiD23MM6kPQSnKS8FNs=", + "lastModified": 1693509694, + "narHash": "sha256-umh/ckDALt0ugXwN8glcaCkGfAQvXY7S3Jd95Do2XeA=", + "owner": "cosmos", + "repo": "ibc-go", + "rev": "c75650a1a037a9fecba5a9005df380f707520ff7", + "type": "github" + }, + "original": { + "owner": "cosmos", + "ref": "v7.3.0", + "repo": "ibc-go", + "type": "github" + } + }, + "ibc-go-v8-channel-upgrade-src": { + "flake": false, + "locked": { + "lastModified": 1695726576, + "narHash": "sha256-mM6h1KAi8lQUrJakxI6f8WI+vpmBhCnAysk3hTZBI7M=", + "owner": "cosmos", + "repo": "ibc-go", + "rev": "63c30108f0ecf954108cf51f50f3d36ec58c7e51", + "type": "github" + }, + "original": { + "owner": "cosmos", + "ref": "04-channel-upgrades-alpha.0", + "repo": "ibc-go", + "type": "github" + } + }, + "ibc-go-v8-src": { + "flake": false, + "locked": { + "lastModified": 1695930850, + "narHash": "sha256-BHmsnnqB+SoS8UdfGbEk07EXGZJG9ELo4+2gAbP8LdM=", "owner": "cosmos", "repo": "ibc-go", - "rev": "d02ab9db8fc80eb5e55041d3d6416370c33441f7", + "rev": "9c7212198d0ef82b8219ea66cee9c96b40e7981d", "type": "github" }, "original": { "owner": "cosmos", - "ref": "v7.2.0", + "ref": "v8.0.0-beta.1", "repo": "ibc-go", "type": "github" } @@ -514,11 +566,11 @@ "ica-src": { "flake": false, "locked": { - "lastModified": 1647255020, - "narHash": "sha256-Ah5pivnAmk3W0fLWnrBbi84tqwJYQETSILSvNVH6fI8=", + "lastModified": 1679480012, + "narHash": "sha256-LFyInZT7z/8/d3RYepYf95ryxA7Pbg3TMQhHrHUvlCA=", "owner": "cosmos", "repo": "interchain-accounts-demo", - "rev": "09b6a493a84a135f395d74d5ec82ea983617a714", + "rev": "fe07f304731161055cecec120e0d2de01e84bad4", "type": "github" }, "original": { @@ -648,11 +700,11 @@ }, "nix-std": { "locked": { - "lastModified": 1658944356, - "narHash": "sha256-+nBrRSPsDIjrmLfLdiB/a22Gj4bhEF53ubWN0z33NJo=", + "lastModified": 1685917625, + "narHash": "sha256-2manVKofCZrCToVDnDYNvtYUFBYOM5JhdDoNGVY4fq4=", "owner": "chessai", "repo": "nix-std", - "rev": "9500903a19ef2720469578de0e10ce9e66623bdf", + "rev": "e20af8822b5739434b875643bfc61fe0195ea2fb", "type": "github" }, "original": { @@ -663,11 +715,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673947312, - "narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=", + "lastModified": 1692684269, + "narHash": "sha256-zJk2pyF4Cuhtor0khtPlf+hfJIh22rzAUC+KU3Ob31Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d38b664b4400335086a713a0036aafaa002c003", + "rev": "9d757ec498666cc1dcc6f2be26db4fd3e1e9ab37", "type": "github" }, "original": { @@ -679,16 +731,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -709,70 +761,35 @@ "type": "github" } }, - "osmosis-src": { - "flake": false, - "locked": { - "lastModified": 1692886846, - "narHash": "sha256-VdM6hGqcDyCNx7AR8s7SxE3pEMxHiIhCJ7592sDp3uc=", - "owner": "osmosis-labs", - "repo": "osmosis", - "rev": "1c5f25d04f19d6302e0bdd585ba1d7a2cc96e397", - "type": "github" - }, - "original": { - "owner": "osmosis-labs", - "ref": "v18.0.0", - "repo": "osmosis", - "type": "github" - } - }, - "osmosis6-src": { - "flake": false, - "locked": { - "lastModified": 1646678581, - "narHash": "sha256-fGcz33PPA5dJ4J9vgfbYvBxNydu3/YuKSCf8pZkn5PM=", - "owner": "osmosis-labs", - "repo": "osmosis", - "rev": "2b61fd38505dbcbad08e78c96b7ab17e7ae1c85d", - "type": "github" - }, - "original": { - "owner": "osmosis-labs", - "ref": "v6.4.1", - "repo": "osmosis", - "type": "github" - } - }, - "osmosis7-src": { - "flake": false, + "nixpkgs_3": { "locked": { - "lastModified": 1651600564, - "narHash": "sha256-aY6L+5Iw5tu/QOZ1ZgZq163MCy4ZZDHVl53MhZ8AyS4=", - "owner": "osmosis-labs", - "repo": "osmosis", - "rev": "ab02323b075e2573cd7a54736d705c88797d11c5", + "lastModified": 1674990008, + "narHash": "sha256-4zOyp+hFW2Y7imxIpZqZGT8CEqKmDjwgfD6BzRUE0mQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2bbcbe6c626d339b25a4995711f07625b508214", "type": "github" }, "original": { - "owner": "osmosis-labs", - "ref": "v7.3.0", - "repo": "osmosis", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, - "osmosis8-src": { + "osmosis-src": { "flake": false, "locked": { - "lastModified": 1652595598, - "narHash": "sha256-upQzIJnzswT+HO6H0welw/X5n4F/K1k/dP4FQMOeC8Q=", + "lastModified": 1692886846, + "narHash": "sha256-VdM6hGqcDyCNx7AR8s7SxE3pEMxHiIhCJ7592sDp3uc=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "16e3b51f19a58f815a4eabcbcee11886eb33e026", + "rev": "1c5f25d04f19d6302e0bdd585ba1d7a2cc96e397", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v8.0.0", + "ref": "v18.0.0", "repo": "osmosis", "type": "github" } @@ -790,11 +807,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1674122161, - "narHash": "sha256-9QM4rvgUSEwO8DWtJN9sR/afEqrH1s3b6ACsZT5wiAM=", + "lastModified": 1692274144, + "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "53e766957b73298fa68b47478c48cbcc005cc18a", + "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "type": "github" }, "original": { @@ -865,6 +882,8 @@ "ibc-go-v5-src": "ibc-go-v5-src", "ibc-go-v6-src": "ibc-go-v6-src", "ibc-go-v7-src": "ibc-go-v7-src", + "ibc-go-v8-channel-upgrade-src": "ibc-go-v8-channel-upgrade-src", + "ibc-go-v8-src": "ibc-go-v8-src", "ibc-rs-src": "ibc-rs-src", "ica-src": "ica-src", "ignite-cli-src": "ignite-cli-src", @@ -877,9 +896,6 @@ "nix-std": "nix-std", "nixpkgs": "nixpkgs", "osmosis-src": "osmosis-src", - "osmosis6-src": "osmosis6-src", - "osmosis7-src": "osmosis7-src", - "osmosis8-src": "osmosis8-src", "pre-commit-hooks": "pre-commit-hooks", "regen-src": "regen-src", "relayer-src": "relayer-src", @@ -892,7 +908,6 @@ "stoml-src": "stoml-src", "stride-consumer-src": "stride-consumer-src", "stride-src": "stride-src", - "terra-src": "terra-src", "ts-relayer-src": "ts-relayer-src", "umee-src": "umee-src", "wasmd-src": "wasmd-src", @@ -927,12 +942,16 @@ } }, "sbt-derivation": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" + }, "locked": { - "lastModified": 1617466857, - "narHash": "sha256-Z7eWMLreLtiSiJ3nWDWBy1w9WNEFexkYCgT/dWZF7yo=", + "lastModified": 1675083208, + "narHash": "sha256-+sSFhSpV2jckr1qYlX/SaxQ6IdpagD6o4rru/3HAl0I=", "owner": "zaninime", "repo": "sbt-derivation", - "rev": "920b6f187937493371e2b1687261017e6e014cf1", + "rev": "92d6d6d825e3f6ae5642d1cce8ff571c3368aaf7", "type": "github" }, "original": { @@ -944,11 +963,11 @@ "sconfig-src": { "flake": false, "locked": { - "lastModified": 1594094862, - "narHash": "sha256-jR2hkR0YlPyW2nKWJl90kL80R+9psNKGPYxGg7Y/YGw=", + "lastModified": 1679585941, + "narHash": "sha256-ywh9IcqMWbRHqJkGJezcDCvfbBYNJH7ualKvPJQRcHA=", "owner": "freshautomations", "repo": "sconfig", - "rev": "88043754c024aec433b3b059af170b6f555931c3", + "rev": "41450b55f3b37b4b7a0fdf4a69c707619dbeb47c", "type": "github" }, "original": { @@ -1011,11 +1030,11 @@ "stoml-src": { "flake": false, "locked": { - "lastModified": 1622172633, - "narHash": "sha256-PvKkOjjWkmK90PzKcOBq0pUWLjHLjfYs9PRqqzAR7/8=", + "lastModified": 1666796497, + "narHash": "sha256-Adjag1/Hd2wrar2/anD6jQEMDvUc2TOIG7DlEgxpTXc=", "owner": "freshautomations", "repo": "stoml", - "rev": "f5dab84dbf52345a1f36389aec38b02fda086a47", + "rev": "4b2cd09b5795a54fddc215f0d24e24071894b3cf", "type": "github" }, "original": { @@ -1073,20 +1092,18 @@ "type": "github" } }, - "terra-src": { - "flake": false, + "systems_2": { "locked": { - "lastModified": 1645516218, - "narHash": "sha256-7cmVYWFLeOZJtbfw8qaVKLDMVafoeFDXOcrmrMS9buE=", - "owner": "terra-money", - "repo": "core", - "rev": "a6b93b72a7d4fabbbb85fb89e685426f5d07cac1", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "terra-money", - "ref": "v0.5.17", - "repo": "core", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, @@ -1110,11 +1127,11 @@ "umee-src": { "flake": false, "locked": { - "lastModified": 1648176855, - "narHash": "sha256-s7MnAaM+O84JDO1uBNZm1qGN6ZfYmhXD5rCvns4u/rc=", + "lastModified": 1649261156, + "narHash": "sha256-hydRL/88fHCW/k7z7GoqAwvynZuvLEDLyA6A9Cm+6UY=", "owner": "umee-network", "repo": "umee", - "rev": "3c9b8db04d6ab19d31e89df65232abc35d1a8a59", + "rev": "42f57545251ce5337dcc5fe4309520ead89183b9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 82c8b63a..d7f0e5a1 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,13 @@ ibc-go-v6-src.url = github:cosmos/ibc-go/v6.1.0; ibc-go-v7-src.flake = false; - ibc-go-v7-src.url = github:cosmos/ibc-go/v7.2.0; + ibc-go-v7-src.url = github:cosmos/ibc-go/v7.3.0; + + ibc-go-v8-src.flake = false; + ibc-go-v8-src.url = github:cosmos/ibc-go/v8.0.0-beta.1; + + ibc-go-v8-channel-upgrade-src.flake = false; + ibc-go-v8-channel-upgrade-src.url = github:cosmos/ibc-go/04-channel-upgrades-alpha.0; cosmos-sdk-src.flake = false; cosmos-sdk-src.url = github:cosmos/cosmos-sdk/v0.46.0; @@ -103,18 +109,6 @@ osmosis-src.flake = false; osmosis-src.url = github:osmosis-labs/osmosis/v18.0.0; - osmosis7-src.flake = false; - osmosis7-src.url = github:osmosis-labs/osmosis/v7.3.0; - - osmosis6-src.flake = false; - osmosis6-src.url = github:osmosis-labs/osmosis/v6.4.1; - - osmosis8-src.flake = false; - osmosis8-src.url = github:osmosis-labs/osmosis/v8.0.0; - - terra-src.flake = false; - terra-src.url = github:terra-money/core/v0.5.17; - sentinel-src.flake = false; sentinel-src.url = github:sentinel-official/hub/v0.9.0-rc0; @@ -214,7 +208,7 @@ inherit system; overlays = [ inputs.rust-overlay.overlays.default - inputs.sbt-derivation.overlay + inputs.sbt-derivation.overlays.default ]; }; eval-pkgs = import inputs.nixpkgs {system = "x86_64-linux";}; @@ -318,6 +312,10 @@ name = "simd"; drv = packages.ibc-go-v7-simapp; }; + ibc-go-v8-simapp = mkApp { + name = "simd"; + drv = packages.ibc-go-v8-simapp; + }; ignite-cli = mkApp { name = "ignite-cli"; exePath = "/bin/ignite"; @@ -349,21 +347,6 @@ drv = packages.centauri; exePath = "/bin/centaurid"; }; - osmosis7 = mkApp { - name = "osmosis"; - drv = packages.osmosis7; - exePath = "/bin/osmosisd"; - }; - osmosis6 = mkApp { - name = "osmosis"; - drv = packages.osmosis6; - exePath = "/bin/osmosisd"; - }; - osmosis8 = mkApp { - name = "osmosis"; - drv = packages.osmosis8; - exePath = "/bin/osmosisd"; - }; iris = mkApp { name = "iris"; drv = packages.iris; @@ -390,11 +373,6 @@ drv = packages.juno; exePath = "/bin/junod"; }; - terra = mkApp { - name = "terra"; - drv = packages.terra; - exePath = "/bin/terrad"; - }; sentinel = mkApp { name = "sentinel"; drv = packages.sentinel; diff --git a/resources.nix b/resources.nix index 37e872e7..b29a0978 100644 --- a/resources.nix +++ b/resources.nix @@ -37,13 +37,13 @@ stoml = pkgs.buildGoModule { name = "stoml"; src = inputs.stoml-src; - vendorSha256 = "sha256-37PcS7qVQ+IVZddcm+KbUjRjql7KIzynVGKpIHAk5GY="; + vendorSha256 = "sha256-i5m2I0IApTwD9XIjsDwU4dpNtwGI0EGeSkY6VbXDOAM="; }; sconfig = pkgs.buildGoModule { name = "sconfig"; src = inputs.sconfig-src; - vendorSha256 = "sha256-ytpye6zEZC4oLrif8xe6Vr99lblule9HiAyZsSisIPg="; + vendorSha256 = "sha256-J3L8gPtCShn//3mliMzvRTxRgb86f1pJ+yjZkF5ixEk="; }; cosmovisor = pkgs.buildGoModule { @@ -127,46 +127,6 @@ doCheck = false; }; - osmosis6 = utilities.mkCosmosGoApp { - name = "osmosis"; - version = "v6.4.1"; - src = inputs.osmosis6-src; - vendorSha256 = "sha256-UI5QGQsTLPnsDWWPUG+REsvF4GIeFeNHOiG0unNXmdY="; - tags = ["netgo"]; - engine = "tendermint/tendermint"; - }; - - osmosis7 = utilities.mkCosmosGoApp { - name = "osmosis"; - version = "v7.3.0"; - src = inputs.osmosis7-src; - excludedPackages = "./tests/e2e"; - vendorSha256 = "sha256-sdj59aZJBF4kpolHnYOHHO4zs7vKFu0i1xGKZFEiOyQ="; - tags = ["netgo"]; - engine = "tendermint/tendermint"; - preFixup = utilities.wasmdPreFixupPhase libwasmvm_1 "osmosisd"; - buildInputs = [libwasmvm_1]; - - # Test has to be skipped as end-to-end testing requires network access - doCheck = false; - }; - - osmosis8 = utilities.mkCosmosGoApp { - name = "osmosis"; - version = "v8.0.0"; - src = inputs.osmosis8-src; - excludedPackages = "./tests/e2e"; - vendorSha256 = "sha256-sdj59aZJBF4kpolHnYOHHO4zs7vKFu0i1xGKZFEiOyQ="; - tags = ["netgo"]; - engine = "tendermint/tendermint"; - preFixup = utilities.wasmdPreFixupPhase libwasmvm_1beta7 "osmosisd"; - dontStrip = true; - buildInputs = [libwasmvm_1beta7]; - - # Test has to be skipped as end-to-end testing requires network access - doCheck = false; - }; - juno = utilities.mkCosmosGoApp { name = "juno"; version = "v13.0.1"; @@ -183,18 +143,6 @@ buildInputs = [libwasmvm_1_1_1]; }; - terra = utilities.mkCosmosGoApp { - name = "terra"; - version = "v0.5.17"; - src = inputs.terra-src; - vendorSha256 = "sha256-2KmSRuSMzg9qFVncrxk+S5hqx8MMpRdo12/HZEaK5Aw="; - tags = ["netgo"]; - engine = "tendermint/tendermint"; - preFixup = utilities.wasmdPreFixupPhase libwasmvm_0_16_3 "terrad"; - dontStrip = true; - buildInputs = [libwasmvm_0_16_3]; - }; - sentinel = utilities.mkCosmosGoApp { name = "sentinel"; version = "v9.0.0-rc0"; @@ -221,7 +169,7 @@ version = "v2.0.0"; subPackages = ["cmd/umeed"]; src = inputs.umee-src; - vendorSha256 = "sha256-HONlFCC6iHgKQwqAiEV29qmSHsLdloUlAeJkxViUG7w="; + vendorSha256 = "sha256-VXBB2ZBh4QFbGQm3bXsl63MeASZMI1++wnhm2IrDrwk="; tags = ["netgo"]; engine = "tendermint/tendermint"; }; @@ -296,7 +244,7 @@ ica = pkgs.buildGoModule { name = "ica"; src = inputs.ica-src; - vendorSha256 = "sha256-ykGo5TQ+MiFoeQoglflQL3x3VN2CQuyZCIiweP/c9lM="; + vendorSha256 = "sha256-ZIP6dmHugLLtdA/8N8byg3D3JinjNxpvxyK/qiIs7bI="; }; wasmd = utilities.mkCosmosGoApp { @@ -442,81 +390,82 @@ }; libwasmvm_1_2_4 = pkgs.rustPlatform.buildRustPackage (libwasmvm - // { + // rec { src = "${inputs.wasmvm_1_2_4-src}/libwasmvm"; version = "v1.2.4"; cargoSha256 = "sha256-BFou838HI+YKXU9H53Xa/y7A441Z7Qkhf92mhquJ5l4="; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.2.6" = "sha256-6uhJijuDPXvEZG8mKBGyswsj/JR75Ui713BVx4XD7WI="; + }; + }; }); libwasmvm_1_2_3 = pkgs.rustPlatform.buildRustPackage (libwasmvm - // { + // rec { src = "${inputs.wasmvm_1_2_3-src}/libwasmvm"; version = "v1.2.3"; cargoSha256 = "sha256-+BaILTe+3qlI+/nz7Nub2hPKiDZlLdL58ckmiBxJtsk="; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.2.4" = "sha256-8BHwgXRNHNB3V1tL+en3IfRHnyeygx5jYz7Sx6duWQg="; + }; + }; }); - libwasmvm_1_1_2 = pkgs.rustPlatform.buildRustPackage { - pname = "libwasmvm"; - src = "${inputs.wasmvm_1_1_2-src}/libwasmvm"; - version = "v1.1.2"; - nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default]; - postInstall = '' - cp ./bindings.h $out/lib/ - ln -s $out/lib/libwasmvm.so $out/lib/libwasmvm.${builtins.head (pkgs.lib.strings.splitString "-" system)}.so - ''; - cargoSha256 = "sha256-bCnr4TrI+jzvE91n2hhZMuBUPlrO1jXRbU/GFbRzs44="; - doCheck = false; - }; - - libwasmvm_1_1_1 = pkgs.rustPlatform.buildRustPackage { - pname = "libwasmvm"; - src = "${inputs.wasmvm_1_1_1-src}/libwasmvm"; - version = "v1.1.1"; - nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default]; - postInstall = '' - cp ./bindings.h $out/lib/ - ln -s $out/lib/libwasmvm.so $out/lib/libwasmvm.${builtins.head (pkgs.lib.strings.splitString "-" system)}.so - ''; - cargoSha256 = "sha256-97BhqI1FZyDbVrT5hdyEK7VPtpE9lQgWduc/siH6NqE"; - doCheck = false; - }; + libwasmvm_1_1_2 = pkgs.rustPlatform.buildRustPackage (libwasmvm + // rec { + src = "${inputs.wasmvm_1_1_2-src}/libwasmvm"; + version = "v1.1.2"; + cargoSha256 = "sha256-bCnr4TrI+jzvE91n2hhZMuBUPlrO1jXRbU/GFbRzs44="; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.1.10" = "sha256-i8tXVYVLguKd8oAwt8lc1aDzkxTtCaydrkl2X82Lw/Y="; + }; + }; + }); - libwasmvm_1 = pkgs.rustPlatform.buildRustPackage { - pname = "libwasmvm"; - src = "${inputs.wasmvm_1-src}/libwasmvm"; - version = "v1.0.0"; - nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default]; - postInstall = '' - cp ./bindings.h $out/lib/ - ln -s $out/lib/libwasmvm.so $out/lib/libwasmvm.${builtins.head (pkgs.lib.strings.splitString "-" system)}.so - ''; - cargoSha256 = "sha256-Q8j9wESn2RBb05LcS7FiKGTPLgIPxWA0GZqHlTjkqpU="; - doCheck = false; - }; + libwasmvm_1_1_1 = pkgs.rustPlatform.buildRustPackage (libwasmvm + // rec { + src = "${inputs.wasmvm_1_1_1-src}/libwasmvm"; + version = "v1.1.1"; + cargoSha256 = "sha256-97BhqI1FZyDbVrT5hdyEK7VPtpE9lQgWduc/siH6NqE"; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.1.2" = "sha256-Phg/StSMZA74gGPyQpzjsy3qRO++AWWVnbcu1Ar0WCE="; + }; + }; + }); - libwasmvm_1beta7 = pkgs.rustPlatform.buildRustPackage { - pname = "libwasmvm"; - src = "${inputs.wasmvm_1_beta7-src}/libwasmvm"; - version = "v1.0.0-beta7"; - nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default]; - postInstall = '' - cp ./bindings.h $out/lib/ - ''; - cargoSha256 = "sha256-G9wHl2JPgCDoMcykUAM0GrPUbMvSY5PbUzZ6G98rIO8="; - doCheck = false; - }; + libwasmvm_1 = pkgs.rustPlatform.buildRustPackage (libwasmvm + // rec { + src = "${inputs.wasmvm_1-src}/libwasmvm"; + version = "v1.0.0"; + cargoSha256 = "sha256-Q8j9wESn2RBb05LcS7FiKGTPLgIPxWA0GZqHlTjkqpU="; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.0.0" = "sha256-GuepzBF0BxbPatKZTiRwqPxJewbie+5gwBtOTLWOnng="; + }; + }; + }); - libwasmvm_0_16_3 = pkgs.rustPlatform.buildRustPackage { - pname = "libwasmvm"; - src = "${inputs.wasmvm_0_16_3-src}/libwasmvm"; - version = "v0.16.3"; - nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default]; - postInstall = '' - cp ./bindings.h $out/lib/ - ''; - cargoSha256 = "sha256-MUTXxBCIYwCBCDNkFh+JrGMhKg20vC3wCGxqpZVa9Os="; - doCheck = false; - }; + libwasmvm_1beta7 = pkgs.rustPlatform.buildRustPackage (libwasmvm + // rec { + src = "${inputs.wasmvm_1_beta7-src}/libwasmvm"; + version = "v1.0.0-beta7"; + cargoSha256 = "sha256-G9wHl2JPgCDoMcykUAM0GrPUbMvSY5PbUzZ6G98rIO8="; + cargoLock = { + lockFile = "${src}/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.0.0-beta6" = "sha256-HnskwQ3fOrLG6ImgDYH+/nBYBqdWJDjPtcsTsUz8n2s="; + }; + }; + }); # Misc gm = with pkgs; @@ -595,7 +544,7 @@ curl lz4 python39 - packages.osmosis8 + packages.osmosis packages.cosmovisor ]; shellHook = '' diff --git a/resources/apalache.nix b/resources/apalache.nix index b37828be..40d8110a 100644 --- a/resources/apalache.nix +++ b/resources/apalache.nix @@ -28,11 +28,11 @@ if (isSnapshot.value) (k -> build) else (k -> v) ''; in - pkgs.sbt.mkDerivation { + pkgs.mkSbtDerivation { pname = "apalache"; inherit version; - depsSha256 = "sha256-0Yu1TgzaAI3bCHNF+IGunWUjjX9RIL8BXQ09fv+mL3o="; + depsSha256 = "sha256-Fyf98HRE5zzSD3aMDsNb6bJh2Ml6DC4+BqH+a7ljFHo="; src = apalache-src; patches = [ diff --git a/resources/ibc-go/default.nix b/resources/ibc-go/default.nix index 2ab771ae..b17458a1 100644 --- a/resources/ibc-go/default.nix +++ b/resources/ibc-go/default.nix @@ -60,14 +60,44 @@ in excludedPackages = ["./e2e"]; }; + # If the modules/apps/callbacks is needed, it must be defined in a separate nix + # package that loads only the given subdirectory as source ibc-go-v7-simapp = { name = "simd"; - version = "v7.2.0"; + version = "v7.3.0"; src = inputs.ibc-go-v7-src; - vendorSha256 = "sha256-Hmzoc8TEuaB8v4svuKLwpVy9+xXKaYnCi2ZJWgFIV+A="; + vendorSha256 = "sha256-Wn7krfvF7E93g4KnGZ8iXaSjc+kmGgQ8Jb5egWNMQg8="; + goVersion = "1.20"; tags = ["netgo"]; engine = "cometbft/cometbft"; - doCheck = false; - excludedPackages = ["./e2e"]; + excludedPackages = ["./e2e" "./modules/apps/callbacks"]; + }; + + # If the modules/apps/callbacks and/or modules/capability are needed, + # they must each be defined in a separate nix package that loads only + # the given subdirectory as source + ibc-go-v8-simapp = { + name = "simd"; + version = "v8.0.0-beta.1"; + src = inputs.ibc-go-v8-src; + vendorSha256 = "sha256-vUj5rwsA7RQfip/LktWG+MdazYfux6zpFN7L/AGdHo0="; + goVersion = "1.21"; + tags = ["netgo"]; + engine = "cometbft/cometbft"; + excludedPackages = ["./e2e" "./modules/apps/callbacks" "./modules/capability"]; + }; + + # If the modules/apps/callbacks and/or modules/capability are needed, + # they must each be defined in a separate nix package that loads only + # the given subdirectory as source + ibc-go-v8-channel-upgrade-simapp = { + name = "simd"; + version = "channel-upgrade-alpha.0"; + src = inputs.ibc-go-v8-channel-upgrade-src; + vendorSha256 = "sha256-FOCQcn9r7mmpjY9h4gvwcRqL4qhu3wkXsx1KM1n17Cg="; + goVersion = "1.21"; + tags = ["netgo"]; + engine = "cometbft/cometbft"; + excludedPackages = ["./e2e" "./modules/apps/callbacks" "./modules/capability"]; }; } diff --git a/resources/utilities.nix b/resources/utilities.nix index 1771ccb2..241a9c59 100644 --- a/resources/utilities.nix +++ b/resources/utilities.nix @@ -11,6 +11,7 @@ additionalLdFlags ? "", appName ? null, preCheck ? null, + goVersion ? "1.19", ... }: let buildGoModuleArgs = @@ -43,8 +44,16 @@ if appName == null then "${name}d" else appName; + + buildGoModuleVersion = { + "1.19" = pkgs.buildGo119Module; + "1.20" = pkgs.buildGo120Module; + "1.21" = pkgs.buildGo121Module; + }; + + buildGoModule = buildGoModuleVersion.${goVersion}; in - pkgs.buildGo119Module ({ + buildGoModule ({ inherit version src vendorSha256; pname = name; preCheck =