diff --git a/.github/workflows/explorer/docker-compose.yaml b/.github/workflows/explorer/docker-compose.yaml index ecbac14c9a9..360cb741465 100644 --- a/.github/workflows/explorer/docker-compose.yaml +++ b/.github/workflows/explorer/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.9" services: cardano-node: - image: ghcr.io/intersectmbo/cardano-node:9.1.1 + image: ghcr.io/intersectmbo/cardano-node:9.2 volumes: - /srv/var/cardano/state-preview:/data environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5892569850e..38352480f18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 As a minor extension, we also keep a semantic version for the `UNRELEASED` changes. +## Unreleased + +- Tested with `cardano-node 9.2.0` and `cardano-cli 9.4.1.0`. + ## [0.19.0] - 2024-09-13 - Tested with `cardano-node 9.1.1` and `cardano-cli 9.2.1.0` diff --git a/demo/docker-compose.yaml b/demo/docker-compose.yaml index fcf7ecd212e..3c3302a4073 100644 --- a/demo/docker-compose.yaml +++ b/demo/docker-compose.yaml @@ -1,6 +1,6 @@ services: cardano-node: - image: ghcr.io/intersectmbo/cardano-node:9.1.1 + image: ghcr.io/intersectmbo/cardano-node:9.2.0 volumes: - ./devnet:/devnet environment: diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md index bb6b7e35606..a0204e8cff0 100644 --- a/docs/docs/tutorial/index.md +++ b/docs/docs/tutorial/index.md @@ -33,7 +33,7 @@ After ensuring the tools above are available, begin by downloading pre-built bin mkdir -p bin hydra_version=0.19.0 mithril_version=2430.0 -cardano_node_version=9.1.1 +cardano_node_version=9.2.0 curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-x86_64-linux-${hydra_version}.zip unzip -d bin hydra-x86_64-linux-${hydra_version}.zip curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-linux.tar.gz @@ -51,7 +51,7 @@ chmod +x bin/* mkdir -p bin hydra_version=0.19.0 mithril_version=2430.0 -cardano_node_version=9.1.1 +cardano_node_version=9.2.0 curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-aarch64-darwin-${hydra_version}.zip unzip -d bin hydra-aarch64-darwin-${hydra_version}.zip curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-macos.tar.gz diff --git a/flake.lock b/flake.lock index c916cc0f820..8436c1fa0b6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1725170790, - "narHash": "sha256-dByd5I847MxV5i9kps89yL1OAvi7iDyC95BU7EM2wtw=", + "lastModified": 1725978043, + "narHash": "sha256-3AwgQ308g74rISxUlbzQRX3At0trVoH836vBwkcFFYg=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "3bed5fccc06ecc11d4a8427112f107876263e0f3", + "rev": "ce5ba82d474225506523e66a4050718de7e2b3fe", "type": "github" }, "original": { @@ -309,7 +309,6 @@ "nixpkgs" ], "iohkNix": "iohkNix", - "nix2container": "nix2container_2", "nixpkgs": [ "cardano-node", "haskellNix", @@ -320,16 +319,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1725255033, - "narHash": "sha256-VIwEjpaGk09+dAcKELjLSR2OP3qBCWTGHpd0SBjgbVc=", + "lastModified": 1726677789, + "narHash": "sha256-utAO4ZP9EAW4LdMT/hdMoykwT/h9gizoVvCbmYfAZSQ=", "owner": "intersectmbo", "repo": "cardano-node", - "rev": "efd560070aaf042d1eb4680ae37fc607c7742319", + "rev": "341ea87ba3b4936188f8c2d4f09bbf1976a7926e", "type": "github" }, "original": { "owner": "intersectmbo", - "ref": "9.1.1", + "ref": "9.2.0", "repo": "cardano-node", "type": "github" } @@ -710,24 +709,6 @@ } }, "flake-utils_5": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -867,11 +848,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1719794527, - "narHash": "sha256-qHo/KumtwAzPkfLWODu/6EFY/LeK+C7iPJyAUdT8tGA=", + "lastModified": 1725928375, + "narHash": "sha256-XO/6kJ77bR99bAuRGr9PleQX75vde5CbSU+6Xf3e8NQ=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "da2a3bc9bd1b3dd41bb147279529c471c615fd3e", + "rev": "68cfb288b958e9d7a1329df614684132f44bd2b3", "type": "github" }, "original": { @@ -904,6 +885,7 @@ "hls-2.6": "hls-2.6", "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -955,7 +937,7 @@ "hls-2.6": "hls-2.6_2", "hls-2.7": "hls-2.7_2", "hls-2.8": "hls-2.8_2", - "hls-2.9": "hls-2.9", + "hls-2.9": "hls-2.9_2", "hpc-coveralls": "hpc-coveralls_2", "hydra": "hydra_2", "iserv-proxy": "iserv-proxy_2", @@ -1334,6 +1316,23 @@ } }, "hls-2.9": { + "flake": false, + "locked": { + "lastModified": 1718469202, + "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.9.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.9_2": { "flake": false, "locked": { "lastModified": 1718469202, @@ -1410,7 +1409,7 @@ "inputs": { "flake-parts": "flake-parts_2", "formal-ledger": "formal-ledger", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1725260503, @@ -1474,7 +1473,7 @@ "iohk-nix": { "inputs": { "blst": "blst_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "secp256k1": "secp256k1_2", "sodium": "sodium_2" }, @@ -1567,7 +1566,7 @@ }, "lint-utils": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "haskellNix", "nixpkgs" @@ -1639,7 +1638,7 @@ "inputs": { "crane": "crane", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1743,7 +1742,7 @@ }, "nix-npm-buildpackage": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1686315622, @@ -1778,29 +1777,10 @@ "type": "github" } }, - "nix2container_2": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1712990762, - "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -2213,22 +2193,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1721933792, "narHash": "sha256-zYVwABlQnxpbaHMfX6Wt9jhyQstFYwN2XjleOJV3VVg=", @@ -2244,7 +2208,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1653917367, "narHash": "sha256-04MsJC0g9kE01nBuXThMppZK+yvCZECQnUaZKSU+HJo=", @@ -2320,21 +2284,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1712920918, - "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1708343346, "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", @@ -2350,7 +2299,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2366,7 +2315,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1718717814, "narHash": "sha256-xB7AzKY4BP7yypo6g+sk1tnVK54sBIJMeEBB5CdbhT4=", @@ -2381,6 +2330,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nosys": { "locked": { "lastModified": 1668010795, @@ -2705,7 +2670,7 @@ "std", "blank" ], - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "paisano": "paisano", "paisano-tui": "paisano-tui", "terranix": [ @@ -2744,21 +2709,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2822,7 +2772,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 1ae75255402..5b4a6f0d6cc 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ url = "github:haskell/haskell-language-server"; flake = false; }; - cardano-node.url = "github:intersectmbo/cardano-node/9.1.1"; + cardano-node.url = "github:intersectmbo/cardano-node/9.2.0"; mithril.url = "github:input-output-hk/mithril/2430.0"; nix-npm-buildpackage.url = "github:serokell/nix-npm-buildpackage"; }; diff --git a/hydra-cluster/test/Test/CardanoNodeSpec.hs b/hydra-cluster/test/Test/CardanoNodeSpec.hs index 214c53b1fdc..33a01b197aa 100644 --- a/hydra-cluster/test/Test/CardanoNodeSpec.hs +++ b/hydra-cluster/test/Test/CardanoNodeSpec.hs @@ -21,7 +21,7 @@ supportedNetworks :: [KnownNetwork] supportedNetworks = [Mainnet, Preproduction, Preview, Sanchonet] supportedCardanoNodeVersion :: String -supportedCardanoNodeVersion = "9.1.1" +supportedCardanoNodeVersion = "9.2.0" forSupportedKnownNetworks :: String -> (KnownNetwork -> IO ()) -> Spec forSupportedKnownNetworks msg action = forEachKnownNetwork msg $ \network -> do diff --git a/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs b/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs index a66f3c58ca3..88905ada19e 100644 --- a/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs +++ b/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs @@ -35,7 +35,7 @@ spec = Just something -> something == "Witnessed Tx ConwayEra" it "has expected cardano-cli version available" $ - readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "9.2.1.0") + readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "9.4.1.0") around (showLogsOnFailure "CardanoCliSpec") $ do it "query protocol-parameters is compatible with our FromJSON instance" $ \tracer -> diff --git a/sample-node-config/another-nixos/flake.nix b/sample-node-config/another-nixos/flake.nix index 54f88cb2632..7b5b942909a 100644 --- a/sample-node-config/another-nixos/flake.nix +++ b/sample-node-config/another-nixos/flake.nix @@ -6,7 +6,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - cardano-node.url = "github:IntersectMBO/cardano-node/9.1.1"; + cardano-node.url = "github:IntersectMBO/cardano-node/9.2.0"; hydra.url = "github:cardano-scaling/hydra/209de1dd8c5ae484a45a4db3af043c4a9d271306"; mithril.url = "github:input-output-hk/mithril/2423.0"; };