diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1bb64af8e6b..a440da1a066 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,11 +22,7 @@ the PR to a particular issue, see - [ ] Commits have useful messages - [ ] The documentation has been properly updated - [ ] New tests are added if needed and existing tests are updated - - [ ] Any changes affecting Consensus packages must have an entry in the - appropriate `changelog.d` directory created using - [`scriv`](https://github.com/input-output-hk/scriv). If in doubt, see - the [Consensus release - process](../ouroboros-consensus/docs/ReleaseProcess.md). + - [ ] Any changes affecting Consensus packages must have an entry in the appropriate `changelog.d` directory created using [`scriv`](https://github.com/input-output-hk/scriv). If in doubt, see the [Consensus release process](../ouroboros-consensus/docs/ReleaseProcess.md). - [ ] If this branch changes Network and has any consequences for downstream repositories or end users, said changes must be documented in [`interface-CHANGELOG.md`](../docs/interface-CHANGELOG.md) - [ ] If serialization changes, user-facing consequences (e.g. replay from genesis) are confirmed to be intentional. - Pull Request diff --git a/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal b/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal index 1c41cd31b49..4b311a37680 100644 --- a/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal +++ b/ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal @@ -48,6 +48,7 @@ library , cardano-ledger-alonzo-test , cardano-ledger-babbage , cardano-ledger-babbage-test + , cardano-ledger-conway-test , cardano-ledger-byron , cardano-ledger-core , cardano-ledger-shelley @@ -105,6 +106,7 @@ test-suite test , cardano-ledger-alonzo , cardano-ledger-byron + , cardano-ledger-conway , cardano-ledger-core , cardano-ledger-shelley , cardano-protocol-tpraos diff --git a/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Examples.hs b/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Examples.hs index 9c17924f6e8..c087dde3c38 100644 --- a/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Examples.hs +++ b/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Examples.hs @@ -71,6 +71,7 @@ eraExamples = :* Shelley.examplesMary :* Shelley.examplesAlonzo :* Shelley.examplesBabbage + :* Shelley.examplesConway :* Nil -- | By using this function, we can't forget to update this test when adding a @@ -89,6 +90,7 @@ combineEras = mconcat . hcollapse . hap eraInjections :* fn (K . injExamples "Mary" (IS (IS (IS IZ)))) :* fn (K . injExamples "Alonzo" (IS (IS (IS (IS IZ))))) :* fn (K . injExamples "Babbage" (IS (IS (IS (IS (IS IZ)))))) + :* fn (K . injExamples "Conway" (IS (IS (IS (IS (IS (IS IZ))))))) :* Nil injExamples :: @@ -163,6 +165,9 @@ alonzoEraParams = Shelley.shelleyEraParams Shelley.testShelleyGenesis babbageEraParams :: History.EraParams babbageEraParams = Shelley.shelleyEraParams Shelley.testShelleyGenesis +conwayEraParams :: History.EraParams +conwayEraParams = Shelley.shelleyEraParams Shelley.testShelleyGenesis + -- | We use 10, 20, 30, 40, ... as the transition epochs shelleyTransitionEpoch :: EpochNo shelleyTransitionEpoch = 10 @@ -205,6 +210,13 @@ babbageStartBound = alonzoStartBound 50 +conwayStartBound :: History.Bound +conwayStartBound = + History.mkUpperBound + alonzoEraParams + alonzoStartBound + 60 + exampleStartBounds :: Exactly (CardanoEras Crypto) History.Bound exampleStartBounds = Exactly $ ( K byronStartBound @@ -213,6 +225,7 @@ exampleStartBounds = Exactly $ :* K maryStartBound :* K alonzoStartBound :* K babbageStartBound + :* K conwayStartBound :* Nil ) @@ -224,6 +237,7 @@ cardanoShape = History.Shape $ Exactly $ :* K maryEraParams :* K alonzoEraParams :* K babbageEraParams + :* K conwayEraParams :* Nil ) @@ -251,6 +265,7 @@ codecConfig = Shelley.ShelleyCodecConfig Shelley.ShelleyCodecConfig Shelley.ShelleyCodecConfig + Shelley.ShelleyCodecConfig ledgerStateByron :: LedgerState ByronBlock diff --git a/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Generators.hs b/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Generators.hs index d51edde8758..5cdc6245192 100644 --- a/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Generators.hs +++ b/ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Generators.hs @@ -53,7 +53,7 @@ import Ouroboros.Consensus.Shelley.Ledger import Ouroboros.Consensus.Cardano.Block import Ouroboros.Consensus.Cardano.Node (CardanoHardForkConstraints) -import Test.Cardano.Ledger.Babbage.Serialisation.Generators () +import Test.Cardano.Ledger.Conway.Serialisation.Generators () import Test.Consensus.Byron.Generators import Test.Consensus.Cardano.MockCrypto import Test.Consensus.Protocol.Serialisation.Generators () @@ -82,6 +82,7 @@ instance Arbitrary (CardanoBlock MockCryptoCompatByron) where :* mk BlockMary :* mk BlockAlonzo :* mk BlockBabbage + :* mk BlockConway :* Nil mk :: @@ -105,6 +106,7 @@ instance Arbitrary (Coherent (CardanoBlock MockCryptoCompatByron)) where :* mk BlockMary :* mk BlockAlonzo :* mk BlockBabbage + :* mk BlockConway :* Nil mk :: @@ -158,15 +160,17 @@ arbitraryNodeToNode , Arbitrary (WithVersion ShelleyNodeToNodeVersion mary) , Arbitrary (WithVersion ShelleyNodeToNodeVersion alonzo) , Arbitrary (WithVersion ShelleyNodeToNodeVersion babbage) + , Arbitrary (WithVersion ShelleyNodeToNodeVersion conway) ) => (byron -> cardano) -> (shelley -> cardano) -> (allegra -> cardano) -> (mary -> cardano) -> (alonzo -> cardano) - -> (babbage -> cardano) + -> (babbage -> cardano) + -> (conway -> cardano) -> Gen (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) cardano) -arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage = oneof +arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage injConway = oneof -- Byron + HardFork disabled [ (\(WithVersion versionByron b) -> WithVersion @@ -176,7 +180,7 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage -- Byron + HardFork enabled. -- NOTE: Any value generated by the V1 generator is also fine when using -- V2. - , (\(WithVersion versionByron b) versionShelley versionAllegra versionMary versionAlonzo versionBabbage -> + , (\(WithVersion versionByron b) versionShelley versionAllegra versionMary versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToNodeEnabled maxBound @@ -186,12 +190,13 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage :* versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injByron b)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Shelley + HardFork enable - , (\versionByron (WithVersion versionShelley s) versionAllegra versionMary versionAlonzo versionBabbage -> + , (\versionByron (WithVersion versionShelley s) versionAllegra versionMary versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToNodeEnabled maxBound @@ -201,12 +206,13 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage :* versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injShelley s)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Allegra + HardFork enabled - , (\versionByron versionShelley (WithVersion versionAllegra a) versionMary versionAlonzo versionBabbage -> + , (\versionByron versionShelley (WithVersion versionAllegra a) versionMary versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToNodeEnabled maxBound @@ -216,12 +222,13 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage :* versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injAllegra a)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Mary + HardFork enabled - , (\versionByron versionShelley versionAllegra (WithVersion versionMary m) versionAlonzo versionBabbage -> + , (\versionByron versionShelley versionAllegra (WithVersion versionMary m) versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToNodeEnabled maxBound @@ -231,12 +238,13 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage :* EraNodeToNodeEnabled versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injMary m)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Alonzo + HardFork enabled - , (\versionByron versionShelley versionAllegra versionMary (WithVersion versionAlonzo a) versionBabbage -> + , (\versionByron versionShelley versionAllegra versionMary (WithVersion versionAlonzo a) versionBabbage versionConway -> WithVersion (HardForkNodeToNodeEnabled maxBound @@ -246,12 +254,13 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage :* EraNodeToNodeEnabled versionMary :* EraNodeToNodeEnabled versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injAlonzo a)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Babbage + HardFork enabled - , (\versionByron versionShelley versionAllegra versionMary versionAlonzo (WithVersion versionBabbage a) -> + , (\versionByron versionShelley versionAllegra versionMary versionAlonzo (WithVersion versionBabbage a) versionConway -> WithVersion (HardForkNodeToNodeEnabled maxBound @@ -261,16 +270,33 @@ arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage :* EraNodeToNodeEnabled versionMary :* EraNodeToNodeEnabled versionAlonzo :* EraNodeToNodeEnabled versionBabbage + :* versionConway :* Nil )) (injBabbage a)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + -- Conway + HardFork enabled + , (\versionByron versionShelley versionAllegra versionMary versionAlonzo versionBabbage (WithVersion versionConway a) -> + WithVersion + (HardForkNodeToNodeEnabled + maxBound + ( EraNodeToNodeEnabled versionByron + :* EraNodeToNodeEnabled versionShelley + :* EraNodeToNodeEnabled versionAllegra + :* EraNodeToNodeEnabled versionMary + :* EraNodeToNodeEnabled versionAlonzo + :* EraNodeToNodeEnabled versionBabbage + :* EraNodeToNodeEnabled versionConway + :* Nil + )) + (injConway a)) + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary ] instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) (SomeSecond (NestedCtxt Header) (CardanoBlock c))) where - arbitrary = arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage + arbitrary = arbitraryNodeToNode injByron injShelley injAllegra injMary injAlonzo injBabbage injConway where injByron = mapSomeNestedCtxt NCZ injShelley = mapSomeNestedCtxt (NCS . NCZ) @@ -278,26 +304,27 @@ instance c ~ MockCryptoCompatByron injMary = mapSomeNestedCtxt (NCS . NCS . NCS . NCZ) injAlonzo = mapSomeNestedCtxt (NCS . NCS . NCS . NCS . NCZ) injBabbage = mapSomeNestedCtxt (NCS . NCS . NCS . NCS . NCS . NCZ) + injConway = mapSomeNestedCtxt (NCS . NCS . NCS . NCS . NCS . NCS . NCZ) instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) (CardanoBlock c)) where - arbitrary = arbitraryNodeToNode BlockByron BlockShelley BlockAllegra BlockMary BlockAlonzo BlockBabbage + arbitrary = arbitraryNodeToNode BlockByron BlockShelley BlockAllegra BlockMary BlockAlonzo BlockBabbage BlockConway instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) (CardanoHeader c)) where - arbitrary = arbitraryNodeToNode HeaderByron HeaderShelley HeaderAllegra HeaderMary HeaderAlonzo HeaderBabbage + arbitrary = arbitraryNodeToNode HeaderByron HeaderShelley HeaderAllegra HeaderMary HeaderAlonzo HeaderBabbage HeaderConway instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) (CardanoGenTx c)) where - arbitrary = arbitraryNodeToNode GenTxByron GenTxShelley GenTxAllegra GenTxMary GenTxAlonzo GenTxBabbage + arbitrary = arbitraryNodeToNode GenTxByron GenTxShelley GenTxAllegra GenTxMary GenTxAlonzo GenTxBabbage GenTxConway instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) (CardanoGenTxId c)) where - arbitrary = arbitraryNodeToNode GenTxIdByron GenTxIdShelley GenTxIdAllegra GenTxIdMary GenTxIdAlonzo GenTxIdBabbage + arbitrary = arbitraryNodeToNode GenTxIdByron GenTxIdShelley GenTxIdAllegra GenTxIdMary GenTxIdAlonzo GenTxIdBabbage GenTxIdConway {------------------------------------------------------------------------------- NodeToClient @@ -361,6 +388,7 @@ arbitraryNodeToClient , Arbitrary (WithVersion ShelleyNodeToClientVersion mary) , Arbitrary (WithVersion ShelleyNodeToClientVersion alonzo) , Arbitrary (WithVersion ShelleyNodeToClientVersion babbage) + , Arbitrary (WithVersion ShelleyNodeToClientVersion conway) ) => (byron -> cardano) -> (shelley -> cardano) @@ -368,8 +396,9 @@ arbitraryNodeToClient -> (mary -> cardano) -> (alonzo -> cardano) -> (babbage -> cardano) + -> (conway -> cardano) -> Gen (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) cardano) -arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbage = oneof +arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbage injConway = oneof -- Byron + HardFork disabled [ (\(WithVersion versionByron b) -> WithVersion @@ -377,7 +406,7 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag (injByron b)) <$> arbitrary -- Byron + HardFork enabled. - , (\(WithVersion versionByron b) versionShelley versionAllegra versionMary versionAlonzo versionBabbage -> + , (\(WithVersion versionByron b) versionShelley versionAllegra versionMary versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToClientEnabled maxBound @@ -387,12 +416,13 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag :* versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injByron b)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Shelley + HardFork enabled - , (\versionByron (WithVersion versionShelley s) versionAllegra versionMary versionAlonzo versionBabbage -> + , (\versionByron (WithVersion versionShelley s) versionAllegra versionMary versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToClientEnabled maxBound @@ -402,12 +432,13 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag :* versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injShelley s)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Allegra + HardFork enabled - , (\versionByron versionShelley (WithVersion versionAllegra a) versionMary versionAlonzo versionBabbage -> + , (\versionByron versionShelley (WithVersion versionAllegra a) versionMary versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToClientEnabled maxBound @@ -417,12 +448,13 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag :* versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injAllegra a)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Mary + HardFork enabled - , (\versionByron versionShelley versionAllegra (WithVersion versionMary m) versionAlonzo versionBabbage -> + , (\versionByron versionShelley versionAllegra (WithVersion versionMary m) versionAlonzo versionBabbage versionConway -> WithVersion (HardForkNodeToClientEnabled maxBound @@ -432,12 +464,13 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag :* EraNodeToClientEnabled versionMary :* versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injMary m)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Alonzo + HardFork enabled - , (\versionByron versionShelley versionAllegra versionMary (WithVersion versionAlonzo a) versionBabbage -> + , (\versionByron versionShelley versionAllegra versionMary (WithVersion versionAlonzo a) versionBabbage versionConway -> WithVersion (HardForkNodeToClientEnabled maxBound @@ -447,12 +480,13 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag :* EraNodeToClientEnabled versionMary :* EraNodeToClientEnabled versionAlonzo :* versionBabbage + :* versionConway :* Nil )) (injAlonzo a)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- Babbage + HardFork enabled - , (\versionByron versionShelley versionAllegra versionMary versionAlonzo (WithVersion versionBabbage a) -> + , (\versionByron versionShelley versionAllegra versionMary versionAlonzo (WithVersion versionBabbage a) versionConway -> WithVersion (HardForkNodeToClientEnabled maxBound @@ -462,27 +496,44 @@ arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbag :* EraNodeToClientEnabled versionMary :* EraNodeToClientEnabled versionAlonzo :* EraNodeToClientEnabled versionBabbage + :* versionConway :* Nil )) (injBabbage a)) - <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + -- Conway + HardFork enabled + , (\versionByron versionShelley versionAllegra versionMary versionAlonzo versionBabbage (WithVersion versionConway a) -> + WithVersion + (HardForkNodeToClientEnabled + maxBound + ( EraNodeToClientEnabled versionByron + :* EraNodeToClientEnabled versionShelley + :* EraNodeToClientEnabled versionAllegra + :* EraNodeToClientEnabled versionMary + :* EraNodeToClientEnabled versionAlonzo + :* EraNodeToClientEnabled versionBabbage + :* EraNodeToClientEnabled versionConway + :* Nil + )) + (injConway a)) + <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary ] instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) (CardanoBlock c)) where - arbitrary = arbitraryNodeToClient BlockByron BlockShelley BlockAllegra BlockMary BlockAlonzo BlockBabbage + arbitrary = arbitraryNodeToClient BlockByron BlockShelley BlockAllegra BlockMary BlockAlonzo BlockBabbage BlockConway instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) (CardanoGenTx c)) where - arbitrary = arbitraryNodeToClient GenTxByron GenTxShelley GenTxAllegra GenTxMary GenTxAlonzo GenTxBabbage + arbitrary = arbitraryNodeToClient GenTxByron GenTxShelley GenTxAllegra GenTxMary GenTxAlonzo GenTxBabbage GenTxConway instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) (CardanoApplyTxErr c)) where arbitrary = frequency - [ (8, arbitraryNodeToClient ApplyTxErrByron ApplyTxErrShelley ApplyTxErrAllegra ApplyTxErrMary ApplyTxErrAlonzo ApplyTxErrBabbage) + [ (8, arbitraryNodeToClient ApplyTxErrByron ApplyTxErrShelley ApplyTxErrAllegra ApplyTxErrMary ApplyTxErrAlonzo ApplyTxErrBabbage ApplyTxErrConway) , (2, WithVersion <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) <*> (HardForkApplyTxErrWrongEra <$> arbitrary)) @@ -514,7 +565,7 @@ instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) (SomeSecond BlockQuery (CardanoBlock c))) where arbitrary = frequency - [ (1, arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbage) + [ (1, arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbage injConway) , (1, WithVersion <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) <*> (injAnytimeByron <$> arbitrary)) @@ -533,6 +584,9 @@ instance c ~ MockCryptoCompatByron , (1, WithVersion <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) <*> (injAnytimeBabbage <$> arbitrary)) + , (1, WithVersion + <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) + <*> (injAnytimeConway <$> arbitrary)) , (1, fmap injHardFork <$> arbitrary) ] where @@ -542,12 +596,14 @@ instance c ~ MockCryptoCompatByron injMary (SomeSecond query) = SomeSecond (QueryIfCurrentMary query) injAlonzo (SomeSecond query) = SomeSecond (QueryIfCurrentAlonzo query) injBabbage (SomeSecond query) = SomeSecond (QueryIfCurrentBabbage query) + injConway (SomeSecond query) = SomeSecond (QueryIfCurrentConway query) injAnytimeByron (Some query) = SomeSecond (QueryAnytimeByron query) injAnytimeShelley (Some query) = SomeSecond (QueryAnytimeShelley query) injAnytimeAllegra (Some query) = SomeSecond (QueryAnytimeAllegra query) injAnytimeMary (Some query) = SomeSecond (QueryAnytimeMary query) injAnytimeAlonzo (Some query) = SomeSecond (QueryAnytimeAlonzo query) injAnytimeBabbage (Some query) = SomeSecond (QueryAnytimeBabbage query) + injAnytimeConway (Some query) = SomeSecond (QueryAnytimeConway query) injHardFork (Some query) = SomeSecond (QueryHardFork query) instance Arbitrary History.EraEnd where @@ -612,7 +668,7 @@ instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) (SomeResult (CardanoBlock c))) where arbitrary = frequency - [ (1, arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbage) + [ (1, arbitraryNodeToClient injByron injShelley injAllegra injMary injAlonzo injBabbage injConway) , (1, WithVersion <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) <*> genQueryIfCurrentResultEraMismatch) @@ -634,6 +690,9 @@ instance c ~ MockCryptoCompatByron , (1, WithVersion <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) <*> genQueryAnytimeResultBabbage) + , (1, WithVersion + <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) + <*> genQueryAnytimeResultConway) , (1, WithVersion <$> (getHardForkEnabledNodeToClientVersion <$> arbitrary) <*> genQueryHardForkResult) @@ -645,6 +704,7 @@ instance c ~ MockCryptoCompatByron injMary (SomeResult q r) = SomeResult (QueryIfCurrentMary q) (QueryResultSuccess r) injAlonzo (SomeResult q r) = SomeResult (QueryIfCurrentAlonzo q) (QueryResultSuccess r) injBabbage (SomeResult q r) = SomeResult (QueryIfCurrentBabbage q) (QueryResultSuccess r) + injConway (SomeResult q r) = SomeResult (QueryIfCurrentConway q) (QueryResultSuccess r) -- In practice, when sending a Byron query you'll never get a mismatch -- saying that your query is from the Shelley era while the ledger is @@ -671,6 +731,9 @@ instance c ~ MockCryptoCompatByron , (\(SomeResult q (_ :: result)) mismatch -> SomeResult (QueryIfCurrentBabbage q) (Left @_ @result mismatch)) <$> arbitrary <*> arbitrary + , (\(SomeResult q (_ :: result)) mismatch -> + SomeResult (QueryIfCurrentConway q) (Left @_ @result mismatch)) + <$> arbitrary <*> arbitrary ] genQueryAnytimeResultByron :: Gen (SomeResult (CardanoBlock c)) @@ -697,6 +760,10 @@ instance c ~ MockCryptoCompatByron genQueryAnytimeResultBabbage = SomeResult (QueryAnytimeBabbage GetEraStart) <$> arbitrary + genQueryAnytimeResultConway :: Gen (SomeResult (CardanoBlock c)) + genQueryAnytimeResultConway = + SomeResult (QueryAnytimeConway GetEraStart) <$> arbitrary + genQueryHardForkResult :: Gen (SomeResult (CardanoBlock c)) genQueryHardForkResult = oneof [ SomeResult (QueryHardFork GetInterpreter) <$> arbitrary diff --git a/ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs b/ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs index 0938901ea72..4c76c1d8ac5 100644 --- a/ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs +++ b/ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs @@ -136,7 +136,9 @@ type ShelleyBasedHardForkConstraints proto1 era1 proto2 era2 = , SL.TranslationError era2 SL.NewEpochState ~ Void , SL.TranslationError era2 SL.ShelleyGenesis ~ Void - , SL.TranslationContext era1 ~ () + , SL.AdditionalGenesisConfig era1 ~ () + , SL.TranslationContext era1 ~ () + , SL.AdditionalGenesisConfig era2 ~ SL.TranslationContext era2 -- At the moment, fix the protocols together , EraCrypto era1 ~ EraCrypto era2 , PraosCrypto (EraCrypto era1) @@ -265,7 +267,7 @@ protocolInfoShelleyBasedHardFork protocolParamsShelleyBased protocolInfo1 = protocolInfoTPraosShelleyBased protocolParamsShelleyBased - () -- trivial translation context + ((), ()) -- trivial additional Genesis config and translation context protVer1 (TxLimits.mkOverrides TxLimits.noOverridesMeasure) @@ -298,7 +300,7 @@ protocolInfoShelleyBasedHardFork protocolParamsShelleyBased , shelleyBasedInitialNonce , shelleyBasedLeaderCredentials } - transCtxt2 + (transCtxt2, transCtxt2) protVer2 (TxLimits.mkOverrides TxLimits.noOverridesMeasure) diff --git a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/ByronCompatibility.hs b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/ByronCompatibility.hs index 2623bc7e60d..743df15d1f2 100644 --- a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/ByronCompatibility.hs +++ b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/ByronCompatibility.hs @@ -132,6 +132,7 @@ toCardanoCodecConfig codecConfigByron = ShelleyCodecConfig ShelleyCodecConfig ShelleyCodecConfig + ShelleyCodecConfig {------------------------------------------------------------------------------ Byron to Cardano diff --git a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Golden.hs b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Golden.hs index 6c0b47d1cf7..26f76ae1b03 100644 --- a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Golden.hs +++ b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Golden.hs @@ -34,6 +34,7 @@ instance CardanoHardForkConstraints c CardanoNodeToNodeVersion4 -> "CardanoNodeToNodeVersion4" CardanoNodeToNodeVersion5 -> "CardanoNodeToNodeVersion5" CardanoNodeToNodeVersion6 -> "CardanoNodeToNodeVersion6" + CardanoNodeToNodeVersion7 -> "CardanoNodeToNodeVersion7" _ -> error $ "Unknown version: " <> show v instance CardanoHardForkConstraints c @@ -49,4 +50,5 @@ instance CardanoHardForkConstraints c CardanoNodeToClientVersion8 -> "CardanoNodeToClientVersion8" CardanoNodeToClientVersion9 -> "CardanoNodeToClientVersion9" CardanoNodeToClientVersion10 -> "CardanoNodeToClientVersion10" + CardanoNodeToClientVersion11 -> "CardanoNodeToClientVersion11" _ -> error $ "Unknown version: " <> show blockVersion diff --git a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs index 36fbe00231d..03ad2c21bd0 100644 --- a/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs +++ b/ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs @@ -49,19 +49,21 @@ testCodecCfg = ShelleyCodecConfig ShelleyCodecConfig ShelleyCodecConfig + ShelleyCodecConfig dictNestedHdr :: forall a. NestedCtxt_ (CardanoBlock MockCryptoCompatByron) Header a -> Dict (Eq a, Show a) dictNestedHdr = \case - NCZ (CtxtByronBoundary {}) -> Dict - NCZ (CtxtByronRegular {}) -> Dict - NCS (NCZ CtxtShelley) -> Dict - NCS (NCS (NCZ CtxtShelley)) -> Dict - NCS (NCS (NCS (NCZ CtxtShelley))) -> Dict - NCS (NCS (NCS (NCS (NCZ CtxtShelley)))) -> Dict - NCS (NCS (NCS (NCS (NCS (NCZ CtxtShelley))))) -> Dict + NCZ (CtxtByronBoundary {}) -> Dict + NCZ (CtxtByronRegular {}) -> Dict + NCS (NCZ CtxtShelley) -> Dict + NCS (NCS (NCZ CtxtShelley)) -> Dict + NCS (NCS (NCS (NCZ CtxtShelley))) -> Dict + NCS (NCS (NCS (NCS (NCZ CtxtShelley)))) -> Dict + NCS (NCS (NCS (NCS (NCS (NCZ CtxtShelley))))) -> Dict + NCS (NCS (NCS (NCS (NCS (NCS (NCZ CtxtShelley)))))) -> Dict {------------------------------------------------------------------------------- BinaryBlockInfo diff --git a/ouroboros-consensus-cardano-test/test/Test/ThreadNet/Cardano.hs b/ouroboros-consensus-cardano-test/test/Test/ThreadNet/Cardano.hs index 7f43ddfde33..4c2d1d66352 100644 --- a/ouroboros-consensus-cardano-test/test/Test/ThreadNet/Cardano.hs +++ b/ouroboros-consensus-cardano-test/test/Test/ThreadNet/Cardano.hs @@ -47,6 +47,7 @@ import Ouroboros.Consensus.Byron.Ledger.Conversions import Ouroboros.Consensus.Byron.Node import qualified Cardano.Ledger.BaseTypes as SL (ActiveSlotCoeff) +import qualified Cardano.Ledger.Conway.Genesis as SL import qualified Cardano.Ledger.Shelley.API as SL import Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol () @@ -77,7 +78,7 @@ import Test.Util.TestEnv import Ouroboros.Consensus.Protocol.Praos.Translate () import Ouroboros.Consensus.Shelley.Node.Praos - (ProtocolParamsBabbage (..)) + (ProtocolParamsBabbage (..), ProtocolParamsConway (..)) import Test.ThreadNet.Infra.TwoEras -- | Use 'MockCryptoCompatByron' so that bootstrap addresses and @@ -525,8 +526,12 @@ mkProtocolCardanoAndHardForkTxs , alonzoMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } ProtocolParamsBabbage { - babbageProtVer = SL.ProtVer babbageMajorVersion 0 - , babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure + babbageProtVer = SL.ProtVer babbageMajorVersion 0 + , babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure + } + ProtocolParamsConway { + conwayProtVer = SL.ProtVer conwayMajorVersion 0 + , conwayMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } protocolParamsByronShelley ProtocolTransitionParamsShelleyBased { @@ -549,6 +554,14 @@ mkProtocolCardanoAndHardForkTxs , transitionTrigger = TriggerHardForkAtVersion babbageMajorVersion } + ProtocolTransitionParamsShelleyBased { + transitionTranslationContext = + -- Note that this is effectively a no-op, which is fine for + -- testing, at least for now. + SL.ConwayGenesis $ SL.GenDelegs $ sgGenDelegs genesisShelley + , transitionTrigger = + TriggerHardForkAtVersion conwayMajorVersion + } -- Byron @@ -604,11 +617,16 @@ maryMajorVersion = allegraMajorVersion + 1 alonzoMajorVersion :: Num a => a alonzoMajorVersion = maryMajorVersion + 1 --- | The major protocol version of babbage in this test +-- | The major protocol version of Babbage in this test -- babbageMajorVersion :: Num a => a babbageMajorVersion = alonzoMajorVersion + 1 +-- | The major protocol version of Conway in this test +-- +conwayMajorVersion :: Num a => a +conwayMajorVersion = babbageMajorVersion + 1 + -- | The initial minor protocol version of Byron in this test -- -- See 'byronMajorVersion' diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/Header_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/Header_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/Header_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/SerialisedHeader_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/SerialisedHeader_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion5/SerialisedHeader_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/Header_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/Header_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/Header_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/SerialisedHeader_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/SerialisedHeader_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion6/SerialisedHeader_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Allegra b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Allegra new file mode 100644 index 00000000000..62f50c036ce Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Allegra differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Alonzo b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Alonzo new file mode 100644 index 00000000000..dc3903d3a62 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Alonzo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Babbage b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Babbage new file mode 100644 index 00000000000..557d4c00497 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Babbage differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Byron_EBB b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Byron_EBB new file mode 100644 index 00000000000..d2bc47fdf75 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Byron_EBB differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Byron_regular b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Byron_regular new file mode 100644 index 00000000000..ce89fa545b3 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Byron_regular differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Mary b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Mary new file mode 100644 index 00000000000..14d8281f933 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Mary differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Shelley b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Shelley new file mode 100644 index 00000000000..7d900c96a82 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Block_Shelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Allegra b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Allegra new file mode 100644 index 00000000000..bd1ec7ac7da --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Allegra @@ -0,0 +1 @@ +X 654IF?O{[hV \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Alonzo b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Alonzo new file mode 100644 index 00000000000..6e6d3158a71 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Alonzo @@ -0,0 +1 @@ +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Babbage b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Babbage new file mode 100644 index 00000000000..d33028ffd27 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Babbage @@ -0,0 +1 @@ +X |a!bI©I&pZ\KpM \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Byron b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Byron new file mode 100644 index 00000000000..a07d334baac Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Conway new file mode 100644 index 00000000000..91b857c2175 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Conway @@ -0,0 +1 @@ +X |a!bI©I&pZ\KpM \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Mary b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Mary new file mode 100644 index 00000000000..1235567289b --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Mary @@ -0,0 +1 @@ +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Shelley b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Shelley new file mode 100644 index 00000000000..667dbef8eaf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTxId_Shelley @@ -0,0 +1 @@ +X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Allegra b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Allegra new file mode 100644 index 00000000000..9470c745cbf Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Allegra differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Alonzo b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Alonzo new file mode 100644 index 00000000000..558dfbcca80 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Alonzo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Babbage b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Babbage new file mode 100644 index 00000000000..709e8951d5c Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Babbage differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Byron b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Byron new file mode 100644 index 00000000000..9c10e1bb390 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Conway new file mode 100644 index 00000000000..0ae146fc33e Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Mary b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Mary new file mode 100644 index 00000000000..1d7d61fa77a Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Mary differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Shelley b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Shelley new file mode 100644 index 00000000000..d41c1aacc85 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/GenTx_Shelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Allegra b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Allegra new file mode 100644 index 00000000000..8e5e06a152f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Allegra differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Alonzo b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Alonzo new file mode 100644 index 00000000000..a446de19eb3 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Alonzo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Babbage b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Babbage new file mode 100644 index 00000000000..e0cb05ee152 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Babbage differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Byron_EBB b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Byron_EBB new file mode 100644 index 00000000000..f69f3d57969 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Byron_EBB differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Byron_regular b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Byron_regular new file mode 100644 index 00000000000..749614e068b Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Byron_regular differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Conway new file mode 100644 index 00000000000..fa06cf0cf0f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Mary b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Mary new file mode 100644 index 00000000000..b07156aa398 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Mary differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Shelley b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Shelley new file mode 100644 index 00000000000..2aad81040df Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/Header_Shelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Allegra b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Allegra new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Allegra @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Alonzo new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Alonzo @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Babbage b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Babbage new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Babbage @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Byron_EBB new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Byron_EBB @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Byron_regular new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Byron_regular @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Mary b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Mary new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Mary @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Shelley b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Shelley new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedBlock_Shelley @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Allegra b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Allegra new file mode 100644 index 00000000000..fc2db110cd8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Allegra @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Alonzo b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Alonzo new file mode 100644 index 00000000000..bd4f42fa98f --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Alonzo @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Babbage b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Babbage new file mode 100644 index 00000000000..ea805c4a854 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Babbage @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Byron_EBB b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Byron_EBB new file mode 100644 index 00000000000..71629ccde7e Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Byron_EBB differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Byron_regular b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Byron_regular new file mode 100644 index 00000000000..9f4c849c9c7 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Byron_regular differ diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Conway b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Conway new file mode 100644 index 00000000000..9225aa4174a --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Conway @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Mary b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Mary new file mode 100644 index 00000000000..f8aa87eb5cf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Mary @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Shelley b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Shelley new file mode 100644 index 00000000000..d5a1a05c355 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/CardanoNodeToNodeVersion7/SerialisedHeader_Shelley @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/ApplyTxErr_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/ApplyTxErr_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/ApplyTxErr_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetCurrentPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetCurrentPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetEpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetEpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetGenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetGenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetLedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetLedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetNonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetStakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Query_Conway_GetStakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_EmptyPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_EmptyPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_EpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_EpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_GenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_GenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_LedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_LedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_NonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_NonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_StakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/SlotNo_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/SlotNo_Conway new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion1/CardanoNodeToClientVersion7/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/ApplyTxErr_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/ApplyTxErr_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/ApplyTxErr_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetCurrentPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetCurrentPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetEpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetEpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetGenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetGenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetLedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetLedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetNonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetStakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Query_Conway_GetStakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_EmptyPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_EmptyPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_EpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_EpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_GenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_GenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_LedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_LedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_NonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_NonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_StakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/SlotNo_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/SlotNo_Conway new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion10/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Allegra b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Allegra new file mode 100644 index 00000000000..018b7bc479f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Allegra differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Alonzo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Alonzo new file mode 100644 index 00000000000..d9c76ed7084 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Alonzo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Babbage b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Babbage new file mode 100644 index 00000000000..dcabd6d2749 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Babbage differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Byron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Byron new file mode 100644 index 00000000000..17283096221 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Conway new file mode 100644 index 00000000000..a663b276da9 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Mary b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Mary new file mode 100644 index 00000000000..f0ab5dd8811 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Mary differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Shelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Shelley new file mode 100644 index 00000000000..15bf711ff08 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_Shelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_WrongEraByron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_WrongEraByron new file mode 100644 index 00000000000..9735c28d234 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_WrongEraByron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_WrongEraShelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_WrongEraShelley new file mode 100644 index 00000000000..43f2fa8267f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/ApplyTxErr_WrongEraShelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Allegra b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Allegra new file mode 100644 index 00000000000..62f50c036ce Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Allegra differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Alonzo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Alonzo new file mode 100644 index 00000000000..dc3903d3a62 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Alonzo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Babbage b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Babbage new file mode 100644 index 00000000000..557d4c00497 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Babbage differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Byron_EBB b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Byron_EBB new file mode 100644 index 00000000000..d2bc47fdf75 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Byron_EBB differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Byron_regular b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Byron_regular new file mode 100644 index 00000000000..ce89fa545b3 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Byron_regular differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Mary b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Mary new file mode 100644 index 00000000000..14d8281f933 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Mary differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Shelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Shelley new file mode 100644 index 00000000000..7d900c96a82 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Block_Shelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra new file mode 100644 index 00000000000..bd1ec7ac7da --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra @@ -0,0 +1 @@ +X 654IF?O{[hV \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo new file mode 100644 index 00000000000..6e6d3158a71 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo @@ -0,0 +1 @@ +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage new file mode 100644 index 00000000000..d33028ffd27 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage @@ -0,0 +1 @@ +X |a!bI©I&pZ\KpM \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron new file mode 100644 index 00000000000..a07d334baac Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway new file mode 100644 index 00000000000..91b857c2175 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway @@ -0,0 +1 @@ +X |a!bI©I&pZ\KpM \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary new file mode 100644 index 00000000000..1235567289b --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary @@ -0,0 +1 @@ +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Shelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Shelley new file mode 100644 index 00000000000..667dbef8eaf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Shelley @@ -0,0 +1 @@ +X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Allegra b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Allegra new file mode 100644 index 00000000000..9470c745cbf Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Allegra differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Alonzo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Alonzo new file mode 100644 index 00000000000..558dfbcca80 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Alonzo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Babbage b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Babbage new file mode 100644 index 00000000000..709e8951d5c Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Babbage differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Byron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Byron new file mode 100644 index 00000000000..9c10e1bb390 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Conway new file mode 100644 index 00000000000..0ae146fc33e Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Mary b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Mary new file mode 100644 index 00000000000..1d7d61fa77a Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Mary differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Shelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Shelley new file mode 100644 index 00000000000..d41c1aacc85 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/GenTx_Shelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetCurrentPParams new file mode 100644 index 00000000000..4d12a7ad6bf Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetCurrentPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetEpochNo new file mode 100644 index 00000000000..1d07267558d Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetEpochNo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetGenesisConfig new file mode 100644 index 00000000000..6741a401cb0 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetGenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetLedgerTip new file mode 100644 index 00000000000..6706725ac78 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetLedgerTip differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..08c5c789e98 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetNonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetProposedPParamsUpdates new file mode 100644 index 00000000000..e85ed2037e6 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetProposedPParamsUpdates differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetStakeDistribution new file mode 100644 index 00000000000..b5f799b2700 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Allegra_GetStakeDistribution differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetCurrentPParams new file mode 100644 index 00000000000..046b306d4dd Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetCurrentPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetEpochNo new file mode 100644 index 00000000000..a6f766751b9 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetEpochNo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetGenesisConfig new file mode 100644 index 00000000000..f701524d73c Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetGenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetLedgerTip new file mode 100644 index 00000000000..d9a18e85a2d Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetLedgerTip differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..58e70d849d7 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetNonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetProposedPParamsUpdates new file mode 100644 index 00000000000..3e58e98cc2b Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetProposedPParamsUpdates differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetStakeDistribution new file mode 100644 index 00000000000..e5308b275a2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Alonzo_GetStakeDistribution differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_AnytimeByron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_AnytimeByron new file mode 100644 index 00000000000..6fd42d60433 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_AnytimeByron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_AnytimeShelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_AnytimeShelley new file mode 100644 index 00000000000..d82b9fc7f4d Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_AnytimeShelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetCurrentPParams new file mode 100644 index 00000000000..cd6d53bc792 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetCurrentPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetEpochNo new file mode 100644 index 00000000000..f5ea7bd0850 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetEpochNo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetGenesisConfig new file mode 100644 index 00000000000..e6ee8c45c44 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetGenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetLedgerTip new file mode 100644 index 00000000000..4d00b4e9fac Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetLedgerTip differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..b5217dc67a9 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetNonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetProposedPParamsUpdates new file mode 100644 index 00000000000..62efc1c1eaa Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetProposedPParamsUpdates differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetStakeDistribution new file mode 100644 index 00000000000..41aeabd30d5 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Babbage_GetStakeDistribution differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Byron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Byron new file mode 100644 index 00000000000..cfa4236d512 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetCurrentPParams new file mode 100644 index 00000000000..05f2ba97731 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetCurrentPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetEpochNo new file mode 100644 index 00000000000..915b078647d Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetEpochNo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetGenesisConfig new file mode 100644 index 00000000000..70189500e98 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetGenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetLedgerTip new file mode 100644 index 00000000000..7337b0de4e0 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetLedgerTip differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..b47684f4c36 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetNonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 00000000000..38afb223542 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetProposedPParamsUpdates differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetStakeDistribution new file mode 100644 index 00000000000..89ed187e31c Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Conway_GetStakeDistribution differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_HardFork b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_HardFork new file mode 100644 index 00000000000..64c266fdc58 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_HardFork differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetCurrentPParams new file mode 100644 index 00000000000..7338cd74165 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetCurrentPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetEpochNo new file mode 100644 index 00000000000..58e4767132c Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetEpochNo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetGenesisConfig new file mode 100644 index 00000000000..2306eb025ee Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetGenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetLedgerTip new file mode 100644 index 00000000000..c5b7ef04972 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetLedgerTip differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..72f3ff8f93a Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetNonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetProposedPParamsUpdates new file mode 100644 index 00000000000..b833d91e655 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetProposedPParamsUpdates differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetStakeDistribution new file mode 100644 index 00000000000..e63d41b76df Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Mary_GetStakeDistribution differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetCurrentPParams new file mode 100644 index 00000000000..cafc5b72906 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetCurrentPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetEpochNo new file mode 100644 index 00000000000..112bec95a37 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetEpochNo differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetGenesisConfig new file mode 100644 index 00000000000..bca99cf2547 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetGenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetLedgerTip new file mode 100644 index 00000000000..33dba00f05a Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetLedgerTip differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..57e64f50fba Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetNonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetProposedPParamsUpdates new file mode 100644 index 00000000000..8fe4019886f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetProposedPParamsUpdates differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetStakeDistribution new file mode 100644 index 00000000000..8d50b1f974d Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Query_Shelley_GetStakeDistribution differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_EmptyPParams new file mode 100644 index 00000000000..654d3fbfbe1 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_EmptyPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_EpochNo new file mode 100644 index 00000000000..b1803703794 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_GenesisConfig new file mode 100644 index 00000000000..94d05d956e2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_GenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_LedgerTip new file mode 100644 index 00000000000..1207f8df8c9 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_LedgerTip @@ -0,0 +1 @@ + X TF bNެKwy=Th|Y \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_NonMyopicMemberRewards new file mode 100644 index 00000000000..c47618c1704 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_NonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_ProposedPParamsUpdates new file mode 100644 index 00000000000..4918531195d --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution new file mode 100644 index 00000000000..968f15663df --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EmptyPParams new file mode 100644 index 00000000000..545141fa69d Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EmptyPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EpochNo new file mode 100644 index 00000000000..b1803703794 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_GenesisConfig new file mode 100644 index 00000000000..94d05d956e2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_GenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_LedgerTip new file mode 100644 index 00000000000..a8d3ebca892 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_LedgerTip @@ -0,0 +1 @@ + X 8ofo&&&nss$& \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_NonMyopicMemberRewards new file mode 100644 index 00000000000..c47618c1704 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_NonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_ProposedPParamsUpdates new file mode 100644 index 00000000000..4080e95c54e --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution new file mode 100644 index 00000000000..968f15663df --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_AnytimeByron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_AnytimeByron new file mode 100644 index 00000000000..070897ad04f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_AnytimeByron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_AnytimeShelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_AnytimeShelley new file mode 100644 index 00000000000..61dee1376e4 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_AnytimeShelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EmptyPParams new file mode 100644 index 00000000000..73e5f524510 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EmptyPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EpochNo new file mode 100644 index 00000000000..b1803703794 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_GenesisConfig new file mode 100644 index 00000000000..94d05d956e2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_GenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_LedgerTip new file mode 100644 index 00000000000..d5deba49be4 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_LedgerTip @@ -0,0 +1 @@ + X Jk{(*h k*!2O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_NonMyopicMemberRewards new file mode 100644 index 00000000000..c47618c1704 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_NonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_ProposedPParamsUpdates new file mode 100644 index 00000000000..4080e95c54e --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution new file mode 100644 index 00000000000..968f15663df --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Byron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Byron new file mode 100644 index 00000000000..d66107b64e8 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Byron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_EmptyPParams new file mode 100644 index 00000000000..73e5f524510 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_EmptyPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_EpochNo new file mode 100644 index 00000000000..b1803703794 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_GenesisConfig new file mode 100644 index 00000000000..94d05d956e2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_GenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_LedgerTip new file mode 100644 index 00000000000..d5deba49be4 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_LedgerTip @@ -0,0 +1 @@ + X Jk{(*h k*!2O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_NonMyopicMemberRewards new file mode 100644 index 00000000000..c47618c1704 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_NonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 00000000000..4080e95c54e --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_StakeDistribution new file mode 100644 index 00000000000..968f15663df --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_EraMismatchByron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_EraMismatchByron new file mode 100644 index 00000000000..9735c28d234 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_EraMismatchByron differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_EraMismatchShelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_EraMismatchShelley new file mode 100644 index 00000000000..43f2fa8267f Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_EraMismatchShelley differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_HardFork b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_HardFork new file mode 100644 index 00000000000..af17ee258b7 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_HardFork differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_EmptyPParams new file mode 100644 index 00000000000..654d3fbfbe1 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_EmptyPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_EpochNo new file mode 100644 index 00000000000..b1803703794 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_GenesisConfig new file mode 100644 index 00000000000..94d05d956e2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_GenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_LedgerTip new file mode 100644 index 00000000000..6ec12660a79 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_LedgerTip @@ -0,0 +1 @@ + X EŽb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_EmptyPParams new file mode 100644 index 00000000000..654d3fbfbe1 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_EmptyPParams differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_EpochNo new file mode 100644 index 00000000000..b1803703794 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_GenesisConfig new file mode 100644 index 00000000000..94d05d956e2 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_GenesisConfig differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_LedgerTip new file mode 100644 index 00000000000..32d3f65a358 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_LedgerTip @@ -0,0 +1 @@ + X u'9Ki(׺yC)l \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_NonMyopicMemberRewards new file mode 100644 index 00000000000..c47618c1704 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_NonMyopicMemberRewards differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_ProposedPParamsUpdates new file mode 100644 index 00000000000..4918531195d --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution new file mode 100644 index 00000000000..968f15663df --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Allegra b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Allegra new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Allegra @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Alonzo new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Alonzo @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Babbage b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Babbage new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Babbage @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Byron_EBB new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Byron_EBB @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Byron_regular new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Byron_regular @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Mary b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Mary new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Mary @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Shelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Shelley new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SerialisedBlock_Shelley @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Allegra b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Allegra new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Allegra @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Alonzo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Alonzo new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Alonzo @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Babbage b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Babbage new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Babbage @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Byron b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Byron new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Byron @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Conway new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Mary b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Mary new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Mary @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Shelley b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Shelley new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion11/SlotNo_Shelley @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/ApplyTxErr_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/ApplyTxErr_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/ApplyTxErr_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetCurrentPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetCurrentPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetEpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetEpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetGenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetGenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetLedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetLedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetNonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetStakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Query_Conway_GetStakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_EmptyPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_EmptyPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_EpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_EpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_GenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_GenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_LedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_LedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_NonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_NonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_StakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/SlotNo_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/SlotNo_Conway new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion7/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/ApplyTxErr_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/ApplyTxErr_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/ApplyTxErr_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetCurrentPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetCurrentPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetEpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetEpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetGenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetGenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetLedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetLedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetNonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetStakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Query_Conway_GetStakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_EmptyPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_EmptyPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_EpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_EpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_GenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_GenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_LedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_LedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_NonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_NonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_StakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/SlotNo_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/SlotNo_Conway new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion8/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/ApplyTxErr_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/ApplyTxErr_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/ApplyTxErr_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Block_Conway new file mode 100644 index 00000000000..fc468f90e43 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/GenTx_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/GenTx_Conway new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/GenTx_Conway @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetCurrentPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetCurrentPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetEpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetEpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetGenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetGenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetLedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetLedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetNonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetStakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Query_Conway_GetStakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_EmptyPParams new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_EmptyPParams @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_EpochNo b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_EpochNo new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_EpochNo @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_GenesisConfig b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_GenesisConfig new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_GenesisConfig @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_LedgerTip b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_LedgerTip new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_LedgerTip @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_NonMyopicMemberRewards b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_NonMyopicMemberRewards new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_NonMyopicMemberRewards @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_StakeDistribution new file mode 100644 index 00000000000..121d3fcf344 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/SerialisedBlock_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/SerialisedBlock_Conway new file mode 100644 index 00000000000..6a5024d0dcf --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/SlotNo_Conway b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/SlotNo_Conway new file mode 100644 index 00000000000..d9ba7315ac8 --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/QueryVersion2/CardanoNodeToClientVersion9/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/AnnTip_Conway b/ouroboros-consensus-cardano-test/test/golden/disk/AnnTip_Conway new file mode 100644 index 00000000000..64565884d5e --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/disk/AnnTip_Conway @@ -0,0 +1,2 @@ +X  +.uL9bW燆L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/Block_Conway b/ouroboros-consensus-cardano-test/test/golden/disk/Block_Conway new file mode 100644 index 00000000000..697433a0c0c Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/disk/Block_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/ChainDepState_Conway b/ouroboros-consensus-cardano-test/test/golden/disk/ChainDepState_Conway new file mode 100644 index 00000000000..5043da9e145 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/disk/ChainDepState_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Conway b/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Conway new file mode 100644 index 00000000000..8d8c26c2364 Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Conway differ diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/HeaderHash_Conway b/ouroboros-consensus-cardano-test/test/golden/disk/HeaderHash_Conway new file mode 100644 index 00000000000..01b0ead20fa --- /dev/null +++ b/ouroboros-consensus-cardano-test/test/golden/disk/HeaderHash_Conway @@ -0,0 +1,2 @@ +X  +.uL9bW燆L \ No newline at end of file diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Conway b/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Conway new file mode 100644 index 00000000000..900707b0b1e Binary files /dev/null and b/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Conway differ diff --git a/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal b/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal index 02d1888dc11..c615be29d1d 100644 --- a/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal +++ b/ouroboros-consensus-cardano-tools/ouroboros-consensus-cardano-tools.cabal @@ -70,6 +70,7 @@ library , cardano-ledger-alonzo , cardano-ledger-babbage , cardano-ledger-byron + , cardano-ledger-conway , cardano-ledger-core , cardano-ledger-shelley , cardano-protocol-tpraos @@ -96,6 +97,7 @@ library , Cardano.Node.Protocol.Alonzo , Cardano.Node.Protocol.Byron , Cardano.Node.Protocol.Cardano + , Cardano.Node.Protocol.Conway , Cardano.Node.Protocol.Shelley , Cardano.Tools.DBAnalyser.Analysis.BenchmarkLedgerOps.SlotDataPoint diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Api/Protocol/Types.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Api/Protocol/Types.hs index 9433454c712..14926d50b56 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Api/Protocol/Types.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Api/Protocol/Types.hs @@ -69,11 +69,13 @@ instance (CardanoHardForkConstraints StandardCrypto, IOLike m) => Protocol m (Ca (ProtocolParamsMary StandardCrypto) (ProtocolParamsAlonzo StandardCrypto) (ProtocolParamsBabbage StandardCrypto) + (ProtocolParamsConway StandardCrypto) (ProtocolTransitionParamsShelleyBased StandardShelley) (ProtocolTransitionParamsShelleyBased StandardAllegra) (ProtocolTransitionParamsShelleyBased StandardMary) (ProtocolTransitionParamsShelleyBased StandardAlonzo) (ProtocolTransitionParamsShelleyBased StandardBabbage) + (ProtocolTransitionParamsShelleyBased StandardConway) protocolInfo (ProtocolInfoArgsCardano paramsByron @@ -83,11 +85,13 @@ instance (CardanoHardForkConstraints StandardCrypto, IOLike m) => Protocol m (Ca paramsMary paramsAlonzo paramsBabbage + paramsConway paramsByronShelley paramsShelleyAllegra paramsAllegraMary paramsMaryAlonzo - paramsAlonzoBabbage) = + paramsAlonzoBabbage + paramsAlonzoConway) = protocolInfoCardano paramsByron paramsShelleyBased @@ -96,11 +100,13 @@ instance (CardanoHardForkConstraints StandardCrypto, IOLike m) => Protocol m (Ca paramsMary paramsAlonzo paramsBabbage + paramsConway paramsByronShelley paramsShelleyAllegra paramsAllegraMary paramsMaryAlonzo paramsAlonzoBabbage + paramsAlonzoConway instance ProtocolClient ByronBlockHFC where data ProtocolClientInfoArgs ByronBlockHFC = diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol.hs index 6a3a9ccb979..b88efa3b61d 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol.hs @@ -40,12 +40,14 @@ mkConsensusProtocol ncProtocolConfig mProtocolFiles = NodeProtocolConfigurationCardano byronConfig shelleyConfig alonzoConfig + conwayConfig hardForkConfig -> firstExceptT CardanoProtocolInstantiationError $ mkSomeConsensusProtocolCardano byronConfig shelleyConfig alonzoConfig + conwayConfig hardForkConfig mProtocolFiles diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Cardano.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Cardano.hs index 8690fb20b51..82085e1ca8d 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Cardano.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Cardano.hs @@ -32,6 +32,7 @@ import Cardano.Api.Protocol.Types import qualified Cardano.Node.Protocol.Alonzo as Alonzo import qualified Cardano.Node.Protocol.Byron as Byron +import qualified Cardano.Node.Protocol.Conway as Conway import qualified Cardano.Node.Protocol.Shelley as Shelley import Cardano.Node.Protocol.Types import Cardano.Node.Types @@ -57,6 +58,7 @@ mkSomeConsensusProtocolCardano :: NodeByronProtocolConfiguration -> NodeShelleyProtocolConfiguration -> NodeAlonzoProtocolConfiguration + -> NodeConwayProtocolConfiguration -> NodeHardForkProtocolConfiguration -> Maybe ProtocolFilepaths -> ExceptT CardanoProtocolInstantiationError IO SomeConsensusProtocol @@ -79,6 +81,10 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { npcAlonzoGenesisFile, npcAlonzoGenesisFileHash } + NodeConwayProtocolConfiguration { + npcConwayGenesisFile, + npcConwayGenesisFileHash + } NodeHardForkProtocolConfiguration { npcTestEnableDevelopmentHardForkEras, -- During testing of the Alonzo era, we conditionally declared that we @@ -95,7 +101,9 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { npcTestAlonzoHardForkAtEpoch, npcTestAlonzoHardForkAtVersion, npcTestBabbageHardForkAtEpoch, - npcTestBabbageHardForkAtVersion + npcTestBabbageHardForkAtVersion, + npcTestConwayHardForkAtEpoch, + npcTestConwayHardForkAtVersion } files = do byronGenesis <- @@ -118,6 +126,11 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { Alonzo.readGenesis npcAlonzoGenesisFile npcAlonzoGenesisFileHash + (conwayGenesis, _conwayGenesis) <- + firstExceptT CardanoProtocolInstantiationConwayGenesisReadError $ + Conway.readGenesis npcConwayGenesisFile + npcConwayGenesisFileHash + shelleyLeaderCredentials <- firstExceptT CardanoProtocolInstantiationPraosLeaderCredentialsError $ Shelley.readLeaderCredentials files @@ -200,17 +213,26 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { Praos.ProtocolParamsBabbage { -- This is /not/ the Babbage protocol version. It is the protocol -- version that this node will declare that it understands, when it - -- is in the Babbage era. Since Babbage is currently the last known - -- protocol version then this is also the Babbage protocol version. - Praos.babbageProtVer = - if npcTestEnableDevelopmentHardForkEras - then ProtVer 7 0 -- Advertise we can support Babbage - else ProtVer 6 0, -- Otherwise we only advertise we know about (the second) Alonzo + -- is in the Babbage era. + Praos.babbageProtVer = ProtVer 7 0, Praos.babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } - -- ProtocolParamsTransition specifies the parameters needed to transition between two eras - -- The comments below also apply for the Shelley -> Allegra and Allegra -> Mary hard forks. + Praos.ProtocolParamsConway { + -- This is /not/ the Conway protocol version. It is the protocol + -- version that this node will declare that it understands, when it + -- is in the Conway era. + Praos.conwayProtVer = + if npcTestEnableDevelopmentHardForkEras + then ProtVer 9 0 -- Advertise we can support Conway + else ProtVer 8 0, -- Otherwise we only advertise we know about Babbage + Praos.conwayMaxTxCapacityOverrides = + TxLimits.mkOverrides TxLimits.noOverridesMeasure + } + -- 'ProtocolTransitionParamsShelleyBased' specifies the parameters + -- needed to transition between two eras. The comments below also apply + -- for the Shelley -> Allegra and Allegra -> Mary hard forks. + -- -- Byron to Shelley hard fork parameters Consensus.ProtocolTransitionParamsShelleyBased { transitionTranslationContext = (), @@ -229,6 +251,8 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { -- Version 5 is Alonzo -- Version 6 is Alonzo (intra era hardfork) -- Version 7 is Babbage + -- Version 8 is Babbage (intra era hardfork) + -- Version 9 is Conway -- -- But we also provide an override to allow for simpler test setups -- such as triggering at the 0 -> 1 transition . @@ -277,6 +301,16 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo } + -- Babbage to Conway hard fork parameters + Consensus.ProtocolTransitionParamsShelleyBased { + transitionTranslationContext = conwayGenesis, + transitionTrigger = + case npcTestConwayHardForkAtEpoch of + Nothing -> Consensus.TriggerHardForkAtVersion + (maybe 9 fromIntegral npcTestConwayHardForkAtVersion) + Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo + + } ------------------------------------------------------------------------------ -- Errors @@ -292,6 +326,9 @@ data CardanoProtocolInstantiationError = | CardanoProtocolInstantiationAlonzoGenesisReadError Shelley.GenesisReadError + | CardanoProtocolInstantiationConwayGenesisReadError + Shelley.GenesisReadError + | CardanoProtocolInstantiationPraosLeaderCredentialsError Shelley.PraosLeaderCredentialsError @@ -306,6 +343,8 @@ instance Error CardanoProtocolInstantiationError where "Shelley related: " <> displayError err displayError (CardanoProtocolInstantiationAlonzoGenesisReadError err) = "Alonzo related: " <> displayError err + displayError (CardanoProtocolInstantiationConwayGenesisReadError err) = + "Conway related: " <> displayError err displayError (CardanoProtocolInstantiationPraosLeaderCredentialsError err) = displayError err displayError (CardanoProtocolInstantiationErrorAlonzo err) = diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Conway.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Conway.hs new file mode 100644 index 00000000000..df7a70ba25c --- /dev/null +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Protocol/Conway.hs @@ -0,0 +1,56 @@ +{-# LANGUAGE EmptyDataDeriving #-} + +-- TODO DUPLICATE? -- as-if adapted? from: cardano-node/src/Cardano/Node/Protocol/Conway.hs + +module Cardano.Node.Protocol.Conway ( + ConwayProtocolInstantiationError + -- * Reusable parts + , readGenesis + , validateGenesis + ) where + +import Cardano.Prelude + +import qualified Cardano.Ledger.Conway.Genesis as Conway +import qualified Cardano.Ledger.Crypto as Crypto + +import Cardano.Node.Protocol.Shelley (GenesisReadError, + readGenesisAny) +import Cardano.Node.Types + +-- +-- Conway genesis +-- + +readGenesis :: Crypto.Crypto c + => GenesisFile + -> Maybe GenesisHash + -> ExceptT GenesisReadError IO + (Conway.ConwayGenesis c, GenesisHash) +readGenesis = readGenesisAny + +validateGenesis :: Conway.ConwayGenesis c + -> ExceptT ConwayProtocolInstantiationError IO () +validateGenesis _ = return () --TODO conway: do the validation + +data ConwayProtocolInstantiationError +{- TODO + = InvalidCostModelError !FilePath + | CostModelExtractionError !FilePath + | ConwayCostModelFileError !(FileError ()) + | ConwayCostModelDecodeError !FilePath !String +-} + deriving Show + +{- TODO +instance Error ConwayProtocolInstantiationError where + displayError (InvalidCostModelError fp) = + "Invalid cost model: " <> show fp + displayError (CostModelExtractionError fp) = + "Error extracting the cost model at: " <> show fp + displayError (ConwayCostModelFileError err) = + displayError err + displayError (ConwayCostModelDecodeError fp err) = + "Error decoding cost model at: " <> show fp <> " Error: " <> err + +-} diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Types.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Types.hs index e3140b06cb2..ee51bf3614e 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Node/Types.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Node/Types.hs @@ -21,6 +21,7 @@ module Cardano.Node.Types ( -- * Consensus protocol configuration , NodeAlonzoProtocolConfiguration (..) , NodeByronProtocolConfiguration (..) + , NodeConwayProtocolConfiguration (..) , NodeHardForkProtocolConfiguration (..) , NodeProtocolConfiguration (..) , NodeShelleyProtocolConfiguration (..) @@ -118,6 +119,7 @@ data NodeProtocolConfiguration = | NodeProtocolConfigurationCardano NodeByronProtocolConfiguration NodeShelleyProtocolConfiguration NodeAlonzoProtocolConfiguration + NodeConwayProtocolConfiguration NodeHardForkProtocolConfiguration deriving (Eq, Show) @@ -163,6 +165,13 @@ data NodeByronProtocolConfiguration = } deriving (Eq, Show) +data NodeConwayProtocolConfiguration = + NodeConwayProtocolConfiguration { + npcConwayGenesisFile :: !GenesisFile + , npcConwayGenesisFileHash :: !(Maybe GenesisHash) + } + deriving (Eq, Show) + -- | Configuration relating to a hard forks themselves, not the specific eras. -- data NodeHardForkProtocolConfiguration = @@ -262,6 +271,16 @@ data NodeHardForkProtocolConfiguration = -- configured the same, or they will disagree. -- , npcTestBabbageHardForkAtVersion :: Maybe Word + + , npcTestConwayHardForkAtEpoch :: Maybe EpochNo + + -- | For testing purposes we support specifying that the hard fork + -- happens at a given major protocol version. + -- + -- Obviously if this is used, all the nodes in the test cluster must be + -- configured the same, or they will disagree. + -- + , npcTestConwayHardForkAtVersion :: Maybe Word } deriving (Eq, Show) @@ -274,10 +293,11 @@ instance AdjustFilePaths NodeProtocolConfiguration where adjustFilePaths f (NodeProtocolConfigurationShelley pc) = NodeProtocolConfigurationShelley (adjustFilePaths f pc) - adjustFilePaths f (NodeProtocolConfigurationCardano pcb pcs pca pch) = + adjustFilePaths f (NodeProtocolConfigurationCardano pcb pcs pca pcc pch) = NodeProtocolConfigurationCardano (adjustFilePaths f pcb) (adjustFilePaths f pcs) (adjustFilePaths f pca) + (adjustFilePaths f pcc) pch instance AdjustFilePaths NodeByronProtocolConfiguration where @@ -298,6 +318,12 @@ instance AdjustFilePaths NodeAlonzoProtocolConfiguration where } = x { npcAlonzoGenesisFile = adjustFilePaths f npcAlonzoGenesisFile } +instance AdjustFilePaths NodeConwayProtocolConfiguration where + adjustFilePaths f x@NodeConwayProtocolConfiguration { + npcConwayGenesisFile + } = + x { npcConwayGenesisFile = adjustFilePaths f npcConwayGenesisFile } + instance AdjustFilePaths GenesisFile where adjustFilePaths f (GenesisFile p) = GenesisFile (f p) diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Cardano.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Cardano.hs index 1d80904143e..6e70627cc21 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Cardano.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Cardano.hs @@ -40,6 +40,7 @@ import Cardano.Crypto (RequiresNetworkMagic (..)) import qualified Cardano.Crypto as Crypto import qualified Cardano.Crypto.Hash.Class as CryptoClass import qualified Cardano.Ledger.Alonzo.Genesis as SL (AlonzoGenesis) +import qualified Cardano.Ledger.Conway.Genesis as SL (ConwayGenesis) import Cardano.Ledger.Crypto import qualified Cardano.Ledger.Era as Core import qualified Cardano.Tools.DBAnalyser.Block.Byron as BlockByron @@ -137,6 +138,8 @@ instance HasProtocolInfo (CardanoBlock StandardCrypto) where Aeson.eitherDecodeFileStrict' (shelleyGenesisPath cc) genesisAlonzo <- either (error . show) return =<< Aeson.eitherDecodeFileStrict' (alonzoGenesisPath cc) + genesisConway <- either (error . show) return =<< + Aeson.eitherDecodeFileStrict' (conwayGenesisPath cc) initialNonce <- case shelleyGenesisHash cc of Just h -> pure h @@ -154,6 +157,7 @@ instance HasProtocolInfo (CardanoBlock StandardCrypto) where threshold genesisShelley genesisAlonzo + genesisConway initialNonce (hardForkTriggers cc) @@ -174,8 +178,11 @@ data CardanoConfig = CardanoConfig { -- | @AlonzoGenesisFile@ field , alonzoGenesisPath :: FilePath + -- | @ConwayGenesisFile@ field + , conwayGenesisPath :: FilePath + -- | @Test*HardForkAtEpoch@ for each Shelley era - , hardForkTriggers :: NP STA (CardanoShelleyEras StandardCrypto) + , hardForkTriggers :: NP ShelleyTransitionArguments (CardanoShelleyEras StandardCrypto) } instance AdjustFilePaths CardanoConfig where @@ -184,15 +191,25 @@ instance AdjustFilePaths CardanoConfig where byronGenesisPath = f $ byronGenesisPath cc , shelleyGenesisPath = f $ shelleyGenesisPath cc , alonzoGenesisPath = f $ alonzoGenesisPath cc + , conwayGenesisPath = f $ conwayGenesisPath cc + -- Byron, Shelley, Alonzo, and Conway are the only eras that have genesis + -- data. The actual genesis block is a Byron block, therefore we needed a + -- genesis file. To transition to Shelley, we needed to add some additional + -- genesis data (eg some initial values of new protocol parametrers like + -- @d@). Similarly in Alonzo (eg Plutus interpreter parameters/limits) and + -- in Conway too (ie keys of the new genesis delegates). + -- + -- In contrast, the Allegra, Mary, and Babbage eras did not introduce any new + -- genesis data. } -- | Shelley transition arguments -data STA :: Type -> Type where - STA :: - -- so far, the context is either () or AlonzoGenesis - (SL.AlonzoGenesis -> Core.TranslationContext era) +data ShelleyTransitionArguments :: Type -> Type where + ShelleyTransitionArguments :: + -- so far, the context is either () or AlonzoGenesis or ConwayGenesis + ((SL.AlonzoGenesis, SL.ConwayGenesis StandardCrypto) -> Core.TranslationContext era) -> TriggerHardFork - -> STA (ShelleyBlock proto era) + -> ShelleyTransitionArguments (ShelleyBlock proto era) instance Aeson.FromJSON CardanoConfig where parseJSON = Aeson.withObject "CardanoConfigFile" $ \v -> do @@ -211,14 +228,16 @@ instance Aeson.FromJSON CardanoConfig where alonzoGenesisPath <- v Aeson..: "AlonzoGenesisFile" + conwayGenesisPath <- v Aeson..: "ConwayGenesisFile" + hardForkTriggers <- do let f :: Aeson.Key -> Word16 -- ^ the argument to 'TriggerHardForkAtVersion' - -> (SL.AlonzoGenesis -> Core.TranslationContext era) - -> (Aeson.Parser :.: STA) (ShelleyBlock proto era) + -> ((SL.AlonzoGenesis, SL.ConwayGenesis StandardCrypto) -> Core.TranslationContext era) + -> (Aeson.Parser :.: ShelleyTransitionArguments) (ShelleyBlock proto era) f nm majProtVer ctxt = Comp $ - fmap (STA ctxt) + fmap (ShelleyTransitionArguments ctxt) $ (fmap TriggerHardForkAtEpoch <$> (v Aeson..:? nm)) Aeson..!= (TriggerHardForkAtVersion majProtVer) @@ -226,15 +245,16 @@ instance Aeson.FromJSON CardanoConfig where f "TestShelleyHardForkAtEpoch" 2 (\_ -> ()) :* f "TestAllegraHardForkAtEpoch" 3 (\_ -> ()) :* f "TestMaryHardForkAtEpoch" 4 (\_ -> ()) :* - f "TestAlonzoHardForkAtEpoch" 5 id :* - f "TestBabbageHardForkAtEpoch" 7 id :* + f "TestAlonzoHardForkAtEpoch" 5 fst :* + f "TestBabbageHardForkAtEpoch" 7 fst :* + f "TestConwayHardForkAtEpoch" 8 snd :* Nil - let isBad :: NP STA xs -> Bool + let isBad :: NP ShelleyTransitionArguments xs -> Bool isBad = \case - STA _ TriggerHardForkAtVersion{} :* STA _ TriggerHardForkAtEpoch{} :* _ -> True + ShelleyTransitionArguments _ TriggerHardForkAtVersion{} :* ShelleyTransitionArguments _ TriggerHardForkAtEpoch{} :* _ -> True - STA{} :* np -> isBad np + ShelleyTransitionArguments{} :* np -> isBad np Nil -> False fmap (\() -> stas) $ when (isBad stas) $ fail $ "if the Cardano config file sets a Test*HardForkEpoch," @@ -248,6 +268,7 @@ instance Aeson.FromJSON CardanoConfig where , shelleyGenesisPath = shelleyGenesisPath , shelleyGenesisHash = shelleyGenesisHash , alonzoGenesisPath = alonzoGenesisPath + , conwayGenesisPath = conwayGenesisPath , hardForkTriggers = hardForkTriggers } @@ -269,10 +290,11 @@ mkCardanoProtocolInfo :: -> Maybe PBftSignatureThreshold -> ShelleyGenesis StandardShelley -> SL.AlonzoGenesis + -> SL.ConwayGenesis StandardCrypto -> Nonce - -> NP STA (CardanoShelleyEras StandardCrypto) + -> NP ShelleyTransitionArguments (CardanoShelleyEras StandardCrypto) -> ProtocolInfo IO (CardanoBlock StandardCrypto) -mkCardanoProtocolInfo genesisByron signatureThreshold genesisShelley genesisAlonzo initialNonce hardForkTriggers = +mkCardanoProtocolInfo genesisByron signatureThreshold genesisShelley genesisAlonzo genesisConway initialNonce hardForkTriggers = protocolInfoCardano ProtocolParamsByron { byronGenesis = genesisByron @@ -307,22 +329,31 @@ mkCardanoProtocolInfo genesisByron signatureThreshold genesisShelley genesisAlon babbageProtVer = ProtVer 7 0 , babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure } - (unSTA shelleyTransition) - (unSTA allegraTransition) - (unSTA maryTransition) - (unSTA alonzoTransition) - (unSTA babbageTransition) + ProtocolParamsConway { + conwayProtVer = ProtVer 9 0 + , conwayMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure + } + (unShelleyTransitionArguments shelleyTransition) + (unShelleyTransitionArguments allegraTransition) + (unShelleyTransitionArguments maryTransition) + (unShelleyTransitionArguments alonzoTransition) + (unShelleyTransitionArguments babbageTransition) + (unShelleyTransitionArguments conwayTransition) where ( shelleyTransition :* allegraTransition :* maryTransition :* alonzoTransition :* babbageTransition :* + conwayTransition :* Nil ) = hardForkTriggers - unSTA :: STA (ShelleyBlock proto era) -> ProtocolTransitionParamsShelleyBased era - unSTA (STA ctxt trigger) = ProtocolTransitionParamsShelleyBased (ctxt genesisAlonzo) trigger + unShelleyTransitionArguments :: + ShelleyTransitionArguments (ShelleyBlock proto era) + -> ProtocolTransitionParamsShelleyBased era + unShelleyTransitionArguments (ShelleyTransitionArguments ctxt trigger) = + ProtocolTransitionParamsShelleyBased (ctxt (genesisAlonzo, genesisConway)) trigger castHeaderHash :: HeaderHash ByronBlock diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Shelley.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Shelley.hs index 2b89efa83d4..7f76dd1021c 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Shelley.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBAnalyser/Block/Shelley.hs @@ -36,6 +36,7 @@ import Cardano.Ledger.Alonzo (AlonzoEra) import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo import qualified Cardano.Ledger.Alonzo.Tx as Alonzo import Cardano.Ledger.Babbage (BabbageEra) +import Cardano.Ledger.Conway (ConwayEra) import Cardano.Ledger.Mary (MaryEra) import Cardano.Ledger.Shelley (ShelleyEra) @@ -124,6 +125,12 @@ instance (Crypto c) let (Alonzo.ExUnits _mem steps) = Alonzo.totExUnits tx in toEnum $ fromEnum steps +instance (Crypto c) + => PerEraAnalysis (ConwayEra c) where + txExUnitsSteps = Just $ \tx -> + let (Alonzo.ExUnits _mem steps) = Alonzo.totExUnits tx + in toEnum $ fromEnum steps + -- | Shelley-era specific instance HasProtocolInfo (ShelleyBlock (TPraos StandardCrypto) StandardShelley) where data Args (ShelleyBlock (TPraos StandardCrypto) StandardShelley) = ShelleyBlockArgs { diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Orphans.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Orphans.hs index c884a07ded8..276097476b1 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Orphans.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Orphans.hs @@ -29,6 +29,7 @@ instance FromJSON NodeConfigStub where <$> v .: "AlonzoGenesisFile" <*> v .: "ShelleyGenesisFile" <*> v .: "ByronGenesisFile" + <*> v .: "ConwayGenesisFile" instance AdjustFilePaths NodeConfigStub where adjustFilePaths f nc = @@ -36,6 +37,7 @@ instance AdjustFilePaths NodeConfigStub where ncsAlonzoGenesisFile = f $ ncsAlonzoGenesisFile nc , ncsShelleyGenesisFile = f $ ncsShelleyGenesisFile nc , ncsByronGenesisFile = f $ ncsByronGenesisFile nc + , ncsConwayGenesisFile = f $ ncsConwayGenesisFile nc } instance AdjustFilePaths NodeCredentials where @@ -62,9 +64,10 @@ instance FromJSON NodeHardForkProtocolConfiguration where <*> v .:? "TestMaryHardForkAtVersion" <*> v .:? "TestAlonzoHardForkAtEpoch" <*> v .:? "TestAlonzoHardForkAtVersion" - <*> v .:? "TestBabbageHardForkAtEpoch" <*> v .:? "TestBabbageHardForkAtVersion" + <*> v .:? "TestConwayHardForkAtEpoch" + <*> v .:? "TestConwayHardForkAtVersion" instance FromJSON NodeByronProtocolConfiguration where parseJSON = withObject "NodeByronProtocolConfiguration" $ \v -> diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Run.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Run.hs index 63f44953afc..5af04aa598f 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Run.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Run.hs @@ -91,7 +91,7 @@ initialize NodeFilePaths{nfpConfig, nfpChainDB} creds synthOptions = do adjustFilePaths relativeToConfig <$> hoistEither byConfig_ let - cardanoConfig = NodeProtocolConfigurationCardano byronConfig shelleyConfig alonzoConfig hfConfig + cardanoConfig = NodeProtocolConfigurationCardano byronConfig shelleyConfig alonzoConfig conwayConfig hfConfig firstExceptT displayError $ mkConsensusProtocol cardanoConfig @@ -99,6 +99,7 @@ initialize NodeFilePaths{nfpConfig, nfpChainDB} creds synthOptions = do where shelleyConfig = NodeShelleyProtocolConfiguration (GenesisFile $ ncsShelleyGenesisFile confConfigStub) Nothing alonzoConfig = NodeAlonzoProtocolConfiguration (GenesisFile $ ncsAlonzoGenesisFile confConfigStub) Nothing + conwayConfig = NodeConwayProtocolConfiguration (GenesisFile $ ncsConwayGenesisFile confConfigStub) Nothing hfConfig_ = eitherParseJson $ ncsNodeConfig confConfigStub byConfig_ = eitherParseJson $ ncsNodeConfig confConfigStub diff --git a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Types.hs b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Types.hs index 9bf04f8558a..68ff8c1e455 100644 --- a/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Types.hs +++ b/ouroboros-consensus-cardano-tools/src/Cardano/Tools/DBSynthesizer/Types.hs @@ -16,6 +16,7 @@ data NodeConfigStub = NodeConfigStub { , ncsAlonzoGenesisFile :: !FilePath , ncsShelleyGenesisFile :: !FilePath , ncsByronGenesisFile :: !FilePath + , ncsConwayGenesisFile :: !FilePath } deriving Show diff --git a/ouroboros-consensus-cardano-tools/test/disk/config/config.json b/ouroboros-consensus-cardano-tools/test/disk/config/config.json index 3f2681b4307..9bbe1e26826 100644 --- a/ouroboros-consensus-cardano-tools/test/disk/config/config.json +++ b/ouroboros-consensus-cardano-tools/test/disk/config/config.json @@ -8,6 +8,7 @@ "ApplicationName": "cardano-sl", "ApplicationVersion": 0, "ByronGenesisFile": "byron/genesis.json", + "ConwayGenesisFile": "genesis-conway.json", "EnableP2P": false, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, diff --git a/ouroboros-consensus-cardano-tools/test/disk/config/genesis-conway.json b/ouroboros-consensus-cardano-tools/test/disk/config/genesis-conway.json new file mode 100644 index 00000000000..edb3f771b26 --- /dev/null +++ b/ouroboros-consensus-cardano-tools/test/disk/config/genesis-conway.json @@ -0,0 +1 @@ +{ "genDelegs": {} } diff --git a/ouroboros-consensus-cardano/changelog.d/20230131_145832_damian.only_issue_3962_conway.md b/ouroboros-consensus-cardano/changelog.d/20230131_145832_damian.only_issue_3962_conway.md new file mode 100644 index 00000000000..b2a2bbca674 --- /dev/null +++ b/ouroboros-consensus-cardano/changelog.d/20230131_145832_damian.only_issue_3962_conway.md @@ -0,0 +1,15 @@ +### Breaking + +#### Added: +- `Conway` to `CardanoEras` +- `NodeToNodeV_11` and `NodeToClientV_15`, both of which enable Conway. +- Conway-related type and pattern synonyms. Eg `StandardConway`, `HeaderConway`, + `GentTxConway`, etc. + +#### Changed + +- The `protocolInfoTPraosShelleyBased` and `protocolInfoPraosShelleyBased` + functions now expect a tuple of the `AdditionalGenesisConfig` and the + `TranslationContext` instead of just the `TranslationContext`. For all + Shelley-based eras before Conway, those had been equal types. + diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index 9c19e74289b..70c74547ebb 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -48,6 +48,7 @@ library , cardano-ledger-alonzo , cardano-ledger-babbage , cardano-ledger-byron + , cardano-ledger-conway , cardano-ledger-core , cardano-ledger-shelley , cardano-ledger-shelley-ma diff --git a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano.hs b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano.hs index 87c2f21d00c..340b7fe6d6b 100644 --- a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano.hs +++ b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano.hs @@ -47,4 +47,5 @@ type ProtocolCardano = HardForkProtocol '[ ByronBlock , ShelleyBlock (TPraos StandardCrypto) StandardMary , ShelleyBlock (TPraos StandardCrypto) StandardAlonzo , ShelleyBlock (Praos StandardCrypto) StandardBabbage + , ShelleyBlock (Praos StandardCrypto) StandardConway ] diff --git a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Block.hs b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Block.hs index e25c7d8f3fd..fc4d1548bf5 100644 --- a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Block.hs +++ b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Block.hs @@ -16,28 +16,28 @@ module Ouroboros.Consensus.Cardano.Block ( -- checks from GHC. But GHC expects a data type, not a type family, that's -- why we sometimes mention the data type of the instance in these exports -- instead of the abstract type family. - , HardForkBlock (BlockAllegra, BlockAlonzo, BlockByron, BlockMary, BlockShelley, BlockBabbage) + , HardForkBlock (BlockAllegra, BlockAlonzo, BlockByron, BlockMary, BlockShelley, BlockBabbage, BlockConway) -- * Headers , CardanoHeader - , Header (HeaderAllegra, HeaderAlonzo, HeaderByron, HeaderMary, HeaderShelley, HeaderBabbage) + , Header (HeaderAllegra, HeaderAlonzo, HeaderByron, HeaderMary, HeaderShelley, HeaderBabbage, HeaderConway) -- * Generalised transactions , CardanoApplyTxErr , CardanoGenTx , CardanoGenTxId - , GenTx (GenTxAllegra, GenTxAlonzo, GenTxByron, GenTxMary, GenTxShelley, GenTxBabbage) - , HardForkApplyTxErr (ApplyTxErrAllegra, ApplyTxErrAlonzo, ApplyTxErrByron, ApplyTxErrMary, ApplyTxErrShelley, ApplyTxErrWrongEra, ApplyTxErrBabbage) - , TxId (GenTxIdAllegra, GenTxIdAlonzo, GenTxIdByron, GenTxIdMary, GenTxIdShelley, GenTxIdBabbage) + , GenTx (GenTxAllegra, GenTxAlonzo, GenTxByron, GenTxMary, GenTxShelley, GenTxBabbage, GenTxConway) + , HardForkApplyTxErr (ApplyTxErrAllegra, ApplyTxErrAlonzo, ApplyTxErrByron, ApplyTxErrMary, ApplyTxErrShelley, ApplyTxErrWrongEra, ApplyTxErrBabbage, ApplyTxErrConway) + , TxId (GenTxIdAllegra, GenTxIdAlonzo, GenTxIdByron, GenTxIdMary, GenTxIdShelley, GenTxIdBabbage, GenTxIdConway) -- * LedgerError , CardanoLedgerError - , HardForkLedgerError (LedgerErrorAllegra, LedgerErrorAlonzo, LedgerErrorByron, LedgerErrorMary, LedgerErrorShelley, LedgerErrorWrongEra, LedgerErrorBabbage) + , HardForkLedgerError (LedgerErrorAllegra, LedgerErrorAlonzo, LedgerErrorByron, LedgerErrorMary, LedgerErrorShelley, LedgerErrorWrongEra, LedgerErrorBabbage, LedgerErrorConway) -- * OtherEnvelopeError , CardanoOtherHeaderEnvelopeError - , HardForkEnvelopeErr (OtherHeaderEnvelopeErrorAllegra, OtherHeaderEnvelopeErrorBabbage, OtherHeaderEnvelopeErrorAlonzo, OtherHeaderEnvelopeErrorByron, OtherHeaderEnvelopeErrorMary, OtherHeaderEnvelopeErrorShelley, OtherHeaderEnvelopeErrorWrongEra) + , HardForkEnvelopeErr (OtherHeaderEnvelopeErrorAllegra, OtherHeaderEnvelopeErrorBabbage, OtherHeaderEnvelopeErrorConway, OtherHeaderEnvelopeErrorAlonzo, OtherHeaderEnvelopeErrorByron, OtherHeaderEnvelopeErrorMary, OtherHeaderEnvelopeErrorShelley, OtherHeaderEnvelopeErrorWrongEra) -- * TipInfo , CardanoTipInfo - , OneEraTipInfo (TipInfoAllegra, TipInfoAlonzo, TipInfoByron, TipInfoBabbage, TipInfoMary, TipInfoShelley) + , OneEraTipInfo (TipInfoAllegra, TipInfoAlonzo, TipInfoByron, TipInfoBabbage, TipInfoConway, TipInfoMary, TipInfoShelley) -- * Query - , BlockQuery (QueryAnytimeAllegra, QueryAnytimeAlonzo, QueryAnytimeBabbage, QueryAnytimeByron, QueryAnytimeMary, QueryAnytimeShelley, QueryHardFork, QueryIfCurrentAllegra, QueryIfCurrentAlonzo, QueryIfCurrentBabbage, QueryIfCurrentByron, QueryIfCurrentMary, QueryIfCurrentShelley) + , BlockQuery (QueryAnytimeAllegra, QueryAnytimeAlonzo, QueryAnytimeBabbage, QueryAnytimeConway, QueryAnytimeByron, QueryAnytimeMary, QueryAnytimeShelley, QueryHardFork, QueryIfCurrentAllegra, QueryIfCurrentAlonzo, QueryIfCurrentBabbage, QueryIfCurrentConway, QueryIfCurrentByron, QueryIfCurrentMary, QueryIfCurrentShelley) , CardanoQuery , CardanoQueryResult , Either (QueryResultSuccess, QueryResultEraMismatch) @@ -58,10 +58,10 @@ module Ouroboros.Consensus.Cardano.Block ( , HardForkLedgerConfig (CardanoLedgerConfig) -- * LedgerState , CardanoLedgerState - , LedgerState (LedgerStateAllegra, LedgerStateAlonzo, LedgerStateBabbage, LedgerStateByron, LedgerStateMary, LedgerStateShelley) + , LedgerState (LedgerStateAllegra, LedgerStateAlonzo, LedgerStateBabbage, LedgerStateConway, LedgerStateByron, LedgerStateMary, LedgerStateShelley) -- * ChainDepState , CardanoChainDepState - , HardForkState (ChainDepStateAllegra, ChainDepStateAlonzo, ChainDepStateBabbage, ChainDepStateByron, ChainDepStateMary, ChainDepStateShelley) + , HardForkState (ChainDepStateAllegra, ChainDepStateAlonzo, ChainDepStateBabbage, ChainDepStateConway, ChainDepStateByron, ChainDepStateMary, ChainDepStateShelley) -- * EraMismatch , EraMismatch (..) ) where @@ -105,6 +105,7 @@ type CardanoShelleyEras c = , ShelleyBlock (TPraos c) (MaryEra c) , ShelleyBlock (TPraos c) (AlonzoEra c) , ShelleyBlock (Praos c) (BabbageEra c) + , ShelleyBlock (Praos c) (ConwayEra c) ] {------------------------------------------------------------------------------- @@ -114,19 +115,21 @@ type CardanoShelleyEras c = -- Here we use layout and adjacency to make it obvious that we haven't -- miscounted. -pattern TagByron :: f ByronBlock -> NS f (CardanoEras c) -pattern TagShelley :: f (ShelleyBlock (TPraos c) (ShelleyEra c)) -> NS f (CardanoEras c) -pattern TagAllegra :: f (ShelleyBlock (TPraos c) (AllegraEra c)) -> NS f (CardanoEras c) -pattern TagMary :: f (ShelleyBlock (TPraos c) (MaryEra c)) -> NS f (CardanoEras c) -pattern TagAlonzo :: f (ShelleyBlock (TPraos c) (AlonzoEra c)) -> NS f (CardanoEras c) -pattern TagBabbage :: f (ShelleyBlock (Praos c) (BabbageEra c)) -> NS f (CardanoEras c) - -pattern TagByron x = Z x -pattern TagShelley x = S (Z x) -pattern TagAllegra x = S (S (Z x)) -pattern TagMary x = S (S (S (Z x))) -pattern TagAlonzo x = S (S (S (S (Z x)))) -pattern TagBabbage x = S (S (S (S (S (Z x))))) +pattern TagByron :: f ByronBlock -> NS f (CardanoEras c) +pattern TagShelley :: f (ShelleyBlock (TPraos c) (ShelleyEra c)) -> NS f (CardanoEras c) +pattern TagAllegra :: f (ShelleyBlock (TPraos c) (AllegraEra c)) -> NS f (CardanoEras c) +pattern TagMary :: f (ShelleyBlock (TPraos c) (MaryEra c)) -> NS f (CardanoEras c) +pattern TagAlonzo :: f (ShelleyBlock (TPraos c) (AlonzoEra c)) -> NS f (CardanoEras c) +pattern TagBabbage :: f (ShelleyBlock (Praos c) (BabbageEra c)) -> NS f (CardanoEras c) +pattern TagConway :: f (ShelleyBlock (Praos c) (ConwayEra c)) -> NS f (CardanoEras c) + +pattern TagByron x = Z x +pattern TagShelley x = S (Z x) +pattern TagAllegra x = S (S (Z x)) +pattern TagMary x = S (S (S (Z x))) +pattern TagAlonzo x = S (S (S (S (Z x)))) +pattern TagBabbage x = S (S (S (S (S (Z x))))) +pattern TagConway x = S (S (S (S (S (S (Z x)))))) {------------------------------------------------------------------------------- INTERNAL A telescope function for each era @@ -171,15 +174,27 @@ pattern TeleBabbage :: -> g (ShelleyBlock (TPraos c) (AlonzoEra c)) -> f (ShelleyBlock (Praos c) (BabbageEra c)) -> Telescope g f (CardanoEras c) + +pattern TeleConway :: + g ByronBlock + -> g (ShelleyBlock (TPraos c) (ShelleyEra c)) + -> g (ShelleyBlock (TPraos c) (AllegraEra c)) + -> g (ShelleyBlock (TPraos c) (MaryEra c)) + -> g (ShelleyBlock (TPraos c) (AlonzoEra c)) + -> g (ShelleyBlock (Praos c) (BabbageEra c)) + -> f (ShelleyBlock (Praos c) (ConwayEra c)) + -> Telescope g f (CardanoEras c) + -- Here we use layout and adjacency to make it obvious that we haven't -- miscounted. -pattern TeleByron x = TZ x -pattern TeleShelley byron x = TS byron (TZ x) -pattern TeleAllegra byron shelley x = TS byron (TS shelley (TZ x)) -pattern TeleMary byron shelley allegra x = TS byron (TS shelley (TS allegra (TZ x))) -pattern TeleAlonzo byron shelley allegra mary x = TS byron (TS shelley (TS allegra (TS mary (TZ x)))) -pattern TeleBabbage byron shelley allegra mary alonzo x = TS byron (TS shelley (TS allegra (TS mary (TS alonzo (TZ x))))) +pattern TeleByron x = TZ x +pattern TeleShelley byron x = TS byron (TZ x) +pattern TeleAllegra byron shelley x = TS byron (TS shelley (TZ x)) +pattern TeleMary byron shelley allegra x = TS byron (TS shelley (TS allegra (TZ x))) +pattern TeleAlonzo byron shelley allegra mary x = TS byron (TS shelley (TS allegra (TS mary (TZ x)))) +pattern TeleBabbage byron shelley allegra mary alonzo x = TS byron (TS shelley (TS allegra (TS mary (TS alonzo (TZ x))))) +pattern TeleConway byron shelley allegra mary alonzo babbage x = TS byron (TS shelley (TS allegra (TS mary (TS alonzo (TS babbage (TZ x)))))) {------------------------------------------------------------------------------- The block type of the Cardano block chain @@ -217,6 +232,9 @@ pattern BlockAlonzo b = HardForkBlock (OneEraBlock (TagAlonzo (I b))) pattern BlockBabbage :: ShelleyBlock (Praos c) (BabbageEra c) -> CardanoBlock c pattern BlockBabbage b = HardForkBlock (OneEraBlock (TagBabbage (I b))) +pattern BlockConway :: ShelleyBlock (Praos c) (ConwayEra c) -> CardanoBlock c +pattern BlockConway b = HardForkBlock (OneEraBlock (TagConway (I b))) + {-# COMPLETE BlockByron , BlockShelley @@ -224,6 +242,7 @@ pattern BlockBabbage b = HardForkBlock (OneEraBlock (TagBabbage (I b))) , BlockMary , BlockAlonzo , BlockBabbage + , BlockConway #-} @@ -262,12 +281,19 @@ pattern HeaderBabbage :: -> CardanoHeader c pattern HeaderBabbage h = HardForkHeader (OneEraHeader (TagBabbage h)) +pattern HeaderConway :: + Header (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoHeader c +pattern HeaderConway h = HardForkHeader (OneEraHeader (TagConway h)) + {-# COMPLETE HeaderByron , HeaderShelley , HeaderAllegra , HeaderMary , HeaderAlonzo - , HeaderBabbage #-} + , HeaderBabbage + , HeaderConway + #-} {------------------------------------------------------------------------------- Generalised transactions @@ -294,6 +320,9 @@ pattern GenTxAlonzo tx = HardForkGenTx (OneEraGenTx (TagAlonzo tx)) pattern GenTxBabbage :: GenTx (ShelleyBlock (Praos c) (BabbageEra c)) -> CardanoGenTx c pattern GenTxBabbage tx = HardForkGenTx (OneEraGenTx (TagBabbage tx)) +pattern GenTxConway :: GenTx (ShelleyBlock (Praos c) (ConwayEra c)) -> CardanoGenTx c +pattern GenTxConway tx = HardForkGenTx (OneEraGenTx (TagConway tx)) + {-# COMPLETE GenTxByron , GenTxShelley @@ -301,10 +330,9 @@ pattern GenTxBabbage tx = HardForkGenTx (OneEraGenTx (TagBabbage tx)) , GenTxMary , GenTxAlonzo , GenTxBabbage + , GenTxConway #-} - - -- | The ID of a Cardano transaction. type CardanoGenTxId c = GenTxId (CardanoBlock c) @@ -342,12 +370,20 @@ pattern GenTxIdBabbage :: pattern GenTxIdBabbage txid = HardForkGenTxId (OneEraGenTxId (TagBabbage (WrapGenTxId txid))) +pattern GenTxIdConway :: + GenTxId (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoGenTxId c +pattern GenTxIdConway txid = + HardForkGenTxId (OneEraGenTxId (TagConway (WrapGenTxId txid))) + {-# COMPLETE GenTxIdByron , GenTxIdShelley , GenTxIdAllegra , GenTxIdMary , GenTxIdAlonzo - , GenTxIdBabbage #-} + , GenTxIdBabbage + , GenTxIdConway + #-} -- | An error resulting from applying a 'CardanoGenTx' to the ledger. -- @@ -401,6 +437,12 @@ pattern ApplyTxErrBabbage :: pattern ApplyTxErrBabbage err = HardForkApplyTxErrFromEra (OneEraApplyTxErr (TagBabbage (WrapApplyTxErr err))) +pattern ApplyTxErrConway :: + ApplyTxErr (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoApplyTxErr c +pattern ApplyTxErrConway err = + HardForkApplyTxErrFromEra (OneEraApplyTxErr (TagConway (WrapApplyTxErr err))) + pattern ApplyTxErrWrongEra :: EraMismatch -> CardanoApplyTxErr c pattern ApplyTxErrWrongEra eraMismatch <- HardForkApplyTxErrWrongEra (mkEraMismatch -> eraMismatch) @@ -411,7 +453,9 @@ pattern ApplyTxErrWrongEra eraMismatch <- , ApplyTxErrMary , ApplyTxErrAlonzo , ApplyTxErrBabbage - , ApplyTxErrWrongEra #-} + , ApplyTxErrConway + , ApplyTxErrWrongEra + #-} {------------------------------------------------------------------------------- LedgerError @@ -474,6 +518,13 @@ pattern LedgerErrorBabbage err = HardForkLedgerErrorFromEra (OneEraLedgerError (TagBabbage (WrapLedgerErr err))) +pattern LedgerErrorConway :: + LedgerError (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoLedgerError c +pattern LedgerErrorConway err = + HardForkLedgerErrorFromEra + (OneEraLedgerError (TagConway (WrapLedgerErr err))) + pattern LedgerErrorWrongEra :: EraMismatch -> CardanoLedgerError c pattern LedgerErrorWrongEra eraMismatch <- HardForkLedgerErrorWrongEra (mkEraMismatch -> eraMismatch) @@ -484,7 +535,9 @@ pattern LedgerErrorWrongEra eraMismatch <- , LedgerErrorMary , LedgerErrorAlonzo , LedgerErrorBabbage - , LedgerErrorWrongEra #-} + , LedgerErrorConway + , LedgerErrorWrongEra + #-} {------------------------------------------------------------------------------- OtherEnvelopeError @@ -530,6 +583,12 @@ pattern OtherHeaderEnvelopeErrorBabbage pattern OtherHeaderEnvelopeErrorBabbage err = HardForkEnvelopeErrFromEra (OneEraEnvelopeErr (TagBabbage (WrapEnvelopeErr err))) +pattern OtherHeaderEnvelopeErrorConway + :: OtherHeaderEnvelopeError (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoOtherHeaderEnvelopeError c +pattern OtherHeaderEnvelopeErrorConway err = + HardForkEnvelopeErrFromEra (OneEraEnvelopeErr (TagConway (WrapEnvelopeErr err))) + pattern OtherHeaderEnvelopeErrorWrongEra :: EraMismatch -> CardanoOtherHeaderEnvelopeError c @@ -542,7 +601,9 @@ pattern OtherHeaderEnvelopeErrorWrongEra eraMismatch <- , OtherHeaderEnvelopeErrorMary , OtherHeaderEnvelopeErrorAlonzo , OtherHeaderEnvelopeErrorBabbage - , OtherHeaderEnvelopeErrorWrongEra #-} + , OtherHeaderEnvelopeErrorConway + , OtherHeaderEnvelopeErrorWrongEra + #-} {------------------------------------------------------------------------------- TipInfo @@ -579,12 +640,19 @@ pattern TipInfoBabbage :: -> CardanoTipInfo c pattern TipInfoBabbage ti = OneEraTipInfo (TagBabbage (WrapTipInfo ti)) +pattern TipInfoConway :: + TipInfo (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoTipInfo c +pattern TipInfoConway ti = OneEraTipInfo (TagConway (WrapTipInfo ti)) + {-# COMPLETE TipInfoByron , TipInfoShelley , TipInfoAllegra , TipInfoMary , TipInfoAlonzo - , TipInfoBabbage #-} + , TipInfoBabbage + , TipInfoConway + #-} {------------------------------------------------------------------------------- Query @@ -641,15 +709,24 @@ pattern QueryIfCurrentBabbage => BlockQuery (ShelleyBlock (Praos c) (BabbageEra c)) result -> CardanoQuery c a +-- | Conway-specific query that can only be answered when the ledger is in the +-- Conway era. +pattern QueryIfCurrentConway + :: () + => CardanoQueryResult c result ~ a + => BlockQuery (ShelleyBlock (Praos c) (ConwayEra c)) result + -> CardanoQuery c a + -- Here we use layout and adjacency to make it obvious that we haven't -- miscounted. -pattern QueryIfCurrentByron q = QueryIfCurrent (QZ q) -pattern QueryIfCurrentShelley q = QueryIfCurrent (QS (QZ q)) -pattern QueryIfCurrentAllegra q = QueryIfCurrent (QS (QS (QZ q))) -pattern QueryIfCurrentMary q = QueryIfCurrent (QS (QS (QS (QZ q)))) -pattern QueryIfCurrentAlonzo q = QueryIfCurrent (QS (QS (QS (QS (QZ q))))) -pattern QueryIfCurrentBabbage q = QueryIfCurrent (QS (QS (QS (QS (QS (QZ q)))))) +pattern QueryIfCurrentByron q = QueryIfCurrent (QZ q) +pattern QueryIfCurrentShelley q = QueryIfCurrent (QS (QZ q)) +pattern QueryIfCurrentAllegra q = QueryIfCurrent (QS (QS (QZ q))) +pattern QueryIfCurrentMary q = QueryIfCurrent (QS (QS (QS (QZ q)))) +pattern QueryIfCurrentAlonzo q = QueryIfCurrent (QS (QS (QS (QS (QZ q))))) +pattern QueryIfCurrentBabbage q = QueryIfCurrent (QS (QS (QS (QS (QS (QZ q)))))) +pattern QueryIfCurrentConway q = QueryIfCurrent (QS (QS (QS (QS (QS (QS (QZ q))))))) -- | Query about the Byron era that can be answered anytime, i.e., -- independent from where the tip of the ledger is. @@ -729,6 +806,19 @@ pattern QueryAnytimeBabbage -> CardanoQuery c result pattern QueryAnytimeBabbage q = QueryAnytime q (EraIndex (TagBabbage (K ()))) +-- | Query about the Conway era that can be answered anytime, i.e., independent +-- from where the tip of the ledger is. +-- +-- For example, to ask for the start of the Conway era (whether the tip of the +-- ledger is in the Byron, Shelley, ... era), use: +-- +-- > QueryAnytimeConway EraStart +-- +pattern QueryAnytimeConway + :: QueryAnytime result + -> CardanoQuery c result +pattern QueryAnytimeConway q = QueryAnytime q (EraIndex (TagConway (K ()))) + {-# COMPLETE QueryIfCurrentByron , QueryIfCurrentShelley , QueryIfCurrentAllegra @@ -741,7 +831,9 @@ pattern QueryAnytimeBabbage q = QueryAnytime q (EraIndex (TagBabbage (K ()))) , QueryAnytimeMary , QueryAnytimeAlonzo , QueryAnytimeBabbage - , QueryHardFork #-} + , QueryAnytimeConway + , QueryHardFork + #-} -- | The result of a 'CardanoQuery' -- @@ -775,8 +867,9 @@ pattern CardanoCodecConfig -> CodecConfig (ShelleyBlock (TPraos c) (MaryEra c)) -> CodecConfig (ShelleyBlock (TPraos c) (AlonzoEra c)) -> CodecConfig (ShelleyBlock (Praos c) (BabbageEra c)) + -> CodecConfig (ShelleyBlock (Praos c) (ConwayEra c)) -> CardanoCodecConfig c -pattern CardanoCodecConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage = +pattern CardanoCodecConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage cfgConway = HardForkCodecConfig { hardForkCodecConfigPerEra = PerEraCodecConfig ( cfgByron @@ -785,6 +878,7 @@ pattern CardanoCodecConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgB :* cfgMary :* cfgAlonzo :* cfgBabbage + :* cfgConway :* Nil ) } @@ -808,8 +902,9 @@ pattern CardanoBlockConfig -> BlockConfig (ShelleyBlock (TPraos c) (MaryEra c)) -> BlockConfig (ShelleyBlock (TPraos c) (AlonzoEra c)) -> BlockConfig (ShelleyBlock (Praos c) (BabbageEra c)) + -> BlockConfig (ShelleyBlock (Praos c) (ConwayEra c)) -> CardanoBlockConfig c -pattern CardanoBlockConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage = +pattern CardanoBlockConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage cfgConway = HardForkBlockConfig { hardForkBlockConfigPerEra = PerEraBlockConfig ( cfgByron @@ -818,6 +913,7 @@ pattern CardanoBlockConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgB :* cfgMary :* cfgAlonzo :* cfgBabbage + :* cfgConway :* Nil ) } @@ -841,8 +937,9 @@ pattern CardanoStorageConfig -> StorageConfig (ShelleyBlock (TPraos c) (MaryEra c)) -> StorageConfig (ShelleyBlock (TPraos c) (AlonzoEra c)) -> StorageConfig (ShelleyBlock (Praos c) (BabbageEra c)) + -> StorageConfig (ShelleyBlock (Praos c) (ConwayEra c)) -> CardanoStorageConfig c -pattern CardanoStorageConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage = +pattern CardanoStorageConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage cfgConway = HardForkStorageConfig { hardForkStorageConfigPerEra = PerEraStorageConfig ( cfgByron @@ -851,6 +948,7 @@ pattern CardanoStorageConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cf :* cfgMary :* cfgAlonzo :* cfgBabbage + :* cfgConway :* Nil ) } @@ -877,8 +975,9 @@ pattern CardanoConsensusConfig -> PartialConsensusConfig (BlockProtocol (ShelleyBlock (TPraos c) (MaryEra c))) -> PartialConsensusConfig (BlockProtocol (ShelleyBlock (TPraos c) (AlonzoEra c))) -> PartialConsensusConfig (BlockProtocol (ShelleyBlock (Praos c) (BabbageEra c))) + -> PartialConsensusConfig (BlockProtocol (ShelleyBlock (Praos c) (ConwayEra c))) -> CardanoConsensusConfig c -pattern CardanoConsensusConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage <- +pattern CardanoConsensusConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage cfgConway <- HardForkConsensusConfig { hardForkConsensusConfigPerEra = PerEraConsensusConfig ( WrapPartialConsensusConfig cfgByron @@ -887,6 +986,7 @@ pattern CardanoConsensusConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo :* WrapPartialConsensusConfig cfgMary :* WrapPartialConsensusConfig cfgAlonzo :* WrapPartialConsensusConfig cfgBabbage + :* WrapPartialConsensusConfig cfgConway :* Nil ) } @@ -912,8 +1012,9 @@ pattern CardanoLedgerConfig -> PartialLedgerConfig (ShelleyBlock (TPraos c) (MaryEra c)) -> PartialLedgerConfig (ShelleyBlock (TPraos c) (AlonzoEra c)) -> PartialLedgerConfig (ShelleyBlock (Praos c) (BabbageEra c)) + -> PartialLedgerConfig (ShelleyBlock (Praos c) (ConwayEra c)) -> CardanoLedgerConfig c -pattern CardanoLedgerConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage <- +pattern CardanoLedgerConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfgBabbage cfgConway <- HardForkLedgerConfig { hardForkLedgerConfigPerEra = PerEraLedgerConfig ( WrapPartialLedgerConfig cfgByron @@ -922,6 +1023,7 @@ pattern CardanoLedgerConfig cfgByron cfgShelley cfgAllegra cfgMary cfgAlonzo cfg :* WrapPartialLedgerConfig cfgMary :* WrapPartialLedgerConfig cfgAlonzo :* WrapPartialLedgerConfig cfgBabbage + :* WrapPartialLedgerConfig cfgConway :* Nil ) } @@ -988,12 +1090,22 @@ pattern LedgerStateBabbage st <- (State.HardForkState (TeleBabbage _ _ _ _ _ (State.Current { currentState = st }))) +pattern LedgerStateConway + :: LedgerState (ShelleyBlock (Praos c) (ConwayEra c)) + -> CardanoLedgerState c +pattern LedgerStateConway st <- + HardForkLedgerState + (State.HardForkState + (TeleConway _ _ _ _ _ _ (State.Current { currentState = st }))) + {-# COMPLETE LedgerStateByron , LedgerStateShelley , LedgerStateAllegra , LedgerStateMary , LedgerStateAlonzo - , LedgerStateBabbage #-} + , LedgerStateBabbage + , LedgerStateConway + #-} {------------------------------------------------------------------------------- ChainDepState @@ -1049,9 +1161,18 @@ pattern ChainDepStateBabbage st <- State.HardForkState (TeleBabbage _ _ _ _ _ (State.Current { currentState = WrapChainDepState st })) +pattern ChainDepStateConway + :: ChainDepState (BlockProtocol (ShelleyBlock (Praos c) (ConwayEra c))) + -> CardanoChainDepState c +pattern ChainDepStateConway st <- + State.HardForkState + (TeleConway _ _ _ _ _ _ (State.Current { currentState = WrapChainDepState st })) + {-# COMPLETE ChainDepStateByron , ChainDepStateShelley , ChainDepStateAllegra , ChainDepStateMary , ChainDepStateAlonzo - , ChainDepStateBabbage #-} + , ChainDepStateBabbage + , ChainDepStateConway + #-} diff --git a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/CanHardFork.hs b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/CanHardFork.hs index 51795b5174c..3ba65722460 100644 --- a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/CanHardFork.hs +++ b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/CanHardFork.hs @@ -74,6 +74,7 @@ import Ouroboros.Consensus.Shelley.ShelleyHFC import Cardano.Ledger.Allegra.Translation () import qualified Cardano.Ledger.Alonzo.Genesis as Alonzo +import qualified Cardano.Ledger.Conway.Genesis as Conway import Cardano.Ledger.Crypto (ADDRHASH, DSIGN, HASH) import qualified Cardano.Ledger.Era as SL import Cardano.Ledger.Hashes (EraIndependentTxBody) @@ -268,6 +269,8 @@ type CardanoHardForkConstraints c = , LedgerSupportsProtocol (ShelleyBlock (TPraos c) (AlonzoEra c)) , ShelleyCompatible (Praos c) (BabbageEra c) , LedgerSupportsProtocol (ShelleyBlock (Praos c) (BabbageEra c)) + , ShelleyCompatible (Praos c) (ConwayEra c) + , LedgerSupportsProtocol (ShelleyBlock (Praos c) (ConwayEra c)) -- These equalities allow the transition from Byron to Shelley, since -- @cardano-ledger-shelley@ requires Ed25519 for Byron bootstrap addresses and -- the current Byron-to-Shelley translation requires a 224-bit hash for @@ -285,6 +288,7 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where $ PCons translateLedgerStateAllegraToMaryWrapper $ PCons translateLedgerStateMaryToAlonzoWrapper $ PCons translateLedgerStateAlonzoToBabbageWrapper + $ PCons translateLedgerStateBabbageToConwayWrapper $ PNil , translateChainDepState = PCons translateChainDepStateByronToShelleyWrapper @@ -292,6 +296,7 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where $ PCons translateChainDepStateAcrossShelley $ PCons translateChainDepStateAcrossShelley $ PCons translateChainDepStateAcrossShelley + $ PCons translateChainDepStateAcrossShelley $ PNil , translateLedgerView = PCons translateLedgerViewByronToShelleyWrapper @@ -299,6 +304,7 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where $ PCons translateLedgerViewAcrossShelley $ PCons translateLedgerViewAcrossShelley $ PCons translateLedgerViewAcrossShelley + $ PCons translateLedgerViewAcrossShelley $ PNil } hardForkChainSel = @@ -332,6 +338,13 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where (translateTxAlonzoToBabbageWrapper ctxt) (translateValidatedTxAlonzoToBabbageWrapper ctxt) ) + $ PCons (RequireBoth $ \_cfgBabbage cfgConway -> + let ctxt = getConwayTranslationContext cfgConway + in + Pair2 + (translateTxBabbageToConwayWrapper ctxt) + (translateValidatedTxBabbageToConwayWrapper ctxt) + ) $ PNil class (SelectView (BlockProtocol blk) ~ PraosChainSelectView c) => HasPraosSelectView c blk @@ -674,3 +687,44 @@ translateValidatedTxAlonzoToBabbageWrapper ctxt = InjectValidatedTx $ transPraosValidatedTx (WrapValidatedGenTx x) = case x of ShelleyValidatedTx txid vtx -> WrapValidatedGenTx $ ShelleyValidatedTx txid (SL.coerceValidated vtx) + +{------------------------------------------------------------------------------- + Translation from Babbage to Conway +-------------------------------------------------------------------------------} + +translateLedgerStateBabbageToConwayWrapper :: + (Praos.PraosCrypto c) + => RequiringBoth + WrapLedgerConfig + (Translate LedgerState) + (ShelleyBlock (Praos c) (BabbageEra c)) + (ShelleyBlock (Praos c) (ConwayEra c)) +translateLedgerStateBabbageToConwayWrapper = + RequireBoth $ \_cfgBabbage cfgConway -> + Translate $ \_epochNo -> + unComp . SL.translateEra' (getConwayTranslationContext cfgConway) . Comp + +getConwayTranslationContext :: + WrapLedgerConfig (ShelleyBlock (Praos c) (ConwayEra c)) + -> Conway.ConwayGenesis c +getConwayTranslationContext = + shelleyLedgerTranslationContext . unwrapLedgerConfig + +translateTxBabbageToConwayWrapper :: + (Praos.PraosCrypto c) + => Conway.ConwayGenesis c + -> InjectTx + (ShelleyBlock (Praos c) (BabbageEra c)) + (ShelleyBlock (Praos c) (ConwayEra c)) +translateTxBabbageToConwayWrapper ctxt = InjectTx $ + fmap unComp . eitherToMaybe . runExcept . SL.translateEra ctxt . Comp + +translateValidatedTxBabbageToConwayWrapper :: + forall c. + (Praos.PraosCrypto c) + => Conway.ConwayGenesis c + -> InjectValidatedTx + (ShelleyBlock (Praos c) (BabbageEra c)) + (ShelleyBlock (Praos c) (ConwayEra c)) +translateValidatedTxBabbageToConwayWrapper ctxt = InjectValidatedTx $ + fmap unComp . eitherToMaybe . runExcept . SL.translateEra ctxt . Comp diff --git a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Node.hs index 66e76eeb193..bfccd436f98 100644 --- a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/Node.hs @@ -28,6 +28,7 @@ module Ouroboros.Consensus.Cardano.Node ( -- * SupportedNetworkProtocolVersion , pattern CardanoNodeToClientVersion1 , pattern CardanoNodeToClientVersion10 + , pattern CardanoNodeToClientVersion11 , pattern CardanoNodeToClientVersion2 , pattern CardanoNodeToClientVersion3 , pattern CardanoNodeToClientVersion4 @@ -42,6 +43,7 @@ module Ouroboros.Consensus.Cardano.Node ( , pattern CardanoNodeToNodeVersion4 , pattern CardanoNodeToNodeVersion5 , pattern CardanoNodeToNodeVersion6 + , pattern CardanoNodeToNodeVersion7 ) where import qualified Codec.CBOR.Decoding as CBOR @@ -111,7 +113,7 @@ import Ouroboros.Consensus.Protocol.Praos (Praos, PraosParams (..)) import Ouroboros.Consensus.Protocol.Praos.Common (praosCanBeLeaderOpCert) import Ouroboros.Consensus.Shelley.Node.Praos - (ProtocolParamsBabbage (..)) + (ProtocolParamsBabbage (..), ProtocolParamsConway (..)) import qualified Ouroboros.Consensus.Shelley.Node.Praos as Praos import qualified Ouroboros.Consensus.Shelley.Node.TPraos as TPraos @@ -149,7 +151,7 @@ instance SerialiseConstraintsHFC ByronBlock -- For more details, see: -- instance CardanoHardForkConstraints c => SerialiseHFC (CardanoEras c) where - encodeDiskHfcBlock (CardanoCodecConfig ccfgByron ccfgShelley ccfgAllegra ccfgMary ccfgAlonzo ccfgBabbage) = \case + encodeDiskHfcBlock (CardanoCodecConfig ccfgByron ccfgShelley ccfgAllegra ccfgMary ccfgAlonzo ccfgBabbage ccfgConway) = \case -- We are backwards compatible with Byron and thus use the exact same -- encoding. BlockByron blockByron -> encodeDisk ccfgByron blockByron @@ -159,7 +161,8 @@ instance CardanoHardForkConstraints c => SerialiseHFC (CardanoEras c) where BlockMary blockMary -> prependTag 4 $ encodeDisk ccfgMary blockMary BlockAlonzo blockAlonzo -> prependTag 5 $ encodeDisk ccfgAlonzo blockAlonzo BlockBabbage blockBabbage -> prependTag 6 $ encodeDisk ccfgBabbage blockBabbage - decodeDiskHfcBlock (CardanoCodecConfig ccfgByron ccfgShelley ccfgAllegra ccfgMary ccfgAlonzo ccfgBabbage) = do + BlockConway blockConway -> prependTag 7 $ encodeDisk ccfgConway blockConway + decodeDiskHfcBlock (CardanoCodecConfig ccfgByron ccfgShelley ccfgAllegra ccfgMary ccfgAlonzo ccfgBabbage ccfgConway) = do enforceSize "CardanoBlock" 2 CBOR.decodeWord >>= \case 0 -> fmap BlockByron <$> Byron.decodeByronBoundaryBlock epochSlots @@ -171,6 +174,7 @@ instance CardanoHardForkConstraints c => SerialiseHFC (CardanoEras c) where 4 -> fmap BlockMary <$> decodeDisk ccfgMary 5 -> fmap BlockAlonzo <$> decodeDisk ccfgAlonzo 6 -> fmap BlockBabbage <$> decodeDisk ccfgBabbage + 7 -> fmap BlockConway <$> decodeDisk ccfgConway t -> cborError $ DecoderErrorUnknownTag "CardanoBlock" (fromIntegral t) where epochSlots = Byron.getByronEpochSlots ccfgByron @@ -186,6 +190,7 @@ instance CardanoHardForkConstraints c => SerialiseHFC (CardanoEras c) where 4 -> SomeSecond $ NestedCtxt (NCS (NCS (NCS (NCZ Shelley.CtxtShelley)))) 5 -> SomeSecond $ NestedCtxt (NCS (NCS (NCS (NCS (NCZ Shelley.CtxtShelley))))) 6 -> SomeSecond $ NestedCtxt (NCS (NCS (NCS (NCS (NCS (NCZ Shelley.CtxtShelley)))))) + 7 -> SomeSecond $ NestedCtxt (NCS (NCS (NCS (NCS (NCS (NCS (NCZ Shelley.CtxtShelley))))))) _ -> error $ "CardanoBlock: invalid prefix " <> show prefix getHfcBinaryBlockInfo = \case @@ -203,6 +208,8 @@ instance CardanoHardForkConstraints c => SerialiseHFC (CardanoEras c) where shiftHeaderOffset 2 $ getBinaryBlockInfo blockAlonzo BlockBabbage blockBabbage -> shiftHeaderOffset 2 $ getBinaryBlockInfo blockBabbage + BlockConway blockConway -> + shiftHeaderOffset 2 $ getBinaryBlockInfo blockConway where shiftHeaderOffset :: Word16 -> BinaryBlockInfo -> BinaryBlockInfo shiftHeaderOffset shift binfo = binfo { @@ -218,6 +225,7 @@ instance CardanoHardForkConstraints c => SerialiseHFC (CardanoEras c) where HeaderMary headerMary -> estimateBlockSize headerMary + 2 HeaderAlonzo headerAlonzo -> estimateBlockSize headerAlonzo + 2 HeaderBabbage headerBabbage -> estimateBlockSize headerBabbage + 2 + HeaderConway headerConway -> estimateBlockSize headerConway + 2 -- | Prepend the given tag by creating a CBOR 2-tuple with the tag as the -- first element and the given 'Encoding' as the second. @@ -253,6 +261,7 @@ pattern CardanoNodeToNodeVersion2 = :* EraNodeToNodeDisabled :* EraNodeToNodeDisabled :* EraNodeToNodeDisabled + :* EraNodeToNodeDisabled :* Nil ) @@ -268,6 +277,7 @@ pattern CardanoNodeToNodeVersion3 = :* EraNodeToNodeDisabled :* EraNodeToNodeDisabled :* EraNodeToNodeDisabled + :* EraNodeToNodeDisabled :* Nil ) @@ -283,6 +293,7 @@ pattern CardanoNodeToNodeVersion4 = :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 :* EraNodeToNodeDisabled :* EraNodeToNodeDisabled + :* EraNodeToNodeDisabled :* Nil ) @@ -298,6 +309,7 @@ pattern CardanoNodeToNodeVersion5 = :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 :* EraNodeToNodeDisabled + :* EraNodeToNodeDisabled :* Nil ) @@ -313,9 +325,25 @@ pattern CardanoNodeToNodeVersion6 = :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* EraNodeToNodeDisabled :* Nil ) +-- | The hard fork enabled with the latest Byron version, the Shelley, Allegra, +-- Mary, Alonzo, Babbage and Conway eras enabled. +pattern CardanoNodeToNodeVersion7 :: BlockNodeToNodeVersion (CardanoBlock c) +pattern CardanoNodeToNodeVersion7 = + HardForkNodeToNodeEnabled + HardForkSpecificNodeToNodeVersion1 + ( EraNodeToNodeEnabled ByronNodeToNodeVersion2 + :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* EraNodeToNodeEnabled ShelleyNodeToNodeVersion1 + :* Nil + ) -- | We support the sole Byron version with the hard fork disabled. pattern CardanoNodeToClientVersion1 :: BlockNodeToClientVersion (CardanoBlock c) @@ -333,6 +361,7 @@ pattern CardanoNodeToClientVersion2 = :* EraNodeToClientDisabled :* EraNodeToClientDisabled :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -348,6 +377,7 @@ pattern CardanoNodeToClientVersion3 = :* EraNodeToClientDisabled :* EraNodeToClientDisabled :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -365,6 +395,7 @@ pattern CardanoNodeToClientVersion4 = :* EraNodeToClientDisabled :* EraNodeToClientDisabled :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -381,6 +412,7 @@ pattern CardanoNodeToClientVersion5 = :* EraNodeToClientEnabled ShelleyNodeToClientVersion2 :* EraNodeToClientDisabled :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -397,6 +429,7 @@ pattern CardanoNodeToClientVersion6 = :* EraNodeToClientEnabled ShelleyNodeToClientVersion3 :* EraNodeToClientDisabled :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -411,6 +444,7 @@ pattern CardanoNodeToClientVersion7 = :* EraNodeToClientEnabled ShelleyNodeToClientVersion4 :* EraNodeToClientEnabled ShelleyNodeToClientVersion4 :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -427,6 +461,7 @@ pattern CardanoNodeToClientVersion8 = :* EraNodeToClientEnabled ShelleyNodeToClientVersion5 :* EraNodeToClientEnabled ShelleyNodeToClientVersion5 :* EraNodeToClientDisabled + :* EraNodeToClientDisabled :* Nil ) @@ -443,6 +478,7 @@ pattern CardanoNodeToClientVersion9 = :* EraNodeToClientEnabled ShelleyNodeToClientVersion5 :* EraNodeToClientEnabled ShelleyNodeToClientVersion5 :* EraNodeToClientEnabled ShelleyNodeToClientVersion5 + :* EraNodeToClientDisabled :* Nil ) @@ -459,6 +495,24 @@ pattern CardanoNodeToClientVersion10 = :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 + :* EraNodeToClientDisabled + :* Nil + ) + +-- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo, Babbage and +-- Conway eras enabled Using 'ShelleyNodeToClientVersion6' for the +-- Shelley-based eras, which enables new queries. +pattern CardanoNodeToClientVersion11 :: BlockNodeToClientVersion (CardanoBlock c) +pattern CardanoNodeToClientVersion11 = + HardForkNodeToClientEnabled + HardForkSpecificNodeToClientVersion2 + ( EraNodeToClientEnabled ByronNodeToClientVersion1 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion6 :* Nil ) @@ -469,6 +523,7 @@ instance CardanoHardForkConstraints c , (NodeToNodeV_8, CardanoNodeToNodeVersion5) , (NodeToNodeV_9, CardanoNodeToNodeVersion6) , (NodeToNodeV_10, CardanoNodeToNodeVersion6) + , (NodeToNodeV_11, CardanoNodeToNodeVersion7) ] supportedNodeToClientVersions _ = Map.fromList $ @@ -478,6 +533,7 @@ instance CardanoHardForkConstraints c , (NodeToClientV_12, CardanoNodeToClientVersion8) , (NodeToClientV_13, CardanoNodeToClientVersion9) , (NodeToClientV_14, CardanoNodeToClientVersion10) + , (NodeToClientV_15, CardanoNodeToClientVersion11) ] latestReleasedNodeVersion _prx = (Just NodeToNodeV_10, Just NodeToClientV_14) @@ -509,11 +565,13 @@ protocolInfoCardano :: -> ProtocolParamsMary c -> ProtocolParamsAlonzo c -> ProtocolParamsBabbage c + -> ProtocolParamsConway c -> ProtocolTransitionParamsShelleyBased (ShelleyEra c) -> ProtocolTransitionParamsShelleyBased (AllegraEra c) -> ProtocolTransitionParamsShelleyBased (MaryEra c) -> ProtocolTransitionParamsShelleyBased (AlonzoEra c) -> ProtocolTransitionParamsShelleyBased (BabbageEra c) + -> ProtocolTransitionParamsShelleyBased (ConwayEra c) -> ProtocolInfo m (CardanoBlock c) protocolInfoCardano protocolParamsByron@ProtocolParamsByron { byronGenesis = genesisByron @@ -545,6 +603,10 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { babbageProtVer = protVerBabbage , babbageMaxTxCapacityOverrides = maxTxCapacityOverridesBabbage } + ProtocolParamsConway { + conwayProtVer = protVerConway + , conwayMaxTxCapacityOverrides = maxTxCapacityOverridesConway + } ProtocolTransitionParamsShelleyBased { transitionTranslationContext = () , transitionTrigger = triggerHardForkShelley @@ -565,6 +627,10 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { transitionTranslationContext = transCtxtBabbage , transitionTrigger = triggerHardForkBabbage } + ProtocolTransitionParamsShelleyBased { + transitionTranslationContext = transCtxtConway + , transitionTrigger = triggerHardForkConway + } | SL.Mainnet <- SL.sgNetworkId genesisShelley , length credssShelleyBased > 1 = error "Multiple Shelley-based credentials not allowed for mainnet" @@ -594,6 +660,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { K protVerMary :* K protVerAlonzo :* K protVerBabbage :* + K protVerConway :* Nil -- Byron @@ -761,7 +828,32 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { genesisBabbage transCtxtBabbage maxMajorProtVer + triggerHardForkConway + + -- Conway + + genesisConway :: ShelleyGenesis (ConwayEra c) + genesisConway = Core.translateEra' transCtxtConway genesisBabbage + + blockConfigConway :: BlockConfig (ShelleyBlock (Praos c) (ConwayEra c)) + blockConfigConway = + Shelley.mkShelleyBlockConfig + protVerConway + genesisConway + (shelleyBlockIssuerVKey <$> credssShelleyBased) + + partialConsensusConfigConway :: + PartialConsensusConfig (BlockProtocol (ShelleyBlock (Praos c) (ConwayEra c))) + partialConsensusConfigConway = praosParams + + partialLedgerConfigConway :: PartialLedgerConfig (ShelleyBlock (Praos c) (ConwayEra c)) + partialLedgerConfigConway = + mkPartialLedgerConfigShelley + genesisConway + transCtxtConway + maxMajorProtVer TriggerHardForkNever + -- Cardano k :: SecurityParam @@ -775,6 +867,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { :* K (Shelley.shelleyEraParams genesisMary) :* K (Shelley.shelleyEraParams genesisAlonzo) :* K (Shelley.shelleyEraParams genesisBabbage) + :* K (Shelley.shelleyEraParams genesisConway) :* Nil cfg :: TopLevelConfig (CardanoBlock c) @@ -789,6 +882,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { :* WrapPartialConsensusConfig partialConsensusConfigMary :* WrapPartialConsensusConfig partialConsensusConfigAlonzo :* WrapPartialConsensusConfig partialConsensusConfigBabbage + :* WrapPartialConsensusConfig partialConsensusConfigConway :* Nil ) } @@ -801,6 +895,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { :* WrapPartialLedgerConfig partialLedgerConfigMary :* WrapPartialLedgerConfig partialLedgerConfigAlonzo :* WrapPartialLedgerConfig partialLedgerConfigBabbage + :* WrapPartialLedgerConfig partialLedgerConfigConway :* Nil ) } @@ -812,6 +907,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { blockConfigMary blockConfigAlonzo blockConfigBabbage + blockConfigConway , topLevelConfigCodec = CardanoCodecConfig (configCodec topLevelConfigByron) @@ -820,6 +916,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { Shelley.ShelleyCodecConfig Shelley.ShelleyCodecConfig Shelley.ShelleyCodecConfig + Shelley.ShelleyCodecConfig , topLevelConfigStorage = CardanoStorageConfig (configStorage topLevelConfigByron) @@ -828,6 +925,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { (Shelley.ShelleyStorageConfig tpraosSlotsPerKESPeriod k) (Shelley.ShelleyStorageConfig tpraosSlotsPerKESPeriod k) (Shelley.ShelleyStorageConfig tpraosSlotsPerKESPeriod k) + (Shelley.ShelleyStorageConfig tpraosSlotsPerKESPeriod k) } -- When the initial ledger state is not in the Byron era, register the @@ -942,6 +1040,7 @@ protocolInfoCardano protocolParamsByron@ProtocolParamsByron { tpraos maxTxCapacityOverridesMary :* tpraos maxTxCapacityOverridesAlonzo :* praos maxTxCapacityOverridesBabbage :* + praos maxTxCapacityOverridesConway :* Nil protocolClientInfoCardano @@ -958,6 +1057,7 @@ protocolClientInfoCardano epochSlots = ProtocolClientInfo { (pClientInfoCodecConfig protocolClientInfoShelley) (pClientInfoCodecConfig protocolClientInfoShelley) (pClientInfoCodecConfig protocolClientInfoShelley) + (pClientInfoCodecConfig protocolClientInfoShelley) } {------------------------------------------------------------------------------- diff --git a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/ShelleyBased.hs b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/ShelleyBased.hs index 8a8f7db04b0..98581c99792 100644 --- a/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/ShelleyBased.hs +++ b/ouroboros-consensus-cardano/src/Ouroboros/Consensus/Cardano/ShelleyBased.hs @@ -9,6 +9,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableSuperClasses #-} + module Ouroboros.Consensus.Cardano.ShelleyBased (overShelleyBasedLedgerState) where import Data.SOP.Strict hiding (All2) @@ -42,11 +43,10 @@ overShelleyBasedLedgerState f (HardForkLedgerState st) = :* injectSingleEra :* injectSingleEra :* injectSingleEra + :* injectSingleEra :* Nil injectSingleEra :: - ( ShelleyCompatible proto era, EraCrypto era ~ c - , shelleyEra ~ ShelleyBlock proto era - ) - => (LedgerState -.-> LedgerState) shelleyEra + (EraCrypto era ~ c, ShelleyCompatible proto era) + => (LedgerState -.-> LedgerState) (ShelleyBlock proto era) injectSingleEra = fn f diff --git a/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal b/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal index 62ce7293e14..3436a2835d0 100644 --- a/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal +++ b/ouroboros-consensus-shelley-test/ouroboros-consensus-shelley-test.cabal @@ -49,6 +49,7 @@ library , cardano-ledger-alonzo-test , cardano-ledger-babbage , cardano-ledger-babbage-test + , cardano-ledger-conway-test , cardano-ledger-shelley , cardano-ledger-shelley-ma , cardano-ledger-shelley-ma-test diff --git a/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs b/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs index 919423e9912..898b346af02 100644 --- a/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs +++ b/ouroboros-consensus-shelley-test/src/Test/Consensus/Shelley/Examples.hs @@ -16,6 +16,7 @@ module Test.Consensus.Shelley.Examples ( , examplesAllegra , examplesAlonzo , examplesBabbage + , examplesConway , examplesMary , examplesShelley ) where @@ -52,6 +53,8 @@ import Test.Cardano.Ledger.Alonzo.Examples.Consensus (ledgerExamplesAlonzo) import Test.Cardano.Ledger.Babbage.Examples.Consensus (ledgerExamplesBabbage) +import Test.Cardano.Ledger.Conway.Examples.Consensus + (ledgerExamplesConway) import Test.Cardano.Ledger.Mary.Examples.Consensus (ledgerExamplesMary) import Test.Cardano.Ledger.Shelley.Examples.Consensus @@ -251,3 +254,6 @@ examplesAlonzo = fromShelleyLedgerExamples ledgerExamplesAlonzo examplesBabbage :: Golden.Examples StandardBabbageBlock examplesBabbage = fromShelleyLedgerExamplesPraos ledgerExamplesBabbage + +examplesConway :: Golden.Examples StandardConwayBlock +examplesConway = fromShelleyLedgerExamplesPraos ledgerExamplesConway diff --git a/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal b/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal index 3f3fb04c6d1..f71405fde30 100644 --- a/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal +++ b/ouroboros-consensus-shelley/ouroboros-consensus-shelley.cabal @@ -82,6 +82,7 @@ library -- cardano-ledger-specs , cardano-ledger-alonzo , cardano-ledger-babbage + , cardano-ledger-conway , cardano-ledger-shelley , cardano-ledger-shelley-ma , small-steps diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Eras.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Eras.hs index 547a1096862..b8ef7b18996 100644 --- a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Eras.hs +++ b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Eras.hs @@ -16,12 +16,14 @@ module Ouroboros.Consensus.Shelley.Eras ( AllegraEra , AlonzoEra , BabbageEra + , ConwayEra , MaryEra , ShelleyEra -- * Eras instantiated with standard crypto , StandardAllegra , StandardAlonzo , StandardBabbage + , StandardConway , StandardMary , StandardShelley -- * Shelley-based era @@ -57,6 +59,8 @@ import Cardano.Ledger.Babbage.PParams (BabbagePParamsHKD (..)) import qualified Cardano.Ledger.Babbage.Rules as Babbage import qualified Cardano.Ledger.Babbage.Translation as Babbage import Cardano.Ledger.BaseTypes +import Cardano.Ledger.Conway (ConwayEra) +import qualified Cardano.Ledger.Conway.Translation as Conway import Cardano.Ledger.Core as Core import Cardano.Ledger.Crypto (StandardCrypto) import Cardano.Ledger.Keys (DSignable, Hash) @@ -94,6 +98,9 @@ type StandardAlonzo = AlonzoEra StandardCrypto -- | The Babbage era with standard crypto type StandardBabbage = BabbageEra StandardCrypto +-- | The Conway era with standard crypto +type StandardConway = ConwayEra StandardCrypto + {------------------------------------------------------------------------------- Type synonyms for convenience -------------------------------------------------------------------------------} @@ -146,13 +153,6 @@ class ( Core.EraSegWits era , HasField "_protocolVersion" (Core.PParamsUpdate era) (SL.StrictMaybe SL.ProtVer) - -- TODO This constraint is a little weird. The translation context - -- reflects things needed in comparison to the previous era, whereas the - -- 'AdditionalGenesisConfig' is from Shelley. Ultimately we should drop - -- this and potentially add a new API for dealing with the relationship - -- between `GenesisConfig` and `TranslationContext`. - , SL.AdditionalGenesisConfig era ~ Core.TranslationContext era - , NoThunks (SL.StashedAVVMAddresses era) , FromCBOR (SL.StashedAVVMAddresses era) , ToCBOR (SL.StashedAVVMAddresses era) @@ -236,6 +236,10 @@ instance (Praos.PraosCrypto c) => ShelleyBasedEra (BabbageEra c) where shelleyBasedEraName _ = "Babbage" applyShelleyBasedTx = applyAlonzoBasedTx +instance (Praos.PraosCrypto c) => ShelleyBasedEra (ConwayEra c) where + shelleyBasedEraName _ = "Conway" + applyShelleyBasedTx = applyAlonzoBasedTx + applyAlonzoBasedTx :: forall era. ( ShelleyBasedEra era, SupportsTwoPhaseValidation era, @@ -331,6 +335,24 @@ instance SupportsTwoPhaseValidation (BabbageEra c) where ) -> Just claimedFlag _ -> Nothing +instance SupportsTwoPhaseValidation (ConwayEra c) where + incorrectClaimedFlag _ pf = case pf of + SL.UtxowFailure + ( Babbage.AlonzoInBabbageUtxowPredFailure + ( Alonzo.ShelleyInAlonzoUtxowPredFailure + ( SL.UtxoFailure + ( Babbage.AlonzoInBabbageUtxoPredFailure + ( Alonzo.UtxosFailure + ( Alonzo.ValidationTagMismatch + (Alonzo.IsValid claimedFlag) + _validationErrs + ) + ) + ) + ) + ) + ) -> Just claimedFlag + _ -> Nothing -- | The ledger responded with Alonzo errors we were not expecting data UnexpectedAlonzoLedgerErrors = @@ -377,3 +399,10 @@ instance ShelleyBasedEra (BabbageEra c) => Core.TranslateEra (BabbageEra c) Wrap fmap (WrapTx . Babbage.unTx) . Core.translateEra @(BabbageEra c) ctxt . Babbage.Tx . unwrapTx + +instance ShelleyBasedEra (ConwayEra c) => Core.TranslateEra (ConwayEra c) WrapTx where + type TranslationError (ConwayEra c) WrapTx = Core.TranslationError (ConwayEra c) Conway.Tx + translateEra ctxt = + fmap (WrapTx . Conway.unTx) + . Core.translateEra @(ConwayEra c) ctxt + . Conway.Tx . unwrapTx diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/HFEras.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/HFEras.hs index 89fb3966994..0cb928df6a5 100644 --- a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/HFEras.hs +++ b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/HFEras.hs @@ -12,6 +12,7 @@ module Ouroboros.Consensus.Shelley.HFEras ( StandardAllegraBlock , StandardAlonzoBlock , StandardBabbageBlock + , StandardConwayBlock , StandardMaryBlock , StandardShelleyBlock ) where @@ -25,9 +26,9 @@ import qualified Ouroboros.Consensus.Protocol.Praos as Praos import Ouroboros.Consensus.Protocol.TPraos (StandardCrypto, TPraos) import qualified Ouroboros.Consensus.Protocol.TPraos as TPraos import Ouroboros.Consensus.Shelley.Eras (AllegraEra, AlonzoEra, - BabbageEra, MaryEra, ShelleyEra, StandardAllegra, - StandardAlonzo, StandardBabbage, StandardMary, - StandardShelley) + BabbageEra, ConwayEra, MaryEra, ShelleyEra, + StandardAllegra, StandardAlonzo, StandardBabbage, + StandardConway, StandardMary, StandardShelley) import Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyBlock, ShelleyCompatible) import Ouroboros.Consensus.Shelley.Ledger.Protocol () @@ -49,6 +50,8 @@ type StandardAlonzoBlock = ShelleyBlock (TPraos StandardCrypto) StandardAlonzo type StandardBabbageBlock = ShelleyBlock (Praos StandardCrypto) StandardBabbage +type StandardConwayBlock = ShelleyBlock (Praos StandardCrypto) StandardConway + {------------------------------------------------------------------------------- ShelleyCompatible -------------------------------------------------------------------------------} @@ -78,3 +81,13 @@ instance instance (Praos.PraosCrypto c) => ShelleyCompatible (Praos c) (BabbageEra c) + +-- This instance is required since the ledger view forecast function for +-- Praos/Conway still goes through the forecast for TPraos. Once this is +-- addressed, we could remove this instance. +instance + (Praos.PraosCrypto c, TPraos.PraosCrypto c) => + ShelleyCompatible (TPraos c) (ConwayEra c) + +instance + (Praos.PraosCrypto c) => ShelleyCompatible (Praos c) (ConwayEra c) diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs index 794db55aa27..9a383073aef 100644 --- a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs +++ b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs @@ -348,6 +348,25 @@ instance ( ShelleyCompatible p (BabbageEra c) where pparams = getPParams $ tickedShelleyLedgerState ledgerState +instance ( ShelleyCompatible p (ConwayEra c) + ) => TxLimits (ShelleyBlock p (ConwayEra c)) where + + type TxMeasure (ShelleyBlock p (ConwayEra c)) = AlonzoMeasure + + txMeasure (ShelleyValidatedTx _txid vtx) = + AlonzoMeasure { + byteSize = ByteSize $ txInBlockSize (mkShelleyTx @(ConwayEra c) @p (SL.extractTx vtx)) + , exUnits = fromExUnits $ totExUnits (SL.extractTx vtx) + } + + txsBlockCapacity ledgerState = + AlonzoMeasure { + byteSize = ByteSize $ txsMaxBytes ledgerState + , exUnits = fromExUnits $ getField @"_maxBlockExUnits" pparams + } + where + pparams = getPParams $ tickedShelleyLedgerState ledgerState + {------------------------------------------------------------------------------- WithTop -------------------------------------------------------------------------------} diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/Praos.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/Praos.hs index 422a0ecb7de..fac45ec1904 100644 --- a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/Praos.hs +++ b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/Praos.hs @@ -10,6 +10,7 @@ module Ouroboros.Consensus.Shelley.Node.Praos ( ProtocolParamsBabbage (..) + , ProtocolParamsConway (..) , praosBlockForging , praosSharedBlockForging ) where @@ -26,8 +27,8 @@ import Ouroboros.Consensus.Protocol.Praos (Praos, PraosParams (..), praosCheckCanForge) import Ouroboros.Consensus.Protocol.Praos.Common (PraosCanBeLeader (praosCanBeLeaderOpCert)) -import Ouroboros.Consensus.Shelley.Eras (BabbageEra, EraCrypto, - ShelleyBasedEra (shelleyBasedEraName)) +import Ouroboros.Consensus.Shelley.Eras (BabbageEra, ConwayEra, + EraCrypto, ShelleyBasedEra (shelleyBasedEraName)) import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock, ShelleyCompatible, forgeShelleyBlock) import Ouroboros.Consensus.Shelley.Node @@ -42,16 +43,16 @@ import Ouroboros.Consensus.Util.IOLike (IOLike) -- | Create a 'BlockForging' record for a single era. praosBlockForging :: - forall m era c. - ( ShelleyCompatible (Praos c) era, - c ~ EraCrypto era, - TxLimits (ShelleyBlock (Praos c) era), - IOLike m - ) => - PraosParams -> - TxLimits.Overrides (ShelleyBlock (Praos c) era) -> - ShelleyLeaderCredentials (EraCrypto era) -> - m (BlockForging m (ShelleyBlock (Praos c) era)) + forall m era c. + ( ShelleyCompatible (Praos c) era + , c ~ EraCrypto era + , TxLimits (ShelleyBlock (Praos c) era) + , IOLike m + ) + => PraosParams + -> TxLimits.Overrides (ShelleyBlock (Praos c) era) + -> ShelleyLeaderCredentials (EraCrypto era) + -> m (BlockForging m (ShelleyBlock (Praos c) era)) praosBlockForging praosParams maxTxCapacityOverrides credentials = do hotKey <- HotKey.mkHotKey @m @c initSignKey startPeriod praosMaxKESEvo pure $ praosSharedBlockForging hotKey slotToPeriod credentials maxTxCapacityOverrides @@ -75,10 +76,10 @@ praosBlockForging praosParams maxTxCapacityOverrides credentials = do -- The name of the era (separated by a @_@) will be appended to each -- 'forgeLabel'. praosSharedBlockForging :: - forall m c era. - ( ShelleyEraWithCrypto c (Praos c) era, - IOLike m - ) + forall m c era. + ( ShelleyEraWithCrypto c (Praos c) era + , IOLike m + ) => HotKey.HotKey c m -> (SlotNo -> Absolute.KESPeriod) -> ShelleyLeaderCredentials c @@ -87,36 +88,41 @@ praosSharedBlockForging :: praosSharedBlockForging hotKey slotToPeriod - ShelleyLeaderCredentials - { shelleyLeaderCredentialsCanBeLeader = canBeLeader, - shelleyLeaderCredentialsLabel = label + ShelleyLeaderCredentials { + shelleyLeaderCredentialsCanBeLeader = canBeLeader + , shelleyLeaderCredentialsLabel = label } maxTxCapacityOverrides = do - BlockForging - { forgeLabel = label <> "_" <> shelleyBasedEraName (Proxy @era), - canBeLeader = canBeLeader, - updateForgeState = \_ curSlot _ -> - forgeStateUpdateInfoFromUpdateInfo - <$> HotKey.evolve hotKey (slotToPeriod curSlot), - checkCanForge = \cfg curSlot _tickedChainDepState _isLeader -> - praosCheckCanForge - (configConsensus cfg) - curSlot, - forgeBlock = \cfg -> - forgeShelleyBlock - hotKey - canBeLeader - cfg - maxTxCapacityOverrides - } + BlockForging + { forgeLabel = label <> "_" <> shelleyBasedEraName (Proxy @era), + canBeLeader = canBeLeader, + updateForgeState = \_ curSlot _ -> + forgeStateUpdateInfoFromUpdateInfo + <$> HotKey.evolve hotKey (slotToPeriod curSlot), + checkCanForge = \cfg curSlot _tickedChainDepState _isLeader -> + praosCheckCanForge + (configConsensus cfg) + curSlot, + forgeBlock = \cfg -> + forgeShelleyBlock + hotKey + canBeLeader + cfg + maxTxCapacityOverrides + } {------------------------------------------------------------------------------- ProtocolInfo -------------------------------------------------------------------------------} -- | Parameters needed to run Babbage -data ProtocolParamsBabbage c = ProtocolParamsBabbage - { babbageProtVer :: SL.ProtVer, - babbageMaxTxCapacityOverrides :: TxLimits.Overrides (ShelleyBlock (Praos c) (BabbageEra c)) +data ProtocolParamsBabbage c = ProtocolParamsBabbage { + babbageProtVer :: SL.ProtVer + , babbageMaxTxCapacityOverrides :: TxLimits.Overrides (ShelleyBlock (Praos c) (BabbageEra c)) } +-- | Parameters needed to run Conway +data ProtocolParamsConway c = ProtocolParamsConway { + conwayProtVer :: SL.ProtVer + , conwayMaxTxCapacityOverrides :: TxLimits.Overrides (ShelleyBlock (Praos c) (ConwayEra c)) + } diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/TPraos.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/TPraos.hs index 23bad278387..3a972d93c25 100644 --- a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/TPraos.hs +++ b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node/TPraos.hs @@ -231,7 +231,7 @@ protocolInfoShelley protocolParamsShelleyBased } = protocolInfoTPraosShelleyBased protocolParamsShelleyBased - () -- trivial translation context + ((), ()) -- trivial additional genesis config and translation context protVer maxTxCapacityOverrides @@ -244,7 +244,7 @@ protocolInfoTPraosShelleyBased :: , c ~ EraCrypto era ) => ProtocolParamsShelleyBased era - -> Core.TranslationContext era + -> (SL.AdditionalGenesisConfig era, Core.TranslationContext era) -> SL.ProtVer -> TxLimits.Overrides (ShelleyBlock (TPraos c) era) -> ProtocolInfo m (ShelleyBlock (TPraos c) era) @@ -253,7 +253,7 @@ protocolInfoTPraosShelleyBased ProtocolParamsShelleyBased { , shelleyBasedInitialNonce = initialNonce , shelleyBasedLeaderCredentials = credentialss } - transCtxt + (additionalGenesisConfig, translationContext) protVer maxTxCapacityOverrides = assertWithMsg (validateGenesis genesis) $ @@ -266,19 +266,6 @@ protocolInfoTPraosShelleyBased ProtocolParamsShelleyBased { credentialss } where - - -- | Currently for all existing eras in ledger-specs (Shelley, Allegra, Mary - -- and Alonzo) it happens to be the case that AdditionalGenesisConfig and - -- TranslationContext are instantiated to the same type. - -- We take advantage of this fact below to simplify our code, but we are - -- aware that this might change in future (for new eras), breaking this - -- code. - -- - -- see type equality constraint in - -- Ouroboros.Consensus.Shelley.Eras.ShelleyBasedEra - additionalGenesisConfig :: SL.AdditionalGenesisConfig era - additionalGenesisConfig = transCtxt - maxMajorProtVer :: MaxMajorProtVer maxMajorProtVer = MaxMajorProtVer $ SL.pvMajor protVer @@ -298,7 +285,7 @@ protocolInfoTPraosShelleyBased ProtocolParamsShelleyBased { } ledgerConfig :: LedgerConfig (ShelleyBlock (TPraos c) era) - ledgerConfig = mkShelleyLedgerConfig genesis transCtxt epochInfo maxMajorProtVer + ledgerConfig = mkShelleyLedgerConfig genesis translationContext epochInfo maxMajorProtVer epochInfo :: EpochInfo (Except History.PastHorizonException) epochInfo = diff --git a/ouroboros-consensus-test/test-storage/Main.hs b/ouroboros-consensus-test/test-storage/Main.hs index efac9491e86..73317175973 100644 --- a/ouroboros-consensus-test/test-storage/Main.hs +++ b/ouroboros-consensus-test/test-storage/Main.hs @@ -18,11 +18,3 @@ tests tmpDir = testGroup "ouroboros-storage" [ Test.Ouroboros.Storage.tests tmpDir ] - --- A bug in CI requires to modify this component; If you encountered --- ``` --- test-storage: cannot execute binary file: Exec format error --- ``` --- increment the following /unlucky/ counter and cross fingers: --- --- 1 diff --git a/ouroboros-consensus/changelog.d/20230131_145319_damian.only_issue_3962_conway.md b/ouroboros-consensus/changelog.d/20230131_145319_damian.only_issue_3962_conway.md new file mode 100644 index 00000000000..b9c50fe5009 --- /dev/null +++ b/ouroboros-consensus/changelog.d/20230131_145319_damian.only_issue_3962_conway.md @@ -0,0 +1,3 @@ +### Non-breaking + +- Added `NodeToClientV_15`, to support the `Conway` era. diff --git a/ouroboros-consensus/docs/AddingAnEra.md b/ouroboros-consensus/docs/AddingAnEra.md index 6541af3ce1b..37e471bebc9 100644 --- a/ouroboros-consensus/docs/AddingAnEra.md +++ b/ouroboros-consensus/docs/AddingAnEra.md @@ -6,6 +6,7 @@ consensus and to add it as an extra era to the Cardano blockchain. Prior art upon which this is based: * [#2666](https://github.com/input-output-hk/ouroboros-network/pull/2666) * [#2679](https://github.com/input-output-hk/ouroboros-network/pull/2679) +* [#3971](https://github.com/input-output-hk/ouroboros-network/pull/3971/) The steps are fairly straightforward. We have put things in place (in consensus and in the ledger) when adding the Allegra and Mary eras that should now make it @@ -20,7 +21,7 @@ previous Shelley-based case. Be sure to run both the Shelley (`ouroboros-consensus-cardano-test`) tests. For exhaustiveness, we give an overview of the changes needed. The new era we'll -be adding is the Alonzo era, which comes after the Mary era. +be using as a running example is the Alonzo era, which comes after the Mary era. ## Preparation @@ -68,11 +69,11 @@ be adding is the Alonzo era, which comes after the Mary era. ## `ouroboros-consensus-cardano` -* In `Ouroboros.Consensus.Cardano.Block`, include `AlonzoEra` in `CardanoEras` - and `ShelleyBasedEras`. Update all the pattern synonyms in the module with the - new era. Don't forget to update the comments, the `COMPLETE` pragmas, and the - export lists. It's easy to forget a case and the compiler will likely not warn - you, you'll notice it when trying to use the pattern synonyms. +* In `Ouroboros.Consensus.Cardano.Block`, include `AlonzoEra` in `CardanoEras`. + Update all the pattern synonyms in the module with the new era. Don't forget + to update the comments, the `COMPLETE` pragmas, and the export lists. It's + easy to forget a case and the compiler will likely not warn you, you'll notice + it when trying to use the pattern synonyms. * In `Ouroboros.Consensus.Cardano.CanHardFork`, update `CardanoHardForkConstraints`, add additional translations to the `CanHardFork` @@ -84,9 +85,8 @@ be adding is the Alonzo era, which comes after the Mary era. ones so that they disable the new era. Be sure to include the new versions in the two methods of the `SupportedNetworkProtocolVersion` instance. Extend `protocolInfoCardano` with the new era by following the type errors and adding - the missing parameters (including `ProtocolParamsTransition`). Don't forget to - derive `maxMajorProtVer` from the new final era. Update - `protocolClientInfoCardano` too. + the missing parameters. Don't forget to derive `maxMajorProtVer` from the new + final era. Update `protocolClientInfoCardano` too. * In `Ouroboros.Consensus.Cardano`, update the `ProtocolCardano` type synonym, add the extra arguments needed for `protocolInfoCardano` to the diff --git a/ouroboros-consensus/docs/interface-CHANGELOG.md b/ouroboros-consensus/docs/interface-CHANGELOG.md index 54b01549095..ba891429cf6 100644 --- a/ouroboros-consensus/docs/interface-CHANGELOG.md +++ b/ouroboros-consensus/docs/interface-CHANGELOG.md @@ -56,6 +56,22 @@ may appear out of chronological order. The internals of each entry are organized similar to https://keepachangelog.com/en/1.1.0/, adapted to our plan explained above. +## Circa 2022-12-19 + +### Added + +- Conway to `CardanoEras`. +- `NodeToNodeV_11` and `NodeToClientV_15`, both of which enable Conway. +- Conway-related type and pattern synonyms. Eg `StandardConway`, `HeaderConway`, + `GentTxConway`, etc. + +### Changed + +- The `protocolInfoTPraosShelleyBased` and `protocolInfoPraosShelleyBased` + functions now expect a tuple of the `AdditionalGenesisConfig` and the + `TranslationContext` instead of just the `TranslationContext`. For all + Shelley-based eras before Conway, those had been equal types. + ## Circa 2022-11-23 - Removed dead `protocolInfoPraosBabbage` and `protocolInfoPraosShelleyBased`. @@ -85,6 +101,7 @@ https://keepachangelog.com/en/1.1.0/, adapted to our plan explained above. - `GetPoolDistr`: Get the pool distribution for the given stake pool ids ## Circa 2022-08-03 + ### Added - new project `ouroboros-consensus-cardano-tools` containing two tools: diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Query/Version.hs b/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Query/Version.hs index 68de62964c9..5caf4f58aaf 100644 --- a/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Query/Version.hs +++ b/ouroboros-consensus/src/Ouroboros/Consensus/Ledger/Query/Version.hs @@ -27,3 +27,4 @@ nodeToClientVersionToQueryVersion x = case x of NodeToClientV_12 -> QueryVersion2 NodeToClientV_13 -> QueryVersion2 NodeToClientV_14 -> QueryVersion2 + NodeToClientV_15 -> QueryVersion2 diff --git a/ouroboros-network-api/src/Ouroboros/Network/NodeToClient/Version.hs b/ouroboros-network-api/src/Ouroboros/Network/NodeToClient/Version.hs index eb210b3e7cb..fe5d52d117a 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/NodeToClient/Version.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/NodeToClient/Version.hs @@ -36,6 +36,8 @@ data NodeToClientVersion -- ^ enabled @CardanoNodeToClientVersion9@, i.e., Babbage | NodeToClientV_14 -- ^ added @GetPoolDistr, @GetPoolState, @GetSnapshots + | NodeToClientV_15 + -- ^ enabled @CardanoNodeToClientVersion11@, i.e., Conway deriving (Eq, Ord, Enum, Bounded, Show, Typeable) -- | We set 16ths bit to distinguish `NodeToNodeVersion` and @@ -54,6 +56,7 @@ nodeToClientVersionCodec = CodecCBORTerm { encodeTerm, decodeTerm } encodeTerm NodeToClientV_12 = CBOR.TInt (12 `setBit` nodeToClientVersionBit) encodeTerm NodeToClientV_13 = CBOR.TInt (13 `setBit` nodeToClientVersionBit) encodeTerm NodeToClientV_14 = CBOR.TInt (14 `setBit` nodeToClientVersionBit) + encodeTerm NodeToClientV_15 = CBOR.TInt (15 `setBit` nodeToClientVersionBit) decodeTerm (CBOR.TInt tag) = case ( tag `clearBit` nodeToClientVersionBit @@ -65,6 +68,7 @@ nodeToClientVersionCodec = CodecCBORTerm { encodeTerm, decodeTerm } (12, True) -> Right NodeToClientV_12 (13, True) -> Right NodeToClientV_13 (14, True) -> Right NodeToClientV_14 + (15, True) -> Right NodeToClientV_15 (n, _) -> Left ( T.pack "decode NodeToClientVersion: unknown tag: " <> T.pack (show tag) , Just n) decodeTerm _ = Left ( T.pack "decode NodeToClientVersion: unexpected term" diff --git a/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs b/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs index d1f100a0083..1cdda91b0a9 100644 --- a/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs +++ b/ouroboros-network-api/src/Ouroboros/Network/NodeToNode/Version.hs @@ -44,6 +44,10 @@ data NodeToNodeVersion -- ^ Changes: -- -- * Enable full duplex connections. + | NodeToNodeV_11 + -- ^ Changes: + -- + -- * Enable @CardanoNodeToNodeVersion7@, i.e., Conway deriving (Eq, Ord, Enum, Bounded, Show, Typeable) nodeToNodeVersionCodec :: CodecCBORTerm (Text, Maybe Int) NodeToNodeVersion @@ -53,11 +57,13 @@ nodeToNodeVersionCodec = CodecCBORTerm { encodeTerm, decodeTerm } encodeTerm NodeToNodeV_8 = CBOR.TInt 8 encodeTerm NodeToNodeV_9 = CBOR.TInt 9 encodeTerm NodeToNodeV_10 = CBOR.TInt 10 + encodeTerm NodeToNodeV_11 = CBOR.TInt 11 decodeTerm (CBOR.TInt 7) = Right NodeToNodeV_7 decodeTerm (CBOR.TInt 8) = Right NodeToNodeV_8 decodeTerm (CBOR.TInt 9) = Right NodeToNodeV_9 decodeTerm (CBOR.TInt 10) = Right NodeToNodeV_10 + decodeTerm (CBOR.TInt 11) = Right NodeToNodeV_11 decodeTerm (CBOR.TInt n) = Left ( T.pack "decode NodeToNodeVersion: unknonw tag: " <> T.pack (show n) , Just n diff --git a/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-client.cddl b/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-client.cddl index d1c7879829f..68f1fd23441 100644 --- a/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-client.cddl +++ b/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-client.cddl @@ -14,8 +14,8 @@ msgRefuse = [2, refuseReason] versionTable = { * versionNumber => nodeToClientVersionData } ; as of version 2 (which is no longer supported) we set 15th bit to 1 -; 9 / 10 / 11 / 12 / 13 / 14 -versionNumber = 32777 / 32778 / 32779 / 32780 / 32781 / 32782 +; 9 / 10 / 11 / 12 / 13 / 14 / 15 +versionNumber = 32777 / 32778 / 32779 / 32780 / 32781 / 32782 / 32783 nodeToClientVersionData = networkMagic diff --git a/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-node.cddl b/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-node.cddl index f492cc27c8f..2f4ab2669e9 100644 --- a/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-node.cddl +++ b/ouroboros-network-protocols/test-cddl/specs/handshake-node-to-node.cddl @@ -13,7 +13,7 @@ msgRefuse = [2, refuseReason] versionTable = { * versionNumber => nodeToNodeVersionData } -versionNumber = 7 / 8 / 9 / 10 +versionNumber = 7 / 8 / 9 / 10 / 11 nodeToNodeVersionData = [ networkMagic, initiatorAndResponderDiffusionMode ]