IntersectMBO · ch1bo · May 27, 2025 · May 27, 2025 · May 27, 2025 · May 27, 2025
@@ -138,6 +138,22 @@ jobs:
     - name: Build projects [build]
       run: cabal build all -j
 
+    - name: Install cddlc
+      run: gem install cddlc
+
+    - name: Clone cuddle with validator
+      uses: actions/checkout
+      with:
+        repo: 'input-output-hk/cuddle'
+        ref: 'js/validator'
+        path: 'cuddle'
+
+    - name: Install cuddle
+      run: |
+        ( cd $GITHUB_WORKSPACE/cuddle
+          cabal install --ignore-project exe:cuddle
+        )
+
     - name: Test
       if: matrix.test-set == 'all'
       run: cabal test all -j --test-show-details=streaming

@@ -0,0 +1,3 @@
+[submodule "cardano-blueprint"]
+	path = cardano-blueprint
+	url = [email protected]:cardano-scaling/cardano-blueprint.git
@@ -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 2025-05-15T07:59:00Z
+  , hackage.haskell.org 2025-05-26T13:28:18Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2025-05-15T08:36:14Z
+  , cardano-haskell-packages 2025-05-26T19:51:53Z
 
 packages:
   ouroboros-consensus
@@ -40,11 +40,6 @@ package ouroboros-network
   -- https://github.com/IntersectMBO/ouroboros-network/issues/4927 for context).
   flags: -txsubmission-delay
 
--- We need to disable bitvec's SIMD for now, as it breaks during cross compilation.
-if(os(windows))
-  constraints:
-    bitvec -simd
-
 if impl (ghc >= 9.12)
   allow-newer:
     -- Bounds will be relaxed in next release
@@ -54,13 +49,46 @@ if impl (ghc >= 9.12)
     , ouroboros-network-protocols:base
     , ouroboros-network:base
 
