From 8daa692c002ea084806ab42c043f9bb0e9d3e62b Mon Sep 17 00:00:00 2001
From: Yura Lazarev <Yuriy.Lazaryev@iohk.io>
Date: Thu, 20 Jun 2024 18:19:34 +0200
Subject: [PATCH 1/5] Update hackage, CHaP indexes

---
 .github/workflows/check-nix-config.yml |  39 --
 cabal.project                          |   4 +-
 flake.lock                             | 694 ++++++++-----------------
 flake.nix                              |   2 +-
 nix/regenerate.sh                      |   5 -
 5 files changed, 211 insertions(+), 533 deletions(-)
 delete mode 100644 .github/workflows/check-nix-config.yml
 delete mode 100755 nix/regenerate.sh

diff --git a/.github/workflows/check-nix-config.yml b/.github/workflows/check-nix-config.yml
deleted file mode 100644
index 84cfc19e668..00000000000
--- a/.github/workflows/check-nix-config.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Check nix configuration
-
-on:
-  pull_request: # Required for workflows to be able to be approved from forks
-  merge_group:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-
-    - name: Install Nix
-      uses: cachix/install-nix-action@v18
-      with:
-        # Use last stable nixos channel and the same nix as in channel:
-        install_url: https://releases.nixos.org/nix/nix-2.11.1/install
-        nix_path: nixpkgs=channel:nixos-22.11
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
-        extra_nix_config: |
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-          experimental-features = nix-command flakes
-          allow-import-from-derivation = true
-          substituters = https://cache.nixos.org https://cache.iog.io
-          trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-
-    - uses: actions/checkout@v3
-
-    - name: Regenerate nix files
-      run: |
-        ./nix/regenerate.sh
-
-    - name: Check nix configuration differences
-      run: |
-        git diff --exit-code
diff --git a/cabal.project b/cabal.project
index d0d53d59565..3a521d8509d 100644
--- a/cabal.project
+++ b/cabal.project
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-05-30T17:32:42Z
-  , cardano-haskell-packages 2024-06-04T19:25:39Z
+  , hackage.haskell.org 2024-06-13T08:49:27Z
+  , cardano-haskell-packages 2024-06-20T14:49:55Z
 
 packages:
   cardano-node
diff --git a/flake.lock b/flake.lock
index b48bd7f60a0..f04dc68331c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "CHaP": {
       "flake": false,
       "locked": {
-        "lastModified": 1717622493,
-        "narHash": "sha256-V7JXGPxd6gwB7YVeZGtikI+Xjfowi8tZRQPcLQFPRJM=",
+        "lastModified": 1718896150,
+        "narHash": "sha256-tLldSak3ilawlFiAENbuTos0W+oZQGVc1sbkUfv1hko=",
         "owner": "intersectmbo",
         "repo": "cardano-haskell-packages",
-        "rev": "d678d09cdae1fe706edcf8e72df924e4c94e080f",
+        "rev": "81a484da765cc302d10956134f455f9493c80d14",
         "type": "github"
       },
       "original": {
@@ -131,6 +131,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",
@@ -191,31 +206,6 @@
         "type": "github"
       }
     },
-    "crane": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_6",
-        "nixpkgs": [
-          "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"
-      }
-    },
     "customConfig": {
       "locked": {
         "lastModified": 1630400035,
@@ -260,28 +250,6 @@
         "type": "github"
       }
     },
-    "devshell_2": {
-      "inputs": {
-        "nixpkgs": [
-          "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": [
@@ -319,8 +287,7 @@
         ],
         "nixlib": [
           "std",
-          "haumea",
-          "nixpkgs"
+          "lib"
         ],
         "yants": [
           "std",
@@ -345,11 +312,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": {
@@ -373,25 +340,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": {
@@ -442,22 +390,6 @@
         "type": "github"
       }
     },
-    "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-utils": {
       "locked": {
         "lastModified": 1667395993,
@@ -519,27 +451,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": {
@@ -568,11 +488,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"
@@ -587,11 +507,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"
@@ -624,11 +544,11 @@
     "hackageNix": {
       "flake": false,
       "locked": {
-        "lastModified": 1717115116,
-        "narHash": "sha256-V41ZuxYDAaN+H9kuREzeL/Pet00MRuHwxYOxs3ti2os=",
+        "lastModified": 1718757495,
+        "narHash": "sha256-xviuxucDjsQ2HbqzfwVyB4ZmDIyzOnf2oDbVtwBHIco=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "724171a4419f1f91dae5febfd2606ef440a3f9ae",
+        "rev": "0bb764772a383a926e3f945397a0e59ab3c64d6d",
         "type": "github"
       },
       "original": {
@@ -658,6 +578,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",
@@ -676,11 +598,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": {
@@ -691,7 +613,10 @@
     },
     "haumea": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": [
+          "std",
+          "lib"
+        ]
       },
       "locked": {
         "lastModified": 1685133229,
@@ -827,6 +752,40 @@
         "type": "github"
       }
     },
+    "hls-2.7": {
+      "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": {
+        "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"
+      }
+    },
     "hpc-coveralls": {
       "flake": false,
       "locked": {
@@ -867,34 +826,10 @@
       }
     },
     "incl": {
-      "inputs": {
-        "nixlib": [
-          "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": [
           "std",
-          "haumea",
-          "nixpkgs"
+          "lib"
         ]
       },
       "locked": {
@@ -921,11 +856,11 @@
         "sodium": "sodium"
       },
       "locked": {
-        "lastModified": 1715898223,
-        "narHash": "sha256-G1LFsvP53twrqaC1FVard/6rjJJ3oitnpJ1E+mTZDGM=",
+        "lastModified": 1718918026,
+        "narHash": "sha256-UwtI3Di9Nj3TeSbpxBF6ZeF6nlpX+01DX/BHAoq7VgM=",
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "29f19cd41dc593cf17bbc24194e34e7c20889fc9",
+        "rev": "dd25b32946a82f109e1da6f82848f57edcbe758a",
         "type": "github"
       },
       "original": {
@@ -937,11 +872,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": {
@@ -951,6 +886,21 @@
         "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"
+      }
+    },
     "lowdown-src": {
       "flake": false,
       "locked": {
@@ -967,52 +917,38 @@
         "type": "github"
       }
     },
-    "n2c": {
-      "inputs": {
-        "flake-utils": [
-          "cardano-automation",
-          "tullia",
-          "std",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "cardano-automation",
-          "tullia",
-          "std",
-          "nixpkgs"
-        ]
-      },
+    "mdbook-kroki-preprocessor": {
+      "flake": false,
       "locked": {
-        "lastModified": 1677330646,
-        "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=",
-        "owner": "nlewo",
-        "repo": "nix2container",
-        "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc",
+        "lastModified": 1661755005,
+        "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=",
+        "owner": "JoelCourtney",
+        "repo": "mdbook-kroki-preprocessor",
+        "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f",
         "type": "github"
       },
       "original": {
-        "owner": "nlewo",
-        "repo": "nix2container",
+        "owner": "JoelCourtney",
+        "repo": "mdbook-kroki-preprocessor",
         "type": "github"
       }
     },
-    "n2c_2": {
+    "n2c": {
       "inputs": {
-        "flake-utils": [
-          "std",
-          "flake-utils"
-        ],
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
+          "cardano-automation",
+          "tullia",
           "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": {
@@ -1098,15 +1034,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": {
@@ -1137,40 +1073,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1676075813,
-        "narHash": "sha256-X/aIT8Qc8UCqnxJvaZykx3CJ0ZnDFvO+dqp/7fglZWo=",
-        "owner": "nix-community",
-        "repo": "nixago",
-        "rev": "9cab4dde31ec2f2c05d702ea8648ce580664e906",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixago",
-        "type": "github"
-      }
-    },
-    "nixago_2": {
-      "inputs": {
-        "flake-utils": [
-          "std",
-          "flake-utils"
-        ],
-        "nixago-exts": [
-          "std",
-          "blank"
-        ],
-        "nixpkgs": [
-          "std",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1683210100,
-        "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=",
+        "lastModified": 1661824785,
+        "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=",
         "owner": "nix-community",
         "repo": "nixago",
-        "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630",
+        "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3",
         "type": "github"
       },
       "original": {
@@ -1356,11 +1263,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": {
@@ -1402,11 +1309,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": {
@@ -1417,47 +1324,16 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1681001314,
-        "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1675940568,
-        "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1677063315,
-        "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
+        "lastModified": 1708343346,
+        "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
+        "rev": "9312b935a538684049cb668885e60f15547d4c5f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1477,21 +1353,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": {
@@ -1512,11 +1373,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": {
@@ -1527,163 +1388,49 @@
     },
     "paisano": {
       "inputs": {
+        "call-flake": "call-flake",
         "nixpkgs": [
-          "cardano-automation",
-          "tullia",
           "std",
           "nixpkgs"
         ],
         "nosys": "nosys",
         "yants": [
-          "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": [
-          "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": [
-          "std",
-          "nixpkgs"
-        ],
-        "paisano-actions": "paisano-actions",
-        "std": [
-          "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-automation",
-          "tullia",
-          "std",
-          "blank"
-        ],
-        "std": [
-          "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": [
-          "std",
-          "blank"
-        ],
-        "std": [
-          "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": [
-          "std",
-          "nixpkgs"
-        ],
-        "nosys": "nosys_2",
-        "yants": [
-          "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",
@@ -1709,52 +1456,6 @@
         "utils": "utils_2"
       }
     },
-    "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": [
-          "std",
-          "paisano-mdbook-preprocessor",
-          "crane",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "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": {
@@ -1792,11 +1493,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": {
@@ -1807,23 +1508,17 @@
     },
     "std": {
       "inputs": {
-        "arion": [
-          "cardano-automation",
-          "tullia",
-          "std",
-          "blank"
-        ],
         "blank": "blank",
         "devshell": "devshell",
         "dmerge": "dmerge",
         "flake-utils": "flake-utils_3",
-        "incl": "incl",
         "makes": [
           "cardano-automation",
           "tullia",
           "std",
           "blank"
         ],
+        "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor",
         "microvm": [
           "cardano-automation",
           "tullia",
@@ -1833,16 +1528,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": {
@@ -1858,11 +1551,14 @@
           "blank"
         ],
         "blank": "blank_2",
-        "devshell": "devshell_2",
+        "devshell": [
+          "std",
+          "blank"
+        ],
         "dmerge": "dmerge_2",
-        "flake-utils": "flake-utils_5",
         "haumea": "haumea",
-        "incl": "incl_2",
+        "incl": "incl",
+        "lib": "lib",
         "makes": [
           "std",
           "blank"
@@ -1871,20 +1567,29 @@
           "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": [
+          "std",
+          "blank"
+        ],
+        "nixago": [
+          "std",
+          "blank"
+        ],
+        "nixpkgs": "nixpkgs_7",
+        "paisano": "paisano",
+        "paisano-tui": "paisano-tui",
+        "terranix": [
+          "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": {
@@ -1908,6 +1613,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"
+      }
+    },
     "tullia": {
       "inputs": {
         "nix-nomad": "nix-nomad",
@@ -1919,11 +1639,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": {
@@ -1948,12 +1668,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": {
@@ -1972,11 +1695,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": {
@@ -1989,8 +1712,7 @@
       "inputs": {
         "nixpkgs": [
           "std",
-          "haumea",
-          "nixpkgs"
+          "lib"
         ]
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 5f9bac94f86..a68c34937c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -175,7 +175,7 @@
         });
 
         exes = (collectExes project) // {
-          inherit (pkgs) cabalProjectRegenerate checkCabalProject;
+          inherit (pkgs) checkCabalProject;
         } // flattenTree (pkgs.scripts // {
           # `tests` are the test suites which have been built.
           inherit (project) tests;
diff --git a/nix/regenerate.sh b/nix/regenerate.sh
deleted file mode 100755
index f8d78cc02c7..00000000000
--- a/nix/regenerate.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-cd $(git rev-parse --show-toplevel)
-
-nix run .#cabalProjectRegenerate

From feb0c8eb14c20b3954bcb3133a2ba4b8009dc581 Mon Sep 17 00:00:00 2001
From: Yura Lazarev <Yuriy.Lazaryev@iohk.io>
Date: Thu, 20 Jun 2024 18:20:38 +0200
Subject: [PATCH 2/5] Update nix in Github workflows

---
 .github/workflows/check-mainnet-config.yml    | 6 ++----
 .github/workflows/github-page.yml             | 3 +--
 .github/workflows/update-hackage-and-chap.yml | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/check-mainnet-config.yml b/.github/workflows/check-mainnet-config.yml
index 451b1d310e8..acbbc250811 100644
--- a/.github/workflows/check-mainnet-config.yml
+++ b/.github/workflows/check-mainnet-config.yml
@@ -15,11 +15,10 @@ jobs:
     steps:
 
     - name: Install Nix
-      uses: cachix/install-nix-action@v18
+      uses: cachix/install-nix-action@v27
       with:
         # Use last stable nixos channel and the same nix as in channel:
-        install_url: https://releases.nixos.org/nix/nix-2.11.1/install
-        nix_path: nixpkgs=channel:nixos-22.11
+        nix_path: nixpkgs=channel:nixos-24.05
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -41,7 +40,6 @@ jobs:
         test_files=(
           'mainnet-alonzo-genesis.json'
           'mainnet-byron-genesis.json'
-          'mainnet-conway-genesis.json'
           'mainnet-config.json'
           'mainnet-shelley-genesis.json'
           'mainnet-topology.json'
diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml
index 576924df371..2bfe19bd8ec 100644
--- a/.github/workflows/github-page.yml
+++ b/.github/workflows/github-page.yml
@@ -18,8 +18,7 @@ jobs:
       uses: cachix/install-nix-action@v18
       with:
         # Use last stable nixos channel and the same nix as in channel:
-        install_url: https://releases.nixos.org/nix/nix-2.11.1/install
-        nix_path: nixpkgs=channel:nixos-22.11
+        nix_path: nixpkgs=channel:nixos-24.05
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
         extra_nix_config: |
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-hackage-and-chap.yml b/.github/workflows/update-hackage-and-chap.yml
index 6ca017b820d..c1d97843e27 100644
--- a/.github/workflows/update-hackage-and-chap.yml
+++ b/.github/workflows/update-hackage-and-chap.yml
@@ -13,8 +13,7 @@ jobs:
         uses: cachix/install-nix-action@v18
         with:
           # Use last stable nixos channel and the same nix as in channel:
-          install_url: https://releases.nixos.org/nix/nix-2.11.1/install
-          nix_path: nixpkgs=channel:nixos-22.11
+          nix_path: nixpkgs=channel:nixos-24.05
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

From 09cceafcbb6ad92c2c8b06b49bf7a50f8f3f0c60 Mon Sep 17 00:00:00 2001
From: Yura Lazarev <Yuriy.Lazaryev@iohk.io>
Date: Thu, 20 Jun 2024 18:22:53 +0200
Subject: [PATCH 3/5] Update dependency versions (cardano-api, cardano-cli,
 ouroboros-network, plutus-ledger-api)

---
 bench/locli/locli.cabal                       |    2 +-
 .../locli/src/Cardano/Analysis/API/Ground.hs  |    2 +-
 bench/locli/src/Cardano/Analysis/MachPerf.hs  |    2 +-
 bench/locli/src/Cardano/Command.hs            |    2 +-
 bench/locli/src/Cardano/Unlog/LogObject.hs    |    2 +-
 .../plutus-scripts-bench.cabal                |    8 +-
 .../PlutusScripts/HashOntoG2AndAdd.hs         |    5 +-
 .../Benchmarking/PlutusScripts/LoopV3.hs      |    5 +-
 .../data/protocol-parameters-conway.json      |   38 +-
 .../scripts-fallback/HashOntoG2AndAdd.plutus  |    2 +-
 .../scripts-fallback/LoopV3.plutus            |    2 +-
 .../src/Cardano/TxGenerator/Setup/Plutus.hs   |   18 +-
 bench/tx-generator/tx-generator.cabal         |   40 +-
 cabal.project                                 |    6 +-
 .../cardano-node-chairman.cabal               |    2 +-
 cardano-node/cardano-node.cabal               |   20 +-
 .../src/Cardano/Node/Tracing/Era/Shelley.hs   |    8 +-
 .../Cardano/Node/Tracing/Tracers/Consensus.hs |  108 +
 .../Tracing/OrphanInstances/Consensus.hs      |   60 +
 .../Tracing/OrphanInstances/Shelley.hs        |    6 +-
 cardano-node/src/Cardano/Tracing/Tracers.hs   |    8 +-
 cardano-submit-api/cardano-submit-api.cabal   |    6 +-
 cardano-testnet/cardano-testnet.cabal         |    8 +-
 cardano-testnet/src/Testnet/Defaults.hs       |   46 +-
 .../src/Testnet/EpochStateProcessing.hs       |    4 +-
 .../src/Testnet/Process/Cli/DRep.hs           |   14 +-
 .../src/Testnet/Process/Cli/SPO.hs            |    8 +-
 cardano-testnet/src/Testnet/Runtime.hs        |    2 +-
 .../Testnet/Test/Cli/Babbage/Transaction.hs   |   16 +-
 .../Cardano/Testnet/Test/Cli/Conway/Plutus.hs |   19 +-
 .../Cardano/Testnet/Test/FoldEpochState.hs    |    2 +-
 .../Cardano/Testnet/Test/Gov/DRepActivity.hs  |    6 +-
 .../Cardano/Testnet/Test/Gov/InfoAction.hs    |    4 +-
 .../Testnet/Test/Gov/PParamChangeFailsSPO.hs  |    4 +-
 .../Testnet/Test/Gov/PredefinedAbstainDRep.hs |   14 +-
 .../Test/Gov/ProposeNewConstitution.hs        |    4 +-
 .../Testnet/Test/Gov/TreasuryGrowth.hs        |    2 +-
 .../cardano-testnet-test.hs                   |    2 +-
 .../files/golden/queries/govStateOut.json     | 2822 ++++++++---------
 .../queries/protocolParametersFileOut.json    |  469 +--
 .../golden/queries/protocolParametersOut.txt  |  469 +--
 .../golden/tx.failed.response.json.golden     |    2 +-
 cardano-tracer/cardano-tracer.cabal           |    2 +-
 .../cardano/mainnet-config-new-tracing.json   |    2 -
 configuration/cardano/mainnet-config.json     |    4 +-
 configuration/cardano/mainnet-config.yaml     |    4 +-
 .../cardano/mainnet-conway-genesis.json       |  274 --
 configuration/cardano/shelley_qa-config.json  |    2 +-
 configuration/cardano/update-config-files.sh  |    1 -
 nix/binary-release.nix                        |   23 +-
 nix/haskell.nix                               |    5 +-
 .../profile/pparams/delta-v9-preview.jq       |  279 +-
 .../profile/pparams/epoch-timeline.jq         |   18 +
 .../babbage/alonzo-babbage-test-genesis.json  |   12 +-
 .../babbage/conway-babbage-test-genesis.json  |    2 +-
 trace-dispatcher/trace-dispatcher.cabal       |    2 +-
 trace-forward/trace-forward.cabal             |    2 +-
 57 files changed, 2306 insertions(+), 2595 deletions(-)
 delete mode 100644 configuration/cardano/mainnet-conway-genesis.json

diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal
index 20b3f4ad2cc..6a5c46efefb 100644
--- a/bench/locli/locli.cabal
+++ b/bench/locli/locli.cabal
@@ -121,7 +121,7 @@ library
                       , optparse-generic
                       , ouroboros-consensus
                       -- for Data.SOP.Strict:
-                      , ouroboros-network ^>= 0.16
+                      , ouroboros-network ^>= 0.16.1
                       , ouroboros-network-api
                       , process
                       , quiet
diff --git a/bench/locli/src/Cardano/Analysis/API/Ground.hs b/bench/locli/src/Cardano/Analysis/API/Ground.hs
index 30bcbaf17c3..d09abe5bf6d 100644
--- a/bench/locli/src/Cardano/Analysis/API/Ground.hs
+++ b/bench/locli/src/Cardano/Analysis/API/Ground.hs
@@ -11,7 +11,7 @@ module Cardano.Analysis.API.Ground
 where
 
 import Prelude                          (show)
-import Cardano.Prelude                  hiding (head)
+import Cardano.Prelude                  hiding (head, toText)
 import Unsafe.Coerce                    qualified as Unsafe
 
 import Data.Aeson
diff --git a/bench/locli/src/Cardano/Analysis/MachPerf.hs b/bench/locli/src/Cardano/Analysis/MachPerf.hs
index f0d78fdb8db..4ee40096443 100644
--- a/bench/locli/src/Cardano/Analysis/MachPerf.hs
+++ b/bench/locli/src/Cardano/Analysis/MachPerf.hs
@@ -12,7 +12,7 @@
 
 module Cardano.Analysis.MachPerf (module Cardano.Analysis.MachPerf) where
 
-import Cardano.Prelude hiding (head)
+import Cardano.Prelude hiding (head, toText)
 import Cardano.Prelude qualified as CP
 
 import Data.List                        ((!!))
diff --git a/bench/locli/src/Cardano/Command.hs b/bench/locli/src/Cardano/Command.hs
index b2fedfb5b2f..41d3738477e 100644
--- a/bench/locli/src/Cardano/Command.hs
+++ b/bench/locli/src/Cardano/Command.hs
@@ -2,7 +2,7 @@
 {-# OPTIONS_GHC -fmax-pmcheck-models=25000 #-}
 module Cardano.Command (module Cardano.Command) where
 
-import Cardano.Prelude          hiding (State)
+import Cardano.Prelude          hiding (State, toText)
 
 import Data.Aeson                       qualified as Aeson
 import Data.Aeson.Text                  qualified as Aeson
diff --git a/bench/locli/src/Cardano/Unlog/LogObject.hs b/bench/locli/src/Cardano/Unlog/LogObject.hs
index bc2050ce5b1..aebfbc7bba9 100644
--- a/bench/locli/src/Cardano/Unlog/LogObject.hs
+++ b/bench/locli/src/Cardano/Unlog/LogObject.hs
@@ -30,7 +30,7 @@ module Cardano.Unlog.LogObject
   )
 where
 
-import           Cardano.Prelude hiding (Text, show)
+import           Cardano.Prelude hiding (Text, show, toText)
 import           GHC.Conc (numCapabilities)
 import           Prelude (id, show, unzip3)
 
diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
index cfe5f3ecd9b..7ba3f25a370 100644
--- a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
+++ b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -80,10 +80,10 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>= 8.46
-    , plutus-ledger-api       >=1.0.0
-    , plutus-tx               >=1.0.0
-    , plutus-tx-plugin        ^>=1.27
+    , cardano-api             ^>=8.48.0.1
+    , plutus-ledger-api       ^>=1.30
+    , plutus-tx               ^>=1.30
+    , plutus-tx-plugin        ^>=1.30
 
   ------------------------
   -- Non-IOG dependencies
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs
index 300e381da0e..ddaaa9bea1f 100644
--- a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs
+++ b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs
@@ -25,6 +25,7 @@ import           GHC.ByteOrder (ByteOrder(LittleEndian))
 import           Language.Haskell.TH
 import           Language.Haskell.TH.Syntax
 import qualified PlutusTx
+import qualified PlutusTx.Builtins.Internal as BI (unitval)
 import           PlutusTx.Prelude as Tx hiding (Semigroup (..), (.), (<$>))
 
 
@@ -36,7 +37,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScript scriptName (toScriptInAnyLang (PlutusScript PlutusScriptV3 scriptSerialized))
 
 {-# INLINABLE mkValidator #-}
-mkValidator :: BuiltinData -> BuiltinData -> BuiltinData -> ()
+mkValidator :: BuiltinData -> BuiltinData -> BuiltinData -> BuiltinUnit
 mkValidator _datum red _txContext =
   case PlutusV3.fromBuiltinData red of
     Nothing -> Tx.traceError "invalid redeemer"
@@ -51,7 +52,7 @@ mkValidator _datum red _txContext =
       where go [] !acc     = acc
             go (q:qs) !acc = go qs $ Tx.bls12_381_G2_add (Tx.bls12_381_G2_hashToGroup q (integerToByteString LittleEndian 0 i)) acc
     loop i l
-      | i == 1000000 = ()
+      | i == 1000000 = BI.unitval
       | otherwise    = let !_ = hashAndAddG2 l i in loop (pred i) l
 
 hashAndAddG2ShortBs :: SBS.ShortByteString
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs
index a84b5a87e12..449bde3d504 100644
--- a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs
+++ b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs
@@ -18,6 +18,7 @@ import qualified Data.ByteString.Short as SBS
 import qualified PlutusLedgerApi.V3 as PlutusV3
 import           PlutusTx
 import           PlutusTx.Builtins (unsafeDataAsI)
+import qualified PlutusTx.Builtins.Internal as BI (unitval)
 import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.), (<$>))
 
 
@@ -30,14 +31,14 @@ script = mkPlutusBenchScript scriptName (toScriptInAnyLang (PlutusScript PlutusS
 
 
 {-# INLINABLE mkValidator #-}
-mkValidator :: BuiltinData -> BuiltinData -> BuiltinData -> ()
+mkValidator :: BuiltinData -> BuiltinData -> BuiltinData -> BuiltinUnit
 mkValidator _datum redeemer _txContext
   = if n < 1000000
        then traceError "redeemer is < 1000000"
        else loop n
   where
     n = unsafeDataAsI redeemer
-    loop i = if i == 1000000 then () else loop $ pred i
+    loop i = if i == 1000000 then BI.unitval else loop $ pred i
 
 loopScriptShortBs :: SBS.ShortByteString
 loopScriptShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/tx-generator/data/protocol-parameters-conway.json b/bench/tx-generator/data/protocol-parameters-conway.json
index 03d5b2c06d6..05e7b2266ac 100644
--- a/bench/tx-generator/data/protocol-parameters-conway.json
+++ b/bench/tx-generator/data/protocol-parameters-conway.json
@@ -447,8 +447,13 @@
       "decodeUtf8-memory-arguments-intercept": 4,
       "decodeUtf8-memory-arguments-slope": 2,
       "divideInteger-cpu-arguments-constant": 85848,
-      "divideInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "divideInteger-cpu-arguments-model-arguments-slope": 122,
+      "divideInteger-cpu-arguments-model-arguments-c00": 123203,
+      "divideInteger-cpu-arguments-model-arguments-c01": 7305,
+      "divideInteger-cpu-arguments-model-arguments-c02": -900,
+      "divideInteger-cpu-arguments-model-arguments-c10": 1716,
+      "divideInteger-cpu-arguments-model-arguments-c11": 549,
+      "divideInteger-cpu-arguments-model-arguments-c20": 57,
+      "divideInteger-cpu-arguments-model-arguments-minimum": 85848,
       "divideInteger-memory-arguments-intercept": 0,
       "divideInteger-memory-arguments-minimum": 1,
       "divideInteger-memory-arguments-slope": 1,
@@ -515,10 +520,14 @@
       "mkPairData-cpu-arguments": 11546,
       "mkPairData-memory-arguments": 32,
       "modInteger-cpu-arguments-constant": 85848,
-      "modInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "modInteger-cpu-arguments-model-arguments-slope": 122,
+      "modInteger-cpu-arguments-model-arguments-c00": 123203,
+      "modInteger-cpu-arguments-model-arguments-c01": 7305,
+      "modInteger-cpu-arguments-model-arguments-c02": -900,
+      "modInteger-cpu-arguments-model-arguments-c10": 1716,
+      "modInteger-cpu-arguments-model-arguments-c11": 549,
+      "modInteger-cpu-arguments-model-arguments-c20": 57,
+      "modInteger-cpu-arguments-model-arguments-minimum": 85848,
       "modInteger-memory-arguments-intercept": 0,
-      "modInteger-memory-arguments-minimum": 1,
       "modInteger-memory-arguments-slope": 1,
       "multiplyInteger-cpu-arguments-intercept": 90434,
       "multiplyInteger-cpu-arguments-slope": 519,
@@ -527,16 +536,25 @@
       "nullList-cpu-arguments": 74433,
       "nullList-memory-arguments": 32,
       "quotientInteger-cpu-arguments-constant": 85848,
-      "quotientInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "quotientInteger-cpu-arguments-model-arguments-slope": 122,
+      "quotientInteger-cpu-arguments-model-arguments-c00": 123203,
+      "quotientInteger-cpu-arguments-model-arguments-c01": 7305,
+      "quotientInteger-cpu-arguments-model-arguments-c02": -900,
+      "quotientInteger-cpu-arguments-model-arguments-c10": 1716,
+      "quotientInteger-cpu-arguments-model-arguments-c11": 549,
+      "quotientInteger-cpu-arguments-model-arguments-c20": 57,
+      "quotientInteger-cpu-arguments-model-arguments-minimum": 85848,
       "quotientInteger-memory-arguments-intercept": 0,
       "quotientInteger-memory-arguments-minimum": 1,
       "quotientInteger-memory-arguments-slope": 1,
       "remainderInteger-cpu-arguments-constant": 85848,
-      "remainderInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "remainderInteger-cpu-arguments-model-arguments-slope": 122,
+      "remainderInteger-cpu-arguments-model-arguments-c00": 123203,
+      "remainderInteger-cpu-arguments-model-arguments-c01": 7305,
+      "remainderInteger-cpu-arguments-model-arguments-c02": -900,
+      "remainderInteger-cpu-arguments-model-arguments-c10": 1716,
+      "remainderInteger-cpu-arguments-model-arguments-c11": 549,
+      "remainderInteger-cpu-arguments-model-arguments-c20": 57,
+      "remainderInteger-cpu-arguments-model-arguments-minimum": 85848,
       "remainderInteger-memory-arguments-intercept": 0,
-      "remainderInteger-memory-arguments-minimum": 1,
       "remainderInteger-memory-arguments-slope": 1,
       "serialiseData-cpu-arguments-intercept": 955506,
       "serialiseData-cpu-arguments-slope": 213312,
diff --git a/bench/tx-generator/scripts-fallback/HashOntoG2AndAdd.plutus b/bench/tx-generator/scripts-fallback/HashOntoG2AndAdd.plutus
index 0dba7178888..f1955b4d493 100644
--- a/bench/tx-generator/scripts-fallback/HashOntoG2AndAdd.plutus
+++ b/bench/tx-generator/scripts-fallback/HashOntoG2AndAdd.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV3",
     "description": "",
-    "cborHex": "59020e59020b010100323232322225329333333006003225333573466e1d200000215933335573e00250022800c004d5d08014d5d1001100090c800c8964cccccc02c0088a0045002280114004004500290ac9999aab9f00228011191940040086ae88010d5d0801c00242b266666601a00245002280100614008a00521800c00400e002460048c009180111801060045002280114008a005219001912999ab9a33710004904044bd0980224811572656465656d6572206973203c20313030303030300013300a00200144c005240110696e76616c69642072656465656d657200119319ab9c0018001801911999aab9f0012800c0004b26666660086ae840088a0045002280114008a00200290ac98021aba200390c0060060050012300244ca00460066ae880090002222223333333574800c4646600e6aae74004d55cf0009baa00723005375600e460086eb001c8c00cdd6803918011bae0078001800911912999ab9a3370e904044bd0018c0004c8cc014cdc080224004004660040026f09220160c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003003222590028800c884cc014004cdde99bc3002333792941200000600311918008009119801980100100081"
+    "cborHex": "59020d59020a010100323232322225329333333006003225333573466e1d200000215933335573e00250022800c004d5d08014d5d1001100090c800c8964cccccc02c0088a0045002280114004004500290ac9999aab9f00228011191940040086ae88010d5d0801c00242b266666601a00245002280100614008a00521800c00400e002460048c009180111801060045002280114008a005219001912999ab9a33710004904044bd0980224811572656465656d6572206973203c20313030303030300013300a00200144c005240110696e76616c69642072656465656d657200119319ab9c0018001801911999aab9f0012800c0004b26666660086ae840088a0045002280114008a00200290ac98021aba200390c0060060050012300244ca00460066ae880090002222223333333574800c4646600e6aae74004d55cf0009baa00723005375600e460086eb001c8c00cdd6803918011bae0078001800911912999ab9a3370e904044bd0018a4c2646600a66e04011200200233002001378491160c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003003222590028800c884cc014004cdde99bc3002333792941200000600311918008009180111980100100081"
 }
diff --git a/bench/tx-generator/scripts-fallback/LoopV3.plutus b/bench/tx-generator/scripts-fallback/LoopV3.plutus
index 75cc7003f90..4b9d95a9370 100644
--- a/bench/tx-generator/scripts-fallback/LoopV3.plutus
+++ b/bench/tx-generator/scripts-fallback/LoopV3.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV3",
     "description": "",
-    "cborHex": "583e583c010100322225333573466e20dd68012410112f42c260086eb4008c8c00400488c94ccd5cd19b874820225e800860002600266e040092002300200201"
+    "cborHex": "583e583c01010032222325333573466e200052080897a1613005001375a00464600200244a666ae68cdc3a410112f40022930991980180180099b81001480081"
 }
diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs
index a101c3c7688..e2f8f25acbd 100644
--- a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs
+++ b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs
@@ -233,17 +233,23 @@ preExecutePlutusV3 (major, _minor) (PlutusScript _ (PlutusScriptSerialised (scri
       exBudget <- firstExceptT PlutusError $
         hoistEither .
           snd $ PlutusV3.evaluateScriptCounting protocolVersion PlutusV3.Verbose evaluationContext scriptForEval
-            [ toPlutusData datum
-            , toPlutusData (getScriptData redeemer)
-            , PlutusV3.toData dummyContext
-            ]
+                (PlutusV3.toData scriptContext)
 
       x <- hoistMaybe (TxGenError "preExecutePlutusV3: could not convert to execution units") $
         exBudgetToExUnits exBudget
       return $ fromAlonzoExUnits x
 
-    dummyContext :: PlutusV3.ScriptContext
-    dummyContext = PlutusV3.ScriptContext dummyTxInfo (PlutusV3.Spending dummyOutRef)
+    r :: PlutusV3.Redeemer
+    r = PlutusV3.Redeemer $ PlutusV3.dataToBuiltinData $ toPlutusData $ getScriptData redeemer
+
+    d :: PlutusV3.Datum
+    d = PlutusV3.Datum $ PlutusV3.dataToBuiltinData $ toPlutusData datum
+
+    scriptContext :: PlutusV3.ScriptContext
+    scriptContext = PlutusV3.ScriptContext dummyTxInfo r scriptInfo
+
+    scriptInfo :: PlutusV3.ScriptInfo
+    scriptInfo = PlutusV3.SpendingScript dummyOutRef (Just d)
 
     dummyOutRef :: PlutusV3.TxOutRef
     dummyOutRef = PlutusV3.TxOutRef (PlutusV3.TxId "") 0
diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
index a37233566d0..b12a61b84af 100644
--- a/bench/tx-generator/tx-generator.cabal
+++ b/bench/tx-generator/tx-generator.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   tx-generator
-version:                2.12
+version:                2.13
 synopsis:               A transaction workload generator for Cardano clusters
 description:            A transaction workload generator for Cardano clusters.
 category:               Cardano,
@@ -41,7 +41,13 @@ library
                         -Wno-unticked-promoted-constructors
                         -Wpartial-fields
                         -Wredundant-constraints
-                        -Wwarn=deprecations
+                        -fno-warn-safe
+                        -fno-warn-unsafe
+                        -fno-warn-missing-import-lists
+                        -fobject-code -fno-ignore-interface-pragmas
+                        -fno-omit-interface-pragmas
+                        -- TODO: switch back to -Wwarn=deprecations having dropped Cardano.Api.ProtocolParameters.ProtocolParameters in favour of Cardano.Api.Ledger.PParams
+                        -Wno-deprecations
 
   exposed-modules:      Cardano.Benchmarking.Command
                         Cardano.Benchmarking.Compiler
@@ -96,9 +102,9 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.46
+                      , cardano-api ^>= 8.48.0.1
                       , cardano-binary
-                      , cardano-cli ^>= 8.23
+                      , cardano-cli ^>= 8.24
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data
@@ -151,19 +157,6 @@ library
   default-language:     Haskell2010
   default-extensions:   OverloadedStrings
 
-  ghc-options:          -Wall
-                        -fno-warn-safe
-                        -fno-warn-unsafe
-                        -fno-warn-missing-import-lists
-                        -Wno-unticked-promoted-constructors
-                        -Wincomplete-record-updates
-                        -Wincomplete-uni-patterns
-                        -Wredundant-constraints
-                        -Wpartial-fields
-                        -Wcompat
-                        -fobject-code -fno-ignore-interface-pragmas
-                        -fno-omit-interface-pragmas
-
 executable tx-generator
   import:               project-config
   hs-source-dirs:       app
@@ -188,6 +181,7 @@ test-suite tx-generator-apitest
                         -Wall
                         -rtsopts
                         "-with-rtsopts=-T"
+                        -Wno-deprecations
 
   build-depends:        base
                       , aeson
@@ -207,18 +201,6 @@ test-suite tx-generator-apitest
   other-modules:        Paths_tx_generator
   autogen-modules:      Paths_tx_generator
 
-  build-depends:       base
-                     , aeson
-                     , bytestring
-                     , filepath
-                     , optparse-applicative-fork
-                     , cardano-api
-                     , cardano-cli
-                     , cardano-node
-                     , transformers
-                     , transformers-except
-                     , tx-generator
-
 test-suite tx-generator-test
   import:               project-config
   hs-source-dirs:       test
diff --git a/cabal.project b/cabal.project
index 3a521d8509d..1badeaaff1c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -31,6 +31,8 @@ packages:
   trace-resources
   trace-forward
 
+extra-packages: Cabal
+
 program-options
   ghc-options: -Werror
 
@@ -57,8 +59,8 @@ package plutus-scripts-bench
 constraints:
   wai-extra < 3.1.15,
 
+allow-newer: katip:Win32
+
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
-
--- `smtp-mail` should depend on `crypton-connection` rather than `connection`!
diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
index 89b9f4c488c..fc1e36cbf93 100644
--- a/cardano-node-chairman/cardano-node-chairman.cabal
+++ b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -88,5 +88,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-N -T"
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 8.23.0.0
+                      , cardano-cli:cardano-cli ^>= 8.24.0.0
                       , cardano-node-chairman:cardano-node-chairman
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
index 8c4e156a477..e1bbffc7e96 100644
--- a/cardano-node/cardano-node.cabal
+++ b/cardano-node/cardano-node.cabal
@@ -145,7 +145,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.46
+                      , cardano-api ^>= 8.48.0.1
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
@@ -186,14 +186,14 @@ library
                       , network-mux >= 0.4
                       , nothunks
                       , optparse-applicative-fork >= 0.18.1
-                      , ouroboros-consensus ^>= 0.18
-                      , ouroboros-consensus-cardano ^>= 0.16
-                      , ouroboros-consensus-diffusion ^>= 0.16
+                      , ouroboros-consensus ^>= 0.19
+                      , ouroboros-consensus-cardano ^>= 0.17
+                      , ouroboros-consensus-diffusion ^>= 0.17
                       , ouroboros-consensus-protocol
-                      , ouroboros-network-api ^>= 0.7.1
-                      , ouroboros-network ^>= 0.16
+                      , ouroboros-network-api ^>= 0.7.3
+                      , ouroboros-network ^>= 0.16.1
                       , ouroboros-network-framework
-                      , ouroboros-network-protocols ^>= 0.8
+                      , ouroboros-network-protocols ^>= 0.9
                       , prettyprinter
                       , prettyprinter-ansi-terminal
                       , psqueues
@@ -205,9 +205,9 @@ library
                       , strict-sop-core
                       , strict-stm
                       , time
-                      , trace-dispatcher ^>= 2.5
-                      , trace-forward ^>= 2.2
-                      , trace-resources ^>= 0.2.1.0
+                      , trace-dispatcher ^>= 2.5.7
+                      , trace-forward ^>= 2.2.5
+                      , trace-resources ^>= 0.2.1
                       , tracer-transformers
                       , transformers
                       , transformers-except
diff --git a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs
index 85fc40f8ce3..2643f60f4fc 100644
--- a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs
+++ b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs
@@ -147,6 +147,10 @@ instance LogFormatting (Conway.ConwayGovCertPredFailure era) where
 
 instance LogFormatting (Conway.ConwayDelegPredFailure era) where
   forMachine _dtal = mconcat . \case
+    Conway.DelegateeNotRegisteredDELEG poolID ->
+      [ "kind" .= String "DelegateeNotRegisteredDELEG"
+      , "poolID" .= String (textShow poolID)
+      ]
     Conway.IncorrectDepositDELEG coin ->
       [ "kind" .= String "IncorrectDepositDELEG"
       , "amount" .= coin
@@ -1164,10 +1168,6 @@ instance
   ( Consensus.ShelleyBasedEra era
   , LogFormatting (PredicateFailure (Ledger.EraRule "CERT" era))
   ) => LogFormatting (Conway.ConwayCertsPredFailure era) where
-  forMachine _ (Conway.DelegateeNotRegisteredDELEG poolID) =
-    mconcat [ "kind" .= String "DelegateeNotRegisteredDELEG"
-            , "poolID" .= String (textShow poolID)
-            ]
   forMachine _ (Conway.WithdrawalsNotInRewardsCERTS rs) =
     mconcat [ "kind" .= String "WithdrawalsNotInRewardsCERTS"
              , "rewardAccounts" .= rs
diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
index 4bdde045890..0f84f4bb238 100644
--- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
+++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
@@ -44,6 +44,9 @@ import           Ouroboros.Consensus.Mempool (MempoolSize (..), TraceEventMempoo
 import           Ouroboros.Consensus.MiniProtocol.BlockFetch.Server
                    (TraceBlockFetchServerEvent (..))
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client
+import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.Jumping (Instruction (..),
+                   JumpInstruction (..), JumpResult (..))
+import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State (JumpInfo (..))
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Server
 import           Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
                    (TraceLocalTxSubmissionServerEvent (..))
@@ -190,6 +193,40 @@ instance (ConvertRawHash blk, LedgerSupportsProtocol blk)
         , "the considered header and the best block number known prior to this"
         , "header"
         ]
+    TraceOfferJump point ->
+      mconcat
+        [ "ChainSync Jumping -- we are offering a jump to the server, to point: "
+        , showT point
+        ]
+    TraceJumpResult (AcceptedJump instruction) ->
+      mconcat
+        [ "ChainSync Jumping -- the client accepted the jump to "
+        , showT (jumpInstructionToPoint instruction)
+        ]
+    TraceJumpResult (RejectedJump instruction) ->
+      mconcat
+        [ "ChainSync Jumping -- the client rejected the jump to "
+        , showT (jumpInstructionToPoint instruction)
+        ]
+    TraceJumpingWaitingForNextInstruction ->
+      "ChainSync Jumping -- the client is blocked, waiting for its next instruction."
+    TraceJumpingInstructionIs RunNormally ->
+      "ChainSyncJumping -- the client is asked to run normally"
+    TraceJumpingInstructionIs Restart ->
+      mconcat
+        [ "ChainSyncJumping -- the client is asked to restart. This is necessary"
+        , "when disengaging a peer of which we know no point that we could set"
+        , "the intersection of the ChainSync server to."
+        ]
+    TraceJumpingInstructionIs (JumpInstruction instruction) ->
+      mconcat
+        [ "ChainSync Jumping -- the client is asked to jump to "
+        , showT (jumpInstructionToPoint instruction)
+        ]
+    where
+      jumpInstructionToPoint = AF.headPoint . jTheirFragment . \case
+        JumpTo ji          -> ji
+        JumpToGoodPoint ji -> ji
 
   forMachine dtal = \case
     TraceDownloadedHeader h ->
@@ -238,6 +275,49 @@ instance (ConvertRawHash blk, LedgerSupportsProtocol blk)
         , "headerHash" .= showT (headerHash header)
         , "blockNo" .= aBlockNo
         ]
+    TraceOfferJump point ->
+      mconcat
+        [ "kind" .= String "TraceOfferJump"
+        , "point" .= showT point
+        ]
+    TraceJumpResult jumpResult ->
+      mconcat
+        [ "kind" .= String "TraceJumpResult"
+        , "result" .= case jumpResult of
+            AcceptedJump _ -> String "AcceptedJump"
+            RejectedJump _ -> String "RejectedJump"
+        ]
+    TraceJumpingWaitingForNextInstruction ->
+      mconcat
+        [ "kind" .= String "TraceJumpingWaitingForNextInstruction"
+        ]
+    TraceJumpingInstructionIs instruction ->
+      mconcat
+        [ "kind" .= String "TraceJumpingInstructionIs"
+        , "instr" .= instructionToObject instruction
+        ]
+    where
+      instructionToObject :: Instruction blk -> Aeson.Object
+      instructionToObject = \case
+        RunNormally ->
+          mconcat ["kind" .= String "RunNormally"]
+        Restart ->
+          mconcat ["kind" .= String "Restart"]
+        JumpInstruction info ->
+          mconcat [ "kind" .= String "JumpInstruction"
+                  , "payload" .= jumpInstructionToObject info
+                  ]
+
+      jumpInstructionToObject :: JumpInstruction blk -> Aeson.Object
+      jumpInstructionToObject = \case
+        JumpTo info ->
+          mconcat [ "kind" .= String "JumpTo"
+                  , "point" .= showT (jumpInfoToPoint info) ]
+        JumpToGoodPoint info ->
+          mconcat [ "kind" .= String "JumpToGoodPoint"
+                  , "point" .= showT (jumpInfoToPoint info) ]
+
+      jumpInfoToPoint = AF.headPoint . jTheirFragment
 
 tipToObject :: forall blk. ConvertRawHash blk => Tip blk -> Aeson.Object
 tipToObject = \case
@@ -272,6 +352,14 @@ instance MetaTrace (TraceChainSyncClientEvent blk) where
       Namespace [] ["AccessingForecastHorizon"]
     TraceGaveLoPToken {} ->
       Namespace [] ["GaveLoPToken"]
+    TraceOfferJump _ ->
+      Namespace [] ["OfferJump"]
+    TraceJumpResult _ ->
+      Namespace [] ["JumpResult"]
+    TraceJumpingWaitingForNextInstruction ->
+      Namespace [] ["JumpingWaitingForNextInstruction"]
+    TraceJumpingInstructionIs _ ->
+      Namespace [] ["JumpingInstructionIs"]
 
   severityFor ns _ =
     case ns of
@@ -293,6 +381,14 @@ instance MetaTrace (TraceChainSyncClientEvent blk) where
         Just Debug
       Namespace _ ["GaveLoPToken"] ->
         Just Debug
+      Namespace _ ["OfferJump"] ->
+        Just Debug
+      Namespace _ ["JumpResult"] ->
+        Just Debug
+      Namespace _ ["JumpingWaitingForNextInstruction"] ->
+        Just Debug
+      Namespace _ ["JumpingInstructionIs"] ->
+        Just Debug
       _ ->
         Nothing
 
@@ -322,6 +418,14 @@ instance MetaTrace (TraceChainSyncClientEvent blk) where
         Just "The slot number, which was previously beyond the forecast horizon, has now entered it"
       Namespace _ ["GaveLoPToken"] ->
         Just "May have added atoken to the LoP bucket of the peer"
+      Namespace _ ["OfferJump"] ->
+        Just "Offering a jump to the remote peer"
+      Namespace _ ["JumpResult"] ->
+        Just "Response to a jump offer (accept or reject)"
+      Namespace _ ["JumpingWaitingForNextInstruction"] ->
+        Just "The client is waiting for the next instruction"
+      Namespace _ ["JumpingInstructionIs"] ->
+        Just "The client got its next instruction"
       _ ->
         Nothing
 
@@ -335,6 +439,10 @@ instance MetaTrace (TraceChainSyncClientEvent blk) where
     , Namespace [] ["WaitingBeyondForecastHorizon"]
     , Namespace [] ["AccessingForecastHorizon"]
     , Namespace [] ["GaveLoPToken"]
+    , Namespace [] ["OfferJump"]
+    , Namespace [] ["JumpResult"]
+    , Namespace [] ["JumpingWaitingForNextInstruction"]
+    , Namespace [] ["JumpingInstructionIs"]
     ]
 
 --------------------------------------------------------------------------------
diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
index d1b7e43dd45..a051411c5fc 100644
--- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
+++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs
@@ -44,6 +44,8 @@ import           Ouroboros.Consensus.Mempool (MempoolSize (..), TraceEventMempoo
 import           Ouroboros.Consensus.MiniProtocol.BlockFetch.Server
                    (TraceBlockFetchServerEvent (..))
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Client (TraceChainSyncClientEvent (..))
+import qualified Ouroboros.Consensus.MiniProtocol.ChainSync.Client.Jumping as ChainSync.Client
+import qualified Ouroboros.Consensus.MiniProtocol.ChainSync.Client.State as ChainSync.Client
 import           Ouroboros.Consensus.MiniProtocol.ChainSync.Server (BlockingType (..),
                    TraceChainSyncServerEvent (..))
 import           Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
@@ -245,6 +247,10 @@ instance HasSeverityAnnotation (TraceChainSyncClientEvent blk) where
   getSeverityAnnotation (TraceWaitingBeyondForecastHorizon _) = Debug
   getSeverityAnnotation (TraceAccessingForecastHorizon _) = Debug
   getSeverityAnnotation (TraceGaveLoPToken _ _ _) = Debug
+  getSeverityAnnotation (TraceOfferJump _) = Debug
+  getSeverityAnnotation (TraceJumpResult _) = Debug
+  getSeverityAnnotation TraceJumpingWaitingForNextInstruction = Debug
+  getSeverityAnnotation (TraceJumpingInstructionIs _) = Debug
 
 
 instance HasPrivacyAnnotation (TraceChainSyncServerEvent blk)
@@ -1358,6 +1364,60 @@ instance (ConvertRawHash blk, LedgerSupportsProtocol blk)
                , "given" .= tokenGiven
                , tipToObject (tipFromHeader h)
                , "blockNo" .=  bestBlockNumberPriorToH ]
+    TraceOfferJump jumpTo ->
+      mconcat [ "kind" .= String "ChainSyncClientEvent.TraceOfferJump"
+               , "jumpTo" .= toObject verb jumpTo
+               ]
+    TraceJumpResult res ->
+      mconcat [ "kind" .= String "ChainSyncClientEvent.TraceJumpResult"
+               , "res" .= case res of
+                   ChainSync.Client.AcceptedJump info -> Aeson.object
+                     [ "kind" .= String "AcceptedJump"
+                      , "payload" .= toObject verb info ]
+                   ChainSync.Client.RejectedJump info -> Aeson.object
+                     [ "kind" .= String "RejectedJump"
+                      , "payload" .= toObject verb info ]
+               ]
+    TraceJumpingWaitingForNextInstruction ->
+      mconcat [ "kind" .= String "ChainSyncClientEvent.TraceJumpingWaitingForNextInstruction"
+               ]
+    TraceJumpingInstructionIs instr ->
+      mconcat [ "kind" .= String "ChainSyncClientEvent.TraceJumpingInstructionIs"
+               , "instr" .= toObject verb instr
+               ]
+
+instance ( LedgerSupportsProtocol blk,
+           ConvertRawHash blk
+         ) => ToObject (ChainSync.Client.Instruction blk) where
+  toObject verb = \case
+    ChainSync.Client.RunNormally ->
+      mconcat ["kind" .= String "RunNormally"]
+    ChainSync.Client.Restart ->
+      mconcat ["kind" .= String "Restart"]
+    ChainSync.Client.JumpInstruction info ->
+      mconcat [ "kind" .= String "JumpInstruction"
+              , "payload" .= toObject verb info
+              ]
+
+instance ( LedgerSupportsProtocol blk,
+           ConvertRawHash blk
+         ) => ToObject (ChainSync.Client.JumpInstruction blk) where
+  toObject verb = \case
+    ChainSync.Client.JumpTo info ->
+      mconcat [ "kind" .= String "JumpTo"
+                , "info" .= toObject verb info ]
+    ChainSync.Client.JumpToGoodPoint info ->
+      mconcat [ "kind" .= String "JumpToGoodPoint"
+                , "info" .= toObject verb info ]
+
+instance ( LedgerSupportsProtocol blk,
+           ConvertRawHash blk
+         ) => ToObject (ChainSync.Client.JumpInfo blk) where
+  toObject verb info =
+    mconcat [ "kind" .= String "JumpInfo"
+              , "mostRecentIntersection" .= toObject verb (ChainSync.Client.jMostRecentIntersection info)
+              , "ourFragment" .= toJSON ((tipToObject . tipFromHeader) `map` AF.toOldestFirst (ChainSync.Client.jOurFragment info))
+              , "theirFragment" .= toJSON ((tipToObject . tipFromHeader) `map` AF.toOldestFirst (ChainSync.Client.jTheirFragment info)) ]
 
 instance ConvertRawHash blk
       => ToObject (TraceChainSyncServerEvent blk) where
diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
index 0347cbd385f..27059c75f1b 100644
--- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
+++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
@@ -191,6 +191,10 @@ instance ToObject (Conway.ConwayGovCertPredFailure era) where
 
 instance ToObject (Conway.ConwayDelegPredFailure era) where
   toObject _verb = mconcat . \case
+    Conway.DelegateeNotRegisteredDELEG (KeyHash targetPool) ->
+      [ "kind" .= String "DelegateeNotRegisteredDELEG"
+      , "targetPool" .= Crypto.hashToTextAsHex targetPool
+      ]
     Conway.IncorrectDepositDELEG coin ->
       [ "kind" .= String "IncorrectDepositDELEG"
       , "amount" .= coin
@@ -387,8 +391,6 @@ instance
   , ToObject (PredicateFailure (Ledger.EraRule "CERT" era))
   ) => ToObject (Conway.ConwayCertsPredFailure era) where
   toObject verb = \case
-    Conway.DelegateeNotRegisteredDELEG targetPool ->
-      mconcat [ "kind" .= String "DelegateeNotRegisteredDELEG" , "targetPool" .= targetPool ]
     Conway.WithdrawalsNotInRewardsCERTS incorrectWithdrawals ->
       mconcat [ "kind" .= String "WithdrawalsNotInRewardsCERTS" , "incorrectWithdrawals" .= incorrectWithdrawals ]
     Conway.CertFailure f -> toObject verb f
diff --git a/cardano-node/src/Cardano/Tracing/Tracers.hs b/cardano-node/src/Cardano/Tracing/Tracers.hs
index 130198c5d46..934a5091612 100644
--- a/cardano-node/src/Cardano/Tracing/Tracers.hs
+++ b/cardano-node/src/Cardano/Tracing/Tracers.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
@@ -47,13 +47,11 @@ import           Cardano.Node.Configuration.Logging
 import           Cardano.Node.Protocol.Byron ()
 import           Cardano.Node.Protocol.Shelley ()
 import           Cardano.Node.Queries
-import qualified Cardano.Node.STM as STM
 import           Cardano.Node.Startup
-
+import qualified Cardano.Node.STM as STM
 import           Cardano.Node.TraceConstraints
-import           Cardano.Node.Tracing.Tracers.NodeVersion
-
 import           Cardano.Node.Tracing
+import           Cardano.Node.Tracing.Tracers.NodeVersion
 import           Cardano.Protocol.TPraos.OCert (KESPeriod (..))
 import           Cardano.Slotting.Slot (EpochNo (..), SlotNo (..), WithOrigin (..))
 import           Cardano.Tracing.Config
diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
index 18fc9c6be7d..b6f64b7d940 100644
--- a/cardano-submit-api/cardano-submit-api.cabal
+++ b/cardano-submit-api/cardano-submit-api.cabal
@@ -39,9 +39,9 @@ library
                       , aeson
                       , async
                       , bytestring
-                      , cardano-api ^>= 8.46
+                      , cardano-api ^>= 8.48.0.1
                       , cardano-binary
-                      , cardano-cli ^>= 8.23
+                      , cardano-cli ^>= 8.24
                       , cardano-crypto-class ^>= 2.1.2
                       , http-media
                       , iohk-monitoring
@@ -49,7 +49,7 @@ library
                       , network
                       , optparse-applicative-fork
                       , ouroboros-consensus-cardano
-                      , ouroboros-network ^>= 0.16
+                      , ouroboros-network ^>= 0.16.1
                       , ouroboros-network-protocols
                       , prometheus >= 2.2.4
                       , servant
diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
index b287e03f916..eae7be91d17 100644
--- a/cardano-testnet/cardano-testnet.cabal
+++ b/cardano-testnet/cardano-testnet.cabal
@@ -35,8 +35,8 @@ library
                       , aeson-pretty
                       , ansi-terminal
                       , bytestring
-                      , cardano-api ^>= 8.46
-                      , cardano-cli ^>= 8.23
+                      , cardano-api ^>= 8.48.0.1
+                      , cardano-cli ^>= 8.24
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>= 0.2.2
@@ -69,7 +69,7 @@ library
                       , network
                       , network-mux
                       , optparse-applicative-fork
-                      , ouroboros-network ^>= 0.16
+                      , ouroboros-network ^>= 0.16.1
                       , ouroboros-network-api
                       , prettyprinter
                       , process
@@ -228,7 +228,7 @@ test-suite cardano-testnet-test
                       , exceptions
                       , filepath
                       , hedgehog
-                      , hedgehog-extras 
+                      , hedgehog-extras
                       , http-conduit
                       , lens-aeson
                       , microlens
diff --git a/cardano-testnet/src/Testnet/Defaults.hs b/cardano-testnet/src/Testnet/Defaults.hs
index 4d232d3412f..eb31c0f3aa3 100644
--- a/cardano-testnet/src/Testnet/Defaults.hs
+++ b/cardano-testnet/src/Testnet/Defaults.hs
@@ -28,11 +28,11 @@ module Testnet.Defaults
   , defaultGenesisFilepath
   , defaultYamlHardforkViaConfig
   , defaultMainnetTopology
-  , plutusV3NonSpendingScript
-  , plutusV3SpendingScript
+  , plutusV3Script
   ) where
 
-import           Cardano.Api (AnyCardanoEra (..), CardanoEra (..), File (..), pshow)
+import           Cardano.Api (AnyCardanoEra (..), CardanoEra (..), File (..), pshow,
+                   unsafeBoundedRational)
 import qualified Cardano.Api.Shelley as Api
 
 import           Cardano.Ledger.Alonzo.Core (PParams (..))
@@ -60,16 +60,13 @@ import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Key as Key
 import qualified Data.Aeson.KeyMap as KeyMapAeson
 import qualified Data.Default.Class as DefaultClass
-import           Data.Maybe
 import           Data.Proxy
 import           Data.Ratio
 import           Data.Scientific
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import           Data.Time (UTCTime)
-import           Data.Typeable
 import qualified Data.Vector as Vector
-import           GHC.Stack
 import           Lens.Micro
 import           Numeric.Natural
 import           System.FilePath ((</>))
@@ -573,35 +570,8 @@ defaultDelegatorStakeKeyPair n =
     , signingKey = File $ "stake-delegators" </> ("delegator" <> show n) </> "staking.skey"
     }
 
--- TODO: We should not hardcode a script like this. We need to move
--- plutus-example from plutus apps to cardano-node-testnet. This will
--- let us directly compile the plutus validators and avoid bit rotting of
--- hardcoded plutus scripts.
--- | Default plutus script that succeeds regardless of redeemer
--- NB: This cannot be used as a spending script
-plutusV3NonSpendingScript :: Text
-plutusV3NonSpendingScript =
-  Text.unlines ["{"
-               , "\"type\": \"PlutusScriptV3\""
-               , ",\"description\": \"\""
-               , ",\"cborHex\": \"4746010100228001\""
-               , "}"
-               ]
-
--- | Default plutus spending script that succeeds regardless of redeemer
-plutusV3SpendingScript :: Text
-plutusV3SpendingScript =
-  Text.unlines ["{"
-               , "\"type\": \"PlutusScriptV3\""
-               , ",\"description\": \"\""
-               , ",\"cborHex\": \"484701010022280001\""
-               , "}"
-               ]
-
--- TODO: move to cardano-api
-unsafeBoundedRational :: forall r. (HasCallStack, Typeable r, BoundedRational r)
-                      => Rational
-                      -> r
-unsafeBoundedRational x = fromMaybe (error errMessage) $ boundRational x
-  where
-    errMessage = show (typeRep (Proxy @r)) <> " is out of bounds: " <> show x
+-- | Default plutus script that always succeeds
+plutusV3Script :: Text
+plutusV3Script =
+  "{ \"type\": \"PlutusScriptV3\", \"description\": \"\", \"cborHex\": \"46450101002499\" }"
+
diff --git a/cardano-testnet/src/Testnet/EpochStateProcessing.hs b/cardano-testnet/src/Testnet/EpochStateProcessing.hs
index 8ed6a0c6caa..e75cf72dff8 100644
--- a/cardano-testnet/src/Testnet/EpochStateProcessing.hs
+++ b/cardano-testnet/src/Testnet/EpochStateProcessing.hs
@@ -21,7 +21,7 @@ import           Prelude
 import           Control.Monad
 import qualified Data.Map as Map
 import           Data.Maybe
-import           Data.Word (Word32)
+import           Data.Word (Word16)
 import           GHC.Exts (IsList (toList), toList)
 import           GHC.Stack
 import           Lens.Micro (to, (^.))
@@ -36,7 +36,7 @@ maybeExtractGovernanceActionIndex
   :: HasCallStack
   => TxId -- ^ transaction id searched for
   -> AnyNewEpochState
-  -> Maybe Word32
+  -> Maybe Word16
 maybeExtractGovernanceActionIndex txid (AnyNewEpochState sbe newEpochState) =
   caseShelleyToBabbageOrConwayEraOnwards
     (const $ error "Governance actions only available in Conway era onwards")
diff --git a/cardano-testnet/src/Testnet/Process/Cli/DRep.hs b/cardano-testnet/src/Testnet/Process/Cli/DRep.hs
index ad6eff60d8c..4793f60e41c 100644
--- a/cardano-testnet/src/Testnet/Process/Cli/DRep.hs
+++ b/cardano-testnet/src/Testnet/Process/Cli/DRep.hs
@@ -30,7 +30,7 @@ import qualified Data.Aeson.Lens as AL
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import           Data.Typeable (Typeable)
-import           Data.Word (Word32)
+import           Data.Word (Word16)
 import           GHC.Exts (fromString)
 import           GHC.Stack
 import           Lens.Micro ((^?))
@@ -152,7 +152,7 @@ generateVoteFiles
   -> String -- ^ Name for the subfolder that will be created under 'work' to store
             -- the output voting files.
   -> String -- ^ Transaction ID string of the governance action.
-  -> Word32 -- ^ Index of the governance action.
+  -> Word16 -- ^ Index of the governance action.
   -> [(KeyPair PaymentKey, [Char])] -- ^ List of tuples where each tuple contains a 'PaymentKeyPair'
                                 -- representing the DRep key pair and a 'String' representing the
                                 -- vote type (i.e: "yes", "no", or "abstain").
@@ -165,7 +165,7 @@ generateVoteFiles execConfig work prefix governanceActionTxId governanceActionIn
       [ "conway", "governance", "vote", "create"
       , "--" ++ vote
       , "--governance-action-tx-id", governanceActionTxId
-      , "--governance-action-index", show @Word32 governanceActionIndex
+      , "--governance-action-index", show @Word16 governanceActionIndex
       , "--drep-verification-key-file", verificationKeyFp drepKeyPair
       , "--out-file", unFile path
       ]
@@ -301,14 +301,14 @@ delegateToDRep execConfig epochStateView sbe work prefix
 --
 -- If no previous proposal was enacted, the function returns 'Nothing'.
 -- If there was a previous enacted proposal, the function returns a tuple with its transaction
--- identifier (as a 'String') and the action index (as a 'Word32').
+-- identifier (as a 'String') and the action index (as a 'Word16').
 getLastPParamUpdateActionId
   :: HasCallStack
   => MonadTest m
   => MonadCatch m
   => MonadIO m
   => H.ExecConfig -- ^ Specifies the CLI execution configuration.
-  -> m (Maybe (String, Word32))
+  -> m (Maybe (String, Word16))
 getLastPParamUpdateActionId execConfig = do
   govStateJSON :: Aeson.Value <- execCliStdoutToJson execConfig
     [ "conway", "query", "gov-state"
@@ -346,11 +346,11 @@ makeActivityChangeProposal
   -> ConwayEraOnwards era -- ^ The 'ConwayEraOnwards' witness for current era.
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
-  -> Maybe (String, Word32) -- ^ The transaction id and the index of the previosu governance action if any.
+  -> Maybe (String, Word16) -- ^ The transaction id and the index of the previosu governance action if any.
   -> EpochInterval -- ^ The target DRep activity interval to be set by the proposal.
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transaction.
   -> EpochInterval -- ^ Number of epochs to wait for the proposal to be registered by the chain.
-  -> m (String, Word32) -- ^ The transaction id and the index of the governance action.
+  -> m (String, Word16) -- ^ The transaction id and the index of the governance action.
 makeActivityChangeProposal execConfig epochStateView ceo work prefix
                            prevGovActionInfo drepActivity wallet timeout = do
 
diff --git a/cardano-testnet/src/Testnet/Process/Cli/SPO.hs b/cardano-testnet/src/Testnet/Process/Cli/SPO.hs
index fdefc8badef..5e7ee0cc8ec 100644
--- a/cardano-testnet/src/Testnet/Process/Cli/SPO.hs
+++ b/cardano-testnet/src/Testnet/Process/Cli/SPO.hs
@@ -31,7 +31,7 @@ import qualified Data.Map.Strict as Map
 import           Data.Set (Set)
 import qualified Data.Set as Set
 import qualified Data.Text as Text
-import           Data.Word (Word32)
+import           Data.Word (Word16)
 import           GHC.Stack (HasCallStack)
 import qualified GHC.Stack as GHC
 import           Lens.Micro
@@ -129,7 +129,7 @@ checkStakeKeyRegistered tempAbsP nodeConfigFile sPath terminationEpoch execConfi
                     , "foldEpochStateError: " <> show e
                     ]
  where
-  handler :: StakeAddress -> AnyNewEpochState -> SlotNo -> BlockNo -> StateT DelegationsAndRewards IO LedgerStateCondition
+  handler :: StakeAddress -> AnyNewEpochState -> SlotNo -> BlockNo -> StateT DelegationsAndRewards IO ConditionResult
   handler (StakeAddress network sCred) (AnyNewEpochState sbe newEpochState) _ _ =
     let umap = shelleyBasedEraConstraints sbe $ newEpochState ^. L.nesEsL . L.epochStateUMapL
         dag = L.filterStakePoolDelegsAndRewards umap $ Set.singleton sCred
@@ -417,7 +417,7 @@ generateVoteFiles :: (MonadTest m, MonadIO m, MonadCatch m)
   -> String -- ^ Name for the subfolder that will be created under 'work' to store
             -- the output voting files.
   -> String -- ^ Transaction ID string of the governance action.
-  -> Word32 -- ^ Index of the governance action.
+  -> Word16 -- ^ Index of the governance action.
   -> [(PoolNodeKeys, [Char])] -- ^ List of tuples where each tuple contains a 'PoolNodeKeys'
                               -- representing the SPO keys and a 'String' representing the
                               -- vote type (i.e: "yes", "no", or "abstain").
@@ -430,7 +430,7 @@ generateVoteFiles ceo execConfig work prefix governanceActionTxId governanceActi
       [ eraToString $ toCardanoEra ceo , "governance", "vote", "create"
       , "--" ++ vote
       , "--governance-action-tx-id", governanceActionTxId
-      , "--governance-action-index", show @Word32 governanceActionIndex
+      , "--governance-action-index", show @Word16 governanceActionIndex
       , "--cold-verification-key-file", verificationKeyFp $ poolNodeKeysCold spoKeys
       , "--out-file", unFile path
       ]
diff --git a/cardano-testnet/src/Testnet/Runtime.hs b/cardano-testnet/src/Testnet/Runtime.hs
index 39ca79fe61a..f8c1239b52e 100644
--- a/cardano-testnet/src/Testnet/Runtime.hs
+++ b/cardano-testnet/src/Testnet/Runtime.hs
@@ -234,7 +234,7 @@ startLedgerNewEpochStateLogging testnetRuntime tmpWorkspace = withFrozenCallStac
             -> AnyNewEpochState
             -> SlotNo
             -> BlockNo
-            -> StateT (Maybe AnyNewEpochState) IO LedgerStateCondition
+            -> StateT (Maybe AnyNewEpochState) IO ConditionResult
     handler outputFp diffFp anes@(AnyNewEpochState !sbe !nes) _ (BlockNo blockNo) = handleException $ do
       let prettyNes = shelleyBasedEraConstraints sbe (encodePretty nes)
           blockLabel = "#### BLOCK " <> show blockNo <> " ####"
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs
index 24a14742897..f7450909bee 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs
@@ -28,6 +28,7 @@ import           Lens.Micro
 import           System.FilePath ((</>))
 import qualified System.Info as SYS
 
+import           Testnet.Components.Configuration
 import           Testnet.Process.Run (execCli', mkExecConfig)
 import           Testnet.Property.Util (decodeEraUTxO, integrationRetryWorkspace)
 import           Testnet.Types
@@ -48,9 +49,10 @@ hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbs
   let
     sbe = ShelleyBasedEraBabbage
     era = toCardanoEra sbe
+    cEra = AnyCardanoEra era
     tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath'
     options = cardanoDefaultTestnetOptions
-      { cardanoNodeEra = AnyCardanoEra era -- TODO: We should only support the latest era and the upcoming era
+      { cardanoNodeEra = cEra -- TODO: We should only support the latest era and the upcoming era
       }
 
   TestnetRuntime
@@ -68,7 +70,7 @@ hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbs
   txbodySignedFp <- H.note $ work </> "tx.body.signed"
 
   void $ execCli' execConfig
-    [ "babbage", "query", "utxo"
+    [ anyEraToString cEra, "query", "utxo"
     , "--address", Text.unpack $ paymentKeyInfoAddr wallet0
     , "--cardano-mode"
     , "--out-file", work </> "utxo-1.json"
@@ -79,14 +81,14 @@ hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbs
   txin1 <- H.noteShow =<< H.headM (Map.keys utxo1)
 
   void $ execCli' execConfig
-    [ "babbage", "transaction", "build"
+    [ anyEraToString cEra, "transaction", "build"
     , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet0
     , "--tx-in", Text.unpack $ renderTxIn txin1
     , "--tx-out", Text.unpack (paymentKeyInfoAddr wallet0) <> "+" <> show @Int 5_000_001
     , "--out-file", txbodyFp
     ]
   cddlUnwitnessedTx <- H.readJsonFileOk txbodyFp
-  apiTx <- H.evalEither $ deserialiseTxLedgerCddl sbe cddlUnwitnessedTx
+  apiTx <- H.evalEither $ deserialiseFromTextEnvelope (AsTx AsBabbageEra) cddlUnwitnessedTx
   let txFee = L.unCoin $ extractTxFee apiTx
 
   -- This is the current calculated fee.
@@ -96,21 +98,21 @@ hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbs
   330 H.=== txFee
 
   void $ execCli' execConfig
-    [ "babbage", "transaction", "sign"
+    [ anyEraToString cEra, "transaction", "sign"
     , "--tx-body-file", txbodyFp
     , "--signing-key-file", signingKeyFp $ paymentKeyInfoPair wallet0
     , "--out-file", txbodySignedFp
     ]
 
   void $ execCli' execConfig
-    [ "babbage", "transaction", "submit"
+    [ anyEraToString cEra, "transaction", "submit"
     , "--tx-file", txbodySignedFp
     ]
 
 
   H.byDurationM 1 15 "Expected UTxO found" $ do
     void $ execCli' execConfig
-      [ "babbage", "query", "utxo"
+      [ anyEraToString cEra, "query", "utxo"
       , "--address", Text.unpack $ paymentKeyInfoAddr wallet0
       , "--cardano-mode"
       , "--out-file", work </> "utxo-2.json"
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/Plutus.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/Plutus.hs
index 3b9aab62f59..b602304e3b4 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/Plutus.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/Plutus.hs
@@ -76,25 +76,22 @@ hprop_plutus_v3 = integrationWorkspace "all-plutus-script-purposes" $ \tempAbsBa
   epochStateView <- getEpochStateView configurationFile socketPath
   txin1 <- findLargestUtxoForPaymentKey epochStateView sbe wallet0
 
-  plutusMintingScript <- H.note $ work </> "always-succeeds-non-spending-script.plutusV3"
-  H.writeFile plutusMintingScript $ Text.unpack plutusV3NonSpendingScript
-
-  plutusSpendingScript <- H.note $ work </> "always-succeeds-spending-script.plutusV3"
-  H.writeFile plutusSpendingScript $ Text.unpack plutusV3SpendingScript
+  plutusScript <- H.note $ work </> "always-succeeds-script.plutusV3"
+  H.writeFile plutusScript $ Text.unpack plutusV3Script
 
   let sendAdaToScriptAddressTxBody = work </> "send-ada-to-script-address-tx-body"
 
   plutusSpendingScriptAddr <-
     execCli' execConfig
       [ "address", "build"
-      , "--payment-script-file", plutusSpendingScript
+      , "--payment-script-file", plutusScript
       ]
 
   mintingPolicyId <- filter (/= '\n') <$>
     execCli' execConfig
       [ anyEraToString anyEra, "transaction"
       , "policyid"
-      , "--script-file", plutusMintingScript
+      , "--script-file", plutusScript
       ]
   let assetName = "4D696C6C6172436F696E"
   H.note_ $ "plutusSpendingScriptAddr: " <> plutusSpendingScriptAddr
@@ -112,7 +109,7 @@ hprop_plutus_v3 = integrationWorkspace "all-plutus-script-purposes" $ \tempAbsBa
   createScriptStakeRegistrationCertificate
     tempAbsPath
     anyEra
-    plutusSpendingScript
+    plutusScript
     0
     scriptStakeRegistrationCertificate
 
@@ -157,14 +154,14 @@ hprop_plutus_v3 = integrationWorkspace "all-plutus-script-purposes" $ \tempAbsBa
     , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet1
     , "--tx-in-collateral", Text.unpack $ renderTxIn txinCollateral
     , "--tx-in", Text.unpack $ renderTxIn plutusScriptTxIn
-    , "--tx-in-script-file", plutusSpendingScript
+    , "--tx-in-script-file", plutusScript
     , "--tx-in-datum-value", "0"
     , "--tx-in-redeemer-value", "0"
     , "--mint", mintValue
-    , "--mint-script-file", plutusMintingScript
+    , "--mint-script-file", plutusScript
     , "--mint-redeemer-value", "0"
     , "--certificate-file", scriptStakeRegistrationCertificate
-    , "--certificate-script-file", plutusSpendingScript
+    , "--certificate-script-file", plutusScript
     , "--certificate-redeemer-value", "0"
     , "--tx-out", txout
     , "--out-file", spendScriptUTxOTxBody
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs
index e45b57cb7b1..ce1d70101e5 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs
@@ -43,7 +43,7 @@ prop_foldEpochState = integrationWorkspace "foldEpochState" $ \tempAbsBasePath'
         => AnyNewEpochState
         -> SlotNo
         -> BlockNo
-        -> StateT [(SlotNo, BlockNo)] IO LedgerStateCondition
+        -> StateT [(SlotNo, BlockNo)] IO ConditionResult
       handler _ slotNo blockNo = do
         modify ((slotNo, blockNo):)
         s <- get
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs
index c3bec1a1bd3..6d5123317ae 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs
@@ -23,7 +23,7 @@ import           Control.Monad
 import           Control.Monad.Catch (MonadCatch)
 import           Data.Data (Typeable)
 import qualified Data.Map as Map
-import           Data.Word (Word32)
+import           Data.Word (Word16)
 import           GHC.Stack (HasCallStack, withFrozenCallStack)
 import           System.FilePath ((</>))
 
@@ -169,7 +169,7 @@ activityChangeProposalTest
                          -- the proposal.
   -> EpochInterval -- ^ The maximum number of epochs to wait for the DRep activity interval to
                    -- become expected value.
-  -> m (String, Word32) -- ^ The transaction id and the index of the governance action.
+  -> m (String, Word16) -- ^ The transaction id and the index of the governance action.
 activityChangeProposalTest execConfig epochStateView ceo work prefix
                            wallet votes change minWait mExpected maxWait = do
   let sbe = conwayEraOnwardsToShelleyBasedEra ceo
@@ -214,7 +214,7 @@ voteChangeProposal
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
   -> String -- ^ The transaction id of the governance action to vote.
-  -> Word32 -- ^ The index of the governance action to vote.
+  -> Word16 -- ^ The index of the governance action to vote.
   -> [([Char], Int)] -- ^ Votes to be casted for the proposal. Each tuple contains the index
                      -- of the default DRep that will make the vote and the type of the vote
                      -- (i.e: "yes", "no", "abstain").
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs
index 95bcb91c641..2f1cf2d0b03 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs
@@ -157,7 +157,7 @@ hprop_ledger_events_info_action = integrationRetryWorkspace 0 "info-hash" $ \tem
       [ "conway", "governance", "vote", "create"
       , "--yes"
       , "--governance-action-tx-id", txidString
-      , "--governance-action-index", show @Word32 governanceActionIndex
+      , "--governance-action-index", show @Word16 governanceActionIndex
       , "--drep-verification-key-file", verificationKeyFp $ defaultDRepKeyPair n
       , "--out-file", voteFp n
       ]
@@ -220,7 +220,7 @@ data InfoActionState = InfoActionState
 
 foldBlocksCheckInfoAction
   :: FilePath -- ^ Where to store debug logs
-  -> Word32 -- ^ gov action index
+  -> Word16 -- ^ gov action index
   -> Env
   -> LedgerState
   -> [LedgerEvent]
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs
index dd58bb6d683..14cf552dc14 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs
@@ -17,7 +17,7 @@ import           Prelude
 
 import           Control.Monad.Catch (MonadCatch)
 import           Data.Typeable (Typeable)
-import           Data.Word (Word32)
+import           Data.Word (Word16)
 import           System.FilePath ((</>))
 
 import           Testnet.Components.Query
@@ -104,7 +104,7 @@ failToVoteChangeProposalWithSPOs
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
   -> String -- ^ The transaction id of the governance action to vote.
-  -> Word32 -- ^ The index of the governance action to vote.
+  -> Word16 -- ^ The index of the governance action to vote.
   -> [([Char], Int)] -- ^ Votes to be casted for the proposal. Each tuple contains the index
                      -- of the default SPO that will make the vote and the type of the vote
                      -- (i.e: "yes", "no", "abstain").
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs
index 08c0ec2e71b..e1d65971fcd 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs
@@ -26,7 +26,7 @@ import           Control.Monad.Catch (MonadCatch)
 import           Data.Data (Typeable)
 import           Data.String (fromString)
 import qualified Data.Text as Text
-import           Data.Word (Word32)
+import           Data.Word (Word16)
 import           GHC.Stack (HasCallStack)
 import           Lens.Micro ((^.))
 import           System.FilePath ((</>))
@@ -176,7 +176,7 @@ desiredPoolNumberProposalTest
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transaction.
-  -> Maybe (String, Word32) -- ^ The transaction identifier and index of the previous passed
+  -> Maybe (String, Word16) -- ^ The transaction identifier and index of the previous passed
                             -- governance action if any.
   -> t (Int, String) -- ^ Model of votes to issue as a list of pairs of amount of each vote
                      -- together with the vote (i.e: "yes", "no", "abstain")
@@ -184,7 +184,7 @@ desiredPoolNumberProposalTest
   -> Integer -- ^ Minimum number of epochs to wait before checking the result
   -> Maybe Integer -- ^ What the expected result is of the change (if anything)
   -> Integer -- ^ Maximum number of epochs to wait while waiting for the result
-  -> m (String, Word32)
+  -> m (String, Word16)
 desiredPoolNumberProposalTest execConfig epochStateView ceo work prefix wallet
                               previousProposalInfo votes change minWait mExpected maxWait = do
   let sbe = conwayEraOnwardsToShelleyBasedEra ceo
@@ -222,11 +222,11 @@ makeDesiredPoolNumberChangeProposal
   -> ConwayEraOnwards ConwayEra -- ^ The conway era onwards witness for the era in which the transaction will be constructed.
   -> FilePath -- ^ Base directory path where generated files will be stored.
   -> String -- ^ Name for the subfolder that will be created under 'work' folder.
-  -> Maybe (String, Word32) -- ^ The transaction identifier and index of the previous passed
+  -> Maybe (String, Word16) -- ^ The transaction identifier and index of the previous passed
                             -- governance action if any.
-  -> Word32 -- ^ What to change the @desiredPoolNumber@ to
+  -> Word16 -- ^ What to change the @desiredPoolNumber@ to
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transaction.
-  -> m (String, Word32)
+  -> m (String, Word16)
 makeDesiredPoolNumberChangeProposal execConfig epochStateView ceo work prefix
                                     prevGovActionInfo desiredPoolNumber wallet = do
 
@@ -309,7 +309,7 @@ voteChangeProposal :: (MonadTest m, MonadIO m, MonadCatch m, H.MonadAssertion m)
   -> FilePath -- ^ Base directory path where the subdirectory with the intermediate files will be created.
   -> String -- ^ Name for the subdirectory that will be created for storing the intermediate files.
   -> String -- ^ Transaction id of the governance action to vote.
-  -> Word32 -- ^ Index of the governance action to vote in the transaction.
+  -> Word16 -- ^ Index of the governance action to vote in the transaction.
   -> [DefaultDRepVote] -- ^ List of votes to issue as pairs of the vote and the number of DRep that votes it.
   -> PaymentKeyInfo -- ^ Wallet that will pay for the transactions
   -> m ()
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs
index 9521a16a230..ff0051e413c 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs
@@ -122,7 +122,7 @@ hprop_ledger_events_propose_new_constitution = integrationWorkspace "propose-new
 
   -- Create constitution proposal
   guardRailScriptFp <- H.note $ work </> "guard-rail-script.plutusV3"
-  H.writeFile guardRailScriptFp $ Text.unpack plutusV3NonSpendingScript
+  H.writeFile guardRailScriptFp $ Text.unpack plutusV3Script
   -- TODO: Update help text for policyid. The script hash is not
   -- only useful for minting scripts
   constitutionScriptHash <- filter (/= '\n') <$>
@@ -211,7 +211,7 @@ foldBlocksCheckConstitutionWasRatified
   :: String -- submitted constitution hash
   -> String -- submitted guard rail script hash
   -> AnyNewEpochState
-  -> StateT s IO LedgerStateCondition -- ^ Accumulator at block i and fold status
+  -> StateT s IO ConditionResult -- ^ Accumulator at block i and fold status
 foldBlocksCheckConstitutionWasRatified submittedConstitutionHash submittedGuardRailScriptHash anyNewEpochState =
   if filterRatificationState submittedConstitutionHash submittedGuardRailScriptHash anyNewEpochState
   then return ConditionMet
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs
index 53539de3cf7..6a628afa347 100644
--- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs
+++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs
@@ -65,7 +65,7 @@ prop_check_if_treasury_is_growing = integrationRetryWorkspace 0 "growing-treasur
        H.note_ "treasury is not growing"
        H.failure
   where
-    handler :: AnyNewEpochState -> SlotNo -> BlockNo -> StateT (Map EpochNo Integer) IO LedgerStateCondition
+    handler :: AnyNewEpochState -> SlotNo -> BlockNo -> StateT (Map EpochNo Integer) IO ConditionResult
     handler (AnyNewEpochState _ newEpochState) _slotNo _blockNo = do
       let (Coin coin) = newEpochState ^. L.nesEsL . L.esAccountStateL . L.asTreasuryL
           epochNo = newEpochState ^. L.nesELL
diff --git a/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs b/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs
index 0abd882d754..420b85cbd01 100644
--- a/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs
+++ b/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs
@@ -49,7 +49,7 @@ tests = do
         [ T.testGroup "Ledger Events"
             [ ignoreOnWindows "Sanity Check" LedgerEvents.hprop_ledger_events_sanity_check
             , ignoreOnWindows "Treasury Growth" Gov.prop_check_if_treasury_is_growing
-            -- TODO: Replace foldBlocks with checkLedgerStateCondition
+            -- TODO: Replace foldBlocks with checkConditionResult
             , T.testGroup "Governance"
                 [ ignoreOnMacAndWindows "Committee Add New" Gov.hprop_constitutional_committee_add_new
                 , ignoreOnMacAndWindows "Committee Motion Of No Confidence"  Gov.hprop_gov_no_confidence
diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json
index caabb1919ec..8b878124e88 100644
--- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json
+++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json
@@ -360,666 +360,966 @@
                 10
             ],
             "PlutusV3": [
-                205665,
-                812,
-                1,
-                1,
-                1000,
-                571,
                 0,
-                1,
-                1000,
-                24177,
-                4,
-                1,
-                1000,
-                32,
-                117366,
-                10475,
-                4,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                100,
-                100,
-                23000,
-                100,
-                19537,
-                32,
-                175354,
-                32,
-                46417,
-                4,
-                221973,
-                511,
                 0,
-                1,
-                89141,
-                32,
-                497525,
-                14068,
-                4,
-                2,
-                196500,
-                453240,
-                220,
                 0,
-                1,
-                1,
-                1000,
-                28662,
-                4,
-                2,
-                245000,
-                216773,
-                62,
-                1,
-                1060367,
-                12586,
-                1,
-                208512,
-                421,
-                1,
-                187000,
-                1000,
-                52998,
-                1,
-                80436,
-                32,
-                43249,
-                32,
-                1000,
-                32,
-                80556,
-                1,
-                57667,
-                4,
-                1000,
-                10,
-                197145,
-                156,
-                1,
-                197145,
-                156,
-                1,
-                204924,
-                473,
-                1,
-                208896,
-                511,
-                1,
-                52467,
-                32,
-                64832,
-                32,
-                65493,
-                32,
-                22558,
-                32,
-                16563,
-                32,
-                76511,
-                32,
-                196500,
-                453240,
-                220,
                 0,
-                1,
-                1,
-                69522,
-                11687,
                 0,
-                1,
-                60091,
-                32,
-                196500,
-                453240,
-                220,
                 0,
-                1,
-                1,
-                196500,
-                453240,
-                220,
                 0,
-                1,
-                1,
-                1159724,
-                392670,
                 0,
-                2,
-                806990,
-                30482,
-                4,
-                1927926,
-                82523,
-                4,
-                265318,
                 0,
-                4,
                 0,
-                85931,
-                32,
-                205665,
-                812,
-                1,
-                1,
-                41182,
-                32,
-                212342,
-                32,
-                31220,
-                32,
-                32696,
-                32,
-                43357,
-                32,
-                32247,
-                32,
-                38314,
-                32,
-                35190005,
-                10,
-                57996947,
-                18975,
-                10,
-                39121781,
-                32260,
-                10,
-                23000,
-                100,
-                23000,
-                100,
-                832808,
-                18,
-                3209094,
-                6,
-                331451,
-                1,
-                65990684,
-                23097,
-                18,
-                114242,
-                18,
-                94393407,
-                87060,
-                18,
-                16420089,
-                18,
-                2145798,
-                36,
-                3795345,
-                12,
-                889023,
-                1,
-                204237282,
-                23271,
-                36,
-                129165,
-                36,
-                189977790,
-                85902,
-                36,
-                33012864,
-                36,
-                388443360,
-                1,
-                401885761,
-                72,
-                2331379,
-                72,
-                1927926,
-                82523,
-                4,
-                117366,
-                10475,
-                4,
-                1292075,
-                24469,
-                74,
                 0,
-                1,
-                936157,
-                49601,
-                237,
                 0,
-                1
-            ]
-        },
-        "dRepActivity": 100,
-        "dRepDeposit": 1000000,
-        "dRepVotingThresholds": {
-            "committeeNoConfidence": 0,
-            "committeeNormal": 0.5,
-            "hardForkInitiation": 0.5,
-            "motionNoConfidence": 0,
-            "ppEconomicGroup": 0.5,
-            "ppGovGroup": 0.5,
-            "ppNetworkGroup": 0.5,
-            "ppTechnicalGroup": 0.5,
-            "treasuryWithdrawal": 0.5,
-            "updateToConstitution": 0
-        },
-        "executionUnitPrices": {
-            "priceMemory": 5.77e-2,
-            "priceSteps": 7.21e-5
-        },
-        "govActionDeposit": 1000000,
-        "govActionLifetime": 1,
-        "maxBlockBodySize": 65536,
-        "maxBlockExecutionUnits": {
-            "memory": 62000000,
-            "steps": 20000000000
-        },
-        "maxBlockHeaderSize": 1100,
-        "maxCollateralInputs": 3,
-        "maxTxExecutionUnits": {
-            "memory": 140000000,
-            "steps": 10000000000
-        },
-        "maxTxSize": 16384,
-        "maxValueSize": 5000,
-        "minFeeRefScriptCostPerByte": 0,
-        "minPoolCost": 0,
-        "monetaryExpansion": 0.1,
-        "poolPledgeInfluence": 0,
-        "poolRetireMaxEpoch": 18,
-        "poolVotingThresholds": {
-            "committeeNoConfidence": 0.5,
-            "committeeNormal": 0.5,
-            "hardForkInitiation": 0.5,
-            "motionNoConfidence": 0.5,
-            "ppSecurityGroup": 0.5
-        },
-        "protocolVersion": {
-            "major": 10,
-            "minor": 0
-        },
-        "stakeAddressDeposit": 0,
-        "stakePoolDeposit": 0,
-        "stakePoolTargetNum": 100,
-        "treasuryCut": 0.1,
-        "txFeeFixed": 0,
-        "txFeePerByte": 1,
-        "utxoCostPerByte": 4310
-    },
-    "futurePParams": {
-        "tag": "NoPParamsUpdate"
-    },
-    "nextRatifyState": {
-        "enactedGovActions": [],
-        "expiredGovActions": [],
-        "nextEnactState": {
-            "committee": {
-                "members": {},
-                "threshold": 0
-            },
-            "constitution": {
-                "anchor": {
-                    "dataHash": "0000000000000000000000000000000000000000000000000000000000000000",
-                    "url": ""
-                }
-            },
-            "curPParams": {
-                "collateralPercentage": 150,
-                "committeeMaxTermLength": 200,
-                "committeeMinSize": 0,
-                "costModels": {
-                    "PlutusV1": [
-                        205665,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0
+            ]
+        },
+        "dRepActivity": 100,
+        "dRepDeposit": 1000000,
+        "dRepVotingThresholds": {
+            "committeeNoConfidence": 0,
+            "committeeNormal": 0.5,
+            "hardForkInitiation": 0.5,
+            "motionNoConfidence": 0,
+            "ppEconomicGroup": 0.5,
+            "ppGovGroup": 0.5,
+            "ppNetworkGroup": 0.5,
+            "ppTechnicalGroup": 0.5,
+            "treasuryWithdrawal": 0.5,
+            "updateToConstitution": 0
+        },
+        "executionUnitPrices": {
+            "priceMemory": 5.77e-2,
+            "priceSteps": 7.21e-5
+        },
+        "govActionDeposit": 1000000,
+        "govActionLifetime": 1,
+        "maxBlockBodySize": 65536,
+        "maxBlockExecutionUnits": {
+            "memory": 62000000,
+            "steps": 20000000000
+        },
+        "maxBlockHeaderSize": 1100,
+        "maxCollateralInputs": 3,
+        "maxTxExecutionUnits": {
+            "memory": 140000000,
+            "steps": 10000000000
+        },
+        "maxTxSize": 16384,
+        "maxValueSize": 5000,
+        "minFeeRefScriptCostPerByte": 0,
+        "minPoolCost": 0,
+        "monetaryExpansion": 0.1,
+        "poolPledgeInfluence": 0,
+        "poolRetireMaxEpoch": 18,
+        "poolVotingThresholds": {
+            "committeeNoConfidence": 0.5,
+            "committeeNormal": 0.5,
+            "hardForkInitiation": 0.5,
+            "motionNoConfidence": 0.5,
+            "ppSecurityGroup": 0.5
+        },
+        "protocolVersion": {
+            "major": 10,
+            "minor": 0
+        },
+        "stakeAddressDeposit": 0,
+        "stakePoolDeposit": 0,
+        "stakePoolTargetNum": 100,
+        "treasuryCut": 0.1,
+        "txFeeFixed": 0,
+        "txFeePerByte": 1,
+        "utxoCostPerByte": 4310
+    },
+    "futurePParams": {
+        "tag": "NoPParamsUpdate"
+    },
+    "nextRatifyState": {
+        "enactedGovActions": [],
+        "expiredGovActions": [],
+        "nextEnactState": {
+            "committee": {
+                "members": {},
+                "threshold": 0
+            },
+            "constitution": {
+                "anchor": {
+                    "dataHash": "0000000000000000000000000000000000000000000000000000000000000000",
+                    "url": ""
+                }
+            },
+            "curPParams": {
+                "collateralPercentage": 150,
+                "committeeMaxTermLength": 200,
+                "committeeMinSize": 0,
+                "costModels": {
+                    "PlutusV1": [
+                        205665,
+                        812,
+                        1,
+                        1,
+                        1000,
+                        571,
+                        0,
+                        1,
+                        1000,
+                        24177,
+                        4,
+                        1,
+                        1000,
+                        32,
+                        117366,
+                        10475,
+                        4,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        100,
+                        100,
+                        23000,
+                        100,
+                        19537,
+                        32,
+                        175354,
+                        32,
+                        46417,
+                        4,
+                        221973,
+                        511,
+                        0,
+                        1,
+                        89141,
+                        32,
+                        497525,
+                        14068,
+                        4,
+                        2,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        1000,
+                        28662,
+                        4,
+                        2,
+                        245000,
+                        216773,
+                        62,
+                        1,
+                        1060367,
+                        12586,
+                        1,
+                        208512,
+                        421,
+                        1,
+                        187000,
+                        1000,
+                        52998,
+                        1,
+                        80436,
+                        32,
+                        43249,
+                        32,
+                        1000,
+                        32,
+                        80556,
+                        1,
+                        57667,
+                        4,
+                        1000,
+                        10,
+                        197145,
+                        156,
+                        1,
+                        197145,
+                        156,
+                        1,
+                        204924,
+                        473,
+                        1,
+                        208896,
+                        511,
+                        1,
+                        52467,
+                        32,
+                        64832,
+                        32,
+                        65493,
+                        32,
+                        22558,
+                        32,
+                        16563,
+                        32,
+                        76511,
+                        32,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        69522,
+                        11687,
+                        0,
+                        1,
+                        60091,
+                        32,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        806990,
+                        30482,
+                        4,
+                        1927926,
+                        82523,
+                        4,
+                        265318,
+                        0,
+                        4,
+                        0,
+                        85931,
+                        32,
+                        205665,
+                        812,
+                        1,
+                        1,
+                        41182,
+                        32,
+                        212342,
+                        32,
+                        31220,
+                        32,
+                        32696,
+                        32,
+                        43357,
+                        32,
+                        32247,
+                        32,
+                        38314,
+                        32,
+                        57996947,
+                        18975,
+                        10
+                    ],
+                    "PlutusV2": [
+                        205665,
                         812,
                         1,
                         1,
-                        1000,
-                        571,
+                        1000,
+                        571,
+                        0,
+                        1,
+                        1000,
+                        24177,
+                        4,
+                        1,
+                        1000,
+                        32,
+                        117366,
+                        10475,
+                        4,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        23000,
+                        100,
+                        100,
+                        100,
+                        23000,
+                        100,
+                        19537,
+                        32,
+                        175354,
+                        32,
+                        46417,
+                        4,
+                        221973,
+                        511,
+                        0,
+                        1,
+                        89141,
+                        32,
+                        497525,
+                        14068,
+                        4,
+                        2,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        1000,
+                        28662,
+                        4,
+                        2,
+                        245000,
+                        216773,
+                        62,
+                        1,
+                        1060367,
+                        12586,
+                        1,
+                        208512,
+                        421,
+                        1,
+                        187000,
+                        1000,
+                        52998,
+                        1,
+                        80436,
+                        32,
+                        43249,
+                        32,
+                        1000,
+                        32,
+                        80556,
+                        1,
+                        57667,
+                        4,
+                        1000,
+                        10,
+                        197145,
+                        156,
+                        1,
+                        197145,
+                        156,
+                        1,
+                        204924,
+                        473,
+                        1,
+                        208896,
+                        511,
+                        1,
+                        52467,
+                        32,
+                        64832,
+                        32,
+                        65493,
+                        32,
+                        22558,
+                        32,
+                        16563,
+                        32,
+                        76511,
+                        32,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        69522,
+                        11687,
                         0,
                         1,
-                        1000,
-                        24177,
+                        60091,
+                        32,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        196500,
+                        453240,
+                        220,
+                        0,
+                        1,
+                        1,
+                        1159724,
+                        392670,
+                        0,
+                        2,
+                        806990,
+                        30482,
+                        4,
+                        1927926,
+                        82523,
+                        4,
+                        265318,
+                        0,
                         4,
+                        0,
+                        85931,
+                        32,
+                        205665,
+                        812,
                         1,
-                        1000,
+                        1,
+                        41182,
                         32,
-                        117366,
-                        10475,
-                        4,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        100,
-                        100,
-                        23000,
-                        100,
-                        19537,
+                        212342,
                         32,
-                        175354,
+                        31220,
                         32,
-                        46417,
-                        4,
-                        221973,
-                        511,
+                        32696,
+                        32,
+                        43357,
+                        32,
+                        32247,
+                        32,
+                        38314,
+                        32,
+                        35892428,
+                        10,
+                        9462713,
+                        1021,
+                        10,
+                        38887044,
+                        32947,
+                        10
+                    ],
+                    "PlutusV3": [
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
                         0,
-                        1,
-                        89141,
-                        32,
-                        497525,
-                        14068,
-                        4,
-                        2,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1000,
-                        28662,
-                        4,
-                        2,
-                        245000,
-                        216773,
-                        62,
-                        1,
-                        1060367,
-                        12586,
-                        1,
-                        208512,
-                        421,
-                        1,
-                        187000,
-                        1000,
-                        52998,
-                        1,
-                        80436,
-                        32,
-                        43249,
-                        32,
-                        1000,
-                        32,
-                        80556,
-                        1,
-                        57667,
-                        4,
-                        1000,
-                        10,
-                        197145,
-                        156,
-                        1,
-                        197145,
-                        156,
-                        1,
-                        204924,
-                        473,
-                        1,
-                        208896,
-                        511,
-                        1,
-                        52467,
-                        32,
-                        64832,
-                        32,
-                        65493,
-                        32,
-                        22558,
-                        32,
-                        16563,
-                        32,
-                        76511,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        69522,
-                        11687,
                         0,
-                        1,
-                        60091,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        806990,
-                        30482,
-                        4,
-                        1927926,
-                        82523,
-                        4,
-                        265318,
                         0,
-                        4,
                         0,
-                        85931,
-                        32,
-                        205665,
-                        812,
-                        1,
-                        1,
-                        41182,
-                        32,
-                        212342,
-                        32,
-                        31220,
-                        32,
-                        32696,
-                        32,
-                        43357,
-                        32,
-                        32247,
-                        32,
-                        38314,
-                        32,
-                        57996947,
-                        18975,
-                        10
-                    ],
-                    "PlutusV2": [
-                        205665,
-                        812,
-                        1,
-                        1,
-                        1000,
-                        571,
                         0,
-                        1,
-                        1000,
-                        24177,
-                        4,
-                        1,
-                        1000,
-                        32,
-                        117366,
-                        10475,
-                        4,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        100,
-                        100,
-                        23000,
-                        100,
-                        19537,
-                        32,
-                        175354,
-                        32,
-                        46417,
-                        4,
-                        221973,
-                        511,
                         0,
-                        1,
-                        89141,
-                        32,
-                        497525,
-                        14068,
-                        4,
-                        2,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1000,
-                        28662,
-                        4,
-                        2,
-                        245000,
-                        216773,
-                        62,
-                        1,
-                        1060367,
-                        12586,
-                        1,
-                        208512,
-                        421,
-                        1,
-                        187000,
-                        1000,
-                        52998,
-                        1,
-                        80436,
-                        32,
-                        43249,
-                        32,
-                        1000,
-                        32,
-                        80556,
-                        1,
-                        57667,
-                        4,
-                        1000,
-                        10,
-                        197145,
-                        156,
-                        1,
-                        197145,
-                        156,
-                        1,
-                        204924,
-                        473,
-                        1,
-                        208896,
-                        511,
-                        1,
-                        52467,
-                        32,
-                        64832,
-                        32,
-                        65493,
-                        32,
-                        22558,
-                        32,
-                        16563,
-                        32,
-                        76511,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        69522,
-                        11687,
                         0,
-                        1,
-                        60091,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1159724,
-                        392670,
                         0,
-                        2,
-                        806990,
-                        30482,
-                        4,
-                        1927926,
-                        82523,
-                        4,
-                        265318,
                         0,
-                        4,
                         0,
-                        85931,
-                        32,
-                        205665,
-                        812,
-                        1,
-                        1,
-                        41182,
-                        32,
-                        212342,
-                        32,
-                        31220,
-                        32,
-                        32696,
-                        32,
-                        43357,
-                        32,
-                        32247,
-                        32,
-                        38314,
-                        32,
-                        35892428,
-                        10,
-                        9462713,
-                        1021,
-                        10,
-                        38887044,
-                        32947,
-                        10
-                    ],
-                    "PlutusV3": [
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0
+                    ]
+                },
+                "dRepActivity": 100,
+                "dRepDeposit": 1000000,
+                "dRepVotingThresholds": {
+                    "committeeNoConfidence": 0,
+                    "committeeNormal": 0.5,
+                    "hardForkInitiation": 0.5,
+                    "motionNoConfidence": 0,
+                    "ppEconomicGroup": 0.5,
+                    "ppGovGroup": 0.5,
+                    "ppNetworkGroup": 0.5,
+                    "ppTechnicalGroup": 0.5,
+                    "treasuryWithdrawal": 0.5,
+                    "updateToConstitution": 0
+                },
+                "executionUnitPrices": {
+                    "priceMemory": 5.77e-2,
+                    "priceSteps": 7.21e-5
+                },
+                "govActionDeposit": 1000000,
+                "govActionLifetime": 1,
+                "maxBlockBodySize": 65536,
+                "maxBlockExecutionUnits": {
+                    "memory": 62000000,
+                    "steps": 20000000000
+                },
+                "maxBlockHeaderSize": 1100,
+                "maxCollateralInputs": 3,
+                "maxTxExecutionUnits": {
+                    "memory": 140000000,
+                    "steps": 10000000000
+                },
+                "maxTxSize": 16384,
+                "maxValueSize": 5000,
+                "minFeeRefScriptCostPerByte": 0,
+                "minPoolCost": 0,
+                "monetaryExpansion": 0.1,
+                "poolPledgeInfluence": 0,
+                "poolRetireMaxEpoch": 18,
+                "poolVotingThresholds": {
+                    "committeeNoConfidence": 0.5,
+                    "committeeNormal": 0.5,
+                    "hardForkInitiation": 0.5,
+                    "motionNoConfidence": 0.5,
+                    "ppSecurityGroup": 0.5
+                },
+                "protocolVersion": {
+                    "major": 10,
+                    "minor": 0
+                },
+                "stakeAddressDeposit": 0,
+                "stakePoolDeposit": 0,
+                "stakePoolTargetNum": 100,
+                "treasuryCut": 0.1,
+                "txFeeFixed": 0,
+                "txFeePerByte": 1,
+                "utxoCostPerByte": 4310
+            },
+            "prevGovActionIds": {
+                "Committee": null,
+                "Constitution": null,
+                "HardFork": null,
+                "PParamUpdate": null
+            },
+            "prevPParams": {
+                "collateralPercentage": 150,
+                "committeeMaxTermLength": 200,
+                "committeeMinSize": 0,
+                "costModels": {
+                    "PlutusV1": [
                         205665,
                         812,
                         1,
@@ -1153,10 +1453,6 @@
                         0,
                         1,
                         1,
-                        1159724,
-                        392670,
-                        0,
-                        2,
                         806990,
                         30482,
                         4,
@@ -1168,162 +1464,30 @@
                         4,
                         0,
                         85931,
-                        32,
-                        205665,
-                        812,
-                        1,
-                        1,
-                        41182,
-                        32,
-                        212342,
-                        32,
-                        31220,
-                        32,
-                        32696,
-                        32,
-                        43357,
-                        32,
-                        32247,
-                        32,
-                        38314,
-                        32,
-                        35190005,
-                        10,
-                        57996947,
-                        18975,
-                        10,
-                        39121781,
-                        32260,
-                        10,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        832808,
-                        18,
-                        3209094,
-                        6,
-                        331451,
-                        1,
-                        65990684,
-                        23097,
-                        18,
-                        114242,
-                        18,
-                        94393407,
-                        87060,
-                        18,
-                        16420089,
-                        18,
-                        2145798,
-                        36,
-                        3795345,
-                        12,
-                        889023,
-                        1,
-                        204237282,
-                        23271,
-                        36,
-                        129165,
-                        36,
-                        189977790,
-                        85902,
-                        36,
-                        33012864,
-                        36,
-                        388443360,
-                        1,
-                        401885761,
-                        72,
-                        2331379,
-                        72,
-                        1927926,
-                        82523,
-                        4,
-                        117366,
-                        10475,
-                        4,
-                        1292075,
-                        24469,
-                        74,
-                        0,
-                        1,
-                        936157,
-                        49601,
-                        237,
-                        0,
-                        1
-                    ]
-                },
-                "dRepActivity": 100,
-                "dRepDeposit": 1000000,
-                "dRepVotingThresholds": {
-                    "committeeNoConfidence": 0,
-                    "committeeNormal": 0.5,
-                    "hardForkInitiation": 0.5,
-                    "motionNoConfidence": 0,
-                    "ppEconomicGroup": 0.5,
-                    "ppGovGroup": 0.5,
-                    "ppNetworkGroup": 0.5,
-                    "ppTechnicalGroup": 0.5,
-                    "treasuryWithdrawal": 0.5,
-                    "updateToConstitution": 0
-                },
-                "executionUnitPrices": {
-                    "priceMemory": 5.77e-2,
-                    "priceSteps": 7.21e-5
-                },
-                "govActionDeposit": 1000000,
-                "govActionLifetime": 1,
-                "maxBlockBodySize": 65536,
-                "maxBlockExecutionUnits": {
-                    "memory": 62000000,
-                    "steps": 20000000000
-                },
-                "maxBlockHeaderSize": 1100,
-                "maxCollateralInputs": 3,
-                "maxTxExecutionUnits": {
-                    "memory": 140000000,
-                    "steps": 10000000000
-                },
-                "maxTxSize": 16384,
-                "maxValueSize": 5000,
-                "minFeeRefScriptCostPerByte": 0,
-                "minPoolCost": 0,
-                "monetaryExpansion": 0.1,
-                "poolPledgeInfluence": 0,
-                "poolRetireMaxEpoch": 18,
-                "poolVotingThresholds": {
-                    "committeeNoConfidence": 0.5,
-                    "committeeNormal": 0.5,
-                    "hardForkInitiation": 0.5,
-                    "motionNoConfidence": 0.5,
-                    "ppSecurityGroup": 0.5
-                },
-                "protocolVersion": {
-                    "major": 10,
-                    "minor": 0
-                },
-                "stakeAddressDeposit": 0,
-                "stakePoolDeposit": 0,
-                "stakePoolTargetNum": 100,
-                "treasuryCut": 0.1,
-                "txFeeFixed": 0,
-                "txFeePerByte": 1,
-                "utxoCostPerByte": 4310
-            },
-            "prevGovActionIds": {
-                "Committee": null,
-                "Constitution": null,
-                "HardFork": null,
-                "PParamUpdate": null
-            },
-            "prevPParams": {
-                "collateralPercentage": 150,
-                "committeeMaxTermLength": 200,
-                "committeeMinSize": 0,
-                "costModels": {
-                    "PlutusV1": [
+                        32,
+                        205665,
+                        812,
+                        1,
+                        1,
+                        41182,
+                        32,
+                        212342,
+                        32,
+                        31220,
+                        32,
+                        32696,
+                        32,
+                        43357,
+                        32,
+                        32247,
+                        32,
+                        38314,
+                        32,
+                        57996947,
+                        18975,
+                        10
+                    ],
+                    "PlutusV2": [
                         205665,
                         812,
                         1,
@@ -1457,6 +1621,10 @@
                         0,
                         1,
                         1,
+                        1159724,
+                        392670,
+                        0,
+                        2,
                         806990,
                         30482,
                         4,
@@ -1487,421 +1655,247 @@
                         32,
                         38314,
                         32,
-                        57996947,
-                        18975,
+                        35892428,
+                        10,
+                        9462713,
+                        1021,
+                        10,
+                        38887044,
+                        32947,
                         10
                     ],
-                    "PlutusV2": [
-                        205665,
-                        812,
-                        1,
-                        1,
-                        1000,
-                        571,
+                    "PlutusV3": [
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
                         0,
-                        1,
-                        1000,
-                        24177,
-                        4,
-                        1,
-                        1000,
-                        32,
-                        117366,
-                        10475,
-                        4,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        100,
-                        100,
-                        23000,
-                        100,
-                        19537,
-                        32,
-                        175354,
-                        32,
-                        46417,
-                        4,
-                        221973,
-                        511,
                         0,
-                        1,
-                        89141,
-                        32,
-                        497525,
-                        14068,
-                        4,
-                        2,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1000,
-                        28662,
-                        4,
-                        2,
-                        245000,
-                        216773,
-                        62,
-                        1,
-                        1060367,
-                        12586,
-                        1,
-                        208512,
-                        421,
-                        1,
-                        187000,
-                        1000,
-                        52998,
-                        1,
-                        80436,
-                        32,
-                        43249,
-                        32,
-                        1000,
-                        32,
-                        80556,
-                        1,
-                        57667,
-                        4,
-                        1000,
-                        10,
-                        197145,
-                        156,
-                        1,
-                        197145,
-                        156,
-                        1,
-                        204924,
-                        473,
-                        1,
-                        208896,
-                        511,
-                        1,
-                        52467,
-                        32,
-                        64832,
-                        32,
-                        65493,
-                        32,
-                        22558,
-                        32,
-                        16563,
-                        32,
-                        76511,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        69522,
-                        11687,
                         0,
-                        1,
-                        60091,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1159724,
-                        392670,
                         0,
-                        2,
-                        806990,
-                        30482,
-                        4,
-                        1927926,
-                        82523,
-                        4,
-                        265318,
                         0,
-                        4,
                         0,
-                        85931,
-                        32,
-                        205665,
-                        812,
-                        1,
-                        1,
-                        41182,
-                        32,
-                        212342,
-                        32,
-                        31220,
-                        32,
-                        32696,
-                        32,
-                        43357,
-                        32,
-                        32247,
-                        32,
-                        38314,
-                        32,
-                        35892428,
-                        10,
-                        9462713,
-                        1021,
-                        10,
-                        38887044,
-                        32947,
-                        10
-                    ],
-                    "PlutusV3": [
-                        205665,
-                        812,
-                        1,
-                        1,
-                        1000,
-                        571,
                         0,
-                        1,
-                        1000,
-                        24177,
-                        4,
-                        1,
-                        1000,
-                        32,
-                        117366,
-                        10475,
-                        4,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        100,
-                        100,
-                        23000,
-                        100,
-                        19537,
-                        32,
-                        175354,
-                        32,
-                        46417,
-                        4,
-                        221973,
-                        511,
                         0,
-                        1,
-                        89141,
-                        32,
-                        497525,
-                        14068,
-                        4,
-                        2,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1000,
-                        28662,
-                        4,
-                        2,
-                        245000,
-                        216773,
-                        62,
-                        1,
-                        1060367,
-                        12586,
-                        1,
-                        208512,
-                        421,
-                        1,
-                        187000,
-                        1000,
-                        52998,
-                        1,
-                        80436,
-                        32,
-                        43249,
-                        32,
-                        1000,
-                        32,
-                        80556,
-                        1,
-                        57667,
-                        4,
-                        1000,
-                        10,
-                        197145,
-                        156,
-                        1,
-                        197145,
-                        156,
-                        1,
-                        204924,
-                        473,
-                        1,
-                        208896,
-                        511,
-                        1,
-                        52467,
-                        32,
-                        64832,
-                        32,
-                        65493,
-                        32,
-                        22558,
-                        32,
-                        16563,
-                        32,
-                        76511,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        69522,
-                        11687,
                         0,
-                        1,
-                        60091,
-                        32,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        196500,
-                        453240,
-                        220,
                         0,
-                        1,
-                        1,
-                        1159724,
-                        392670,
                         0,
-                        2,
-                        806990,
-                        30482,
-                        4,
-                        1927926,
-                        82523,
-                        4,
-                        265318,
                         0,
-                        4,
                         0,
-                        85931,
-                        32,
-                        205665,
-                        812,
-                        1,
-                        1,
-                        41182,
-                        32,
-                        212342,
-                        32,
-                        31220,
-                        32,
-                        32696,
-                        32,
-                        43357,
-                        32,
-                        32247,
-                        32,
-                        38314,
-                        32,
-                        35190005,
-                        10,
-                        57996947,
-                        18975,
-                        10,
-                        39121781,
-                        32260,
-                        10,
-                        23000,
-                        100,
-                        23000,
-                        100,
-                        832808,
-                        18,
-                        3209094,
-                        6,
-                        331451,
-                        1,
-                        65990684,
-                        23097,
-                        18,
-                        114242,
-                        18,
-                        94393407,
-                        87060,
-                        18,
-                        16420089,
-                        18,
-                        2145798,
-                        36,
-                        3795345,
-                        12,
-                        889023,
-                        1,
-                        204237282,
-                        23271,
-                        36,
-                        129165,
-                        36,
-                        189977790,
-                        85902,
-                        36,
-                        33012864,
-                        36,
-                        388443360,
-                        1,
-                        401885761,
-                        72,
-                        2331379,
-                        72,
-                        1927926,
-                        82523,
-                        4,
-                        117366,
-                        10475,
-                        4,
-                        1292075,
-                        24469,
-                        74,
                         0,
-                        1,
-                        936157,
-                        49601,
-                        237,
                         0,
-                        1
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0,
+                        0
                     ]
                 },
                 "dRepActivity": 100,
@@ -2131,190 +2125,13 @@
                 32,
                 32247,
                 32,
-                38314,
-                32,
-                57996947,
-                18975,
-                10
-            ],
-            "PlutusV2": [
-                205665,
-                812,
-                1,
-                1,
-                1000,
-                571,
-                0,
-                1,
-                1000,
-                24177,
-                4,
-                1,
-                1000,
-                32,
-                117366,
-                10475,
-                4,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                23000,
-                100,
-                100,
-                100,
-                23000,
-                100,
-                19537,
-                32,
-                175354,
-                32,
-                46417,
-                4,
-                221973,
-                511,
-                0,
-                1,
-                89141,
-                32,
-                497525,
-                14068,
-                4,
-                2,
-                196500,
-                453240,
-                220,
-                0,
-                1,
-                1,
-                1000,
-                28662,
-                4,
-                2,
-                245000,
-                216773,
-                62,
-                1,
-                1060367,
-                12586,
-                1,
-                208512,
-                421,
-                1,
-                187000,
-                1000,
-                52998,
-                1,
-                80436,
-                32,
-                43249,
-                32,
-                1000,
-                32,
-                80556,
-                1,
-                57667,
-                4,
-                1000,
-                10,
-                197145,
-                156,
-                1,
-                197145,
-                156,
-                1,
-                204924,
-                473,
-                1,
-                208896,
-                511,
-                1,
-                52467,
-                32,
-                64832,
-                32,
-                65493,
-                32,
-                22558,
-                32,
-                16563,
-                32,
-                76511,
-                32,
-                196500,
-                453240,
-                220,
-                0,
-                1,
-                1,
-                69522,
-                11687,
-                0,
-                1,
-                60091,
-                32,
-                196500,
-                453240,
-                220,
-                0,
-                1,
-                1,
-                196500,
-                453240,
-                220,
-                0,
-                1,
-                1,
-                1159724,
-                392670,
-                0,
-                2,
-                806990,
-                30482,
-                4,
-                1927926,
-                82523,
-                4,
-                265318,
-                0,
-                4,
-                0,
-                85931,
-                32,
-                205665,
-                812,
-                1,
-                1,
-                41182,
-                32,
-                212342,
-                32,
-                31220,
-                32,
-                32696,
-                32,
-                43357,
-                32,
-                32247,
-                32,
-                38314,
-                32,
-                35892428,
-                10,
-                9462713,
-                1021,
-                10,
-                38887044,
-                32947,
+                38314,
+                32,
+                57996947,
+                18975,
                 10
             ],
-            "PlutusV3": [
+            "PlutusV2": [
                 205665,
                 812,
                 1,
@@ -2482,72 +2299,247 @@
                 32,
                 38314,
                 32,
-                35190005,
-                10,
-                57996947,
-                18975,
+                35892428,
                 10,
-                39121781,
-                32260,
+                9462713,
+                1021,
                 10,
-                23000,
-                100,
-                23000,
-                100,
-                832808,
-                18,
-                3209094,
-                6,
-                331451,
-                1,
-                65990684,
-                23097,
-                18,
-                114242,
-                18,
-                94393407,
-                87060,
-                18,
-                16420089,
-                18,
-                2145798,
-                36,
-                3795345,
-                12,
-                889023,
-                1,
-                204237282,
-                23271,
-                36,
-                129165,
-                36,
-                189977790,
-                85902,
-                36,
-                33012864,
-                36,
-                388443360,
-                1,
-                401885761,
-                72,
-                2331379,
-                72,
-                1927926,
-                82523,
-                4,
-                117366,
-                10475,
-                4,
-                1292075,
-                24469,
-                74,
+                38887044,
+                32947,
+                10
+            ],
+            "PlutusV3": [
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
                 0,
-                1,
-                936157,
-                49601,
-                237,
                 0,
-                1
+                0
             ]
         },
         "dRepActivity": 100,
diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json
index 96ac06d38a0..c59347a2e91 100644
--- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json
+++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json
@@ -1,5 +1,7 @@
 {
     "collateralPercentage": 150,
+    "committeeMaxTermLength": 200,
+    "committeeMinSize": 0,
     "costModels": {
         "PlutusV1": [
             205665,
@@ -347,247 +349,259 @@
             10
         ],
         "PlutusV3": [
-            205665,
-            812,
-            1,
-            1,
-            1000,
-            571,
             0,
-            1,
-            1000,
-            24177,
-            4,
-            1,
-            1000,
-            32,
-            117366,
-            10475,
-            4,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            100,
-            100,
-            23000,
-            100,
-            19537,
-            32,
-            175354,
-            32,
-            46417,
-            4,
-            221973,
-            511,
             0,
-            1,
-            89141,
-            32,
-            497525,
-            14068,
-            4,
-            2,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            1000,
-            28662,
-            4,
-            2,
-            245000,
-            216773,
-            62,
-            1,
-            1060367,
-            12586,
-            1,
-            208512,
-            421,
-            1,
-            187000,
-            1000,
-            52998,
-            1,
-            80436,
-            32,
-            43249,
-            32,
-            1000,
-            32,
-            80556,
-            1,
-            57667,
-            4,
-            1000,
-            10,
-            197145,
-            156,
-            1,
-            197145,
-            156,
-            1,
-            204924,
-            473,
-            1,
-            208896,
-            511,
-            1,
-            52467,
-            32,
-            64832,
-            32,
-            65493,
-            32,
-            22558,
-            32,
-            16563,
-            32,
-            76511,
-            32,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            69522,
-            11687,
             0,
-            1,
-            60091,
-            32,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            1159724,
-            392670,
             0,
-            2,
-            806990,
-            30482,
-            4,
-            1927926,
-            82523,
-            4,
-            265318,
             0,
-            4,
             0,
-            85931,
-            32,
-            205665,
-            812,
-            1,
-            1,
-            41182,
-            32,
-            212342,
-            32,
-            31220,
-            32,
-            32696,
-            32,
-            43357,
-            32,
-            32247,
-            32,
-            38314,
-            32,
-            35190005,
-            10,
-            57996947,
-            18975,
-            10,
-            39121781,
-            32260,
-            10,
-            23000,
-            100,
-            23000,
-            100,
-            832808,
-            18,
-            3209094,
-            6,
-            331451,
-            1,
-            65990684,
-            23097,
-            18,
-            114242,
-            18,
-            94393407,
-            87060,
-            18,
-            16420089,
-            18,
-            2145798,
-            36,
-            3795345,
-            12,
-            889023,
-            1,
-            204237282,
-            23271,
-            36,
-            129165,
-            36,
-            189977790,
-            85902,
-            36,
-            33012864,
-            36,
-            388443360,
-            1,
-            401885761,
-            72,
-            2331379,
-            72,
-            1927926,
-            82523,
-            4,
-            117366,
-            10475,
-            4,
-            1292075,
-            24469,
-            74,
             0,
-            1,
-            936157,
-            49601,
-            237,
             0,
-            1
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0
         ]
     },
-    "decentralization": null,
+    "dRepActivity": 100,
+    "dRepDeposit": 1000000,
+    "dRepVotingThresholds": {
+        "committeeNoConfidence": 0,
+        "committeeNormal": 0.5,
+        "hardForkInitiation": 0.5,
+        "motionNoConfidence": 0,
+        "ppEconomicGroup": 0.5,
+        "ppGovGroup": 0.5,
+        "ppNetworkGroup": 0.5,
+        "ppTechnicalGroup": 0.5,
+        "treasuryWithdrawal": 0.5,
+        "updateToConstitution": 0
+    },
     "executionUnitPrices": {
         "priceMemory": 5.77e-2,
         "priceSteps": 7.21e-5
     },
-    "extraPraosEntropy": null,
+    "govActionDeposit": 1000000,
+    "govActionLifetime": 1,
     "maxBlockBodySize": 65536,
     "maxBlockExecutionUnits": {
         "memory": 62000000,
@@ -601,11 +615,18 @@
     },
     "maxTxSize": 16384,
     "maxValueSize": 5000,
+    "minFeeRefScriptCostPerByte": 0,
     "minPoolCost": 0,
-    "minUTxOValue": null,
     "monetaryExpansion": 0.1,
     "poolPledgeInfluence": 0,
     "poolRetireMaxEpoch": 18,
+    "poolVotingThresholds": {
+        "committeeNoConfidence": 0.5,
+        "committeeNormal": 0.5,
+        "hardForkInitiation": 0.5,
+        "motionNoConfidence": 0.5,
+        "ppSecurityGroup": 0.5
+    },
     "protocolVersion": {
         "major": 10,
         "minor": 0
diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt
index 96ac06d38a0..c59347a2e91 100644
--- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt
+++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt
@@ -1,5 +1,7 @@
 {
     "collateralPercentage": 150,
+    "committeeMaxTermLength": 200,
+    "committeeMinSize": 0,
     "costModels": {
         "PlutusV1": [
             205665,
@@ -347,247 +349,259 @@
             10
         ],
         "PlutusV3": [
-            205665,
-            812,
-            1,
-            1,
-            1000,
-            571,
             0,
-            1,
-            1000,
-            24177,
-            4,
-            1,
-            1000,
-            32,
-            117366,
-            10475,
-            4,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            23000,
-            100,
-            100,
-            100,
-            23000,
-            100,
-            19537,
-            32,
-            175354,
-            32,
-            46417,
-            4,
-            221973,
-            511,
             0,
-            1,
-            89141,
-            32,
-            497525,
-            14068,
-            4,
-            2,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            1000,
-            28662,
-            4,
-            2,
-            245000,
-            216773,
-            62,
-            1,
-            1060367,
-            12586,
-            1,
-            208512,
-            421,
-            1,
-            187000,
-            1000,
-            52998,
-            1,
-            80436,
-            32,
-            43249,
-            32,
-            1000,
-            32,
-            80556,
-            1,
-            57667,
-            4,
-            1000,
-            10,
-            197145,
-            156,
-            1,
-            197145,
-            156,
-            1,
-            204924,
-            473,
-            1,
-            208896,
-            511,
-            1,
-            52467,
-            32,
-            64832,
-            32,
-            65493,
-            32,
-            22558,
-            32,
-            16563,
-            32,
-            76511,
-            32,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            69522,
-            11687,
             0,
-            1,
-            60091,
-            32,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            196500,
-            453240,
-            220,
             0,
-            1,
-            1,
-            1159724,
-            392670,
             0,
-            2,
-            806990,
-            30482,
-            4,
-            1927926,
-            82523,
-            4,
-            265318,
             0,
-            4,
             0,
-            85931,
-            32,
-            205665,
-            812,
-            1,
-            1,
-            41182,
-            32,
-            212342,
-            32,
-            31220,
-            32,
-            32696,
-            32,
-            43357,
-            32,
-            32247,
-            32,
-            38314,
-            32,
-            35190005,
-            10,
-            57996947,
-            18975,
-            10,
-            39121781,
-            32260,
-            10,
-            23000,
-            100,
-            23000,
-            100,
-            832808,
-            18,
-            3209094,
-            6,
-            331451,
-            1,
-            65990684,
-            23097,
-            18,
-            114242,
-            18,
-            94393407,
-            87060,
-            18,
-            16420089,
-            18,
-            2145798,
-            36,
-            3795345,
-            12,
-            889023,
-            1,
-            204237282,
-            23271,
-            36,
-            129165,
-            36,
-            189977790,
-            85902,
-            36,
-            33012864,
-            36,
-            388443360,
-            1,
-            401885761,
-            72,
-            2331379,
-            72,
-            1927926,
-            82523,
-            4,
-            117366,
-            10475,
-            4,
-            1292075,
-            24469,
-            74,
             0,
-            1,
-            936157,
-            49601,
-            237,
             0,
-            1
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0
         ]
     },
-    "decentralization": null,
+    "dRepActivity": 100,
+    "dRepDeposit": 1000000,
+    "dRepVotingThresholds": {
+        "committeeNoConfidence": 0,
+        "committeeNormal": 0.5,
+        "hardForkInitiation": 0.5,
+        "motionNoConfidence": 0,
+        "ppEconomicGroup": 0.5,
+        "ppGovGroup": 0.5,
+        "ppNetworkGroup": 0.5,
+        "ppTechnicalGroup": 0.5,
+        "treasuryWithdrawal": 0.5,
+        "updateToConstitution": 0
+    },
     "executionUnitPrices": {
         "priceMemory": 5.77e-2,
         "priceSteps": 7.21e-5
     },
-    "extraPraosEntropy": null,
+    "govActionDeposit": 1000000,
+    "govActionLifetime": 1,
     "maxBlockBodySize": 65536,
     "maxBlockExecutionUnits": {
         "memory": 62000000,
@@ -601,11 +615,18 @@
     },
     "maxTxSize": 16384,
     "maxValueSize": 5000,
+    "minFeeRefScriptCostPerByte": 0,
     "minPoolCost": 0,
-    "minUTxOValue": null,
     "monetaryExpansion": 0.1,
     "poolPledgeInfluence": 0,
     "poolRetireMaxEpoch": 18,
+    "poolVotingThresholds": {
+        "committeeNoConfidence": 0.5,
+        "committeeNormal": 0.5,
+        "hardForkInitiation": 0.5,
+        "motionNoConfidence": 0.5,
+        "ppSecurityGroup": 0.5
+    },
     "protocolVersion": {
         "major": 10,
         "minor": 0
diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/tx.failed.response.json.golden b/cardano-testnet/test/cardano-testnet-test/files/golden/tx.failed.response.json.golden
index 8561163b649..79c15862593 100644
--- a/cardano-testnet/test/cardano-testnet-test/files/golden/tx.failed.response.json.golden
+++ b/cardano-testnet/test/cardano-testnet-test/files/golden/tx.failed.response.json.golden
@@ -13,7 +13,7 @@
                     },
                     {
                         "contents": {
-                            "contents": "AlonzoInBabbageUtxoPredFailure (BadInputsUTxO (fromList [TxIn (TxId {unTxId = SafeHash \"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\"}) (TxIx 0)]))",
+                            "contents": "AlonzoInBabbageUtxoPredFailure (BadInputsUTxO (fromList [TxIn (TxId {unTxId = SafeHash \"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\"}) (TxIx {unTxIx = 0})]))",
                             "tag": "UtxoFailure"
                         },
                         "tag": "UtxowFailure"
diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal
index 27dc15f9077..69816d0fff6 100644
--- a/cardano-tracer/cardano-tracer.cabal
+++ b/cardano-tracer/cardano-tracer.cabal
@@ -155,7 +155,7 @@ library
                       , filepath
                       , mime-mail
                       , optparse-applicative
-                      , ouroboros-network ^>= 0.16
+                      , ouroboros-network ^>= 0.16.1
                       , ouroboros-network-api
                       , ouroboros-network-framework
                       , signal
diff --git a/configuration/cardano/mainnet-config-new-tracing.json b/configuration/cardano/mainnet-config-new-tracing.json
index 4a44bacb2c7..eef33cdbf8a 100644
--- a/configuration/cardano/mainnet-config-new-tracing.json
+++ b/configuration/cardano/mainnet-config-new-tracing.json
@@ -3,8 +3,6 @@
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
   "ByronGenesisFile": "mainnet-byron-genesis.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
-  "ConwayGenesisFile": "mainnet-conway-genesis.json",
-  "ConwayGenesisHash": "40bca1ded6a9cf924f4a228123c102a14ea4b9d211822aabca0b7c22cdb7431b",
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 0,
diff --git a/configuration/cardano/mainnet-config.json b/configuration/cardano/mainnet-config.json
index 10a51793c21..0b5deb77c42 100644
--- a/configuration/cardano/mainnet-config.json
+++ b/configuration/cardano/mainnet-config.json
@@ -3,14 +3,12 @@
   "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
   "ByronGenesisFile": "mainnet-byron-genesis.json",
   "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
-  "ConwayGenesisFile": "mainnet-conway-genesis.json",
-  "ConwayGenesisHash": "91bedad42212c07f6abdafedb7e7c8577fbd07152c695ffae1ab2a528741c6e4",
   "EnableP2P": true,
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 0,
   "MaxKnownMajorProtocolVersion": 2,
-  "MinNodeVersion": "8.11.0",
+  "MinNodeVersion": "8.12.0",
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresNoMagic",
diff --git a/configuration/cardano/mainnet-config.yaml b/configuration/cardano/mainnet-config.yaml
index 343b4e2b9bd..0646c238158 100644
--- a/configuration/cardano/mainnet-config.yaml
+++ b/configuration/cardano/mainnet-config.yaml
@@ -7,8 +7,6 @@ AlonzoGenesisFile: mainnet-alonzo-genesis.json
 AlonzoGenesisHash: 7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874
 ByronGenesisFile: mainnet-byron-genesis.json
 ByronGenesisHash: 5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb
-ConwayGenesisFile: mainnet-conway-genesis.json
-ConwayGenesisHash: 91bedad42212c07f6abdafedb7e7c8577fbd07152c695ffae1ab2a528741c6e4
 ShelleyGenesisFile: mainnet-shelley-genesis.json
 ShelleyGenesisHash: 1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81
 
@@ -42,7 +40,7 @@ TargetNumberOfRootPeers: 60
 
 ##### Version Information #####
 
-MinNodeVersion: 8.11.0
+MinNodeVersion: 8.12.0
 
 ##### Logging configuration #####
 
diff --git a/configuration/cardano/mainnet-conway-genesis.json b/configuration/cardano/mainnet-conway-genesis.json
deleted file mode 100644
index 07caef68754..00000000000
--- a/configuration/cardano/mainnet-conway-genesis.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-  "poolVotingThresholds": {
-    "committeeNormal": 0.60,
-    "committeeNoConfidence": 0.51,
-    "hardForkInitiation": 0.51,
-    "motionNoConfidence": 0.60,
-    "ppSecurityGroup": 0.60
-  },
-  "dRepVotingThresholds": {
-    "motionNoConfidence": 0.67,
-    "committeeNormal": 0.67,
-    "committeeNoConfidence": 0.60,
-    "updateToConstitution": 0.75,
-    "hardForkInitiation": 0.60,
-    "ppNetworkGroup": 0.67,
-    "ppEconomicGroup": 0.67,
-    "ppTechnicalGroup": 0.67,
-    "ppGovGroup": 0.75,
-    "treasuryWithdrawal": 0.67
-  },
-  "committeeMinSize": 7,
-  "committeeMaxTermLength": 73,
-  "govActionLifetime": 6,
-  "govActionDeposit": 50000000000,
-  "dRepDeposit": 500000000,
-  "dRepActivity": 20,
-  "minFeeRefScriptCostPerByte": 44,
-  "constitution": {
-    "anchor": {
-      "url": "",
-      "dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
-    }
-  },
-  "committee": {
-    "members": {
-    },
-    "threshold": 0.67
-  },
-  "plutusV3CostModel": [
-    100788,
-    420,
-    1,
-    1,
-    1000,
-    173,
-    0,
-    1,
-    1000,
-    59957,
-    4,
-    1,
-    11183,
-    32,
-    207616,
-    8310,
-    4,
-    201305,
-    8356,
-    4,
-    962335,
-    18,
-    2780678,
-    6,
-    442008,
-    1,
-    52538055,
-    3756,
-    18,
-    267929,
-    18,
-    76433006,
-    8868,
-    18,
-    52948122,
-    18,
-    1995836,
-    36,
-    3227919,
-    12,
-    901022,
-    1,
-    166917843,
-    4307,
-    36,
-    284546,
-    36,
-    158221314,
-    26549,
-    36,
-    74698472,
-    36,
-    333849714,
-    1,
-    254006273,
-    72,
-    2174038,
-    72,
-    1006041,
-    43623,
-    251,
-    0,
-    1,
-    16000,
-    100,
-    16000,
-    100,
-    16000,
-    100,
-    16000,
-    100,
-    16000,
-    100,
-    16000,
-    100,
-    16000,
-    100,
-    16000,
-    100,
-    100,
-    100,
-    16000,
-    100,
-    94375,
-    32,
-    132994,
-    32,
-    61462,
-    4,
-    72010,
-    178,
-    0,
-    1,
-    22151,
-    32,
-    91189,
-    769,
-    4,
-    2,
-    85848,
-    228465,
-    122,
-    0,
-    1,
-    1,
-    1000,
-    42921,
-    4,
-    2,
-    24548,
-    29498,
-    38,
-    1,
-    898148,
-    27279,
-    1,
-    51775,
-    558,
-    1,
-    39184,
-    1000,
-    60594,
-    1,
-    141895,
-    32,
-    83150,
-    32,
-    15299,
-    32,
-    76049,
-    1,
-    13169,
-    4,
-    1293828,
-    28716,
-    63,
-    0,
-    1,
-    2261318,
-    64571,
-    4,
-    22100,
-    10,
-    28999,
-    74,
-    1,
-    28999,
-    74,
-    1,
-    43285,
-    552,
-    1,
-    44749,
-    541,
-    1,
-    33852,
-    32,
-    68246,
-    32,
-    72362,
-    32,
-    7243,
-    32,
-    7391,
-    32,
-    11546,
-    32,
-    85848,
-    228465,
-    122,
-    0,
-    1,
-    1,
-    90434,
-    519,
-    0,
-    1,
-    74433,
-    32,
-    85848,
-    228465,
-    122,
-    0,
-    1,
-    1,
-    85848,
-    228465,
-    122,
-    0,
-    1,
-    1,
-    955506,
-    213312,
-    0,
-    2,
-    270652,
-    22588,
-    4,
-    1457325,
-    64566,
-    4,
-    20467,
-    1,
-    4,
-    0,
-    141992,
-    32,
-    100788,
-    420,
-    1,
-    1,
-    81663,
-    32,
-    59498,
-    32,
-    20142,
-    32,
-    24588,
-    32,
-    20744,
-    32,
-    25933,
-    32,
-    24623,
-    32,
-    43053543,
-    10,
-    53384111,
-    14333,
-    10,
-    43574283,
-    26308,
-    10
-  ]
-}
diff --git a/configuration/cardano/shelley_qa-config.json b/configuration/cardano/shelley_qa-config.json
index fdecc0a704b..0c9406bfcb5 100644
--- a/configuration/cardano/shelley_qa-config.json
+++ b/configuration/cardano/shelley_qa-config.json
@@ -11,7 +11,7 @@
   "LastKnownBlockVersion-Alt": 0,
   "LastKnownBlockVersion-Major": 3,
   "LastKnownBlockVersion-Minor": 1,
-  "MinNodeVersion": "8.11.0",
+  "MinNodeVersion": "8.12.0",
   "PeerSharing": true,
   "Protocol": "Cardano",
   "RequiresNetworkMagic": "RequiresMagic",
diff --git a/configuration/cardano/update-config-files.sh b/configuration/cardano/update-config-files.sh
index 24cd62e105d..9e81b72b84a 100755
--- a/configuration/cardano/update-config-files.sh
+++ b/configuration/cardano/update-config-files.sh
@@ -16,7 +16,6 @@ echo "#################"
 echo "# Copying files #"
 echo "#################"
 
-copyFile "mainnet-conway-genesis.json"
 copyFile "mainnet-alonzo-genesis.json"
 copyFile "mainnet-byron-genesis.json"
 copyFile "mainnet-config.json"
diff --git a/nix/binary-release.nix b/nix/binary-release.nix
index 4927a95bb6c..aa61fdcfa44 100644
--- a/nix/binary-release.nix
+++ b/nix/binary-release.nix
@@ -21,17 +21,18 @@ let
     [ "mainnet" "preprod" "preview" "sanchonet" ]
     pkgs.cardanoLib.environments;
 
-  genesisAttrs = {
-    # File references point to the nix store, so we need to rewrite them
-    # as relative paths
-    ByronGenesisFile =  "byron-genesis.json";
-    ShelleyGenesisFile = "shelley-genesis.json";
-    AlonzoGenesisFile = "alonzo-genesis.json";
-    ConwayGenesisFile = "conway-genesis.json";
-  };
 
   writeConfig = name: env:
     let
+      genesisAttrs = {
+        # File references point to the nix store, so we need to rewrite them
+        # as relative paths
+        ByronGenesisFile =  "byron-genesis.json";
+        ShelleyGenesisFile = "shelley-genesis.json";
+        AlonzoGenesisFile = "alonzo-genesis.json";
+      } // lib.optionalAttrs (env.nodeConfig ? ConwayGenesisFile) {
+        ConwayGenesisFile = "conway-genesis.json";
+      };
       nodeConfig = pkgs.writeText
         "config.json"
         (builtins.toJSON
@@ -46,7 +47,7 @@ let
 
       # Genesis files are the same for env.nodeConfig and env.nodeConfigBp
       inherit (env.nodeConfig)
-        ByronGenesisFile ShelleyGenesisFile AlonzoGenesisFile ConwayGenesisFile;
+        ByronGenesisFile ShelleyGenesisFile AlonzoGenesisFile;
     in
       # Format the node config file and copy the genesis files
       ''
@@ -63,9 +64,11 @@ let
         cp -n --remove-destination -v \
           "${AlonzoGenesisFile}" \
            share/${name}/alonzo-genesis.json
+        ${lib.optionalString (env.nodeConfig ? ConwayGenesisFile) ''
         cp -n --remove-destination -v \
-          "${ConwayGenesisFile}" \
+          "${env.nodeConfig.ConwayGenesisFile}" \
            share/${name}/conway-genesis.json
+        ''}
       '';
 
 in pkgs.runCommand name {
diff --git a/nix/haskell.nix b/nix/haskell.nix
index 305a6026850..75bf94df7ee 100644
--- a/nix/haskell.nix
+++ b/nix/haskell.nix
@@ -119,10 +119,12 @@ let
             packages.cardano-ledger-alonzo.components.library.doHaddock = false;
             packages.cardano-ledger-api.components.library.doHaddock = false;
             packages.cardano-ledger-babbage.components.library.doHaddock = false;
+            packages.cardano-ledger-core.components.library.doHaddock = false;
             packages.cardano-ledger-conway.components.library.doHaddock = false;
             packages.cardano-ledger-shelley.components.library.doHaddock = false;
             packages.cardano-protocol-tpraos.components.library.doHaddock = false;
             packages.ouroboros-consensus-cardano.components.library.doHaddock = false;
+            packages.ouroboros-consensus.components.library.doHaddock = false;
           })
           ({ lib, pkgs, ...}: lib.mkIf (pkgs.stdenv.hostPlatform.isWindows) {
             # Remvoe this once mingwx is mapped to null in haskell.nix (haskell.nix#2032), and we bumped _past_ that.
@@ -191,7 +193,8 @@ let
                 "configuration/cardano/mainnet-byron-genesis.json"
                 "configuration/cardano/mainnet-shelley-genesis.json"
                 "configuration/cardano/mainnet-alonzo-genesis.json"
-                "configuration/cardano/mainnet-conway-genesis.json"
+                # uncomment after mainnet conway genesis is finalized
+                #"configuration/cardano/mainnet-conway-genesis.json"
               ];
               cardanoTestnetGoldenFiles = [
                 "configuration/defaults/byron-mainnet"
diff --git a/nix/workbench/profile/pparams/delta-v9-preview.jq b/nix/workbench/profile/pparams/delta-v9-preview.jq
index d123848b4f4..8719392d081 100644
--- a/nix/workbench/profile/pparams/delta-v9-preview.jq
+++ b/nix/workbench/profile/pparams/delta-v9-preview.jq
@@ -6,247 +6,6 @@ def delta:
       "major": 9
     },
   },
-  "costModels": {
-    "PlutusV1": {
-    },
-    "PlutusV2": {
-    },
-    "PlutusV3": {
-      "addInteger-cpu-arguments-intercept": 100788,
-      "addInteger-cpu-arguments-slope": 420,
-      "addInteger-memory-arguments-intercept": 1,
-      "addInteger-memory-arguments-slope": 1,
-      "appendByteString-cpu-arguments-intercept": 1000,
-      "appendByteString-cpu-arguments-slope": 173,
-      "appendByteString-memory-arguments-intercept": 0,
-      "appendByteString-memory-arguments-slope": 1,
-      "appendString-cpu-arguments-intercept": 1000,
-      "appendString-cpu-arguments-slope": 59957,
-      "appendString-memory-arguments-intercept": 4,
-      "appendString-memory-arguments-slope": 1,
-      "bData-cpu-arguments": 11183,
-      "bData-memory-arguments": 32,
-      "blake2b_224-cpu-arguments-intercept": 207616,
-      "blake2b_224-cpu-arguments-slope": 8310,
-      "blake2b_224-memory-arguments": 4,
-      "blake2b_256-cpu-arguments-intercept": 201305,
-      "blake2b_256-cpu-arguments-slope": 8356,
-      "blake2b_256-memory-arguments": 4,
-      "bls12_381_G1_add-cpu-arguments": 962335,
-      "bls12_381_G1_add-memory-arguments": 18,
-      "bls12_381_G1_compress-cpu-arguments": 2780678,
-      "bls12_381_G1_compress-memory-arguments": 6,
-      "bls12_381_G1_equal-cpu-arguments": 442008,
-      "bls12_381_G1_equal-memory-arguments": 1,
-      "bls12_381_G1_hashToGroup-cpu-arguments-intercept": 52538055,
-      "bls12_381_G1_hashToGroup-cpu-arguments-slope": 3756,
-      "bls12_381_G1_hashToGroup-memory-arguments": 18,
-      "bls12_381_G1_neg-cpu-arguments": 267929,
-      "bls12_381_G1_neg-memory-arguments": 18,
-      "bls12_381_G1_scalarMul-cpu-arguments-intercept": 76433006,
-      "bls12_381_G1_scalarMul-cpu-arguments-slope": 8868,
-      "bls12_381_G1_scalarMul-memory-arguments": 18,
-      "bls12_381_G1_uncompress-cpu-arguments": 52948122,
-      "bls12_381_G1_uncompress-memory-arguments": 18,
-      "bls12_381_G2_add-cpu-arguments": 1995836,
-      "bls12_381_G2_add-memory-arguments": 36,
-      "bls12_381_G2_compress-cpu-arguments": 3227919,
-      "bls12_381_G2_compress-memory-arguments": 12,
-      "bls12_381_G2_equal-cpu-arguments": 901022,
-      "bls12_381_G2_equal-memory-arguments": 1,
-      "bls12_381_G2_hashToGroup-cpu-arguments-intercept": 166917843,
-      "bls12_381_G2_hashToGroup-cpu-arguments-slope": 4307,
-      "bls12_381_G2_hashToGroup-memory-arguments": 36,
-      "bls12_381_G2_neg-cpu-arguments": 284546,
-      "bls12_381_G2_neg-memory-arguments": 36,
-      "bls12_381_G2_scalarMul-cpu-arguments-intercept": 158221314,
-      "bls12_381_G2_scalarMul-cpu-arguments-slope": 26549,
-      "bls12_381_G2_scalarMul-memory-arguments": 36,
-      "bls12_381_G2_uncompress-cpu-arguments": 74698472,
-      "bls12_381_G2_uncompress-memory-arguments": 36,
-      "bls12_381_finalVerify-cpu-arguments": 333849714,
-      "bls12_381_finalVerify-memory-arguments": 1,
-      "bls12_381_millerLoop-cpu-arguments": 254006273,
-      "bls12_381_millerLoop-memory-arguments": 72,
-      "bls12_381_mulMlResult-cpu-arguments": 2174038,
-      "bls12_381_mulMlResult-memory-arguments": 72,
-      "byteStringToInteger-cpu-arguments-c0": 1006041,
-      "byteStringToInteger-cpu-arguments-c1": 43623,
-      "byteStringToInteger-cpu-arguments-c2": 251,
-      "byteStringToInteger-memory-arguments-intercept": 0,
-      "byteStringToInteger-memory-arguments-slope": 1,
-      "cekApplyCost-exBudgetCPU": 16000,
-      "cekApplyCost-exBudgetMemory": 100,
-      "cekBuiltinCost-exBudgetCPU": 16000,
-      "cekBuiltinCost-exBudgetMemory": 100,
-      "cekCaseCost-exBudgetCPU": 16000,
-      "cekCaseCost-exBudgetMemory": 100,
-      "cekConstCost-exBudgetCPU": 16000,
-      "cekConstCost-exBudgetMemory": 100,
-      "cekConstrCost-exBudgetCPU": 16000,
-      "cekConstrCost-exBudgetMemory": 100,
-      "cekDelayCost-exBudgetCPU": 16000,
-      "cekDelayCost-exBudgetMemory": 100,
-      "cekForceCost-exBudgetCPU": 16000,
-      "cekForceCost-exBudgetMemory": 100,
-      "cekLamCost-exBudgetCPU": 16000,
-      "cekLamCost-exBudgetMemory": 100,
-      "cekStartupCost-exBudgetCPU": 100,
-      "cekStartupCost-exBudgetMemory": 100,
-      "cekVarCost-exBudgetCPU": 16000,
-      "cekVarCost-exBudgetMemory": 100,
-      "chooseData-cpu-arguments": 94375,
-      "chooseData-memory-arguments": 32,
-      "chooseList-cpu-arguments": 132994,
-      "chooseList-memory-arguments": 32,
-      "chooseUnit-cpu-arguments": 61462,
-      "chooseUnit-memory-arguments": 4,
-      "consByteString-cpu-arguments-intercept": 72010,
-      "consByteString-cpu-arguments-slope": 178,
-      "consByteString-memory-arguments-intercept": 0,
-      "consByteString-memory-arguments-slope": 1,
-      "constrData-cpu-arguments": 22151,
-      "constrData-memory-arguments": 32,
-      "decodeUtf8-cpu-arguments-intercept": 91189,
-      "decodeUtf8-cpu-arguments-slope": 769,
-      "decodeUtf8-memory-arguments-intercept": 4,
-      "decodeUtf8-memory-arguments-slope": 2,
-      "divideInteger-cpu-arguments-constant": 85848,
-      "divideInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "divideInteger-cpu-arguments-model-arguments-slope": 122,
-      "divideInteger-memory-arguments-intercept": 0,
-      "divideInteger-memory-arguments-minimum": 1,
-      "divideInteger-memory-arguments-slope": 1,
-      "encodeUtf8-cpu-arguments-intercept": 1000,
-      "encodeUtf8-cpu-arguments-slope": 42921,
-      "encodeUtf8-memory-arguments-intercept": 4,
-      "encodeUtf8-memory-arguments-slope": 2,
-      "equalsByteString-cpu-arguments-constant": 24548,
-      "equalsByteString-cpu-arguments-intercept": 29498,
-      "equalsByteString-cpu-arguments-slope": 38,
-      "equalsByteString-memory-arguments": 1,
-      "equalsData-cpu-arguments-intercept": 898148,
-      "equalsData-cpu-arguments-slope": 27279,
-      "equalsData-memory-arguments": 1,
-      "equalsInteger-cpu-arguments-intercept": 51775,
-      "equalsInteger-cpu-arguments-slope": 558,
-      "equalsInteger-memory-arguments": 1,
-      "equalsString-cpu-arguments-constant": 39184,
-      "equalsString-cpu-arguments-intercept": 1000,
-      "equalsString-cpu-arguments-slope": 60594,
-      "equalsString-memory-arguments": 1,
-      "fstPair-cpu-arguments": 141895,
-      "fstPair-memory-arguments": 32,
-      "headList-cpu-arguments": 83150,
-      "headList-memory-arguments": 32,
-      "iData-cpu-arguments": 15299,
-      "iData-memory-arguments": 32,
-      "ifThenElse-cpu-arguments": 76049,
-      "ifThenElse-memory-arguments": 1,
-      "indexByteString-cpu-arguments": 13169,
-      "indexByteString-memory-arguments": 4,
-      "integerToByteString-cpu-arguments-c0": 1293828,
-      "integerToByteString-cpu-arguments-c1": 28716,
-      "integerToByteString-cpu-arguments-c2": 63,
-      "integerToByteString-memory-arguments-intercept": 0,
-      "integerToByteString-memory-arguments-slope": 1,
-      "keccak_256-cpu-arguments-intercept": 2261318,
-      "keccak_256-cpu-arguments-slope": 64571,
-      "keccak_256-memory-arguments": 4,
-      "lengthOfByteString-cpu-arguments": 22100,
-      "lengthOfByteString-memory-arguments": 10,
-      "lessThanByteString-cpu-arguments-intercept": 28999,
-      "lessThanByteString-cpu-arguments-slope": 74,
-      "lessThanByteString-memory-arguments": 1,
-      "lessThanEqualsByteString-cpu-arguments-intercept": 28999,
-      "lessThanEqualsByteString-cpu-arguments-slope": 74,
-      "lessThanEqualsByteString-memory-arguments": 1,
-      "lessThanEqualsInteger-cpu-arguments-intercept": 43285,
-      "lessThanEqualsInteger-cpu-arguments-slope": 552,
-      "lessThanEqualsInteger-memory-arguments": 1,
-      "lessThanInteger-cpu-arguments-intercept": 44749,
-      "lessThanInteger-cpu-arguments-slope": 541,
-      "lessThanInteger-memory-arguments": 1,
-      "listData-cpu-arguments": 33852,
-      "listData-memory-arguments": 32,
-      "mapData-cpu-arguments": 68246,
-      "mapData-memory-arguments": 32,
-      "mkCons-cpu-arguments": 72362,
-      "mkCons-memory-arguments": 32,
-      "mkNilData-cpu-arguments": 7243,
-      "mkNilData-memory-arguments": 32,
-      "mkNilPairData-cpu-arguments": 7391,
-      "mkNilPairData-memory-arguments": 32,
-      "mkPairData-cpu-arguments": 11546,
-      "mkPairData-memory-arguments": 32,
-      "modInteger-cpu-arguments-constant": 85848,
-      "modInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "modInteger-cpu-arguments-model-arguments-slope": 122,
-      "modInteger-memory-arguments-intercept": 0,
-      "modInteger-memory-arguments-minimum": 1,
-      "modInteger-memory-arguments-slope": 1,
-      "multiplyInteger-cpu-arguments-intercept": 90434,
-      "multiplyInteger-cpu-arguments-slope": 519,
-      "multiplyInteger-memory-arguments-intercept": 0,
-      "multiplyInteger-memory-arguments-slope": 1,
-      "nullList-cpu-arguments": 74433,
-      "nullList-memory-arguments": 32,
-      "quotientInteger-cpu-arguments-constant": 85848,
-      "quotientInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "quotientInteger-cpu-arguments-model-arguments-slope": 122,
-      "quotientInteger-memory-arguments-intercept": 0,
-      "quotientInteger-memory-arguments-minimum": 1,
-      "quotientInteger-memory-arguments-slope": 1,
-      "remainderInteger-cpu-arguments-constant": 85848,
-      "remainderInteger-cpu-arguments-model-arguments-intercept": 228465,
-      "remainderInteger-cpu-arguments-model-arguments-slope": 122,
-      "remainderInteger-memory-arguments-intercept": 0,
-      "remainderInteger-memory-arguments-minimum": 1,
-      "remainderInteger-memory-arguments-slope": 1,
-      "serialiseData-cpu-arguments-intercept": 955506,
-      "serialiseData-cpu-arguments-slope": 213312,
-      "serialiseData-memory-arguments-intercept": 0,
-      "serialiseData-memory-arguments-slope": 2,
-      "sha2_256-cpu-arguments-intercept": 270652,
-      "sha2_256-cpu-arguments-slope": 22588,
-      "sha2_256-memory-arguments": 4,
-      "sha3_256-cpu-arguments-intercept": 1457325,
-      "sha3_256-cpu-arguments-slope": 64566,
-      "sha3_256-memory-arguments": 4,
-      "sliceByteString-cpu-arguments-intercept": 20467,
-      "sliceByteString-cpu-arguments-slope": 1,
-      "sliceByteString-memory-arguments-intercept": 4,
-      "sliceByteString-memory-arguments-slope": 0,
-      "sndPair-cpu-arguments": 141992,
-      "sndPair-memory-arguments": 32,
-      "subtractInteger-cpu-arguments-intercept": 100788,
-      "subtractInteger-cpu-arguments-slope": 420,
-      "subtractInteger-memory-arguments-intercept": 1,
-      "subtractInteger-memory-arguments-slope": 1,
-      "tailList-cpu-arguments": 81663,
-      "tailList-memory-arguments": 32,
-      "trace-cpu-arguments": 59498,
-      "trace-memory-arguments": 32,
-      "unBData-cpu-arguments": 20142,
-      "unBData-memory-arguments": 32,
-      "unConstrData-cpu-arguments": 24588,
-      "unConstrData-memory-arguments": 32,
-      "unIData-cpu-arguments": 20744,
-      "unIData-memory-arguments": 32,
-      "unListData-cpu-arguments": 25933,
-      "unListData-memory-arguments": 32,
-      "unMapData-cpu-arguments": 24623,
-      "unMapData-memory-arguments": 32,
-      "verifyEcdsaSecp256k1Signature-cpu-arguments": 43053543,
-      "verifyEcdsaSecp256k1Signature-memory-arguments": 10,
-      "verifyEd25519Signature-cpu-arguments-intercept": 53384111,
-      "verifyEd25519Signature-cpu-arguments-slope": 14333,
-      "verifyEd25519Signature-memory-arguments": 10,
-      "verifySchnorrSecp256k1Signature-cpu-arguments-intercept": 43574283,
-      "verifySchnorrSecp256k1Signature-cpu-arguments-slope": 26308,
-      "verifySchnorrSecp256k1Signature-memory-arguments": 10
-    }
-  },
   "conway": {
     "plutusV3CostModel":
       [
@@ -300,8 +59,13 @@ def delta:
         4,
         2,
         85848,
-        228465,
-        122,
+        123203,
+        7305,
+        -900,
+        1716,
+        549,
+        57,
+        85848,
         0,
         1,
         1,
@@ -360,11 +124,15 @@ def delta:
         11546,
         32,
         85848,
-        228465,
-        122,
+        123203,
+        7305,
+        -900,
+        1716,
+        549,
+        57,
+        85848,
         0,
         1,
-        1,
         90434,
         519,
         0,
@@ -372,17 +140,26 @@ def delta:
         74433,
         32,
         85848,
-        228465,
-        122,
+        123203,
+        7305,
+        -900,
+        1716,
+        549,
+        57,
+        85848,
         0,
         1,
         1,
         85848,
-        228465,
-        122,
+        123203,
+        7305,
+        -900,
+        1716,
+        549,
+        57,
+        85848,
         0,
         1,
-        1,
         955506,
         213312,
         0,
diff --git a/nix/workbench/profile/pparams/epoch-timeline.jq b/nix/workbench/profile/pparams/epoch-timeline.jq
index 322e8dafc52..8e00e3fec81 100644
--- a/nix/workbench/profile/pparams/epoch-timeline.jq
+++ b/nix/workbench/profile/pparams/epoch-timeline.jq
@@ -596,6 +596,24 @@ def epochs:
         "verifySchnorrSecp256k1Signature-memory-arguments": 10
       }
     }
+  },
+  "492": {
+    "epoch": 492,
+    "description": "V2 Cost Model - new mandatory parameters - speculative/not yet deployed",
+    "costModels": {
+      "PlutusV2": {
+        "byteStringToInteger-cpu-arguments-c0": 1006041,
+        "byteStringToInteger-cpu-arguments-c1": 43623,
+        "byteStringToInteger-cpu-arguments-c2": 251,
+        "byteStringToInteger-memory-arguments-intercept": 0,
+        "byteStringToInteger-memory-arguments-slope": 1,
+        "integerToByteString-cpu-arguments-c0": 1293828,
+        "integerToByteString-cpu-arguments-c1": 28716,
+        "integerToByteString-cpu-arguments-c2": 63,
+        "integerToByteString-memory-arguments-intercept": 0,
+        "integerToByteString-memory-arguments-slope": 1
+      }
+    }
   }
 };
 
diff --git a/scripts/babbage/alonzo-babbage-test-genesis.json b/scripts/babbage/alonzo-babbage-test-genesis.json
index 5ef1a3901a9..56f623e1561 100644
--- a/scripts/babbage/alonzo-babbage-test-genesis.json
+++ b/scripts/babbage/alonzo-babbage-test-genesis.json
@@ -365,7 +365,17 @@
             "verifyEd25519Signature-memory-arguments": 10,
             "verifySchnorrSecp256k1Signature-cpu-arguments-intercept": 38887044,
             "verifySchnorrSecp256k1Signature-cpu-arguments-slope": 32947,
-            "verifySchnorrSecp256k1Signature-memory-arguments": 10
+            "verifySchnorrSecp256k1Signature-memory-arguments": 10,
+            "byteStringToInteger-cpu-arguments-c0": 0,
+            "byteStringToInteger-cpu-arguments-c1": 0,
+            "byteStringToInteger-cpu-arguments-c2": 0,
+            "byteStringToInteger-memory-arguments-intercept": 0,
+            "byteStringToInteger-memory-arguments-slope": 0,
+            "integerToByteString-cpu-arguments-c0": 0,
+            "integerToByteString-cpu-arguments-c1": 0,
+            "integerToByteString-cpu-arguments-c2": 0,
+            "integerToByteString-memory-arguments-intercept": 0,
+            "integerToByteString-memory-arguments-slope": 0
         }
     }
 }
diff --git a/scripts/babbage/conway-babbage-test-genesis.json b/scripts/babbage/conway-babbage-test-genesis.json
index f27ec351592..71990b818f8 100644
--- a/scripts/babbage/conway-babbage-test-genesis.json
+++ b/scripts/babbage/conway-babbage-test-genesis.json
@@ -25,7 +25,7 @@
   "dRepDeposit": 2000000,
   "dRepActivity": 20,
   "minFeeRefScriptCostPerByte": 0,
-  "plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+  "plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
   "constitution": {
     "anchor": {
       "url": "",
diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal
index 340581c9aec..0ffb12ee123 100644
--- a/trace-dispatcher/trace-dispatcher.cabal
+++ b/trace-dispatcher/trace-dispatcher.cabal
@@ -60,7 +60,7 @@ library
                       , hostname
                       , network
                       , optparse-applicative-fork
-                      , ouroboros-network ^>= 0.16
+                      , ouroboros-network ^>= 0.16.1
                       , ouroboros-network-api
                       , ouroboros-network-framework
                       , serialise
diff --git a/trace-forward/trace-forward.cabal b/trace-forward/trace-forward.cabal
index 5724261043a..4b1eaa04ff0 100644
--- a/trace-forward/trace-forward.cabal
+++ b/trace-forward/trace-forward.cabal
@@ -64,7 +64,7 @@ library
                       , deepseq
                       , extra
                       , io-classes
-                      , ouroboros-network-api ^>= 0.7.1
+                      , ouroboros-network-api ^>= 0.7.3
                       , ouroboros-network-framework
                       , serialise
                       , stm

From 9d2a2ad12e36bb45861813ee1b1ab55a495db120 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Thu, 20 Jun 2024 16:12:31 -0400
Subject: [PATCH 4/5] cardano-node: bump version to 8.12

---
 cardano-node-chairman/cardano-node-chairman.cabal | 4 ++--
 cardano-node/cardano-node.cabal                   | 8 ++++----
 cardano-submit-api/cardano-submit-api.cabal       | 2 +-
 cardano-testnet/cardano-testnet.cabal             | 2 +-
 trace-dispatcher/trace-dispatcher.cabal           | 2 +-
 trace-forward/trace-forward.cabal                 | 2 +-
 trace-resources/trace-resources.cabal             | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
index fc1e36cbf93..735183efd4a 100644
--- a/cardano-node-chairman/cardano-node-chairman.cabal
+++ b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node-chairman
-version:                8.11.0
+version:                8.12.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -44,7 +44,7 @@ executable cardano-node-chairman
   build-depends:        cardano-api
                       , cardano-crypto-class
                       , cardano-git-rev ^>=0.2.2
-                      , cardano-node ^>= 8.11
+                      , cardano-node ^>= 8.12
                       , cardano-prelude
                       , containers
                       , contra-tracer
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
index e1bbffc7e96..9807376370d 100644
--- a/cardano-node/cardano-node.cabal
+++ b/cardano-node/cardano-node.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                8.11.0
+version:                8.12.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -205,9 +205,9 @@ library
                       , strict-sop-core
                       , strict-stm
                       , time
-                      , trace-dispatcher ^>= 2.5.7
-                      , trace-forward ^>= 2.2.5
-                      , trace-resources ^>= 0.2.1
+                      , trace-dispatcher ^>= 2.5.8
+                      , trace-forward ^>= 2.2.6
+                      , trace-resources ^>= 0.2.2
                       , tracer-transformers
                       , transformers
                       , transformers-except
diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
index b6f64b7d940..bd904d2c815 100644
--- a/cardano-submit-api/cardano-submit-api.cabal
+++ b/cardano-submit-api/cardano-submit-api.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-submit-api
-version:                8.11.0
+version:                8.12.0
 synopsis:               A web server that allows transactions to be POSTed to the cardano chain
 description:            A web server that allows transactions to be POSTed to the cardano chain.
 homepage:               https://github.com/intersectmbo/cardano-node
diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
index eae7be91d17..a87c80bf840 100644
--- a/cardano-testnet/cardano-testnet.cabal
+++ b/cardano-testnet/cardano-testnet.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-testnet
-version:                8.11.0
+version:                8.12.0
 synopsis:               The cardano full node
 description:            The cardano full node.
 copyright:              2021-2023 Input Output Global Inc (IOG), 2023-2024 Intersect.
diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal
index 0ffb12ee123..55719509d8f 100644
--- a/trace-dispatcher/trace-dispatcher.cabal
+++ b/trace-dispatcher/trace-dispatcher.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   trace-dispatcher
-version:                2.5.7
+version:                2.5.8
 synopsis:               Tracers for Cardano
 description:            Package for development of simple and efficient tracers
                         based on the arrow based contra-tracer package
diff --git a/trace-forward/trace-forward.cabal b/trace-forward/trace-forward.cabal
index 4b1eaa04ff0..6a9c67a7972 100644
--- a/trace-forward/trace-forward.cabal
+++ b/trace-forward/trace-forward.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   trace-forward
-version:                2.2.5
+version:                2.2.6
 synopsis:               The forwarding protocols library for cardano node.
 description:            The library providing typed protocols for forwarding different
                         information from the cardano node to an external application.
diff --git a/trace-resources/trace-resources.cabal b/trace-resources/trace-resources.cabal
index a9f1cd6c23b..80b07411f02 100644
--- a/trace-resources/trace-resources.cabal
+++ b/trace-resources/trace-resources.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   trace-resources
-version:                0.2.1.0
+version:                0.2.2.0
 synopsis:               Package for tracing resources for linux, mac and windows
 description:            Package for tracing resources for linux, mac and windows.
 category:               Cardano,

From d5529f2c0b6fea8ab215509670072e8669c3dade Mon Sep 17 00:00:00 2001
From: Sean D Gillespie <sean.gillespie@iohk.io>
Date: Thu, 20 Jun 2024 16:23:40 -0400
Subject: [PATCH 5/5] fix: Temporarily add cardano-testnet-test to non-required
 aggregate

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index a68c34937c4..1b37fe287b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -341,6 +341,7 @@
             lib.optionals (system == "x86_64-darwin") [
               #FIXME: make variants nonrequired for macos until CI has more capacity for macos builds
               "native\\.variants\\..*"
+              "native\\.checks/cardano-testnet/cardano-testnet-test"
             ];
           in
           pkgs.callPackages iohkNix.utils.ciJobsAggregates