From 0f10c19d77bc72ba0fcc009d0e80b4ac2258d33c Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Mon, 5 Aug 2024 16:05:14 -0400 Subject: [PATCH 1/2] Bump plutus and ledger dependencies in preparation for cardano-node-9.2 release --- README.md | 10 +++--- cabal.project | 5 +-- flake.lock | 6 ++-- ouroboros-consensus-cardano/CHANGELOG.md | 11 ++++++ .../ApplyTxErr_Allegra | Bin 0 -> 39 bytes .../ApplyTxErr_Alonzo | Bin 0 -> 39 bytes .../ApplyTxErr_Babbage | Bin 0 -> 39 bytes .../ApplyTxErr_Byron | Bin 0 -> 14 bytes .../ApplyTxErr_Conway | 1 + .../ApplyTxErr_Mary | Bin 0 -> 39 bytes .../ApplyTxErr_Shelley | Bin 0 -> 39 bytes .../ApplyTxErr_WrongEraByron | Bin 0 -> 19 bytes .../ApplyTxErr_WrongEraShelley | Bin 0 -> 19 bytes .../Block_Allegra | Bin 0 -> 1799 bytes .../CardanoNodeToClientVersion13/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 .../CardanoNodeToClientVersion13/Block_Conway | Bin 0 -> 1752 bytes .../CardanoNodeToClientVersion13/Block_Mary | Bin 0 -> 1894 bytes .../Block_Shelley | Bin 0 -> 1687 bytes .../GenTxId_Allegra | 3 ++ .../GenTxId_Alonzo | 1 + .../GenTxId_Babbage | 1 + .../GenTxId_Byron | Bin 0 -> 38 bytes .../GenTxId_Conway | 1 + .../CardanoNodeToClientVersion13/GenTxId_Mary | 1 + .../GenTxId_Shelley | 1 + .../GenTx_Allegra | Bin 0 -> 799 bytes .../CardanoNodeToClientVersion13/GenTx_Alonzo | Bin 0 -> 872 bytes .../GenTx_Babbage | Bin 0 -> 973 bytes .../CardanoNodeToClientVersion13/GenTx_Byron | Bin 0 -> 240 bytes .../CardanoNodeToClientVersion13/GenTx_Conway | Bin 0 -> 899 bytes .../CardanoNodeToClientVersion13/GenTx_Mary | Bin 0 -> 894 bytes .../GenTx_Shelley | Bin 0 -> 687 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_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Allegra_GetStakeDistribution | Bin 0 -> 6 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_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Alonzo_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_AnytimeByron | Bin 0 -> 5 bytes .../Query_AnytimeShelley | Bin 0 -> 5 bytes .../Query_Babbage_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Babbage_GetEpochNo | Bin 0 -> 6 bytes .../Query_Babbage_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Babbage_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Babbage_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Babbage_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Babbage_GetStakeDistribution | Bin 0 -> 6 bytes .../CardanoNodeToClientVersion13/Query_Byron | Bin 0 -> 5 bytes .../Query_Conway_GetCurrentPParams | Bin 0 -> 6 bytes .../Query_Conway_GetEpochNo | Bin 0 -> 6 bytes .../Query_Conway_GetGenesisConfig | Bin 0 -> 6 bytes .../Query_Conway_GetLedgerTip | Bin 0 -> 6 bytes .../Query_Conway_GetNonMyopicMemberRewards | Bin 0 -> 82 bytes .../Query_Conway_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Conway_GetStakeDistribution | Bin 0 -> 6 bytes .../Query_HardFork | Bin 0 -> 4 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_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Mary_GetStakeDistribution | Bin 0 -> 6 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_GetProposedPParamsUpdates | Bin 0 -> 6 bytes .../Query_Shelley_GetStakeDistribution | Bin 0 -> 6 bytes .../Result_Allegra_EmptyPParams | Bin 0 -> 40 bytes .../Result_Allegra_EpochNo | 1 + .../Result_Allegra_GenesisConfig | Bin 0 -> 78 bytes .../Result_Allegra_LedgerTip | 1 + .../Result_Allegra_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Allegra_ProposedPParamsUpdates | 1 + .../Result_Allegra_StakeDistribution | 1 + .../Result_Alonzo_EmptyPParams | Bin 0 -> 63 bytes .../Result_Alonzo_EpochNo | 1 + .../Result_Alonzo_GenesisConfig | Bin 0 -> 78 bytes .../Result_Alonzo_LedgerTip | 1 + .../Result_Alonzo_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Alonzo_ProposedPParamsUpdates | 1 + .../Result_Alonzo_StakeDistribution | 1 + .../Result_AnytimeByron | Bin 0 -> 5 bytes .../Result_AnytimeShelley | Bin 0 -> 15 bytes .../Result_Babbage_EmptyPParams | Bin 0 -> 55 bytes .../Result_Babbage_EpochNo | 1 + .../Result_Babbage_GenesisConfig | Bin 0 -> 78 bytes .../Result_Babbage_LedgerTip | Bin 0 -> 37 bytes .../Result_Babbage_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Babbage_ProposedPParamsUpdates | 1 + .../Result_Babbage_StakeDistribution | 1 + .../CardanoNodeToClientVersion13/Result_Byron | Bin 0 -> 138 bytes .../Result_Conway_EmptyPParams | Bin 0 -> 145 bytes .../Result_Conway_EpochNo | 1 + .../Result_Conway_GenesisConfig | Bin 0 -> 78 bytes .../Result_Conway_LedgerTip | 1 + .../Result_Conway_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Conway_ProposedPParamsUpdates | 1 + .../Result_Conway_StakeDistribution | 1 + .../Result_EraMismatchByron | Bin 0 -> 19 bytes .../Result_EraMismatchShelley | Bin 0 -> 19 bytes .../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_LedgerTip | 1 + .../Result_Mary_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Mary_ProposedPParamsUpdates | 1 + .../Result_Mary_StakeDistribution | 1 + .../Result_Shelley_EmptyPParams | Bin 0 -> 40 bytes .../Result_Shelley_EpochNo | 1 + .../Result_Shelley_GenesisConfig | Bin 0 -> 78 bytes .../Result_Shelley_LedgerTip | 1 + .../Result_Shelley_NonMyopicMemberRewards | Bin 0 -> 139 bytes .../Result_Shelley_ProposedPParamsUpdates | 1 + .../Result_Shelley_StakeDistribution | 1 + .../SerialisedBlock_Allegra | 1 + .../SerialisedBlock_Alonzo | 1 + .../SerialisedBlock_Babbage | 1 + .../SerialisedBlock_Byron_EBB | 1 + .../SerialisedBlock_Byron_regular | 1 + .../SerialisedBlock_Conway | 1 + .../SerialisedBlock_Mary | 1 + .../SerialisedBlock_Shelley | 1 + .../SlotNo_Allegra | 1 + .../SlotNo_Alonzo | 1 + .../SlotNo_Babbage | 1 + .../CardanoNodeToClientVersion13/SlotNo_Byron | 1 + .../SlotNo_Conway | 1 + .../CardanoNodeToClientVersion13/SlotNo_Mary | 1 + .../SlotNo_Shelley | 1 + .../ShelleyNodeToClientVersion9/ApplyTxErr | Bin 0 -> 36 bytes .../ShelleyNodeToClientVersion9/Block | Bin 0 -> 1685 bytes .../ShelleyNodeToClientVersion9/GenTx | Bin 0 -> 685 bytes .../ShelleyNodeToClientVersion9/GenTxId | 1 + .../Query_GetCurrentPParams | 1 + .../Query_GetEpochNo | 1 + .../Query_GetGenesisConfig | 1 + .../Query_GetLedgerTip | Bin 0 -> 2 bytes .../Query_GetNonMyopicMemberRewards | Bin 0 -> 78 bytes .../Query_GetProposedPParamsUpdates | 1 + .../Query_GetStakeDistribution | 1 + .../Result_EmptyPParams | Bin 0 -> 39 bytes .../Result_EpochNo | 1 + .../Result_GenesisConfig | Bin 0 -> 77 bytes .../Result_LedgerTip | 1 + .../Result_NonMyopicMemberRewards | Bin 0 -> 138 bytes .../Result_ProposedPParamsUpdates | 1 + .../Result_StakeDistribution | 1 + .../SerialisedBlock | 1 + .../ShelleyNodeToClientVersion9/SlotNo | 1 + .../ouroboros-consensus-cardano.cabal | 22 ++++++------ .../Consensus/Cardano/CanHardFork.hs | 17 ++++----- .../Ouroboros/Consensus/Cardano/Node.hs | 23 ++++++++++-- .../Shelley/Ledger/NetworkProtocolVersion.hs | 4 +++ .../Consensus/Shelley/Ledger/Query.hs | 33 ++++++++++++++++++ .../Cardano/Tools/DBAnalyser/Analysis.hs | 6 ++-- .../Test/Consensus/Cardano/Golden.hs | 1 + .../MiniProtocol/LocalTxSubmission/Server.hs | 3 +- .../Test/ThreadNet/AllegraMary.hs | 4 +-- .../cardano-test/Test/ThreadNet/MaryAlonzo.hs | 4 +-- .../Test/ThreadNet/ShelleyAllegra.hs | 2 +- ouroboros-consensus-diffusion/CHANGELOG.md | 7 ++++ .../ouroboros-consensus-diffusion.cabal | 8 ++--- .../Ouroboros/Consensus/Network/NodeToNode.hs | 4 +-- .../Ouroboros/Consensus/NodeKernel.hs | 3 +- ouroboros-consensus/CHANGELOG.md | 17 +++++++++ .../Bench/Consensus/Mempool/TestBlock.hs | 5 +-- .../bench/mempool-bench/Main.hs | 3 +- ouroboros-consensus/ouroboros-consensus.cabal | 10 +++--- .../Consensus/Ledger/Query/Version.hs | 1 + .../Ouroboros/Consensus/Mempool.hs | 4 +-- .../Ouroboros/Consensus/Mempool/API.hs | 6 ++-- .../Consensus/Mempool/Impl/Common.hs | 6 ++-- .../Ouroboros/Consensus/Mempool/Init.hs | 4 +-- .../Ouroboros/Consensus/Mempool/TxSeq.hs | 18 +++++----- .../Ouroboros/Consensus/Mempool/Update.hs | 6 ++-- .../Ouroboros/Consensus/Util/Orphans.hs | 8 +++-- .../Test/Consensus/Mempool/Mocked.hs | 2 +- .../consensus-test/Test/Consensus/Mempool.hs | 27 +++++++------- .../Test/Consensus/Mempool/Fairness.hs | 3 +- sop-extras/CHANGELOG.md | 7 ++++ sop-extras/sop-extras.cabal | 4 +-- strict-sop-core/CHANGELOG.md | 7 ++++ strict-sop-core/strict-sop-core.cabal | 4 +-- 198 files changed, 274 insertions(+), 100 deletions(-) create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_WrongEraByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_WrongEraShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Allegra_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Alonzo_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_AnytimeByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_AnytimeShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_HardFork create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_AnytimeByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_AnytimeShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_EraMismatchByron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_EraMismatchShelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_HardFork create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_EBB create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_regular create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Shelley create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Allegra create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Alonzo create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Babbage create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Byron create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Conway create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Mary create mode 100644 ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Shelley create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/ApplyTxErr create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Block create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/GenTx create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/GenTxId create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetCurrentPParams create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetEpochNo create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetGenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetLedgerTip create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetNonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Query_GetStakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_EmptyPParams create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_EpochNo create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_GenesisConfig create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_LedgerTip create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_NonMyopicMemberRewards create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_ProposedPParamsUpdates create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Result_StakeDistribution create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SerialisedBlock create mode 100644 ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SlotNo diff --git a/README.md b/README.md index 88f41084a1..1819cee7af 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Ouroboros Consensus -[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.20.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.20.0.0/) -[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.17.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.17.0.1/) +[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.20.1.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.20.1.0/) +[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.17.1.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.17.1.0/) [![protocol](https://img.shields.io/badge/ouroboros--consensus--protocol-0.9.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-protocol-0.9.0.1/) -[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.18.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.18.0.0/) -[![sop-extras](https://img.shields.io/badge/sop--extras-0.2.0.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.0.0/) -[![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.1.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.1.0/) +[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.19.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.19.0.0/) +[![sop-extras](https://img.shields.io/badge/sop--extras-0.2.1.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.2.1.0/) +[![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.2.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.2.0/) [![docs](https://img.shields.io/badge/Documentation-yellow)][webpage] diff --git a/cabal.project b/cabal.project index 4b41a250c9..9a82c4fd96 100644 --- a/cabal.project +++ b/cabal.project @@ -16,7 +16,7 @@ index-state: -- Bump this if you need newer packages from Hackage , hackage.haskell.org 2024-07-23T00:03:37Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2024-08-15T10:40:33Z + , cardano-haskell-packages 2024-08-27T16:28:01Z packages: ouroboros-consensus @@ -50,6 +50,3 @@ if impl(ghc >= 9.10) , cardano-ledger-binary:plutus-ledger-api , cardano-ledger-conway:plutus-ledger-api - constraints: - -- Earlier versions do not compile with ghc-9.10 - , plutus-ledger-api ^>=1.31 diff --git a/flake.lock b/flake.lock index c8189eda4e..79fc009beb 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1723719216, - "narHash": "sha256-0RCMUZu1YthjOJUT6JHCfwxLZVobhTzx17nK7U745/I=", + "lastModified": 1724604182, + "narHash": "sha256-gQmj2hHwEvS29Gf+juG95T7Qt5LfzDJKzdPajcuHZgs=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "e4cfce4c4612111b0b51567cb4445a7740303f0e", + "rev": "3a25be01c845e86092e514403882ac74141ac3da", "type": "github" }, "original": { diff --git a/ouroboros-consensus-cardano/CHANGELOG.md b/ouroboros-consensus-cardano/CHANGELOG.md index 3b8f66bef5..42144d9fdb 100644 --- a/ouroboros-consensus-cardano/CHANGELOG.md +++ b/ouroboros-consensus-cardano/CHANGELOG.md @@ -2,6 +2,17 @@ # Changelog entries + +## 0.18.0.0 — 2024-08-26 + +### Breaking + +- Add `GetProposals` and `GetRatifyState` queries. +- Propagate cardano-ledger's updated `TranslationContext` `NoGenesis` +- Add `NodeToClientV_17` to `supportedNodeToClientVersions` +- Add `CardanoNodeToClientVersion13` +- Replace deprecated `TxSizeInBytes` with `SizeInBytes` + ## 0.18.0.0 — 2024-07-02 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..018b7bc479fdc07b689fdf01efb60f256b9bd9a6 GIT binary patch literal 39 vcmZo{Vw&H?*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN)8a> literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..d9c76ed7084ce14b9e08833533dac4c38fc81797 GIT binary patch literal 39 vcmZo{VwvB>*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN>~u& literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Babbage new file mode 100644 index 0000000000000000000000000000000000000000..dcabd6d2749da7f9805399d6c25d0063a8e28cc0 GIT binary patch literal 39 vcmZo{Vx8Z_*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN_`OJ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Byron new file mode 100644 index 0000000000000000000000000000000000000000..1728309622124f9d85cb596a6163f5c1c4b8d8f5 GIT binary patch literal 14 ScmZo{VgSKrhQ!1s1_l5iVgt_r literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Conway new file mode 100644 index 0000000000..7e36ce4445 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Conway @@ -0,0 +1 @@ +X1s]k?ժP[{%A \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Mary new file mode 100644 index 0000000000000000000000000000000000000000..f0ab5dd88118933571c1f90bf476eaa89bb3b758 GIT binary patch literal 39 vcmZo{VxHf`*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN;44S literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_Shelley new file mode 100644 index 0000000000000000000000000000000000000000..15bf711ff08d74707ca7c28f45f016abdb7d251f GIT binary patch literal 39 vcmZo{Vw~T^*u)Sa^I*A%;S8a}--~y#yot@W|8sTKjR3ZWXqIXYRmcATN$C*b literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_WrongEraByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_WrongEraByron new file mode 100644 index 0000000000000000000000000000000000000000..9735c28d23436ca90c123fd781e030a3bf8c2969 GIT binary patch literal 19 acmZo_VoVRtNX^Mft!!dQb*e1N&jSEQF$XjN literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_WrongEraShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/ApplyTxErr_WrongEraShelley new file mode 100644 index 0000000000000000000000000000000000000000..43f2fa8267f5b22ef6dd14c7a562e2fd1bab5ca0 GIT binary patch literal 19 acmZo_Vn}tWEXvPoVoVRtNX^Mftpor@n+G%i literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..b525fa7868f6550666ddc7f4b81f258068d33d96 GIT binary patch literal 1799 zcmai!`8U)H7{X)j~ z6S%_}9(u7dH=U+|Irf#f)cZwAGP30$AtU|W>qzVZ=ZD)XUGo-S#*<)d8$L%`aVat# zRxd?A{(A=ml3nJzy5vL6Ji8;p2U=7SP}Kt=rM=Y55h%E2DqMh3O#Q>VO`{hrjI~0> z8sJH~qSebKqT88dsCL^?NogYz=qd_dVdZ~H!yjl4U!%GUuEy_VuP=jni`EYqs`%8u z&9hdVaOM{U`K5aE3U~(G?zr1{mLVf{f7h5VIn_DJkWx(kR@GZ45PQzE+FpZ^*a-DA zL_O-uzq^Rpg=0mXJ0)-P<^pB=Gcj@sIE-juiR&I9N8CDISv1^!9?fZTjs+A58D9H6??SoRb9Y))D zmUbJpotu6Nn$bV435ALK6pHbmVoOH->`2w_JNFiCp*h}oapv^ZEecpokT7E-AMj4+ zkHE$)yhILNGlIhKxzWwF2+U?od{)~sY6=ntxug3LpRa>ol;BfVYFigq1;pM?JGaw{ ztZ1U*>x2dX0LeL08OFIO=N)&Yi9HyMHF8bWAOttJ9&c*o+CNG2z<{G}?pAx(<5x#uXo?5u5o4+ai+!P?KCTIyr@6zrxVmdVehijN*}@%nk<1@iTR z-q1Q;`KJHK{tH?`Jp)H)E#e8{+V`%Dc1?0jHAMY%-Gd9+-X@s7Fz<$*dMS2%gzs0d zDgoUnPZxixAK~}tJHSPg?rslT@%$$kg{hio3&cCnU^QLq%Jp`#BTt1*@3eI^O^mJ@ z_u)omeY3J+Unc5&@UE-wViSfi`@5CHImA_LtR`IxI5mWGR;cO0U0StFi zc8QdV*!{E%C@ai+W=OnSXL+bKt3rb@qiwM|AyYZ}S?JOBm&8YQ(~7}UEMRimP^pS}F2dOY^#q4YKXkY!IO_(9LGPIFUc z)>`_-zR5lOXvPVXsUa-sn1;XbV`dCDPbo&Cvx#Y-$iHB#+AuIsnczAVoh&9fJ=xFU zH1}T#QDS@;GHVj*X}syFO*ub>vxsJY-)4BPxF+hzIp!XW+ zR=CV4FtEGHGwkK=tY{OSeV?8rmhISTEfMB$JtKq8YN00Kaz&5Rj{&2^CQcydQg&k9_Z-C65rWZavG7bWJp-LsV0`sflBKN9Bz z6B|*6U^o!}b~6rpb4(IM3!u}Ofiz|mlNe5?pE(eh0HGj&|0_R`X`kYJm95t)p@Qpa z{JxYH)7MgXUtjAbI{TbFO^p8=wEQU)#0Qn$-j>zpN_UEwEyx+)(^hLk+F!li9t;Yjd5pHkUJClN?u5OH}BtEwmvbLP31h-To*=?MsHn@6nuBTo=9sF^D zKBibwLG)oLb?{im!RQT$S(tk3Kx2t6wfN36ExH6V&_FI4KWTHzw4K7w^cvL!$tfp& z7IF9vEoWMV_=K$2^{)k91|F6PmG4z+)hbx%^qPXIO| zOhht?tL0NxCf@Z2(QReP!>+qJc5qb04c`CKH{0?ry{m2qO5@n_KHl*v*OMTzL^4J4 O;UOE9AK&bgUi}AOr!))z literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..dc3903d3a62a08c9bdacf27ca74ce62e6b71ee66 GIT binary patch literal 1872 zcmai!c{tPw7{`CV8FLnLwKK~wX**^Vw~vfeY*)Fl*1v{SDA*~IFq(PFYDx8QHIQ7>xD|mEivY) z&}wZpUVa(spWsbVAOBvjn{{!psCAt}nQ$^dwJRO3MkeCtyJz#={MB^Vyecp1Yq@Yl zJ)HE*&eH;zbxip+Be&GNkLqsc54jNbPFT)hy=`)z;A@HgVoRODf+Mejrsjqjx7=tn z%9LYZlG1LRt;gkdqvqJL$B-H4!=hAr;#YDpX$V$ zU&OkSRtMKG^=N^v`iq2G0D!Es71NA!la902r(o{%#2L9HZ>9z{G##q1%XfT~;*N*x zdZRxTRJq>^xh!X}`rcU0J*{3EQ^(vx#<_ab&i^1D1$crj_Ey7Mstj(xbnIPOq2*9( zm1%N9T&^{}pmKU_fu0dI*rk~Pf3u==E80)m(S8e@A(c=0^eF6kQOBn<7&`;G!)^ixreV9x#4jeaP?x|6GPn_w=A8SGOusuj_X)_8B!^i{Uvp8{$tOpHUr;X z^a&{uD&BdnzA6Ku&tCIA7$&~3F}?%!b{gkRW=-IoMQ75xhDxilo2^`PgiqaCgeNBs z^5+S9EoDaG=)3~P4jB@L9!L{)2PnZR=oHXS2ea!OtF4W9Er zg6?$mZE2`a&s1jq=V`>qx7PCv)J3Q4v}?P&%M)Bi z1t&2IW5ZoJISpOE2WxOgdd=#kdYfN%+)O$?O0*EbUzH3iimO9D883O-j}xPF6!zYI z`NS{29;W)n>EU;bD44<(0E|G?Nwovrh1N7GUlO{MQP|bPYhTM;QrbCX+%(1(r&(?Q zS$vMdN;vBcoz~Pe6P?Epydb9NC+tfr%7OTldKGfrQwoUozfk0FJ zEcPzj@%IZ`B6TRJZIxfK2+71V-gXzKZnf=VDqAQx)B^s_>TAl1d9No z@BBczW74j(uwJXY7O|u5>ugF)XXC}&`t$)@RxF8)5v>qSI)X)(2mHEBRX<<3b)MHK zH|`Z?wb*;D-vyg^P%a+7!A2xURulqwl)^IRg2p?xqO0ss34G3k9i{Ybq>53Dt7#4X z$@q_tgk_)VF!xX6Sf_V4%&+@wo2p2@71(LGuc+Fi;av zhHXo?w=hNNo-!I_4ZBCy!ZlTN#+tO)f>UiXBg_+ZL8Hv~-$sfYLK{-LRV*cfCE?({ zhl#s`u)|^5Low*}UYB6yCVs-(49PPB8fH3z0HCc6D9OR3W(=GJ0AzF?LRLv#E)g&Q qqKknNFp$URhOmQB_I|Pa03I3vQF0=*jUNajU?K{3u>Wr1oA@tqHCSu_ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Babbage new file mode 100644 index 0000000000000000000000000000000000000000..279d590c81066bbeab4f42723931f373c80af1b6 GIT binary patch literal 1826 zcmbtTS5Q+46n!s^5Cx>Ui4uscB1JkPRf>qANmFCGQy_OR-P{Sx_QP zMFo^11PzKxN27uPdkG-YtBmflupj%eAG$L;bLaltGv}O{bFP@UONxx(P9n)@X^0{) zDB7SJG+y4fm#{tAM?YTilIsvK3ZG3#ynTVAsB{&gB=bJLW=l_G{o(ae*Q!2%*%l%# zBxfqDo?`RBDmjM#&k+b@>ps@pOboO1ZHbEPs#ixN<#$BX#$ronAg{ziGyzgAXpt=z zv6I%O+M%ziQ5@a5`O`&nr75<^O?huw1rr0vV=i(wCiim^*}g9Fd(aL+`jIv8!ZegU zX?KUIPELGgl{V{2uu2u=7VD3Z$V`-@zt`I|V`jWr^Q!>cM7L;TYN74d^7dN-?DGPf zm6doIlC%~?v0uZB4xqWV9dWa7KbbLYv?+C5=gF`{Xz=L*5F0p6=R%aHIelj6FXy3g z71V&u+7*-Y0=@PoN3V$0F|m59UmvXo0LV5|F4^=P_n7mqN!UA2<4rsgH7Ox=4gR$? zIosNjeDIJ%cg##~h0ndPVvN!9dqY+C)Vj5(I##}Yj4Ov6_W9uv6tD|yyf{={YSiD8 zux~tgEvIpgYGLF}9UOk4+>p@it}UiJblTxY`oCZWU;TDSdbu^a!|CH1ZQiIb&Yzta zg!d8X2;W`ZS|tY`i3*s3%8yFb5E;uK8%FK9{|(5IGPt%feAc%=1cxtwFFZhYqJx#q z3#wI)O5(?&+K)OLw9HM?O*;sEN&#tU@x7!m)xZ|Pb;Fk<^HW*eY;3`DrOR=ixT_!4 zc9uP?oW$qdoj8;UPC${as_tyLsCAEvqvFD`q8%s?NqO)@iMu%d05+w@t)Thc0^-0vkPEm0CWOSvPni)L(VEqy4 zOD??cw9si^B;-zO&xX3%l(g@>)Q%4t{8;8*^MP(@gPoc*(O^nkPPR&%Oj9k(Xf^+& zgL-vW*Y%?w1F_B7My_tv9*H1_;)%@Hctm8- zwhj|wvSdB)zIhUqPzzIN@%ngsiL5zX3BU+M8CBlhm1nC(VYi1bq~>)#WworNF33BL znKlg31<9M&0WwRdpZy)E@L#ylAY24M=0JM}ENf$zMJ5zS_^wlKozB=jH(0mVdnq7W@6x*#a(HV^>R)dBex$p3J$ z3gGS?k^g(6Naz7H26F-d5CBs7k@aNskM9uW;fGa~t+OayxasB|6VvwNI zmJaJT$*2)pYrah-#dXx@-!|0ll{#~nNXPPjB2CcimMA&@q zzAE;>ar`g|_;q%C3`wp4z@uarZGKhhr^|Wu`4_<%X7p(JKO_|fg;G^bp}&|u8kb(= zsf_TM8OFKvU$ZI;+&Fe4@m6q$^@D=$s6gvT$-h!w22n1^pTEMZXD;-7z8}{1($c$n zDsbWaghKDlQG*9BoW&_pKZnRIwR5S)mf`Cgx@wAag9HT;w**S=x+qp`at|L=HLRR5SXSoAhJAj~qYTt34Ha5YI?-t36gt#+u xJyBR7ufW=57(4Q2Pd!fTayZo_x?q2<>atJ40PBVwx@ngif&hU4fuNuNfuQ4nDC7VD literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Byron_regular new file mode 100644 index 0000000000000000000000000000000000000000..ce89fa545b376130983575f559f429ad109bc7c8 GIT binary patch literal 867 zcmca15y>3a#Ms;_#q7VpFhZeY0{ZzM@#c@%10ROM;5ekoWrh4wNI{n~< z$ENFR)r_TUTc$@ar<~S4c4F_!Rh*?enwTRLE@!DpE-UhMV|ggO#r^d8Aj6lRcBvi` zn^^w#q~qRzwK)+A>kr&Yk+A-h=5OowrpV%|%C3a^b+0!0A7pslCc7(hx^#qsUz!Hb zP2Wg?B9qx~xC|yNwOZ*KruRFS<7!@TsyCm*jFu(_#t4VS-nXrHH=H&1-SYDEiVf_) zCU~CsV7=eLu_k%?+Y?VZUL_@b;CyO+a%QJo*ZjNBKRsTygRklG_WK*O#Pbf!TE?B) z$k@cx)WSfyK@kqG=X1U?T+H9dAaZlonkRwTCTedgY+pW%I zm)>9&XlTWh_(AL2TKyv&7v^_<=QBu;mIr!9XG3z=q|ixnA}$RklO2sFzkZ|WD7NO{ z97Ps6GxwF^7H=E5&A->yad^AcugCcaM{WqQxEb6!uGhzz z^zYpn3H|@`o0@=%6`LbuRs|PvMy<-=mArDwGqZW2Yr!1rhuyqB&8MsH#4TWuGP*OP z52$`YBiQuTrU(b`+{$v39G75M(_oXdU=Op@62JV?%!t$~=StTs?_}c=cay9{gKW1f ze~ZGZ#7rZzDBplkSFbeJN<-893e)Tehm5YZt<}f>8~n*gx+VRn@r%N-pu+808>ct@ zcX%{4>PLs<;l7wk;eHKvt6dL+PBf`@yC^I;c=GS1oEeR3)Bo5p{BL5u$;i|&|9=w@ HH!c7G_QsqY literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Conway new file mode 100644 index 0000000000000000000000000000000000000000..5ae5c5065de3335619ac6b764801535b5fc102ce GIT binary patch literal 1752 zcmbtTX*84z82-K)!Ghv+p_9EQ!gU#HWZ+c4n9vbS-7RgllOfOL9$?7G%ki zEkfC4h!_AG|~_s9K_d(J)QJ@2pQJkRsK@AD2|9oTzej!SSXk`uyLD`m@x zyM8TXIb$qi?G!@<@0d>j)AVbhQI9hs1ce?z_}G~DZ)lveN#AUS=L~8o zlDMc|orEQGj81%YT8`q32#$gbLO0>g;cfWq&|BP)IRIqLyk#7GF=lfu$Keo2MCiXq1J z_VUfGRx7kO8r%4Y1_djKz6mb_07yTPH&*>-4!=}RZbfWaBM4vQ4R>z)2zVByr<`f!601jZiYnx#^G)&;#P_-)U zJuu0UA+hMRe2dGoORvNtJHhlZ&oJpy7h2UA^OF0C4t4w8{(zL zLIW?D74K!`q&3y9t9M{nLQV+@A%h|_;w~-K1&p?l|!u|Ie(aU$1+I|53`EB7S%T#j!a^L zl6a0idE4z8T0zGXLln`5V?3JlVqg$N&|wHaEqt;oU0)hcYxmxWPw(uZw(KNq@E@H~ zubCiK#~#`TaQ^^q_kEzie`G|0^lSjq1ln&vHn$fj=_xIE~tseF}Wad`66id=v!4soz>jU9xsXBm)KuCa;P6}CzE{*L&H&wZD_G)(FmTuxmUzK zl6Y-cj@k4Z8l*t}Z(~JDSsbN}p1-I+|H`?!{$d}y#YuLvkNG-zE(d2GMm=)x&~3`> z3vki(AN$w(cR=_I{?z+1Rg{hX&kbH}L)yp7=3O>YX9WgJrj?prnGVEpY!BfDg+&1X zXk8yh;5P&GBW&8<2Wq;?v*lg0?sdzMxv6d{!oj%F!?{}Z1V)?#OB&K|C_{zm|M@cD zx$PdJWunPVKQZbuJtM2XVuUXq!*68iN4-$fU2}5ykKjLt*2??6Qh(D<8Y+A>(8Ch* z^UKBWKyE4hlbP>V#@3-2FaW?J$YfYVFlMtDn|_d4KsM-3rBS>{9*85ZztY^ONEk%0 VF^~qXARPuH5Om`sThSv%`~@UG9BKdn literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Mary new file mode 100644 index 0000000000000000000000000000000000000000..14d8281f93368d898501f14636df833891cdfe4a GIT binary patch literal 1894 zcmah}dpy$%AKu-zGUd|8VzW}mt>${1Tw-z?QS!R{6v`x*w9Ph`T*`jDIF{nP`V_5Sz%!{5*Id7kI{{XU^vdG<+k!UDAhKM z*>0OSf7seMYDf%AKd4;2R;sMvQNYJL|AteyG6Q^+%;kiliEP4=2Id;gPnw^)hr7NA z6wW(6W$h(o{brxH?1iWX1RSoDZnKh@WGszc9=(nI^FC=i?QKS2a}env)w zS@(09JCCV22bQ&4HD8>31=ukr*5vZbKjBLV6Un6mp>Af6{Pz5KXB*w~)_-Ep=WoMf zi~y1>LSRR+Q71M9rV`_fR}TLSCvD3p9(U^h8rZZXKF$Y7uLT2#;D7uB_@WCNcigvQ zepO2DY<2TJual5S*7-e641oZY0<~Q0o0*q9^|O&rUng7nWEqko8=8V8^#b>o*#T(4 zr7vNr=uyD)=rV-G_UDsz&-MC@s3!J-1C09@T*6PGVUQqb%jF@AtFr&yU@h&&eI_+H z73SFif3}SmTQT8ZZk^^0U)v?pWOe(WPMUpT&~~G;sm^dr!G7Ppe+)gNjAGJoT`?!c z9d&Bl)VPo(pgK*ZUYoJ~m3ds~i*FEtirKHbVwMBPB2nn-k>&`32OU}?TPN1JX)0dH zB_B)<7};3mTX$gxG(+<8lHcNIiD%lSRpx`!s|)o${`c`=nMIhl z@w6NZlz7~bJh}oJFI0w|IxoHTLrMqik-tYQndyF$xO!JY@r@(Ukx(vjCao19c*0xuOfRb731&c^&Y-P?KU z^U8rZ69VkV>Tf7e`>Y7ieP5wzE>Le(vKtXoA?F>}`YIJZsPt2a6!d;4k!Ls~p2J}~ zGotBu_-7a#jzDC95D)_BZYG=y-y8=>ZKJzuI+kGvxvh^wt*kpQ6O@;4`aX2f*zw{j zji5;Jf+7_}5Q+r|?>F<|Zf=tf(!&{ab_AUr&n7b&jMyV7X&?%Oh`#5C@Z2-K^SP$2 zs(RRt`fm%_NnMS%pO_oJRk?mqn~oH1VXb`@1#Y!G1YS)DQ2|I66Lt^V)@E8=oUi3V zNBKUs4yfp!zg(t^Rul`L-f6g_VVJF?{{IeK5d_?*$Ce+SqWc@(GH>jzcTNMT?Lk9! z2(td7-@TfVTLP0K&b|7F8eJ&58fBHv;1Xno<8_r2ef43 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Block_Shelley new file mode 100644 index 0000000000000000000000000000000000000000..7d900c96a82bca1ac8cb49d56f3dab29752dc091 GIT binary patch literal 1687 zcmai!`9ISQ0LQ=Em|3ovBF5-)nu{8m%yL9Zc|89>{rq{qUhmKA^?AKMBP#yLTnNsBvJuiCj)$)>&S zpAoxbKY!b9lvDcZDqlCYCIS%PuoTA z`m6x%{+)707N*u1ZWLHC8|3D+93-ro_`5YECenl;-kOK}AyW$UL>;Z~s*`6jVgkN^ z+_O>*DrA{{lbFEv??90hzG_R6!HR@b2BmIKLxB3RUR_3`D zJ!l~&fXz-ERTXRe*~zOmc_~_5%x4u!mdRjl#vel7eye%p&Xd{&RLP_HGkLIiFxo@o zAWc4IXMYE9tF&;y%&6+V{r(pA9UaQ7zTN7CQnm1tz_<13!Lbh0AWuD!01cMAU243W z3F$4~4mx&UK{zvV%>k=EIKYxU_u~nPWfnG2|*V}>yBE_Ea@Gjc5WfAZ*~(~w9Jrr>GnGT*al?VB7cS2EHN8!YVX?6?GZ0z z@-c}d)J_MEgsOZQAO+$~KibqhS)1cKJ7uTCCiA_l?U9jvKb=LzUq=?F-YB^;IRLb= z;BQZuK#2{nv@7Kb?Ht|ss*>=AK(m#1!-Ec==+BI`m8~#aWOOqKd>EM(rYN3TWUSdF zy#JyzGjO=Q{~TInYuZ>bN^Nv6Qe+6jMv5^FCKubEkpe=d2FVVX=~!vDz<2( nilvP&)}iZp%5s1T*hwml5=jb&?+Z?#g;5a@3@*VzI0XL(ewqfX literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra new file mode 100644 index 0000000000..61ec98ae96 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra @@ -0,0 +1,3 @@ +X cA:^D d +uS| ] +q \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo new file mode 100644 index 0000000000..6e6d3158a7 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo @@ -0,0 +1 @@ +X 3? GCa\ո1%Eg# diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage new file mode 100644 index 0000000000..3c56b72b00 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage @@ -0,0 +1 @@ +X M~@)_ur7WH5O2$h h \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Byron new file mode 100644 index 0000000000000000000000000000000000000000..a07d334baac1cfb0a29ff177fce5cb1ea3291226 GIT binary patch literal 38 wcmV+>0NMY70D=HmAWNt@#2~ZMy+f5S_>s!#rPRdO5(Gvt+Q%-A31a^4%v69AGynhq literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway new file mode 100644 index 0000000000..8f2268ce3f --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway @@ -0,0 +1 @@ +X K8aLs,а^"5J \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary new file mode 100644 index 0000000000..1235567289 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary @@ -0,0 +1 @@ +X Ճ(x.x_GFߖ} Ԉh+ ޢ \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Shelley new file mode 100644 index 0000000000..667dbef8ea --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Shelley @@ -0,0 +1 @@ +X np+t3NUe<Ҷ= \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Allegra new file mode 100644 index 0000000000000000000000000000000000000000..786e4823022271a8f0bf311d4796b7daff8cd3b4 GIT binary patch literal 799 zcmZo-x*-wCEYZA@p|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuSX z1gf%RI6XNcXzrJyIYw@a78swNp}2bg#oQ+y4XhKq_Birph1X4ST-$du&C+l}p0D$p z7e90gwPl%1*Z*eYVq#`yVQFq+Xkv(v!Kbi`8NYml!qG=k8&7^?(rrAvDbB>~biM5N z`e{My?1Tjl^(D#PsP1c$Q2>`0G~aL_^oMZ%1h4AD^ATTE-lt8$j{Gls;+Hf zYhqXkaz8`2dyDU+M*YLQ@?0mk{r=ouac0-t9fn#r*(X#=p>%z#gGs^wN6W(Le7FyEylEF+Q3a zU}eXadG4Rf+gU$ue13XQ*qwuEAwv@|`nozE-!0+%IQ4JPZC#sPu|=oSIrqy>5t9B~ z(!sceKR+hIp<>pFs5cwC%Y>9Bs;~48Uh=4oDKEG8m)RZ%ZP9Sv8B2MagYGX-x%4yP z-N`MxlP>*j&A%hPWVK#&k<7sbWoGH@KufH%)c2g*wnR5+@rnyt`MkxcMxy1ikDQlT z9q?G#9eGPL!l5N0`V*JzK`r0B)jSVHB4>V`6KND?SG)F!(k7MFW$Yar=Ul5X*qZgH zk)z;l)VGYuzL(gNOGW0+Yj|U_*gEb5f724iwBnMY%)E3a*QCml)MDl)Mkbbp%#KNo z&CE>AO^i)VEDTMooJ~wk;Dj{gVM(#x&sERuEu*%$vhQEnd@Vrvpwv`(9-}89d3-?( jl0Uv#icKT*i}`|>^#KVHdQ13P`1W}_%m4l1-f$ZLvR7Dr literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Alonzo new file mode 100644 index 0000000000000000000000000000000000000000..558dfbcca80c1286824fab921cb0c4d4c6196851 GIT binary patch literal 872 zcmZo-xginBoY=CCp|L4K;hkvIxj7D+3MHqr{`br|d#U(@n8$xX&-Z3~UghoXvQuT? z1*zI?utY~L>BIV4@mzjgVft0Vi+o-&ylb3T-L_+1gRsadM#jeG2up_3lOuxWekqz` zBp?BX3rC-4w^QeK*rA4JYLJI=^}GL#I$%mdSMeZ?-0h zl!Xy8%iP?(`$G)XMA^0-D!$BqJZzTVwv*XTcfB-&xE6XP=a-h06g%f<=1DTYAna}? zN#^IwEG*4U3{4CXGWaa-V#Y5Yp>Xt()W(zFm~!OYS#QWSF>*!7KEP*BBYtZdn(~tK^NLgRic5?23i9)FoT_V^*qRs?g51y0?cU-$ zsZswhuRPbuZNERaSDe{3cZZ?YP4)?u5_zl(30N(W!qx-~;0Mb^3}*-({$9L`p>%z`?`^bmkA4XLV<^iEh&36&JMfd5cqx zM9XC#IWMz1;IXhf@|I?VLt|Ls*2XOxvH) zpt)a)<`}sxT3~#7hT`h|7jvIn zlFTodniy|LI7#ehz9He=#N^@5$iSea#2_fpM1d=$7+T`r3W7-{N#^IwEG*4U3{4CX zGWeX{#f)D*LgDBmsf{PUG3hoQ-V|qIcDi2nd;PSab#}r6hx(FaZ&dp*vfhwuV&saD zeSpuNM*P+^H034d=M|^s6_*z473AmVI91m+u{AL)1i7D~+r7niQltK1UU{yQ+kSs; zuQ;=7?hZq(o9q)RCGuDo60lk#g{=t~I}etN7|swn{JnS=%bVD2`#)D#-3VZ7h-Rtg zP<33$BFVpifrE(;=*%B7&+_<#ZpAEVoNSR-D){&527|@yTMlQ4n;rYW2{dP8cG%Z9 zY~Ih-*sM-4eZQ`4bJ`i(BMYt;CfF7{MT=$b2!(lqGgo%(D*Auz<)O?|x2=P>eopv5 z^P|wsP45hjT=%-s%}!VeKjRW`jPs#9_aTB>Lb8Pv*2X@j9faGX2giw#VJ%X{2jpa2>&+?b9S zFaMx{f&kbUScQUEKuc|TcQkB7Q$;mXG-gvsHf3~9Z*^%{WqLz-MQTf9GjvBZYGE*I zMruzuae85CGB#RGP*p`rW<_~1HE(z|Ygj;Nimiov$Nw<=XkywM;(_!a#!_*&YO$As q|3KoETKI?=!;V~e6OSkdI=bOf$buz{L?EES$^Fu7n1Lpj{5}9%*=jNX literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTx_Conway new file mode 100644 index 0000000000000000000000000000000000000000..9d1ce51c81a083d3d3747b94a91d699f4106dd15 GIT binary patch literal 899 zcmZo-yCD(DT+_0V;U*(fV^f5}JJG0fa~w1kN=|3}@0oM(!Rk+(=iH=;-hxNDOx%|4q^s9sy`MhFy*Eq4dZO6O@VUbmgLPVO#%-FbuA;Oa3 z^yG-3xnGLr7`ZK4V0?Op;_CeubDwlHuukyWHGckliXLp4#hZHJ04vmXze<+tr*w$oiN%^rM`CJj>$`x)rmeak52T zso>wI8w?h+Z#kSHZg%VgCouRoW`})!!{+^Ljm_!=)A#GzHm9AjJ+k0xVS;VJQ?%gc zj!>8*s|3Gd~L5-1N@i$aSw9-Ry*w@H2`^GcYim{Bxg4 zVF@htT4$;6Ik##yIqbW0{T zcbNh=GblLVNd_Fr68l*fHZd?XNit7wk`(R$qOUg@nHMuGVN5G7Day=CXL3!dEJ-b9 ZZenC&S;*{|#Ms!x*ud22<_b!9i2&Dufsg>*4pqm6Udj2T zB_+kq`I&i=%rBUjnORtxn;4oHB4qFx+{KJvK0@K>BdLuizcJ}H9^MpZVs^S-_Iv%b zpmlb_0*CsNWN%daFtXl|YhvVzkbQv9o<{uEG&JQU=jRot<`tI~>lNhZ=Qvf@HnBA^ zECjiqq1(O1cT%JNVP1KzliPlOZm&4AYwiw1t()uOdVYv zkMEXnew_L@=(euSuGpee>74szrwB=ZF6m(0!k-@#;UIHa(zy58BHxak3P)G(Y>#E# zRvEHl zaD3TT^=`j!MRR_1owVP~x=?x7t*rkAhiab5edK%ob%)UQqbGh9Ejao}Z~N_M`JY*u zmN2FjmlS2@r8BuERhFa{GdD3Zu`FbEOloXqW@>I?Y-(a*Xkz7TVrl}XyD1M#iuHc3 zdTwtSwZ)Zv|H|fT0m=uZrpogeJpsw%OU@wq;EigVkLvi)~i@8ra8dxWI?Q!JI3a^{uxVG0}Vp@|_v2A|?CX8iII3P&GFZ9MsnNw@LvrZ^L` z)Ah37>!$^+vlA9L)R!cCquPg&^@dy%BUgm%1AO*0;wek;l4_fYlNyY)uOz zWF9ORF`OZE_Uey&g!ALnzd^TkZFa>Lol582FFQp@ z`g2JK;}-t>mF1h1)|Jn`YP`A-eCT`~m&ASLLkvJmth3bjoZGfUH)-*T3tIWS#i>T3<+6{Q zmsuU~SlAtTOEbdZdV|Z|EpNB`n(Yua{QQ@xY-C^n00bKW1^@s6 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_AnytimeShelley new file mode 100644 index 0000000000000000000000000000000000000000..d82b9fc7f4db2360746cc261fca05ba77e024882 GIT binary patch literal 5 McmZo>Y-C^r00bNX2LJ#7 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..cd6d53bc7927fe437916bd1d73399b30995390c8 GIT binary patch literal 6 NcmZo-Xku+-1^@;w0geCw literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..f5ea7bd0850ebee0cf8399477b2f3ebb4c627588 GIT binary patch literal 6 NcmZo-Xku+-1ONss0gM0u literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetGenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..e6ee8c45c445e9f45d46f9697246532688a4d27e GIT binary patch literal 6 NcmZo-Xku;T1^@;&0hRy& literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..4d00b4e9fac6402b2123d72fd8c9cc6d132da36e GIT binary patch literal 6 NcmZo-Xku+-000In0gC_t literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..b5217dc67a9654ad4719e1ad9251e626310e8af7 GIT binary patch literal 82 zcmZo-Xku+*y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kackslZU literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetProposedPParamsUpdates new file mode 100644 index 0000000000000000000000000000000000000000..62efc1c1eaa2112b0068c7c2356df99a1c88396a GIT binary patch literal 6 NcmZo-Xku+-0RRRs0gnIx literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Babbage_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..41aeabd30d52dad7c32a530bddd87ff3f2086e3e GIT binary patch literal 6 NcmZo-Xku+-1po#x0gwOy literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Byron new file mode 100644 index 0000000000000000000000000000000000000000..cfa4236d512052278add088e0bdc0291b8cb4f59 GIT binary patch literal 5 McmZo-XkuUh00b2Q1poj5 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..05f2ba977317862aed5a2c3181e704fba88c8675 GIT binary patch literal 6 NcmZo-Xku$*1^@;z0gnIx literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..915b078647dc32f66b9231a59874cb67c7e33057 GIT binary patch literal 6 NcmZo-Xku$*1ONsv0gV6v literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetGenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetGenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..70189500e98e7e5069cbd45266e9f84fa03d999c GIT binary patch literal 6 NcmZo-Xku&R1^@;*0ha&( literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..7337b0de4e05ef7684c1baf8c244a84e9726dc73 GIT binary patch literal 6 NcmZo-Xku$*000Iq0gM0u literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..b47684f4c36d20579ebf205c39c63dc8ae5b0f5f GIT binary patch literal 82 zcmZo-Xku$(y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kac;2#+P literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetProposedPParamsUpdates new file mode 100644 index 0000000000000000000000000000000000000000..38afb2235421c3142d7dcae1c5e3e6853a78beb5 GIT binary patch literal 6 NcmZo-Xku$*0RRRv0gwOy literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Conway_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..89ed187e31c950d4c8648d9723a5ae542e6c119c GIT binary patch literal 6 NcmZo-Xku$*1po#!0g(Uz literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_HardFork new file mode 100644 index 0000000000000000000000000000000000000000..64c266fdc583e5b469bd7bd1b6d6747616aa38f0 GIT binary patch literal 4 LcmZo-YGeQa0~7%U literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..7338cd74165e275f099d161987a36d85731ed114 GIT binary patch literal 6 NcmZo-Xku<;1^@;q0gM0u literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetEpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetEpochNo new file mode 100644 index 0000000000000000000000000000000000000000..58e4767132c03722d57319642bb2b358b258da16 GIT binary patch literal 6 NcmZo-Xku<;1ONsm0g3U1^@;y0h9m$ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetLedgerTip b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetLedgerTip new file mode 100644 index 0000000000000000000000000000000000000000..c5b7ef04972567e830b9ffdb2b1f869d0391313f GIT binary patch literal 6 NcmZo-Xku<;000Ih0f_(r literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetNonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetNonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..72f3ff8f93a4c299c41025f94732a75d7aefac64 GIT binary patch literal 82 zcmZo-Xku<+y2;4Y+{7S}(!|)r7$NguxrpHmp~K&ccd@*Q&9?t@b=8dkwuWeyY7SLL mpbCZvnPqP7-u)qlYNBl04i#T!KOQ#AZ`;Xir@LO7L0kab^B)!f literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetProposedPParamsUpdates new file mode 100644 index 0000000000000000000000000000000000000000..b833d91e655614957dcc842965d20ade9d740a7d GIT binary patch literal 6 NcmZo-Xku<;0RRRm0gV6v literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetStakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Mary_GetStakeDistribution new file mode 100644 index 0000000000000000000000000000000000000000..e63d41b76df54ba67176d302d70dfe571b2af40d GIT binary patch literal 6 NcmZo-Xku<;1po#r0geCw literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetCurrentPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Query_Shelley_GetCurrentPParams new file mode 100644 index 0000000000000000000000000000000000000000..cafc5b72906ddd4c9ef0dd49a1b4bc6b8fbf7000 GIT binary patch literal 6 NcmZo-Xku(+1^@;k0g3O`T literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_ProposedPParamsUpdates new file mode 100644 index 0000000000..4918531195 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Allegra_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..9e750e26883f4da621d2d29754142e8e40dba30a GIT binary patch literal 63 tcmZpiA<4kNAjttF7#Ji{Zpbw;FrpES46H!81x*OyCI$u|Vvv}|3IMiK4g~-J literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_ProposedPParamsUpdates new file mode 100644 index 0000000000..4080e95c54 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Alonzo_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_AnytimeByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_AnytimeByron new file mode 100644 index 0000000000000000000000000000000000000000..070897ad04f6b56bc26e2d24a3de47ce5b565852 GIT binary patch literal 5 McmZo{W?*0d00fo+1poj5 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_AnytimeShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_AnytimeShelley new file mode 100644 index 0000000000000000000000000000000000000000..61dee1376e428f9f6be1a1df74036a259c3abed8 GIT binary patch literal 15 WcmZo{mS&K+SJs%@z#z%|f(rmDO9co3 literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..edc6f118879e20b92158ee19e3a1b8c86f2a5aca GIT binary patch literal 55 qcmZpi&cMJR$pIu77$j0|$TcxAA_#V%;DROuzlnhXh!`ZMu>t@_#S8NQ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ9GddYeB}0*aNF80_Eez0_`TSI8uvMDFuW3+ literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_NonMyopicMemberRewards b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_NonMyopicMemberRewards new file mode 100644 index 0000000000000000000000000000000000000000..c47618c1704a42d99637d6e981fbe535f7ee04d8 GIT binary patch literal 139 zcmZo%+{7S}vM@qsnVY+Je~6))DBHF}#h2NSht2Zab~4-Pu9s#I7jqM16JvzTgXJQI zGlUL*FW$xSCN|st&(&2o0@xa&S*kfy9TxzVFyJ=@XvxOxu&-~}yq~SHS)E||eqGz< Rv@^Cx7F;b%uq}AX2>?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_ProposedPParamsUpdates new file mode 100644 index 0000000000..4080e95c54 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Babbage_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Byron new file mode 100644 index 0000000000000000000000000000000000000000..d66107b64e8efc78189421a6da827d6795795e62 GIT binary patch literal 138 zcmZqdW@u($VCZ9zl#Y;MkZWlG6OsxHl1zJ~85lSv{E8MZ02wSj>Xrc@2E&UhO9eoT zsLujb4h&q)(hST--BWxVfMQIFo09G}fFyM*J8Tsgniy_K1UCV>y@93vL15in)=B#s Sr2j*~{QnC;;3gwe!vX-}Un%DR literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..04416edc3001ff65d97814b507e465618d05bc91 GIT binary patch literal 145 zcmZpiA?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_ProposedPParamsUpdates new file mode 100644 index 0000000000..4080e95c54 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2 \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_StakeDistribution new file mode 100644 index 0000000000..967baf0b47 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Conway_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_EraMismatchByron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_EraMismatchByron new file mode 100644 index 0000000000000000000000000000000000000000..9735c28d23436ca90c123fd781e030a3bf8c2969 GIT binary patch literal 19 acmZo_VoVRtNX^Mft!!dQb*e1N&jSEQF$XjN literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_EraMismatchShelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_EraMismatchShelley new file mode 100644 index 0000000000000000000000000000000000000000..43f2fa8267f5b22ef6dd14c7a562e2fd1bab5ca0 GIT binary patch literal 19 acmZo_Vn}tWEXvPoVoVRtNX^Mftpor@n+G%i literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_HardFork b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_HardFork new file mode 100644 index 0000000000000000000000000000000000000000..84885abaa8e259d4f17df3b0dc0a38159befc5e3 GIT binary patch literal 76 zcmbQ=+|0nh&@9a$aj&c~w}C;D`2|;tM2e(zL^Fd(BZEjYsuYkXIVEOM5(9%Iiw`$Q PA^U}91_`A`ApQ>kP&^fL literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..0240c52f6f4a5b9e9fb8311b565cb71ed695ca0b GIT binary patch literal 40 fcmZpi#K6EH$pIu77$j0|$TcxAq7jV@EI>H`r>zJY literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EpochNo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EpochNo new file mode 100644 index 0000000000..b180370379 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_EpochNo @@ -0,0 +1 @@ + diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_GenesisConfig b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_GenesisConfig new file mode 100644 index 0000000000000000000000000000000000000000..10a12c25266694f1ad7a3b9f9b14028c526e90bf GIT binary patch literal 78 zcmZqdZ?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_ProposedPParamsUpdates new file mode 100644 index 0000000000..4918531195 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Mary_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_EmptyPParams b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_EmptyPParams new file mode 100644 index 0000000000000000000000000000000000000000..b792678e2e46579b71c1ff88ab31eb9a6264bced GIT binary patch literal 40 fcmZpi#K6EH$pIu77$j0|$TcxAq7jV@Oh7pRr=?(kJ1zhK literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_ProposedPParamsUpdates b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_ProposedPParamsUpdates new file mode 100644 index 0000000000..4918531195 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_ProposedPParamsUpdates @@ -0,0 +1 @@ +X ts.?9ZEP# 2d \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_StakeDistribution new file mode 100644 index 0000000000..968f15663d --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/Result_Shelley_StakeDistribution @@ -0,0 +1 @@ +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Allegra new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Allegra @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Alonzo new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Alonzo @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Babbage new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Babbage @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_EBB b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_EBB new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_EBB @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_regular b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_regular new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Byron_regular @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Conway new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Conway @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Mary new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Mary @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Shelley new file mode 100644 index 0000000000..6a5024d0dc --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SerialisedBlock_Shelley @@ -0,0 +1 @@ +O \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Allegra b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Allegra new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Allegra @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Alonzo b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Alonzo new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Alonzo @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Babbage b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Babbage new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Babbage @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Byron b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Byron new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Byron @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Conway new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Conway @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Mary b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Mary new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Mary @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Shelley b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Shelley new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/SlotNo_Shelley @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/ApplyTxErr b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/ApplyTxErr new file mode 100644 index 0000000000000000000000000000000000000000..7fcb1ef7073c267072474fe876d9df684ce2e890 GIT binary patch literal 36 scmbQ=#Ms0TA@g9lh~W&O!{3W{vAl`Rw*PZ=)r|nQhG>>*4pqnh03yy0-2eap literal 0 HcmV?d00001 diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Block b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/Block new file mode 100644 index 0000000000000000000000000000000000000000..f49d79d20f8273b71b0eebf001d382c1f1207858 GIT binary patch literal 1685 zcmai!`#aMM0LH)DY-YI>BVvqhZZRV#*XEK&lq9|?I!G?n#x^Ea*|!}$7%C!JXNx3Z zDVH)LJB8#jCt_VhNy#ji=%O6wAE=+-&+~lV=Xsy!9nua$<#M1Lgc67s5lYSV!#)Y6 zhcUY|0xXj>u6j=b)9iD}sdulWXkaTqd`9}4mkgzu{2zYLw>UNi(;i1Ewczs9b>|rA zuv#_hq2Ch_NZKQBZ`Y1?2<(W9?P)YZK*DATx%HZZ7f@VgFPVXn?L%Wb?3uGpwx&@p z>fk9`7Qg0{E?&)>c`k3)VVTx(j=w)Pjnq*R}HYjO$ci?HjC2>F!1U8@GIvQp}2 z)aLk4-_~2?@?KmK8>(LCPe)+8Gtrtl81!P#T%musrp4-!sw;!7myhTk*WTcn&18GA z)L#=WmN^dM1Kh(wU!}b==UG&U%f&u)9VT4lZ1$q)$VjAoevEL(-^2tb-+7d?X1AhS z;I$5$mXnjcpab>8l0sv4`I= z-2|qE?#okk005Hm)G}-@a!z}#PeV5MC)xO>8sj7HH63cGFWmV!EdUL=4#90-E77Li!9EcCEBLoId4!~WU+YHwE4qc)kB z87Ek{Yon@#Ezuq;i~&ohLOtCULZy|Xf479kMO%^NYx7V)lzG6Dm;-g4wQ6iuT<~X5 zcuKKeo2uMv6&KR>9Vk>JRBFX61ip(zp@pL@5jal@tfqZgzt#gg)GKLtV`gq*XLH{6 z2}X(y=5mvUb>#Ygc8IF1p3A<@<#P&>y)N$+Gpj&2dCQ z5n*~VVK8-Ey^-9n>E4(|PVJT)?V63RF)-N1p8sbvOX=#a^rg_K`9LVLxpUC`UPC5# zDLw1S*d_s!cGzxWK#8#5I8^dJGqJEhFHuF@Kqu-7{&F{}>*=XF(0-= z*L^NZk2XHw&>*oie${!Kb9w^f#AJV8V_jWR6aCqCIcUceCLv#S@BLSOVaW|_d}xv- z+I3vjj$ID0ArL>Ud7!75WP)dO#VltPclXmfw8+bAJmt1clN3>g^F{!+LfHXb7eGJW zJgu1Mag}e~RcLs#MRMY8dI~bvtI0(rCh&BgOI7ypQ9G+#ijUjW`!D8kW;pm(;dj(J z0G7&!BM=ycvk(9Qpx&?G48*T<5dUy&T}|f#d<$EAJH*De>kMx3%tgOyXN}cu*K-}wJdDy?!q(GE#Duo_Fp~urLVyV>QuF0n$6a)zV?+;||tPctWX@tEX5839k>aUVJ;)@A8rP*wRST4y&bXl1UQ7sGJCO`S=`b$>HR? z&&HE|``UU>W3)%sw*e~>hnUSxJ@utq!b-~fOsOjL2%;tvH|ADm-%1u_21!jo(z6uz zm$kA6AKSYcR&zh#j9E-n_Ck->H(p%aYBK9}O(N>tZpePyksxdym#sl;Nm^UUl?_#L mj0i=>Oj92f0ZwPdXY{CwT2~IX|yBHLtj|Sg#;IKgX%M zwu!BYVIj!<4BhT6zLOgD5A(`%o!s{Ob9=>^U2}IBYTaa?P$`kex{!d?5-Ds=3nOG6 zEEh4HA$0hA@h+A(vDx;2uCBTfz}67WQq7_2xR6DXe*pt~go4pa>vc!}ygTgT+~39c zXlj6!9b4wPe=cul{kZY@={;fhg$zx=2<+;3e7A)2lH#TK1P=iDzlMM(N{ zNeAN={`{B-hoaK-WwvwI-?DY`JS@q|v@Oo~`;%*z9AB58(pM6-6cOXm>~=WJnBS5r z^#1ARnm^W+&%SEBx)6Nmd>xm>edR+8KufH%)c2g*wnR5+@rnyt`MkxcMxy1ikDQlT z9q?G#9eGPL!r^*@%iS$+xBHsy5H|e$m#O3vS4Q8rb6&sZ78VM4)I8W&!8Xya$;u)n zQe;YRqp;EbD)BYFZ*Qz=Q8JjNQLg37yM!^VxTGjEFP+IXsj?)sn7N6OiDeOw^h@qM&+qOf+m)Vbp&GOrJGTZ5{mu3(ba}#3|V}#6uŽb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SerialisedBlock b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SerialisedBlock new file mode 100644 index 0000000000..558b48dd80 --- /dev/null +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SerialisedBlock @@ -0,0 +1 @@ +G \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SlotNo b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SlotNo new file mode 100644 index 0000000000..d9ba7315ac --- /dev/null +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion9/SlotNo @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index e2dc5e3912..e41b605a46 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus-cardano -version: 0.18.0.0 +version: 0.19.0.0 synopsis: The instantation of the Ouroboros consensus layer used by Cardano @@ -134,16 +134,16 @@ library cardano-crypto, cardano-crypto-class, cardano-crypto-wrapper, - cardano-ledger-allegra ^>=1.5, - cardano-ledger-alonzo ^>=1.10, - cardano-ledger-api ^>=1.9.2, - cardano-ledger-babbage ^>=1.8.2, - cardano-ledger-binary ^>=1.3.3, + cardano-ledger-allegra ^>=1.6, + cardano-ledger-alonzo ^>=1.10.2, + cardano-ledger-api ^>=1.9.3, + cardano-ledger-babbage ^>=1.9, + cardano-ledger-binary ^>=1.3.4, cardano-ledger-byron ^>=1.0.1, - cardano-ledger-conway ^>=1.16.0, - cardano-ledger-core ^>=1.13.2, - cardano-ledger-mary ^>=1.6.1, - cardano-ledger-shelley ^>=1.12, + cardano-ledger-conway ^>=1.16, + cardano-ledger-core ^>=1.14, + cardano-ledger-mary ^>=1.7, + cardano-ledger-shelley ^>=1.13, cardano-prelude, cardano-protocol-tpraos ^>=1.2, cardano-slotting, @@ -159,7 +159,7 @@ library nothunks, ouroboros-consensus ^>=0.20, ouroboros-consensus-protocol ^>=0.9, - ouroboros-network-api ^>=0.7.3, + ouroboros-network-api ^>=0.9, serialise ^>=0.2, small-steps, sop-core ^>=0.5, diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/CanHardFork.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/CanHardFork.hs index 298e18cc19..800041c0e3 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/CanHardFork.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/CanHardFork.hs @@ -35,6 +35,7 @@ import qualified Cardano.Ledger.BaseTypes as SL import qualified Cardano.Ledger.Core as Core import Cardano.Ledger.Crypto (ADDRHASH, Crypto, DSIGN, HASH) import qualified Cardano.Ledger.Era as SL +import qualified Cardano.Ledger.Genesis as SL import Cardano.Ledger.Hashes (EraIndependentTxBody) import Cardano.Ledger.Keys (DSignable, Hash) import qualified Cardano.Ledger.Shelley.API as SL @@ -333,7 +334,7 @@ instance CardanoHardForkConstraints c => CanHardFork (CardanoEras c) where (translateValidatedTxMaryToAlonzoWrapper ctxt) ) $ PCons (RequireBoth $ \_cfgAlonzo _cfgBabbage -> - let ctxt = () + let ctxt = SL.NoGenesis in Pair2 (translateTxAlonzoToBabbageWrapper ctxt) @@ -526,7 +527,7 @@ translateLedgerStateShelleyToAllegraWrapper :: translateLedgerStateShelleyToAllegraWrapper = ignoringBoth $ Translate $ \_epochNo -> - unComp . SL.translateEra' () . Comp + unComp . SL.translateEra' SL.NoGenesis . Comp translateTxShelleyToAllegraWrapper :: (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody)) @@ -534,7 +535,7 @@ translateTxShelleyToAllegraWrapper :: (ShelleyBlock (TPraos c) (ShelleyEra c)) (ShelleyBlock (TPraos c) (AllegraEra c)) translateTxShelleyToAllegraWrapper = InjectTx $ - fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp + fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp translateValidatedTxShelleyToAllegraWrapper :: (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody)) @@ -542,7 +543,7 @@ translateValidatedTxShelleyToAllegraWrapper :: (ShelleyBlock (TPraos c) (ShelleyEra c)) (ShelleyBlock (TPraos c) (AllegraEra c)) translateValidatedTxShelleyToAllegraWrapper = InjectValidatedTx $ - fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp + fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp {------------------------------------------------------------------------------- Translation from Allegra to Mary @@ -558,7 +559,7 @@ translateLedgerStateAllegraToMaryWrapper :: translateLedgerStateAllegraToMaryWrapper = ignoringBoth $ Translate $ \_epochNo -> - unComp . SL.translateEra' () . Comp + unComp . SL.translateEra' SL.NoGenesis . Comp translateTxAllegraToMaryWrapper :: (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody)) @@ -566,7 +567,7 @@ translateTxAllegraToMaryWrapper :: (ShelleyBlock (TPraos c) (AllegraEra c)) (ShelleyBlock (TPraos c) (MaryEra c)) translateTxAllegraToMaryWrapper = InjectTx $ - fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp + fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp translateValidatedTxAllegraToMaryWrapper :: (PraosCrypto c, DSignable c (Hash c EraIndependentTxBody)) @@ -574,7 +575,7 @@ translateValidatedTxAllegraToMaryWrapper :: (ShelleyBlock (TPraos c) (AllegraEra c)) (ShelleyBlock (TPraos c) (MaryEra c)) translateValidatedTxAllegraToMaryWrapper = InjectValidatedTx $ - fmap unComp . eitherToMaybe . runExcept . SL.translateEra () . Comp + fmap unComp . eitherToMaybe . runExcept . SL.translateEra SL.NoGenesis . Comp {------------------------------------------------------------------------------- Translation from Mary to Alonzo @@ -631,7 +632,7 @@ translateLedgerStateAlonzoToBabbageWrapper :: translateLedgerStateAlonzoToBabbageWrapper = RequireBoth $ \_cfgAlonzo _cfgBabbage -> Translate $ \_epochNo -> - unComp . SL.translateEra' () . Comp . transPraosLS + unComp . SL.translateEra' SL.NoGenesis . Comp . transPraosLS where transPraosLS :: LedgerState (ShelleyBlock (TPraos c) (AlonzoEra c)) -> 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 700626382a..de4d7ae288 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 @@ -44,6 +44,7 @@ module Ouroboros.Consensus.Cardano.Node ( , pattern CardanoNodeToClientVersion10 , pattern CardanoNodeToClientVersion11 , pattern CardanoNodeToClientVersion12 + , pattern CardanoNodeToClientVersion13 , pattern CardanoNodeToClientVersion2 , pattern CardanoNodeToClientVersion3 , pattern CardanoNodeToClientVersion4 @@ -440,7 +441,7 @@ pattern CardanoNodeToClientVersion11 = ) -- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage --- and Conway eras enabled, using 'ShelleyNodeToClientVersion7' for the +-- and Conway eras enabled, using 'ShelleyNodeToClientVersion8' for the -- Shelley-based eras. pattern CardanoNodeToClientVersion12 :: BlockNodeToClientVersion (CardanoBlock c) pattern CardanoNodeToClientVersion12 = @@ -456,6 +457,23 @@ pattern CardanoNodeToClientVersion12 = :* Nil ) +-- | The hard fork enabled, and the Shelley, Allegra, Mary, Alonzo and Babbage +-- and Conway eras enabled, using 'ShelleyNodeToClientVersion9' for the +-- Shelley-based eras. +pattern CardanoNodeToClientVersion13 :: BlockNodeToClientVersion (CardanoBlock c) +pattern CardanoNodeToClientVersion13 = + HardForkNodeToClientEnabled + HardForkSpecificNodeToClientVersion3 + ( EraNodeToClientEnabled ByronNodeToClientVersion1 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion9 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion9 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion9 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion9 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion9 + :* EraNodeToClientEnabled ShelleyNodeToClientVersion9 + :* Nil + ) + instance CardanoHardForkConstraints c => SupportedNetworkProtocolVersion (CardanoBlock c) where supportedNodeToNodeVersions _ = Map.fromList $ @@ -477,9 +495,10 @@ instance CardanoHardForkConstraints c , (NodeToClientV_14, CardanoNodeToClientVersion10) , (NodeToClientV_15, CardanoNodeToClientVersion11) , (NodeToClientV_16, CardanoNodeToClientVersion12) + , (NodeToClientV_17, CardanoNodeToClientVersion13) ] - latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_16) + latestReleasedNodeVersion _prx = (Just NodeToNodeV_13, Just NodeToClientV_17) {------------------------------------------------------------------------------- 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 283312674d..c9b08fd4cb 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 @@ -37,6 +37,9 @@ data ShelleyNodeToClientVersion = -- | New queries introduced: GetConstitutionHash, GetFilteredVoteDelegatees | ShelleyNodeToClientVersion8 + + -- | New queries introduced: GetProposals, GetRatifyState + | ShelleyNodeToClientVersion9 deriving (Show, Eq, Ord, Enum, Bounded) instance HasNetworkProtocolVersion (ShelleyBlock proto era) where @@ -63,6 +66,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where , (NodeToClientV_14, ShelleyNodeToClientVersion6) , (NodeToClientV_15, ShelleyNodeToClientVersion7) , (NodeToClientV_16, ShelleyNodeToClientVersion8) + , (NodeToClientV_17, ShelleyNodeToClientVersion9) ] latestReleasedNodeVersion = latestReleasedNodeVersionDefault diff --git a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs index 689e1c8dee..b32c1f9461 100644 --- a/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs +++ b/ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs @@ -62,6 +62,7 @@ import Data.Kind (Type) import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map import Data.Maybe (fromMaybe) +import Data.Sequence (Seq (..)) import Data.Set (Set) import qualified Data.Set as Set import Data.Type.Equality (apply) @@ -298,6 +299,15 @@ data instance BlockQuery (ShelleyBlock proto era) :: Type -> Type where => Set (KeyHash 'StakePool (EraCrypto era)) -> BlockQuery (ShelleyBlock proto era) (Map (KeyHash 'StakePool (EraCrypto era)) Coin) + GetProposals + :: CG.ConwayEraGov era + => Set (CG.GovActionId (EraCrypto era)) + -> BlockQuery (ShelleyBlock proto era) (Seq (CG.GovActionState era)) + + GetRatifyState + :: CG.ConwayEraGov era + => BlockQuery (ShelleyBlock proto era) (CG.RatifyState era) + -- WARNING: please add new queries to the end of the list and stick to this -- order in all other pattern matches on queries. This helps in particular -- with the en/decoders, as we want the CBOR tags to be ordered. @@ -454,6 +464,10 @@ instance (ShelleyCompatible proto era, ProtoCrypto proto ~ crypto) SL.queryAccountState st GetSPOStakeDistr keys -> SL.querySPOStakeDistr st keys + GetProposals gids -> + SL.queryProposals st gids + GetRatifyState -> + SL.queryRatifyState st where lcfg = configLedger $ getExtLedgerCfg cfg globals = shelleyLedgerGlobals lcfg @@ -609,6 +623,10 @@ instance SameDepIndex (BlockQuery (ShelleyBlock proto era)) where sameDepIndex GetAccountState {} _ = Nothing sameDepIndex GetSPOStakeDistr{} GetSPOStakeDistr{} = Just Refl sameDepIndex GetSPOStakeDistr{} _ = Nothing + sameDepIndex GetProposals{} GetProposals{} = Just Refl + sameDepIndex GetProposals{} _ = Nothing + sameDepIndex GetRatifyState{} GetRatifyState{} = Just Refl + sameDepIndex GetRatifyState{} _ = Nothing deriving instance Eq (BlockQuery (ShelleyBlock proto era) result) deriving instance Show (BlockQuery (ShelleyBlock proto era) result) @@ -646,6 +664,8 @@ instance ShelleyCompatible proto era => ShowQuery (BlockQuery (ShelleyBlock prot GetFilteredVoteDelegatees {} -> show GetAccountState {} -> show GetSPOStakeDistr {} -> show + GetProposals {} -> show + GetRatifyState {} -> show -- | Is the given query supported by the given 'ShelleyNodeToClientVersion'? querySupportedVersion :: BlockQuery (ShelleyBlock proto era) result -> ShelleyNodeToClientVersion -> Bool @@ -681,6 +701,8 @@ querySupportedVersion = \case GetFilteredVoteDelegatees {} -> (>= v8) GetAccountState {} -> (>= v8) GetSPOStakeDistr {} -> (>= v8) + GetProposals {} -> (>= v9) + GetRatifyState {} -> (>= v9) -- WARNING: when adding a new query, a new @ShelleyNodeToClientVersionX@ -- must be added. See #2830 for a template on how to do this. where @@ -692,6 +714,7 @@ querySupportedVersion = \case v6 = ShelleyNodeToClientVersion6 v7 = ShelleyNodeToClientVersion7 v8 = ShelleyNodeToClientVersion8 + v9 = ShelleyNodeToClientVersion9 {------------------------------------------------------------------------------- Auxiliary @@ -806,6 +829,10 @@ encodeShelleyQuery query = case query of CBOR.encodeListLen 1 <> CBOR.encodeWord8 29 GetSPOStakeDistr keys -> CBOR.encodeListLen 2 <> CBOR.encodeWord8 30 <> LC.toEraCBOR @era keys + GetProposals gids -> + CBOR.encodeListLen 2 <> CBOR.encodeWord8 31 <> LC.toEraCBOR @era gids + GetRatifyState -> + CBOR.encodeListLen 1 <> CBOR.encodeWord8 32 decodeShelleyQuery :: forall era proto. ShelleyBasedEra era @@ -864,6 +891,8 @@ decodeShelleyQuery = do SomeSecond . GetFilteredVoteDelegatees <$> LC.fromEraCBOR @era (1, 29) -> return $ SomeSecond GetAccountState (2, 30) -> requireCG $ SomeSecond . GetSPOStakeDistr <$> LC.fromEraCBOR @era + (2, 31) -> requireCG $ SomeSecond . GetProposals <$> LC.fromEraCBOR @era + (1, 32) -> requireCG $ return $ SomeSecond GetRatifyState _ -> failmsg "invalid" encodeShelleyResult :: @@ -902,6 +931,8 @@ encodeShelleyResult v query = case query of GetFilteredVoteDelegatees {} -> LC.toEraCBOR @era GetAccountState {} -> LC.toEraCBOR @era GetSPOStakeDistr {} -> LC.toEraCBOR @era + GetProposals {} -> LC.toEraCBOR @era + GetRatifyState {} -> LC.toEraCBOR @era decodeShelleyResult :: forall proto era result. ShelleyCompatible proto era @@ -940,6 +971,8 @@ decodeShelleyResult v query = case query of GetFilteredVoteDelegatees {} -> LC.fromEraCBOR @era GetAccountState {} -> LC.fromEraCBOR @era GetSPOStakeDistr {} -> LC.fromEraCBOR @era + GetProposals {} -> LC.fromEraCBOR @era + GetRatifyState {} -> LC.fromEraCBOR @era currentPParamsEnDecoding :: forall era s. diff --git a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs index 62a6ea9982..b56ee74d71 100644 --- a/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs +++ b/ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Analysis.hs @@ -72,11 +72,11 @@ import Ouroboros.Consensus.Storage.ImmutableDB (ImmutableDB) import qualified Ouroboros.Consensus.Storage.ImmutableDB as ImmutableDB import Ouroboros.Consensus.Storage.LedgerDB (DiskSnapshot (..), writeSnapshot) -import Ouroboros.Consensus.Storage.Serialisation (SizeInBytes, - encodeDisk) +import Ouroboros.Consensus.Storage.Serialisation (encodeDisk) import Ouroboros.Consensus.Util ((..:)) import qualified Ouroboros.Consensus.Util.IOLike as IOLike import Ouroboros.Consensus.Util.ResourceRegistry +import Ouroboros.Network.SizeInBytes import System.FS.API (SomeHasFS (..)) import qualified System.IO as IO @@ -743,7 +743,7 @@ reproMempoolForge numBlks env = do -- one megabyte should generously accomodate two blocks' worth of txs (Mempool.MempoolCapacityBytesOverride $ Mempool.MempoolCapacityBytes $ 2^(20 :: Int)) nullTracer - LedgerSupportsMempool.txInBlockSize + (SizeInBytes . LedgerSupportsMempool.txInBlockSize) void $ processAll db registry GetBlock startFrom limit Nothing (process howManyBlocks ref mempool) pure Nothing 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 3cf473ada5..6aad905a6a 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 @@ -44,4 +44,5 @@ instance CardanoHardForkConstraints c CardanoNodeToClientVersion10 -> "CardanoNodeToClientVersion10" CardanoNodeToClientVersion11 -> "CardanoNodeToClientVersion11" CardanoNodeToClientVersion12 -> "CardanoNodeToClientVersion12" + CardanoNodeToClientVersion13 -> "CardanoNodeToClientVersion13" _ -> error $ "Unknown version: " <> show blockVersion diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs index 2d26cff5ca..7b8498adb5 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/Consensus/Cardano/MiniProtocol/LocalTxSubmission/Server.hs @@ -32,6 +32,7 @@ import Ouroboros.Network.Protocol.LocalTxSubmission.Examples (localTxSubmissionClient) import Ouroboros.Network.Protocol.LocalTxSubmission.Server (localTxSubmissionServerPeer) +import Ouroboros.Network.SizeInBytes import Test.Consensus.Cardano.MiniProtocol.LocalTxSubmission.ByteStringTxParser (deserialiseTx) import Test.Consensus.Cardano.ProtocolInfo @@ -85,7 +86,7 @@ tests = mempool <- Mocked.openMockedMempool capcityBytesOverride tracer - LedgerSupportsMempool.txInBlockSize + (SizeInBytes . LedgerSupportsMempool.txInBlockSize) mempoolParams mempool `should_process` [ _137 ] diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/AllegraMary.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/AllegraMary.hs index daef2413be..0dcb32cb51 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/AllegraMary.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/AllegraMary.hs @@ -240,8 +240,8 @@ prop_simple_allegraMary_convergence TestSetup protocolParamsShelleyBased (SL.ProtVer majorVersion1 0) (SL.ProtVer majorVersion2 0) - ( L.mkTransitionConfig () - $ L.mkTransitionConfig () + ( L.mkTransitionConfig L.NoGenesis + $ L.mkTransitionConfig L.NoGenesis $ L.mkShelleyTransitionConfig genesisShelley ) hardForkTrigger diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/MaryAlonzo.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/MaryAlonzo.hs index 4bb0eb5e40..696dd4c943 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/MaryAlonzo.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/MaryAlonzo.hs @@ -246,8 +246,8 @@ prop_simple_allegraAlonzo_convergence TestSetup (SL.ProtVer majorVersion1 0) (SL.ProtVer majorVersion2 0) ( L.mkTransitionConfig alonzoGenesis - $ L.mkTransitionConfig () - $ L.mkTransitionConfig () + $ L.mkTransitionConfig L.NoGenesis + $ L.mkTransitionConfig L.NoGenesis $ L.mkShelleyTransitionConfig shelleyGenesis ) hardForkTrigger diff --git a/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/ShelleyAllegra.hs b/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/ShelleyAllegra.hs index 57fe18ba9f..3c0f33e0e6 100644 --- a/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/ShelleyAllegra.hs +++ b/ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/ShelleyAllegra.hs @@ -251,7 +251,7 @@ prop_simple_shelleyAllegra_convergence TestSetup protocolParamsShelleyBased (SL.ProtVer majorVersion1 0) (SL.ProtVer majorVersion2 0) - ( L.mkTransitionConfig () + ( L.mkTransitionConfig L.NoGenesis $ L.mkShelleyTransitionConfig genesisShelley ) hardForkTrigger diff --git a/ouroboros-consensus-diffusion/CHANGELOG.md b/ouroboros-consensus-diffusion/CHANGELOG.md index 809cad88c5..f003c73ccb 100644 --- a/ouroboros-consensus-diffusion/CHANGELOG.md +++ b/ouroboros-consensus-diffusion/CHANGELOG.md @@ -2,6 +2,13 @@ # Changelog entries + +## 0.17.1.0 — 2024-08-26 + +### Non-Breaking + +- Propagate `ouroboros-network` types `NumTxIdsToAck` and `SizeInBytes` + ## 0.17.0.1 — 2024-06-26 diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal index 1b81f61b54..0f0a674759 100644 --- a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal +++ b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus-diffusion -version: 0.17.0.1 +version: 0.17.1.0 synopsis: Integration for the Ouroboros Network layer description: Top level integration for consensus & network layers of the Ouroboros blockchain protocol. @@ -90,10 +90,10 @@ library io-classes ^>=1.5, mtl, ouroboros-consensus ^>=0.20, - ouroboros-network ^>=0.16, - ouroboros-network-api ^>=0.7.3, + ouroboros-network ^>=0.17.1, + ouroboros-network-api ^>=0.9, ouroboros-network-framework ^>=0.13.2, - ouroboros-network-protocols ^>=0.9, + ouroboros-network-protocols ^>=0.10, random, safe-wild-cards ^>=1.0, serialise ^>=0.2, diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs index abb195eb65..79a3a08e0b 100644 --- a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs +++ b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs @@ -242,14 +242,14 @@ mkHandlers , hTxSubmissionClient = \version controlMessageSTM peer -> txSubmissionOutbound (contramap (TraceLabelPeer peer) (Node.txOutboundTracer tracers)) - (txSubmissionMaxUnacked miniProtocolParameters) + (NumTxIdsToAck $ txSubmissionMaxUnacked miniProtocolParameters) (mapTxSubmissionMempoolReader txForgetValidated $ getMempoolReader getMempool) version controlMessageSTM , hTxSubmissionServer = \version peer -> txSubmissionInbound (contramap (TraceLabelPeer peer) (Node.txInboundTracer tracers)) - (txSubmissionMaxUnacked miniProtocolParameters) + (NumTxIdsToAck $ txSubmissionMaxUnacked miniProtocolParameters) (mapTxSubmissionMempoolReader txForgetValidated $ getMempoolReader getMempool) (getMempoolWriter getMempool) version diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs index 1c6f0bdb0f..12b356ed66 100644 --- a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs +++ b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/NodeKernel.hs @@ -104,6 +104,7 @@ import Ouroboros.Network.PeerSharing (PeerSharingAPI, PeerSharingRegistry, newPeerSharingAPI, newPeerSharingRegistry, ps_POLICY_PEER_SHARE_MAX_PEERS, ps_POLICY_PEER_SHARE_STICKY_TIME) +import Ouroboros.Network.SizeInBytes import Ouroboros.Network.TxSubmission.Inbound (TxSubmissionMempoolWriter) import qualified Ouroboros.Network.TxSubmission.Inbound as Inbound @@ -379,7 +380,7 @@ initInternalState NodeKernelArgs { tracers, chainDB, registry, cfg (configLedger cfg) mempoolCapacityOverride (mempoolTracer tracers) - txInBlockSize + (SizeInBytes . txInBlockSize) fetchClientRegistry <- newFetchClientRegistry diff --git a/ouroboros-consensus/CHANGELOG.md b/ouroboros-consensus/CHANGELOG.md index 26f0239538..efb806392d 100644 --- a/ouroboros-consensus/CHANGELOG.md +++ b/ouroboros-consensus/CHANGELOG.md @@ -2,6 +2,23 @@ # Changelog entries + +## 0.20.1.0 — 2024-08-26 + +### Non-Breaking + +- Bump to `nothunks` 0.2 +- Add `NoThunks` orphan instance for `NoGenesis era` + +### Breaking + +- Update `txSize` to return `SizeInBytes` instead of `TxSizeInBytes` +- Expose `SizeInBytes` instead of `TxSizeInBytes` +- Update `mpEnvTxSize`and `txSizesInBytes` to return `SizeInBytes` instead of `TxSizeInBytes` +- `initMempoolEnv`, `extendVRNew`, `openMempool`, `openMempoolWithoutSyncThread`, `implAddTx`, `implTryAddTx` and `openMockedMempool` now require callback `(GenTx blk -> SizeInBytes)` instead of `(GenTx blk -> TxSizeInBytes)` +- Update `txTicketTxSizeInBytes`,`mSizeBytes`'s types from `TxSizeInBytes` to `SizeInBytes` +- `splitAfterTxSize`, `splitAfterTxSizeSpec` requires `SizeInBytes` instead of `TxSizeInBytes` + ## 0.20.0.0 — 2024-07-02 diff --git a/ouroboros-consensus/bench/mempool-bench/Bench/Consensus/Mempool/TestBlock.hs b/ouroboros-consensus/bench/mempool-bench/Bench/Consensus/Mempool/TestBlock.hs index 989ce7ff24..e2becb2cfa 100644 --- a/ouroboros-consensus/bench/mempool-bench/Bench/Consensus/Mempool/TestBlock.hs +++ b/ouroboros-consensus/bench/mempool-bench/Bench/Consensus/Mempool/TestBlock.hs @@ -37,6 +37,7 @@ import qualified Ouroboros.Consensus.HardFork.History as HardFork import qualified Ouroboros.Consensus.Ledger.Basics as Ledger import qualified Ouroboros.Consensus.Ledger.SupportsMempool as Ledger import qualified Ouroboros.Consensus.Mempool as Mempool +import Ouroboros.Network.SizeInBytes import Test.Util.TestBlock (LedgerState (TestLedger), PayloadSemantics (PayloadDependentError, PayloadDependentState, applyPayload), TestBlockWith, applyDirectlyToPayloadDependentState, @@ -122,7 +123,7 @@ newtype instance Ledger.GenTx TestBlock = TestBlockGenTx { unGenTx :: Tx } -- | For the mempool tests and benchmarks it is not imporant that we calculate -- the actual size of the transaction in bytes. -txSize :: Ledger.GenTx TestBlock -> Mempool.TxSizeInBytes +txSize :: Ledger.GenTx TestBlock -> Mempool.SizeInBytes txSize (TestBlockGenTx tx) = fromIntegral $ 1 + length (consumed tx) + length (produced tx) mkTx :: @@ -148,7 +149,7 @@ instance Ledger.LedgerSupportsMempool TestBlock where -- maximum mempool capacity. The value used here depends on 'txInBlockSize'. txsMaxBytes _ = 20 - txInBlockSize = txSize + txInBlockSize = getSizeInBytes . txSize txForgetValidated (ValidatedGenTx tx) = tx diff --git a/ouroboros-consensus/bench/mempool-bench/Main.hs b/ouroboros-consensus/bench/mempool-bench/Main.hs index f344ee33c2..bcc45a2db0 100644 --- a/ouroboros-consensus/bench/mempool-bench/Main.hs +++ b/ouroboros-consensus/bench/mempool-bench/Main.hs @@ -22,6 +22,7 @@ import qualified Data.Text as Text import qualified Data.Text.Read as Text.Read import Main.Utf8 (withStdTerminalHandles) import qualified Ouroboros.Consensus.Mempool.Capacity as Mempool +import Ouroboros.Network.SizeInBytes import System.Exit (die, exitFailure) import qualified Test.Consensus.Mempool.Mocked as Mocked import Test.Consensus.Mempool.Mocked (MockedMempool) @@ -57,7 +58,7 @@ main = withStdTerminalHandles $ do (pure $!! let cmds = mkNTryAddTxs n sz = sum $ map TestBlock.txSize $ getCmdsTxs cmds - in (cmds, Mempool.ByteSize sz) + in (cmds, Mempool.ByteSize $ getSizeInBytes sz) ) (\_ -> pure ()) (\getCmds -> do diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal index 8da0a39480..aeb03444bb 100644 --- a/ouroboros-consensus/ouroboros-consensus.cabal +++ b/ouroboros-consensus/ouroboros-consensus.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus -version: 0.20.0.0 +version: 0.20.1.0 synopsis: Consensus layer for the Ouroboros blockchain protocol description: Consensus layer for the Ouroboros blockchain protocol. license: Apache-2.0 @@ -279,6 +279,7 @@ library bytestring >=0.10 && <0.13, cardano-binary, cardano-crypto-class, + cardano-ledger-core, cardano-prelude, cardano-slotting, cardano-strict-containers, @@ -292,10 +293,10 @@ library io-classes ^>=1.5, measures, mtl, - nothunks ^>=0.1.5, - ouroboros-network-api ^>=0.7.3, + nothunks ^>=0.2, + ouroboros-network-api ^>=0.9, ouroboros-network-mock ^>=0.1, - ouroboros-network-protocols ^>=0.9, + ouroboros-network-protocols ^>=0.10, primitive, psqueues ^>=0.2.3, quiet ^>=0.2, @@ -696,6 +697,7 @@ benchmark mempool-bench deepseq, nothunks, ouroboros-consensus, + ouroboros-network-api, serialise, tasty, tasty-bench, 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 2b504c2ab8..509583abf3 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_14 -> QueryVersion2 NodeToClientV_15 -> QueryVersion2 NodeToClientV_16 -> QueryVersion2 + NodeToClientV_17 -> QueryVersion2 diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs index 849e38cce4..d91ad92420 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool.hs @@ -15,8 +15,8 @@ module Ouroboros.Consensus.Mempool ( -- ** Mempool Snapshot , MempoolSnapshot (..) -- ** Re-exports + , SizeInBytes , TicketNo - , TxSizeInBytes , zeroTicketNo -- * Mempool capacity , MempoolCapacityBytes (..) @@ -39,7 +39,7 @@ module Ouroboros.Consensus.Mempool ( import Ouroboros.Consensus.Mempool.API (ForgeLedgerState (..), Mempool (..), MempoolAddTxResult (..), - MempoolSnapshot (..), TicketNo, TxSizeInBytes, addLocalTxs, + MempoolSnapshot (..), SizeInBytes, TicketNo, addLocalTxs, addTxs, isMempoolTxAdded, isMempoolTxRejected, mempoolTxAddedToMaybe, zeroTicketNo) import Ouroboros.Consensus.Mempool.Capacity (ByteSize (..), diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs index 4414869937..3a321ce7a4 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/API.hs @@ -25,8 +25,8 @@ module Ouroboros.Consensus.Mempool.API ( -- * Mempool Snapshot , MempoolSnapshot (..) -- * Re-exports + , SizeInBytes , TicketNo - , TxSizeInBytes , zeroTicketNo ) where @@ -36,7 +36,7 @@ import Ouroboros.Consensus.Ledger.SupportsMempool import qualified Ouroboros.Consensus.Mempool.Capacity as Cap import Ouroboros.Consensus.Mempool.TxSeq (TicketNo, zeroTicketNo) import Ouroboros.Consensus.Util.IOLike -import Ouroboros.Network.Protocol.TxSubmission2.Type (TxSizeInBytes) +import Ouroboros.Network.Protocol.TxSubmission2.Type (SizeInBytes) {------------------------------------------------------------------------------- Mempool API @@ -209,7 +209,7 @@ data Mempool m blk = Mempool { , getCapacity :: STM m Cap.MempoolCapacityBytes -- | Return the post-serialisation size in bytes of a 'GenTx'. - , getTxSize :: GenTx blk -> TxSizeInBytes + , getTxSize :: GenTx blk -> SizeInBytes } {------------------------------------------------------------------------------- diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Impl/Common.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Impl/Common.hs index d723189eb7..3448785e98 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Impl/Common.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Impl/Common.hs @@ -191,7 +191,7 @@ data MempoolEnv m blk = MempoolEnv { , mpEnvAddTxsRemoteFifo :: MVar m () , mpEnvAddTxsAllFifo :: MVar m () , mpEnvTracer :: Tracer m (TraceEventMempool blk) - , mpEnvTxSize :: GenTx blk -> TxSizeInBytes + , mpEnvTxSize :: GenTx blk -> SizeInBytes , mpEnvCapacityOverride :: MempoolCapacityBytesOverride } @@ -204,7 +204,7 @@ initMempoolEnv :: ( IOLike m -> LedgerConfig blk -> MempoolCapacityBytesOverride -> Tracer m (TraceEventMempool blk) - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -> m (MempoolEnv m blk) initMempoolEnv ledgerInterface cfg capacityOverride tracer txSize = do st <- atomically $ getCurrentLedgerState ledgerInterface @@ -327,7 +327,7 @@ extendVRPrevApplied cfg txTicket vr = -- again. extendVRNew :: (LedgerSupportsMempool blk, HasTxId (GenTx blk)) => LedgerConfig blk - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -> WhetherToIntervene -> GenTx blk -> ValidationResult (GenTx blk) blk diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Init.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Init.hs index f2aa648eb8..685aebdf5c 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Init.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Init.hs @@ -39,7 +39,7 @@ openMempool :: -> LedgerConfig blk -> MempoolCapacityBytesOverride -> Tracer m (TraceEventMempool blk) - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -> m (Mempool m blk) openMempool registry ledger cfg capacityOverride tracer txSize = do env <- initMempoolEnv ledger cfg capacityOverride tracer txSize @@ -91,7 +91,7 @@ openMempoolWithoutSyncThread :: -> LedgerConfig blk -> MempoolCapacityBytesOverride -> Tracer m (TraceEventMempool blk) - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -> m (Mempool m blk) openMempoolWithoutSyncThread ledger cfg capacityOverride tracer txSize = mkMempool <$> initMempoolEnv ledger cfg capacityOverride tracer txSize diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/TxSeq.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/TxSeq.hs index b162fea511..4b0e4c11bb 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/TxSeq.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/TxSeq.hs @@ -36,7 +36,7 @@ import Data.Word (Word64) import GHC.Generics (Generic) import NoThunks.Class (NoThunks) import Ouroboros.Consensus.Mempool.Capacity (MempoolSize (..)) -import Ouroboros.Network.Protocol.TxSubmission2.Type (TxSizeInBytes) +import Ouroboros.Network.SizeInBytes {------------------------------------------------------------------------------- Mempool transaction sequence as a finger tree @@ -61,7 +61,7 @@ data TxTicket tx = TxTicket -- ^ The transaction associated with this ticket. , txTicketNo :: !TicketNo -- ^ The ticket number. - , txTicketTxSizeInBytes :: !TxSizeInBytes + , txTicketTxSizeInBytes :: !SizeInBytes -- ^ The byte size of the transaction ('txTicketTx') associated with this -- ticket. , txTicketRefScriptSize :: !Int @@ -106,7 +106,7 @@ instance Foldable TxSeq where data TxSeqMeasure = TxSeqMeasure { mMinTicket :: !TicketNo, mMaxTicket :: !TicketNo, - mSizeBytes :: !TxSizeInBytes, + mSizeBytes :: !SizeInBytes, mSize :: !Int, mRefScriptSize :: !Int } @@ -189,11 +189,11 @@ splitAfterTicketNo (TxSeq txs) n = (l, r) -> (TxSeq l, TxSeq r) -- | \( O(\log(n)) \). Split the sequence of transactions into two parts --- based on the given 'TxSizeInBytes'. The first part has transactions whose --- summed 'TxSizeInBytes' is less than or equal to the given 'TxSizeInBytes', +-- based on the given 'SizeInBytes'. The first part has transactions whose +-- summed 'SizeInBytes' is less than or equal to the given 'SizeInBytes', -- and the second part has the remaining transactions in the sequence. -- -splitAfterTxSize :: TxSeq tx -> TxSizeInBytes -> (TxSeq tx, TxSeq tx) +splitAfterTxSize :: TxSeq tx -> SizeInBytes -> (TxSeq tx, TxSeq tx) splitAfterTxSize (TxSeq txs) n = case FingerTree.split (\m -> mSizeBytes m > n) txs of (l, r) -> (TxSeq l, TxSeq r) @@ -204,14 +204,14 @@ splitAfterTxSize (TxSeq txs) n = -- -- This function is used to verify whether 'splitAfterTxSize' behaves as -- expected. -splitAfterTxSizeSpec :: TxSeq tx -> TxSizeInBytes -> (TxSeq tx, TxSeq tx) +splitAfterTxSizeSpec :: TxSeq tx -> SizeInBytes -> (TxSeq tx, TxSeq tx) splitAfterTxSizeSpec txseq n = mapTuple fromList $ go 0 [] (toList txseq) where mapTuple :: (a -> b) -> (a, a) -> (b, b) mapTuple f (x, y) = (f x, f y) - go :: TxSizeInBytes + go :: SizeInBytes -> [TxTicket tx] -> [TxTicket tx] -> ([TxTicket tx], [TxTicket tx]) @@ -244,7 +244,7 @@ toTuples (TxSeq ftree) = fmap toMempoolSize :: TxSeq tx -> MempoolSize toMempoolSize (TxSeq ftree) = MempoolSize { msNumTxs = fromIntegral mSize - , msNumBytes = mSizeBytes + , msNumBytes = getSizeInBytes mSizeBytes } where TxSeqMeasure { mSizeBytes, mSize } = FingerTree.measure ftree diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Update.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Update.hs index 193fbf83a0..dec61a9ed9 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Update.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Mempool/Update.hs @@ -44,7 +44,7 @@ implAddTx :: -- ^ The FIFO for all remote peers and local clients -> LedgerConfig blk -- ^ The configuration of the ledger. - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -- ^ The function to calculate the size of a -- transaction. -> Tracer m (TraceEventMempool blk) @@ -144,7 +144,7 @@ implTryAddTx :: -- ^ The InternalState TVar. -> LedgerConfig blk -- ^ The configuration of the ledger. - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -- ^ The function to calculate the size of a -- transaction. -> WhetherToIntervene @@ -172,7 +172,7 @@ pureTryAddTx :: ) => LedgerCfg (LedgerState blk) -- ^ The ledger configuration. - -> (GenTx blk -> TxSizeInBytes) + -> (GenTx blk -> SizeInBytes) -- ^ The function to claculate the size of a transaction. -> WhetherToIntervene -> GenTx blk diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/Orphans.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/Orphans.hs index 582821b599..ffb1d559b6 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/Orphans.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/Orphans.hs @@ -15,6 +15,7 @@ module Ouroboros.Consensus.Util.Orphans () where import Cardano.Crypto.DSIGN.Class import Cardano.Crypto.DSIGN.Mock (MockDSIGN) import Cardano.Crypto.Hash (Hash) +import Cardano.Ledger.Genesis (NoGenesis (..)) import Codec.CBOR.Decoding (Decoder) import Codec.Serialise (Serialise (..)) import Control.Tracer (Tracer) @@ -22,7 +23,6 @@ import Data.Bimap (Bimap) import qualified Data.Bimap as Bimap import Data.IntPSQ (IntPSQ) import qualified Data.IntPSQ as PSQ -import Data.Monoid import Data.SOP.BasicFunctors import NoThunks.Class (InspectHeap (..), InspectHeapNamed (..), NoThunks (..), OnlyCheckWhnfNamed (..), allNoThunks, @@ -46,6 +46,10 @@ instance Serialise (VerKeyDSIGN MockDSIGN) where NoThunks -------------------------------------------------------------------------------} +instance NoThunks (NoGenesis era) where + showTypeOf _ = "NoGenesis" + wNoThunks _ NoGenesis = return Nothing + instance (NoThunks k, NoThunks v) => NoThunks (Bimap k v) where wNoThunks ctxt = noThunksInKeysAndValues ctxt . Bimap.toList @@ -71,8 +75,6 @@ instance NoThunks a => NoThunks (K a b) where showTypeOf _ = showTypeOf (Proxy @a) wNoThunks ctxt (K a) = wNoThunks ("K":ctxt) a -instance NoThunks a => NoThunks (Sum a) - {------------------------------------------------------------------------------- fs-api -------------------------------------------------------------------------------} diff --git a/ouroboros-consensus/src/unstable-mempool-test-utils/Test/Consensus/Mempool/Mocked.hs b/ouroboros-consensus/src/unstable-mempool-test-utils/Test/Consensus/Mempool/Mocked.hs index 3d9975c06d..e05161aa9c 100644 --- a/ouroboros-consensus/src/unstable-mempool-test-utils/Test/Consensus/Mempool/Mocked.hs +++ b/ouroboros-consensus/src/unstable-mempool-test-utils/Test/Consensus/Mempool/Mocked.hs @@ -58,7 +58,7 @@ openMockedMempool :: ) => Mempool.MempoolCapacityBytesOverride -> Tracer IO (Mempool.TraceEventMempool blk) - -> (Ledger.GenTx blk -> Mempool.TxSizeInBytes) + -> (Ledger.GenTx blk -> Mempool.SizeInBytes) -> InitialMempoolAndModelParams blk -> IO (MockedMempool IO blk) openMockedMempool capacityOverride tracer txSizeImpl initialParams = do diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs index 84cf942ca5..126b012ebb 100644 --- a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs +++ b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool.hs @@ -64,6 +64,7 @@ import Ouroboros.Consensus.Util (repeatedly, repeatedlyM, safeMaximumOn, (.:)) import Ouroboros.Consensus.Util.Condense (condense) import Ouroboros.Consensus.Util.IOLike +import Ouroboros.Network.SizeInBytes import Test.QuickCheck hiding (elements) import Test.Tasty (TestTree, testGroup) import Test.Tasty.QuickCheck (testProperty) @@ -338,8 +339,8 @@ ppTestTxWithHash x = condense (hashWithSerialiser toCBOR (simpleGenTx x) :: Hash SHA256 Tx, x) -- | Given some transactions, calculate the sum of their sizes in bytes. -txSizesInBytes :: [TestTx] -> TxSizeInBytes -txSizesInBytes = List.foldl' (\acc tx -> acc + txSize tx) 0 +txSizesInBytes :: [TestTx] -> SizeInBytes +txSizesInBytes = SizeInBytes . List.foldl' (\acc tx -> acc + txSize tx) 0 -- | Generate a 'TestSetup' and return the ledger obtained by applying all of -- the initial transactions. @@ -353,7 +354,7 @@ genTestSetupWithExtraCapacity maxInitialTxs extraCapacity = do (_txs1, ledger1) <- genValidTxs ledgerSize testInitLedger ( txs2, ledger2) <- genValidTxs nbInitialTxs ledger1 let initTxsSizeInBytes = txSizesInBytes txs2 - mpCap = MempoolCapacityBytes (initTxsSizeInBytes + extraCapacity) + mpCap = MempoolCapacityBytes (getSizeInBytes initTxsSizeInBytes + extraCapacity) testSetup = TestSetup { testLedgerState = ledger1 , testInitialTxs = txs2 @@ -389,10 +390,10 @@ instance Arbitrary TestSetup where , testMempoolCapOverride = MempoolCapacityBytesOverride (MempoolCapacityBytes mpCap') } - | let extraCap = mpCap - txSizesInBytes testInitialTxs + | let extraCap = mpCap - getSizeInBytes (txSizesInBytes testInitialTxs) , testInitialTxs' <- shrinkList (const []) testInitialTxs , isRight $ txsAreValid testLedgerState testInitialTxs' - , let mpCap' = txSizesInBytes testInitialTxs' + extraCap + , let mpCap' = getSizeInBytes (txSizesInBytes testInitialTxs') + extraCap ] -- TODO shrink to an override, that's an easier test case @@ -597,7 +598,7 @@ instance Arbitrary TestSetupWithTxs where if noOverride then NoMempoolCapacityBytesOverride else MempoolCapacityBytesOverride $ MempoolCapacityBytes $ - mpCap + txSizesInBytes (map fst txs) + mpCap + getSizeInBytes (txSizesInBytes $ map fst txs) } return TestSetupWithTxs { testSetup = testSetup', txs } @@ -733,7 +734,7 @@ withTestMempool setup@TestSetup {..} prop = testLedgerConfig testMempoolCapOverride tracer - txSize + (SizeInBytes . txSize) result <- addTxs mempool testInitialTxs -- the invalid transactions are reported in the same order they were -- added, so the first error is not the result of a cascade @@ -881,7 +882,7 @@ prop_TxSeq_lookupByTicketNo_sound smalls small = -- | Test that the 'fst' of the result of 'splitAfterTxSize' only contains -- 'TxTicket's whose summed up transaction sizes are less than or equal to --- that of the 'TxSizeInBytes' which the 'TxSeq' was split on. +-- that of the 'SizeInBytes' which the 'TxSeq' was split on. prop_TxSeq_splitAfterTxSize :: TxSizeSplitTestSetup -> Property prop_TxSeq_splitAfterTxSize tss = property $ txSizeSum (TxSeq.toList before) <= tssTxSizeToSplitOn @@ -893,7 +894,7 @@ prop_TxSeq_splitAfterTxSize tss = txseq :: TxSeq Int txseq = txSizeSplitTestSetupToTxSeq tss - txSizeSum :: [TxTicket tx] -> TxSizeInBytes + txSizeSum :: [TxTicket tx] -> SizeInBytes txSizeSum = sum . map txTicketTxSizeInBytes @@ -919,8 +920,8 @@ prop_TxSeq_splitAfterTxSizeSpec tss = -------------------------------------------------------------------------------} data TxSizeSplitTestSetup = TxSizeSplitTestSetup - { tssTxSizes :: ![TxSizeInBytes] - , tssTxSizeToSplitOn :: !TxSizeInBytes + { tssTxSizes :: ![SizeInBytes] + , tssTxSizeToSplitOn :: !SizeInBytes } deriving Show instance Arbitrary TxSizeSplitTestSetup where @@ -935,8 +936,8 @@ instance Arbitrary TxSizeSplitTestSetup where , (1, choose (totalTxsSize + 1, totalTxsSize + 1000)) ] pure TxSizeSplitTestSetup - { tssTxSizes = txSizes - , tssTxSizeToSplitOn = txSizeToSplitOn + { tssTxSizes = map SizeInBytes txSizes + , tssTxSizeToSplitOn = SizeInBytes txSizeToSplitOn } shrink TxSizeSplitTestSetup { tssTxSizes, tssTxSizeToSplitOn } = diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness.hs index 128a81760a..a8a50fb32b 100644 --- a/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness.hs +++ b/ouroboros-consensus/test/consensus-test/Test/Consensus/Mempool/Fairness.hs @@ -28,6 +28,7 @@ import Ouroboros.Consensus.Mempool (Mempool) import qualified Ouroboros.Consensus.Mempool as Mempool import qualified Ouroboros.Consensus.Mempool.Capacity as Mempool import Ouroboros.Consensus.Util.IOLike (STM, atomically, retry) +import Ouroboros.Network.SizeInBytes import System.Random (randomIO) import Test.Consensus.Mempool.Fairness.TestBlock import Test.Tasty (TestTree, testGroup) @@ -92,7 +93,7 @@ testTxSizeFairness TestParams { mempoolMaxCapacity, smallTxSize, largeTxSize, nr (testBlockLedgerConfigFrom eraParams) (Mempool.mkCapacityBytesOverride mempoolMaxCapacity) Tracer.nullTracer - genTxSize + (SizeInBytes . genTxSize) ---------------------------------------------------------------------------- -- Add and collect transactions diff --git a/sop-extras/CHANGELOG.md b/sop-extras/CHANGELOG.md index 1fc8888469..39dca53607 100644 --- a/sop-extras/CHANGELOG.md +++ b/sop-extras/CHANGELOG.md @@ -2,6 +2,13 @@ # Changelog entries + +## 0.2.0.0 — 2024-08-26 + +### Non-Breaking + +- Bump to `nothunks` 0.2 + ## 0.2.0.0 — 2024-05-13 diff --git a/sop-extras/sop-extras.cabal b/sop-extras/sop-extras.cabal index 23d357e9bd..cb27ee2813 100644 --- a/sop-extras/sop-extras.cabal +++ b/sop-extras/sop-extras.cabal @@ -5,7 +5,7 @@ description: This package provides some more constructs that are not present on the @sop-core@ package but built upon the same foundations. -version: 0.2.0.0 +version: 0.2.1.0 license: Apache-2.0 license-files: LICENSE @@ -49,7 +49,7 @@ library build-depends: base >=4.14 && <4.21, constraints ^>=0.14, - nothunks ^>=0.1, + nothunks ^>=0.2, sop-core ^>=0.5, strict-sop-core ^>=0.1, these ^>=1.2, diff --git a/strict-sop-core/CHANGELOG.md b/strict-sop-core/CHANGELOG.md index d880a46ad0..16ec4d8324 100644 --- a/strict-sop-core/CHANGELOG.md +++ b/strict-sop-core/CHANGELOG.md @@ -2,6 +2,13 @@ # Changelog entries + +## 0.1.1.0 — 2024-08-26 + +### Non-Breaking + +- Bump to `nothunks` 0.2 + ## 0.1.1.0 — 2024-05-13 diff --git a/strict-sop-core/strict-sop-core.cabal b/strict-sop-core/strict-sop-core.cabal index 2bd0e53bba..0aa5b22c20 100644 --- a/strict-sop-core/strict-sop-core.cabal +++ b/strict-sop-core/strict-sop-core.cabal @@ -2,7 +2,7 @@ cabal-version: 3.0 name: strict-sop-core synopsis: Strict replacement for NS and NP. description: Strict replacement for NS and NP from @sop-core@. -version: 0.1.1.0 +version: 0.1.2.0 license: Apache-2.0 license-files: LICENSE @@ -38,7 +38,7 @@ library build-depends: base >=4.14 && <4.21, - nothunks ^>=0.1, + nothunks ^>=0.2, sop-core ^>=0.5, default-language: Haskell2010 From cba804e58cfee357e00a6b097bdec608b447624a Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Wed, 28 Aug 2024 21:07:48 +0200 Subject: [PATCH 2/2] Fix Byron tests by disabling network TxSubmission delay --- cabal.project | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cabal.project b/cabal.project index 9a82c4fd96..ab838dbc76 100644 --- a/cabal.project +++ b/cabal.project @@ -34,6 +34,12 @@ multi-repl: True import: ./asserts.cabal +package ouroboros-network + -- Certain ThreadNet tests rely on transactions to be submitted promptly after + -- a node (re)start. Therefore, we disable this flag (see + -- https://github.com/IntersectMBO/ouroboros-network/issues/4927 for context). + flags: -txsubmission-delay + -- We need to disable bitvec's SIMD for now, as it breaks during cross compilation. if(os(windows)) constraints: