Skip to content

Commit 8ffa243

Browse files
committed
change serialization / deserialization for OneEraGenTxId so it's treated as a bytestring and is decoded into an arbitrary era
use PatternSynonyms rather than coerces for ByronDlgId / ByronUpdate*Id use Shelley for blessedGenTxIdDecodeEra for CardanoShelleyEras OneEraGenTxId { NS WrapGenTxId xs -> ShortByteString } use CardanoNodeToClientVersion15 instead of creating a new version move GenTxId to its own section and describe why it's not an NS of GenTxId
1 parent a68908a commit 8ffa243

File tree

254 files changed

+391
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+391
-190
lines changed

cabal.project

+7
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,10 @@ source-repository-package
103103
plutus-core
104104
plutus-ledger-api
105105
plutus-tx
106+
107+
source-repository-package
108+
type: git
109+
location: https://github.com/input-output-hk/ouroboros-network
110+
-- branch: fraser-iohk/one-era-gen-tx-id-protocol-version-bump
111+
tag: 48b8d1df364a266b260b462cba0db8c4b9850f75
112+
subdir: ouroboros-network-api
Binary file not shown.

ouroboros-consensus-cardano/golden/byron/QueryVersion1/ByronNodeToClientVersion1/GenTxId

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Allegra

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Alonzo

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Babbage

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Conway

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion2/GenTxId_Mary

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Allegra

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Alonzo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Babbage

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Byron

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Mary

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/GenTxId_Shelley

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Allegra

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Alonzo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Babbage

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_EBB

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Byron_regular

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Mary

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedBlock_Shelley

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Allegra

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Alonzo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Babbage

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Mary

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/CardanoNodeToNodeVersion3/SerialisedHeader_Shelley

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Allegra

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Alonzo

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Babbage

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Conway

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/GenTxId_Mary

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Allegra

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Alonzo

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Babbage

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Conway

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion13/GenTxId_Mary

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Allegra

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Alonzo

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Babbage

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Conway

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion14/GenTxId_Mary

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Allegra

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Alonzo

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Babbage

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Conway

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion15/GenTxId_Mary

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Allegra

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Alonzo

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Babbage

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Conway

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion16/GenTxId_Mary

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/ApplyTxErr_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Allegra

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Alonzo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Babbage

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Byron

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Mary

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/GenTxId_Shelley

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_EpochNo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_GetBigLedgerPeerSnapshot

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_LedgerTip

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_StakeDistribution

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_EpochNo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_GetBigLedgerPeerSnapshot

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_LedgerTip

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_StakeDistribution

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_EpochNo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_StakeDistribution

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_EpochNo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_LedgerTip

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_StakeDistribution

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_EpochNo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_GetBigLedgerPeerSnapshot

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_LedgerTip

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_StakeDistribution

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_EpochNo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_GetBigLedgerPeerSnapshot

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_LedgerTip

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_StakeDistribution

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Allegra

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Alonzo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Babbage

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_EBB

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Byron_regular

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Mary

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SerialisedBlock_Shelley

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Allegra

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Alonzo

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Babbage

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Byron

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Conway

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Mary

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/SlotNo_Shelley

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import qualified Cardano.Chain.Update as CC.Update
2121
import Control.Monad
2222
import qualified Data.Map.Strict as Map
2323
import Data.Maybe (listToMaybe, mapMaybe)
24+
import Data.SOP.Strict.NS (NS(..))
2425
import Data.Word
2526
import GHC.Generics
2627
import NoThunks.Class
@@ -76,6 +77,13 @@ instance SupportedNetworkProtocolVersion ByronBlockHFC where
7677

7778
latestReleasedNodeVersion = latestReleasedNodeVersionDefault
7879

80+
{-------------------------------------------------------------------------------
81+
HasBlessedGenTxIdEra instance
82+
-------------------------------------------------------------------------------}
83+
84+
instance HasBlessedGenTxIdEra '[ByronBlock] where
85+
blessedGenTxIdEra = Z mempty
86+
7987
{-------------------------------------------------------------------------------
8088
SerialiseHFC instance
8189
-------------------------------------------------------------------------------}

0 commit comments

Comments
 (0)