[wip] Integrate no bytes block

README.md

@@ -1,9 +1,9 @@
 # Ouroboros Consensus
 
 [![consensus](https://img.shields.io/badge/ouroboros--consensus-0.22.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.22.0.0/)
-[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.19.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.19.0.0/)
+[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.20.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.20.0.0/)
 [![protocol](https://img.shields.io/badge/ouroboros--consensus--protocol-0.10.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-protocol-0.10.0.0/)
-[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.21.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.21.0.0/)
+[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.21.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.21.0.1/)
 [![sop-extras](https://img.shields.io/badge/sop--extras-0.2.1.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.1.0/)
 [![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.2.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.2.0/)
 

cabal.project

@@ -14,9 +14,9 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2024-12-10T16:20:07Z
+  , hackage.haskell.org 2025-01-14T00:25:08Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2025-02-04T06:43:15Z
+  , cardano-haskell-packages 2025-02-26T16:38:34Z
 
 packages:
   ouroboros-consensus
@@ -44,3 +44,62 @@ package ouroboros-network
 if(os(windows))
   constraints:
     bitvec -simd
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-base
+  tag: b2cec3fbcde4bacb9c961e5510d5a1d3754c4e2b
+  --sha256: sha256-TDEBINZ3SkhpRNomMdt53bR3gdzgkWR9jIlAr8yrU6o=
+  subdir:
+      cardano-crypto-class
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-ledger
+  -- This tag is from Alexey's PR that is based on an older version
+  -- tag: 9d380ab7d6ae52ff66aae9a19dbb3036b1b13c94
+  -- This tag is before genIssuerKeys
+  -- tag: 4b2721c8abdf704c6f8de042e8fb1f3f6b3f1aed
+  -- This tag is before parameterising KeySpace and GenEnv over some (Crypto c)
+  -- tag: a0d93ad3134a8c5fe04ddaacffdaf39e1af8b8cf
+  tag: e3fa55fccd30ff6c048764a447368f23d809487e
+  --sha256: sha256-qaoVERbGDGqMMuY1b90GQ31F5QxrgE1u04TEMRSMX4I=
+  subdir:
+      eras/allegra/impl
+      eras/alonzo/impl
+      eras/alonzo/test-suite
+      eras/babbage/impl
+      eras/babbage/test-suite
+      eras/byron/chain/executable-spec
+      eras/byron/crypto
+      eras/byron/crypto/test
+      eras/byron/ledger/executable-spec
+      eras/byron/ledger/impl
+      eras/byron/ledger/impl/test
+      eras/conway/impl
+      eras/conway/test-suite
+      eras/mary/impl
+      eras/shelley/impl
+      eras/shelley-ma/test-suite
+      eras/shelley/test-suite
+      libs/cardano-data
+      libs/cardano-ledger-api
+      libs/cardano-ledger-binary
+      libs/cardano-ledger-core
+      libs/cardano-ledger-test
+      libs/cardano-protocol-tpraos
+      libs/constrained-generators
+      libs/non-integral
+      libs/set-algebra
+      libs/small-steps
+      libs/vector-map
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/plutus
+  tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168
+  --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M=
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx

flake.nix

@@ -16,7 +16,7 @@
       inputs.hackage.follows = "hackageNix";
     };
     hackageNix = {
-      url = "github:input-output-hk/hackage.nix";
+      url = "github:input-output-hk/hackage.nix?ref=for-stackage";
       flake = false;
     };
     CHaP = {

ouroboros-consensus-cardano/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 # Changelog entries
 
+<a id='changelog-0.21.0.1'></a>
+## 0.21.0.1 — 2025-02-10
+
+### Patch
+
+- Bump to ouroboros-network-framework 0.16.
+
 <a id='changelog-0.21.0.0'></a>
 ## 0.21.0.0 — 2025-01-08
 

ouroboros-consensus-cardano/changelog.d/20250213_115925_fraser.murray_localtxmonitor_measures.md

@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Add instances for `TxMeasureMetrics` to Cardano block types
+

ouroboros-consensus-cardano/changelog.d/20250214_122220_jasataco_sts.md

@@ -0,0 +1,25 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+<!--
+### Non-Breaking
+
+- A bullet item for the Non-Breaking category.
+
+-->
+
+### Breaking
+
+- Adapt to the change in block application and ticking interface in
+  Byron and Shelley. Block application and ticking now can choose
+  validation policy and enable or disable ledger events.
+- Delete `GetProposedPParamsUpdates` query which is deprecated starting in Conway.

ouroboros-consensus-cardano/changelog.d/20250304_140316_jasataco_release_10_3.md

@@ -0,0 +1,23 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+<!--
+### Non-Breaking
+
+- A bullet item for the Non-Breaking category.
+
+-->
+
+### Breaking
+
+- Adapt to Ledger's Crypto monomorphization. Many types and fields have lost their `c/crypto` type variable as now `StandardCrypto` is used by the Ledger everywhere.
+- Deprecate the `StandardX` type aliases.

ouroboros-consensus-cardano/changelog.d/js-ntc20.md

@@ -0,0 +1,4 @@
+### Breaking
+
+* Use new `NodeToClientV_20`.
+* Expose new query `QueryStakePoolDefaultVote` in new `ShelleyNodeToClientVersion12`.