From 4564a4dc5abdf7370fb7682bf04072507fab35f2 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Mon, 18 Nov 2024 14:20:21 +0100 Subject: [PATCH 01/15] Add Georgy Lukyanov to core contributors Signed-off-by: Georgy Lukyanov --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd11eaa851..46efafa548 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -370,6 +370,8 @@ The core contributors to consensus codebase are: - [Damian Nadales](https://github.com/dnadales) +- [Georgy Lukyanov](https://github.com/geo2a) + # Code of conduct See [Cardano engineering From fe95aad7fdba0e2c911cf312b8cec49fd828deae Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Mon, 18 Nov 2024 15:38:46 +0100 Subject: [PATCH 02/15] Add Georgy Lukyanov to CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index b8ea65074b..4391f58fce 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ # Ouroboros-Consensus # These owners will be the default owners for everything in the repository. -* @nfrisby @jasagredo @amesgen @fraser-iohk @dnadales +* @nfrisby @jasagredo @amesgen @fraser-iohk @dnadales @geo2a From 050cf82f58e8d59f04d730a7678ab51577ba98ad Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Tue, 12 Nov 2024 13:27:43 +0000 Subject: [PATCH 03/15] change serialization / deserialization for OneEraGenTxId so it's treated as a bytestring and is decoded into an arbitrary era --- .../Ouroboros/Consensus/Cardano/ByronHFC.hs | 4 ++ .../Ouroboros/Consensus/Cardano/Node.hs | 40 +++++++++++++++++- .../Shelley/Ledger/NetworkProtocolVersion.hs | 2 + .../Ouroboros/Consensus/Shelley/ShelleyHFC.hs | 4 ++ .../Test/Consensus/Cardano/Generators.hs | 5 +++ .../ThreadNet/Infra/ShelleyBasedHardFork.hs | 3 ++ .../Test/Consensus/Cardano/Golden.hs | 2 + .../Test/Consensus/HardFork/Combinator.hs | 3 ++ .../HardFork/Combinator/Serialisation.hs | 5 ++- .../Combinator/Serialisation/Common.hs | 19 ++++++++- .../Serialisation/SerialiseNodeToClient.hs | 41 +++++++++++++++++-- .../Serialisation/SerialiseNodeToNode.hs | 24 ++++++++++- .../Consensus/Ledger/Query/Version.hs | 1 + .../Test/Util/Serialisation/Roundtrip.hs | 4 ++ 14 files changed, 147 insertions(+), 10 deletions(-) diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs index 140c633968..94058f106d 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs @@ -7,6 +7,7 @@ module Ouroboros.Consensus.Cardano.ByronHFC (ByronBlockHFC) where import qualified Data.Map.Strict as Map +import Data.SOP.Strict.NS import Ouroboros.Consensus.Block import Ouroboros.Consensus.Byron.Ledger import Ouroboros.Consensus.Byron.Node () @@ -60,6 +61,9 @@ instance SupportedNetworkProtocolVersion ByronBlockHFC where SerialiseHFC instance -------------------------------------------------------------------------------} +instance HasBlessedGenTxIdDecodeEra '[ByronBlock] where + blessedGenTxIdDecodeEra = Z mempty + -- | Forward to the ByronBlock instance, this means we don't add an era -- wrapper around blocks on disk. This makes sure we're compatible with the -- existing Byron blocks. diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs index f54245242f..c000b893dd 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs @@ -49,6 +49,7 @@ module Ouroboros.Consensus.Cardano.Node ( , pattern CardanoNodeToClientVersion13 , pattern CardanoNodeToClientVersion14 , pattern CardanoNodeToClientVersion15 + , pattern CardanoNodeToClientVersion16 , pattern CardanoNodeToClientVersion2 , pattern CardanoNodeToClientVersion3 , pattern CardanoNodeToClientVersion4 @@ -59,6 +60,7 @@ module Ouroboros.Consensus.Cardano.Node ( , pattern CardanoNodeToClientVersion9 , pattern CardanoNodeToNodeVersion1 , pattern CardanoNodeToNodeVersion2 + , pattern CardanoNodeToNodeVersion3 ) where import Cardano.Binary (DecoderError (..), enforceSize) @@ -130,6 +132,12 @@ import Ouroboros.Consensus.Util.IOLike instance SerialiseConstraintsHFC ByronBlock +instance HasBlessedGenTxIdDecodeEra (CardanoShelleyEras c) where + blessedGenTxIdDecodeEra = S $ S $ S $ S $ Z mempty + +instance HasBlessedGenTxIdDecodeEra (CardanoEras c) where + blessedGenTxIdDecodeEra = S blessedGenTxIdDecodeEra + -- | Important: we need to maintain binary compatibility with Byron blocks, as -- they are already stored on disk. -- @@ -272,6 +280,20 @@ pattern CardanoNodeToNodeVersion2 = :* Nil ) +pattern CardanoNodeToNodeVersion3 :: BlockNodeToNodeVersion (CardanoBlock c) +pattern CardanoNodeToNodeVersion3 = + HardForkNodeToNodeEnabled + HardForkSpecificNodeToNodeVersion2 + ( WrapNodeToNodeVersion ByronNodeToNodeVersion2 + :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1 + :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1 + :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1 + :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1 + :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1 + :* WrapNodeToNodeVersion ShelleyNodeToNodeVersion1 + :* Nil + ) + -- | We support the sole Byron version with the hard fork disabled. pattern CardanoNodeToClientVersion1 :: BlockNodeToClientVersion (CardanoBlock c) pattern CardanoNodeToClientVersion1 = @@ -511,11 +533,26 @@ pattern CardanoNodeToClientVersion15 = :* Nil ) +pattern CardanoNodeToClientVersion16 :: BlockNodeToClientVersion (CardanoBlock c) +pattern CardanoNodeToClientVersion16 = + HardForkNodeToClientEnabled + HardForkSpecificNodeToClientVersion4 + ( EraNodeToClientEnabled ByronNodeToClientVersion1 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 + :* Nil + ) + instance CardanoHardForkConstraints c => SupportedNetworkProtocolVersion (CardanoBlock c) where supportedNodeToNodeVersions _ = Map.fromList $ [ (NodeToNodeV_13, CardanoNodeToNodeVersion2) , (NodeToNodeV_14, CardanoNodeToNodeVersion2) + , (NodeToNodeV_15, CardanoNodeToNodeVersion3) ] supportedNodeToClientVersions _ = Map.fromList $ @@ -530,9 +567,10 @@ instance CardanoHardForkConstraints c , (NodeToClientV_17, CardanoNodeToClientVersion13) , (NodeToClientV_18, CardanoNodeToClientVersion14) , (NodeToClientV_19, CardanoNodeToClientVersion15) + , (NodeToClientV_20, CardanoNodeToClientVersion16) ] - latestReleasedNodeVersion _prx = (Just NodeToNodeV_14, Just NodeToClientV_19) + latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_20) {------------------------------------------------------------------------------- ProtocolInfo diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs index 01b79c62ee..a2996ca6bb 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs @@ -57,6 +57,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where supportedNodeToNodeVersions _ = Map.fromList [ (NodeToNodeV_13, ShelleyNodeToNodeVersion1) , (NodeToNodeV_14, ShelleyNodeToNodeVersion1) + , (NodeToNodeV_15, ShelleyNodeToNodeVersion1) ] supportedNodeToClientVersions _ = Map.fromList [ (NodeToClientV_9, ShelleyNodeToClientVersion5) @@ -70,6 +71,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where , (NodeToClientV_17, ShelleyNodeToClientVersion9) , (NodeToClientV_18, ShelleyNodeToClientVersion10) , (NodeToClientV_19, ShelleyNodeToClientVersion11) + , (NodeToClientV_20, ShelleyNodeToClientVersion11) ] latestReleasedNodeVersion = latestReleasedNodeVersionDefault diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs index 1527dc8c6c..83a57b8cb3 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs @@ -36,6 +36,7 @@ import Data.Coerce import qualified Data.Map.Strict as Map import Data.SOP.BasicFunctors import Data.SOP.InPairs (RequiringBoth (..), ignoringBoth) +import Data.SOP.Strict.NS import qualified Data.Text as T (pack) import Data.Void (Void) import Data.Word @@ -115,6 +116,9 @@ instance ( ShelleyCompatible proto era SerialiseHFC instance -------------------------------------------------------------------------------} +instance HasBlessedGenTxIdDecodeEra '[ShelleyBlock proto era] where + blessedGenTxIdDecodeEra = Z mempty + -- | Use the default implementations. This means the serialisation of blocks -- includes an era wrapper. Each block should do this from the start to be -- prepared for future hard forks without having to do any bit twiddling. diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs index ee869afc94..20d68ca794 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs @@ -461,6 +461,11 @@ instance c ~ MockCryptoCompatByron (CardanoGenTx c)) where arbitrary = arbitraryNodeToClient GenTxByron GenTxShelley GenTxAllegra GenTxMary GenTxAlonzo GenTxBabbage GenTxConway +instance c ~ MockCryptoCompatByron + => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) + (CardanoGenTxId c)) where + arbitrary = arbitraryNodeToClient GenTxIdByron GenTxIdShelley GenTxIdAllegra GenTxIdMary GenTxIdAlonzo GenTxIdBabbage GenTxIdConway + instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) (CardanoApplyTxErr c)) where diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs index d4961835e0..a5594c146d 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs @@ -163,6 +163,9 @@ instance TranslateTxMeasure AlonzoMeasure ConwayMeasure where instance TranslateTxMeasure ConwayMeasure ConwayMeasure where translateTxMeasure = id +instance HasBlessedGenTxIdDecodeEra (ShelleyBasedHardForkEras proto1 era1 proto2 era2) where + blessedGenTxIdDecodeEra = S $ Z mempty + instance ShelleyBasedHardForkConstraints proto1 era1 proto2 era2 => SerialiseHFC (ShelleyBasedHardForkEras proto1 era1 proto2 era2) -- use defaults diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs index 203c621df5..18eb81589c 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs @@ -27,6 +27,7 @@ instance CardanoHardForkConstraints c toGoldenDirectory v = case v of CardanoNodeToNodeVersion1 -> "CardanoNodeToNodeVersion1" CardanoNodeToNodeVersion2 -> "CardanoNodeToNodeVersion2" + CardanoNodeToNodeVersion3 -> "CardanoNodeToNodeVersion3" _ -> error $ "Unknown version: " <> show v instance CardanoHardForkConstraints c @@ -47,4 +48,5 @@ instance CardanoHardForkConstraints c CardanoNodeToClientVersion13 -> "CardanoNodeToClientVersion13" CardanoNodeToClientVersion14 -> "CardanoNodeToClientVersion14" CardanoNodeToClientVersion15 -> "CardanoNodeToClientVersion15" + CardanoNodeToClientVersion16 -> "CardanoNodeToClientVersion16" _ -> error $ "Unknown version: " <> show blockVersion diff --git a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs index c59f9b27ba..849be590c0 100644 --- a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs +++ b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs @@ -362,6 +362,9 @@ instance TxGen TestBlock where type TestBlock = HardForkBlock '[BlockA, BlockB] +instance HasBlessedGenTxIdDecodeEra '[BlockA, BlockB] where + blessedGenTxIdDecodeEra = Z mempty + instance CanHardFork '[BlockA, BlockB] where type HardForkTxMeasure '[BlockA, BlockB] = IgnoringOverflow ByteSize32 diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs index 578f6001c4..c80b73e06a 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs @@ -7,8 +7,9 @@ import Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common as HardForkNodeToNodeVersion (..), HardForkSpecificNodeToClientVersion (..), HardForkSpecificNodeToNodeVersion (..), - SerialiseConstraintsHFC, SerialiseHFC (..), - isHardForkNodeToClientEnabled, isHardForkNodeToNodeEnabled) + HasBlessedGenTxIdDecodeEra (..), SerialiseConstraintsHFC, + SerialiseHFC (..), isHardForkNodeToClientEnabled, + isHardForkNodeToNodeEnabled) import Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseDisk as X () import Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseNodeToClient as X () import Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseNodeToNode as X () diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs index bf36dda805..3c39cdd3bf 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs @@ -17,6 +17,7 @@ module Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common ( -- * Conditions required by the HFC to support serialisation HardForkEncoderException (..) + , HasBlessedGenTxIdDecodeEra (..) , SerialiseConstraintsHFC , SerialiseHFC (..) , disabledEraException @@ -133,8 +134,12 @@ notFirstEra = hcmap proxySingle aux -- | Versioning of the specific additions made by the HFC to the @NodeToNode@ -- protocols, e.g., the era tag. -data HardForkSpecificNodeToNodeVersion = - HardForkSpecificNodeToNodeVersion1 +data HardForkSpecificNodeToNodeVersion + = HardForkSpecificNodeToNodeVersion1 + + -- | Represent GenTxId as an era-agnostic ShortByteStrings + | HardForkSpecificNodeToNodeVersion2 + deriving (Eq, Ord, Show, Enum, Bounded) -- | Versioning of the specific additions made by the HFC to the @NodeToClient@ @@ -147,6 +152,9 @@ data HardForkSpecificNodeToClientVersion = -- | Include the Genesis window in 'EraParams'. | HardForkSpecificNodeToClientVersion3 + + -- | Represent GenTxId as an era-agnostic ShortByteString + | HardForkSpecificNodeToClientVersion4 deriving (Eq, Ord, Show, Enum, Bounded) data HardForkNodeToNodeVersion xs where @@ -210,6 +218,12 @@ isHardForkNodeToClientEnabled :: HardForkNodeToClientVersion xs -> Bool isHardForkNodeToClientEnabled HardForkNodeToClientEnabled {} = True isHardForkNodeToClientEnabled _ = False + +-- absolutely horrible. should be HasLatestStableGenTxIdEra probably. +-- especially nasty because it's +class HasBlessedGenTxIdDecodeEra (xs :: [Type]) where + blessedGenTxIdDecodeEra :: NS (K ()) xs + {------------------------------------------------------------------------------- Conditions required by the HFC to support serialisation -------------------------------------------------------------------------------} @@ -250,6 +264,7 @@ pSHFC = Proxy -- This would then lead to problems with binary streaming, and we do not -- currently provide any provisions to resolve these. class ( CanHardFork xs + , HasBlessedGenTxIdDecodeEra xs , All SerialiseConstraintsHFC xs -- Required for HasNetworkProtocolVersion , All (Compose Show EraNodeToClientVersion) xs diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs index 7eb237f82a..af2ccd1748 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs @@ -38,10 +38,12 @@ import Ouroboros.Consensus.HardFork.Combinator.Mempool import Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common import Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseDisk () import Ouroboros.Consensus.HardFork.History (EraParamsFormat (..)) -import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId) +import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId, + toRawTxIdHash) import Ouroboros.Consensus.Node.NetworkProtocolVersion import Ouroboros.Consensus.Node.Run import Ouroboros.Consensus.Node.Serialisation +import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) @@ -164,8 +166,41 @@ instance SerialiseHFC xs instance SerialiseHFC xs => SerialiseNodeToClient (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where - encodeNodeToClient = dispatchEncoder `after` (getOneEraGenTxId . getHardForkGenTxId) - decodeNodeToClient = fmap (HardForkGenTxId . OneEraGenTxId) .: dispatchDecoder + encodeNodeToClient cc v (HardForkGenTxId (OneEraGenTxId txid)) = + case v of + HardForkNodeToClientEnabled hfv _ | hfv >= HardForkSpecificNodeToClientVersion4 -> + unK $ + hctraverse' + (Proxy :: Proxy SerialiseConstraintsHFC) + (K . Serialise.encode . toRawTxIdHash . unwrapGenTxId) + txid + _ -> + dispatchEncoder cc v txid + decodeNodeToClient cc v = + case v of + HardForkNodeToClientEnabled hfc vs + | hfc >= HardForkSpecificNodeToClientVersion4 -> do + let aux :: forall s blk . SerialiseConstraintsHFC blk + => CodecConfig blk + -> EraNodeToClientVersion blk + -> K () blk + -> (Decoder s :.: WrapGenTxId) blk + aux ecc vv _ = Comp $ case vv of + EraNodeToClientEnabled bv -> do + decodeNodeToClient ecc bv + EraNodeToClientDisabled -> + -- Is this sensible? What should the behaviour be when the + -- blessed GenTxId era is disabled by EraNodeToClientDisabled? + fail $ show $ disabledEraException (Proxy @blk) + fmap (HardForkGenTxId . OneEraGenTxId) $ + htraverse' unComp $ + hcliftA3 pSHFC + aux + (getPerEraCodecConfig (hardForkCodecConfigPerEra cc)) + vs + blessedGenTxIdDecodeEra + _ -> + fmap (HardForkGenTxId . OneEraGenTxId) $ dispatchDecoder cc v instance SerialiseHFC xs => SerialiseNodeToClient (HardForkBlock xs) SlotNo where diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs index edf78b0051..3d39309810 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs @@ -2,6 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GADTs #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE QuantifiedConstraints #-} {-# LANGUAGE RankNTypes #-} @@ -139,5 +140,24 @@ instance SerialiseHFC xs instance SerialiseHFC xs => SerialiseNodeToNode (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where - encodeNodeToNode = dispatchEncoder `after` (getOneEraGenTxId . getHardForkGenTxId) - decodeNodeToNode = fmap (HardForkGenTxId . OneEraGenTxId) .: dispatchDecoder + encodeNodeToNode cc v (HardForkGenTxId (OneEraGenTxId txid)) = do + case v of + HardForkNodeToNodeEnabled hfv _ | hfv >= HardForkSpecificNodeToNodeVersion2 -> + hcollapse $ + hcmap + pSHFC + (K . Serialise.encode . toRawTxIdHash . unwrapGenTxId) + txid + _ -> dispatchEncoder cc v txid + decodeNodeToNode cc v = + case v of + HardForkNodeToNodeEnabled hfv vs | hfv >= HardForkSpecificNodeToNodeVersion2 -> do + let ccfgs = getPerEraCodecConfig $ hardForkCodecConfigPerEra cc + fmap (HardForkGenTxId . OneEraGenTxId) $ + htraverse' unComp $ + hcliftA3 pSHFC + (\ecc (WrapNodeToNodeVersion ev) _ -> Comp (decodeNodeToNode ecc ev)) + ccfgs + vs + blessedGenTxIdDecodeEra + _ -> fmap (HardForkGenTxId . OneEraGenTxId) $ dispatchDecoder cc v diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs index 204c8e5ded..b95602b2fc 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs @@ -31,3 +31,4 @@ nodeToClientVersionToQueryVersion x = case x of NodeToClientV_17 -> QueryVersion2 NodeToClientV_18 -> QueryVersion2 NodeToClientV_19 -> QueryVersion2 + NodeToClientV_20 -> QueryVersion2 diff --git a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs index 7425098bc0..e8840eb591 100644 --- a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs +++ b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/Serialisation/Roundtrip.hs @@ -204,6 +204,7 @@ roundtrip_all , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk) + , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeSecond BlockQuery blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk) @@ -252,6 +253,7 @@ roundtrip_all_skipping , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk) + , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeSecond BlockQuery blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk) @@ -493,6 +495,7 @@ roundtrip_SerialiseNodeToClient , Show (BlockNodeToClientVersion blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk) + , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeSecond BlockQuery blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk) @@ -508,6 +511,7 @@ roundtrip_SerialiseNodeToClient roundtrip_SerialiseNodeToClient shouldCheckCBORvalidity ccfg = [ rt (Proxy @blk) "blk" , rt (Proxy @(GenTx blk)) "GenTx" + , rt (Proxy @(GenTxId blk)) "GenTxId" , rt (Proxy @(ApplyTxErr blk)) "ApplyTxErr" , rt (Proxy @(SomeSecond BlockQuery blk)) "BlockQuery" , rtWith From 531e0156585cd5119cadff7d60f8cf1f6321cd30 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Tue, 12 Nov 2024 13:28:18 +0000 Subject: [PATCH 04/15] commit golden tests for changed OneEraGenTxId serialization --- .../CardanoNodeToNodeVersion3/Block_Allegra | Bin 0 -> 1799 bytes .../CardanoNodeToNodeVersion3/Block_Alonzo | Bin 0 -> 1872 bytes .../CardanoNodeToNodeVersion3/Block_Babbage | Bin 0 -> 1826 bytes .../CardanoNodeToNodeVersion3/Block_Byron_EBB | Bin 0 -> 91 bytes .../Block_Byron_regular | Bin 0 -> 867 bytes .../CardanoNodeToNodeVersion3/Block_Conway | Bin 0 -> 1752 bytes .../cardano/CardanoNodeToNodeVersion3/Block_Mary | Bin 0 -> 1894 bytes .../CardanoNodeToNodeVersion3/Block_Shelley | Bin 0 -> 1687 bytes .../CardanoNodeToNodeVersion3/GenTxId_Allegra | 3 +++ .../CardanoNodeToNodeVersion3/GenTxId_Alonzo | 1 + .../CardanoNodeToNodeVersion3/GenTxId_Babbage | 1 + .../CardanoNodeToNodeVersion3/GenTxId_Byron | 1 + .../CardanoNodeToNodeVersion3/GenTxId_Conway | 1 + .../CardanoNodeToNodeVersion3/GenTxId_Mary | 1 + .../CardanoNodeToNodeVersion3/GenTxId_Shelley | 1 + .../CardanoNodeToNodeVersion3/GenTx_Allegra | Bin 0 -> 799 bytes .../CardanoNodeToNodeVersion3/GenTx_Alonzo | Bin 0 -> 872 bytes .../CardanoNodeToNodeVersion3/GenTx_Babbage | Bin 0 -> 973 bytes .../CardanoNodeToNodeVersion3/GenTx_Byron | Bin 0 -> 240 bytes .../CardanoNodeToNodeVersion3/GenTx_Conway | Bin 0 -> 899 bytes .../cardano/CardanoNodeToNodeVersion3/GenTx_Mary | Bin 0 -> 894 bytes .../CardanoNodeToNodeVersion3/GenTx_Shelley | Bin 0 -> 687 bytes .../CardanoNodeToNodeVersion3/Header_Allegra | Bin 0 -> 1003 bytes .../CardanoNodeToNodeVersion3/Header_Alonzo | Bin 0 -> 1003 bytes .../CardanoNodeToNodeVersion3/Header_Babbage | Bin 0 -> 856 bytes .../CardanoNodeToNodeVersion3/Header_Byron_EBB | Bin 0 -> 91 bytes .../Header_Byron_regular | Bin 0 -> 619 bytes .../CardanoNodeToNodeVersion3/Header_Conway | Bin 0 -> 856 bytes .../CardanoNodeToNodeVersion3/Header_Mary | Bin 0 -> 1003 bytes .../CardanoNodeToNodeVersion3/Header_Shelley | Bin 0 -> 1003 bytes .../SerialisedBlock_Allegra | 1 + .../SerialisedBlock_Alonzo | 1 + .../SerialisedBlock_Babbage | 1 + .../SerialisedBlock_Byron_EBB | 1 + .../SerialisedBlock_Byron_regular | 1 + .../SerialisedBlock_Conway | 1 + .../SerialisedBlock_Mary | 1 + .../SerialisedBlock_Shelley | 1 + .../SerialisedHeader_Allegra | 1 + .../SerialisedHeader_Alonzo | 1 + .../SerialisedHeader_Babbage | 1 + .../SerialisedHeader_Byron_EBB | Bin 0 -> 22 bytes .../SerialisedHeader_Byron_regular | Bin 0 -> 18 bytes .../SerialisedHeader_Conway | 1 + .../SerialisedHeader_Mary | 1 + .../SerialisedHeader_Shelley | 1 + .../ApplyTxErr_Allegra | Bin 0 -> 39 bytes .../ApplyTxErr_Alonzo | Bin 0 -> 39 bytes .../ApplyTxErr_Babbage | Bin 0 -> 39 bytes .../ApplyTxErr_Byron | Bin 0 -> 14 bytes .../ApplyTxErr_Conway | 1 + .../CardanoNodeToClientVersion16/ApplyTxErr_Mary | Bin 0 -> 39 bytes .../ApplyTxErr_Shelley | Bin 0 -> 39 bytes .../ApplyTxErr_WrongEraByron | Bin 0 -> 19 bytes .../ApplyTxErr_WrongEraShelley | Bin 0 -> 19 bytes .../CardanoNodeToClientVersion16/Block_Allegra | Bin 0 -> 1799 bytes .../CardanoNodeToClientVersion16/Block_Alonzo | Bin 0 -> 1872 bytes .../CardanoNodeToClientVersion16/Block_Babbage | Bin 0 -> 1826 bytes .../CardanoNodeToClientVersion16/Block_Byron_EBB | Bin 0 -> 91 bytes .../Block_Byron_regular | Bin 0 -> 867 bytes .../CardanoNodeToClientVersion16/Block_Conway | Bin 0 -> 1752 bytes .../CardanoNodeToClientVersion16/Block_Mary | Bin 0 -> 1894 bytes .../CardanoNodeToClientVersion16/Block_Shelley | Bin 0 -> 1687 bytes .../CardanoNodeToClientVersion16/GenTxId_Allegra | 3 +++ .../CardanoNodeToClientVersion16/GenTxId_Alonzo | 1 + .../CardanoNodeToClientVersion16/GenTxId_Babbage | 1 + .../CardanoNodeToClientVersion16/GenTxId_Byron | 1 + .../CardanoNodeToClientVersion16/GenTxId_Conway | 1 + .../CardanoNodeToClientVersion16/GenTxId_Mary | 1 + .../CardanoNodeToClientVersion16/GenTxId_Shelley | 1 + .../CardanoNodeToClientVersion16/GenTx_Allegra | Bin 0 -> 799 bytes .../CardanoNodeToClientVersion16/GenTx_Alonzo | Bin 0 -> 872 bytes .../CardanoNodeToClientVersion16/GenTx_Babbage | Bin 0 -> 973 bytes .../CardanoNodeToClientVersion16/GenTx_Byron | Bin 0 -> 240 bytes .../CardanoNodeToClientVersion16/GenTx_Conway | Bin 0 -> 899 bytes .../CardanoNodeToClientVersion16/GenTx_Mary | Bin 0 -> 894 bytes .../CardanoNodeToClientVersion16/GenTx_Shelley | Bin 0 -> 687 bytes .../Query_Allegra_GetBigLedgerPeerSnapshot | 1 + .../Query_Allegra_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Allegra_GetEpochNo | Bin 0 -> 6 bytes .../Query_Allegra_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Allegra_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Allegra_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Allegra_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Allegra_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_Alonzo_GetBigLedgerPeerSnapshot | 1 + .../Query_Alonzo_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Alonzo_GetEpochNo | Bin 0 -> 6 bytes .../Query_Alonzo_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Alonzo_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Alonzo_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Alonzo_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Alonzo_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_AnytimeByron | Bin 0 -> 5 bytes .../Query_AnytimeShelley | Bin 0 -> 5 bytes .../Query_Babbage_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Babbage_GetEpochNo | Bin 0 -> 6 bytes .../Query_Babbage_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Babbage_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Babbage_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Babbage_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Babbage_GetStakeDistribution | Bin 0 -> 6 bytes .../CardanoNodeToClientVersion16/Query_Byron | Bin 0 -> 5 bytes .../Query_Conway_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Conway_GetEpochNo | Bin 0 -> 6 bytes .../Query_Conway_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Conway_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Conway_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Conway_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Conway_GetStakeDistribution | Bin 0 -> 6 bytes .../CardanoNodeToClientVersion16/Query_HardFork | Bin 0 -> 4 bytes .../Query_Mary_GetBigLedgerPeerSnapshot | 1 + .../Query_Mary_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Mary_GetEpochNo | Bin 0 -> 6 bytes .../Query_Mary_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Mary_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Mary_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Mary_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Mary_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_Shelley_GetBigLedgerPeerSnapshot | 1 + .../Query_Shelley_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Shelley_GetEpochNo | Bin 0 -> 6 bytes .../Query_Shelley_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Shelley_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Shelley_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Shelley_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Shelley_GetStakeDistribution | Bin 0 -> 6 bytes .../Result_Allegra_EmptyPParams | Bin 0 -> 40 bytes .../Result_Allegra_EpochNo | 1 + .../Result_Allegra_GenesisConfig | Bin 0 -> 78 bytes .../Result_Allegra_GetBigLedgerPeerSnapshot | 3 +++ .../Result_Allegra_LedgerTip | 1 + .../Result_Allegra_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Allegra_ProposedPParamsUpdates | 1 + .../Result_Allegra_StakeDistribution | 1 + .../Result_Alonzo_EmptyPParams | Bin 0 -> 63 bytes .../Result_Alonzo_EpochNo | 1 + .../Result_Alonzo_GenesisConfig | Bin 0 -> 78 bytes .../Result_Alonzo_GetBigLedgerPeerSnapshot | 3 +++ .../Result_Alonzo_LedgerTip | 1 + .../Result_Alonzo_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Alonzo_ProposedPParamsUpdates | 1 + .../Result_Alonzo_StakeDistribution | 1 + .../Result_AnytimeByron | Bin 0 -> 5 bytes .../Result_AnytimeShelley | Bin 0 -> 15 bytes .../Result_Babbage_EmptyPParams | Bin 0 -> 55 bytes .../Result_Babbage_EpochNo | 1 + .../Result_Babbage_GenesisConfig | Bin 0 -> 78 bytes .../Result_Babbage_LedgerTip | Bin 0 -> 37 bytes .../Result_Babbage_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Babbage_ProposedPParamsUpdates | 1 + .../Result_Babbage_StakeDistribution | 1 + .../CardanoNodeToClientVersion16/Result_Byron | Bin 0 -> 138 bytes .../Result_Conway_EmptyPParams | Bin 0 -> 145 bytes .../Result_Conway_EpochNo | 1 + .../Result_Conway_GenesisConfig | Bin 0 -> 78 bytes .../Result_Conway_LedgerTip | 1 + .../Result_Conway_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Conway_ProposedPParamsUpdates | 1 + .../Result_Conway_StakeDistribution | 1 + .../Result_EraMismatchByron | Bin 0 -> 19 bytes .../Result_EraMismatchShelley | Bin 0 -> 19 bytes .../CardanoNodeToClientVersion16/Result_HardFork | Bin 0 -> 76 bytes .../Result_Mary_EmptyPParams | Bin 0 -> 40 bytes .../Result_Mary_EpochNo | 1 + .../Result_Mary_GenesisConfig | Bin 0 -> 78 bytes .../Result_Mary_GetBigLedgerPeerSnapshot | 3 +++ .../Result_Mary_LedgerTip | 1 + .../Result_Mary_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Mary_ProposedPParamsUpdates | 1 + .../Result_Mary_StakeDistribution | 1 + .../Result_Shelley_EmptyPParams | Bin 0 -> 40 bytes .../Result_Shelley_EpochNo | 1 + .../Result_Shelley_GenesisConfig | Bin 0 -> 78 bytes .../Result_Shelley_GetBigLedgerPeerSnapshot | 3 +++ .../Result_Shelley_LedgerTip | 1 + .../Result_Shelley_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Shelley_ProposedPParamsUpdates | 1 + .../Result_Shelley_StakeDistribution | 1 + .../SerialisedBlock_Allegra | 1 + .../SerialisedBlock_Alonzo | 1 + .../SerialisedBlock_Babbage | 1 + .../SerialisedBlock_Byron_EBB | 1 + .../SerialisedBlock_Byron_regular | 1 + .../SerialisedBlock_Conway | 1 + .../SerialisedBlock_Mary | 1 + .../SerialisedBlock_Shelley | 1 + .../CardanoNodeToClientVersion16/SlotNo_Allegra | 1 + .../CardanoNodeToClientVersion16/SlotNo_Alonzo | 1 + .../CardanoNodeToClientVersion16/SlotNo_Babbage | 1 + .../CardanoNodeToClientVersion16/SlotNo_Byron | 1 + .../CardanoNodeToClientVersion16/SlotNo_Conway | 1 + .../CardanoNodeToClientVersion16/SlotNo_Mary | 1 + .../CardanoNodeToClientVersion16/SlotNo_Shelley | 1 + 194 files changed, 87 insertions(+) create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_HardFork create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_HardFork create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..b525fa7868f6550666ddc7f4b81f258068d33d96 GIT binary patch literal 1799 zcmai!`8U)H7{X)j~ z6S%_}9(u7dH=U+|Irf#f)cZwAGP30$AtU|W>qzVZ=ZD)XUGo-S#*<)d8$L%`aVat# zRxd?A{(A=ml3nJzy5vL6Ji8;p2U=7SP}Kt=rM=Y55h%E2DqMh3O#Q>VO`{hrjI~0> z8sJH~qSebKqT88dsCL^?NogYz=qd_dVdZ~H!yjl4U!%GUuEy_VuP=jni`EYqs`%8u z&9hdVaOM{U`K5aE3U~(G?zr1{mLVf{f7h5VIn_DJkWx(kR@GZ45PQzE+FpZ^*a-DA zL_O-uzq^Rpg=0mXJ0)-P<^pB=Gcj@sIE-juiR&I9N8CDISv1^!9?fZTjs+A58D9H6??SoRb9Y))D zmUbJpotu6Nn$bV435ALK6pHbmVoOH->`2w_JNFiCp*h}oapv^ZEecpokT7E-AMj4+ zkHE$)yhILNGlIhKxzWwF2+U?od{)~sY6=ntxug3LpRa>ol;BfVYFigq1;pM?JGaw{ ztZ1U*>x2dX0LeL08OFIO=N)&Yi9HyMHF8bWAOttJ9&c*o+CNG2z<{G}?pAx(<5x#uXo?5u5o4+ai+!P?KCTIyr@6zrxVmdVehijN*}@%nk<1@iTR z-q1Q;`KJHK{tH?`Jp)H)E#e8{+V`%Dc1?0jHAMY%-Gd9+-X@s7Fz<$*dMS2%gzs0d zDgoUnPZxixAK~}tJHSPg?rslT@%$$kg{hio3&cCnU^QLq%Jp`#BTt1*@3eI^O^mJ@ z_u)omeY3J+Unc5&@UE-wViSfi`@5CHImA_LtR`IxI5mWGR;cO0U0StFi zc8QdV*!{E%C@ai+W=OnSXL+bKt3rb@qiwM|AyYZ}S?JOBm&8YQ(~7}UEMRimP^pS}F2dOY^#q4YKXkY!IO_(9LGPIFUc z)>`_-zR5lOXvPVXsUa-sn1;XbV`dCDPbo&Cvx#Y-$iHB#+AuIsnczAVoh&9fJ=xFU zH1}T#QDS@;GHVj*X}syFO*ub>vxsJY-)4BPxF+hzIp!XW+ zR=CV4FtEGHGwkK=tY{OSeV?8rmhISTEfMB$JtKq8YN00Kaz&5Rj{&2^CQcydQg&k9_Z-C65rWZavG7bWJp-LsV0`sflBKN9Bz z6B|*6U^o!}b~6rpb4(IM3!u}Ofiz|mlNe5?pE(eh0HGj&|0_R`X`kYJm95t)p@Qpa z{JxYH)7MgXUtjAbI{TbFO^p8=wEQU)#0Qn$-j>zpN_UEwEyx+)(^hLk+F!li9t;Yjd5pHkUJClN?u5OH}BtEwmvbLP31h-To*=?MsHn@6nuBTo=9sF^D zKBibwLG)oLb?{im!RQT$S(tk3Kx2t6wfN36ExH6V&_FI4KWTHzw4K7w^cvL!$tfp& z7IF9vEoWMV_=K$2^{)k91|F6PmG4z+)hbx%^qPXIO| zOhht?tL0NxCf@Z2(QReP!>+qJc5qb04c`CKH{0?ry{m2qO5@n_KHl*v*OMTzL^4J4 O;UOE9AK&bgUi}AOr!))z literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..dc3903d3a62a08c9bdacf27ca74ce62e6b71ee66 GIT binary patch literal 1872 zcmai!c{tPw7{`CV8FLnLwKK~wX**^Vw~vfeY*)Fl*1v{SDA*~IFq(PFYDx8QHIQ7>xD|mEivY) z&}wZpUVa(spWsbVAOBvjn{{!psCAt}nQ$^dwJRO3MkeCtyJz#={MB^Vyecp1Yq@Yl zJ)HE*&eH;zbxip+Be&GNkLqsc54jNbPFT)hy=`)z;A@HgVoRODf+Mejrsjqjx7=tn z%9LYZlG1LRt;gkdqvqJL$B-H4!=hAr;#YDpX$V$ zU&OkSRtMKG^=N^v`iq2G0D!Es71NA!la902r(o{%#2L9HZ>9z{G##q1%XfT~;*N*x zdZRxTRJq>^xh!X}`rcU0J*{3EQ^(vx#<_ab&i^1D1$crj_Ey7Mstj(xbnIPOq2*9( zm1%N9T&^{}pmKU_fu0dI*rk~Pf3u==E80)m(S8e@A(c=0^eF6kQOBn<7&`;G!)^ixreV9x#4jeaP?x|6GPn_w=A8SGOusuj_X)_8B!^i{Uvp8{$tOpHUr;X z^a&{uD&BdnzA6Ku&tCIA7$&~3F}?%!b{gkRW=-IoMQ75xhDxilo2^`PgiqaCgeNBs z^5+S9EoDaG=)3~P4jB@L9!L{)2PnZR=oHXS2ea!OtF4W9Er zg6?$mZE2`a&s1jq=V`>qx7PCv)J3Q4v}?P&%M)Bi z1t&2IW5ZoJISpOE2WxOgdd=#kdYfN%+)O$?O0*EbUzH3iimO9D883O-j}xPF6!zYI z`NS{29;W)n>EU;bD44<(0E|G?Nwovrh1N7GUlO{MQP|bPYhTM;QrbCX+%(1(r&(?Q zS$vMdN;vBcoz~Pe6P?Epydb9NC+tfr%7OTldKGfrQwoUozfk0FJ zEcPzj@%IZ`B6TRJZIxfK2+71V-gXzKZnf=VDqAQx)B^s_>TAl1d9No z@BBczW74j(uwJXY7O|u5>ugF)XXC}&`t$)@RxF8)5v>qSI)X)(2mHEBRX<<3b)MHK zH|`Z?wb*;D-vyg^P%a+7!A2xURulqwl)^IRg2p?xqO0ss34G3k9i{Ybq>53Dt7#4X z$@q_tgk_)VF!xX6Sf_V4%&+@wo2p2@71(LGuc+Fi;av zhHXo?w=hNNo-!I_4ZBCy!ZlTN#+tO)f>UiXBg_+ZL8Hv~-$sfYLK{-LRV*cfCE?({ zhl#s`u)|^5Low*}UYB6yCVs-(49PPB8fH3z0HCc6D9OR3W(=GJ0AzF?LRLv#E)g&Q qqKknNFp$URhOmQB_I|Pa03I3vQF0=*jUNajU?K{3u>Wr1oA@tqHCSu_ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Babbage new file mode 100644 index 0000000000000000000000000000000000000000..279d590c81066bbeab4f42723931f373c80af1b6 GIT binary patch literal 1826 zcmbtTS5Q+46n!s^5Cx>Ui4uscB1JkPRf>qANmFCGQy_OR-P{Sx_QP zMFo^11PzKxN27uPdkG-YtBmflupj%eAG$L;bLaltGv}O{bFP@UONxx(P9n)@X^0{) zDB7SJG+y4fm#{tAM?YTilIsvK3ZG3#ynTVAsB{&gB=bJLW=l_G{o(ae*Q!2%*%l%# zBxfqDo?`RBDmjM#&k+b@>ps@pOboO1ZHbEPs#ixN<#$BX#$ronAg{ziGyzgAXpt=z zv6I%O+M%ziQ5@a5`O`&nr75<^O?huw1rr0vV=i(wCiim^*}g9Fd(aL+`jIv8!ZegU zX?KUIPELGgl{V{2uu2u=7VD3Z$V`-@zt`I|V`jWr^Q!>cM7L;TYN74d^7dN-?DGPf zm6doIlC%~?v0uZB4xqWV9dWa7KbbLYv?+C5=gF`{Xz=L*5F0p6=R%aHIelj6FXy3g z71V&u+7*-Y0=@PoN3V$0F|m59UmvXo0LV5|F4^=P_n7mqN!UA2<4rsgH7Ox=4gR$? zIosNjeDIJ%cg##~h0ndPVvN!9dqY+C)Vj5(I##}Yj4Ov6_W9uv6tD|yyf{={YSiD8 zux~tgEvIpgYGLF}9UOk4+>p@it}UiJblTxY`oCZWU;TDSdbu^a!|CH1ZQiIb&Yzta zg!d8X2;W`ZS|tY`i3*s3%8yFb5E;uK8%FK9{|(5IGPt%feAc%=1cxtwFFZhYqJx#q z3#wI)O5(?&+K)OLw9HM?O*;sEN&#tU@x7!m)xZ|Pb;Fk<^HW*eY;3`DrOR=ixT_!4 zc9uP?oW$qdoj8;UPC${as_tyLsCAEvqvFD`q8%s?NqO)@iMu%d05+w@t)Thc0^-0vkPEm0CWOSvPni)L(VEqy4 zOD??cw9si^B;-zO&xX3%l(g@>)Q%4t{8;8*^MP(@gPoc*(O^nkPPR&%Oj9k(Xf^+& zgL-vW*Y%?w1F_B7My_tv9*H1_;)%@Hctm8- zwhj|wvSdB)zIhUqPzzIN@%ngsiL5zX3BU+M8CBlhm1nC(VYi1bq~>)#WworNF33BL znKlg31<9M&0WwRdpZy)E@L#ylAY24M=0JM}ENf$zMJ5zS_^wlKozB=jH(0mVdnq7W@6x*#a(HV^>R)dBex$p3J$ z3gGS?k^g(6Naz7H26F-d5CBs7k@aNskM9uW;fGa~t+OayxasB|6VvwNI zmJaJT$*2)pYrah-#dXx@-!|0ll{#~nNXPPjB2CcimMA&@q zzAE;>ar`g|_;q%C3`wp4z@uarZGKhhr^|Wu`4_<%X7p(JKO_|fg;G^bp}&|u8kb(= zsf_TM8OFKvU$ZI;+&Fe4@m6q$^@D=$s6gvT$-h!w22n1^pTEMZXD;-7z8}{1($c$n zDsbWaghKDlQG*9BoW&_pKZnRIwR5S)mf`Cgx@wAag9HT;w**S=x+qp`at|L=HLRR5SXSoAhJAj~qYTt34Ha5YI?-t36gt#+u xJyBR7ufW=57(4Q2Pd!fTayZo_x?q2<>atJ40PBVwx@ngif&hU4fuNuNfuQ4nDC7VD literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Byron_regular new file mode 100644 index 0000000000000000000000000000000000000000..ce89fa545b376130983575f559f429ad109bc7c8 GIT binary patch literal 867 zcmca15y>3a#Ms;_#q7VpFhZeY0{ZzM@#c@%10ROM;5ekoWrh4wNI{n~< z$ENFR)r_TUTc$@ar<~S4c4F_!Rh*?enwTRLE@!DpE-UhMV|ggO#r^d8Aj6lRcBvi` zn^^w#q~qRzwK)+A>kr&Yk+A-h=5OowrpV%|%C3a^b+0!0A7pslCc7(hx^#qsUz!Hb zP2Wg?B9qx~xC|yNwOZ*KruRFS<7!@TsyCm*jFu(_#t4VS-nXrHH=H&1-SYDEiVf_) zCU~CsV7=eLu_k%?+Y?VZUL_@b;CyO+a%QJo*ZjNBKRsTygRklG_WK*O#Pbf!TE?B) z$k@cx)WSfyK@kqG=X1U?T+H9dAaZlonkRwTCTedgY+pW%I zm)>9&XlTWh_(AL2TKyv&7v^_<=QBu;mIr!9XG3z=q|ixnA}$RklO2sFzkZ|WD7NO{ z97Ps6GxwF^7H=E5&A->yad^AcugCcaM{WqQxEb6!uGhzz z^zYpn3H|@`o0@=%6`LbuRs|PvMy<-=mArDwGqZW2Yr!1rhuyqB&8MsH#4TWuGP*OP z52$`YBiQuTrU(b`+{$v39G75M(_oXdU=Op@62JV?%!t$~=StTs?_}c=cay9{gKW1f ze~ZGZ#7rZzDBplkSFbeJN<-893e)Tehm5YZt<}f>8~n*gx+VRn@r%N-pu+808>ct@ zcX%{4>PLs<;l7wk;eHKvt6dL+PBf`@yC^I;c=GS1oEeR3)Bo5p{BL5u$;i|&|9=w@ HH!c7G_QsqY literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Conway new file mode 100644 index 0000000000000000000000000000000000000000..5ae5c5065de3335619ac6b764801535b5fc102ce GIT binary patch literal 1752 zcmbtTX*84z82-K)!Ghv+p_9EQ!gU#HWZ+c4n9vbS-7RgllOfOL9$?7G%ki zEkfC4h!_AG|~_s9K_d(J)QJ@2pQJkRsK@AD2|9oTzej!SSXk`uyLD`m@x zyM8TXIb$qi?G!@<@0d>j)AVbhQI9hs1ce?z_}G~DZ)lveN#AUS=L~8o zlDMc|orEQGj81%YT8`q32#$gbLO0>g;cfWq&|BP)IRIqLyk#7GF=lfu$Keo2MCiXq1J z_VUfGRx7kO8r%4Y1_djKz6mb_07yTPH&*>-4!=}RZbfWaBM4vQ4R>z)2zVByr<`f!601jZiYnx#^G)&;#P_-)U zJuu0UA+hMRe2dGoORvNtJHhlZ&oJpy7h2UA^OF0C4t4w8{(zL zLIW?D74K!`q&3y9t9M{nLQV+@A%h|_;w~-K1&p?l|!u|Ie(aU$1+I|53`EB7S%T#j!a^L zl6a0idE4z8T0zGXLln`5V?3JlVqg$N&|wHaEqt;oU0)hcYxmxWPw(uZw(KNq@E@H~ zubCiK#~#`TaQ^^q_kEzie`G|0^lSjq1ln&vHn$fj=_xIE~tseF}Wad`66id=v!4soz>jU9xsXBm)KuCa;P6}CzE{*L&H&wZD_G)(FmTuxmUzK zl6Y-cj@k4Z8l*t}Z(~JDSsbN}p1-I+|H`?!{$d}y#YuLvkNG-zE(d2GMm=)x&~3`> z3vki(AN$w(cR=_I{?z+1Rg{hX&kbH}L)yp7=3O>YX9WgJrj?prnGVEpY!BfDg+&1X zXk8yh;5P&GBW&8<2Wq;?v*lg0?sdzMxv6d{!oj%F!?{}Z1V)?#OB&K|C_{zm|M@cD zx$PdJWunPVKQZbuJtM2XVuUXq!*68iN4-$fU2}5ykKjLt*2??6Qh(D<8Y+A>(8Ch* z^UKBWKyE4hlbP>V#@3-2FaW?J$YfYVFlMtDn|_d4KsM-3rBS>{9*85ZztY^ONEk%0 VF^~qXARPuH5Om`sThSv%`~@UG9BKdn literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Mary new file mode 100644 index 0000000000000000000000000000000000000000..14d8281f93368d898501f14636df833891cdfe4a GIT binary patch literal 1894 zcmah}dpy$%AKu-zGUd|8VzW}mt>${1Tw-z?QS!R{6v`x*w9Ph`T*`jDIF{nP`V_5Sz%!{5*Id7kI{{XU^vdG<+k!UDAhKM z*>0OSf7seMYDf%AKd4;2R;sMvQNYJL|AteyG6Q^+%;kiliEP4=2Id;gPnw^)hr7NA z6wW(6W$h(o{brxH?1iWX1RSoDZnKh@WGszc9=(nI^FC=i?QKS2a}env)w zS@(09JCCV22bQ&4HD8>31=ukr*5vZbKjBLV6Un6mp>Af6{Pz5KXB*w~)_-Ep=WoMf zi~y1>LSRR+Q71M9rV`_fR}TLSCvD3p9(U^h8rZZXKF$Y7uLT2#;D7uB_@WCNcigvQ zepO2DY<2TJual5S*7-e641oZY0<~Q0o0*q9^|O&rUng7nWEqko8=8V8^#b>o*#T(4 zr7vNr=uyD)=rV-G_UDsz&-MC@s3!J-1C09@T*6PGVUQqb%jF@AtFr&yU@h&&eI_+H z73SFif3}SmTQT8ZZk^^0U)v?pWOe(WPMUpT&~~G;sm^dr!G7Ppe+)gNjAGJoT`?!c z9d&Bl)VPo(pgK*ZUYoJ~m3ds~i*FEtirKHbVwMBPB2nn-k>&`32OU}?TPN1JX)0dH zB_B)<7};3mTX$gxG(+<8lHcNIiD%lSRpx`!s|)o${`c`=nMIhl z@w6NZlz7~bJh}oJFI0w|IxoHTLrMqik-tYQndyF$xO!JY@r@(Ukx(vjCao19c*0xuOfRb731&c^&Y-P?KU z^U8rZ69VkV>Tf7e`>Y7ieP5wzE>Le(vKtXoA?F>}`YIJZsPt2a6!d;4k!Ls~p2J}~ zGotBu_-7a#jzDC95D)_BZYG=y-y8=>ZKJzuI+kGvxvh^wt*kpQ6O@;4`aX2f*zw{j zji5;Jf+7_}5Q+r|?>F<|Zf=tf(!&{ab_AUr&n7b&jMyV7X&?%Oh`#5C@Z2-K^SP$2 zs(RRt`fm%_NnMS%pO_oJRk?mqn~oH1VXb`@1#Y!G1YS)DQ2|I66Lt^V)@E8=oUi3V zNBKUs4yfp!zg(t^Rul`L-f6g_VVJF?{{IeK5d_?*$Ce+SqWc@(GH>jzcTNMT?Lk9! z2(td7-@TfVTLP0K&b|7F8eJ&58fBHv;1Xno<8_r2ef43 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Block_Shelley new file mode 100644 index 0000000000000000000000000000000000000000..7d900c96a82bca1ac8cb49d56f3dab29752dc091 GIT binary patch literal 1687 zcmai!`9ISQ0LQ=Em|3ovBF5-)nu{8m%yL9Zc|89>{rq{qUhmKA^?AKMBP#yLTnNsBvJuiCj)$)>&S zpAoxbKY!b9lvDcZDqlCYCIS%PuoTA z`m6x%{+)707N*u1ZWLHC8|3D+93-ro_`5YECenl;-kOK}AyW$UL>;Z~s*`6jVgkN^ z+_O>*DrA{{lbFEv??90hzG_R6!HR@b2BmIKLxB3RUR_3`D zJ!l~&fXz-ERTXRe*~zOmc_~_5%x4u!mdRjl#vel7eye%p&Xd{&RLP_HGkLIiFxo@o zAWc4IXMYE9tF&;y%&6+V{r(pA9UaQ7zTN7CQnm1tz_<13!Lbh0AWuD!01cMAU243W z3F$4~4mx&UK{zvV%>k=EIKYxU_u~nPWfnG2|*V}>yBE_Ea@Gjc5WfAZ*~(~w9Jrr>GnGT*al?VB7cS2EHN8!YVX?6?GZ0z z@-c}d)J_MEgsOZQAO+$~KibqhS)1cKJ7uTCCiA_l?U9jvKb=LzUq=?F-YB^;IRLb= z;BQZuK#2{nv@7Kb?Ht|ss*>=AK(m#1!-Ec==+BI`m8~#aWOOqKd>EM(rYN3TWUSdF zy#JyzGjO=Q{~TInYuZ>bN^Nv6Qe+6jMv5^FCKubEkpe=d2FVVX=~!vDz<2( nilvP&)}iZp%5s1T*hwml5=jb&?+Z?#g;5a@3@*VzI0XL(ewqfX literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra new file mode 100644 index 0000000000..8507fa8715 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra @@ -0,0 +1,3 @@ +X cA:^D d +uS| ] +q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo new file mode 100644 index 0000000000..0e06fd5e02 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo @@ -0,0 +1 @@ +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage new file mode 100644 index 0000000000..f875b3bdec --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage @@ -0,0 +1 @@ +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron new file mode 100644 index 0000000000..a0a1e937dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron @@ -0,0 +1 @@ +X K9 ҽC0F0. b \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway new file mode 100644 index 0000000000..426c12e555 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway @@ -0,0 +1 @@ +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary new file mode 100644 index 0000000000..dd7df1c0fc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary @@ -0,0 +1 @@ +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley new file mode 100644 index 0000000000..b26e394526 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley @@ -0,0 +1 @@ +X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..786e4823022271a8f0bf311d4796b7daff8cd3b4 GIT binary patch literal 799 zcmZo-x*-wCEYZA@p|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuSX z1gf%RI6XNcXzrJyIYw@a78swNp}2bg#oQ+y4XhKq_Birph1X4ST-$du&C+l}p0D$p z7e90gwPl%1*Z*eYVq#`yVQFq+Xkv(v!Kbi`8NYml!qG=k8&7^?(rrAvDbB>~biM5N z`e{My?1Tjl^(D#PsP1c$Q2>`0G~aL_^oMZ%1h4AD^ATTE-lt8$j{Gls;+Hf zYhqXkaz8`2dyDU+M*YLQ@?0mk{r=ouac0-t9fn#r*(X#=p>%z#gGs^wN6W(Le7FyEylEF+Q3a zU}eXadG4Rf+gU$ue13XQ*qwuEAwv@|`nozE-!0+%IQ4JPZC#sPu|=oSIrqy>5t9B~ z(!sceKR+hIp<>pFs5cwC%Y>9Bs;~48Uh=4oDKEG8m)RZ%ZP9Sv8B2MagYGX-x%4yP z-N`MxlP>*j&A%hPWVK#&k<7sbWoGH@KufH%)c2g*wnR5+@rnyt`MkxcMxy1ikDQlT z9q?G#9eGPL!l5N0`V*JzK`r0B)jSVHB4>V`6KND?SG)F!(k7MFW$Yar=Ul5X*qZgH zk)z;l)VGYuzL(gNOGW0+Yj|U_*gEb5f724iwBnMY%)E3a*QCml)MDl)Mkbbp%#KNo z&CE>AO^i)VEDTMooJ~wk;Dj{gVM(#x&sERuEu*%$vhQEnd@Vrvpwv`(9-}89d3-?( jl0Uv#icKT*i}`|>^#KVHdQ13P`1W}_%m4l1-f$ZLvR7Dr literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..558dfbcca80c1286824fab921cb0c4d4c6196851 GIT binary patch literal 872 zcmZo-xginBoY=CCp|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuT? z1*zI?utY~L>BIV4@mzjgVft0Vi+o-&ylb3T-L_+1gRsadM#jeG2up_3lOuxWekqz` zBp?BX3rC-4w^QeK*rA4JYLJI=^}GL#I$%mdSMeZ?-0h zl!Xy8%iP?(`$G)XMA^0-D!$BqJZzTVwv*XTcfB-&xE6XP=a-h06g%f<=1DTYAna}? zN#^IwEG*4U3{4CXGWaa-V#Y5Yp>Xt()W(zFm~!OYS#QWSF>*!7KEP*BBYtZdn(~tK^NLgRic5?23i9)FoT_V^*qRs?g51y0?cU-$ zsZswhuRPbuZNERaSDe{3cZZ?YP4)?u5_zl(30N(W!qx-~;0Mb^3}*-({$9L`p>%z`?`^bmkA4XLV<^iEh&36&JMfd5cqx zM9XC#IWMz1;IXhf@|I?VLt|Ls*2XOxvH) zpt)a)<`}sxT3~#7hT`h|7jvIn zlFTodniy|LI7#ehz9He=#N^@5$iSea#2_fpM1d=$7+T`r3W7-{N#^IwEG*4U3{4CX zGWeX{#f)D*LgDBmsf{PUG3hoQ-V|qIcDi2nd;PSab#}r6hx(FaZ&dp*vfhwuV&saD zeSpuNM*P+^H034d=M|^s6_*z473AmVI91m+u{AL)1i7D~+r7niQltK1UU{yQ+kSs; zuQ;=7?hZq(o9q)RCGuDo60lk#g{=t~I}etN7|swn{JnS=%bVD2`#)D#-3VZ7h-Rtg zP<33$BFVpifrE(;=*%B7&+_<#ZpAEVoNSR-D){&527|@yTMlQ4n;rYW2{dP8cG%Z9 zY~Ih-*sM-4eZQ`4bJ`i(BMYt;CfF7{MT=$b2!(lqGgo%(D*Auz<)O?|x2=P>eopv5 z^P|wsP45hjT=%-s%}!VeKjRW`jPs#9_aTB>Lb8Pv*2X@j9faGX2giw#VJ%X{2jpa2>&+?b9S zFaMx{f&kbUScQUEKuc|TcQkB7Q$;mXG-gvsHf3~9Z*^%{WqLz-MQTf9GjvBZYGE*I zMruzuae85CGB#RGP*p`rW<_~1HE(z|Ygj;Nimiov$Nw<=XkywM;(_!a#!_*&YO$As q|3KoETKI?=!;V~e6OSkdI=bOf$buz{L?EES$^Fu7n1Lpj{5}9%*=jNX literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTx_Conway new file mode 100644 index 0000000000000000000000000000000000000000..9d1ce51c81a083d3d3747b94a91d699f4106dd15 GIT binary patch literal 899 zcmZo-yCD(DT+_0V;U*(fV^f5}JJG0fa~w1kN=|3}@0oM(!Rk+(=iH=;-hxNDOx%|4q^s9sy`MhFy*Eq4dZO6O@VUbmgLPVO#%-FbuA;Oa3 z^yG-3xnGLr7`ZK4V0?Op;_CeubDwlHuukyWHGckliXLp4#hZHJ04vmXze<+tr*w$oiN%^rM`CJj>$`x)rmeak52T zso>wI8w?h+Z#kSHZg%VgCouRoW`})!!{+^Ljm_!=)A#GzHm9AjJ+k0xVS;VJQ?%gc zj!>8*s|3Gd~L5-1N@i$aSw9-Ry*w@H2`^GcYim{Bxg4 zVF@htT4$;6Ik##yIqbW0{T zcbNh=GblLVNd_Fr68l*fHZd?XNit7wk`(R$qOUg@nHMuGVN5G7Day=CXL3!dEJ-b9 ZZenC&S;*{|#Ms!x*ud22<_b!9i2&Dufsg>*4pqm6Udj2T zB_+kq`I&i=%rBUjnORtxn;4oHB4qFx+{KJvK0@K>BdLuizcJ}H9^MpZVs^S-_Iv%b zpmlb_0*CsNWN%daFtXl|YhvVzkbQv9o<{uEG&JQU=jRot<`tI~>lNhZ=Qvf@HnBA^ zECjiqq1(O1cT%JNVP1KzliPlOZm&4AYwiw1t()uOdVYv zkMEXnew_L@=(euSuGpee>74szrwB=ZF6m(0!k-@#;UIHa(zy58BHxak3P)G(Y>#E# zRvEHl zaD3TT^=`j!MRR_1owVP~x=?x7t*rkAhiab5edK%ob%)UQqbGh9Ejao}Z~N_M`JY*u zmN2FjmlS2@r8BuERhFa{GdD3Zu`FbEOloXqW@>I?Y-(a*Xkz7TVrl}XyD1M#iuHc3 zdTwtSwZ)Zv|H|fT0m=uZrpogeJpsw%OU@wq;EigVkLvi)~i@8ra8dxWI?Q!JI3a^{uxVG0}Vp@|_v2A|?CX8iII3P&GFZ9MsnNw@LvrZ^L` z)Ah37>!$^+vlA9L)R!cCquPg&^@dy%BUgm%1AO*0;wek;l4_fYlNyY)uOz zWF9ORF`OZE_Uey&g!ALnzd^TkZFa>Lol582FFQp@ z`g2JK;}-t>mF1h1)|Jn`YP`A-eCT`~m&ASLLkvJmth3bjoZGfUH)-*T3tIWS#i>T3<+6{Q zmsuU~SlAtTOEbdZdV|Z|EpNB`n(Yua{QQ@x=OL@5jd&X**ZQad6JMA_Ic2z0pX(r8`OhoTfU_@c~FW zVQ|Pgck(?pDrnrb0)Q>|`H!Ucr;9*>vJq1b5;QPaQ1@{5cADvj9YVQq{9;tQl6)b7 z|MXaw@e zy9LysKNhhF4T4xe{%9w4@cJVzke%F~!yyi*pzdW9&5H;X843vZ&hwa5V-+qC->sh3 zz?)HN{re>WMU9qD?c+FnL5uv8&6o(pbDo7Ze> zk_#CLDOe!vLl|S@EEi?A3!s0MZz*v|a$B3om_22Xa^dSF3)(tZAkvuHI0NgMSnwPI z=RYJ6^7*?i%fm)eYa4cVE*sr_wEzHEK$H)PHkO2bN+X8_z0!I#P=+WVXSuvwx3-u^ z%7<16SVYx!^_s9&!D*!gG7Q1$w80ZA4>R2m%0E0l{-fu9^2E;*~lm_swrDMe&eY zIS9;ZTD8fv4}pAfUG-S6eFwG}Zw${dabCjv0GJ0btQKnaSLSC12(RJ4WgSUw0kOyb z9<)Xj*w4|o<0~vFIW&?s%nI5RU5$-;*%|L1V92|zG289=^Ob~`1)vNRsCZEZs^cG3 ztHrVM2%Nt0ZIl7=Sa3`pPjnA)CC|qIshyY5GcK&NK1;lft0;2pD?Rz)6Rq0o(N@34 zPv6HfVNELS(F$0jNt3s*jDjljs$pAeyPGC^$pYl@2VNOU?FdYvkBiOWrm&R1KT?&T z)KtKrgY8>%_X#h+r!;H>mzpr{>UP$Kf+6nmATE4XdH6o)jPM*FDTy0vV?x;3O#p$`w=s)qp@lAHvd^g Z>=OL@5jd&X**ZQad6JMA_Ic2z0pX(r8`OhoTfU_@c~FW zVQ|Pgck(?pDrnrb0)Q>|`H!Ucr;9*>vJq1b5;QPaQ1@{5cADvj9YVQq{9;tQl6)b7 z|MXaw@e zy9LysKNhhF4T4xe{%9w4@cJVzke%F~!yyi*pzdW9&5H;X843vZ&hwa5V-+qC->sh3 zz?)HN{re>WMU9qD?c+FnL5uv8&6o(pbDo7Ze> zk_#CLDOezack^sA86}>s0gTIqLpTK!StE|8Rrm`q4r=VDkg2g)AkvuHI0NgMSnwPI z=RYJ6^7*?i%fm)eYa4cVE*sr_wEzHEK$H)PHkO2bN+X8_z0!I#P=+WVXSuvwx3-u^ z%7<16SVYx!^_s9&!D*!gG7Q1$w80ZA4>R2m%0E0l-B+;vW<+a%J&( zzS^8V;lr>whJAXLKq{KA@#^?0jBDJ@9*lwgKON2wMeal?iDvQ`t?yvc4o}^-bSg-D z2noz;TD8fv4}pAfUG-S6eFwG}Zw${dabCjv0GJ0btQKnaSLSC12(RJ4WgSUw0kOyb z9<)Xj*w4|o<0~vFIW&?s%nI5RU5$-;*%|L1V92|zG289=^Ob~`1)vNRsCZEZs^cG3 ztHrVM2%Nt0ZIl7=Sa3`pPjnA)CC|qIshyY5GcK&NK1;lft0;2pD?Rz)6Rq0o(N@34 zPv6HfVNELS(F$0jNt3s*jDjljs$pAeyPGC^$pYl@2VNOU?FdYvkBiOWrm&R1KT?&T z)KtKrgY8>%_X#h+r!;H>mzpr{>UP$Kf+6nmATE4XdH6o)jPM*FDTy0vV?x;3O#p$`w=s)qp@lAHvd^g Z>6g1=tu_15tvC0|{6lyD+3I9%AsX+FuGzidHXr6QWG&0Pca2dxp54fD;s| zSRjgs=OL@5jd&X**ZQad6JMA_Ic2z0pX(r8`OhoTfU_@c~FW zVQ|Pgck(?pDrnrb0)Q>|`H!Ucr;9*>vJq1b5;QPaQ1@{5cADvj9YVQq{9;tQl6)b7 z|MXaw@e zy9LysKNhhF4H*e3SRg_nh;?0IOv-#sLd%7d^fEV$@GH>l<-aiGo&a}X^lpS$AkvuH zI0NgMSnwPI=RYJ6^7*?i%fm)eYa4cVE*sr_wEzHEK$H)PHkO2bN+X8_z0!I#P=+WV zXSuvwx3-u^%7<16SVYx!^_s9&!D*!gG7Q1$w80ZA4>R2!a9tSpmSG z>b0jb=GJ>-@Ma`{!1qWxGE+$C?AH~%d(}@W*ltA4K?d#S>jk^`TU6!Qgtjg0lJF+V zQvzv#{>=n}h~ogvYFf3)v=4!Nab5LTuYCu$7;g;EF>zkP`v8~+Fsv48_E+X-1_-a= zzhxasZUM2!{~okP6xh$vx8o};DLFKfHp~jz6kUytdf6H89$?73tufo}`SX>8mj$2< z6sUMn2CCy9Rjb9Z@(7&1@okg=@mO$79#3=+aV5{k0I8jq&@(Qqvp!3_jjJef>?=L_ z;S;Ue>(N%f#!uhJGGR?B?a>NYqe+vuu#AE#^QvK6YrC5!d&vUi@dsWRO6>?tp^uBr z;ij;Zzdurypwv{rpo8sOboU7_z^6291DBdG?&@~dhUF5vNYWKVx`#-H&CzDd@^!Hv zA2@;Z#3y_SqDzSUVQBPMf@i(S)-1WVi;et_VL?X4$&aHh==XZkz4(j5~m6f^8k!T!p<<&d4(Jv_8$+Cog=L$V{f%_3N iuA{MO^)~-mMeGW8l@3w9-q2!uw}BvGdM^k<HLRR5SXSoAhJAj~qYTt34Ha5YI?-t36 xgt#+uJyBR7ufW=57(4Q2Pd!fTayZo_x?q2<>atJ40PBVwx@ngif&hU4fuNX%Clvqy literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Byron_regular new file mode 100644 index 0000000000000000000000000000000000000000..749614e068be4f86e3a1a346222de9aeb8cb802c GIT binary patch literal 619 zcmZo-Xli1VWKO*y5y=$SD#h%-z%W9gV*>v!hY7X|wk+;tTYPEn+W)zpE0*nGdH--r zkj8|^J9Ju_86ya2`cmV&e?GXx(b*6gm zu{!K6Ya7%2k}DJDQjy6fS3}NiHk$bYpoay~X|X`5?oW zpLVGp5}R25_N3$9fVDXh3hNKtN|CVsl;&^i_om3=s>-f}`gN~1`5$C>-6p#$bGmed zf?t{j&rRP*fg+RHZ@3I5EVWwc8m9L3h_ucaH z^okAazb1H|_+Y)?!LcTJ`r8vvI$k9ueBgX)esX4~T-W@&&p$n0wu7(f^7i{1w8Zlc z%v#2s+Q`_%)YQU2xj_*Qujg~VGF;5x$RKia)|w}Q*(PdlDr{dqjN`v5-?{qVy&J~D zZ`YP7&zIg{7HDY2l=wmG+gkl292e$ye&;htkCq2|MrT8E*QC%%aw0AbCX*eFCcl28 z=qR@4;2cF3Ipe*u593dqYqbkIzvjX(G2gC5{qquLhcBJ0IwRW6HL&A${L$C!5e`=@ zih?5g*YApZ+N1o`F)_b<+3uuckzOvzOP0sDy|$RQk(bS5a>bp8ndg26uH*Q%CQdK; zM2mdru`}*he_Zl^#|BITjEqfb?)f<>sd*B~3nCP}S86R*IL38m*7cps{Pk{y9=Y^J R;~C4Zk8K6r{yctt_W@!~DvtmF literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/Header_Conway new file mode 100644 index 0000000000000000000000000000000000000000..7bea7230e70ee2b68f3fe2dee25cdd607d026d82 GIT binary patch literal 856 zcmV-e1E>6g2G|%`15tvC0|{6lyD+3I9%AsX+FuGzidHXr6QWG&0Pca2dxp54fD;s| zSRjgs=OL@5jd&X**ZQad6JMA_Ic2z0pX(r8`OhoTfU_@c~FW zVQ|Pgck(?pDrnrb0)Q>|`H!Ucr;9*>vJq1b5;QPaQ1@{5cADvj9YVQq{9;tQl6)b7 z|MXaw@e zy9LysKNhhF4H*e3SRiS`#MNvwU%>1^Y#sxvF0Dd<+yE}0m*Du-tfl;M&S8XDAkvuH zI0NgMSnwPI=RYJ6^7*?i%fm)eYa4cVE*sr_wEzHEK$H)PHkO2bN+X8_z0!I#P=+WV zXSuvwx3-u^%7<16SVYx!^_s9&!D*!gG7Q1$w80ZA4>R2!a9tSpmRe z%0kOn-$)PtGf%YBC+r8FAN5`Ln+#~qKeA1vjY_x<-)@D@2s1_s=>#OJK?d7BeNm<0 z)9+9faKr?Q+W7^{YFf3)v=4!Nab5LTuYCu$7;g;EF>zkP`v8~+Fsv48_E+X-1_-a= zzhxasZUM2!{~okP6xh$vx8o};DLFKfHp~jz6kUytdf6H89$?73tufo}`SX>8mj$2< z6sUMn2CCy9Rjb9Z@(7&1@okg=@mO$79#3=+aV5{k0I8jq&@(Qqvp!3_jjJef>?=L_ z;S;Ue>(N%f#!uhJGGR?B?a>NYqe+vuu#AE#^QvK6YrC5!d&vUi@dsWRO6>?tp^uBr z;ij;Zzdurypwv{rpo8sOboU7_z^6291DBdG?&@~dhUF5vNYWKVx`#-H&CzDd@^!Hv zA2@;Z#3y_SqDzSUVQBPMf@i(S)-1WVi;et_VL?X4$&aHh==XZkz4(j5~m6f^8k!T!p<<&d4(Jv_8$+Cog=L$V{f%_3N iuA{MO^)~-mMeGW8l@3w9-q2!uw}BvGdM^k<=OL@5jd&X**ZQad6JMA_Ic2z0pX(r8`OhoTfU_@c~FW zVQ|Pgck(?pDrnrb0)Q>|`H!Ucr;9*>vJq1b5;QPaQ1@{5cADvj9YVQq{9;tQl6)b7 z|MXaw@e zy9LysKNhhF4T4xe{%9w4@cJVzke%F~!yyi*pzdW9&5H;X843vZ&hwa5V-+qC->sh3 zz?)HN{re>WMU9qD?c+FnL5uv8&6o(pbDo7Ze> zk_#CLDOe!KWtclaIT9YcS9~6ED)>E#10V~7oaaH-`d7U5wNI5;AkvuHI0NgMSnwPI z=RYJ6^7*?i%fm)eYa4cVE*sr_wEzHEK$H)PHkO2bN+X8_z0!I#P=+WVXSuvwx3-u^ z%7<16SVYx!^_s9&!D*!gG7Q1$w80ZA4>R2m%0E0lTzmpb$pgL%i)^RqRi-w5O#}QEp%ik>RbP1T!Y9R(s=Tx)=Gb%K%_Zgt?)PYL zVh+q|TD8fv4}pAfUG-S6eFwG}Zw${dabCjv0GJ0btQKnaSLSC12(RJ4WgSUw0kOyb z9<)Xj*w4|o<0~vFIW&?s%nI5RU5$-;*%|L1V92|zG289=^Ob~`1)vNRsCZEZs^cG3 ztHrVM2%Nt0ZIl7=Sa3`pPjnA)CC|qIshyY5GcK&NK1;lft0;2pD?Rz)6Rq0o(N@34 zPv6HfVNELS(F$0jNt3s*jDjljs$pAeyPGC^$pYl@2VNOU?FdYvkBiOWrm&R1KT?&T z)KtKrgY8>%_X#h+r!;H>mzpr{>UP$Kf+6nmATE4XdH6o)jPM*FDTy0vV?x;3O#p$`w=s)qp@lAHvd^g Z>1LT5_0|{6lyD+3I9%AsX+FuGzidHXr6QWG&0Pca2dxp54fD;s| zSRjgs=OL@5jd&X**ZQad6JMA_Ic2z0pX(r8`OhoTfU_@c~FW zVQ|Pgck(?pDrnrb0)Q>|`H!Ucr;9*>vJq1b5;QPaQ1@{5cADvj9YVQq{9;tQl6)b7 z|MXaw@e zy9LysKNhhF4T4xe{%9w4@cJVzke%F~!yyi*pzdW9&5H;X843vZ&hwa5V-+qC->sh3 zz?)HN{re>WMU9qD?c+FnL5uv8&6o(pbDo7Ze> zk_#CLDOe!q6&_Sqji^&YQglp;;e^_ggKDlcoq=^xneU9*5_0@lAkvuHI0NgMSnwPI z=RYJ6^7*?i%fm)eYa4cVE*sr_wEzHEK$H)PHkO2bN+X8_z0!I#P=+WVXSuvwx3-u^ z%7<16SVYx!^_s9&!D*!gG7Q1$w80ZA4>R2m%0E0l=C-eDZt<*(`Jq zhS)|r*Hx}ee7wfO?Mf?zU9U?e4lXt_Iux&JSfuP>NkjHw+N|N9zhiM}F+lGZlm`6_ zodC>gTD8fv4}pAfUG-S6eFwG}Zw${dabCjv0GJ0btQKnaSLSC12(RJ4WgSUw0kOyb z9<)Xj*w4|o<0~vFIW&?s%nI5RU5$-;*%|L1V92|zG289=^Ob~`1)vNRsCZEZs^cG3 ztHrVM2%Nt0ZIl7=Sa3`pPjnA)CC|qIshyY5GcK&NK1;lft0;2pD?Rz)6Rq0o(N@34 zPv6HfVNELS(F$0jNt3s*jDjljs$pAeyPGC^$pYl@2VNOU?FdYvkBiOWrm&R1KT?&T z)KtKrgY8>%_X#h+r!;H>mzpr{>UP$Kf+6nmATE4XdH6o)jPM*FDTy0vV?x;3O#p$`w=s)qp@lAHvd^g Z> \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra new file mode 100644 index 0000000000..fc2db110cd --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo new file mode 100644 index 0000000000..bd4f42fa98 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage new file mode 100644 index 0000000000..ea805c4a85 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_EBB new file mode 100644 index 0000000000000000000000000000000000000000..71629ccde7e244b10027d592846bf55c23a798ff GIT binary patch literal 22 dcmZo-Xli1RNVy^5W8>=N6z}2c=;9h=2LMg|28sXx literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Byron_regular new file mode 100644 index 0000000000000000000000000000000000000000..9f4c849c9c7aaec2cc98d380bfb4793b700edfde GIT binary patch literal 18 ZcmZo-Xli1VNVy^5VdLTI=;9h=2LLrD1z!LF literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway new file mode 100644 index 0000000000..9225aa4174 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary new file mode 100644 index 0000000000..f8aa87eb5c --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley new file mode 100644 index 0000000000..d5a1a05c35 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley @@ -0,0 +1 @@ +H
\ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..018b7bc479fdc07b689fdf01efb60f256b9bd9a6 GIT binary patch literal 39 vcmZo{Vw&H?*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN)8a> literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..d9c76ed7084ce14b9e08833533dac4c38fc81797 GIT binary patch literal 39 vcmZo{VwvB>*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN>~u& literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Babbage new file mode 100644 index 0000000000000000000000000000000000000000..dcabd6d2749da7f9805399d6c25d0063a8e28cc0 GIT binary patch literal 39 vcmZo{Vx8Z_*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN_`OJ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Byron new file mode 100644 index 0000000000000000000000000000000000000000..1728309622124f9d85cb596a6163f5c1c4b8d8f5 GIT binary patch literal 14 ScmZo{VgSKrhQ!1s1_l5iVgt_r literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway new file mode 100644 index 0000000000..7e36ce4445 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway @@ -0,0 +1 @@ +X1s]k?ժP[{%A \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Mary new file mode 100644 index 0000000000000000000000000000000000000000..f0ab5dd88118933571c1f90bf476eaa89bb3b758 GIT binary patch literal 39 vcmZo{VxHf`*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN;44S literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Shelley new file mode 100644 index 0000000000000000000000000000000000000000..15bf711ff08d74707ca7c28f45f016abdb7d251f GIT binary patch literal 39 vcmZo{Vw~T^*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN$C*b literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraByron new file mode 100644 index 0000000000000000000000000000000000000000..9735c28d23436ca90c123fd781e030a3bf8c2969 GIT binary patch literal 19 acmZo_VoVRtNX^Mft!!dQb*e1N&jSEQF$XjN literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraShelley new file mode 100644 index 0000000000000000000000000000000000000000..43f2fa8267f5b22ef6dd14c7a562e2fd1bab5ca0 GIT binary patch literal 19 acmZo_Vn}tWEXvPoVoVRtNX^Mftpor@n+G%i literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..b525fa7868f6550666ddc7f4b81f258068d33d96 GIT binary patch literal 1799 zcmai!`8U)H7{X)j~ z6S%_}9(u7dH=U+|Irf#f)cZwAGP30$AtU|W>qzVZ=ZD)XUGo-S#*<)d8$L%`aVat# zRxd?A{(A=ml3nJzy5vL6Ji8;p2U=7SP}Kt=rM=Y55h%E2DqMh3O#Q>VO`{hrjI~0> z8sJH~qSebKqT88dsCL^?NogYz=qd_dVdZ~H!yjl4U!%GUuEy_VuP=jni`EYqs`%8u z&9hdVaOM{U`K5aE3U~(G?zr1{mLVf{f7h5VIn_DJkWx(kR@GZ45PQzE+FpZ^*a-DA zL_O-uzq^Rpg=0mXJ0)-P<^pB=Gcj@sIE-juiR&I9N8CDISv1^!9?fZTjs+A58D9H6??SoRb9Y))D zmUbJpotu6Nn$bV435ALK6pHbmVoOH->`2w_JNFiCp*h}oapv^ZEecpokT7E-AMj4+ zkHE$)yhILNGlIhKxzWwF2+U?od{)~sY6=ntxug3LpRa>ol;BfVYFigq1;pM?JGaw{ ztZ1U*>x2dX0LeL08OFIO=N)&Yi9HyMHF8bWAOttJ9&c*o+CNG2z<{G}?pAx(<5x#uXo?5u5o4+ai+!P?KCTIyr@6zrxVmdVehijN*}@%nk<1@iTR z-q1Q;`KJHK{tH?`Jp)H)E#e8{+V`%Dc1?0jHAMY%-Gd9+-X@s7Fz<$*dMS2%gzs0d zDgoUnPZxixAK~}tJHSPg?rslT@%$$kg{hio3&cCnU^QLq%Jp`#BTt1*@3eI^O^mJ@ z_u)omeY3J+Unc5&@UE-wViSfi`@5CHImA_LtR`IxI5mWGR;cO0U0StFi zc8QdV*!{E%C@ai+W=OnSXL+bKt3rb@qiwM|AyYZ}S?JOBm&8YQ(~7}UEMRimP^pS}F2dOY^#q4YKXkY!IO_(9LGPIFUc z)>`_-zR5lOXvPVXsUa-sn1;XbV`dCDPbo&Cvx#Y-$iHB#+AuIsnczAVoh&9fJ=xFU zH1}T#QDS@;GHVj*X}syFO*ub>vxsJY-)4BPxF+hzIp!XW+ zR=CV4FtEGHGwkK=tY{OSeV?8rmhISTEfMB$JtKq8YN00Kaz&5Rj{&2^CQcydQg&k9_Z-C65rWZavG7bWJp-LsV0`sflBKN9Bz z6B|*6U^o!}b~6rpb4(IM3!u}Ofiz|mlNe5?pE(eh0HGj&|0_R`X`kYJm95t)p@Qpa z{JxYH)7MgXUtjAbI{TbFO^p8=wEQU)#0Qn$-j>zpN_UEwEyx+)(^hLk+F!li9t;Yjd5pHkUJClN?u5OH}BtEwmvbLP31h-To*=?MsHn@6nuBTo=9sF^D zKBibwLG)oLb?{im!RQT$S(tk3Kx2t6wfN36ExH6V&_FI4KWTHzw4K7w^cvL!$tfp& z7IF9vEoWMV_=K$2^{)k91|F6PmG4z+)hbx%^qPXIO| zOhht?tL0NxCf@Z2(QReP!>+qJc5qb04c`CKH{0?ry{m2qO5@n_KHl*v*OMTzL^4J4 O;UOE9AK&bgUi}AOr!))z literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..dc3903d3a62a08c9bdacf27ca74ce62e6b71ee66 GIT binary patch literal 1872 zcmai!c{tPw7{`CV8FLnLwKK~wX**^Vw~vfeY*)Fl*1v{SDA*~IFq(PFYDx8QHIQ7>xD|mEivY) z&}wZpUVa(spWsbVAOBvjn{{!psCAt}nQ$^dwJRO3MkeCtyJz#={MB^Vyecp1Yq@Yl zJ)HE*&eH;zbxip+Be&GNkLqsc54jNbPFT)hy=`)z;A@HgVoRODf+Mejrsjqjx7=tn z%9LYZlG1LRt;gkdqvqJL$B-H4!=hAr;#YDpX$V$ zU&OkSRtMKG^=N^v`iq2G0D!Es71NA!la902r(o{%#2L9HZ>9z{G##q1%XfT~;*N*x zdZRxTRJq>^xh!X}`rcU0J*{3EQ^(vx#<_ab&i^1D1$crj_Ey7Mstj(xbnIPOq2*9( zm1%N9T&^{}pmKU_fu0dI*rk~Pf3u==E80)m(S8e@A(c=0^eF6kQOBn<7&`;G!)^ixreV9x#4jeaP?x|6GPn_w=A8SGOusuj_X)_8B!^i{Uvp8{$tOpHUr;X z^a&{uD&BdnzA6Ku&tCIA7$&~3F}?%!b{gkRW=-IoMQ75xhDxilo2^`PgiqaCgeNBs z^5+S9EoDaG=)3~P4jB@L9!L{)2PnZR=oHXS2ea!OtF4W9Er zg6?$mZE2`a&s1jq=V`>qx7PCv)J3Q4v}?P&%M)Bi z1t&2IW5ZoJISpOE2WxOgdd=#kdYfN%+)O$?O0*EbUzH3iimO9D883O-j}xPF6!zYI z`NS{29;W)n>EU;bD44<(0E|G?Nwovrh1N7GUlO{MQP|bPYhTM;QrbCX+%(1(r&(?Q zS$vMdN;vBcoz~Pe6P?Epydb9NC+tfr%7OTldKGfrQwoUozfk0FJ zEcPzj@%IZ`B6TRJZIxfK2+71V-gXzKZnf=VDqAQx)B^s_>TAl1d9No z@BBczW74j(uwJXY7O|u5>ugF)XXC}&`t$)@RxF8)5v>qSI)X)(2mHEBRX<<3b)MHK zH|`Z?wb*;D-vyg^P%a+7!A2xURulqwl)^IRg2p?xqO0ss34G3k9i{Ybq>53Dt7#4X z$@q_tgk_)VF!xX6Sf_V4%&+@wo2p2@71(LGuc+Fi;av zhHXo?w=hNNo-!I_4ZBCy!ZlTN#+tO)f>UiXBg_+ZL8Hv~-$sfYLK{-LRV*cfCE?({ zhl#s`u)|^5Low*}UYB6yCVs-(49PPB8fH3z0HCc6D9OR3W(=GJ0AzF?LRLv#E)g&Q qqKknNFp$URhOmQB_I|Pa03I3vQF0=*jUNajU?K{3u>Wr1oA@tqHCSu_ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Babbage new file mode 100644 index 0000000000000000000000000000000000000000..279d590c81066bbeab4f42723931f373c80af1b6 GIT binary patch literal 1826 zcmbtTS5Q+46n!s^5Cx>Ui4uscB1JkPRf>qANmFCGQy_OR-P{Sx_QP zMFo^11PzKxN27uPdkG-YtBmflupj%eAG$L;bLaltGv}O{bFP@UONxx(P9n)@X^0{) zDB7SJG+y4fm#{tAM?YTilIsvK3ZG3#ynTVAsB{&gB=bJLW=l_G{o(ae*Q!2%*%l%# zBxfqDo?`RBDmjM#&k+b@>ps@pOboO1ZHbEPs#ixN<#$BX#$ronAg{ziGyzgAXpt=z zv6I%O+M%ziQ5@a5`O`&nr75<^O?huw1rr0vV=i(wCiim^*}g9Fd(aL+`jIv8!ZegU zX?KUIPELGgl{V{2uu2u=7VD3Z$V`-@zt`I|V`jWr^Q!>cM7L;TYN74d^7dN-?DGPf zm6doIlC%~?v0uZB4xqWV9dWa7KbbLYv?+C5=gF`{Xz=L*5F0p6=R%aHIelj6FXy3g z71V&u+7*-Y0=@PoN3V$0F|m59UmvXo0LV5|F4^=P_n7mqN!UA2<4rsgH7Ox=4gR$? zIosNjeDIJ%cg##~h0ndPVvN!9dqY+C)Vj5(I##}Yj4Ov6_W9uv6tD|yyf{={YSiD8 zux~tgEvIpgYGLF}9UOk4+>p@it}UiJblTxY`oCZWU;TDSdbu^a!|CH1ZQiIb&Yzta zg!d8X2;W`ZS|tY`i3*s3%8yFb5E;uK8%FK9{|(5IGPt%feAc%=1cxtwFFZhYqJx#q z3#wI)O5(?&+K)OLw9HM?O*;sEN&#tU@x7!m)xZ|Pb;Fk<^HW*eY;3`DrOR=ixT_!4 zc9uP?oW$qdoj8;UPC${as_tyLsCAEvqvFD`q8%s?NqO)@iMu%d05+w@t)Thc0^-0vkPEm0CWOSvPni)L(VEqy4 zOD??cw9si^B;-zO&xX3%l(g@>)Q%4t{8;8*^MP(@gPoc*(O^nkPPR&%Oj9k(Xf^+& zgL-vW*Y%?w1F_B7My_tv9*H1_;)%@Hctm8- zwhj|wvSdB)zIhUqPzzIN@%ngsiL5zX3BU+M8CBlhm1nC(VYi1bq~>)#WworNF33BL znKlg31<9M&0WwRdpZy)E@L#ylAY24M=0JM}ENf$zMJ5zS_^wlKozB=jH(0mVdnq7W@6x*#a(HV^>R)dBex$p3J$ z3gGS?k^g(6Naz7H26F-d5CBs7k@aNskM9uW;fGa~t+OayxasB|6VvwNI zmJaJT$*2)pYrah-#dXx@-!|0ll{#~nNXPPjB2CcimMA&@q zzAE;>ar`g|_;q%C3`wp4z@uarZGKhhr^|Wu`4_<%X7p(JKO_|fg;G^bp}&|u8kb(= zsf_TM8OFKvU$ZI;+&Fe4@m6q$^@D=$s6gvT$-h!w22n1^pTEMZXD;-7z8}{1($c$n zDsbWaghKDlQG*9BoW&_pKZnRIwR5S)mf`Cgx@wAag9HT;w**S=x+qp`at|L=HLRR5SXSoAhJAj~qYTt34Ha5YI?-t36gt#+u xJyBR7ufW=57(4Q2Pd!fTayZo_x?q2<>atJ40PBVwx@ngif&hU4fuNuNfuQ4nDC7VD literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_regular new file mode 100644 index 0000000000000000000000000000000000000000..ce89fa545b376130983575f559f429ad109bc7c8 GIT binary patch literal 867 zcmca15y>3a#Ms;_#q7VpFhZeY0{ZzM@#c@%10ROM;5ekoWrh4wNI{n~< z$ENFR)r_TUTc$@ar<~S4c4F_!Rh*?enwTRLE@!DpE-UhMV|ggO#r^d8Aj6lRcBvi` zn^^w#q~qRzwK)+A>kr&Yk+A-h=5OowrpV%|%C3a^b+0!0A7pslCc7(hx^#qsUz!Hb zP2Wg?B9qx~xC|yNwOZ*KruRFS<7!@TsyCm*jFu(_#t4VS-nXrHH=H&1-SYDEiVf_) zCU~CsV7=eLu_k%?+Y?VZUL_@b;CyO+a%QJo*ZjNBKRsTygRklG_WK*O#Pbf!TE?B) z$k@cx)WSfyK@kqG=X1U?T+H9dAaZlonkRwTCTedgY+pW%I zm)>9&XlTWh_(AL2TKyv&7v^_<=QBu;mIr!9XG3z=q|ixnA}$RklO2sFzkZ|WD7NO{ z97Ps6GxwF^7H=E5&A->yad^AcugCcaM{WqQxEb6!uGhzz z^zYpn3H|@`o0@=%6`LbuRs|PvMy<-=mArDwGqZW2Yr!1rhuyqB&8MsH#4TWuGP*OP z52$`YBiQuTrU(b`+{$v39G75M(_oXdU=Op@62JV?%!t$~=StTs?_}c=cay9{gKW1f ze~ZGZ#7rZzDBplkSFbeJN<-893e)Tehm5YZt<}f>8~n*gx+VRn@r%N-pu+808>ct@ zcX%{4>PLs<;l7wk;eHKvt6dL+PBf`@yC^I;c=GS1oEeR3)Bo5p{BL5u$;i|&|9=w@ HH!c7G_QsqY literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Conway new file mode 100644 index 0000000000000000000000000000000000000000..5ae5c5065de3335619ac6b764801535b5fc102ce GIT binary patch literal 1752 zcmbtTX*84z82-K)!Ghv+p_9EQ!gU#HWZ+c4n9vbS-7RgllOfOL9$?7G%ki zEkfC4h!_AG|~_s9K_d(J)QJ@2pQJkRsK@AD2|9oTzej!SSXk`uyLD`m@x zyM8TXIb$qi?G!@<@0d>j)AVbhQI9hs1ce?z_}G~DZ)lveN#AUS=L~8o zlDMc|orEQGj81%YT8`q32#$gbLO0>g;cfWq&|BP)IRIqLyk#7GF=lfu$Keo2MCiXq1J z_VUfGRx7kO8r%4Y1_djKz6mb_07yTPH&*>-4!=}RZbfWaBM4vQ4R>z)2zVByr<`f!601jZiYnx#^G)&;#P_-)U zJuu0UA+hMRe2dGoORvNtJHhlZ&oJpy7h2UA^OF0C4t4w8{(zL zLIW?D74K!`q&3y9t9M{nLQV+@A%h|_;w~-K1&p?l|!u|Ie(aU$1+I|53`EB7S%T#j!a^L zl6a0idE4z8T0zGXLln`5V?3JlVqg$N&|wHaEqt;oU0)hcYxmxWPw(uZw(KNq@E@H~ zubCiK#~#`TaQ^^q_kEzie`G|0^lSjq1ln&vHn$fj=_xIE~tseF}Wad`66id=v!4soz>jU9xsXBm)KuCa;P6}CzE{*L&H&wZD_G)(FmTuxmUzK zl6Y-cj@k4Z8l*t}Z(~JDSsbN}p1-I+|H`?!{$d}y#YuLvkNG-zE(d2GMm=)x&~3`> z3vki(AN$w(cR=_I{?z+1Rg{hX&kbH}L)yp7=3O>YX9WgJrj?prnGVEpY!BfDg+&1X zXk8yh;5P&GBW&8<2Wq;?v*lg0?sdzMxv6d{!oj%F!?{}Z1V)?#OB&K|C_{zm|M@cD zx$PdJWunPVKQZbuJtM2XVuUXq!*68iN4-$fU2}5ykKjLt*2??6Qh(D<8Y+A>(8Ch* z^UKBWKyE4hlbP>V#@3-2FaW?J$YfYVFlMtDn|_d4KsM-3rBS>{9*85ZztY^ONEk%0 VF^~qXARPuH5Om`sThSv%`~@UG9BKdn literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Mary new file mode 100644 index 0000000000000000000000000000000000000000..14d8281f93368d898501f14636df833891cdfe4a GIT binary patch literal 1894 zcmah}dpy$%AKu-zGUd|8VzW}mt>${1Tw-z?QS!R{6v`x*w9Ph`T*`jDIF{nP`V_5Sz%!{5*Id7kI{{XU^vdG<+k!UDAhKM z*>0OSf7seMYDf%AKd4;2R;sMvQNYJL|AteyG6Q^+%;kiliEP4=2Id;gPnw^)hr7NA z6wW(6W$h(o{brxH?1iWX1RSoDZnKh@WGszc9=(nI^FC=i?QKS2a}env)w zS@(09JCCV22bQ&4HD8>31=ukr*5vZbKjBLV6Un6mp>Af6{Pz5KXB*w~)_-Ep=WoMf zi~y1>LSRR+Q71M9rV`_fR}TLSCvD3p9(U^h8rZZXKF$Y7uLT2#;D7uB_@WCNcigvQ zepO2DY<2TJual5S*7-e641oZY0<~Q0o0*q9^|O&rUng7nWEqko8=8V8^#b>o*#T(4 zr7vNr=uyD)=rV-G_UDsz&-MC@s3!J-1C09@T*6PGVUQqb%jF@AtFr&yU@h&&eI_+H z73SFif3}SmTQT8ZZk^^0U)v?pWOe(WPMUpT&~~G;sm^dr!G7Ppe+)gNjAGJoT`?!c z9d&Bl)VPo(pgK*ZUYoJ~m3ds~i*FEtirKHbVwMBPB2nn-k>&`32OU}?TPN1JX)0dH zB_B)<7};3mTX$gxG(+<8lHcNIiD%lSRpx`!s|)o${`c`=nMIhl z@w6NZlz7~bJh}oJFI0w|IxoHTLrMqik-tYQndyF$xO!JY@r@(Ukx(vjCao19c*0xuOfRb731&c^&Y-P?KU z^U8rZ69VkV>Tf7e`>Y7ieP5wzE>Le(vKtXoA?F>}`YIJZsPt2a6!d;4k!Ls~p2J}~ zGotBu_-7a#jzDC95D)_BZYG=y-y8=>ZKJzuI+kGvxvh^wt*kpQ6O@;4`aX2f*zw{j zji5;Jf+7_}5Q+r|?>F<|Zf=tf(!&{ab_AUr&n7b&jMyV7X&?%Oh`#5C@Z2-K^SP$2 zs(RRt`fm%_NnMS%pO_oJRk?mqn~oH1VXb`@1#Y!G1YS)DQ2|I66Lt^V)@E8=oUi3V zNBKUs4yfp!zg(t^Rul`L-f6g_VVJF?{{IeK5d_?*$Ce+SqWc@(GH>jzcTNMT?Lk9! z2(td7-@TfVTLP0K&b|7F8eJ&58fBHv;1Xno<8_r2ef43 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Shelley new file mode 100644 index 0000000000000000000000000000000000000000..7d900c96a82bca1ac8cb49d56f3dab29752dc091 GIT binary patch literal 1687 zcmai!`9ISQ0LQ=Em|3ovBF5-)nu{8m%yL9Zc|89>{rq{qUhmKA^?AKMBP#yLTnNsBvJuiCj)$)>&S zpAoxbKY!b9lvDcZDqlCYCIS%PuoTA z`m6x%{+)707N*u1ZWLHC8|3D+93-ro_`5YECenl;-kOK}AyW$UL>;Z~s*`6jVgkN^ z+_O>*DrA{{lbFEv??90hzG_R6!HR@b2BmIKLxB3RUR_3`D zJ!l~&fXz-ERTXRe*~zOmc_~_5%x4u!mdRjl#vel7eye%p&Xd{&RLP_HGkLIiFxo@o zAWc4IXMYE9tF&;y%&6+V{r(pA9UaQ7zTN7CQnm1tz_<13!Lbh0AWuD!01cMAU243W z3F$4~4mx&UK{zvV%>k=EIKYxU_u~nPWfnG2|*V}>yBE_Ea@Gjc5WfAZ*~(~w9Jrr>GnGT*al?VB7cS2EHN8!YVX?6?GZ0z z@-c}d)J_MEgsOZQAO+$~KibqhS)1cKJ7uTCCiA_l?U9jvKb=LzUq=?F-YB^;IRLb= z;BQZuK#2{nv@7Kb?Ht|ss*>=AK(m#1!-Ec==+BI`m8~#aWOOqKd>EM(rYN3TWUSdF zy#JyzGjO=Q{~TInYuZ>bN^Nv6Qe+6jMv5^FCKubEkpe=d2FVVX=~!vDz<2( nilvP&)}iZp%5s1T*hwml5=jb&?+Z?#g;5a@3@*VzI0XL(ewqfX literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra new file mode 100644 index 0000000000..8507fa8715 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra @@ -0,0 +1,3 @@ +X cA:^D d +uS| ] +q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo new file mode 100644 index 0000000000..0e06fd5e02 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo @@ -0,0 +1 @@ +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage new file mode 100644 index 0000000000..f875b3bdec --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage @@ -0,0 +1 @@ +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron new file mode 100644 index 0000000000..a0a1e937dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron @@ -0,0 +1 @@ +X K9 ҽC0F0. b \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway new file mode 100644 index 0000000000..426c12e555 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway @@ -0,0 +1 @@ +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary new file mode 100644 index 0000000000..dd7df1c0fc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary @@ -0,0 +1 @@ +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley new file mode 100644 index 0000000000..b26e394526 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley @@ -0,0 +1 @@ +X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..786e4823022271a8f0bf311d4796b7daff8cd3b4 GIT binary patch literal 799 zcmZo-x*-wCEYZA@p|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuSX z1gf%RI6XNcXzrJyIYw@a78swNp}2bg#oQ+y4XhKq_Birph1X4ST-$du&C+l}p0D$p z7e90gwPl%1*Z*eYVq#`yVQFq+Xkv(v!Kbi`8NYml!qG=k8&7^?(rrAvDbB>~biM5N z`e{My?1Tjl^(D#PsP1c$Q2>`0G~aL_^oMZ%1h4AD^ATTE-lt8$j{Gls;+Hf zYhqXkaz8`2dyDU+M*YLQ@?0mk{r=ouac0-t9fn#r*(X#=p>%z#gGs^wN6W(Le7FyEylEF+Q3a zU}eXadG4Rf+gU$ue13XQ*qwuEAwv@|`nozE-!0+%IQ4JPZC#sPu|=oSIrqy>5t9B~ z(!sceKR+hIp<>pFs5cwC%Y>9Bs;~48Uh=4oDKEG8m)RZ%ZP9Sv8B2MagYGX-x%4yP z-N`MxlP>*j&A%hPWVK#&k<7sbWoGH@KufH%)c2g*wnR5+@rnyt`MkxcMxy1ikDQlT z9q?G#9eGPL!l5N0`V*JzK`r0B)jSVHB4>V`6KND?SG)F!(k7MFW$Yar=Ul5X*qZgH zk)z;l)VGYuzL(gNOGW0+Yj|U_*gEb5f724iwBnMY%)E3a*QCml)MDl)Mkbbp%#KNo z&CE>AO^i)VEDTMooJ~wk;Dj{gVM(#x&sERuEu*%$vhQEnd@Vrvpwv`(9-}89d3-?( jl0Uv#icKT*i}`|>^#KVHdQ13P`1W}_%m4l1-f$ZLvR7Dr literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..558dfbcca80c1286824fab921cb0c4d4c6196851 GIT binary patch literal 872 zcmZo-xginBoY=CCp|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuT? z1*zI?utY~L>BIV4@mzjgVft0Vi+o-&ylb3T-L_+1gRsadM#jeG2up_3lOuxWekqz` zBp?BX3rC-4w^QeK*rA4JYLJI=^}GL#I$%mdSMeZ?-0h zl!Xy8%iP?(`$G)XMA^0-D!$BqJZzTVwv*XTcfB-&xE6XP=a-h06g%f<=1DTYAna}? zN#^IwEG*4U3{4CXGWaa-V#Y5Yp>Xt()W(zFm~!OYS#QWSF>*!7KEP*BBYtZdn(~tK^NLgRic5?23i9)FoT_V^*qRs?g51y0?cU-$ zsZswhuRPbuZNERaSDe{3cZZ?YP4)?u5_zl(30N(W!qx-~;0Mb^3}*-({$9L`p>%z`?`^bmkA4XLV<^iEh&36&JMfd5cqx zM9XC#IWMz1;IXhf@|I?VLt|Ls*2XOxvH) zpt)a)<`}sxT3~#7hT`h|7jvIn zlFTodniy|LI7#ehz9He=#N^@5$iSea#2_fpM1d=$7+T`r3W7-{N#^IwEG*4U3{4CX zGWeX{#f)D*LgDBmsf{PUG3hoQ-V|qIcDi2nd;PSab#}r6hx(FaZ&dp*vfhwuV&saD zeSpuNM*P+^H034d=M|^s6_*z473AmVI91m+u{AL)1i7D~+r7niQltK1UU{yQ+kSs; zuQ;=7?hZq(o9q)RCGuDo60lk#g{=t~I}etN7|swn{JnS=%bVD2`#)D#-3VZ7h-Rtg zP<33$BFVpifrE(;=*%B7&+_<#ZpAEVoNSR-D){&527|@yTMlQ4n;rYW2{dP8cG%Z9 zY~Ih-*sM-4eZQ`4bJ`i(BMYt;CfF7{MT=$b2!(lqGgo%(D*Auz<)O?|x2=P>eopv5 z^P|wsP45hjT=%-s%}!VeKjRW`jPs#9_aTB>Lb8Pv*2X@j9faGX2giw#VJ%X{2jpa2>&+?b9S zFaMx{f&kbUScQUEKuc|TcQkB7Q$;mXG-gvsHf3~9Z*^%{WqLz-MQTf9GjvBZYGE*I zMruzuae85CGB#RGP*p`rW<_~1HE(z|Ygj;Nimiov$Nw<=XkywM;(_!a#!_*&YO$As q|3KoETKI?=!;V~e6OSkdI=bOf$buz{L?EES$^Fu7n1Lpj{5}9%*=jNX literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Conway new file mode 100644 index 0000000000000000000000000000000000000000..9d1ce51c81a083d3d3747b94a91d699f4106dd15 GIT binary patch literal 899 zcmZo-yCD(DT+_0V;U*(fV^f5}JJG0fa~w1kN=|3}@0oM(!Rk+(=iH=;-hxNDOx%|4q^s9sy`MhFy*Eq4dZO6O@VUbmgLPVO#%-FbuA;Oa3 z^yG-3xnGLr7`ZK4V0?Op;_CeubDwlHuukyWHGckliXLp4#hZHJ04vmXze<+tr*w$oiN%^rM`CJj>$`x)rmeak52T zso>wI8w?h+Z#kSHZg%VgCouRoW`})!!{+^Ljm_!=)A#GzHm9AjJ+k0xVS;VJQ?%gc zj!>8*s|3Gd~L5-1N@i$aSw9-Ry*w@H2`^GcYim{Bxg4 zVF@htT4$;6Ik##yIqbW0{T zcbNh=GblLVNd_Fr68l*fHZd?XNit7wk`(R$qOUg@nHMuGVN5G7Day=CXL3!dEJ-b9 ZZenC&S;*{|#Ms!x*ud22<_b!9i2&Dufsg>*4pqm6Udj2T zB_+kq`I&i=%rBUjnORtxn;4oHB4qFx+{KJvK0@K>BdLuizcJ}H9^MpZVs^S-_Iv%b zpmlb_0*CsNWN%daFtXl|YhvVzkbQv9o<{uEG&JQU=jRot<`tI~>lNhZ=Qvf@HnBA^ zECjiqq1(O1cT%JNVP1KzliPlOZm&4AYwiw1t()uOdVYv zkMEXnew_L@=(euSuGpee>74szrwB=ZF6m(0!k-@#;UIHa(zy58BHxak3P)G(Y>#E# zRvEHl zaD3TT^=`j!MRR_1owVP~x=?x7t*rkAhiab5edK%ob%)UQqbGh9Ejao}Z~N_M`JY*u zmN2FjmlS2@r8BuERhFa{GdD3Zu`FbEOloXqW@>I?Y-(a*Xkz7TVrl}XyD1M#iuHc3 zdTwtSwZ)Zv|H|fT0m=uZrpogeJpsw%OU@wq;EigVkLvi)~i@8ra8dxWI?Q!JI3a^{uxVG0}Vp@|_v2A|?CX8iII3P&GFZ9MsnNw@LvrZ^L` z)Ah37>!$^+vlA9L)R!cCquPg&^@dy%BUgm%1AO*0;wek;l4_fYlNyY)uOz zWF9ORF`OZE_Uey&g!ALnzd^TkZFa>Lol582FFQp@ z`g2JK;}-t>mF1h1)|Jn`YP`A-eCT`~m&ASLLkvJmth3bjoZGfUH)-*T3tIWS#i>T3<+6{Q zmsuU~SlAtTOEbdZdV|Z|EpNB`n(Yua{QQ@xY-C^n00bKW1^@s6 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeShelley new file mode 100644 index 0000000000000000000000000000000000000000..d82b9fc7f4db2360746cc261fca05ba77e024882 GIT binary patch literal 5 McmZo>Y-C^r00bNX2LJ#7 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..cd6d53bc7927fe437916bd1d73399b30995390c8 GIT binary patch literal 6 NcmZo-Xku+-1^@;w0geCw literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..f5ea7bd0850ebee0cf8399477b2f3ebb4c627588 GIT binary patch literal 6 NcmZo-Xku+-1ONss0gM0u literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetGenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..e6ee8c45c445e9f45d46f9697246532688a4d27e GIT binary patch literal 6 NcmZo-Xku;T1^@;&0hRy& literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..4d00b4e9fac6402b2123d72fd8c9cc6d132da36e GIT binary patch literal 6 NcmZo-Xku+-000In0gC_t literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..b5217dc67a9654ad4719e1ad9251e626310e8af7 GIT binary patch literal 82 zcmZo-Xku+*y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kackslZU literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetProposedPParamsUpdates new file mode 100644 index 0000000000000000000000000000000000000000..62efc1c1eaa2112b0068c7c2356df99a1c88396a GIT binary patch literal 6 NcmZo-Xku+-0RRRs0gnIx literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..41aeabd30d52dad7c32a530bddd87ff3f2086e3e GIT binary patch literal 6 NcmZo-Xku+-1po#x0gwOy literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Byron new file mode 100644 index 0000000000000000000000000000000000000000..cfa4236d512052278add088e0bdc0291b8cb4f59 GIT binary patch literal 5 McmZo-XkuUh00b2Q1poj5 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..05f2ba977317862aed5a2c3181e704fba88c8675 GIT binary patch literal 6 NcmZo-Xku$*1^@;z0gnIx literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..915b078647dc32f66b9231a59874cb67c7e33057 GIT binary patch literal 6 NcmZo-Xku$*1ONsv0gV6v literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetGenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..70189500e98e7e5069cbd45266e9f84fa03d999c GIT binary patch literal 6 NcmZo-Xku&R1^@;*0ha&( literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..7337b0de4e05ef7684c1baf8c244a84e9726dc73 GIT binary patch literal 6 NcmZo-Xku$*000Iq0gM0u literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..b47684f4c36d20579ebf205c39c63dc8ae5b0f5f GIT binary patch literal 82 zcmZo-Xku$(y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kac;2#+P literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 0000000000000000000000000000000000000000..38afb2235421c3142d7dcae1c5e3e6853a78beb5 GIT binary patch literal 6 NcmZo-Xku$*0RRRv0gwOy literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..89ed187e31c950d4c8648d9723a5ae542e6c119c GIT binary patch literal 6 NcmZo-Xku$*1po#!0g(Uz literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_HardFork new file mode 100644 index 0000000000000000000000000000000000000000..64c266fdc583e5b469bd7bd1b6d6747616aa38f0 GIT binary patch literal 4 LcmZo-YGeQa0~7%U literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot new file mode 100644 index 0000000000..8576dd1663 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot @@ -0,0 +1 @@ +ShelleyEncoderUnsupportedQuery (SomeSecond GetBigLedgerPeerSnapshot) ShelleyNodeToClientVersion10 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..7338cd74165e275f099d161987a36d85731ed114 GIT binary patch literal 6 NcmZo-Xku<;1^@;q0gM0u literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..58e4767132c03722d57319642bb2b358b258da16 GIT binary patch literal 6 NcmZo-Xku<;1ONsm0g3U1^@;y0h9m$ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..c5b7ef04972567e830b9ffdb2b1f869d0391313f GIT binary patch literal 6 NcmZo-Xku<;000Ih0f_(r literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..72f3ff8f93a4c299c41025f94732a75d7aefac64 GIT binary patch literal 82 zcmZo-Xku<+y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kab^B)!f literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetProposedPParamsUpdates new file mode 100644 index 0000000000000000000000000000000000000000..b833d91e655614957dcc842965d20ade9d740a7d GIT binary patch literal 6 NcmZo-Xku<;0RRRm0gV6v literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..e63d41b76df54ba67176d302d70dfe571b2af40d GIT binary patch literal 6 NcmZo-Xku<;1po#r0geCw literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot new file mode 100644 index 0000000000..8576dd1663 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot @@ -0,0 +1 @@ +ShelleyEncoderUnsupportedQuery (SomeSecond GetBigLedgerPeerSnapshot) ShelleyNodeToClientVersion10 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..cafc5b72906ddd4c9ef0dd49a1b4bc6b8fbf7000 GIT binary patch literal 6 NcmZo-Xku(+1^@;k0g3O`T literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates new file mode 100644 index 0000000000..4918531195 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/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/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..9e750e26883f4da621d2d29754142e8e40dba30a GIT binary patch literal 63 tcmZpiA<4kNAjttF7#Ji{Zpbw;FrpES46H!81x*OyCI$u|Vvv}|3IMiK4g~-J literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates new file mode 100644 index 0000000000..4080e95c54 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/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/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeByron new file mode 100644 index 0000000000000000000000000000000000000000..070897ad04f6b56bc26e2d24a3de47ce5b565852 GIT binary patch literal 5 McmZo{W?*0d00fo+1poj5 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeShelley new file mode 100644 index 0000000000000000000000000000000000000000..61dee1376e428f9f6be1a1df74036a259c3abed8 GIT binary patch literal 15 WcmZo{mS&K+SJs%@z#z%|f(rmDO9co3 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..edc6f118879e20b92158ee19e3a1b8c86f2a5aca GIT binary patch literal 55 qcmZpi&cMJR$pIu77$j0|$TcxAA_#V%;DROuzlnhXh!`ZMu>t@_#S8NQ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ9GddYeB}0*aNF80_Eez0_`TSI8uvMDFuW3+ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_NonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..c47618c1704a42d99637d6e981fbe535f7ee04d8 GIT binary patch literal 139 zcmZo%+{7S}vM@qsnVY+Je~6))DBHF}#h2NSht2Zab~4-Pu9s#I7jqM16JvzTgXJQI zGlUL*FW$xSCN|st&(&2o0@xa&S*kfy9TxzVFyJ=@XvxOxu&-~}yq~SHS)E||eqGz< Rv@^Cx7F;b%uq}AX2>?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates new file mode 100644 index 0000000000..4080e95c54 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/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/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Byron new file mode 100644 index 0000000000000000000000000000000000000000..d66107b64e8efc78189421a6da827d6795795e62 GIT binary patch literal 138 zcmZqdW@u($VCZ9zl#Y;MkZWlG6OsxHl1zJ~85lSv{E8MZ02wSj>Xrc@2E&UhO9eoT zsLujb4h&q)(hST--BWxVfMQIFo09G}fFyM*J8Tsgniy_K1UCV>y@93vL15in)=B#s Sr2j*~{QnC;;3gwe!vX-}Un%DR literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..04416edc3001ff65d97814b507e465618d05bc91 GIT binary patch literal 145 zcmZpiA?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 0000000000..4080e95c54 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution new file mode 100644 index 0000000000..967baf0b47 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/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/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchByron new file mode 100644 index 0000000000000000000000000000000000000000..9735c28d23436ca90c123fd781e030a3bf8c2969 GIT binary patch literal 19 acmZo_VoVRtNX^Mft!!dQb*e1N&jSEQF$XjN literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchShelley new file mode 100644 index 0000000000000000000000000000000000000000..43f2fa8267f5b22ef6dd14c7a562e2fd1bab5ca0 GIT binary patch literal 19 acmZo_Vn}tWEXvPoVoVRtNX^Mftpor@n+G%i literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_HardFork new file mode 100644 index 0000000000000000000000000000000000000000..84885abaa8e259d4f17df3b0dc0a38159befc5e3 GIT binary patch literal 76 zcmbQ=+|0nh&@9a$aj&c~w}C;D`2|;tM2e(zL^Fd(BZEjYsuYkXIVEOM5(9%Iiw`$Q PA^U}91_`A`ApQ>kP&^fL literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..0240c52f6f4a5b9e9fb8311b565cb71ed695ca0b GIT binary patch literal 40 fcmZpi#K6EH$pIu77$j0|$TcxAq7jV@EI>H`r>zJY literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates new file mode 100644 index 0000000000..4918531195 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..b792678e2e46579b71c1ff88ab31eb9a6264bced GIT binary patch literal 40 fcmZpi#K6EH$pIu77$j0|$TcxAq7jV@Oh7pRr=?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates new file mode 100644 index 0000000000..4918531195 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/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/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley @@ -0,0 +1 @@ +* \ No newline at end of file From bf0b86974ef6bc82251d541f7d5679e3bace33ca Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Mon, 18 Nov 2024 12:53:16 +0000 Subject: [PATCH 05/15] use PatternSynonyms rather than coerces for ByronDlgId / ByronUpdate*Id --- .../Consensus/Byron/Ledger/Mempool.hs | 106 ++++++++++-------- .../Ouroboros/Consensus/ByronDual/Ledger.hs | 7 +- .../Test/Consensus/Byron/Examples.hs | 9 +- .../Test/Consensus/Byron/Generators.hs | 6 +- .../test/byron-test/Test/ThreadNet/Byron.hs | 2 +- 5 files changed, 74 insertions(+), 56 deletions(-) diff --git a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs index 8200ddf8c1..5bbbde6c61 100644 --- a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs +++ b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs @@ -6,7 +6,9 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE ViewPatterns #-} {-# OPTIONS_GHC -Wno-orphans #-} @@ -15,6 +17,10 @@ module Ouroboros.Consensus.Byron.Ledger.Mempool ( -- * Mempool integration GenTx (..) , TxId (..) + , pattern ByronTxId + , pattern ByronDlgId + , pattern ByronUpdateProposalId + , pattern ByronUpdateVoteId , Validated (..) -- * Transaction IDs , byronIdDlg @@ -35,6 +41,7 @@ module Ouroboros.Consensus.Byron.Ledger.Mempool ( , countByronGenTxs ) where +import Data.Coerce import qualified Cardano.Chain.Block as CC import qualified Cardano.Chain.Byron.API as CC import qualified Cardano.Chain.Delegation as Delegation @@ -44,15 +51,12 @@ import qualified Cardano.Chain.UTxO as Utxo import qualified Cardano.Chain.ValidationMode as CC import Cardano.Crypto (hashDecoded) import qualified Cardano.Crypto as CC -import Cardano.Ledger.Binary (ByteSpan, DecoderError (..), +import Cardano.Ledger.Binary (ByteSpan, byronProtVer, fromByronCBOR, serialize, slice, toByronCBOR, unsafeDeserialize) -import Cardano.Ledger.Binary.Plain (enforceSize) -import Cardano.Prelude (Natural, cborError) +import Cardano.Prelude (Natural) import Codec.CBOR.Decoding (Decoder) -import qualified Codec.CBOR.Decoding as CBOR import Codec.CBOR.Encoding (Encoding) -import qualified Codec.CBOR.Encoding as CBOR import Control.Monad (void) import Control.Monad.Except (Except, throwError) import Data.ByteString (ByteString) @@ -83,10 +87,10 @@ import Ouroboros.Consensus.Util.Condense -- This is effectively the same as 'CC.AMempoolPayload' but we cache the -- transaction ID (a hash). data instance GenTx ByronBlock - = ByronTx !Utxo.TxId !(Utxo.ATxAux ByteString) - | ByronDlg !Delegation.CertificateId !(Delegation.ACertificate ByteString) - | ByronUpdateProposal !Update.UpId !(Update.AProposal ByteString) - | ByronUpdateVote !Update.VoteId !(Update.AVote ByteString) + = ByronTx !(GenTxId ByronBlock) !(Utxo.ATxAux ByteString) + | ByronDlg !(GenTxId ByronBlock) !(Delegation.ACertificate ByteString) + | ByronUpdateProposal !(GenTxId ByronBlock) !(Update.AProposal ByteString) + | ByronUpdateVote !(GenTxId ByronBlock) !(Update.AVote ByteString) deriving (Eq, Generic) deriving NoThunks via InspectHeapNamed "GenTx ByronBlock" (GenTx ByronBlock) @@ -157,26 +161,47 @@ instance TxLimits ByronBlock where $ Utxo.TxValidationTxTooLarge txszNat maxTxSize data instance TxId (GenTx ByronBlock) - = ByronTxId !Utxo.TxId - | ByronDlgId !Delegation.CertificateId - | ByronUpdateProposalId !Update.UpId - | ByronUpdateVoteId !Update.VoteId + = ByronGenTxId !(CC.Hash (GenTx ByronBlock)) deriving (Eq, Ord) deriving NoThunks via InspectHeapNamed "TxId (GenTx ByronBlock)" (TxId (GenTx ByronBlock)) instance ShowProxy (TxId (GenTx ByronBlock)) where instance HasTxId (GenTx ByronBlock) where - txId (ByronTx i _) = ByronTxId i - txId (ByronDlg i _) = ByronDlgId i - txId (ByronUpdateProposal i _) = ByronUpdateProposalId i - txId (ByronUpdateVote i _) = ByronUpdateVoteId i + txId (ByronTx i _) = i + txId (ByronDlg i _) = i + txId (ByronUpdateProposal i _) = i + txId (ByronUpdateVote i _) = i instance ConvertRawTxId (GenTx ByronBlock) where - toRawTxIdHash (ByronTxId i) = CC.abstractHashToShort i - toRawTxIdHash (ByronDlgId i) = CC.abstractHashToShort i - toRawTxIdHash (ByronUpdateProposalId i) = CC.abstractHashToShort i - toRawTxIdHash (ByronUpdateVoteId i) = CC.abstractHashToShort i + toRawTxIdHash (ByronGenTxId i) = CC.abstractHashToShort i + +castAbstractHash :: CC.Hash a -> CC.Hash b +castAbstractHash = coerce + +pattern ByronTxId :: Utxo.TxId -> TxId (GenTx ByronBlock) +pattern ByronTxId i <- ByronGenTxId (castAbstractHash -> i) + where ByronTxId i = ByronGenTxId (castAbstractHash i) + +{-# COMPLETE ByronTxId #-} + +pattern ByronDlgId :: Delegation.CertificateId -> TxId (GenTx ByronBlock) +pattern ByronDlgId i <- ByronGenTxId (castAbstractHash -> i) + where ByronDlgId i = ByronGenTxId (castAbstractHash i) + +{-# COMPLETE ByronDlgId #-} + +pattern ByronUpdateProposalId :: Update.UpId -> TxId (GenTx ByronBlock) +pattern ByronUpdateProposalId i <- ByronGenTxId (castAbstractHash -> i) + where ByronUpdateProposalId i = ByronGenTxId (castAbstractHash i) + +{-# COMPLETE ByronUpdateProposalId #-} + +pattern ByronUpdateVoteId :: Update.VoteId -> TxId (GenTx ByronBlock) +pattern ByronUpdateVoteId i <- ByronGenTxId (castAbstractHash -> i) + where ByronUpdateVoteId i = ByronGenTxId (castAbstractHash i) + +{-# COMPLETE ByronUpdateVoteId #-} instance HasTxs ByronBlock where extractTxs blk = case byronBlockRaw blk of @@ -221,17 +246,17 @@ fromMempoolPayload = go -------------------------------------------------------------------------------} -- TODO: move to cardano-ledger-byron (cardano-ledger-byron#581) -byronIdTx :: Utxo.ATxAux ByteString -> Utxo.TxId -byronIdTx = hashDecoded . Utxo.aTaTx +byronIdTx :: Utxo.ATxAux ByteString -> GenTxId ByronBlock +byronIdTx = ByronTxId . hashDecoded . Utxo.aTaTx -byronIdDlg :: Delegation.ACertificate ByteString -> Delegation.CertificateId -byronIdDlg = Delegation.recoverCertificateId +byronIdDlg :: Delegation.ACertificate ByteString -> GenTxId ByronBlock +byronIdDlg = ByronDlgId . Delegation.recoverCertificateId -byronIdProp :: Update.AProposal ByteString -> Update.UpId -byronIdProp = Update.recoverUpId +byronIdProp :: Update.AProposal ByteString -> GenTxId ByronBlock +byronIdProp = ByronUpdateProposalId . Update.recoverUpId -byronIdVote :: Update.AVote ByteString -> Update.VoteId -byronIdVote = Update.recoverVoteId +byronIdVote :: Update.AVote ByteString -> GenTxId ByronBlock +byronIdVote = ByronUpdateVoteId . Update.recoverVoteId {------------------------------------------------------------------------------- Pretty-printing @@ -241,10 +266,7 @@ instance Condense (GenTx ByronBlock) where condense = condense . toMempoolPayload instance Condense (GenTxId ByronBlock) where - condense (ByronTxId i) = condense i - condense (ByronDlgId i) = condense i - condense (ByronUpdateProposalId i) = condense i - condense (ByronUpdateVoteId i) = condense i + condense (ByronGenTxId i) = show $ CC.abstractHashToShort i instance Show (GenTx ByronBlock) where show = condense @@ -313,24 +335,10 @@ decodeByronGenTx = fromMempoolPayload . canonicalise <$> fromByronCBOR mp' = unsafeDeserialize byronProtVer canonicalBytes encodeByronGenTxId :: GenTxId ByronBlock -> Encoding -encodeByronGenTxId genTxId = mconcat [ - CBOR.encodeListLen 2 - , case genTxId of - ByronTxId i -> toByronCBOR (0 :: Word8) <> toByronCBOR i - ByronDlgId i -> toByronCBOR (1 :: Word8) <> toByronCBOR i - ByronUpdateProposalId i -> toByronCBOR (2 :: Word8) <> toByronCBOR i - ByronUpdateVoteId i -> toByronCBOR (3 :: Word8) <> toByronCBOR i - ] +encodeByronGenTxId (ByronGenTxId i) = toByronCBOR i decodeByronGenTxId :: Decoder s (GenTxId ByronBlock) -decodeByronGenTxId = do - enforceSize "GenTxId (ByronBlock cfg)" 2 - CBOR.decodeWord8 >>= \case - 0 -> ByronTxId <$> fromByronCBOR - 1 -> ByronDlgId <$> fromByronCBOR - 2 -> ByronUpdateProposalId <$> fromByronCBOR - 3 -> ByronUpdateVoteId <$> fromByronCBOR - tag -> cborError $ DecoderErrorUnknownTag "GenTxId (ByronBlock cfg)" tag +decodeByronGenTxId = ByronGenTxId <$> fromByronCBOR encodeByronApplyTxError :: ApplyTxErr ByronBlock -> Encoding encodeByronApplyTxError = toByronCBOR diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs index 52778758b7..f6c847eec6 100644 --- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs +++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs @@ -24,6 +24,7 @@ module Ouroboros.Consensus.ByronDual.Ledger ( , forgeDualByronBlock ) where +import Data.Coerce import qualified Byron.Spec.Ledger.Core as Spec import qualified Byron.Spec.Ledger.UTxO as Spec import qualified Cardano.Chain.UTxO as Impl @@ -82,13 +83,17 @@ instance Monoid SpecToImplIds where -- | Construct singleton 'SpecToImplIds' for a transaction specToImplTx :: Spec.Tx -> Impl.ATxAux ByteString -> SpecToImplIds specToImplTx spec impl = SpecToImplIds $ Spec.Test.AbstractToConcreteIdMaps { - transactionIds = Map.singleton (specTxId spec) (byronIdTx impl) + transactionIds = + Map.singleton (specTxId spec) (byronGenTxIdToTxId $ byronIdTx impl) , proposalIds = Map.empty } where specTxId :: Spec.Tx -> Spec.TxId specTxId = Spec.txid . Spec.body + byronGenTxIdToTxId :: TxId (GenTx ByronBlock) -> Impl.TxId + byronGenTxIdToTxId (ByronGenTxId i) = coerce i + {------------------------------------------------------------------------------- Bridge -------------------------------------------------------------------------------} diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs index 9626d98aa9..62ea18fbad 100644 --- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs +++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs @@ -23,9 +23,11 @@ module Test.Consensus.Byron.Examples ( , examples ) where +import Data.Coerce import qualified Cardano.Chain.Block as CC.Block import qualified Cardano.Chain.Byron.API as CC import qualified Cardano.Chain.Common as CC +import qualified Cardano.Crypto.Hashing as Crypto import qualified Cardano.Chain.Update.Validation.Interface as CC.UPI import qualified Cardano.Chain.UTxO as CC import Control.Monad.Except (runExcept) @@ -202,11 +204,14 @@ exampleExtLedgerState = ExtLedgerState { exampleHeaderHash :: ByronHash exampleHeaderHash = blockHash exampleBlock +exampleTxId :: Crypto.Hash (GenTx ByronBlock) +exampleTxId = coerce CC.exampleTxId + exampleGenTx :: GenTx ByronBlock -exampleGenTx = ByronTx CC.exampleTxId (CC.annotateTxAux CC.exampleTxAux) +exampleGenTx = ByronTx exampleGenTxId (CC.annotateTxAux CC.exampleTxAux) exampleGenTxId :: TxId (GenTx ByronBlock) -exampleGenTxId = ByronTxId CC.exampleTxId +exampleGenTxId = ByronGenTxId exampleTxId exampleUPIState :: CC.UPI.State exampleUPIState = CC.UPI.initialState ledgerConfig diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs index ee39d62924..6e5a098b21 100644 --- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs +++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Generators.hs @@ -137,10 +137,10 @@ instance Arbitrary (GenTx ByronBlock) where instance Arbitrary (GenTxId ByronBlock) where arbitrary = oneof - [ ByronTxId <$> hedgehog CC.genTxId - , ByronDlgId <$> hedgehog genCertificateId + [ ByronTxId <$> hedgehog CC.genTxId + , ByronDlgId <$> hedgehog genCertificateId , ByronUpdateProposalId <$> hedgehog (UG.genUpId protocolMagicId) - , ByronUpdateVoteId <$> hedgehog genUpdateVoteId + , ByronUpdateVoteId <$> hedgehog genUpdateVoteId ] where genCertificateId = CC.genAbstractHash (CC.genCertificate protocolMagicId) diff --git a/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs b/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs index fb50268583..a4ad3ef251 100644 --- a/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs +++ b/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs @@ -1365,4 +1365,4 @@ dlgTx cert = reAnnotate byronProtVer (Delegation.aEpoch cert) , Delegation.annotation = ann } - in Byron.ByronDlg (Delegation.recoverCertificateId cert') cert' + in Byron.ByronDlg (Byron.ByronGenTxId $ coerce $ Delegation.recoverCertificateId cert') cert' From c053a8d2c65f2f4189ad84e3cc1e6befc764717a Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Mon, 18 Nov 2024 12:55:14 +0000 Subject: [PATCH 06/15] stylish --- .../byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs | 11 +++++------ .../Ouroboros/Consensus/ByronDual/Ledger.hs | 2 +- .../Test/Consensus/Byron/Examples.hs | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs index 5bbbde6c61..1241a6f31b 100644 --- a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs +++ b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Mempool.hs @@ -17,11 +17,11 @@ module Ouroboros.Consensus.Byron.Ledger.Mempool ( -- * Mempool integration GenTx (..) , TxId (..) - , pattern ByronTxId + , Validated (..) , pattern ByronDlgId + , pattern ByronTxId , pattern ByronUpdateProposalId , pattern ByronUpdateVoteId - , Validated (..) -- * Transaction IDs , byronIdDlg , byronIdProp @@ -41,7 +41,6 @@ module Ouroboros.Consensus.Byron.Ledger.Mempool ( , countByronGenTxs ) where -import Data.Coerce import qualified Cardano.Chain.Block as CC import qualified Cardano.Chain.Byron.API as CC import qualified Cardano.Chain.Delegation as Delegation @@ -51,9 +50,8 @@ import qualified Cardano.Chain.UTxO as Utxo import qualified Cardano.Chain.ValidationMode as CC import Cardano.Crypto (hashDecoded) import qualified Cardano.Crypto as CC -import Cardano.Ledger.Binary (ByteSpan, - byronProtVer, fromByronCBOR, serialize, slice, toByronCBOR, - unsafeDeserialize) +import Cardano.Ledger.Binary (ByteSpan, byronProtVer, fromByronCBOR, + serialize, slice, toByronCBOR, unsafeDeserialize) import Cardano.Prelude (Natural) import Codec.CBOR.Decoding (Decoder) import Codec.CBOR.Encoding (Encoding) @@ -62,6 +60,7 @@ import Control.Monad.Except (Except, throwError) import Data.ByteString (ByteString) import qualified Data.ByteString as Strict import qualified Data.ByteString.Lazy as Lazy +import Data.Coerce import Data.Maybe (maybeToList) import Data.Word import GHC.Generics (Generic) diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs index f6c847eec6..497f9c5516 100644 --- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs +++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Ouroboros/Consensus/ByronDual/Ledger.hs @@ -24,13 +24,13 @@ module Ouroboros.Consensus.ByronDual.Ledger ( , forgeDualByronBlock ) where -import Data.Coerce import qualified Byron.Spec.Ledger.Core as Spec import qualified Byron.Spec.Ledger.UTxO as Spec import qualified Cardano.Chain.UTxO as Impl import Cardano.Crypto.DSIGN.Class import Codec.Serialise import Data.ByteString (ByteString) +import Data.Coerce import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map import qualified Data.Set as Set diff --git a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs index 62ea18fbad..cce9ce7a4d 100644 --- a/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs +++ b/ouroboros-consensus-cardano/src/unstable-byron-testlib/Test/Consensus/Byron/Examples.hs @@ -23,14 +23,14 @@ module Test.Consensus.Byron.Examples ( , examples ) where -import Data.Coerce import qualified Cardano.Chain.Block as CC.Block import qualified Cardano.Chain.Byron.API as CC import qualified Cardano.Chain.Common as CC -import qualified Cardano.Crypto.Hashing as Crypto import qualified Cardano.Chain.Update.Validation.Interface as CC.UPI import qualified Cardano.Chain.UTxO as CC +import qualified Cardano.Crypto.Hashing as Crypto import Control.Monad.Except (runExcept) +import Data.Coerce import qualified Data.Map.Strict as Map import Ouroboros.Consensus.Block import Ouroboros.Consensus.Byron.Crypto.DSIGN (SignKeyDSIGN (..)) From c4ba4c6dc97b4c7af2be03a98b8440b6c974a194 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Wed, 20 Nov 2024 14:30:53 +0000 Subject: [PATCH 07/15] add source-repository-package for ouroboros-network-api branch --- cabal.project | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cabal.project b/cabal.project index 5bc613b1a8..25f95e93ee 100644 --- a/cabal.project +++ b/cabal.project @@ -47,3 +47,10 @@ if(os(windows)) -- https://github.com/ulidtko/cabal-doctest/issues/85 constraints: Cabal < 3.13 + +source-repository-package + type: git + location: https://github.com/input-output-hk/ouroboros-network + -- branch: fraser-iohk/one-era-gen-tx-id-protocol-version-bump + tag: 5bbd1696304d82968c3055dfcf2380ee66bb56a0 + subdir: ouroboros-network-api From 21b5d07ac7db9a42dafe4796fccc64cf348082cb Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Thu, 21 Nov 2024 01:16:42 +0000 Subject: [PATCH 08/15] update golden tests for new Byron GenTxId serialization --- .../golden/byron/ByronNodeToNodeVersion2/GenTxId | Bin 36 -> 34 bytes .../ByronNodeToClientVersion1/GenTxId | Bin 36 -> 34 bytes .../ByronNodeToClientVersion1/GenTxId | Bin 36 -> 34 bytes .../CardanoNodeToNodeVersion2/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion7/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion10/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion11/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion12/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion13/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion14/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion15/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion7/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion8/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToClientVersion9/GenTxId_Byron | Bin 38 -> 36 bytes 14 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ouroboros-consensus-cardano/golden/byron/ByronNodeToNodeVersion2/GenTxId b/ouroboros-consensus-cardano/golden/byron/ByronNodeToNodeVersion2/GenTxId index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..a0a1e937dc2224da28baf00f275c440a361a0567 100644 GIT binary patch delta 5 McmY#Un#iOC00SBT`~Uy| delta 7 OcmY#VVQONSpacK~Apv~= diff --git a/ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId b/ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..a0a1e937dc2224da28baf00f275c440a361a0567 100644 GIT binary patch delta 5 McmY#Un#iOC00SBT`~Uy| delta 7 OcmY#VVQONSpacK~Apv~= diff --git a/ouroboros-consensus-cardano/golden/byron/QueryVersion2/ByronNodeToClientVersion1/GenTxId b/ouroboros-consensus-cardano/golden/byron/QueryVersion2/ByronNodeToClientVersion1/GenTxId index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..a0a1e937dc2224da28baf00f275c440a361a0567 100644 GIT binary patch delta 5 McmY#Un#iOC00SBT`~Uy| delta 7 OcmY#VVQONSpacK~Apv~= diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..9511ba87eeb0d0a7d5874a268a5f165cb478ea62 100644 GIT binary patch delta 5 McmY#WnaHF900S-o0ssI2 delta 7 OcmY#UV`^fUpaK8|JpqFN From 299eb3e98196239953854cfa1cdb7d8843ff3677 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Tue, 26 Nov 2024 12:23:17 +0000 Subject: [PATCH 09/15] use Shelley for blessedGenTxIdDecodeEra for CardanoShelleyEras --- .../Ouroboros/Consensus/Cardano/Node.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs index c000b893dd..9c028bd846 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs @@ -133,7 +133,7 @@ import Ouroboros.Consensus.Util.IOLike instance SerialiseConstraintsHFC ByronBlock instance HasBlessedGenTxIdDecodeEra (CardanoShelleyEras c) where - blessedGenTxIdDecodeEra = S $ S $ S $ S $ Z mempty + blessedGenTxIdDecodeEra = Z mempty instance HasBlessedGenTxIdDecodeEra (CardanoEras c) where blessedGenTxIdDecodeEra = S blessedGenTxIdDecodeEra From 9ab01702bdee6d6f884b53667688680d81ec9ae4 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Tue, 26 Nov 2024 13:21:00 +0000 Subject: [PATCH 10/15] OneEraGenTxId { NS WrapGenTxId xs -> ShortByteString } --- .../ouroboros-consensus-cardano.cabal | 1 + .../Ouroboros/Consensus/Cardano/Block.hs | 55 ++------------ .../Ouroboros/Consensus/Cardano/ByronHFC.hs | 4 +- .../Ouroboros/Consensus/Cardano/Node.hs | 11 ++- .../Ouroboros/Consensus/Shelley/ShelleyHFC.hs | 4 +- .../Test/Consensus/Cardano/Examples.hs | 2 +- .../Test/Consensus/Cardano/Generators.hs | 14 +++- .../ThreadNet/Infra/ShelleyBasedHardFork.hs | 4 +- .../Consensus/Cardano/ByronCompatibility.hs | 13 +++- .../Test/Consensus/HardFork/Combinator.hs | 4 +- .../HardFork/Combinator/AcrossEras.hs | 29 +------- .../Consensus/HardFork/Combinator/Condense.hs | 2 +- .../HardFork/Combinator/Degenerate.hs | 10 --- .../HardFork/Combinator/Embed/Nary.hs | 5 +- .../HardFork/Combinator/Embed/Unary.hs | 4 - .../Consensus/HardFork/Combinator/Mempool.hs | 5 +- .../HardFork/Combinator/Serialisation.hs | 2 +- .../Combinator/Serialisation/Common.hs | 11 +-- .../Serialisation/SerialiseNodeToClient.hs | 73 +++++++++++-------- .../Serialisation/SerialiseNodeToNode.hs | 44 ++++++----- .../Consensus/Ledger/SupportsMempool.hs | 2 + 21 files changed, 131 insertions(+), 168 deletions(-) diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index df32ce0c7f..7164c59b70 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -435,6 +435,7 @@ test-suite cardano-test base16-bytestring, bytestring, cardano-crypto-class, + cardano-crypto-wrapper, cardano-ledger-alonzo, cardano-ledger-alonzo-test, cardano-ledger-api, diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs index ac41aafe2f..73bf584ddf 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs @@ -29,7 +29,7 @@ module Ouroboros.Consensus.Cardano.Block ( , CardanoGenTxId , 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) + , TxId (CardanoGenTxId) -- * LedgerError , CardanoLedgerError , HardForkLedgerError (LedgerErrorAllegra, LedgerErrorAlonzo, LedgerErrorByron, LedgerErrorMary, LedgerErrorShelley, LedgerErrorWrongEra, LedgerErrorBabbage, LedgerErrorConway) @@ -69,6 +69,7 @@ module Ouroboros.Consensus.Cardano.Block ( , EraMismatch (..) ) where +import Data.ByteString.Short (ShortByteString) import Data.Kind import Data.SOP.BasicFunctors import Data.SOP.Strict @@ -349,54 +350,10 @@ pattern GenTxConway tx = HardForkGenTx (OneEraGenTx (TagConway tx)) -- | The ID of a Cardano transaction. type CardanoGenTxId c = GenTxId (CardanoBlock c) -pattern GenTxIdByron :: GenTxId ByronBlock -> CardanoGenTxId c -pattern GenTxIdByron txid = - HardForkGenTxId (OneEraGenTxId (TagByron (WrapGenTxId txid))) - -pattern GenTxIdShelley :: - GenTxId (ShelleyBlock (TPraos c) (ShelleyEra c)) - -> CardanoGenTxId c -pattern GenTxIdShelley txid = - HardForkGenTxId (OneEraGenTxId (TagShelley (WrapGenTxId txid))) - -pattern GenTxIdAllegra :: - GenTxId (ShelleyBlock (TPraos c) (AllegraEra c)) - -> CardanoGenTxId c -pattern GenTxIdAllegra txid = - HardForkGenTxId (OneEraGenTxId (TagAllegra (WrapGenTxId txid))) - -pattern GenTxIdMary :: - GenTxId (ShelleyBlock (TPraos c) (MaryEra c)) - -> CardanoGenTxId c -pattern GenTxIdMary txid = - HardForkGenTxId (OneEraGenTxId (TagMary (WrapGenTxId txid))) - -pattern GenTxIdAlonzo :: - GenTxId (ShelleyBlock (TPraos c) (AlonzoEra c)) - -> CardanoGenTxId c -pattern GenTxIdAlonzo txid = - HardForkGenTxId (OneEraGenTxId (TagAlonzo (WrapGenTxId txid))) - -pattern GenTxIdBabbage :: - GenTxId (ShelleyBlock (Praos c) (BabbageEra c)) - -> CardanoGenTxId c -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 - , GenTxIdConway - #-} +pattern CardanoGenTxId :: ShortByteString -> CardanoGenTxId c +pattern CardanoGenTxId txid = HardForkGenTxId (OneEraGenTxId txid) + +{-# COMPLETE CardanoGenTxId #-} -- | An error resulting from applying a 'CardanoGenTx' to the ledger. -- diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs index 94058f106d..d61af2adb0 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs @@ -61,8 +61,8 @@ instance SupportedNetworkProtocolVersion ByronBlockHFC where SerialiseHFC instance -------------------------------------------------------------------------------} -instance HasBlessedGenTxIdDecodeEra '[ByronBlock] where - blessedGenTxIdDecodeEra = Z mempty +instance HasBlessedGenTxIdEra '[ByronBlock] where + blessedGenTxIdEra = Z mempty -- | Forward to the ByronBlock instance, this means we don't add an era -- wrapper around blocks on disk. This makes sure we're compatible with the diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs index 9c028bd846..936a7317f7 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs @@ -132,11 +132,11 @@ import Ouroboros.Consensus.Util.IOLike instance SerialiseConstraintsHFC ByronBlock -instance HasBlessedGenTxIdDecodeEra (CardanoShelleyEras c) where - blessedGenTxIdDecodeEra = Z mempty +instance HasBlessedGenTxIdEra (CardanoShelleyEras c) where + blessedGenTxIdEra = Z mempty -instance HasBlessedGenTxIdDecodeEra (CardanoEras c) where - blessedGenTxIdDecodeEra = S blessedGenTxIdDecodeEra +instance HasBlessedGenTxIdEra (CardanoEras c) where + blessedGenTxIdEra = S blessedGenTxIdEra -- | Important: we need to maintain binary compatibility with Byron blocks, as -- they are already stored on disk. @@ -567,10 +567,9 @@ instance CardanoHardForkConstraints c , (NodeToClientV_17, CardanoNodeToClientVersion13) , (NodeToClientV_18, CardanoNodeToClientVersion14) , (NodeToClientV_19, CardanoNodeToClientVersion15) - , (NodeToClientV_20, CardanoNodeToClientVersion16) ] - latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_20) + latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_19) {------------------------------------------------------------------------------- ProtocolInfo diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs index 83a57b8cb3..bc227ae690 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs @@ -116,8 +116,8 @@ instance ( ShelleyCompatible proto era SerialiseHFC instance -------------------------------------------------------------------------------} -instance HasBlessedGenTxIdDecodeEra '[ShelleyBlock proto era] where - blessedGenTxIdDecodeEra = Z mempty +instance HasBlessedGenTxIdEra '[ShelleyBlock proto era] where + blessedGenTxIdEra = Z mempty -- | Use the default implementations. This means the serialisation of blocks -- includes an era wrapper. Each block should do this from the start to be diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Examples.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Examples.hs index 95038ff6cf..9212e8e2eb 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Examples.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Examples.hs @@ -119,7 +119,7 @@ instance Inject Examples where , exampleSerialisedHeader = inj (Proxy @SerialisedHeader) exampleSerialisedHeader , exampleHeaderHash = inj (Proxy @WrapHeaderHash) exampleHeaderHash , exampleGenTx = inj (Proxy @GenTx) exampleGenTx - , exampleGenTxId = inj (Proxy @WrapGenTxId) exampleGenTxId + , exampleGenTxId = inj (Proxy @WrapGenTxId) exampleGenTxId , exampleApplyTxErr = inj (Proxy @WrapApplyTxErr) exampleApplyTxErr , exampleQuery = inj (Proxy @(SomeSecond BlockQuery)) exampleQuery , exampleResult = inj (Proxy @SomeResult) exampleResult diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs index 20d68ca794..0252c1680c 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs @@ -39,6 +39,7 @@ import Ouroboros.Consensus.HardFork.Combinator import Ouroboros.Consensus.HardFork.Combinator.Serialisation import qualified Ouroboros.Consensus.HardFork.History as History import Ouroboros.Consensus.HeaderValidation +import Ouroboros.Consensus.Ledger.SupportsMempool (ConvertRawTxId(..)) import Ouroboros.Consensus.Node.NetworkProtocolVersion import Ouroboros.Consensus.Node.Serialisation (Some (..)) import Ouroboros.Consensus.Protocol.TPraos (TPraos) @@ -256,7 +257,11 @@ instance c ~ MockCryptoCompatByron instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToNodeVersion (CardanoEras c)) (CardanoGenTxId c)) where - arbitrary = arbitraryNodeToNode GenTxIdByron GenTxIdShelley GenTxIdAllegra GenTxIdMary GenTxIdAlonzo GenTxIdBabbage GenTxIdConway + arbitrary = do + let fromByronGenTxId :: TxId (GenTx ByronBlock) -> CardanoGenTxId c + fromByronGenTxId = HardForkGenTxId . OneEraGenTxId . toRawTxIdHash + arbitraryNodeToNode fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId + {------------------------------------------------------------------------------- NodeToClient @@ -463,8 +468,11 @@ instance c ~ MockCryptoCompatByron instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) - (CardanoGenTxId c)) where - arbitrary = arbitraryNodeToClient GenTxIdByron GenTxIdShelley GenTxIdAllegra GenTxIdMary GenTxIdAlonzo GenTxIdBabbage GenTxIdConway + (CardanoGenTxId c)) where + arbitrary = do + let fromByronGenTxId :: TxId (GenTx ByronBlock) -> CardanoGenTxId c + fromByronGenTxId = HardForkGenTxId . OneEraGenTxId . toRawTxIdHash + arbitraryNodeToClient fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId fromByronGenTxId instance c ~ MockCryptoCompatByron => Arbitrary (WithVersion (HardForkNodeToClientVersion (CardanoEras c)) diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs index a5594c146d..6d56fb2b7a 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs @@ -163,8 +163,8 @@ instance TranslateTxMeasure AlonzoMeasure ConwayMeasure where instance TranslateTxMeasure ConwayMeasure ConwayMeasure where translateTxMeasure = id -instance HasBlessedGenTxIdDecodeEra (ShelleyBasedHardForkEras proto1 era1 proto2 era2) where - blessedGenTxIdDecodeEra = S $ Z mempty +instance HasBlessedGenTxIdEra (ShelleyBasedHardForkEras proto1 era1 proto2 era2) where + blessedGenTxIdEra = S $ Z mempty instance ShelleyBasedHardForkConstraints proto1 era1 proto2 era2 => SerialiseHFC (ShelleyBasedHardForkEras proto1 era1 proto2 era2) diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs index 437670c1f4..29e13e8026 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs @@ -19,6 +19,7 @@ -- existing roundtrip test functions. module Test.Consensus.Cardano.ByronCompatibility (tests) where +import qualified Cardano.Crypto.Hashing as CC import qualified Cardano.Chain.Byron.API as CC import Codec.CBOR.Decoding (Decoder) import Codec.CBOR.Encoding (Encoding) @@ -180,6 +181,10 @@ instance ShowQuery (BlockQuery ByronToCardano) where instance SameDepIndex (BlockQuery ByronToCardano) where sameDepIndex (QueryB2C q1) (QueryB2C q2) = sameDepIndex q1 q2 +cardanoGenTxIdToByron :: TxId (GenTx (CardanoBlock Crypto)) -> TxId (GenTx ByronToCardano) +cardanoGenTxIdToByron txid = + GenTxIdB2C $ ByronGenTxId $ CC.unsafeAbstractHashFromShort $ toRawTxIdHash txid + {------------------------------------------------------------------------------ Byron to Cardano: Disk ------------------------------------------------------------------------------} @@ -295,7 +300,7 @@ instance SerialiseNodeToNode ByronToCardano (GenTx ByronToCardano) where instance SerialiseNodeToNode ByronToCardano (GenTxId ByronToCardano) where encodeNodeToNode = encodeNodeToNodeB2C (Proxy @WrapGenTxId) unGenTxIdB2C - decodeNodeToNode = decodeNodeToNodeB2C (Proxy @WrapGenTxId) (\(GenTxIdByron txid) -> GenTxIdB2C txid) + decodeNodeToNode = decodeNodeToNodeB2C (Proxy @WrapGenTxId) cardanoGenTxIdToByron instance SerialiseNodeToNodeConstraints ByronToCardano where estimateBlockSize = estimateBlockSize . unHeaderB2C @@ -371,7 +376,7 @@ instance SerialiseNodeToClient ByronToCardano (GenTx ByronToCardano) where instance SerialiseNodeToClient ByronToCardano (GenTxId ByronToCardano) where encodeNodeToClient = encodeNodeToClientB2C (Proxy @WrapGenTxId) unGenTxIdB2C - decodeNodeToClient = decodeNodeToClientB2C (Proxy @WrapGenTxId) (\(GenTxIdByron txid) -> GenTxIdB2C txid) + decodeNodeToClient = decodeNodeToClientB2C (Proxy @WrapGenTxId) cardanoGenTxIdToByron instance SerialiseNodeToClient ByronToCardano SlotNo @@ -600,7 +605,7 @@ instance SerialiseNodeToNode CardanoToByron (GenTx CardanoToByron) where decodeNodeToNode = decodeNodeToNodeC2B (Proxy @GenTx) GenTxC2B instance SerialiseNodeToNode CardanoToByron (GenTxId CardanoToByron) where - encodeNodeToNode = encodeNodeToNodeC2B (Proxy @WrapGenTxId) (GenTxIdByron . unGenTxIdC2B) + encodeNodeToNode = encodeNodeToNodeC2B (Proxy @WrapGenTxId) (CardanoGenTxId . toRawTxIdHash . unGenTxIdC2B) decodeNodeToNode = decodeNodeToNodeC2B (Proxy @WrapGenTxId) GenTxIdC2B instance SerialiseNodeToNodeConstraints CardanoToByron where @@ -660,7 +665,7 @@ instance SerialiseNodeToClient CardanoToByron (GenTx CardanoToByron) where decodeNodeToClient = decodeNodeToClientC2B (Proxy @GenTx) GenTxC2B instance SerialiseNodeToClient CardanoToByron (GenTxId CardanoToByron) where - encodeNodeToClient = encodeNodeToClientC2B (Proxy @WrapGenTxId) (GenTxIdByron . unGenTxIdC2B) + encodeNodeToClient = encodeNodeToClientC2B (Proxy @WrapGenTxId) (CardanoGenTxId . toRawTxIdHash . unGenTxIdC2B) decodeNodeToClient = decodeNodeToClientC2B (Proxy @WrapGenTxId) GenTxIdC2B instance SerialiseNodeToClient CardanoToByron SlotNo diff --git a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs index 849be590c0..b03dd950da 100644 --- a/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs +++ b/ouroboros-consensus-diffusion/test/consensus-test/Test/Consensus/HardFork/Combinator.hs @@ -362,8 +362,8 @@ instance TxGen TestBlock where type TestBlock = HardForkBlock '[BlockA, BlockB] -instance HasBlessedGenTxIdDecodeEra '[BlockA, BlockB] where - blessedGenTxIdDecodeEra = Z mempty +instance HasBlessedGenTxIdEra '[BlockA, BlockB] where + blessedGenTxIdEra = Z mempty instance CanHardFork '[BlockA, BlockB] where type HardForkTxMeasure '[BlockA, BlockB] = IgnoringOverflow ByteSize32 diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs index 3264308fb0..5abdddd207 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs @@ -124,7 +124,8 @@ newtype OneEraEnvelopeErr xs = OneEraEnvelopeErr { getOneEra newtype OneEraForgeStateInfo xs = OneEraForgeStateInfo { getOneEraForgeStateInfo :: NS WrapForgeStateInfo xs } newtype OneEraForgeStateUpdateError xs = OneEraForgeStateUpdateError { getOneEraForgeStateUpdateError :: NS WrapForgeStateUpdateError xs } newtype OneEraGenTx xs = OneEraGenTx { getOneEraGenTx :: NS GenTx xs } -newtype OneEraGenTxId xs = OneEraGenTxId { getOneEraGenTxId :: NS WrapGenTxId xs } +newtype OneEraGenTxId xs = OneEraGenTxId { getOneEraGenTxId :: ShortByteString } + deriving (Show, Eq, Ord, Generic, NoThunks) newtype OneEraHeader xs = OneEraHeader { getOneEraHeader :: NS Header xs } newtype OneEraIsLeader xs = OneEraIsLeader { getOneEraIsLeader :: NS WrapIsLeader xs } newtype OneEraLedgerError xs = OneEraLedgerError { getOneEraLedgerError :: NS WrapLedgerErr xs } @@ -159,23 +160,6 @@ instance Show (OneEraHash xs) where instance Condense (OneEraHash xs) where condense = show -{------------------------------------------------------------------------------- - OneEraGenTxId --------------------------------------------------------------------------------} - --- | This instance compares the underlying raw hash ('toRawTxIdHash') of the --- 'TxId'. --- --- Note that this means that transactions in different eras can have equal --- 'TxId's. This should only be the case when the transaction format is --- backwards compatible from one era to the next. -instance CanHardFork xs => Eq (OneEraGenTxId xs) where - (==) = (==) `on` oneEraGenTxIdRawHash - --- | See the corresponding 'Eq' instance. -instance CanHardFork xs => Ord (OneEraGenTxId xs) where - compare = compare `on` oneEraGenTxIdRawHash - {------------------------------------------------------------------------------- Value for two /different/ eras -------------------------------------------------------------------------------} @@ -266,10 +250,7 @@ getSameValue values = = throwError "differing values across hard fork" oneEraGenTxIdRawHash :: CanHardFork xs => OneEraGenTxId xs -> ShortByteString -oneEraGenTxIdRawHash = - hcollapse - . hcmap proxySingle (K . toRawTxIdHash . unwrapGenTxId) - . getOneEraGenTxId +oneEraGenTxIdRawHash = getOneEraGenTxId {------------------------------------------------------------------------------- NoThunks instances @@ -296,9 +277,6 @@ deriving via LiftNamedNS "OneEraEnvelopeErr" WrapEnvelopeErr xs deriving via LiftNamedNS "OneEraGenTx" GenTx xs instance CanHardFork xs => NoThunks (OneEraGenTx xs) -deriving via LiftNamedNS "OneEraGenTxId" WrapGenTxId xs - instance CanHardFork xs => NoThunks (OneEraGenTxId xs) - deriving via LiftNamedNS "OneEraHeader" Header xs instance CanHardFork xs => NoThunks (OneEraHeader xs) @@ -361,6 +339,5 @@ deriving via LiftNS WrapApplyTxErr xs instance CanHardFork xs => Show (OneEraAp deriving via LiftNS I xs instance CanHardFork xs => Show (OneEraBlock xs) deriving via LiftNS WrapCannotForge xs instance CanHardFork xs => Show (OneEraCannotForge xs) deriving via LiftNS GenTx xs instance CanHardFork xs => Show (OneEraGenTx xs) -deriving via LiftNS WrapGenTxId xs instance CanHardFork xs => Show (OneEraGenTxId xs) deriving via LiftNS Header xs instance CanHardFork xs => Show (OneEraHeader xs) deriving via LiftNS WrapSelectView xs instance CanHardFork xs => Show (OneEraSelectView xs) diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs index afed7eafb5..380125f06e 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Condense.hs @@ -57,7 +57,7 @@ instance All CondenseConstraints xs => Condense (GenTx (HardForkBlock xs)) where condense = defaultCondenseNS (Proxy @GenTx) . coerce instance All CondenseConstraints xs => Condense (TxId (GenTx (HardForkBlock xs))) where - condense = defaultCondenseNS (Proxy @WrapGenTxId) . coerce + condense (HardForkGenTxId (OneEraGenTxId txid)) = show txid {------------------------------------------------------------------------------- Forwarding diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs index fcb70b8ed6..5b94c36e7a 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Degenerate.hs @@ -28,7 +28,6 @@ module Ouroboros.Consensus.HardFork.Combinator.Degenerate ( , LedgerState (DegenLedgerState) , OneEraTipInfo (DegenTipInfo) , TopLevelConfig (DegenTopLevelConfig) - , TxId (DegenGenTxId) ) where import Data.SOP.Strict @@ -61,7 +60,6 @@ import Ouroboros.Consensus.TypeFamilyWrappers {-# COMPLETE DegenBlockConfig #-} {-# COMPLETE DegenCodecConfig #-} {-# COMPLETE DegenGenTx #-} -{-# COMPLETE DegenGenTxId #-} {-# COMPLETE DegenHeader #-} {-# COMPLETE DegenLedgerError #-} {-# COMPLETE DegenLedgerState #-} @@ -94,14 +92,6 @@ pattern DegenGenTx x <- (project -> x) where DegenGenTx x = inject x -pattern DegenGenTxId :: - forall b. NoHardForks b - => GenTxId b - -> GenTxId (HardForkBlock '[b]) -pattern DegenGenTxId x <- (project' (Proxy @(WrapGenTxId b)) -> x) - where - DegenGenTxId x = inject' (Proxy @(WrapGenTxId b)) x - pattern DegenApplyTxErr :: forall b. NoHardForks b => ApplyTxErr b diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs index 6ed0df1002..227997d3d2 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs @@ -21,6 +21,7 @@ module Ouroboros.Consensus.HardFork.Combinator.Embed.Nary ( import Data.Bifunctor (first) import Data.Coerce (Coercible, coerce) +import Data.SOP (Compose) import Data.SOP.BasicFunctors import Data.SOP.Counting (Exactly (..)) import Data.SOP.Dict (Dict (..)) @@ -35,6 +36,7 @@ import qualified Ouroboros.Consensus.HardFork.History as History import Ouroboros.Consensus.HeaderValidation (AnnTip, HeaderState (..), genesisHeaderState) import Ouroboros.Consensus.Ledger.Extended (ExtLedgerState (..)) +import Ouroboros.Consensus.Ledger.SupportsMempool (ConvertRawTxId(..)) import Ouroboros.Consensus.Storage.Serialisation import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) @@ -135,7 +137,8 @@ instance Inject GenTx where inject _ = injectNS' (Proxy @GenTx) instance Inject WrapGenTxId where - inject _ = injectNS' (Proxy @WrapGenTxId) + inject _ ix w = WrapGenTxId $ HardForkGenTxId $ OneEraGenTxId $ + hcollapse $ hcmap proxySingle (K . toRawTxIdHash . unwrapGenTxId) $ injectNS ix w instance Inject WrapApplyTxErr where inject _ = diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs index d182dbb22e..c7ef619d16 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Unary.hs @@ -163,10 +163,6 @@ instance Isomorphic WrapIsLeader where project = defaultProjectNS inject = defaultInjectNS -instance Isomorphic WrapGenTxId where - project = defaultProjectNS - inject = defaultInjectNS - instance Isomorphic WrapValidatedGenTx where project = defaultProjectNS inject = defaultInjectNS diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs index a987cb7c32..f11e9d0592 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Mempool.hs @@ -323,9 +323,12 @@ instance Typeable xs => ShowProxy (TxId (GenTx (HardForkBlock xs))) where instance CanHardFork xs => HasTxId (GenTx (HardForkBlock xs)) where txId = HardForkGenTxId . OneEraGenTxId - . hcmap proxySingle (WrapGenTxId . txId) + . hcollapse . hcmap proxySingle (K . toRawTxIdHash . txId) . getOneEraGenTx . getHardForkGenTx +instance CanHardFork xs => ConvertRawTxId (GenTx (HardForkBlock xs)) where + toRawTxIdHash (HardForkGenTxId (OneEraGenTxId txid)) = txid + {------------------------------------------------------------------------------- HasTxs diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs index c80b73e06a..011dbd6e51 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation.hs @@ -7,7 +7,7 @@ import Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common as HardForkNodeToNodeVersion (..), HardForkSpecificNodeToClientVersion (..), HardForkSpecificNodeToNodeVersion (..), - HasBlessedGenTxIdDecodeEra (..), SerialiseConstraintsHFC, + HasBlessedGenTxIdEra (..), SerialiseConstraintsHFC, SerialiseHFC (..), isHardForkNodeToClientEnabled, isHardForkNodeToNodeEnabled) import Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseDisk as X () diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs index 3c39cdd3bf..43ee512abb 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs @@ -17,7 +17,7 @@ module Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common ( -- * Conditions required by the HFC to support serialisation HardForkEncoderException (..) - , HasBlessedGenTxIdDecodeEra (..) + , HasBlessedGenTxIdEra (..) , SerialiseConstraintsHFC , SerialiseHFC (..) , disabledEraException @@ -220,9 +220,10 @@ isHardForkNodeToClientEnabled _ = False -- absolutely horrible. should be HasLatestStableGenTxIdEra probably. --- especially nasty because it's -class HasBlessedGenTxIdDecodeEra (xs :: [Type]) where - blessedGenTxIdDecodeEra :: NS (K ()) xs +-- especially nasty because it's a K () rather than an equivalent (but +-- non-existent) 'Void :: (Type -> Type) -> Type' +class HasBlessedGenTxIdEra (xs :: [Type]) where + blessedGenTxIdEra :: NS (K ()) xs {------------------------------------------------------------------------------- Conditions required by the HFC to support serialisation @@ -264,7 +265,7 @@ pSHFC = Proxy -- This would then lead to problems with binary streaming, and we do not -- currently provide any provisions to resolve these. class ( CanHardFork xs - , HasBlessedGenTxIdDecodeEra xs + , HasBlessedGenTxIdEra xs , All SerialiseConstraintsHFC xs -- Required for HasNetworkProtocolVersion , All (Compose Show EraNodeToClientVersion) xs diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs index af2ccd1748..5e64cbaf48 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs @@ -47,6 +47,7 @@ import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) +import Data.ByteString.Short (ShortByteString) instance SerialiseHFC xs => SerialiseNodeToClientConstraints (HardForkBlock xs) @@ -166,41 +167,51 @@ instance SerialiseHFC xs instance SerialiseHFC xs => SerialiseNodeToClient (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where + -- This instance can be massively simplified after we drop support for + -- 'NodeToClientVersion's earlier than 'NodeToClientV_19', since we no longer + -- need to handle the cases where 'ShortByteString's are serialised with + -- an era tag ('encodeNS'). + encodeNodeToClient cc v (HardForkGenTxId (OneEraGenTxId txid)) = case v of HardForkNodeToClientEnabled hfv _ | hfv >= HardForkSpecificNodeToClientVersion4 -> - unK $ - hctraverse' - (Proxy :: Proxy SerialiseConstraintsHFC) - (K . Serialise.encode . toRawTxIdHash . unwrapGenTxId) - txid - _ -> - dispatchEncoder cc v txid + Serialise.encode txid + HardForkNodeToClientEnabled _ _ -> do + let blessedGenTxId :: NS (K ShortByteString) xs + blessedGenTxId = hmap (pure $ K txid) blessedGenTxIdEra + encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId + HardForkNodeToClientDisabled _ -> + Serialise.encode txid decodeNodeToClient cc v = - case v of - HardForkNodeToClientEnabled hfc vs - | hfc >= HardForkSpecificNodeToClientVersion4 -> do - let aux :: forall s blk . SerialiseConstraintsHFC blk - => CodecConfig blk - -> EraNodeToClientVersion blk - -> K () blk - -> (Decoder s :.: WrapGenTxId) blk - aux ecc vv _ = Comp $ case vv of - EraNodeToClientEnabled bv -> do - decodeNodeToClient ecc bv - EraNodeToClientDisabled -> - -- Is this sensible? What should the behaviour be when the - -- blessed GenTxId era is disabled by EraNodeToClientDisabled? - fail $ show $ disabledEraException (Proxy @blk) - fmap (HardForkGenTxId . OneEraGenTxId) $ - htraverse' unComp $ - hcliftA3 pSHFC - aux - (getPerEraCodecConfig (hardForkCodecConfigPerEra cc)) - vs - blessedGenTxIdDecodeEra - _ -> - fmap (HardForkGenTxId . OneEraGenTxId) $ dispatchDecoder cc v + fmap (HardForkGenTxId . OneEraGenTxId) $ + case v of + HardForkNodeToClientEnabled hfc vs + | hfc >= HardForkSpecificNodeToClientVersion4 -> do + Serialise.decode + -- let aux :: forall s blk . SerialiseConstraintsHFC blk + -- => CodecConfig blk + -- -> EraNodeToClientVersion blk + -- -> K () blk + -- -> (Decoder s :.: WrapGenTxId) blk + -- aux ecc vv _ = Comp $ case vv of + -- EraNodeToClientEnabled bv -> do + -- decodeNodeToClient ecc bv + -- EraNodeToClientDisabled -> + -- -- Is this sensible? What should the behaviour be when the + -- -- blessed GenTxId era is disabled by EraNodeToClientDisabled? + -- fail $ show $ disabledEraException (Proxy @blk) + -- htraverse' unComp $ + -- hcliftA3 pSHFC + -- aux + -- (getPerEraCodecConfig (hardForkCodecConfigPerEra cc)) + -- vs + -- blessedGenTxIdEra + HardForkNodeToClientEnabled _ _ ->do + let eraDecoders :: NP (Decoder s :.: K ShortByteString) xs + eraDecoders = hpure $ Comp $ K <$> Serialise.decode + hcollapse <$> decodeNS eraDecoders + HardForkNodeToClientDisabled _ -> + Serialise.decode instance SerialiseHFC xs => SerialiseNodeToClient (HardForkBlock xs) SlotNo where diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs index 3d39309810..2bbfd35ad2 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs @@ -38,6 +38,7 @@ import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) +import Data.ByteString.Short (ShortByteString) instance SerialiseHFC xs => SerialiseNodeToNodeConstraints (HardForkBlock xs) where estimateBlockSize = estimateHfcBlockSize @@ -138,26 +139,35 @@ instance SerialiseHFC xs encodeNodeToNode = dispatchEncoder `after` (getOneEraGenTx . getHardForkGenTx) decodeNodeToNode = fmap (HardForkGenTx . OneEraGenTx) .: dispatchDecoder + instance SerialiseHFC xs => SerialiseNodeToNode (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where + -- This instance can be massively simplified after we drop support for + -- 'NodeToNodeVersion's earlier than 'NodeToNodeV_15', since we no longer + -- need to handle the cases where 'ShortByteString's are serialised with + -- an era tag ('encodeNS'). + encodeNodeToNode cc v (HardForkGenTxId (OneEraGenTxId txid)) = do case v of HardForkNodeToNodeEnabled hfv _ | hfv >= HardForkSpecificNodeToNodeVersion2 -> - hcollapse $ - hcmap - pSHFC - (K . Serialise.encode . toRawTxIdHash . unwrapGenTxId) - txid - _ -> dispatchEncoder cc v txid + Serialise.encode txid + HardForkNodeToNodeEnabled _ vs -> do + + let blessedGenTxId :: NS (K ShortByteString) xs + blessedGenTxId = hmap (pure $ K txid) blessedGenTxIdEra + case blessedGenTxId of + Z i -> Serialise.encode $ unK i + S x -> encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId + HardForkNodeToNodeDisabled _ -> + Serialise.encode txid decodeNodeToNode cc v = - case v of - HardForkNodeToNodeEnabled hfv vs | hfv >= HardForkSpecificNodeToNodeVersion2 -> do - let ccfgs = getPerEraCodecConfig $ hardForkCodecConfigPerEra cc - fmap (HardForkGenTxId . OneEraGenTxId) $ - htraverse' unComp $ - hcliftA3 pSHFC - (\ecc (WrapNodeToNodeVersion ev) _ -> Comp (decodeNodeToNode ecc ev)) - ccfgs - vs - blessedGenTxIdDecodeEra - _ -> fmap (HardForkGenTxId . OneEraGenTxId) $ dispatchDecoder cc v + fmap (HardForkGenTxId . OneEraGenTxId) $ + case v of + HardForkNodeToNodeEnabled hfv vs | hfv >= HardForkSpecificNodeToNodeVersion2 -> + Serialise.decode + HardForkNodeToNodeEnabled _ _ -> do + let eraDecoders :: NP (Decoder s :.: K ShortByteString) xs + eraDecoders = hpure $ Comp $ K <$> Serialise.decode + hcollapse <$> decodeNS eraDecoders + HardForkNodeToNodeDisabled _ -> + Serialise.decode diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/SupportsMempool.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/SupportsMempool.hs index 605c66bf00..653956ca7e 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/SupportsMempool.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/SupportsMempool.hs @@ -144,6 +144,8 @@ class HasTxId tx => ConvertRawTxId tx where -- properties as defined in the docs of 'txId'. toRawTxIdHash :: TxId tx -> ShortByteString + -- unsafeFromRawTxIdHash :: ShortByteString -> TxId tx + -- | Shorthand: ID of a generalized transaction type GenTxId blk = TxId (GenTx blk) From 3bad129ce77b4b56e91758032a1476b18aaf9f16 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Wed, 27 Nov 2024 13:56:36 +0000 Subject: [PATCH 11/15] regenerate GenTxId golden tests --- .../CardanoNodeToNodeVersion2/GenTxId_Allegra | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Alonzo | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Babbage | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToNodeVersion2/GenTxId_Conway | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion7/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion10/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion10/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion10/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion10/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion10/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion10/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion11/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion11/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion11/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion11/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion11/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion11/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion12/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion12/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion12/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion12/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion12/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion12/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion13/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion13/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion13/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion13/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion13/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion13/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion14/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion14/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion14/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion14/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion14/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion14/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion15/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion7/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion7/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion8/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion8/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion8/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion8/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion8/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion8/GenTxId_Mary | 2 +- .../CardanoNodeToClientVersion9/GenTxId_Allegra | 2 +- .../CardanoNodeToClientVersion9/GenTxId_Alonzo | 2 +- .../CardanoNodeToClientVersion9/GenTxId_Babbage | 2 +- .../CardanoNodeToClientVersion9/GenTxId_Byron | Bin 36 -> 36 bytes .../CardanoNodeToClientVersion9/GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion9/GenTxId_Mary | 2 +- 66 files changed, 55 insertions(+), 55 deletions(-) diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway index 8f2268ce3f..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway @@ -1 +1 @@ -X K8aLs,а^"5J \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Babbage index 0d2b383718..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Babbage @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Babbage"}) \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway index 121d3fcf34..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Conway @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway index 121d3fcf34..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Conway @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway index 121d3fcf34..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Conway @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway index 8f2268ce3f..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway @@ -1 +1 @@ -X K8aLs,а^"5J \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway index 8f2268ce3f..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway @@ -1 +1 @@ -X K8aLs,а^"5J \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway index 8f2268ce3f..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway @@ -1 +1 @@ -X K8aLs,а^"5J \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway index 8f2268ce3f..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway @@ -1 +1 @@ -X K8aLs,а^"5J \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Babbage index 0d2b383718..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Babbage @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Babbage"}) \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway index 121d3fcf34..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Conway @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Babbage index 0d2b383718..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Babbage @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Babbage"}) \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway index 121d3fcf34..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Conway @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Byron index 9511ba87eeb0d0a7d5874a268a5f165cb478ea62..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#UVQONW$fN`S2A2VY delta 8 PcmY#UVQONS$fN`S29p7T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway index 121d3fcf34..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Conway @@ -1 +1 @@ -HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Conway"}) \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file From 27bb25b67944eb136e0945738c2344b12ecb182a Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Wed, 27 Nov 2024 14:05:33 +0000 Subject: [PATCH 12/15] stylish --- .../Test/Consensus/Cardano/Generators.hs | 3 ++- .../cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs | 2 +- .../Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs | 3 ++- .../HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs | 2 +- .../HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs index 0252c1680c..f2d3fbab10 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs @@ -39,7 +39,8 @@ import Ouroboros.Consensus.HardFork.Combinator import Ouroboros.Consensus.HardFork.Combinator.Serialisation import qualified Ouroboros.Consensus.HardFork.History as History import Ouroboros.Consensus.HeaderValidation -import Ouroboros.Consensus.Ledger.SupportsMempool (ConvertRawTxId(..)) +import Ouroboros.Consensus.Ledger.SupportsMempool + (ConvertRawTxId (..)) import Ouroboros.Consensus.Node.NetworkProtocolVersion import Ouroboros.Consensus.Node.Serialisation (Some (..)) import Ouroboros.Consensus.Protocol.TPraos (TPraos) diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs index 29e13e8026..45c15b724a 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs @@ -19,8 +19,8 @@ -- existing roundtrip test functions. module Test.Consensus.Cardano.ByronCompatibility (tests) where -import qualified Cardano.Crypto.Hashing as CC import qualified Cardano.Chain.Byron.API as CC +import qualified Cardano.Crypto.Hashing as CC import Codec.CBOR.Decoding (Decoder) import Codec.CBOR.Encoding (Encoding) import qualified Data.ByteString.Lazy as Lazy diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs index 227997d3d2..e10f4438d8 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs @@ -36,7 +36,8 @@ import qualified Ouroboros.Consensus.HardFork.History as History import Ouroboros.Consensus.HeaderValidation (AnnTip, HeaderState (..), genesisHeaderState) import Ouroboros.Consensus.Ledger.Extended (ExtLedgerState (..)) -import Ouroboros.Consensus.Ledger.SupportsMempool (ConvertRawTxId(..)) +import Ouroboros.Consensus.Ledger.SupportsMempool + (ConvertRawTxId (..)) import Ouroboros.Consensus.Storage.Serialisation import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs index 5e64cbaf48..57a1577bd4 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs @@ -23,6 +23,7 @@ import Codec.CBOR.Encoding (Encoding) import qualified Codec.CBOR.Encoding as Enc import qualified Codec.Serialise as Serialise import Control.Exception (throw) +import Data.ByteString.Short (ShortByteString) import Data.Proxy import Data.SOP.BasicFunctors import Data.SOP.Constraint @@ -47,7 +48,6 @@ import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) -import Data.ByteString.Short (ShortByteString) instance SerialiseHFC xs => SerialiseNodeToClientConstraints (HardForkBlock xs) diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs index 2bbfd35ad2..91d59d7da4 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs @@ -18,6 +18,7 @@ import Codec.CBOR.Decoding (Decoder) import Codec.CBOR.Encoding (Encoding) import qualified Codec.Serialise as Serialise import Control.Exception (throw) +import Data.ByteString.Short (ShortByteString) import Data.Proxy import Data.SOP.BasicFunctors import Data.SOP.NonEmpty (ProofNonEmpty (..), isNonEmpty) @@ -38,7 +39,6 @@ import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) -import Data.ByteString.Short (ShortByteString) instance SerialiseHFC xs => SerialiseNodeToNodeConstraints (HardForkBlock xs) where estimateBlockSize = estimateHfcBlockSize From 37690bd59c9b1c5a37bd6dc328e7a46040ce01a0 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Thu, 28 Nov 2024 12:08:25 +0000 Subject: [PATCH 13/15] fix warnings --- .../HardFork/Combinator/AcrossEras.hs | 4 --- .../HardFork/Combinator/Embed/Nary.hs | 1 - .../Serialisation/SerialiseNodeToClient.hs | 32 ++++--------------- .../Serialisation/SerialiseNodeToNode.hs | 13 +++----- 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs index 5abdddd207..c215e0aca8 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/AcrossEras.hs @@ -68,7 +68,6 @@ import qualified Data.ByteString.Base16 as B16 import qualified Data.ByteString.Char8 as BSC import Data.ByteString.Short (ShortByteString) import qualified Data.ByteString.Short as Short -import Data.Function (on) import Data.Proxy import Data.SOP.BasicFunctors import Data.SOP.Constraint @@ -249,9 +248,6 @@ getSameValue values = | otherwise = throwError "differing values across hard fork" -oneEraGenTxIdRawHash :: CanHardFork xs => OneEraGenTxId xs -> ShortByteString -oneEraGenTxIdRawHash = getOneEraGenTxId - {------------------------------------------------------------------------------- NoThunks instances -------------------------------------------------------------------------------} diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs index e10f4438d8..0bb3d1a13a 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Embed/Nary.hs @@ -21,7 +21,6 @@ module Ouroboros.Consensus.HardFork.Combinator.Embed.Nary ( import Data.Bifunctor (first) import Data.Coerce (Coercible, coerce) -import Data.SOP (Compose) import Data.SOP.BasicFunctors import Data.SOP.Counting (Exactly (..)) import Data.SOP.Dict (Dict (..)) diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs index 57a1577bd4..a8d3e57690 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToClient.hs @@ -23,7 +23,6 @@ import Codec.CBOR.Encoding (Encoding) import qualified Codec.CBOR.Encoding as Enc import qualified Codec.Serialise as Serialise import Control.Exception (throw) -import Data.ByteString.Short (ShortByteString) import Data.Proxy import Data.SOP.BasicFunctors import Data.SOP.Constraint @@ -39,15 +38,14 @@ import Ouroboros.Consensus.HardFork.Combinator.Mempool import Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common import Ouroboros.Consensus.HardFork.Combinator.Serialisation.SerialiseDisk () import Ouroboros.Consensus.HardFork.History (EraParamsFormat (..)) -import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId, - toRawTxIdHash) +import Ouroboros.Consensus.Ledger.SupportsMempool (GenTxId) import Ouroboros.Consensus.Node.NetworkProtocolVersion import Ouroboros.Consensus.Node.Run import Ouroboros.Consensus.Node.Serialisation -import Ouroboros.Consensus.TypeFamilyWrappers import Ouroboros.Consensus.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) +import Data.ByteString.Short (ShortByteString) instance SerialiseHFC xs => SerialiseNodeToClientConstraints (HardForkBlock xs) @@ -172,7 +170,7 @@ instance SerialiseHFC xs -- need to handle the cases where 'ShortByteString's are serialised with -- an era tag ('encodeNS'). - encodeNodeToClient cc v (HardForkGenTxId (OneEraGenTxId txid)) = + encodeNodeToClient _cc v (HardForkGenTxId (OneEraGenTxId txid)) = case v of HardForkNodeToClientEnabled hfv _ | hfv >= HardForkSpecificNodeToClientVersion4 -> Serialise.encode txid @@ -182,31 +180,13 @@ instance SerialiseHFC xs encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId HardForkNodeToClientDisabled _ -> Serialise.encode txid - decodeNodeToClient cc v = + decodeNodeToClient _cc v = fmap (HardForkGenTxId . OneEraGenTxId) $ case v of - HardForkNodeToClientEnabled hfc vs + HardForkNodeToClientEnabled hfc _ | hfc >= HardForkSpecificNodeToClientVersion4 -> do Serialise.decode - -- let aux :: forall s blk . SerialiseConstraintsHFC blk - -- => CodecConfig blk - -- -> EraNodeToClientVersion blk - -- -> K () blk - -- -> (Decoder s :.: WrapGenTxId) blk - -- aux ecc vv _ = Comp $ case vv of - -- EraNodeToClientEnabled bv -> do - -- decodeNodeToClient ecc bv - -- EraNodeToClientDisabled -> - -- -- Is this sensible? What should the behaviour be when the - -- -- blessed GenTxId era is disabled by EraNodeToClientDisabled? - -- fail $ show $ disabledEraException (Proxy @blk) - -- htraverse' unComp $ - -- hcliftA3 pSHFC - -- aux - -- (getPerEraCodecConfig (hardForkCodecConfigPerEra cc)) - -- vs - -- blessedGenTxIdEra - HardForkNodeToClientEnabled _ _ ->do + HardForkNodeToClientEnabled _ _ -> do let eraDecoders :: NP (Decoder s :.: K ShortByteString) xs eraDecoders = hpure $ Comp $ K <$> Serialise.decode hcollapse <$> decodeNS eraDecoders diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs index 91d59d7da4..877a107a3f 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/SerialiseNodeToNode.hs @@ -147,23 +147,20 @@ instance SerialiseHFC xs -- need to handle the cases where 'ShortByteString's are serialised with -- an era tag ('encodeNS'). - encodeNodeToNode cc v (HardForkGenTxId (OneEraGenTxId txid)) = do + encodeNodeToNode _cc v (HardForkGenTxId (OneEraGenTxId txid)) = do case v of HardForkNodeToNodeEnabled hfv _ | hfv >= HardForkSpecificNodeToNodeVersion2 -> Serialise.encode txid - HardForkNodeToNodeEnabled _ vs -> do - + HardForkNodeToNodeEnabled _ _ -> do let blessedGenTxId :: NS (K ShortByteString) xs blessedGenTxId = hmap (pure $ K txid) blessedGenTxIdEra - case blessedGenTxId of - Z i -> Serialise.encode $ unK i - S x -> encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId + encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId HardForkNodeToNodeDisabled _ -> Serialise.encode txid - decodeNodeToNode cc v = + decodeNodeToNode _cc v = fmap (HardForkGenTxId . OneEraGenTxId) $ case v of - HardForkNodeToNodeEnabled hfv vs | hfv >= HardForkSpecificNodeToNodeVersion2 -> + HardForkNodeToNodeEnabled hfv _ | hfv >= HardForkSpecificNodeToNodeVersion2 -> Serialise.decode HardForkNodeToNodeEnabled _ _ -> do let eraDecoders :: NP (Decoder s :.: K ShortByteString) xs From 8686357ea460f36817b17332bc38d038824185b5 Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Thu, 28 Nov 2024 12:46:59 +0000 Subject: [PATCH 14/15] use CardanoNodeToClientVersion15 instead of creating a new version --- .../GenTxId_Allegra | 2 +- .../GenTxId_Alonzo | 2 +- .../GenTxId_Babbage | 2 +- .../GenTxId_Byron | 2 +- .../GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Mary | 2 +- .../GenTxId_Shelley | 2 +- .../ApplyTxErr_Allegra | Bin 39 -> 0 bytes .../ApplyTxErr_Alonzo | Bin 39 -> 0 bytes .../ApplyTxErr_Babbage | Bin 39 -> 0 bytes .../ApplyTxErr_Byron | Bin 14 -> 0 bytes .../ApplyTxErr_Conway | 1 - .../ApplyTxErr_Mary | Bin 39 -> 0 bytes .../ApplyTxErr_Shelley | Bin 39 -> 0 bytes .../ApplyTxErr_WrongEraByron | Bin 19 -> 0 bytes .../ApplyTxErr_WrongEraShelley | Bin 19 -> 0 bytes .../Block_Allegra | Bin 1799 -> 0 bytes .../CardanoNodeToClientVersion16/Block_Alonzo | Bin 1872 -> 0 bytes .../Block_Babbage | Bin 1826 -> 0 bytes .../Block_Byron_EBB | Bin 91 -> 0 bytes .../Block_Byron_regular | Bin 867 -> 0 bytes .../CardanoNodeToClientVersion16/Block_Conway | Bin 1752 -> 0 bytes .../CardanoNodeToClientVersion16/Block_Mary | Bin 1894 -> 0 bytes .../Block_Shelley | Bin 1687 -> 0 bytes .../GenTxId_Allegra | 3 --- .../GenTxId_Alonzo | 1 - .../GenTxId_Babbage | 1 - .../GenTxId_Byron | 1 - .../GenTxId_Conway | 1 - .../CardanoNodeToClientVersion16/GenTxId_Mary | 1 - .../GenTxId_Shelley | 1 - .../GenTx_Allegra | Bin 799 -> 0 bytes .../CardanoNodeToClientVersion16/GenTx_Alonzo | Bin 872 -> 0 bytes .../GenTx_Babbage | Bin 973 -> 0 bytes .../CardanoNodeToClientVersion16/GenTx_Byron | Bin 240 -> 0 bytes .../CardanoNodeToClientVersion16/GenTx_Conway | Bin 899 -> 0 bytes .../CardanoNodeToClientVersion16/GenTx_Mary | Bin 894 -> 0 bytes .../GenTx_Shelley | Bin 687 -> 0 bytes .../Query_Allegra_GetBigLedgerPeerSnapshot | 1 - .../Query_Allegra_GetCurrentPParams | Bin 6 -> 0 bytes .../Query_Allegra_GetEpochNo | Bin 6 -> 0 bytes .../Query_Allegra_GetGenesisConfig | Bin 6 -> 0 bytes .../Query_Allegra_GetLedgerTip | Bin 6 -> 0 bytes .../Query_Allegra_GetNonMyopicMemberRewards | Bin 82 -> 0 bytes .../Query_Allegra_GetProposedPParamsUpdates | Bin 6 -> 0 bytes .../Query_Allegra_GetStakeDistribution | Bin 6 -> 0 bytes .../Query_Alonzo_GetBigLedgerPeerSnapshot | 1 - .../Query_Alonzo_GetCurrentPParams | Bin 6 -> 0 bytes .../Query_Alonzo_GetEpochNo | Bin 6 -> 0 bytes .../Query_Alonzo_GetGenesisConfig | Bin 6 -> 0 bytes .../Query_Alonzo_GetLedgerTip | Bin 6 -> 0 bytes .../Query_Alonzo_GetNonMyopicMemberRewards | Bin 82 -> 0 bytes .../Query_Alonzo_GetProposedPParamsUpdates | Bin 6 -> 0 bytes .../Query_Alonzo_GetStakeDistribution | Bin 6 -> 0 bytes .../Query_AnytimeByron | Bin 5 -> 0 bytes .../Query_AnytimeShelley | Bin 5 -> 0 bytes .../Query_Babbage_GetCurrentPParams | Bin 6 -> 0 bytes .../Query_Babbage_GetEpochNo | Bin 6 -> 0 bytes .../Query_Babbage_GetGenesisConfig | Bin 6 -> 0 bytes .../Query_Babbage_GetLedgerTip | Bin 6 -> 0 bytes .../Query_Babbage_GetNonMyopicMemberRewards | Bin 82 -> 0 bytes .../Query_Babbage_GetProposedPParamsUpdates | Bin 6 -> 0 bytes .../Query_Babbage_GetStakeDistribution | Bin 6 -> 0 bytes .../CardanoNodeToClientVersion16/Query_Byron | Bin 5 -> 0 bytes .../Query_Conway_GetCurrentPParams | Bin 6 -> 0 bytes .../Query_Conway_GetEpochNo | Bin 6 -> 0 bytes .../Query_Conway_GetGenesisConfig | Bin 6 -> 0 bytes .../Query_Conway_GetLedgerTip | Bin 6 -> 0 bytes .../Query_Conway_GetNonMyopicMemberRewards | Bin 82 -> 0 bytes .../Query_Conway_GetProposedPParamsUpdates | Bin 6 -> 0 bytes .../Query_Conway_GetStakeDistribution | Bin 6 -> 0 bytes .../Query_HardFork | Bin 4 -> 0 bytes .../Query_Mary_GetBigLedgerPeerSnapshot | 1 - .../Query_Mary_GetCurrentPParams | Bin 6 -> 0 bytes .../Query_Mary_GetEpochNo | Bin 6 -> 0 bytes .../Query_Mary_GetGenesisConfig | Bin 6 -> 0 bytes .../Query_Mary_GetLedgerTip | Bin 6 -> 0 bytes .../Query_Mary_GetNonMyopicMemberRewards | Bin 82 -> 0 bytes .../Query_Mary_GetProposedPParamsUpdates | Bin 6 -> 0 bytes .../Query_Mary_GetStakeDistribution | Bin 6 -> 0 bytes .../Query_Shelley_GetBigLedgerPeerSnapshot | 1 - .../Query_Shelley_GetCurrentPParams | Bin 6 -> 0 bytes .../Query_Shelley_GetEpochNo | Bin 6 -> 0 bytes .../Query_Shelley_GetGenesisConfig | Bin 6 -> 0 bytes .../Query_Shelley_GetLedgerTip | Bin 6 -> 0 bytes .../Query_Shelley_GetNonMyopicMemberRewards | Bin 82 -> 0 bytes .../Query_Shelley_GetProposedPParamsUpdates | Bin 6 -> 0 bytes .../Query_Shelley_GetStakeDistribution | Bin 6 -> 0 bytes .../Result_Allegra_EmptyPParams | Bin 40 -> 0 bytes .../Result_Allegra_EpochNo | 1 - .../Result_Allegra_GenesisConfig | Bin 78 -> 0 bytes .../Result_Allegra_GetBigLedgerPeerSnapshot | 3 --- .../Result_Allegra_LedgerTip | 1 - .../Result_Allegra_NonMyopicMemberRewards | Bin 139 -> 0 bytes .../Result_Allegra_ProposedPParamsUpdates | 1 - .../Result_Allegra_StakeDistribution | 1 - .../Result_Alonzo_EmptyPParams | Bin 63 -> 0 bytes .../Result_Alonzo_EpochNo | 1 - .../Result_Alonzo_GenesisConfig | Bin 78 -> 0 bytes .../Result_Alonzo_GetBigLedgerPeerSnapshot | 3 --- .../Result_Alonzo_LedgerTip | 1 - .../Result_Alonzo_NonMyopicMemberRewards | Bin 139 -> 0 bytes .../Result_Alonzo_ProposedPParamsUpdates | 1 - .../Result_Alonzo_StakeDistribution | 1 - .../Result_AnytimeByron | Bin 5 -> 0 bytes .../Result_AnytimeShelley | Bin 15 -> 0 bytes .../Result_Babbage_EmptyPParams | Bin 55 -> 0 bytes .../Result_Babbage_EpochNo | 1 - .../Result_Babbage_GenesisConfig | Bin 78 -> 0 bytes .../Result_Babbage_LedgerTip | Bin 37 -> 0 bytes .../Result_Babbage_NonMyopicMemberRewards | Bin 139 -> 0 bytes .../Result_Babbage_ProposedPParamsUpdates | 1 - .../Result_Babbage_StakeDistribution | 1 - .../CardanoNodeToClientVersion16/Result_Byron | Bin 138 -> 0 bytes .../Result_Conway_EmptyPParams | Bin 145 -> 0 bytes .../Result_Conway_EpochNo | 1 - .../Result_Conway_GenesisConfig | Bin 78 -> 0 bytes .../Result_Conway_LedgerTip | 1 - .../Result_Conway_NonMyopicMemberRewards | Bin 139 -> 0 bytes .../Result_Conway_ProposedPParamsUpdates | 1 - .../Result_Conway_StakeDistribution | 1 - .../Result_EraMismatchByron | Bin 19 -> 0 bytes .../Result_EraMismatchShelley | Bin 19 -> 0 bytes .../Result_HardFork | Bin 76 -> 0 bytes .../Result_Mary_EmptyPParams | Bin 40 -> 0 bytes .../Result_Mary_EpochNo | 1 - .../Result_Mary_GenesisConfig | Bin 78 -> 0 bytes .../Result_Mary_GetBigLedgerPeerSnapshot | 3 --- .../Result_Mary_LedgerTip | 1 - .../Result_Mary_NonMyopicMemberRewards | Bin 139 -> 0 bytes .../Result_Mary_ProposedPParamsUpdates | 1 - .../Result_Mary_StakeDistribution | 1 - .../Result_Shelley_EmptyPParams | Bin 40 -> 0 bytes .../Result_Shelley_EpochNo | 1 - .../Result_Shelley_GenesisConfig | Bin 78 -> 0 bytes .../Result_Shelley_GetBigLedgerPeerSnapshot | 3 --- .../Result_Shelley_LedgerTip | 1 - .../Result_Shelley_NonMyopicMemberRewards | Bin 139 -> 0 bytes .../Result_Shelley_ProposedPParamsUpdates | 1 - .../Result_Shelley_StakeDistribution | 1 - .../SerialisedBlock_Allegra | 1 - .../SerialisedBlock_Alonzo | 1 - .../SerialisedBlock_Babbage | 1 - .../SerialisedBlock_Byron_EBB | 1 - .../SerialisedBlock_Byron_regular | 1 - .../SerialisedBlock_Conway | 1 - .../SerialisedBlock_Mary | 1 - .../SerialisedBlock_Shelley | 1 - .../SlotNo_Allegra | 1 - .../SlotNo_Alonzo | 1 - .../SlotNo_Babbage | 1 - .../CardanoNodeToClientVersion16/SlotNo_Byron | 1 - .../SlotNo_Conway | 1 - .../CardanoNodeToClientVersion16/SlotNo_Mary | 1 - .../SlotNo_Shelley | 1 - .../ShelleyNodeToClientVersion5/GenTxId | 1 - .../ShelleyNodeToClientVersion10/GenTxId | 1 - .../ShelleyNodeToClientVersion11/GenTxId | 1 - .../ShelleyNodeToClientVersion5/GenTxId | 1 - .../ShelleyNodeToClientVersion6/GenTxId | 1 - .../ShelleyNodeToClientVersion7/GenTxId | 1 - .../ShelleyNodeToClientVersion8/GenTxId | 1 - .../ShelleyNodeToClientVersion9/GenTxId | 1 - .../shelley/ShelleyNodeToNodeVersion1/GenTxId | 1 - .../Ouroboros/Consensus/Cardano/Node.hs | 23 +++--------------- .../Shelley/Ledger/NetworkProtocolVersion.hs | 1 - .../Test/Consensus/Cardano/Golden.hs | 1 - .../Consensus/Ledger/Query/Version.hs | 1 - 168 files changed, 11 insertions(+), 102 deletions(-) delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Allegra delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Alonzo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Babbage delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Byron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Mary delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Shelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraByron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraShelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Allegra delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Alonzo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Babbage delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_EBB delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_regular delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Conway delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Mary delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Shelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Allegra delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Alonzo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Babbage delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Byron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Conway delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Mary delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Shelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetCurrentPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetEpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetGenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetLedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetNonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Allegra_GetStakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetCurrentPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetEpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetGenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetLedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetNonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Alonzo_GetStakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeByron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeShelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetCurrentPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetEpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetGenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetLedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetNonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetStakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Byron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetCurrentPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetEpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetGenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetLedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetNonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetStakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_HardFork delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetCurrentPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetEpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetGenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetLedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetNonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetStakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetCurrentPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetEpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetGenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetLedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetNonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetStakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EmptyPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_LedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_NonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EmptyPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_LedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_NonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeByron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeShelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EmptyPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_GenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_LedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_NonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Byron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EmptyPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_GenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_LedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_NonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchByron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchShelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_HardFork delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EmptyPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_LedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_NonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EmptyPParams delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EpochNo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_GenesisConfig delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_GetBigLedgerPeerSnapshot delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_LedgerTip delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_NonMyopicMemberRewards delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary delete mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion10/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion11/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/GenTxId delete mode 100644 ouroboros-consensus-cardano/golden/shelley/ShelleyNodeToNodeVersion1/GenTxId diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra index a1b108b647..8507fa8715 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra @@ -1,3 +1,3 @@ -X cA:^D d +X cA:^D d uS| ] q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo index 3c280119f4..0e06fd5e02 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo @@ -1 +1 @@ -X 3? GCa\ո1%Eg# +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage index 0a9e8f1976..f875b3bdec 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage @@ -1 +1 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron index 3ccdd3059b..a0a1e937dc 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Byron @@ -1 +1 @@ -X K9 ҽC0F0. b \ No newline at end of file +X K9 ҽC0F0. b \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway index c795639f31..426c12e555 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway @@ -1 +1 @@ -X K8aLs,а^"5J \ No newline at end of file +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary index ead4fbe073..dd7df1c0fc 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary @@ -1 +1 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Shelley index 667dbef8ea..b26e394526 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Shelley +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Shelley @@ -1 +1 @@ -X np+t3NUe<Ҷ= \ No newline at end of file +X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Allegra deleted file mode 100644 index 018b7bc479fdc07b689fdf01efb60f256b9bd9a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmZo{Vw&H?*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN)8a> diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Alonzo deleted file mode 100644 index d9c76ed7084ce14b9e08833533dac4c38fc81797..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmZo{VwvB>*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN>~u& diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Babbage deleted file mode 100644 index dcabd6d2749da7f9805399d6c25d0063a8e28cc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmZo{Vx8Z_*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN_`OJ diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Byron deleted file mode 100644 index 1728309622124f9d85cb596a6163f5c1c4b8d8f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14 ScmZo{VgSKrhQ!1s1_l5iVgt_r diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway deleted file mode 100644 index 7e36ce4445..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Conway +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%A \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Mary deleted file mode 100644 index f0ab5dd88118933571c1f90bf476eaa89bb3b758..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmZo{VxHf`*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN;44S diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_Shelley deleted file mode 100644 index 15bf711ff08d74707ca7c28f45f016abdb7d251f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmZo{Vw~T^*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN$C*b diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraByron deleted file mode 100644 index 9735c28d23436ca90c123fd781e030a3bf8c2969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmZo_VoVRtNX^Mft!!dQb*e1N&jSEQF$XjN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/ApplyTxErr_WrongEraShelley deleted file mode 100644 index 43f2fa8267f5b22ef6dd14c7a562e2fd1bab5ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmZo_Vn}tWEXvPoVoVRtNX^Mftpor@n+G%i diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Allegra deleted file mode 100644 index b525fa7868f6550666ddc7f4b81f258068d33d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1799 zcmai!`8U)H7{X)j~ z6S%_}9(u7dH=U+|Irf#f)cZwAGP30$AtU|W>qzVZ=ZD)XUGo-S#*<)d8$L%`aVat# zRxd?A{(A=ml3nJzy5vL6Ji8;p2U=7SP}Kt=rM=Y55h%E2DqMh3O#Q>VO`{hrjI~0> z8sJH~qSebKqT88dsCL^?NogYz=qd_dVdZ~H!yjl4U!%GUuEy_VuP=jni`EYqs`%8u z&9hdVaOM{U`K5aE3U~(G?zr1{mLVf{f7h5VIn_DJkWx(kR@GZ45PQzE+FpZ^*a-DA zL_O-uzq^Rpg=0mXJ0)-P<^pB=Gcj@sIE-juiR&I9N8CDISv1^!9?fZTjs+A58D9H6??SoRb9Y))D zmUbJpotu6Nn$bV435ALK6pHbmVoOH->`2w_JNFiCp*h}oapv^ZEecpokT7E-AMj4+ zkHE$)yhILNGlIhKxzWwF2+U?od{)~sY6=ntxug3LpRa>ol;BfVYFigq1;pM?JGaw{ ztZ1U*>x2dX0LeL08OFIO=N)&Yi9HyMHF8bWAOttJ9&c*o+CNG2z<{G}?pAx(<5x#uXo?5u5o4+ai+!P?KCTIyr@6zrxVmdVehijN*}@%nk<1@iTR z-q1Q;`KJHK{tH?`Jp)H)E#e8{+V`%Dc1?0jHAMY%-Gd9+-X@s7Fz<$*dMS2%gzs0d zDgoUnPZxixAK~}tJHSPg?rslT@%$$kg{hio3&cCnU^QLq%Jp`#BTt1*@3eI^O^mJ@ z_u)omeY3J+Unc5&@UE-wViSfi`@5CHImA_LtR`IxI5mWGR;cO0U0StFi zc8QdV*!{E%C@ai+W=OnSXL+bKt3rb@qiwM|AyYZ}S?JOBm&8YQ(~7}UEMRimP^pS}F2dOY^#q4YKXkY!IO_(9LGPIFUc z)>`_-zR5lOXvPVXsUa-sn1;XbV`dCDPbo&Cvx#Y-$iHB#+AuIsnczAVoh&9fJ=xFU zH1}T#QDS@;GHVj*X}syFO*ub>vxsJY-)4BPxF+hzIp!XW+ zR=CV4FtEGHGwkK=tY{OSeV?8rmhISTEfMB$JtKq8YN00Kaz&5Rj{&2^CQcydQg&k9_Z-C65rWZavG7bWJp-LsV0`sflBKN9Bz z6B|*6U^o!}b~6rpb4(IM3!u}Ofiz|mlNe5?pE(eh0HGj&|0_R`X`kYJm95t)p@Qpa z{JxYH)7MgXUtjAbI{TbFO^p8=wEQU)#0Qn$-j>zpN_UEwEyx+)(^hLk+F!li9t;Yjd5pHkUJClN?u5OH}BtEwmvbLP31h-To*=?MsHn@6nuBTo=9sF^D zKBibwLG)oLb?{im!RQT$S(tk3Kx2t6wfN36ExH6V&_FI4KWTHzw4K7w^cvL!$tfp& z7IF9vEoWMV_=K$2^{)k91|F6PmG4z+)hbx%^qPXIO| zOhht?tL0NxCf@Z2(QReP!>+qJc5qb04c`CKH{0?ry{m2qO5@n_KHl*v*OMTzL^4J4 O;UOE9AK&bgUi}AOr!))z diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Alonzo deleted file mode 100644 index dc3903d3a62a08c9bdacf27ca74ce62e6b71ee66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1872 zcmai!c{tPw7{`CV8FLnLwKK~wX**^Vw~vfeY*)Fl*1v{SDA*~IFq(PFYDx8QHIQ7>xD|mEivY) z&}wZpUVa(spWsbVAOBvjn{{!psCAt}nQ$^dwJRO3MkeCtyJz#={MB^Vyecp1Yq@Yl zJ)HE*&eH;zbxip+Be&GNkLqsc54jNbPFT)hy=`)z;A@HgVoRODf+Mejrsjqjx7=tn z%9LYZlG1LRt;gkdqvqJL$B-H4!=hAr;#YDpX$V$ zU&OkSRtMKG^=N^v`iq2G0D!Es71NA!la902r(o{%#2L9HZ>9z{G##q1%XfT~;*N*x zdZRxTRJq>^xh!X}`rcU0J*{3EQ^(vx#<_ab&i^1D1$crj_Ey7Mstj(xbnIPOq2*9( zm1%N9T&^{}pmKU_fu0dI*rk~Pf3u==E80)m(S8e@A(c=0^eF6kQOBn<7&`;G!)^ixreV9x#4jeaP?x|6GPn_w=A8SGOusuj_X)_8B!^i{Uvp8{$tOpHUr;X z^a&{uD&BdnzA6Ku&tCIA7$&~3F}?%!b{gkRW=-IoMQ75xhDxilo2^`PgiqaCgeNBs z^5+S9EoDaG=)3~P4jB@L9!L{)2PnZR=oHXS2ea!OtF4W9Er zg6?$mZE2`a&s1jq=V`>qx7PCv)J3Q4v}?P&%M)Bi z1t&2IW5ZoJISpOE2WxOgdd=#kdYfN%+)O$?O0*EbUzH3iimO9D883O-j}xPF6!zYI z`NS{29;W)n>EU;bD44<(0E|G?Nwovrh1N7GUlO{MQP|bPYhTM;QrbCX+%(1(r&(?Q zS$vMdN;vBcoz~Pe6P?Epydb9NC+tfr%7OTldKGfrQwoUozfk0FJ zEcPzj@%IZ`B6TRJZIxfK2+71V-gXzKZnf=VDqAQx)B^s_>TAl1d9No z@BBczW74j(uwJXY7O|u5>ugF)XXC}&`t$)@RxF8)5v>qSI)X)(2mHEBRX<<3b)MHK zH|`Z?wb*;D-vyg^P%a+7!A2xURulqwl)^IRg2p?xqO0ss34G3k9i{Ybq>53Dt7#4X z$@q_tgk_)VF!xX6Sf_V4%&+@wo2p2@71(LGuc+Fi;av zhHXo?w=hNNo-!I_4ZBCy!ZlTN#+tO)f>UiXBg_+ZL8Hv~-$sfYLK{-LRV*cfCE?({ zhl#s`u)|^5Low*}UYB6yCVs-(49PPB8fH3z0HCc6D9OR3W(=GJ0AzF?LRLv#E)g&Q qqKknNFp$URhOmQB_I|Pa03I3vQF0=*jUNajU?K{3u>Wr1oA@tqHCSu_ diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Babbage deleted file mode 100644 index 279d590c81066bbeab4f42723931f373c80af1b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1826 zcmbtTS5Q+46n!s^5Cx>Ui4uscB1JkPRf>qANmFCGQy_OR-P{Sx_QP zMFo^11PzKxN27uPdkG-YtBmflupj%eAG$L;bLaltGv}O{bFP@UONxx(P9n)@X^0{) zDB7SJG+y4fm#{tAM?YTilIsvK3ZG3#ynTVAsB{&gB=bJLW=l_G{o(ae*Q!2%*%l%# zBxfqDo?`RBDmjM#&k+b@>ps@pOboO1ZHbEPs#ixN<#$BX#$ronAg{ziGyzgAXpt=z zv6I%O+M%ziQ5@a5`O`&nr75<^O?huw1rr0vV=i(wCiim^*}g9Fd(aL+`jIv8!ZegU zX?KUIPELGgl{V{2uu2u=7VD3Z$V`-@zt`I|V`jWr^Q!>cM7L;TYN74d^7dN-?DGPf zm6doIlC%~?v0uZB4xqWV9dWa7KbbLYv?+C5=gF`{Xz=L*5F0p6=R%aHIelj6FXy3g z71V&u+7*-Y0=@PoN3V$0F|m59UmvXo0LV5|F4^=P_n7mqN!UA2<4rsgH7Ox=4gR$? zIosNjeDIJ%cg##~h0ndPVvN!9dqY+C)Vj5(I##}Yj4Ov6_W9uv6tD|yyf{={YSiD8 zux~tgEvIpgYGLF}9UOk4+>p@it}UiJblTxY`oCZWU;TDSdbu^a!|CH1ZQiIb&Yzta zg!d8X2;W`ZS|tY`i3*s3%8yFb5E;uK8%FK9{|(5IGPt%feAc%=1cxtwFFZhYqJx#q z3#wI)O5(?&+K)OLw9HM?O*;sEN&#tU@x7!m)xZ|Pb;Fk<^HW*eY;3`DrOR=ixT_!4 zc9uP?oW$qdoj8;UPC${as_tyLsCAEvqvFD`q8%s?NqO)@iMu%d05+w@t)Thc0^-0vkPEm0CWOSvPni)L(VEqy4 zOD??cw9si^B;-zO&xX3%l(g@>)Q%4t{8;8*^MP(@gPoc*(O^nkPPR&%Oj9k(Xf^+& zgL-vW*Y%?w1F_B7My_tv9*H1_;)%@Hctm8- zwhj|wvSdB)zIhUqPzzIN@%ngsiL5zX3BU+M8CBlhm1nC(VYi1bq~>)#WworNF33BL znKlg31<9M&0WwRdpZy)E@L#ylAY24M=0JM}ENf$zMJ5zS_^wlKozB=jH(0mVdnq7W@6x*#a(HV^>R)dBex$p3J$ z3gGS?k^g(6Naz7H26F-d5CBs7k@aNskM9uW;fGa~t+OayxasB|6VvwNI zmJaJT$*2)pYrah-#dXx@-!|0ll{#~nNXPPjB2CcimMA&@q zzAE;>ar`g|_;q%C3`wp4z@uarZGKhhr^|Wu`4_<%X7p(JKO_|fg;G^bp}&|u8kb(= zsf_TM8OFKvU$ZI;+&Fe4@m6q$^@D=$s6gvT$-h!w22n1^pTEMZXD;-7z8}{1($c$n zDsbWaghKDlQG*9BoW&_pKZnRIwR5S)mf`Cgx@wAag9HT;w**S=x+qp`at|L=HLRR5SXSoAhJAj~qYTt34Ha5YI?-t36gt#+u xJyBR7ufW=57(4Q2Pd!fTayZo_x?q2<>atJ40PBVwx@ngif&hU4fuNuNfuQ4nDC7VD diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Byron_regular deleted file mode 100644 index ce89fa545b376130983575f559f429ad109bc7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmca15y>3a#Ms;_#q7VpFhZeY0{ZzM@#c@%10ROM;5ekoWrh4wNI{n~< z$ENFR)r_TUTc$@ar<~S4c4F_!Rh*?enwTRLE@!DpE-UhMV|ggO#r^d8Aj6lRcBvi` zn^^w#q~qRzwK)+A>kr&Yk+A-h=5OowrpV%|%C3a^b+0!0A7pslCc7(hx^#qsUz!Hb zP2Wg?B9qx~xC|yNwOZ*KruRFS<7!@TsyCm*jFu(_#t4VS-nXrHH=H&1-SYDEiVf_) zCU~CsV7=eLu_k%?+Y?VZUL_@b;CyO+a%QJo*ZjNBKRsTygRklG_WK*O#Pbf!TE?B) z$k@cx)WSfyK@kqG=X1U?T+H9dAaZlonkRwTCTedgY+pW%I zm)>9&XlTWh_(AL2TKyv&7v^_<=QBu;mIr!9XG3z=q|ixnA}$RklO2sFzkZ|WD7NO{ z97Ps6GxwF^7H=E5&A->yad^AcugCcaM{WqQxEb6!uGhzz z^zYpn3H|@`o0@=%6`LbuRs|PvMy<-=mArDwGqZW2Yr!1rhuyqB&8MsH#4TWuGP*OP z52$`YBiQuTrU(b`+{$v39G75M(_oXdU=Op@62JV?%!t$~=StTs?_}c=cay9{gKW1f ze~ZGZ#7rZzDBplkSFbeJN<-893e)Tehm5YZt<}f>8~n*gx+VRn@r%N-pu+808>ct@ zcX%{4>PLs<;l7wk;eHKvt6dL+PBf`@yC^I;c=GS1oEeR3)Bo5p{BL5u$;i|&|9=w@ HH!c7G_QsqY diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Conway deleted file mode 100644 index 5ae5c5065de3335619ac6b764801535b5fc102ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1752 zcmbtTX*84z82-K)!Ghv+p_9EQ!gU#HWZ+c4n9vbS-7RgllOfOL9$?7G%ki zEkfC4h!_AG|~_s9K_d(J)QJ@2pQJkRsK@AD2|9oTzej!SSXk`uyLD`m@x zyM8TXIb$qi?G!@<@0d>j)AVbhQI9hs1ce?z_}G~DZ)lveN#AUS=L~8o zlDMc|orEQGj81%YT8`q32#$gbLO0>g;cfWq&|BP)IRIqLyk#7GF=lfu$Keo2MCiXq1J z_VUfGRx7kO8r%4Y1_djKz6mb_07yTPH&*>-4!=}RZbfWaBM4vQ4R>z)2zVByr<`f!601jZiYnx#^G)&;#P_-)U zJuu0UA+hMRe2dGoORvNtJHhlZ&oJpy7h2UA^OF0C4t4w8{(zL zLIW?D74K!`q&3y9t9M{nLQV+@A%h|_;w~-K1&p?l|!u|Ie(aU$1+I|53`EB7S%T#j!a^L zl6a0idE4z8T0zGXLln`5V?3JlVqg$N&|wHaEqt;oU0)hcYxmxWPw(uZw(KNq@E@H~ zubCiK#~#`TaQ^^q_kEzie`G|0^lSjq1ln&vHn$fj=_xIE~tseF}Wad`66id=v!4soz>jU9xsXBm)KuCa;P6}CzE{*L&H&wZD_G)(FmTuxmUzK zl6Y-cj@k4Z8l*t}Z(~JDSsbN}p1-I+|H`?!{$d}y#YuLvkNG-zE(d2GMm=)x&~3`> z3vki(AN$w(cR=_I{?z+1Rg{hX&kbH}L)yp7=3O>YX9WgJrj?prnGVEpY!BfDg+&1X zXk8yh;5P&GBW&8<2Wq;?v*lg0?sdzMxv6d{!oj%F!?{}Z1V)?#OB&K|C_{zm|M@cD zx$PdJWunPVKQZbuJtM2XVuUXq!*68iN4-$fU2}5ykKjLt*2??6Qh(D<8Y+A>(8Ch* z^UKBWKyE4hlbP>V#@3-2FaW?J$YfYVFlMtDn|_d4KsM-3rBS>{9*85ZztY^ONEk%0 VF^~qXARPuH5Om`sThSv%`~@UG9BKdn diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Mary deleted file mode 100644 index 14d8281f93368d898501f14636df833891cdfe4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1894 zcmah}dpy$%AKu-zGUd|8VzW}mt>${1Tw-z?QS!R{6v`x*w9Ph`T*`jDIF{nP`V_5Sz%!{5*Id7kI{{XU^vdG<+k!UDAhKM z*>0OSf7seMYDf%AKd4;2R;sMvQNYJL|AteyG6Q^+%;kiliEP4=2Id;gPnw^)hr7NA z6wW(6W$h(o{brxH?1iWX1RSoDZnKh@WGszc9=(nI^FC=i?QKS2a}env)w zS@(09JCCV22bQ&4HD8>31=ukr*5vZbKjBLV6Un6mp>Af6{Pz5KXB*w~)_-Ep=WoMf zi~y1>LSRR+Q71M9rV`_fR}TLSCvD3p9(U^h8rZZXKF$Y7uLT2#;D7uB_@WCNcigvQ zepO2DY<2TJual5S*7-e641oZY0<~Q0o0*q9^|O&rUng7nWEqko8=8V8^#b>o*#T(4 zr7vNr=uyD)=rV-G_UDsz&-MC@s3!J-1C09@T*6PGVUQqb%jF@AtFr&yU@h&&eI_+H z73SFif3}SmTQT8ZZk^^0U)v?pWOe(WPMUpT&~~G;sm^dr!G7Ppe+)gNjAGJoT`?!c z9d&Bl)VPo(pgK*ZUYoJ~m3ds~i*FEtirKHbVwMBPB2nn-k>&`32OU}?TPN1JX)0dH zB_B)<7};3mTX$gxG(+<8lHcNIiD%lSRpx`!s|)o${`c`=nMIhl z@w6NZlz7~bJh}oJFI0w|IxoHTLrMqik-tYQndyF$xO!JY@r@(Ukx(vjCao19c*0xuOfRb731&c^&Y-P?KU z^U8rZ69VkV>Tf7e`>Y7ieP5wzE>Le(vKtXoA?F>}`YIJZsPt2a6!d;4k!Ls~p2J}~ zGotBu_-7a#jzDC95D)_BZYG=y-y8=>ZKJzuI+kGvxvh^wt*kpQ6O@;4`aX2f*zw{j zji5;Jf+7_}5Q+r|?>F<|Zf=tf(!&{ab_AUr&n7b&jMyV7X&?%Oh`#5C@Z2-K^SP$2 zs(RRt`fm%_NnMS%pO_oJRk?mqn~oH1VXb`@1#Y!G1YS)DQ2|I66Lt^V)@E8=oUi3V zNBKUs4yfp!zg(t^Rul`L-f6g_VVJF?{{IeK5d_?*$Ce+SqWc@(GH>jzcTNMT?Lk9! z2(td7-@TfVTLP0K&b|7F8eJ&58fBHv;1Xno<8_r2ef43 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Block_Shelley deleted file mode 100644 index 7d900c96a82bca1ac8cb49d56f3dab29752dc091..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1687 zcmai!`9ISQ0LQ=Em|3ovBF5-)nu{8m%yL9Zc|89>{rq{qUhmKA^?AKMBP#yLTnNsBvJuiCj)$)>&S zpAoxbKY!b9lvDcZDqlCYCIS%PuoTA z`m6x%{+)707N*u1ZWLHC8|3D+93-ro_`5YECenl;-kOK}AyW$UL>;Z~s*`6jVgkN^ z+_O>*DrA{{lbFEv??90hzG_R6!HR@b2BmIKLxB3RUR_3`D zJ!l~&fXz-ERTXRe*~zOmc_~_5%x4u!mdRjl#vel7eye%p&Xd{&RLP_HGkLIiFxo@o zAWc4IXMYE9tF&;y%&6+V{r(pA9UaQ7zTN7CQnm1tz_<13!Lbh0AWuD!01cMAU243W z3F$4~4mx&UK{zvV%>k=EIKYxU_u~nPWfnG2|*V}>yBE_Ea@Gjc5WfAZ*~(~w9Jrr>GnGT*al?VB7cS2EHN8!YVX?6?GZ0z z@-c}d)J_MEgsOZQAO+$~KibqhS)1cKJ7uTCCiA_l?U9jvKb=LzUq=?F-YB^;IRLb= z;BQZuK#2{nv@7Kb?Ht|ss*>=AK(m#1!-Ec==+BI`m8~#aWOOqKd>EM(rYN3TWUSdF zy#JyzGjO=Q{~TInYuZ>bN^Nv6Qe+6jMv5^FCKubEkpe=d2FVVX=~!vDz<2( nilvP&)}iZp%5s1T*hwml5=jb&?+Z?#g;5a@3@*VzI0XL(ewqfX diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra deleted file mode 100644 index 8507fa8715..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Allegra +++ /dev/null @@ -1,3 +0,0 @@ -X cA:^D d -uS| ] -q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo deleted file mode 100644 index 0e06fd5e02..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Alonzo +++ /dev/null @@ -1 +0,0 @@ -X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage deleted file mode 100644 index f875b3bdec..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Babbage +++ /dev/null @@ -1 +0,0 @@ -X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron deleted file mode 100644 index a0a1e937dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Byron +++ /dev/null @@ -1 +0,0 @@ -X K9 ҽC0F0. b \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway deleted file mode 100644 index 426c12e555..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Conway +++ /dev/null @@ -1 +0,0 @@ -X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary deleted file mode 100644 index dd7df1c0fc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Mary +++ /dev/null @@ -1 +0,0 @@ -X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTxId_Shelley +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Allegra deleted file mode 100644 index 786e4823022271a8f0bf311d4796b7daff8cd3b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmZo-x*-wCEYZA@p|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuSX z1gf%RI6XNcXzrJyIYw@a78swNp}2bg#oQ+y4XhKq_Birph1X4ST-$du&C+l}p0D$p z7e90gwPl%1*Z*eYVq#`yVQFq+Xkv(v!Kbi`8NYml!qG=k8&7^?(rrAvDbB>~biM5N z`e{My?1Tjl^(D#PsP1c$Q2>`0G~aL_^oMZ%1h4AD^ATTE-lt8$j{Gls;+Hf zYhqXkaz8`2dyDU+M*YLQ@?0mk{r=ouac0-t9fn#r*(X#=p>%z#gGs^wN6W(Le7FyEylEF+Q3a zU}eXadG4Rf+gU$ue13XQ*qwuEAwv@|`nozE-!0+%IQ4JPZC#sPu|=oSIrqy>5t9B~ z(!sceKR+hIp<>pFs5cwC%Y>9Bs;~48Uh=4oDKEG8m)RZ%ZP9Sv8B2MagYGX-x%4yP z-N`MxlP>*j&A%hPWVK#&k<7sbWoGH@KufH%)c2g*wnR5+@rnyt`MkxcMxy1ikDQlT z9q?G#9eGPL!l5N0`V*JzK`r0B)jSVHB4>V`6KND?SG)F!(k7MFW$Yar=Ul5X*qZgH zk)z;l)VGYuzL(gNOGW0+Yj|U_*gEb5f724iwBnMY%)E3a*QCml)MDl)Mkbbp%#KNo z&CE>AO^i)VEDTMooJ~wk;Dj{gVM(#x&sERuEu*%$vhQEnd@Vrvpwv`(9-}89d3-?( jl0Uv#icKT*i}`|>^#KVHdQ13P`1W}_%m4l1-f$ZLvR7Dr diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Alonzo deleted file mode 100644 index 558dfbcca80c1286824fab921cb0c4d4c6196851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 872 zcmZo-xginBoY=CCp|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuT? z1*zI?utY~L>BIV4@mzjgVft0Vi+o-&ylb3T-L_+1gRsadM#jeG2up_3lOuxWekqz` zBp?BX3rC-4w^QeK*rA4JYLJI=^}GL#I$%mdSMeZ?-0h zl!Xy8%iP?(`$G)XMA^0-D!$BqJZzTVwv*XTcfB-&xE6XP=a-h06g%f<=1DTYAna}? zN#^IwEG*4U3{4CXGWaa-V#Y5Yp>Xt()W(zFm~!OYS#QWSF>*!7KEP*BBYtZdn(~tK^NLgRic5?23i9)FoT_V^*qRs?g51y0?cU-$ zsZswhuRPbuZNERaSDe{3cZZ?YP4)?u5_zl(30N(W!qx-~;0Mb^3}*-({$9L`p>%z`?`^bmkA4XLV<^iEh&36&JMfd5cqx zM9XC#IWMz1;IXhf@|I?VLt|Ls*2XOxvH) zpt)a)<`}sxT3~#7hT`h|7jvIn zlFTodniy|LI7#ehz9He=#N^@5$iSea#2_fpM1d=$7+T`r3W7-{N#^IwEG*4U3{4CX zGWeX{#f)D*LgDBmsf{PUG3hoQ-V|qIcDi2nd;PSab#}r6hx(FaZ&dp*vfhwuV&saD zeSpuNM*P+^H034d=M|^s6_*z473AmVI91m+u{AL)1i7D~+r7niQltK1UU{yQ+kSs; zuQ;=7?hZq(o9q)RCGuDo60lk#g{=t~I}etN7|swn{JnS=%bVD2`#)D#-3VZ7h-Rtg zP<33$BFVpifrE(;=*%B7&+_<#ZpAEVoNSR-D){&527|@yTMlQ4n;rYW2{dP8cG%Z9 zY~Ih-*sM-4eZQ`4bJ`i(BMYt;CfF7{MT=$b2!(lqGgo%(D*Auz<)O?|x2=P>eopv5 z^P|wsP45hjT=%-s%}!VeKjRW`jPs#9_aTB>Lb8Pv*2X@j9faGX2giw#VJ%X{2jpa2>&+?b9S zFaMx{f&kbUScQUEKuc|TcQkB7Q$;mXG-gvsHf3~9Z*^%{WqLz-MQTf9GjvBZYGE*I zMruzuae85CGB#RGP*p`rW<_~1HE(z|Ygj;Nimiov$Nw<=XkywM;(_!a#!_*&YO$As q|3KoETKI?=!;V~e6OSkdI=bOf$buz{L?EES$^Fu7n1Lpj{5}9%*=jNX diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/GenTx_Conway deleted file mode 100644 index 9d1ce51c81a083d3d3747b94a91d699f4106dd15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 899 zcmZo-yCD(DT+_0V;U*(fV^f5}JJG0fa~w1kN=|3}@0oM(!Rk+(=iH=;-hxNDOx%|4q^s9sy`MhFy*Eq4dZO6O@VUbmgLPVO#%-FbuA;Oa3 z^yG-3xnGLr7`ZK4V0?Op;_CeubDwlHuukyWHGckliXLp4#hZHJ04vmXze<+tr*w$oiN%^rM`CJj>$`x)rmeak52T zso>wI8w?h+Z#kSHZg%VgCouRoW`})!!{+^Ljm_!=)A#GzHm9AjJ+k0xVS;VJQ?%gc zj!>8*s|3Gd~L5-1N@i$aSw9-Ry*w@H2`^GcYim{Bxg4 zVF@htT4$;6Ik##yIqbW0{T zcbNh=GblLVNd_Fr68l*fHZd?XNit7wk`(R$qOUg@nHMuGVN5G7Day=CXL3!dEJ-b9 ZZenC&S;*{|#Ms!x*ud22<_b!9i2&Dufsg>*4pqm6Udj2T zB_+kq`I&i=%rBUjnORtxn;4oHB4qFx+{KJvK0@K>BdLuizcJ}H9^MpZVs^S-_Iv%b zpmlb_0*CsNWN%daFtXl|YhvVzkbQv9o<{uEG&JQU=jRot<`tI~>lNhZ=Qvf@HnBA^ zECjiqq1(O1cT%JNVP1KzliPlOZm&4AYwiw1t()uOdVYv zkMEXnew_L@=(euSuGpee>74szrwB=ZF6m(0!k-@#;UIHa(zy58BHxak3P)G(Y>#E# zRvEHl zaD3TT^=`j!MRR_1owVP~x=?x7t*rkAhiab5edK%ob%)UQqbGh9Ejao}Z~N_M`JY*u zmN2FjmlS2@r8BuERhFa{GdD3Zu`FbEOloXqW@>I?Y-(a*Xkz7TVrl}XyD1M#iuHc3 zdTwtSwZ)Zv|H|fT0m=uZrpogeJpsw%OU@wq;EigVkLvi)~i@8ra8dxWI?Q!JI3a^{uxVG0}Vp@|_v2A|?CX8iII3P&GFZ9MsnNw@LvrZ^L` z)Ah37>!$^+vlA9L)R!cCquPg&^@dy%BUgm%1AO*0;wek;l4_fYlNyY)uOz zWF9ORF`OZE_Uey&g!ALnzd^TkZFa>Lol582FFQp@ z`g2JK;}-t>mF1h1)|Jn`YP`A-eCT`~m&ASLLkvJmth3bjoZGfUH)-*T3tIWS#i>T3<+6{Q zmsuU~SlAtTOEbdZdV|Z|EpNB`n(Yua{QQ@xY-C^n00bKW1^@s6 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_AnytimeShelley deleted file mode 100644 index d82b9fc7f4db2360746cc261fca05ba77e024882..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5 McmZo>Y-C^r00bNX2LJ#7 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetCurrentPParams deleted file mode 100644 index cd6d53bc7927fe437916bd1d73399b30995390c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku+-1^@;w0geCw diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetEpochNo deleted file mode 100644 index f5ea7bd0850ebee0cf8399477b2f3ebb4c627588..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku+-1ONss0gM0u diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetGenesisConfig deleted file mode 100644 index e6ee8c45c445e9f45d46f9697246532688a4d27e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku;T1^@;&0hRy& diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetLedgerTip deleted file mode 100644 index 4d00b4e9fac6402b2123d72fd8c9cc6d132da36e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku+-000In0gC_t diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetNonMyopicMemberRewards deleted file mode 100644 index b5217dc67a9654ad4719e1ad9251e626310e8af7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmZo-Xku+*y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kackslZU diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetProposedPParamsUpdates deleted file mode 100644 index 62efc1c1eaa2112b0068c7c2356df99a1c88396a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku+-0RRRs0gnIx diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Babbage_GetStakeDistribution deleted file mode 100644 index 41aeabd30d52dad7c32a530bddd87ff3f2086e3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku+-1po#x0gwOy diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Byron deleted file mode 100644 index cfa4236d512052278add088e0bdc0291b8cb4f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5 McmZo-XkuUh00b2Q1poj5 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetCurrentPParams deleted file mode 100644 index 05f2ba977317862aed5a2c3181e704fba88c8675..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku$*1^@;z0gnIx diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetEpochNo deleted file mode 100644 index 915b078647dc32f66b9231a59874cb67c7e33057..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku$*1ONsv0gV6v diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetGenesisConfig deleted file mode 100644 index 70189500e98e7e5069cbd45266e9f84fa03d999c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku&R1^@;*0ha&( diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetLedgerTip deleted file mode 100644 index 7337b0de4e05ef7684c1baf8c244a84e9726dc73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku$*000Iq0gM0u diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetNonMyopicMemberRewards deleted file mode 100644 index b47684f4c36d20579ebf205c39c63dc8ae5b0f5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmZo-Xku$(y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kac;2#+P diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetProposedPParamsUpdates deleted file mode 100644 index 38afb2235421c3142d7dcae1c5e3e6853a78beb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku$*0RRRv0gwOy diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Conway_GetStakeDistribution deleted file mode 100644 index 89ed187e31c950d4c8648d9723a5ae542e6c119c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku$*1po#!0g(Uz diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_HardFork deleted file mode 100644 index 64c266fdc583e5b469bd7bd1b6d6747616aa38f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZo-YGeQa0~7%U diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot deleted file mode 100644 index 8576dd1663..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetBigLedgerPeerSnapshot +++ /dev/null @@ -1 +0,0 @@ -ShelleyEncoderUnsupportedQuery (SomeSecond GetBigLedgerPeerSnapshot) ShelleyNodeToClientVersion10 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetCurrentPParams deleted file mode 100644 index 7338cd74165e275f099d161987a36d85731ed114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku<;1^@;q0gM0u diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetEpochNo deleted file mode 100644 index 58e4767132c03722d57319642bb2b358b258da16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku<;1ONsm0g3U1^@;y0h9m$ diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetLedgerTip deleted file mode 100644 index c5b7ef04972567e830b9ffdb2b1f869d0391313f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku<;000Ih0f_(r diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetNonMyopicMemberRewards deleted file mode 100644 index 72f3ff8f93a4c299c41025f94732a75d7aefac64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmZo-Xku<+y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kab^B)!f diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetProposedPParamsUpdates deleted file mode 100644 index b833d91e655614957dcc842965d20ade9d740a7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku<;0RRRm0gV6v diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Mary_GetStakeDistribution deleted file mode 100644 index e63d41b76df54ba67176d302d70dfe571b2af40d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku<;1po#r0geCw diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot deleted file mode 100644 index 8576dd1663..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetBigLedgerPeerSnapshot +++ /dev/null @@ -1 +0,0 @@ -ShelleyEncoderUnsupportedQuery (SomeSecond GetBigLedgerPeerSnapshot) ShelleyNodeToClientVersion10 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Query_Shelley_GetCurrentPParams deleted file mode 100644 index cafc5b72906ddd4c9ef0dd49a1b4bc6b8fbf7000..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6 NcmZo-Xku(+1^@;k0g3O`T diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo deleted file mode 100644 index b180370379..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_EpochNo +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_GenesisConfig deleted file mode 100644 index 10a12c25266694f1ad7a3b9f9b14028c526e90bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmZqdZ?(kJ1zhK diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates deleted file mode 100644 index 4918531195..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_ProposedPParamsUpdates +++ /dev/null @@ -1 +0,0 @@ -X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution deleted file mode 100644 index 968f15663d..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Allegra_StakeDistribution +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EmptyPParams deleted file mode 100644 index 9e750e26883f4da621d2d29754142e8e40dba30a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63 tcmZpiA<4kNAjttF7#Ji{Zpbw;FrpES46H!81x*OyCI$u|Vvv}|3IMiK4g~-J diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo deleted file mode 100644 index b180370379..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_EpochNo +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_GenesisConfig deleted file mode 100644 index 10a12c25266694f1ad7a3b9f9b14028c526e90bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmZqdZ?(kJ1zhK diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates deleted file mode 100644 index 4080e95c54..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_ProposedPParamsUpdates +++ /dev/null @@ -1 +0,0 @@ -X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution deleted file mode 100644 index 968f15663d..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Alonzo_StakeDistribution +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeByron deleted file mode 100644 index 070897ad04f6b56bc26e2d24a3de47ce5b565852..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5 McmZo{W?*0d00fo+1poj5 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_AnytimeShelley deleted file mode 100644 index 61dee1376e428f9f6be1a1df74036a259c3abed8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 WcmZo{mS&K+SJs%@z#z%|f(rmDO9co3 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EmptyPParams deleted file mode 100644 index edc6f118879e20b92158ee19e3a1b8c86f2a5aca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 qcmZpi&cMJR$pIu77$j0|$TcxAA_#V%;DROuzlnhXh!`ZMu>t@_#S8NQ diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo deleted file mode 100644 index b180370379..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_EpochNo +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_GenesisConfig deleted file mode 100644 index 10a12c25266694f1ad7a3b9f9b14028c526e90bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmZqdZ9GddYeB}0*aNF80_Eez0_`TSI8uvMDFuW3+ diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_NonMyopicMemberRewards deleted file mode 100644 index c47618c1704a42d99637d6e981fbe535f7ee04d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmZo%+{7S}vM@qsnVY+Je~6))DBHF}#h2NSht2Zab~4-Pu9s#I7jqM16JvzTgXJQI zGlUL*FW$xSCN|st&(&2o0@xa&S*kfy9TxzVFyJ=@XvxOxu&-~}yq~SHS)E||eqGz< Rv@^Cx7F;b%uq}AX2>?(kJ1zhK diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates deleted file mode 100644 index 4080e95c54..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_ProposedPParamsUpdates +++ /dev/null @@ -1 +0,0 @@ -X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution deleted file mode 100644 index 968f15663d..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Babbage_StakeDistribution +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Byron deleted file mode 100644 index d66107b64e8efc78189421a6da827d6795795e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmZqdW@u($VCZ9zl#Y;MkZWlG6OsxHl1zJ~85lSv{E8MZ02wSj>Xrc@2E&UhO9eoT zsLujb4h&q)(hST--BWxVfMQIFo09G}fFyM*J8Tsgniy_K1UCV>y@93vL15in)=B#s Sr2j*~{QnC;;3gwe!vX-}Un%DR diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_EmptyPParams deleted file mode 100644 index 04416edc3001ff65d97814b507e465618d05bc91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmZpiA?(kJ1zhK diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates deleted file mode 100644 index 4080e95c54..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_ProposedPParamsUpdates +++ /dev/null @@ -1 +0,0 @@ -X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution deleted file mode 100644 index 967baf0b47..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Conway_StakeDistribution +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchByron deleted file mode 100644 index 9735c28d23436ca90c123fd781e030a3bf8c2969..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmZo_VoVRtNX^Mft!!dQb*e1N&jSEQF$XjN diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_EraMismatchShelley deleted file mode 100644 index 43f2fa8267f5b22ef6dd14c7a562e2fd1bab5ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmZo_Vn}tWEXvPoVoVRtNX^Mftpor@n+G%i diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_HardFork deleted file mode 100644 index 84885abaa8e259d4f17df3b0dc0a38159befc5e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmbQ=+|0nh&@9a$aj&c~w}C;D`2|;tM2e(zL^Fd(BZEjYsuYkXIVEOM5(9%Iiw`$Q PA^U}91_`A`ApQ>kP&^fL diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EmptyPParams deleted file mode 100644 index 0240c52f6f4a5b9e9fb8311b565cb71ed695ca0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 fcmZpi#K6EH$pIu77$j0|$TcxAq7jV@EI>H`r>zJY diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo deleted file mode 100644 index b180370379..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_EpochNo +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_GenesisConfig deleted file mode 100644 index 10a12c25266694f1ad7a3b9f9b14028c526e90bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmZqdZ?(kJ1zhK diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates deleted file mode 100644 index 4918531195..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_ProposedPParamsUpdates +++ /dev/null @@ -1 +0,0 @@ -X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution deleted file mode 100644 index 968f15663d..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Mary_StakeDistribution +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_EmptyPParams deleted file mode 100644 index b792678e2e46579b71c1ff88ab31eb9a6264bced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 fcmZpi#K6EH$pIu77$j0|$TcxAq7jV@Oh7pRr=?(kJ1zhK diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates deleted file mode 100644 index 4918531195..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_ProposedPParamsUpdates +++ /dev/null @@ -1 +0,0 @@ -X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution deleted file mode 100644 index 968f15663d..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/Result_Shelley_StakeDistribution +++ /dev/null @@ -1 +0,0 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Allegra +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Alonzo +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Babbage +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_EBB +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Byron_regular +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Conway +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Mary +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley deleted file mode 100644 index 6a5024d0dc..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SerialisedBlock_Shelley +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Allegra +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Alonzo +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Babbage +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Byron +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Conway +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Mary +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley deleted file mode 100644 index d9ba7315ac..0000000000 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion16/SlotNo_Shelley +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion10/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion10/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion10/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion11/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion11/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion11/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/GenTxId b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/ShelleyNodeToNodeVersion1/GenTxId b/ouroboros-consensus-cardano/golden/shelley/ShelleyNodeToNodeVersion1/GenTxId deleted file mode 100644 index b26e394526..0000000000 --- a/ouroboros-consensus-cardano/golden/shelley/ShelleyNodeToNodeVersion1/GenTxId +++ /dev/null @@ -1 +0,0 @@ -X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs index 936a7317f7..1c96739572 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs @@ -49,7 +49,6 @@ module Ouroboros.Consensus.Cardano.Node ( , pattern CardanoNodeToClientVersion13 , pattern CardanoNodeToClientVersion14 , pattern CardanoNodeToClientVersion15 - , pattern CardanoNodeToClientVersion16 , pattern CardanoNodeToClientVersion2 , pattern CardanoNodeToClientVersion3 , pattern CardanoNodeToClientVersion4 @@ -516,13 +515,13 @@ pattern CardanoNodeToClientVersion14 = :* Nil ) --- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage --- and Conway eras enabled, using 'ShelleyNodeToClientVersion11' for the --- Shelley-based eras. +-- | The hard fork enabled, using 'HardForkSpecificNodeToClientVersion4', and +-- the Shelley, Allegra, Mary, Alonzo and Babbage and Conway eras enabled, +-- using 'ShelleyNodeToClientVersion11' for the Shelley-based eras. pattern CardanoNodeToClientVersion15 :: BlockNodeToClientVersion (CardanoBlock c) pattern CardanoNodeToClientVersion15 = HardForkNodeToClientEnabled - HardForkSpecificNodeToClientVersion3 + HardForkSpecificNodeToClientVersion4 ( EraNodeToClientEnabled ByronNodeToClientVersion1 :* EraNodeToClientEnabled ShelleyNodeToClientVersion11 :* EraNodeToClientEnabled ShelleyNodeToClientVersion11 @@ -533,20 +532,6 @@ pattern CardanoNodeToClientVersion15 = :* Nil ) -pattern CardanoNodeToClientVersion16 :: BlockNodeToClientVersion (CardanoBlock c) -pattern CardanoNodeToClientVersion16 = - HardForkNodeToClientEnabled - HardForkSpecificNodeToClientVersion4 - ( EraNodeToClientEnabled ByronNodeToClientVersion1 - :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 - :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 - :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 - :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 - :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 - :* EraNodeToClientEnabled ShelleyNodeToClientVersion10 - :* Nil - ) - instance CardanoHardForkConstraints c => SupportedNetworkProtocolVersion (CardanoBlock c) where supportedNodeToNodeVersions _ = Map.fromList $ diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs index a2996ca6bb..bba8285d3e 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs @@ -71,7 +71,6 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where , (NodeToClientV_17, ShelleyNodeToClientVersion9) , (NodeToClientV_18, ShelleyNodeToClientVersion10) , (NodeToClientV_19, ShelleyNodeToClientVersion11) - , (NodeToClientV_20, ShelleyNodeToClientVersion11) ] latestReleasedNodeVersion = latestReleasedNodeVersionDefault diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs index 18eb81589c..67d50dd0fb 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/Golden.hs @@ -48,5 +48,4 @@ instance CardanoHardForkConstraints c CardanoNodeToClientVersion13 -> "CardanoNodeToClientVersion13" CardanoNodeToClientVersion14 -> "CardanoNodeToClientVersion14" CardanoNodeToClientVersion15 -> "CardanoNodeToClientVersion15" - CardanoNodeToClientVersion16 -> "CardanoNodeToClientVersion16" _ -> error $ "Unknown version: " <> show blockVersion diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs index b95602b2fc..204c8e5ded 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs @@ -31,4 +31,3 @@ nodeToClientVersionToQueryVersion x = case x of NodeToClientV_17 -> QueryVersion2 NodeToClientV_18 -> QueryVersion2 NodeToClientV_19 -> QueryVersion2 - NodeToClientV_20 -> QueryVersion2 From 2e7dbb8509d160f8168de930ec7aa61b468f62fc Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Thu, 28 Nov 2024 17:41:54 +0000 Subject: [PATCH 15/15] changelog for GenTxId change --- ...41128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md diff --git a/ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md b/ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md new file mode 100644 index 0000000000..acb132b72c --- /dev/null +++ b/ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md @@ -0,0 +1,4 @@ +### Breaking + +- Change internal representation of `OneEraGenTxId xs` from `NS WrapGenTxId xs` to `ShortByteString`. This breaks backwards compatibility for serialisation of Byron-era `GenTxId`s, and introduces new hard-fork-specific node-to-client and node-to-node versions, `HardForkSpecificNodeToClientVersion4` and `HardForkSpecificNodeToNodeVersion2`. Currently-running networks which require the ability to submit Byron transactions should ensure that all nodes are upgraded simultaneously, or these nodes may be unable to communicate with one another. +- Change internal representation of Byron-era `GenTxId`s from a sum of the different possible Byron IDs (transaction ID, certification delegation ID, etc.) to `Hash`. In order to determine the type of a Byron `GenTxId`, you'll now need to find the transaction that the ID refers to and check its type.