WIP

Author: jasagredo

ouroboros-consensus-cardano/cddl/node-to-client/txsubmission2/reject.cddl

@@ -0,0 +1,32 @@
+applyTxErr = ns7< byron.applyMempoolPayloadErr
+                , shelley.applyTxErr
+                , allegra.applyTxErr
+                , mary.applyTxErr
+                , alonzo.applyTxErr
+                , babbage.applyTxErr
+                , conway.applyTxErr>
+
+byron.applyMempoolPayloadErr = undefined
+
+; ShelleyLedgerPredFailure
+shelley.applyTxErr = [0, utxowFailure] / [1, delegsFailure]
+
+; ShelleyDelegsPredFailure
+delegsFailure = [0, delegateeNotRegistered] / [1, withdrawalsNotInRewards] / [2, delplFailure]
+
+delegateeNotRegistered = keyhash
+
+withdrawalsNotInRewards = { * reward_account => coin }
+
+; ShelleyDlplPredFailure
+delplFailure = [0, poolFailure] / [1, delegFailure]
+
+; ShelleyPoolPredFailure
+poolFailure = [ 0, keyhash ]
+            / [ 1, epochno, epochno, epochno ]
+            / [ 3, epochno, epochno ]
+            / [ 4, epochno, epochno, keyhash ]
+            / [ 5, keyhash, int ]
+
+; ShelleyDelegPredFailure
+delegFailure = [

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

@@ -1,11 +1,11 @@
 tx =
   ns7<byron.tx,
-      serialisedShelleyTx<shelley.tx>,
-      serialisedShelleyTx<allegra.tx>,
-      serialisedShelleyTx<mary.tx>,
-      serialisedShelleyTx<alonzo.tx>,
-      serialisedShelleyTx<babbage.tx>,
-      serialisedShelleyTx<conway.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)
 

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

@@ -1,11 +1,11 @@
 txId =
   ns7<byronTxId,
-      shelley.txid,
-      shelley.txid,
-      shelley.txid,
-      shelley.txid,
-      shelley.txid,
-      shelley.txid>
+      shelley.transaction_id,
+      allegra.transaction_id,
+      mary.transaction_id,
+      alonzo.transaction_id,
+      conway.transaction_id,
+      babbage.transaction_id>
 
 byronTxId = [0, byron.txid]
           / [1, byron.certificateid]
@@ -14,4 +14,9 @@ byronTxId = [0, byron.txid]
 
 ;# 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

ouroboros-consensus-cardano/test/byron-test/Test/Consensus/Byron/Golden.hs

@@ -14,7 +14,7 @@ import Test.Util.Paths
 import Test.Util.Serialisation.Golden
 
 tests :: TestTree
-tests = goldenTest_all codecConfig ($(getGoldenDir) </> "byron") examples
+tests = goldenTest_all codecConfig ($(getGoldenDir) </> "byron") Nothing examples
 
 instance ToGoldenDirectory ByronNodeToNodeVersion
 

ouroboros-consensus-cardano/test/byron-test/Test/Consensus/Byron/Serialisation.hs

@@ -37,7 +37,7 @@ tests :: TestTree
 tests =
   testGroup
     "Byron"
-    [ roundtrip_all testCodecCfg dictNestedHdr
+    [ roundtrip_all testCodecCfg dictNestedHdr Nothing
     , testProperty "BinaryBlockInfo sanity check" prop_byronBinaryBlockInfo
     , testGroup
         "Integrity"

ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/GenCDDLs.hs

@@ -121,6 +121,7 @@ setupCDDLCEnv = do
         $ L.intersperse ":"
         $ map (mconcat . L.intersperse ":") [byron, shelley, allegra, mary, alonzo, babbage, conway] <> local_paths
 
+  writeFile "env" ("CDDL_INCLUDE_PATH=" <> include_path <> ":")
   E.setEnv "CDDL_INCLUDE_PATH" (include_path <> ":")
 
 sed :: FilePath -> [String] -> IO ()

ouroboros-consensus-cardano/test/shelley-test/Test/Consensus/Shelley/Golden.hs

@@ -17,7 +17,7 @@ import Test.Util.Paths
 import Test.Util.Serialisation.Golden
 
 tests :: TestTree
-tests = goldenTest_all codecConfig ($(getGoldenDir) </> "shelley") examplesShelley
+tests = goldenTest_all codecConfig ($(getGoldenDir) </> "shelley") Nothing examplesShelley
 
 instance ToGoldenDirectory ShelleyNodeToNodeVersion
 

ouroboros-consensus-cardano/test/shelley-test/Test/Consensus/Shelley/Serialisation.hs

@@ -31,7 +31,7 @@ tests :: TestTree
 tests =
   testGroup
     "Shelley"
-    [ roundtrip_all testCodecCfg dictNestedHdr
+    [ roundtrip_all testCodecCfg dictNestedHdr Nothing
     , -- Test for real crypto too
       testProperty "hashSize real crypto" $ prop_hashSize pReal
     , testProperty "ConvertRawHash real crypto" $ roundtrip_ConvertRawHash pReal

ouroboros-consensus-diffusion/test/mock-test/Test/ThreadNet/BFT.hs

@@ -55,7 +55,7 @@ instance Arbitrary TestSetup where
 tests :: TestTree
 tests =
   testGroup "BFT" $
-    [ roundtrip_all SimpleCodecConfig dictNestedHdr
+    [ roundtrip_all SimpleCodecConfig dictNestedHdr Nothing
     , testProperty "simple convergence" $ \setup ->
         prop_simple_bft_convergence setup
     ]