Add Dijkstra ledger era (#1567)

Fixes #1544

~Needs IntersectMBO/cardano-ledger#5136 --- the
Ledger pr was merged to `master`; I've updates the s-r-p.

~Needs draft integration with `cardano-node`~ I've attempted to
integrate with `cardano-node`, but abandoned this effort, as we first
need an integration into `cardano-api`.

Author: geo2a

cabal.project

@@ -68,8 +68,8 @@ source-repository-package
 source-repository-package
    type: git
    location: https://github.com/IntersectMBO/cardano-ledger
-   tag: b44ce911475794a15f908ad27a6f497d6a27e8ba
-   --sha256: sha256-MXaVKKH9siUsmOnJmYyL6if48dx11zugux7AWGPABfA=
+   tag: ca8d451bbce11dde3b68e99782c79f9b4c1dfca5
+   --sha256: sha256-YHIscWnp9GrFn0EYGM7xd8Ds8x0O00FWBAIZX22bWpA=
    subdir:
       eras/allegra/impl
       eras/alonzo/impl
@@ -82,6 +82,7 @@ source-repository-package
       eras/byron/ledger/impl
       eras/conway/impl
       eras/conway/test-suite
+      eras/dijkstra/
       eras/mary/impl
       eras/shelley/impl
       eras/shelley-ma/test-suite

docs/website/contents/for-developers/AddingAnEra.md

@@ -18,6 +18,7 @@ hsPkgs.shellFor {
     pkgs.fourmolu
     pkgs.cuddle
     pkgs.cddlc
+    pkgs.pretty-simple
 
     # release management
     pkgs.scriv

nix/shell.nix

@@ -1,14 +1,16 @@
-telescope7<byron, shelley, allegra, mary, alonzo, babbage, conway>
-  = [pastEra, pastEra, pastEra, pastEra, pastEra, pastEra, currentEra<conway>] /
+telescope8<byron, shelley, allegra, mary, alonzo, babbage, conway, dijkstra>
+  = [pastEra, pastEra, pastEra, pastEra, pastEra, pastEra, pastEra, currentEra<dijkstra>] /
+    [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] /
+ns8<byron, shelley, allegra, mary, alonzo, babbage, conway, dijkstra>
+  = [7, dijkstra] /
+    [6, conway] /
     [5, babbage] /
     [4, alonzo] /
     [3, mary] /

ouroboros-consensus-cardano/cddl/base.cddl

@@ -2,7 +2,7 @@ headerState =
   [withOrigin<headerStateTip>, headerStateChainDep]
 
 headerStateTip =
-  ns7<byronAnnTip, annTip, annTip, annTip, annTip, annTip, annTip>
+  ns8<byronAnnTip, annTip, annTip, annTip, annTip, annTip, annTip, annTip>
 
 byronAnnTip = [slotno,
                hash,
@@ -14,15 +14,16 @@ annTip = [slotno,
           blockno]
 
 headerStateChainDep =
-  telescope7<versionedPbftState,
+  telescope8<versionedPbftState,
              versionedTPraosState,
              versionedTPraosState,
              versionedTPraosState,
              versionedTPraosState,
              versionedPraosState,
+             versionedPraosState,
              versionedPraosState>
 
-;# import withOrigin, ns7, telescope7, slotno, hash, blockno from base
+;# import withOrigin, ns8, telescope8, slotno, hash, blockno from base
 ;# import versionedPbftState from pbft
 ;# import versionedPraosState from praos
 ;# import versionedTPraosState from tpraos

ouroboros-consensus-cardano/cddl/disk/ledger/headerstate.cddl

@@ -1,11 +1,12 @@
 ledgerState =
-  telescope7<byron.ledgerstate,
+  telescope8<byron.ledgerstate,
              versionedShelleyLedgerState<shelley.ledgerstate>,
              versionedShelleyLedgerState<allegra.ledgerstate>,
              versionedShelleyLedgerState<mary.ledgerstate>,
              versionedShelleyLedgerState<alonzo.ledgerstate>,
              versionedShelleyLedgerState<babbage.ledgerstate>,
-             versionedShelleyLedgerState<conway.ledgerstate>>
+             versionedShelleyLedgerState<conway.ledgerstate>,
+             versionedShelleyLedgerState<dijkstra.ledgerstate>>
 
 versionedShelleyLedgerState<eraSt1> = [ shelleyVersion2, shelleyLedgerState<eraSt1> ]
 
@@ -26,5 +27,6 @@ mary.ledgerstate = any
 alonzo.ledgerstate = any
 babbage.ledgerstate = any
 conway.ledgerstate = any
+dijkstra.ledgerstate = any
 
-;# import telescope7, withOrigin, slotno, blockno, hash, word32 from base
+;# import telescope8, withOrigin, slotno, blockno, hash, word32 from base

ouroboros-consensus-cardano/cddl/disk/ledger/ledgerstate.cddl

@@ -7,6 +7,7 @@ cardanoBlock = byron.block
              / [5, alonzo.block]
              / [6, babbage.block]
              / [7, conway.block]
+             / [8, dijkstra.block]
 
 ;# import byron as byron
 ;# import shelley as shelley
@@ -15,3 +16,4 @@ cardanoBlock = byron.block
 ;# import alonzo as alonzo
 ;# import babbage as babbage
 ;# import conway as conway
+;# import dijkstra as dijkstra

ouroboros-consensus-cardano/cddl/node-to-node/blockfetch/block.cddl

@@ -1,11 +1,12 @@
 header
- = base.ns7<byronHeader,
+ = base.ns8<byronHeader,
             serialisedShelleyHeader<shelley.header>,
             serialisedShelleyHeader<allegra.header>,
             serialisedShelleyHeader<mary.header>,
             serialisedShelleyHeader<alonzo.header>,
             serialisedShelleyHeader<babbage.header>,
-            serialisedShelleyHeader<conway.header>>
+            serialisedShelleyHeader<conway.header>,
+            serialisedShelleyHeader<dijkstra.header>>
 
 byronHeader = [byronRegularIdx, #6.24(bytes .cbor byron.blockhead)]
             / [byronBoundaryIdx, #6.24(bytes .cbor byron.ebbhead)]
@@ -22,4 +23,5 @@ serialisedShelleyHeader<era> = #6.24(bytes .cbor era)
 ;# include alonzo as alonzo
 ;# include babbage as babbage
 ;# include conway as conway
+;# include dijkstra as dijkstra
 ;# import base as base

ouroboros-consensus-cardano/cddl/node-to-node/chainsync/header.cddl

@@ -1,11 +1,12 @@
 tx =
-  base.ns7<byron.transaction,
+  base.ns8<byron.transaction,
            serialisedShelleyTx<shelley.transaction>,
            serialisedShelleyTx<allegra.transaction>,
            serialisedShelleyTx<mary.transaction>,
            serialisedShelleyTx<alonzo.transaction>,
            serialisedShelleyTx<babbage.transaction>,
-           serialisedShelleyTx<conway.transaction>>
+           serialisedShelleyTx<conway.transaction>,
+           serialisedShelleyTx<dijkstra.transaction>>
 
 serialisedShelleyTx<era> = #6.24(bytes .cbor era)
 
@@ -20,4 +21,5 @@ byron.transaction = [0, [byron.tx, [+ byron.twit]]] / [1, any] / [2, any] / [3,
 ;# include alonzo as alonzo
 ;# include babbage as babbage
 ;# include conway as conway
+;# include dijkstra as dijkstra
 ;# import base as base

ouroboros-consensus-cardano/cddl/node-to-node/txsubmission2/tx.cddl

@@ -1,10 +1,12 @@
+; TODO(geo2a): why are this order? Why babbage is last?
 txId =
-  base.ns7<byronTxId,
+  base.ns8<byronTxId,
            shelley.transaction_id,
            allegra.transaction_id,
            mary.transaction_id,
            alonzo.transaction_id,
            conway.transaction_id,
+           dijkstra.transaction_id,
            babbage.transaction_id>
 
 byronTxId = [0, byron.txid]
@@ -19,4 +21,5 @@ byronTxId = [0, byron.txid]
 ;# include alonzo as alonzo
 ;# include babbage as babbage
 ;# include conway as conway
+;# include dijkstra as dijkstra
 ;# import base as base