diff --git a/.github/workflows/explorer/docker-compose.yaml b/.github/workflows/explorer/docker-compose.yaml index d2ced1e8732..baecff1c7b2 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.9.0 + image: ghcr.io/intersectmbo/cardano-node:9.0.0 volumes: - /srv/var/cardano/state-preview:/data environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index f586ba12a7b..68c6c4ed976 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,12 +12,12 @@ changes. - **DO NOT RELEASE** as the tested `cardano-node` version is not intended to be used on `mainnet` yet. -- Tested with `cardano-node 8.11.0` and `cardano-cli 8.23.1.0`. +- Tested with `cardano-node 9.0.0` and `cardano-cli 9.0.0.0`. - **BREAKING** Changes to the `hydra-node` API `/commit` endpoint [#1463](https://github.com/cardano-scaling/hydra/pull/1463): - Removed the check that prevented committing UTxOs from an internal `hydra-node` wallet. - `SpendingNodeUtxoForbidden` error was removed. - + - Change `--start-chain-from` to always use the newer point when also a head state is known. - Moved several pages from "core concepts" into the user manual and developer docs to futher improve user journey. diff --git a/demo/docker-compose.yaml b/demo/docker-compose.yaml index fc1bbc62330..8093f67f11a 100644 --- a/demo/docker-compose.yaml +++ b/demo/docker-compose.yaml @@ -1,6 +1,6 @@ services: cardano-node: - image: ghcr.io/intersectmbo/cardano-node:8.9.1 + image: ghcr.io/intersectmbo/cardano-node:9.0.0 volumes: - ./devnet:/devnet environment: @@ -21,7 +21,7 @@ services: hydra-node-1: # NOTE: Make sure to use the same image in ./seed-devnet.sh - image: ghcr.io/cardano-scaling/hydra-node:0.17.0 + image: ghcr.io/cardano-scaling/hydra-node:unstable build: context: ../ target: hydra-node @@ -56,7 +56,7 @@ services: hydra-node-2: # NOTE: Make sure to use the same image in ./seed-devnet.sh - image: ghcr.io/cardano-scaling/hydra-node:0.17.0 + image: ghcr.io/cardano-scaling/hydra-node:unstable build: context: ../ target: hydra-node @@ -91,7 +91,7 @@ services: hydra-node-3: # NOTE: Make sure to use the same image in ./seed-devnet.sh - image: ghcr.io/cardano-scaling/hydra-node:0.17.0 + image: ghcr.io/cardano-scaling/hydra-node:unstable build: context: ../ target: hydra-node diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md index 147836d61f2..08a7d76621a 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 version=0.17.0 mithril_version=2423.0 -node_version=8.9.3 +node_version=9.0.0 curl -L -O https://github.com/cardano-scaling/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/IntersectMBO/cardano-node/releases/download/${node_version}/cardano-node-${node_version}-linux.tar.gz @@ -51,7 +51,7 @@ chmod +x bin/* mkdir -p bin version=0.17.0 mithril_version=2423.0 -node_version=8.9.3 +node_version=9.0.0 curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${version}/hydra-aarch64-darwin-${version}.zip unzip -d bin hydra-aarch64-darwin-${version}.zip curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${node_version}/cardano-node-${node_version}-macos.tar.gz diff --git a/flake.lock b/flake.lock index 5059be0501c..3215f96b7e6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1715690409, - "narHash": "sha256-+PWaq7ngq5d601d+GBNggNuzT+jXSV7Dl2IrMNCY1KQ=", + "lastModified": 1719971647, + "narHash": "sha256-Q/u1ZklzmymTSSY6/F48rGsWewVYf108torqR9+nFJU=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "0ce6797192cbbab051cd8fe5b7516b55273229f1", + "rev": "bfd6987c14410757c6cde47e6c45621e9664347f", "type": "github" }, "original": { @@ -232,6 +232,21 @@ "type": "github" } }, + "call-flake": { + "locked": { + "lastModified": 1687380775, + "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "owner": "divnix", + "repo": "call-flake", + "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "call-flake", + "type": "github" + } + }, "cardano-automation": { "inputs": { "flake-utils": "flake-utils", @@ -305,16 +320,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1715793024, - "narHash": "sha256-BoTWJKRc7gWSzptEuk32A/uV6MRkRx7vKdz34k8IPY8=", + "lastModified": 1720029730, + "narHash": "sha256-ESE5/7XzXeIZldkYPbMd8CoMKQo9ghY1vOkhHpOj0K4=", "owner": "intersectmbo", "repo": "cardano-node", - "rev": "38c7f1cf2db12dff9c814ad10049f411a4b30448", + "rev": "2820a63dc934c6d5b5f450b6c2543b81c6476696", "type": "github" }, "original": { "owner": "intersectmbo", - "ref": "8.11.0-pre", + "ref": "9.0.0", "repo": "cardano-node", "type": "github" } @@ -352,32 +367,6 @@ } }, "crane": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_6", - "nixpkgs": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1676162383, - "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "mithril", @@ -385,11 +374,11 @@ ] }, "locked": { - "lastModified": 1713979152, - "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "lastModified": 1720546058, + "narHash": "sha256-iU2yVaPIZm5vMGdlT0+57vdB/aPq/V5oZFBRwYw+HBM=", "owner": "ipetkov", "repo": "crane", - "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "rev": "2d83156f23c43598cf44e152c33a59d3892f8b29", "type": "github" }, "original": { @@ -444,29 +433,6 @@ "type": "github" } }, - "devshell_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1686680692, - "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", - "owner": "numtide", - "repo": "devshell", - "rev": "fd6223370774dd9c33354e87a007004b5fd36442", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dmerge": { "inputs": { "nixlib": [ @@ -508,8 +474,7 @@ "nixlib": [ "cardano-node", "std", - "haumea", - "nixpkgs" + "lib" ], "yants": [ "cardano-node", @@ -535,11 +500,11 @@ "em": { "flake": false, "locked": { - "lastModified": 1684791668, - "narHash": "sha256-JyPm0RiWCfy/8rs7wd/IRSWIz+bTkD78uxIMnKktU2g=", + "lastModified": 1685015066, + "narHash": "sha256-etAdEoYhtvjTw1ITh28WPNfwvvb5t/fpwCP6s7odSiQ=", "owner": "deepfire", "repo": "em", - "rev": "302cdf6d654fb18baff0213bdfa41a653774585a", + "rev": "af69bb5c2ac2161434d8fea45f920f8f359587ce", "type": "github" }, "original": { @@ -563,25 +528,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": "nixpkgs_9", - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1677306201, - "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "0923f0c162f65ae40261ec940406049726cfeab4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -633,22 +579,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1672831974, @@ -688,11 +618,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -762,27 +692,15 @@ } }, "flake-utils_5": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" + "inputs": { + "systems": "systems" }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -791,7 +709,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -843,11 +761,11 @@ "ghc910X": { "flake": false, "locked": { - "lastModified": 1711543129, - "narHash": "sha256-MUI07CxYOng7ZwHnMCw0ugY3HmWo2p/f4r07CGV7OAM=", + "lastModified": 1714520650, + "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=", "ref": "ghc-9.10", - "rev": "6ecd5f2ff97af53c7334f2d8581651203a2c6b7d", - "revCount": 62607, + "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5", + "revCount": 62663, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -862,11 +780,11 @@ "ghc911": { "flake": false, "locked": { - "lastModified": 1711538967, - "narHash": "sha256-KSdOJ8seP3g30FaC2du8QjU9vumMnmzPR5wfkVRXQMk=", + "lastModified": 1714817013, + "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", "ref": "refs/heads/master", - "rev": "0acfe391583d77a72051d505f05fab0ada056c49", - "revCount": 62632, + "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", + "revCount": 62816, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -915,11 +833,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1711412520, - "narHash": "sha256-48Aw1X7IuXZR6Wi2WOlvj9HpoUHty/JW1MqAehgnoHo=", + "lastModified": 1719794527, + "narHash": "sha256-qHo/KumtwAzPkfLWODu/6EFY/LeK+C7iPJyAUdT8tGA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "fc84d1170ccc83d50db7b71a6edd090b2cef7657", + "rev": "da2a3bc9bd1b3dd41bb147279529c471c615fd3e", "type": "github" }, "original": { @@ -950,6 +868,8 @@ "hls-2.4": "hls-2.4", "hls-2.5": "hls-2.5", "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -969,11 +889,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1712278203, - "narHash": "sha256-L4eFUxnID2EYYtONE3fmZxPQdgPlB6XbAfIjlZi4c+U=", + "lastModified": 1718797200, + "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "57938c23a4d40e5a746f05f2b71af11a7273a133", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" }, "original": { @@ -989,7 +909,7 @@ "cabal-34": "cabal-34_2", "cabal-36": "cabal-36_2", "cardano-shell": "cardano-shell_2", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", "hackage": "hackage", "hls-1.10": "hls-1.10_2", @@ -999,8 +919,8 @@ "hls-2.4": "hls-2.4_2", "hls-2.5": "hls-2.5_2", "hls-2.6": "hls-2.6_2", - "hls-2.7": "hls-2.7", - "hls-2.8": "hls-2.8", + "hls-2.7": "hls-2.7_2", + "hls-2.8": "hls-2.8_2", "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls_2", "hydra": "hydra_2", @@ -1036,7 +956,11 @@ }, "haumea": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "cardano-node", + "std", + "lib" + ] }, "locked": { "lastModified": 1685133229, @@ -1324,6 +1248,23 @@ "type": "github" } }, + "hls-2.7_2": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.8": { "flake": false, "locked": { @@ -1341,6 +1282,23 @@ "type": "github" } }, + "hls-2.8_2": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.9": { "flake": false, "locked": { @@ -1438,36 +1396,11 @@ } }, "incl": { - "inputs": { - "nixlib": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "incl_2": { "inputs": { "nixlib": [ "cardano-node", "std", - "haumea", - "nixpkgs" + "lib" ] }, "locked": { @@ -1487,7 +1420,7 @@ "iohk-nix": { "inputs": { "blst": "blst_2", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_9", "secp256k1": "secp256k1_2", "sodium": "sodium_2" }, @@ -1516,16 +1449,15 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1715311504, - "narHash": "sha256-Jxma8/3WMb++2V1sp/iMF+6azv8cBR+ZbkLr61p2R24=", + "lastModified": 1719237167, + "narHash": "sha256-ifW5Jfwu/iwYs0r7f8AdiWDQK+Pr1gZLz+p5u8OtOgo=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "47727032a26ed92438afef6bdd45c95cd7399694", + "rev": "577f4d5072945a88dda6f5cfe205e6b4829a0423", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "node-8.11", "repo": "iohk-nix", "type": "github" } @@ -1533,11 +1465,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1708894040, - "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=", + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9", + "rev": "2ed34002247213fc435d0062350b91bab920626e", "type": "github" }, "original": { @@ -1564,9 +1496,24 @@ "type": "github" } }, + "lib": { + "locked": { + "lastModified": 1694306727, + "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "lint-utils": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "haskellNix", "nixpkgs" @@ -1618,37 +1565,47 @@ "type": "github" } }, + "mdbook-kroki-preprocessor": { + "flake": false, + "locked": { + "lastModified": 1661755005, + "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", + "type": "github" + }, + "original": { + "owner": "JoelCourtney", + "repo": "mdbook-kroki-preprocessor", + "type": "github" + } + }, "mithril": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1714464175, - "narHash": "sha256-DQVuHnDg9FdOlFPGK9KSNXCVl1vxYcYCKk/cBN/JEdo=", + "lastModified": 1720620343, + "narHash": "sha256-DXIX9kww679WFpiuQ2skk/bRuY4Jtlx1FaXK36YJPQE=", "owner": "input-output-hk", "repo": "mithril", - "rev": "512fe8d0b72e27f38b76cddca3d22877505156b0", + "rev": "6756b0f7d73d37229321ec6be74954f5c6d0486c", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "2418.1", + "ref": "2428.0", "repo": "mithril", "type": "github" } }, "n2c": { "inputs": { - "flake-utils": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "flake-utils" - ], + "flake-utils": "flake-utils_4", "nixpkgs": [ "cardano-node", "cardano-automation", @@ -1658,38 +1615,11 @@ ] }, "locked": { - "lastModified": 1677330646, - "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "n2c_2": { - "inputs": { - "flake-utils": [ - "cardano-node", - "std", - "flake-utils" - ], - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685771919, - "narHash": "sha256-3lVKWrhNXjHJB6QkZ2SJaOs4X/mmYXtY6ovPVpDMOHc=", + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", "owner": "nlewo", "repo": "nix2container", - "rev": "95e2220911874064b5d809f8d35f7835184c4ddf", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", "type": "github" }, "original": { @@ -1759,7 +1689,7 @@ }, "nix-npm-buildpackage": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1686315622, @@ -1796,15 +1726,15 @@ }, "nix2container_2": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1671269339, - "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", + "lastModified": 1712990762, + "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", "owner": "nlewo", "repo": "nix2container", - "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", + "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", "type": "github" }, "original": { @@ -1816,7 +1746,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_8", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1859,43 +1789,11 @@ ] }, "locked": { - "lastModified": 1676075813, - "narHash": "sha256-X/aIT8Qc8UCqnxJvaZykx3CJ0ZnDFvO+dqp/7fglZWo=", + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", "owner": "nix-community", "repo": "nixago", - "rev": "9cab4dde31ec2f2c05d702ea8648ce580664e906", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixago_2": { - "inputs": { - "flake-utils": [ - "cardano-node", - "std", - "flake-utils" - ], - "nixago-exts": [ - "cardano-node", - "std", - "blank" - ], - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683210100, - "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", - "owner": "nix-community", - "repo": "nixago", - "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", "type": "github" }, "original": { @@ -2158,20 +2056,14 @@ }, "nixpkgs-lib_2": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs-regression": { @@ -2240,43 +2132,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "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_12": { - "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "lastModified": 1720571246, + "narHash": "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "rev": "16e401f01842c5bb2499e78c1fe227f939c0c474", "type": "github" }, "original": { @@ -2286,7 +2146,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_11": { "locked": { "lastModified": 1653917367, "narHash": "sha256-04MsJC0g9kE01nBuXThMppZK+yvCZECQnUaZKSU+HJo=", @@ -2317,11 +2177,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", "type": "github" }, "original": { @@ -2363,11 +2223,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1712920918, + "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297", "type": "github" }, "original": { @@ -2378,47 +2238,48 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "lastModified": 1708343346, + "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9312b935a538684049cb668885e60f15547d4c5f", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", + "owner": "nixos", + "ref": "release-23.11", + "repo": "nixpkgs", "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", - "owner": "nixos", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } @@ -2438,21 +2299,6 @@ "type": "github" } }, - "nosys_2": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, "old-ghc-nix": { "flake": false, "locked": { @@ -2490,11 +2336,11 @@ "ops-lib": { "flake": false, "locked": { - "lastModified": 1675186784, - "narHash": "sha256-HqDtrvk1l7YeREzCSEpUtChtlEgT6Tww9WrJiozjukc=", + "lastModified": 1713366514, + "narHash": "sha256-0hNlv+grFTE+TeXIbxSY97QoEEaUupOKMusZ4PesdrQ=", "owner": "input-output-hk", "repo": "ops-lib", - "rev": "5be29ed53b2a4cbbf4cf326fa2e9c1f2b754d26d", + "rev": "19d83fa8eab1c0b7765f736eb4e8569d84d3e39d", "type": "github" }, "original": { @@ -2505,174 +2351,51 @@ }, "paisano": { "inputs": { + "call-flake": "call-flake", "nixpkgs": [ "cardano-node", - "cardano-automation", - "tullia", "std", "nixpkgs" ], "nosys": "nosys", "yants": [ "cardano-node", - "cardano-automation", - "tullia", "std", "yants" ] }, "locked": { - "lastModified": 1677437285, - "narHash": "sha256-YGfMothgUq1T9wMJYEhOSvdIiD/8gLXO1YcZA6hyIWU=", + "lastModified": 1708640854, + "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=", "owner": "paisano-nix", "repo": "core", - "rev": "5f2fc05e98e001cb1cf9535ded09e05d90cec131", + "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe", "type": "github" }, "original": { "owner": "paisano-nix", + "ref": "0.2.0", "repo": "core", "type": "github" } }, - "paisano-actions": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677306424, - "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", - "owner": "paisano-nix", - "repo": "actions", - "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "actions", - "type": "github" - } - }, - "paisano-mdbook-preprocessor": { - "inputs": { - "crane": "crane", - "fenix": "fenix", - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "paisano-actions": "paisano-actions", - "std": [ - "cardano-node", - "std" - ] - }, - "locked": { - "lastModified": 1680654400, - "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "type": "github" - } - }, "paisano-tui": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], - "std": [ - "cardano-node", - "cardano-automation", - "tullia", - "std" - ] - }, - "locked": { - "lastModified": 1677533603, - "narHash": "sha256-Nq1dH/qn7Wg/Tj1+id+ZM3o0fzqonW73jAgY3mCp35M=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "802958d123b0a5437441be0cab1dee487b0ed3eb", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "tui", - "type": "github" - } - }, - "paisano-tui_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "blank" - ], - "std": [ - "cardano-node", - "std" - ] - }, + "flake": false, "locked": { - "lastModified": 1681847764, - "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", + "lastModified": 1708637035, + "narHash": "sha256-R19YURSK+MY/Rw6FZnojQS9zuDh+OoTAyngQAjjoubc=", "owner": "paisano-nix", "repo": "tui", - "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", + "rev": "231761b260587a64817e4ffae3afc15defaa15db", "type": "github" }, "original": { "owner": "paisano-nix", - "ref": "0.1.1", + "ref": "v0.5.0", "repo": "tui", "type": "github" } }, - "paisano_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "nosys": "nosys_2", - "yants": [ - "cardano-node", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862844, - "narHash": "sha256-m8l/HpRBJnZ3c0F1u0IyQ3nYGWE0R9V5kfORuqZPzgk=", - "owner": "paisano-nix", - "repo": "core", - "rev": "6674b3d3577212c1eeecd30d62d52edbd000e726", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.1.1", - "repo": "core", - "type": "github" - } - }, "root": { "inputs": { "CHaP": "CHaP", @@ -2690,54 +2413,6 @@ ] } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1677221702, - "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "cardano-node", - "std", - "paisano-mdbook-preprocessor", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "secp256k1": { "flake": false, "locked": { @@ -2809,11 +2484,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1712276009, - "narHash": "sha256-KlRJ+CGXRueyz2VRLDwra5JBNaI2GkltNJAjHa7fowE=", + "lastModified": 1718756571, + "narHash": "sha256-8rL8viTbuE9/yV1of6SWp2tHmhVMD2UmkOfmN5KDbKg=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "758035379a5ac4390879e4cd5164abe0c96fcea7", + "rev": "027672fb6fd45828b0e623c8152572d4058429ad", "type": "github" }, "original": { @@ -2840,18 +2515,10 @@ }, "std": { "inputs": { - "arion": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", "flake-utils": "flake-utils_3", - "incl": "incl", "makes": [ "cardano-node", "cardano-automation", @@ -2859,6 +2526,7 @@ "std", "blank" ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", "microvm": [ "cardano-node", "cardano-automation", @@ -2869,16 +2537,14 @@ "n2c": "n2c", "nixago": "nixago", "nixpkgs": "nixpkgs_3", - "paisano": "paisano", - "paisano-tui": "paisano-tui", "yants": "yants" }, "locked": { - "lastModified": 1677533652, - "narHash": "sha256-H37dcuWAGZs6Yl9mewMNVcmSaUXR90/bABYFLT/nwhk=", + "lastModified": 1665513321, + "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", "owner": "divnix", "repo": "std", - "rev": "490542f624412662e0411d8cb5a9af988ef56633", + "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", "type": "github" }, "original": { @@ -2895,11 +2561,15 @@ "blank" ], "blank": "blank_2", - "devshell": "devshell_2", + "devshell": [ + "cardano-node", + "std", + "blank" + ], "dmerge": "dmerge_2", - "flake-utils": "flake-utils_5", "haumea": "haumea", - "incl": "incl_2", + "incl": "incl", + "lib": "lib", "makes": [ "cardano-node", "std", @@ -2910,20 +2580,32 @@ "std", "blank" ], - "n2c": "n2c_2", - "nixago": "nixago_2", - "nixpkgs": "nixpkgs_8", - "paisano": "paisano_2", - "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", - "paisano-tui": "paisano-tui_2", + "n2c": [ + "cardano-node", + "std", + "blank" + ], + "nixago": [ + "cardano-node", + "std", + "blank" + ], + "nixpkgs": "nixpkgs_7", + "paisano": "paisano", + "paisano-tui": "paisano-tui", + "terranix": [ + "cardano-node", + "std", + "blank" + ], "yants": "yants_2" }, "locked": { - "lastModified": 1687300684, - "narHash": "sha256-oBqbss0j+B568GoO3nF2BCoPEgPxUjxfZQGynW6mhEk=", + "lastModified": 1715201063, + "narHash": "sha256-LcLYV5CDhIiJs3MfxGZFKsXPR4PtfnY4toZ75GM+2Pw=", "owner": "divnix", "repo": "std", - "rev": "80e5792eae98353a97ab1e85f3fba2784e4a3690", + "rev": "b6924a7d37a46fc1dda8efe405040e27ecf1bbd6", "type": "github" }, "original": { @@ -2947,6 +2629,21 @@ "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": [ @@ -2955,11 +2652,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1720507012, + "narHash": "sha256-QIeZ43t9IVB4dLsFaWh2f4C7JSRfK7p+Y1U9dULsLXU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "8b63fe8cf7892c59b3df27cbcab4d5644035d72f", "type": "github" }, "original": { @@ -2980,11 +2677,11 @@ "std": "std" }, "locked": { - "lastModified": 1684859161, - "narHash": "sha256-wOKutImA7CRL0rN+Ng80E72fD5FkVub7LLP2k9NICpg=", + "lastModified": 1668711738, + "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", "owner": "input-output-hk", "repo": "tullia", - "rev": "2964cff1a16eefe301bdddb508c49d94d04603d6", + "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", "type": "github" }, "original": { @@ -3009,12 +2706,15 @@ } }, "utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -3034,11 +2734,11 @@ ] }, "locked": { - "lastModified": 1667096281, - "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", "owner": "divnix", "repo": "yants", - "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", "type": "github" }, "original": { @@ -3052,8 +2752,7 @@ "nixpkgs": [ "cardano-node", "std", - "haumea", - "nixpkgs" + "lib" ] }, "locked": { diff --git a/flake.nix b/flake.nix index caaea1dbd4c..ed8a575e1d7 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,8 @@ url = "github:haskell/haskell-language-server"; flake = false; }; - cardano-node.url = "github:intersectmbo/cardano-node/8.11.0-pre"; - mithril.url = "github:input-output-hk/mithril/2418.1"; + cardano-node.url = "github:intersectmbo/cardano-node/9.0.0"; + mithril.url = "github:input-output-hk/mithril/2428.0"; nix-npm-buildpackage.url = "github:serokell/nix-npm-buildpackage"; }; diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/hydra-cardano-api/src/Hydra/Cardano/Api.hs index 9a333eea435..c7c2fab02ec 100644 --- a/hydra-cardano-api/src/Hydra/Cardano/Api.hs +++ b/hydra-cardano-api/src/Hydra/Cardano/Api.hs @@ -94,7 +94,6 @@ import Cardano.Api.Shelley as X ( Key (..), PlutusScriptOrReferenceInput (PScript), PoolId, - ProtocolParameters (..), ShelleyGenesis (..), ShelleyLedgerEra, SigningKey (..), diff --git a/hydra-cluster/config/protocol-parameters.json b/hydra-cluster/config/protocol-parameters.json index eeb2bcede7f..bde22e6d6d4 100644 --- a/hydra-cluster/config/protocol-parameters.json +++ b/hydra-cluster/config/protocol-parameters.json @@ -354,8 +354,6 @@ 10 ] }, - "decentralization": null, - "extraPraosEntropy": null, "maxBlockBodySize": 90112, "maxBlockExecutionUnits": { "memory": 62000000, @@ -370,7 +368,6 @@ "maxTxSize": 16384, "maxValueSize": 5000, "minPoolCost": 170000000, - "minUTxOValue": null, "monetaryExpansion": 3.0e-3, "poolPledgeInfluence": 0.3, "poolRetireMaxEpoch": 18, @@ -382,6 +379,5 @@ "stakePoolDeposit": 500000000, "stakePoolTargetNum": 500, "treasuryCut": 0.2, - "utxoCostPerByte": 4310, - "utxoCostPerWord": null + "utxoCostPerByte": 4310 } diff --git a/hydra-cluster/test/Test/CardanoNodeSpec.hs b/hydra-cluster/test/Test/CardanoNodeSpec.hs index 3dab4a075f8..1b30abf3078 100644 --- a/hydra-cluster/test/Test/CardanoNodeSpec.hs +++ b/hydra-cluster/test/Test/CardanoNodeSpec.hs @@ -21,7 +21,7 @@ supportedNetworks :: [KnownNetwork] supportedNetworks = [Sanchonet] supportedCardanoNodeVersion :: String -supportedCardanoNodeVersion = "8.11.0" +supportedCardanoNodeVersion = "9.0.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 fced2882efd..0a6ad4d3c91 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.23.1.0") + readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "9.0.0.0") around (showLogsOnFailure "CardanoCliSpec") $ do it "query protocol-parameters is compatible with our FromJSON instance" $ \tracer -> diff --git a/hydra-node/src/Hydra/Ledger/Cardano/Configuration.hs b/hydra-node/src/Hydra/Ledger/Cardano/Configuration.hs index 7cfa90f7fe5..b7ef5de8c54 100644 --- a/hydra-node/src/Hydra/Ledger/Cardano/Configuration.hs +++ b/hydra-node/src/Hydra/Ledger/Cardano/Configuration.hs @@ -82,11 +82,7 @@ newGlobals genesisParameters = do -- | Decode protocol parameters using the 'ProtocolParameters' instance as this -- is used by cardano-cli and matches the schema. TODO: define the schema pparamsFromJson :: Json.Value -> Json.Parser (PParams LedgerEra) -pparamsFromJson v = do - x <- parseJSON v - case toLedgerPParams (shelleyBasedEra @Era) x of - Left e -> fail $ show e - Right z -> pure z +pparamsFromJson = parseJSON -- | Create a new ledger env from given protocol parameters. newLedgerEnv :: PParams LedgerEra -> Ledger.LedgerEnv LedgerEra