More changes

Author: jasagredo

ouroboros-consensus-cardano/cddl/base.cddl

@@ -1,4 +1,4 @@
-cardanoTelescope<byron, shelley, allegra, mary, alonzo, babbage, conway>
+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>] /
@@ -7,7 +7,7 @@ cardanoTelescope<byron, shelley, allegra, mary, alonzo, babbage, conway>
     [pastEra, currentEra<shelley>] /
     [currentEra<byron>]
 
-cardanoNs<byron, shelley, allegra, mary, alonzo, babbage, conway>
+ns7<byron, shelley, allegra, mary, alonzo, babbage, conway>
   = [6, conway] /
     [5, babbage] /
     [4, alonzo] /
@@ -16,28 +16,36 @@ cardanoNs<byron, shelley, allegra, mary, alonzo, babbage, conway>
     [1, shelley] /
     [0, byron]
 
+;; Blockchain types
+pastEra = [bound, bound]
+currentEra<st> = [bound, st]
 blockno = word64
 bound = [relativeTime, slotno, epochno]
 coin = word64
-either<x, y> = [0, x] / [1, y]
 epochno = word64
 eraIdx = word8
 hash = bstr
 individualPoolStake = [stake, hash]
 keyhash = bstr
-map<x, y> = { * x => y }
-maybe<x> = [] / [x]
 nonce = [0] / [1, hash]
 point = [] / [ slotno, hash ]
 poolDistr = map<keyhash, individualPoolStake>
 rational = [int, int]
 relativeTime = int
-seq<x> = [*23 x] / [24* x] ; encoded with indefinite-length encoding
-set<x> = #6.258([* x])
 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])
+
+;; Base word types
+word8 = 0..255
 word32 = 0..4294967295
 word64 = 0..18446744073709551615
-word8 = 0..255

ouroboros-consensus-cardano/cddl/cddlc.sh

@@ -1,5 +1,3 @@
-export CDDL_INCLUDE_PATH=ledger-cddls/eras/byron/cddl-spec:ledger-cddls/eras/shelley/impl/cddl-files:ledger-cddls/eras/allegra/impl/cddl-files:ledger-cddls/eras/mary/impl/cddl-files:ledger-cddls/eras/alonzo/impl/cddl-files:ledger-cddls/eras/babbage/impl/cddl-files:ledger-cddls/eras/conway/impl/cddl-files:disk:.:
-
 mkdir -p out
 
 gen () {
@@ -9,14 +7,30 @@ gen () {
     echo " ok"
 }
 
-IN=$(fd -e cddl -E ledger-cddls -E out -E base.cddl -E node-to-client/localstatequery/query.cddl -E node-to-client/localstatequery/result.cddl)
+CDDL_INCLUDE_PATH=""
+for f in $(fd -t d); do
+    CDDL_INCLUDE_PATH+="$f:"
+done
+
+export CDDL_INCLUDE_PATH=$CDDL_INCLUDE_PATH.:
+
+IN=$(fd -e cddl \
+        -E ledger-cddls \
+        -E out \
+        -E base.cddl \
+        -E node-to-client/localstatequery/shelley \
+        -E node-to-client/localstatequery/byron \
+        -E node-to-client/localstatequery/consensus \
+        -E disk/snapshot
+  )
 
 echo "Generating complete CDDLs:"
 for f in $IN; do
     gen $(echo $f | cut -d'.' -f1)
 done
 
 UNDEFINEDS=$(grep -R undefined out)
+
 if [ ! -z "$UNDEFINEDS" ]; then
     echo -e "\033[0;31mThere were undefined references!\n$UNDEFINEDS\033[0m"
 

ouroboros-consensus-cardano/cddl/disk/ledger-state-snapshot.cddl

@@ -0,0 +1,9 @@
+ledgerStateSnapshot =
+  [snapshotEncodingVersion1, extLedgerState]
+
+snapshotEncodingVersion1 = 1
+
+extLedgerState = [ledgerState, headerState]
+
+;# import ledgerstate
+;# import headerstate

ouroboros-consensus-cardano/cddl/disk/snapshot.cddl

@@ -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

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

@@ -0,0 +1,27 @@
+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
+
+;# import base
+;# 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

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

@@ -0,0 +1,13 @@
+versionedPraosState = [praosVersion, praosState]
+
+praosVersion = 0
+
+praosState = [withOrigin<slotno>,
+              {* keyhash => word64},
+              nonce,
+              nonce,
+              nonce,
+              nonce,
+              nonce]
+
+;# import base

ouroboros-consensus-cardano/cddl/disk/snapshot/praos.cddl

@@ -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