From a3a4d2d0f02f3f0429b37a083ab51fddbd9d0ceb Mon Sep 17 00:00:00 2001 From: Fraser Murray Date: Mon, 12 May 2025 12:20:47 +0100 Subject: [PATCH] change serialization / deserialization for OneEraGenTxId so it's treated as a bytestring and is decoded into an arbitrary era use PatternSynonyms rather than coerces for ByronDlgId / ByronUpdate*Id use Shelley for blessedGenTxIdDecodeEra for CardanoShelleyEras OneEraGenTxId { NS WrapGenTxId xs -> ShortByteString } use CardanoNodeToClientVersion15 instead of creating a new version move GenTxId to its own section and describe why it's not an NS of GenTxId --- cabal.project | 17 +++ .../byron/ByronNodeToNodeVersion2/GenTxId | Bin 36 -> 34 bytes .../ByronNodeToClientVersion1/GenTxId | 1 + .../ByronNodeToClientVersion1/GenTxId | Bin 36 -> 34 bytes .../CardanoNodeToNodeVersion2/GenTxId_Allegra | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Alonzo | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Babbage | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Byron | Bin 38 -> 36 bytes .../CardanoNodeToNodeVersion2/GenTxId_Conway | 2 +- .../CardanoNodeToNodeVersion2/GenTxId_Mary | 2 +- .../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 .../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 .../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 .../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 + .../GenTxId_Byron | Bin 0 -> 37 bytes .../GenTxId_Allegra | 2 +- .../GenTxId_Alonzo | 2 +- .../GenTxId_Babbage | 2 +- .../GenTxId_Byron | Bin 38 -> 36 bytes .../GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion12/GenTxId_Mary | 2 +- .../GenTxId_Allegra | 2 +- .../GenTxId_Alonzo | 2 +- .../GenTxId_Babbage | 2 +- .../GenTxId_Byron | Bin 38 -> 36 bytes .../GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion13/GenTxId_Mary | 2 +- .../GenTxId_Allegra | 2 +- .../GenTxId_Alonzo | 2 +- .../GenTxId_Babbage | 2 +- .../GenTxId_Byron | Bin 38 -> 36 bytes .../GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion14/GenTxId_Mary | 2 +- .../GenTxId_Allegra | 2 +- .../GenTxId_Alonzo | 2 +- .../GenTxId_Babbage | 2 +- .../GenTxId_Byron | Bin 38 -> 36 bytes .../GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion15/GenTxId_Mary | 2 +- .../GenTxId_Allegra | 2 +- .../GenTxId_Alonzo | 2 +- .../GenTxId_Babbage | 2 +- .../GenTxId_Byron | Bin 38 -> 36 bytes .../GenTxId_Conway | 2 +- .../CardanoNodeToClientVersion16/GenTxId_Mary | 2 +- .../ApplyTxErr_Allegra | Bin 0 -> 38 bytes .../ApplyTxErr_Alonzo | Bin 0 -> 38 bytes .../ApplyTxErr_Babbage | Bin 0 -> 38 bytes .../ApplyTxErr_Byron | Bin 0 -> 14 bytes .../ApplyTxErr_Conway | 1 + .../ApplyTxErr_Mary | Bin 0 -> 38 bytes .../ApplyTxErr_Shelley | Bin 0 -> 38 bytes .../ApplyTxErr_WrongEraByron | Bin 0 -> 19 bytes .../ApplyTxErr_WrongEraShelley | Bin 0 -> 19 bytes .../Block_Allegra | Bin 0 -> 1799 bytes .../CardanoNodeToClientVersion17/Block_Alonzo | Bin 0 -> 1872 bytes .../Block_Babbage | Bin 0 -> 1826 bytes .../Block_Byron_EBB | Bin 0 -> 91 bytes .../Block_Byron_regular | Bin 0 -> 867 bytes .../CardanoNodeToClientVersion17/Block_Conway | Bin 0 -> 1752 bytes .../CardanoNodeToClientVersion17/Block_Mary | Bin 0 -> 1894 bytes .../Block_Shelley | Bin 0 -> 1687 bytes .../GenTxId_Allegra | 3 + .../GenTxId_Alonzo | 1 + .../GenTxId_Babbage | 1 + .../GenTxId_Byron | 1 + .../GenTxId_Conway | 1 + .../CardanoNodeToClientVersion17/GenTxId_Mary | 1 + .../GenTxId_Shelley | 1 + .../GenTx_Allegra | Bin 0 -> 799 bytes .../CardanoNodeToClientVersion17/GenTx_Alonzo | Bin 0 -> 872 bytes .../GenTx_Babbage | Bin 0 -> 973 bytes .../CardanoNodeToClientVersion17/GenTx_Byron | Bin 0 -> 240 bytes .../CardanoNodeToClientVersion17/GenTx_Conway | Bin 0 -> 899 bytes .../CardanoNodeToClientVersion17/GenTx_Mary | Bin 0 -> 894 bytes .../GenTx_Shelley | Bin 0 -> 687 bytes .../CardanoNodeToClientVersion17/LedgerConfig | Bin 0 -> 4513 bytes .../Query_Allegra_GetBigLedgerPeerSnapshot | Bin 0 -> 7 bytes .../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_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_Alonzo_GetBigLedgerPeerSnapshot | Bin 0 -> 7 bytes .../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_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_GetStakeDistribution | Bin 0 -> 6 bytes .../CardanoNodeToClientVersion17/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_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_HardFork | Bin 0 -> 4 bytes .../Query_Mary_GetBigLedgerPeerSnapshot | Bin 0 -> 7 bytes .../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_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_Shelley_GetBigLedgerPeerSnapshot | Bin 0 -> 7 bytes .../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_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_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_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_StakeDistribution | 1 + .../CardanoNodeToClientVersion17/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_StakeDistribution | 1 + .../Result_EraMismatchByron | Bin 0 -> 19 bytes .../Result_EraMismatchShelley | Bin 0 -> 19 bytes .../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_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_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 + .../CardanoNodeToClientVersion17/SlotNo_Byron | 1 + .../SlotNo_Conway | 1 + .../CardanoNodeToClientVersion17/SlotNo_Mary | 1 + .../SlotNo_Shelley | 1 + .../Ouroboros/Consensus/Byron/ByronHFC.hs | 8 ++ .../Consensus/Byron/Ledger/Mempool.hs | 109 ++++++++++-------- .../Ouroboros/Consensus/Cardano/Block.hs | 55 +-------- .../Ouroboros/Consensus/Cardano/ByronHFC.hs | 0 .../Ouroboros/Consensus/Cardano/Node.hs | 47 +++++++- .../Shelley/Ledger/NetworkProtocolVersion.hs | 1 + .../Ouroboros/Consensus/Shelley/ShelleyHFC.hs | 4 + .../Ouroboros/Consensus/ByronDual/Ledger.hs | 7 +- .../Test/Consensus/Byron/Examples.hs | 9 +- .../Test/Consensus/Byron/Generators.hs | 6 +- .../Test/Consensus/Cardano/Generators.hs | 16 ++- .../ThreadNet/Infra/ShelleyBasedHardFork.hs | 3 + .../test/byron-test/Test/ThreadNet/Byron.hs | 2 +- .../Consensus/Cardano/ByronCompatibility.hs | 0 .../Test/Consensus/Cardano/Golden.hs | 2 + .../Test/Consensus/HardFork/Combinator.hs | 3 + ...ser.murray_one_era_gen_tx_id_bytestring.md | 4 + .../HardFork/Combinator/AcrossEras.hs | 35 ++---- .../Consensus/HardFork/Combinator/Condense.hs | 2 +- .../HardFork/Combinator/Degenerate.hs | 10 -- .../HardFork/Combinator/Embed/Nary.hs | 7 +- .../HardFork/Combinator/Embed/Unary.hs | 1 - .../Consensus/HardFork/Combinator/Mempool.hs | 5 +- .../HardFork/Combinator/NetworkVersion.hs | 4 + .../HardFork/Combinator/Serialisation.hs | 5 +- .../Combinator/Serialisation/Common.hs | 11 ++ .../Serialisation/SerialiseNodeToClient.hs | 31 ++++- .../Serialisation/SerialiseNodeToNode.hs | 31 ++++- .../Consensus/Ledger/Query/Version.hs | 1 + .../Test/Util/Serialisation/Roundtrip.hs | 4 + 254 files changed, 395 insertions(+), 183 deletions(-) create mode 100644 ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId 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/CardanoNodeToClientVersion11/GenTxId_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Block_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/LedgerConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_HardFork create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_HardFork create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GetBigLedgerPeerSnapshot create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley create mode 100644 ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/ByronHFC.hs create mode 100644 ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/ByronCompatibility.hs create mode 100644 ouroboros-consensus/changelog.d/20241128_123146_fraser.murray_one_era_gen_tx_id_bytestring.md diff --git a/cabal.project b/cabal.project index da2ec2c4e6..39afda1056 100644 --- a/cabal.project +++ b/cabal.project @@ -57,3 +57,20 @@ if impl (ghc >= 9.12) -- https://github.com/kapralVV/Unique/issues/11 , Unique:hashable + +source-repository-package + type: git + location: https://github.com/IntersectMBO/plutus + tag: be9ccfc7f8ecc6ebc577dcf3374a30530ecdb168 + --sha256: sha256-R7t5Luc1d9l2tXKg5Jgqye+vQAEONwCrQ9/JDkFCu9M= + subdir: + plutus-core + plutus-ledger-api + plutus-tx + +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: d1f4c7983b19a5e4768fb5f691fa8d10cd0f10ee + subdir: ouroboros-network-api 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 new file mode 100644 index 0000000000..0eaababb81 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId @@ -0,0 +1 @@ +X K�9� �ҽC�0�������F0��.� b��� 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_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� �u�S�|��� ]� 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�? �G�Ca�\�ո��1�%E�g# +�X ��3�? �G�Ca�\�ո��1�%E�g# 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~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file +�X M~@)_ur7��WH5���O�2��$�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 a07d334baac1cfb0a29ff177fce5cb1ea3291226..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#WVQONW$f5)Q2CD&w delta 10 RcmY#UV`*Y&VwlLJ1ON)z0tf&A 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 �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file +�X �K�8�aL�s��,��а�^�����"��5�J \ 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�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file +�X �Ճ(x��.��x�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file 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� +�u�S�|��� ]� +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�? �G�Ca�\�ո��1�%E�g# 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~@)_ur7��WH5���O�2��$�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 K�9� �ҽC�0�������F0��.� 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 �K�8�aL�s��,��а�^�����"��5�J \ 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�_G��F��ߖ} Ԉ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��+�t���3N��Ue�<Ҷ���=� \ 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 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 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 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 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/CardanoNodeToClientVersion11/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/GenTxId_Byron new file mode 100644 index 0000000000000000000000000000000000000000..73f032d2b86295726b6540888c12ba1595d9a0a5 GIT binary patch literal 37 vcmV+=0NVe809YVPs5!(Sv(mjol`!~`%IT%l#Mlx9MljmPE{+Le{_e~QQ|=PH literal 0 HcmV?d00001 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� �u�S�|��� ]� 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�? �G�Ca�\�ո��1�%E�g# +�X ��3�? �G�Ca�\�ո��1�%E�g# 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~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file +�X M~@)_ur7��WH5���O�2��$�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 a07d334baac1cfb0a29ff177fce5cb1ea3291226..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#WVQONW$f5)Q2CD&w delta 10 RcmY#UV`*Y&VwlLJ1ON)z0tf&A 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 �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file +�X �K�8�aL�s��,��а�^�����"��5�J \ 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�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file +�X �Ճ(x��.��x�_G��F��ߖ} Ԉ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� �u�S�|��� ]� 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�? �G�Ca�\�ո��1�%E�g# +�X ��3�? �G�Ca�\�ո��1�%E�g# 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~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file +�X M~@)_ur7��WH5���O�2��$�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 a07d334baac1cfb0a29ff177fce5cb1ea3291226..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#WVQONW$f5)Q2CD&w delta 10 RcmY#UV`*Y&VwlLJ1ON)z0tf&A 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 �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file +�X �K�8�aL�s��,��а�^�����"��5�J \ 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�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file +�X �Ճ(x��.��x�_G��F��ߖ} Ԉ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� �u�S�|��� ]� 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�? �G�Ca�\�ո��1�%E�g# +�X ��3�? �G�Ca�\�ո��1�%E�g# 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~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file +�X M~@)_ur7��WH5���O�2��$�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 a07d334baac1cfb0a29ff177fce5cb1ea3291226..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#WVQONW$f5)Q2CD&w delta 10 RcmY#UV`*Y&VwlLJ1ON)z0tf&A 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 �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file +�X �K�8�aL�s��,��а�^�����"��5�J \ 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�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file +�X �Ճ(x��.��x�_G��F��ߖ} Ԉ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� �u�S�|��� ]� 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�? �G�Ca�\�ո��1�%E�g# +�X ��3�? �G�Ca�\�ո��1�%E�g# 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~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file +�X M~@)_ur7��WH5���O�2��$�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 a07d334baac1cfb0a29ff177fce5cb1ea3291226..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#WVQONW$f5)Q2CD&w delta 10 RcmY#UV`*Y&VwlLJ1ON)z0tf&A 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 �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file +�X �K�8�aL�s��,��а�^�����"��5�J \ 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�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file +�X �Ճ(x��.��x�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra index 61ec98ae96..a1b108b647 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra @@ -1,3 +1,3 @@ -�X cA:^D ��d� +�X cA:^D ��d� �u�S�|��� ]� q� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo index 6e6d3158a7..3c280119f4 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo @@ -1 +1 @@ -�X ��3�? �G�Ca�\�ո��1�%E�g# +�X ��3�? �G�Ca�\�ո��1�%E�g# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage index 3c56b72b00..0a9e8f1976 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage @@ -1 +1 @@ -�X M~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file +�X M~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Byron index a07d334baac1cfb0a29ff177fce5cb1ea3291226..3ccdd3059b28a28cad51a26e83ffe9bb64c85a79 100644 GIT binary patch delta 8 PcmY#WVQONW$f5)Q2CD&w delta 10 RcmY#UV`*Y&VwlLJ1ON)z0tf&A diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway index 8f2268ce3f..c795639f31 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway @@ -1 +1 @@ -�X �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file +�X �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary index 1235567289..ead4fbe073 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary @@ -1 +1 @@ -�X �Ճ(x��.��x�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file +�X �Ճ(x��.��x�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..df2444bf34c7f1d27541d9277bc5114dafccd8df GIT binary patch literal 38 ucmZo{Vrpz+Y+{Izd9Yl>aE8#~@5Q@V-o$3x|GB#AMgUtwG)pyysv`h35)Z`y literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..4637c62e4dd0347ea3f8bccb91192e45d60706d4 GIT binary patch literal 38 ucmZo{Vrgt*Y+{Izd9Yl>aE8#~@5Q@V-o$3x|GB#AMgUtwG)pyysv`h3S`Wtn literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Babbage new file mode 100644 index 0000000000000000000000000000000000000000..736de5a8eff46556261f094cc5d474964002a4df GIT binary patch literal 38 ucmZo{Vr^_aE8#~@5Q@V-o$3x|GB#AMgUtwG)pyysv`h3eh

