cardano-ledger upgrade: use modified ledger serialization API

Author: neilmayhew

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

@@ -178,7 +178,7 @@ encodeByronBlock blk = mconcat [
 -- | Inverse of 'encodeByronBlock'
 decodeByronBlock :: CC.EpochSlots -> Decoder s (Lazy.ByteString -> ByronBlock)
 decodeByronBlock epochSlots =
-    toPlainDecoder byronProtVer $
+    toPlainDecoder Nothing byronProtVer $
     flip (\bs -> mkByronBlock epochSlots
                . annotationBytes bs)
     <$> CC.decCBORABlockOrBoundary epochSlots
@@ -195,7 +195,7 @@ decodeByronBlock epochSlots =
 decodeByronRegularBlock :: CC.EpochSlots
                         -> Decoder s (Lazy.ByteString -> ByronBlock)
 decodeByronRegularBlock epochSlots =
-    toPlainDecoder byronProtVer $
+    toPlainDecoder Nothing byronProtVer $
     flip (\bs -> mkByronBlock epochSlots
                . annotationBytes bs
                . CC.ABOBBlock)
@@ -213,7 +213,7 @@ decodeByronRegularBlock epochSlots =
 decodeByronBoundaryBlock :: CC.EpochSlots
                          -> Decoder s (Lazy.ByteString -> ByronBlock)
 decodeByronBoundaryBlock epochSlots =
-    toPlainDecoder byronProtVer $
+    toPlainDecoder Nothing byronProtVer $
     flip (\bs -> mkByronBlock epochSlots
                . annotationBytes bs
                . CC.ABOBBoundary)
@@ -231,7 +231,7 @@ decodeByronRegularHeader ::
      CC.EpochSlots
   -> Decoder s (Lazy.ByteString -> RawHeader)
 decodeByronRegularHeader epochSlots =
-    toPlainDecoder byronProtVer $
+    toPlainDecoder Nothing byronProtVer $
     flip annotationBytes <$> CC.decCBORAHeader epochSlots
 
 -- | Encodes a raw Byron EBB header /without/ a tag indicating whether it's a
@@ -244,7 +244,7 @@ encodeByronBoundaryHeader = toByronCBOR . CBOR.encodePreEncoded . CC.boundaryHea
 -- | Inverse of 'encodeByronBoundaryHeader'
 decodeByronBoundaryHeader :: Decoder s (Lazy.ByteString -> RawBoundaryHeader)
 decodeByronBoundaryHeader =
-    toPlainDecoder byronProtVer $
+    toPlainDecoder Nothing byronProtVer $
     flip annotationBytes <$> CC.decCBORABoundaryHeader
 
 -- | The 'BinaryBlockInfo' of the given 'ByronBlock'.
@@ -325,7 +325,7 @@ encodeUnsizedHeader (UnsizedHeader raw _ _) = toByronCBOR $ CC.encCBORABlockOrBo
 decodeUnsizedHeader :: CC.EpochSlots
                     -> Decoder s (Lazy.ByteString -> UnsizedHeader)
 decodeUnsizedHeader epochSlots =
-    toPlainDecoder byronProtVer $
+    toPlainDecoder Nothing byronProtVer $
     fillInByteString <$> CC.decCBORABlockOrBoundaryHdr epochSlots
   where
     fillInByteString :: CC.ABlockOrBoundaryHdr ByteSpan

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Block.hs

@@ -40,12 +40,12 @@ module Ouroboros.Consensus.Shelley.Ledger.Block (
 
 import qualified Cardano.Crypto.Hash as Crypto
 import           Cardano.Ledger.Binary (Annotator (..), DecCBOR (..),
-                     EncCBOR (..), FullByteString (..), serialize,
-                     toPlainDecoder)
+                     EncCBOR (..), FullByteString (..), serialize)
 import qualified Cardano.Ledger.Binary.Plain as Plain
-import           Cardano.Ledger.Core as SL (eraProtVerLow, toEraCBOR)
+import           Cardano.Ledger.Core as SL (eraDecoder, eraProtVerLow,
+                     toEraCBOR)
+import qualified Cardano.Ledger.Core as SL (hashTxSeq)
 import           Cardano.Ledger.Crypto (HASH)
-import qualified Cardano.Ledger.Era as SL (hashTxSeq)
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Protocol.TPraos.BHeader as SL
 import qualified Data.ByteString.Lazy as Lazy
@@ -274,7 +274,7 @@ encodeShelleyBlock = toEraCBOR @era
 decodeShelleyBlock ::
   forall proto era. ShelleyCompatible proto era
   => forall s. Plain.Decoder s (Lazy.ByteString -> ShelleyBlock proto era)
-decodeShelleyBlock = toPlainDecoder (eraProtVerLow @era) $ (. Full) . runAnnotator <$> decCBOR
+decodeShelleyBlock = eraDecoder @era $ (. Full) . runAnnotator <$> decCBOR
 
 shelleyBinaryBlockInfo :: forall proto era. ShelleyCompatible proto era => ShelleyBlock proto era -> BinaryBlockInfo
 shelleyBinaryBlockInfo blk = BinaryBlockInfo {
@@ -293,7 +293,7 @@ encodeShelleyHeader = toEraCBOR @era
 decodeShelleyHeader ::
   forall proto era. ShelleyCompatible proto era
   => forall s. Plain.Decoder s (Lazy.ByteString -> Header (ShelleyBlock proto era))
-decodeShelleyHeader = toPlainDecoder (eraProtVerLow @era) $ (. Full) . runAnnotator <$> decCBOR
+decodeShelleyHeader = eraDecoder @era $ (. Full) . runAnnotator <$> decCBOR
 
 {-------------------------------------------------------------------------------
   Condense

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs

@@ -38,7 +38,7 @@ module Ouroboros.Consensus.Shelley.Ledger.Mempool (
 
 import qualified Cardano.Crypto.Hash as Hash
 import qualified Cardano.Ledger.Allegra.Rules as AllegraEra
-import           Cardano.Ledger.Alonzo.Core (Tx, TxSeq, bodyTxL, eraProtVerLow,
+import           Cardano.Ledger.Alonzo.Core (Tx, TxSeq, bodyTxL, eraDecoder,
                      fromTxSeq, ppMaxBBSizeL, ppMaxBlockExUnitsL, sizeTxF)
 import qualified Cardano.Ledger.Alonzo.Rules as AlonzoEra
 import           Cardano.Ledger.Alonzo.Scripts (ExUnits, ExUnits',
@@ -49,7 +49,7 @@ import qualified Cardano.Ledger.Babbage.Rules as BabbageEra
 import qualified Cardano.Ledger.BaseTypes as L
 import           Cardano.Ledger.Binary (Annotator (..), DecCBOR (..),
                      EncCBOR (..), FromCBOR (..), FullByteString (..),
-                     ToCBOR (..), toPlainDecoder)
+                     ToCBOR (..))
 import qualified Cardano.Ledger.Conway.Rules as ConwayEra
 import qualified Cardano.Ledger.Conway.Rules as SL
 import qualified Cardano.Ledger.Conway.UTxO as SL
@@ -199,7 +199,7 @@ instance ShelleyCompatible proto era => ToCBOR (GenTx (ShelleyBlock proto era))
 
 instance ShelleyCompatible proto era => FromCBOR (GenTx (ShelleyBlock proto era)) where
   fromCBOR = fmap mkShelleyTx $ unwrapCBORinCBOR
-    $ toPlainDecoder (eraProtVerLow @era) $ (. Full) . runAnnotator <$> decCBOR
+    $ eraDecoder @era $ (. Full) . runAnnotator <$> decCBOR
 
 {-------------------------------------------------------------------------------
   Pretty-printing

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query/PParamsLegacyEncoder.hs

@@ -103,7 +103,7 @@ instance Crypto c => ToCBOR (LegacyPParams (AlonzoEra c)) where
 
 instance Crypto c => FromCBOR (LegacyPParams (AlonzoEra c)) where
   fromCBOR =
-    toPlainDecoder (eraProtVerLow @(AlonzoEra c)) $
+    eraDecoder @(AlonzoEra c) $
       decode $
         RecD mkLegacyAlonzoPParams
           <! From -- appMinFeeA
@@ -173,7 +173,7 @@ instance Crypto c => ToCBOR (LegacyPParams (BabbageEra c)) where
 
 instance Crypto c => FromCBOR (LegacyPParams (BabbageEra c)) where
   fromCBOR =
-    toPlainDecoder (eraProtVerLow @(BabbageEra c)) $
+    eraDecoder @(BabbageEra c) $
       decode $
         RecD mkLegacyBabbagePParams
           <! From -- bppMinFeeA

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Api/KeysByron.hs

@@ -146,7 +146,7 @@ instance SerialiseAsRawBytes (SigningKey ByronKey) where
       either (const Nothing) (Just . ByronSigningKey . Byron.SigningKey)
              (snd <$> CBOR.deserialiseFromBytes decCBORXPrv (LB.fromStrict bs))
       where
-        decCBORXPrv = toPlainDecoder byronProtVer Byron.decCBORXPrv
+        decCBORXPrv = toPlainDecoder Nothing byronProtVer Byron.decCBORXPrv
 
 
 newtype instance Hash ByronKey = ByronKeyHash Byron.KeyHash

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Api/OperationalCertificate.hs

@@ -57,13 +57,13 @@ instance ToCBOR OperationalCertificate where
     toCBOR = CBOR.toPlainEncoding CBOR.shelleyProtVer . encCBOR
 
 instance FromCBOR OperationalCertificate where
-    fromCBOR = CBOR.toPlainDecoder CBOR.shelleyProtVer decCBOR
+    fromCBOR = CBOR.toPlainDecoder Nothing CBOR.shelleyProtVer decCBOR
 
 instance ToCBOR OperationalCertificateIssueCounter where
     toCBOR = CBOR.toPlainEncoding CBOR.shelleyProtVer . encCBOR
 
 instance FromCBOR OperationalCertificateIssueCounter where
-    fromCBOR = CBOR.toPlainDecoder CBOR.shelleyProtVer decCBOR
+    fromCBOR = CBOR.toPlainDecoder Nothing CBOR.shelleyProtVer decCBOR
 
 instance EncCBOR OperationalCertificate where
     encCBOR (OperationalCertificate ocert vkey) =