diff --git a/.github/workflows/explorer/docker-compose.yaml b/.github/workflows/explorer/docker-compose.yaml index d5429b9bdad..dccbe76b0ed 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:8.8.0-pre + image: ghcr.io/intersectmbo/cardano-node:8.9.0 volumes: - /srv/var/cardano/state-sanchonet:/data environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7942cbcea67..1e45dc76ef2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ changes. - **DO NOT RELEASE** as only tested against Sanchonet. -- **BREAKING** Update to and tested against `cardano-node 8.8.0-pre` and `cardano-cli 8.20`. This made smoke tests incompatible with public testnets and mainnet. +- **BREAKING** Update to and tested against `cardano-node 8.9.0` and `cardano-cli 8.20.3.0`. This made smoke tests incompatible with public testnets and mainnet. - **BREAKING** Hydra scripts changed due to updates in the `plutus` toolchain: - Overall slight increase in script size. diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md index 133cef43923..aba15485231 100644 --- a/docs/docs/tutorial/index.md +++ b/docs/docs/tutorial/index.md @@ -44,7 +44,7 @@ mkdir -p bin version=0.15.0 curl -L -O https://github.com/input-output-hk/hydra/releases/download/${version}/hydra-x86_64-linux-${version}.zip unzip -d bin hydra-x86_64-linux-${version}.zip -curl -L -o - https://github.com/input-output-hk/cardano-node/releases/download/8.8.0-pre/cardano-node-8.8.0-linux.tar.gz \ +curl -L -o - https://github.com/input-output-hk/cardano-node/releases/download/8.9.0/cardano-node-8.9.0-linux.tar.gz \ | tar xz -C bin ./cardano-node ./cardano-cli curl -L -o - https://github.com/input-output-hk/mithril/releases/download/2347.0/mithril-2347.0-linux-x64.tar.gz \ | tar xz -C bin mithril-client @@ -59,9 +59,9 @@ mkdir -p bin version=0.15.0 curl -L -O https://github.com/input-output-hk/hydra/releases/download/${version}/hydra-aarch64-darwin-${version}.zip unzip -d bin hydra-aarch64-darwin-${version}.zip -curl -L -o - https://github.com/input-output-hk/hydra/releases/download/${version}/cardano-node-aarch-darwin-8.8.0.zip -unzip -d bin cardano-node-8.8.0-linux.zip -curl -L -o - https://github.com/input-output-hk/cardano-node/releases/download/8.8.0-pre/cardano-node-8.8.0-macos.tar.gz \ +curl -L -o - https://github.com/input-output-hk/hydra/releases/download/${version}/cardano-node-aarch-darwin-8.9.0.zip +unzip -d bin cardano-node-8.9.0-linux.zip +curl -L -o - https://github.com/input-output-hk/cardano-node/releases/download/8.9.0/cardano-node-8.9.0-macos.tar.gz \ | tar xz -C bin --wildcards ./cardano-node ./cardano-cli '*.dylib' chmod +x bin/* ``` diff --git a/flake.lock b/flake.lock index ef97cd72b0c..0b1c89a40a9 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1707293988, - "narHash": "sha256-UAa4nL8qhPyI133IJOPMBgLECa91CPPwwhypFXKm7Fw=", + "lastModified": 1709731402, + "narHash": "sha256-7h4/ns3WRI3BtK1FbUEm6nMqW1ahNNehiHr7eQ03muk=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "501510e79f9cf76012cba0e86f88fa0b8b053fbd", + "rev": "8e4f211a8e537c8c939b65e887556bd7441c774c", "type": "github" }, "original": { @@ -99,17 +99,17 @@ "blst": { "flake": false, "locked": { - "lastModified": 1656163412, - "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "lastModified": 1691598027, + "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", "owner": "supranational", "repo": "blst", - "rev": "03b5124029979755c752eec45f3c29674b558446", + "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", "type": "github" }, "original": { "owner": "supranational", + "ref": "v0.3.11", "repo": "blst", - "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" } }, @@ -305,16 +305,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1707399758, - "narHash": "sha256-pWXI8dyqKQ3HncbBtd54wdHi3Pj7J5y+nybqpzMXOj4=", + "lastModified": 1709733493, + "narHash": "sha256-chcwbks+HyImFk7FpbkC7FFmfpScMx5T7K0TzTkGAww=", "owner": "intersectmbo", "repo": "cardano-node", - "rev": "4bb2048db77d623ee6e3678618c2d8b6c4676333", + "rev": "0d98405a60d57e1c8e13406d51cce0e34356bd64", "type": "github" }, "original": { "owner": "intersectmbo", - "ref": "8.8.0-pre", + "ref": "8.9.0", "repo": "cardano-node", "type": "github" } @@ -952,11 +952,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1707178947, - "narHash": "sha256-zK4s98xucxwefNtf7Ewc42lQkb5ZXNzFV4sOliif8Rg=", + "lastModified": 1709684582, + "narHash": "sha256-+rC8Vpaxdd4Nw2fJIn9wzAnzW5arILly5AkTG6chRAw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "ef22972dd06ed3359945489b582849fdf680c583", + "rev": "c2ed9aa79252ed67a1fb694b3fffaf7dd7ead6d2", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1707180591, - "narHash": "sha256-MR/sPRfbtab9AEgvTb70VU94MDqEXFNM3RnMfb10gT8=", + "lastModified": 1708911681, + "narHash": "sha256-QGkzPN1HUYxgMU2EwiwjMvR2gQF0ffUdxALq1+bOdcY=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "0a4c42df4321e510f38affa11a2109e84a5399e4", + "rev": "5031fa0b8346fcc533c33073530ca87b8390add3", "type": "github" }, "original": { @@ -1504,11 +1504,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1707337252, - "narHash": "sha256-sliOZlzvx3sG+YqkgcXqK7Va0OyYFD+VPWiEK+qeoNI=", + "lastModified": 1709083850, + "narHash": "sha256-6DQ89ktt8rRVV1pXEyX2JwPjaqS0mQkelkmJmka04rg=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "3358489541bdc1228afaa678c2adf4bb891f560e", + "rev": "1c793a53ac0bd99b795c2180eb23d37e8389a74b", "type": "github" }, "original": { @@ -2836,11 +2836,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1707178218, - "narHash": "sha256-3JatI3pDGahu+k5povDpQWBnMbngfL/8aKPLU4PsAxM=", + "lastModified": 1708906175, + "narHash": "sha256-KJDF0CO077Jx4GjjPK6pNkx6NkY7p1x5RMPfaIe8nl4=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "43eb3859170423a3c1f048815070ed10099f7e5c", + "rev": "bfa4778050cf69fe50f91d39dcefbb9005d6d0d0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7aaaf256e2a..6bc0e26fd4b 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ url = "github:cardano-scaling/haskell-language-server?ref=2.6-patched"; flake = false; }; - cardano-node.url = "github:intersectmbo/cardano-node/8.8.0-pre"; + cardano-node.url = "github:intersectmbo/cardano-node/8.9.0"; mithril.url = "github:input-output-hk/mithril/2347.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 7d647119d1d..34901db4680 100644 --- a/hydra-cluster/test/Test/CardanoNodeSpec.hs +++ b/hydra-cluster/test/Test/CardanoNodeSpec.hs @@ -22,7 +22,7 @@ spec = do -- false positives test errors in case someone uses an "untested" / -- different than in shell.nix version of cardano-node and cardano-cli. it "has expected cardano-node version available" $ - getCardanoNodeVersion >>= (`shouldContain` "8.8.0") + getCardanoNodeVersion >>= (`shouldContain` "8.9.0") around (failAfter 5 . setupTracerAndTempDir) $ do it "withCardanoNodeDevnet does start a block-producing devnet within 5 seconds" $ \(tr, tmp) -> diff --git a/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs b/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs index 69020d742dc..23512a1f5d4 100644 --- a/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs +++ b/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs @@ -36,7 +36,7 @@ spec = Just something -> something == "Witnessed Tx BabbageEra" it "has expected cardano-cli version available" $ - readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "8.20.0.0") + readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "8.20.3.0") around (showLogsOnFailure "CardanoCliSpec") $ do it "query protocol-parameters is compatible with our FromJSON instance" $ \tracer -> diff --git a/hydra-explorer/hydra-explorer.cabal b/hydra-explorer/hydra-explorer.cabal index 1856d893d70..3a04be7c6ab 100644 --- a/hydra-explorer/hydra-explorer.cabal +++ b/hydra-explorer/hydra-explorer.cabal @@ -83,7 +83,6 @@ test-suite tests , filepath , hspec , hspec-wai - , http-types , hydra-chain-observer , hydra-explorer , hydra-node @@ -92,7 +91,6 @@ test-suite tests , lens , openapi3 , QuickCheck - , wai-extra , yaml other-modules: diff --git a/hydra-explorer/test/Hydra/ExplorerSpec.hs b/hydra-explorer/test/Hydra/ExplorerSpec.hs index c298b5ac926..25743a3f3c6 100644 --- a/hydra-explorer/test/Hydra/ExplorerSpec.hs +++ b/hydra-explorer/test/Hydra/ExplorerSpec.hs @@ -24,8 +24,6 @@ import Data.OpenApi ( import Data.Yaml qualified as Yaml import Hydra.Explorer (httpApp) import Hydra.Logging (nullTracer) -import Network.HTTP.Types (statusCode) -import Network.Wai.Test (SResponse (..)) import System.FilePath (()) import Test.Hspec.Wai (MatchBody (..), ResponseMatcher (ResponseMatcher), shouldRespondWith, (<:>)) import Test.Hspec.Wai qualified as Wai diff --git a/hydra-node/hydra-node.cabal b/hydra-node/hydra-node.cabal index 91c3669df0f..7ce511f8655 100644 --- a/hydra-node/hydra-node.cabal +++ b/hydra-node/hydra-node.cabal @@ -332,7 +332,6 @@ test-suite tests , cardano-ledger-alonzo , cardano-ledger-api , cardano-ledger-babbage:{cardano-ledger-babbage, testlib} - , cardano-ledger-binary , cardano-ledger-core , cardano-ledger-mary , cardano-ledger-shelley