aE8#~@5Q@V-o$3x|GB#AMgUtwG)pyysv`h3HV?)C literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Shelley new file mode 100644 index 0000000000000000000000000000000000000000..ed31f2848b5e74fce8a1df7cac09225a280bada2 GIT binary patch literal 38 ucmZo{Vr*<;Y+{Izd9Yl>aE8#~@5Q@V-o$3x|GB#AMgUtwG)pyysv`h2?hnKO literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_WrongEraShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra new file mode 100644 index 0000000000..8507fa8715 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra @@ -0,0 +1,3 @@ +X cA:^D ��d� +�u�S�|��� ]� +q� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo new file mode 100644 index 0000000000..0e06fd5e02 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo @@ -0,0 +1 @@ +X ��3�? �G�Ca�\�ո��1�%E�g# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage new file mode 100644 index 0000000000..f875b3bdec --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage @@ -0,0 +1 @@ +X M~@)_ur7��WH5���O�2��$�h��� h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron new file mode 100644 index 0000000000..a0a1e937dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron @@ -0,0 +1 @@ +X K�9� �ҽC�0�������F0��.� b��� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway new file mode 100644 index 0000000000..426c12e555 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway @@ -0,0 +1 @@ +X �K�8�aL�s��,��а�^�����"��5�J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary new file mode 100644 index 0000000000..dd7df1c0fc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary @@ -0,0 +1 @@ +X �Ճ(x��.��x�_G��F��ߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley new file mode 100644 index 0000000000..b26e394526 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley @@ -0,0 +1 @@ +X ���np��+�t���3N��Ue�<Ҷ���=� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTx_Conway new file mode 100644 index 0000000000000000000000000000000000000000..9d1ce51c81a083d3d3747b94a91d699f4106dd15 GIT binary patch literal 899 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 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetBigLedgerPeerSnapshot new file mode 100644 index 0000000000000000000000000000000000000000..bc0aee634c3585dcba38b95485697c47fd8b2711 GIT binary patch literal 7 OcmZo-Xku!VPyzr4`~kuM literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..4d12a7ad6bfae580936a2d40b740fc81fee0f5e7 GIT binary patch literal 6 NcmZo-Xkuz)1^@;n0gC_t literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..1d07267558db5b737e2c199afbea01aebe644bca GIT binary patch literal 6 NcmZo-Xkuz)1ONsj0f_(r literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetGenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..6741a401cb06539d4b6072d432f1300832e0df5c GIT binary patch literal 6 NcmZo-Xku#Q1^@;v0h0g# literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..6706725ac788700bc71bad18fdb99b059d33c8df GIT binary patch literal 6 NcmZo-Xkuz)000Ie0f+zq literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..08c5c789e98877eb41e3d46a4313e6961c6a338e GIT binary patch literal 82 zcmZo-Xkuz&y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kabq#qRk literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Allegra_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..b5f799b2700599a0064a4e1a671e0976235b649a GIT binary patch literal 6 NcmZo-Xkuz)1po#o0gV6v literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetBigLedgerPeerSnapshot new file mode 100644 index 0000000000000000000000000000000000000000..7312d4e72650330016d124f2892f64c24de02fe2 GIT binary patch literal 7 OcmZo-XkuxUPyzr51OdbV literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..046b306d4dd38983845194e73872372d0791fa7f GIT binary patch literal 6 NcmZo-Xkuw(1^@;t0gV6v literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..a6f766751b97a6d264c6274c334e285a52fde724 GIT binary patch literal 6 NcmZo-Xkuw(1ONsp0gC_t literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetGenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..f701524d73ce531cc592a4a33ad33e8414bb996b GIT binary patch literal 6 NcmZo-XkuyP1^@;#0hIs% literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Alonzo_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..d9a18e85a2dc40d177d463697a59078e960c4a29 GIT binary patch literal 6 NcmZo-Xkuw(000Ik0g3Y-C^n00bKW1^@s6 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Babbage_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetBigLedgerPeerSnapshot new file mode 100644 index 0000000000000000000000000000000000000000..b3f0d169c0dac76f3ad1caf5a4c83c76950f5c99 GIT binary patch literal 7 OcmZo-Xku=ZPyzr500F}Q literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Mary_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetBigLedgerPeerSnapshot b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetBigLedgerPeerSnapshot new file mode 100644 index 0000000000000000000000000000000000000000..95d62a50fd510ffac3f83e194d06f6a280586aa4 GIT binary patch literal 7 OcmZo-Xku)XPyzr4_yNHH literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Query_Shelley_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo @@ -0,0 +1 @@ +� diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution @@ -0,0 +1 @@ +��X�1���s��]k?�ժ�P�[{%A��X �����-�ò^46���R�>Žb�{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo @@ -0,0 +1 @@ +� diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution @@ -0,0 +1 @@ +��X�1���s��]k?�ժ�P�[{%A��X �����-�ò^46���R�>Žb�{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo @@ -0,0 +1 @@ +� diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution @@ -0,0 +1 @@ +��X�1���s��]k?�ժ�P�[{%A��X �����-�ò^46���R�>Žb�{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution new file mode 100644 index 0000000000..967baf0b47 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +��X�1���s��]k?�ժ�P�[{%A���X �����-�ò^46���R�>Žb�{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_EraMismatchShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo @@ -0,0 +1 @@ +� diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution @@ -0,0 +1 @@ +��X�1���s��]k?�ժ�P�[{%A��X �����-�ò^46���R�>Žb�{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/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/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution @@ -0,0 +1 @@ +��X�1���s��]k?�ժ�P�[{%A��X �����-�ò^46���R�>Žb�{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley @@ -0,0 +1 @@ +�O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs index 6761c762ea..12b3cbab20 100644 --- a/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs +++ b/ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs @@ -29,6 +29,7 @@ import Data.Maybe (listToMaybe, mapMaybe) import Data.MemPack import Data.SOP.Index (Index (..)) import Data.Void (Void, absurd) +import Data.SOP.Strict.NS (NS(..)) import Data.Word import GHC.Generics import NoThunks.Class @@ -88,6 +89,13 @@ instance SupportedNetworkProtocolVersion ByronBlockHFC where latestReleasedNodeVersion = latestReleasedNodeVersionDefault +{------------------------------------------------------------------------------- + HasBlessedGenTxIdEra instance +-------------------------------------------------------------------------------} + +instance HasBlessedGenTxIdEra '[ByronBlock] where + blessedGenTxIdEra = Z mempty + {------------------------------------------------------------------------------- SerialiseHFC instance -------------------------------------------------------------------------------} 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 1a323e58e6..1504b34810 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 #-} @@ -16,6 +18,10 @@ module Ouroboros.Consensus.Byron.Ledger.Mempool ( GenTx (..) , TxId (..) , Validated (..) + , pattern ByronDlgId + , pattern ByronTxId + , pattern ByronUpdateProposalId + , pattern ByronUpdateVoteId -- * Transaction IDs , byronIdDlg , byronIdProp @@ -44,20 +50,17 @@ 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 (..), - byronProtVer, fromByronCBOR, serialize, slice, toByronCBOR, - unsafeDeserialize) -import Cardano.Ledger.Binary.Plain (enforceSize) -import Cardano.Prelude (Natural, cborError) +import Cardano.Ledger.Binary (ByteSpan, byronProtVer, fromByronCBOR, + serialize, slice, toByronCBOR, unsafeDeserialize) +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) 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) @@ -84,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) @@ -160,26 +163,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 @@ -224,17 +248,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 @@ -244,10 +268,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 @@ -316,24 +337,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/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Block.hs index 8db3c12acc..642e01f130 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 @@ -31,7 +31,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) @@ -71,6 +71,7 @@ module Ouroboros.Consensus.Cardano.Block ( , EraMismatch (..) ) where +import Data.ByteString.Short (ShortByteString) import Data.Kind import Data.SOP.BasicFunctors import Data.SOP.Functors @@ -353,54 +354,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) - -> CardanoGenTxId c -pattern GenTxIdShelley txid = - HardForkGenTxId (OneEraGenTxId (TagShelley (WrapGenTxId txid))) - -pattern GenTxIdAllegra :: - GenTxId (ShelleyBlock (TPraos c) AllegraEra) - -> CardanoGenTxId c -pattern GenTxIdAllegra txid = - HardForkGenTxId (OneEraGenTxId (TagAllegra (WrapGenTxId txid))) - -pattern GenTxIdMary :: - GenTxId (ShelleyBlock (TPraos c) MaryEra) - -> CardanoGenTxId c -pattern GenTxIdMary txid = - HardForkGenTxId (OneEraGenTxId (TagMary (WrapGenTxId txid))) - -pattern GenTxIdAlonzo :: - GenTxId (ShelleyBlock (TPraos c) AlonzoEra) - -> CardanoGenTxId c -pattern GenTxIdAlonzo txid = - HardForkGenTxId (OneEraGenTxId (TagAlonzo (WrapGenTxId txid))) - -pattern GenTxIdBabbage :: - GenTxId (ShelleyBlock (Praos c) BabbageEra) - -> CardanoGenTxId c -pattern GenTxIdBabbage txid = - HardForkGenTxId (OneEraGenTxId (TagBabbage (WrapGenTxId txid))) - -pattern GenTxIdConway :: - GenTxId (ShelleyBlock (Praos c) ConwayEra) - -> 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 new file mode 100644 index 0000000000..e69de29bb2 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 61fc950ca6..c2f28208f0 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 @@ -32,8 +32,10 @@ module Ouroboros.Consensus.Cardano.Node ( , pattern CardanoNodeToClientVersion14 , pattern CardanoNodeToClientVersion15 , pattern CardanoNodeToClientVersion16 + , pattern CardanoNodeToClientVersion17 , pattern CardanoNodeToNodeVersion1 , pattern CardanoNodeToNodeVersion2 + , pattern CardanoNodeToNodeVersion3 ) where import Cardano.Binary (DecoderError (..), enforceSize) @@ -222,6 +224,16 @@ prependTag tag payload = mconcat [ , payload ] +{------------------------------------------------------------------------------- + HasBlessedGenTxIdEra instances +-------------------------------------------------------------------------------} + +instance HasBlessedGenTxIdEra (CardanoShelleyEras c) where + blessedGenTxIdEra = Z mempty + +instance HasBlessedGenTxIdEra (CardanoEras c) where + blessedGenTxIdEra = S blessedGenTxIdEra + {------------------------------------------------------------------------------- SupportedNetworkProtocolVersion instance -------------------------------------------------------------------------------} @@ -251,6 +263,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 + ) + -- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage -- and Conway eras enabled, using 'ShelleyNodeToClientVersion8' for the -- Shelley-based eras. @@ -336,11 +362,29 @@ pattern CardanoNodeToClientVersion16 = :* Nil ) +-- | The hard fork enabled, using 'HardForkSpecificNodeToClientVersion4', and the Shelley, Allegra, Mary, Alonzo and Babbage +-- and Conway eras enabled, using 'ShelleyNodeToClientVersion12' for the +-- Shelley-based eras. +pattern CardanoNodeToClientVersion17 :: BlockNodeToClientVersion (CardanoBlock c) +pattern CardanoNodeToClientVersion17 = + HardForkNodeToClientEnabled + HardForkSpecificNodeToClientVersion4 + ( EraNodeToClientEnabled ByronNodeToClientVersion1 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion12 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion12 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion12 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion12 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion12 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion12 + :* Nil + ) + instance CardanoHardForkConstraints c => SupportedNetworkProtocolVersion (CardanoBlock c) where supportedNodeToNodeVersions _ = Map.fromList $ [ (NodeToNodeV_13, CardanoNodeToNodeVersion2) , (NodeToNodeV_14, CardanoNodeToNodeVersion2) + , (NodeToNodeV_15, CardanoNodeToNodeVersion3) ] supportedNodeToClientVersions _ = Map.fromList $ @@ -349,9 +393,10 @@ instance CardanoHardForkConstraints c , (NodeToClientV_18, CardanoNodeToClientVersion14) , (NodeToClientV_19, CardanoNodeToClientVersion15) , (NodeToClientV_20, CardanoNodeToClientVersion16) + , (NodeToClientV_21, CardanoNodeToClientVersion17) ] - latestReleasedNodeVersion _prx = (Just NodeToNodeV_14, Just NodeToClientV_20) + 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 5b8810bcf9..76529c94cb 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 @@ -41,6 +41,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where supportedNodeToNodeVersions _ = Map.fromList [ (NodeToNodeV_13, ShelleyNodeToNodeVersion1) , (NodeToNodeV_14, ShelleyNodeToNodeVersion1) + , (NodeToNodeV_15, ShelleyNodeToNodeVersion1) ] supportedNodeToClientVersions _ = Map.fromList [ (NodeToClientV_16, ShelleyNodeToClientVersion8) 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 403564ee40..80418eee02 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs @@ -54,6 +54,7 @@ import Data.SOP.InPairs (RequiringBoth (..), ignoringBoth) import Data.SOP.Strict import qualified Data.SOP.Tails as Tails import qualified Data.SOP.Telescope as Telescope +import Data.SOP.Strict.NS import qualified Data.Text as T (pack) import Data.Typeable import Data.Void (Void) @@ -141,6 +142,9 @@ instance ( ShelleyCompatible proto era SerialiseHFC instance -------------------------------------------------------------------------------} +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 -- prepared for future hard forks without having to do any bit twiddling. 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 81e449725e..4e0414283d 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 @@ -30,6 +30,7 @@ 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 @@ -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 981536e699..44b263333c 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 @@ -30,8 +30,10 @@ import qualified Cardano.Chain.Byron.API as CC import qualified Cardano.Chain.Common as CC 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 Cardano.Ledger.BaseTypes (knownNonZeroBounded) 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 (..)) @@ -215,11 +217,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 3bbd2123e1..2948aaf905 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 @@ -234,10 +234,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/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs b/ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/Generators.hs index f5726d67fb..1a641f5b95 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 @@ -44,6 +44,8 @@ import Ouroboros.Consensus.HardFork.Combinator.Serialisation import qualified Ouroboros.Consensus.HardFork.History as History import Ouroboros.Consensus.HeaderValidation import Ouroboros.Consensus.Ledger.Query +import Ouroboros.Consensus.Ledger.SupportsMempool + (ConvertRawTxId (..)) import Ouroboros.Consensus.Node.NetworkProtocolVersion import Ouroboros.Consensus.Node.Serialisation (Some (..)) import Ouroboros.Consensus.Protocol.TPraos (TPraos) @@ -263,7 +265,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 @@ -468,6 +474,14 @@ 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 = 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)) (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 6c6f044823..9c8a7c3ba1 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 @@ -216,6 +216,9 @@ instance TranslateTxMeasure AlonzoMeasure ConwayMeasure where instance TranslateTxMeasure ConwayMeasure ConwayMeasure where translateTxMeasure = id +instance HasBlessedGenTxIdEra (ShelleyBasedHardForkEras proto1 era1 proto2 era2) where + blessedGenTxIdEra = S $ Z mempty + instance ShelleyBasedHardForkConstraints proto1 era1 proto2 era2 => SerialiseHFC (ShelleyBasedHardForkEras proto1 era1 proto2 era2) -- use defaults 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 d2f0502662..1a66c9c3f4 100644 --- a/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs +++ b/ouroboros-consensus-cardano/test/byron-test/Test/ThreadNet/Byron.hs @@ -1368,4 +1368,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' 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 new file mode 100644 index 0000000000..e69de29bb2 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 b89e7708ea..fd7afb7c8f 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 @@ -37,4 +38,5 @@ instance CardanoHardForkConstraints c CardanoNodeToClientVersion14 -> "CardanoNodeToClientVersion14" CardanoNodeToClientVersion15 -> "CardanoNodeToClientVersion15" CardanoNodeToClientVersion16 -> "CardanoNodeToClientVersion16" + CardanoNodeToClientVersion17 -> "CardanoNodeToClientVersion17" _ -> 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 014d286490..e664d1fa65 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 @@ -396,6 +396,9 @@ instance HasHardForkTxOut '[BlockA, BlockB] where type TestBlock = HardForkBlock '[BlockA, BlockB] +instance HasBlessedGenTxIdEra '[BlockA, BlockB] where + blessedGenTxIdEra = Z mempty + instance CanHardFork '[BlockA, BlockB] where type HardForkTxMeasure '[BlockA, BlockB] = IgnoringOverflow ByteSize32 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. 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 6e5f55da74..65e2d7226d 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 @@ -124,7 +123,6 @@ 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 OneEraHeader xs = OneEraHeader { getOneEraHeader :: NS Header xs } newtype OneEraIsLeader xs = OneEraIsLeader { getOneEraIsLeader :: NS WrapIsLeader xs } newtype OneEraLedgerError xs = OneEraLedgerError { getOneEraLedgerError :: NS WrapLedgerErr xs } @@ -160,21 +158,20 @@ instance Condense (OneEraHash xs) where condense = show {------------------------------------------------------------------------------- - OneEraGenTxId + GenTxId -------------------------------------------------------------------------------} --- | This instance compares the underlying raw hash ('toRawTxIdHash') of the --- 'TxId'. +-- | The GenTxId for an era -- --- 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 +-- This type is special in effectively the same way as OneEraHash (and for +-- basically the same reason, too) -- it doesn't use an NS, because we don't +-- want to be able to differentiate eras' 'GenTxId's. Ideally, 'OneEraGenTxId' +-- would be serialised simply as a 'ShortByteString', but for backwards +-- compatibility reasons we /pretend/ that it's always a Shelley-era 'GenTxId' +-- when we're communicating with other nodes or clients that don't support the +-- new serialisation format. +newtype OneEraGenTxId xs = OneEraGenTxId { getOneEraGenTxId :: ShortByteString } + deriving (Show, Eq, Ord, Generic, NoThunks) {------------------------------------------------------------------------------- Value for two /different/ eras @@ -265,12 +262,6 @@ getSameValue values = | otherwise = throwError "differing values across hard fork" -oneEraGenTxIdRawHash :: CanHardFork xs => OneEraGenTxId xs -> ShortByteString -oneEraGenTxIdRawHash = - hcollapse - . hcmap proxySingle (K . toRawTxIdHash . unwrapGenTxId) - . getOneEraGenTxId - {------------------------------------------------------------------------------- NoThunks instances -------------------------------------------------------------------------------} @@ -296,9 +287,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) @@ -364,6 +352,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 289f92ee50..cda1520690 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 @@ -29,7 +29,6 @@ module Ouroboros.Consensus.HardFork.Combinator.Degenerate ( , LedgerState (DegenLedgerState) , OneEraTipInfo (DegenTipInfo) , TopLevelConfig (DegenTopLevelConfig) - , TxId (DegenGenTxId) ) where import Data.SOP.Functors (Flip (..)) @@ -63,7 +62,6 @@ import Ouroboros.Consensus.TypeFamilyWrappers {-# COMPLETE DegenBlockConfig #-} {-# COMPLETE DegenCodecConfig #-} {-# COMPLETE DegenGenTx #-} -{-# COMPLETE DegenGenTxId #-} {-# COMPLETE DegenHeader #-} {-# COMPLETE DegenLedgerError #-} {-# COMPLETE DegenLedgerState #-} @@ -96,14 +94,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 1074e8ad7b..b0c6d9cc41 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 @@ -44,6 +44,8 @@ import Ouroboros.Consensus.Ledger.Basics import Ouroboros.Consensus.Ledger.Extended (ExtLedgerState (..)) import Ouroboros.Consensus.Ledger.Query import Ouroboros.Consensus.Ledger.Tables.Utils +import Ouroboros.Consensus.Ledger.SupportsMempool + (ConvertRawTxId (..)) import Ouroboros.Consensus.Storage.Serialisation import Ouroboros.Consensus.TypeFamilyWrappers @@ -197,7 +199,10 @@ instance Inject GenTx where inject = injectNS' (Proxy @GenTx) . forgetInjectionIndex instance Inject WrapGenTxId where - inject = injectNS' (Proxy @WrapGenTxId) . forgetInjectionIndex + inject ix w = + WrapGenTxId $ HardForkGenTxId $ OneEraGenTxId $ + hcollapse $ hcmap proxySingle (K . toRawTxIdHash . unwrapGenTxId) $ + injectNS (forgetInjectionIndex 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 772cd86fdb..f71c3478c5 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 @@ -166,7 +166,6 @@ deriving via IsomorphicUnary NS Header instance Isomorphic He deriving via IsomorphicUnary NS I instance Isomorphic I deriving via IsomorphicUnary NS WrapCannotForge instance Isomorphic WrapCannotForge deriving via IsomorphicUnary NS WrapForgeStateUpdateError instance Isomorphic WrapForgeStateUpdateError -deriving via IsomorphicUnary NS WrapGenTxId instance Isomorphic WrapGenTxId deriving via IsomorphicUnary NS WrapIsLeader instance Isomorphic WrapIsLeader deriving via IsomorphicUnary NS WrapTipInfo instance Isomorphic WrapTipInfo deriving via IsomorphicUnary NS WrapValidatedGenTx instance Isomorphic WrapValidatedGenTx 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 46eacc01d0..2555cadfc0 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 @@ -488,9 +488,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/NetworkVersion.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs index 858fa5dcde..ef2e91ee59 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/NetworkVersion.hs @@ -34,6 +34,8 @@ import Ouroboros.Consensus.TypeFamilyWrappers -- protocols, e.g., the era tag. 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@ @@ -41,6 +43,8 @@ data HardForkSpecificNodeToNodeVersion = 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 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..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,8 +7,9 @@ import Ouroboros.Consensus.HardFork.Combinator.Serialisation.Common as HardForkNodeToNodeVersion (..), HardForkSpecificNodeToClientVersion (..), HardForkSpecificNodeToNodeVersion (..), - SerialiseConstraintsHFC, SerialiseHFC (..), - isHardForkNodeToClientEnabled, isHardForkNodeToNodeEnabled) + HasBlessedGenTxIdEra (..), 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 a0b10c5cc5..720476b2a5 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 (..) + , HasBlessedGenTxIdEra (..) , SerialiseConstraintsHFC , SerialiseHFC (..) , disabledEraException @@ -129,6 +130,15 @@ notFirstEra = hcmap proxySingle aux aux :: forall f blk. SingleEraBlock blk => f blk -> SingleEraInfo blk aux _ = singleEraInfo (Proxy @blk) + +-- | 'HasBlessedGenTxIdEra' is used solely for backwards-compatibility reasons +-- for when we're communicating with older node / client versions and need to +-- serialise / deserialise era-tagged 'GenTxId's. The 'blessedGenTxIdEra' is +-- used as the "default" era tag when we want to send a (non-era-tagged) +-- 'GenTxId' to these nodes / clients. +class HasBlessedGenTxIdEra (xs :: [Type]) where + blessedGenTxIdEra :: NS Proxy xs + {------------------------------------------------------------------------------- Conditions required by the HFC to support serialisation -------------------------------------------------------------------------------} @@ -169,6 +179,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 + , 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 f0744af20e..2b9bcd2db9 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 @@ -44,12 +44,14 @@ import Ouroboros.Consensus.HardFork.Combinator.Serialisation.Serialise import qualified Ouroboros.Consensus.HardFork.History as History import Ouroboros.Consensus.Ledger.Query 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.Util ((.:)) import Ouroboros.Network.Block (Serialised, unwrapCBORinCBOR, wrapCBORinCBOR) +import Data.ByteString.Short (ShortByteString) {------------------------------------------------------------------------------- Serialisation of products @@ -328,8 +330,33 @@ instance SerialiseHFC xs instance SerialiseHFC xs => SerialiseNodeToClient (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where - encodeNodeToClient = dispatchEncoder `after` (getOneEraGenTxId . getHardForkGenTxId) - decodeNodeToClient = fmap (HardForkGenTxId . OneEraGenTxId) .: dispatchDecoder + -- 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 -> + 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 = + fmap (HardForkGenTxId . OneEraGenTxId) $ + case v of + HardForkNodeToClientEnabled hfc _ + | hfc >= HardForkSpecificNodeToClientVersion4 -> do + Serialise.decode + 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 edf78b0051..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 @@ -2,6 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GADTs #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE QuantifiedConstraints #-} {-# LANGUAGE RankNTypes #-} @@ -17,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) @@ -137,7 +139,32 @@ instance SerialiseHFC xs encodeNodeToNode = dispatchEncoder `after` (getOneEraGenTx . getHardForkGenTx) decodeNodeToNode = fmap (HardForkGenTx . OneEraGenTx) .: dispatchDecoder + instance SerialiseHFC xs => SerialiseNodeToNode (HardForkBlock xs) (GenTxId (HardForkBlock xs)) where - encodeNodeToNode = dispatchEncoder `after` (getOneEraGenTxId . getHardForkGenTxId) - decodeNodeToNode = fmap (HardForkGenTxId . OneEraGenTxId) .: dispatchDecoder + -- 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 -> + Serialise.encode txid + HardForkNodeToNodeEnabled _ _ -> do + let blessedGenTxId :: NS (K ShortByteString) xs + blessedGenTxId = hmap (pure $ K txid) blessedGenTxIdEra + encodeNS (hpure $ Fn $ K . Serialise.encode . unK) blessedGenTxId + HardForkNodeToNodeDisabled _ -> + Serialise.encode txid + decodeNodeToNode _cc v = + fmap (HardForkGenTxId . OneEraGenTxId) $ + case v of + HardForkNodeToNodeEnabled hfv _ | 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/Query/Version.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs index 9ed29584a3..7ef85266b1 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 @@ -28,3 +28,4 @@ nodeToClientVersionToQueryVersion x = case x of NodeToClientV_18 -> QueryVersion2 NodeToClientV_19 -> QueryVersion2 NodeToClientV_20 -> QueryVersion3 + NodeToClientV_21 -> QueryVersion3 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 109c4c3753..addca0473c 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 @@ -235,6 +235,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) (SomeBlockQuery (BlockQuery blk)) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk) @@ -286,6 +287,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) (SomeBlockQuery (BlockQuery blk)) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk) @@ -542,6 +544,7 @@ roundtrip_SerialiseNodeToClient ( SerialiseNodeToClientConstraints blk , ArbitraryWithVersion (BlockNodeToClientVersion blk) blk , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTx blk) + , ArbitraryWithVersion (BlockNodeToClientVersion blk) (GenTxId blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (ApplyTxErr blk) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeBlockQuery (BlockQuery blk)) , ArbitraryWithVersion (BlockNodeToClientVersion blk) (SomeResult blk) @@ -560,6 +563,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 @(SomeBlockQuery (BlockQuery blk))) "BlockQuery" -- Note: Ideally we'd just use 'rt' to test Ledger config, but that would