-    -- https://github.com/phadej/vec/issues/118
-    , bin:base
-    , fin:base
-    , ral:base
-
-    -- https://github.com/haskellari/tree-diff/issues/97
-    , tree-diff:base
-
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
+
+source-repository-package
+   type: git
+   location: https://github.com/IntersectMBO/ouroboros-network
+   tag: 3e8d3b4b8c87ead794876c62d7fe25f32efb5142
+   -- sha256: sha256-uKrxpHhcNGzKUSeA4zIdkslfDFIJjkCsHUg+FUef1yE=
+   subdir:
+     ouroboros-network-api
+
+source-repository-package
+   type: git
+   location: https://github.com/IntersectMBO/cardano-ledger
+   tag: 75656430492b34e2300704eafeb77e1d5001671a
+   --sha256: sha256-m/Glsryh4aJBsI4ifIe4H3ZkcX6K7EGLEHCGGVzOzyI=
+   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/ledger/executable-spec
+      eras/byron/ledger/impl
+      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
@@ -16,6 +16,10 @@ hsPkgs.shellFor {
     pkgs.ghcid
     pkgs.xrefcheck
     pkgs.fourmolu
+    pkgs.cuddle
+
+    # testing cddls
+    pkgs.cddl
 
     # release management
     (pkgs.scriv.overridePythonAttrs (_oldAttrs: {

@@ -38,6 +38,15 @@ in
 
   fourmolu = tool "fourmolu" "0.18.0.0" { };
 
+  cuddle = tool "cuddle" "git" {
+    src = final.fetchFromGitHub {
+      owner = "input-output-hk";
+      repo = "cuddle";
+      rev = "43050522b2c3326dc2bcb95a3fde852bce5bc729";
+      hash = "sha256-S3GJBmvBmnbdb7tD2Fq9FNr9Z8iuT/eWwRpRxq9is10=";
+    };
+  };
+
   haskellBuildUtils = prev.haskellBuildUtils.override {
     inherit (final.hsPkgs.args) compiler-nix-name;
     index-state = tool-index-state;

@@ -0,0 +1,53 @@
+telescope7<byron, shelley, allegra, mary, alonzo, babbage, conway>
+  = [pastEra, pastEra, pastEra, pastEra, pastEra, pastEra, currentEra<conway>] /
+    [pastEra, pastEra, pastEra, pastEra, pastEra, currentEra<babbage>] /
+    [pastEra, pastEra, pastEra, pastEra, currentEra<alonzo>] /
+    [pastEra, pastEra, pastEra, currentEra<mary>] /
+    [pastEra, pastEra, currentEra<allegra>] /
+    [pastEra, currentEra<shelley>] /
+    [currentEra<byron>]
+
+ns7<byron, shelley, allegra, mary, alonzo, babbage, conway>
+  = [6, conway] /
+    [5, babbage] /
+    [4, alonzo] /
+    [3, mary] /
+    [2, allegra] /
+    [1, shelley] /
+    [0, byron]
+
+;; Blockchain types
+pastEra = [bound, bound]
+currentEra<st> = [bound, st]
+bound = [relativeTime, slotno, epochno]
+eraIdx = word8
+individualPoolStake = [stake, hash]
+nonce = [0] / [1, hash]
+point = [] / [ slotno, hash ]
+poolDistr = map<keyhash, individualPoolStake>
+slotno = word64
+stake = rational
+
+withOrigin<v> = [] / [v]
+withOriginTH<v> = [0] / [1, v]
+
+;; Collections
+either<x, y> = [0, x] / [1, y]
+map<x, y> = { * x => y }
+maybe<x> = [] / [x]
+seq<x> = [*23 x] / [24* x] ; encoded with indefinite-length encoding
+set<x> = #6.258([* x])
+
+;; Types from other packages
+blockno = word64
+epochno = word64
+coin = word64
+rational = [int, int]
+keyhash = bstr .size 28
+hash = bstr .size 32
+relativeTime = int
+
+;; Base word types
+word8  = uint .size 1
+word32 = uint .size 4
+word64 = uint .size 8
@@ -0,0 +1,15 @@
+cardanoBlock = byron.block
+             / [2, shelley.block]
+             / [3, allegra.block]
+             / [4, mary.block]
+             / [5, alonzo.block]
+             / [6, babbage.block]
+             / [7, conway.block]
+
+;# import byron as byron
+;# import shelley as shelley
+;# import allegra as allegra
+;# import mary as mary
+;# import alonzo as alonzo
+;# import babbage as babbage
+;# import conway as conway
@@ -0,0 +1,9 @@
+ledgerStateSnapshot =
+  [snapshotEncodingVersion1, extLedgerState]
+
+snapshotEncodingVersion1 = 1
+
+extLedgerState = [ledgerState, headerState]
+
+;# import ledgerstate
+;# import headerstate
@@ -0,0 +1,23 @@
+headerState =
+  [withOrigin<headerStateTip>, headerStateChainDep]
+
+headerStateTip =
+  ns7<byronAnnTip, annTip, annTip, annTip, annTip, annTip, annTip>
+
+byronAnnTip = [slotno, hash, blockno, bool]
+annTip = [slotno, hash, blockno]
+
+headerStateChainDep =
+  telescope7<versionedPbftState,
+             versionedTPraosState,
+             versionedTPraosState,
+             versionedTPraosState,
+             versionedTPraosState,
+             versionedPraosState,
+             versionedPraosState>
+
+versionedPbftState = [serializationFormat1, {* keyhash => [* slotno]}]
+
+;# import base
+;# import praos
+;# import tpraos
@@ -0,0 +1,30 @@
+ledgerState =
+  telescope7<byron.ledgerstate,
+             versionedShelleyLedgerState<shelley.ledgerstate>,
+             versionedShelleyLedgerState<allegra.ledgerstate>,
+             versionedShelleyLedgerState<mary.ledgerstate>,
+             versionedShelleyLedgerState<alonzo.ledgerstate>,
+             versionedShelleyLedgerState<babbage.ledgerstate>,
+             versionedShelleyLedgerState<conway.ledgerstate>>
+
+versionedShelleyLedgerState<era> = [ shelleyVersion2, shelleyLedgerState<era> ]
+
+shelleyVersion2 = 2
+
+shelleyLedgerState<era> = [ withOrigin<shelleyTip>, era, shelleyTransition ]
+
+shelleyTip = [slotno, blockno, hash]
+
+shelleyTransition = word32
+
+; TODO these should be imports from the ledger however they do not
+; provide these definitions yet.
+byron.ledgerstate = any
+shelley.ledgerstate = any
+allegra.ledgerstate = any
+mary.ledgerstate = any
+alonzo.ledgerstate = any
+babbage.ledgerstate = any
+conway.ledgerstate = any
+
+;# import base
@@ -0,0 +1,13 @@
+versionedPraosState = [praosVersion, praosState]
+
+praosVersion = 0
+
+praosState = [withOrigin<slotno>,
+              {* keyhash => word64},
+              nonce,
+              nonce,
+              nonce,
+              nonce,
+              nonce]
+
+;# import base
@@ -0,0 +1,12 @@
+versionedTPraosState =
+  [serializationFormat1, [withOriginTH<slotno>, tpraosState]]
+
+tpraosState = [prtclState, ticknState, nonce]
+
+prtclState = [{* keyhash => word64}, nonce, nonce]
+
+ticknState = [nonce, nonce]
+
+serializationFormat1 = 1
+
+;# import base
@@ -0,0 +1,3 @@
+serialisedCardanoBlock = #6.24(bytes .cbor cardanoBlock)
+
+;# import cardanoBlock from block
@@ -0,0 +1,3 @@
+point = base.point
+
+;# import base as base
@@ -0,0 +1,25 @@
+header
+ = ns7<byronHeader,
+       serialisedShelleyHeader<shelley.header>,
+       serialisedShelleyHeader<allegra.header>,
+       serialisedShelleyHeader<mary.header>,
+       serialisedShelleyHeader<alonzo.header>,
+       serialisedShelleyHeader<babbage.header>,
+       serialisedShelleyHeader<conway.header>>
+
+byronHeader = [byronRegularIdx, #6.24(bytes .cbor byron.blockhead)]
+            / [byronBoundaryIdx, #6.24(bytes .cbor byron.ebbhead)]
+
+byronBoundaryIdx = [0, word32]
+byronRegularIdx = [1, word32]
+
+serialisedShelleyHeader<era> = #6.24(bytes .cbor era)
+
+;# include byron as byron
+;# include shelley as shelley
+;# include allegra as allegra
+;# include mary as mary
+;# include alonzo as alonzo
+;# include babbage as babbage
+;# include conway as conway
+;# import base
@@ -0,0 +1,3 @@
+point = base.point
+
+;# import base as base
@@ -0,0 +1,3 @@
+tip = [ base.point, base.blockno ]
+
+;# import base as base
@@ -0,0 +1,19 @@
+tx =
+  ns7<byron.tx,
+      serialisedShelleyTx<shelley.transaction>,
+      serialisedShelleyTx<allegra.transaction>,
+      serialisedShelleyTx<mary.transaction>,
+      serialisedShelleyTx<alonzo.transaction>,
+      serialisedShelleyTx<babbage.transaction>,
+      serialisedShelleyTx<conway.transaction>>
+
+serialisedShelleyTx<era> = #6.24(bytes .cbor era)
+
+;# include byron as byron
+;# include shelley as shelley
+;# include allegra as allegra
+;# include mary as mary
+;# include alonzo as alonzo
+;# include babbage as babbage
+;# include conway as conway
+;# import base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		serialisedCardanoBlock = #6.24(bytes .cbor cardanoBlock)

		;# import cardanoBlock from block
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		tip = [ base.point, base.blockno ]

		;# import base as base