Merge pull request #4995 from IntersectMBO/td/pv-encoding-in-pparams

Stop encoding/decoding protocol version as a CBOR group in `PParams`

Author: teodanciu

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs

@@ -77,16 +77,13 @@ import Cardano.Ledger.Binary (
   Encoding,
   FromCBOR (..),
   ToCBOR (..),
-  decCBORGroup,
   decodeRecordNamed,
-  encCBORGroup,
   encodeFoldableAsDefLenList,
   encodeFoldableAsIndefLenList,
   encodeListLen,
   encodeMapLen,
   encodeNull,
   encodePreEncoded,
-  listLen,
   serialize',
  )
 import Cardano.Ledger.Binary.Coders (
@@ -389,7 +386,7 @@ instance EraGov AlonzoEra where
 
 instance Era era => EncCBOR (AlonzoPParams Identity era) where
   encCBOR AlonzoPParams {..} =
-    encodeListLen (23 + listLen appProtocolVersion)
+    encodeListLen 24
       <> encCBOR appMinFeeA
       <> encCBOR appMinFeeB
       <> encCBOR appMaxBBSize
@@ -404,7 +401,7 @@ instance Era era => EncCBOR (AlonzoPParams Identity era) where
       <> encCBOR appTau
       <> encCBOR appD
       <> encCBOR appExtraEntropy
-      <> encCBORGroup appProtocolVersion
+      <> encCBOR appProtocolVersion
       <> encCBOR appMinPoolCost
       -- new/updated for alonzo
       <> encCBOR appCoinsPerUTxOWord
@@ -418,7 +415,7 @@ instance Era era => EncCBOR (AlonzoPParams Identity era) where
 
 instance Era era => DecCBOR (AlonzoPParams Identity era) where
   decCBOR =
-    decodeRecordNamed "PParams" (\pp -> 23 + fromIntegral (listLen (appProtocolVersion pp))) $ do
+    decodeRecordNamed "PParams" (const 24) $ do
       appMinFeeA <- decCBOR
       appMinFeeB <- decCBOR
       appMaxBBSize <- decCBOR
@@ -433,7 +430,7 @@ instance Era era => DecCBOR (AlonzoPParams Identity era) where
       appTau <- decCBOR
       appD <- decCBOR
       appExtraEntropy <- decCBOR
-      appProtocolVersion <- decCBORGroup
+      appProtocolVersion <- decCBOR
       appMinPoolCost <- decCBOR
       -- new/updated for alonzo
       appCoinsPerUTxOWord <- decCBOR

eras/babbage/impl/src/Cardano/Ledger/Babbage/PParams.hs

@@ -73,11 +73,8 @@ import Cardano.Ledger.Binary (
   Encoding,
   FromCBOR (..),
   ToCBOR (..),
-  decCBORGroup,
   decodeRecordNamed,
-  encCBORGroup,
   encodeListLen,
-  listLen,
  )
 import Cardano.Ledger.Binary.Coders (
   Decode (..),
@@ -274,7 +271,7 @@ instance EraGov BabbageEra where
 
 instance Era era => EncCBOR (BabbagePParams Identity era) where
   encCBOR BabbagePParams {..} =
-    encodeListLen (21 + listLen bppProtocolVersion)
+    encodeListLen 22
       <> encCBOR bppMinFeeA
       <> encCBOR bppMinFeeB
       <> encCBOR bppMaxBBSize
@@ -287,7 +284,7 @@ instance Era era => EncCBOR (BabbagePParams Identity era) where
       <> encCBOR bppA0
       <> encCBOR bppRho
       <> encCBOR bppTau
-      <> encCBORGroup bppProtocolVersion
+      <> encCBOR bppProtocolVersion
       <> encCBOR bppMinPoolCost
       <> encCBOR bppCoinsPerUTxOByte
       <> encCBOR bppCostModels
@@ -303,7 +300,7 @@ instance Era era => ToCBOR (BabbagePParams Identity era) where
 
 instance Era era => DecCBOR (BabbagePParams Identity era) where
   decCBOR =
-    decodeRecordNamed "PParams" (\pp -> 21 + fromIntegral (listLen (bppProtocolVersion pp))) $ do
+    decodeRecordNamed "PParams" (const 22) $ do
       bppMinFeeA <- decCBOR
       bppMinFeeB <- decCBOR
       bppMaxBBSize <- decCBOR
@@ -316,7 +313,7 @@ instance Era era => DecCBOR (BabbagePParams Identity era) where
       bppA0 <- decCBOR
       bppRho <- decCBOR
       bppTau <- decCBOR
-      bppProtocolVersion <- decCBORGroup
+      bppProtocolVersion <- decCBOR
       bppMinPoolCost <- decCBOR
       bppCoinsPerUTxOByte <- decCBOR
       bppCostModels <- decCBOR

eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs

@@ -50,9 +50,7 @@ import Cardano.Ledger.BaseTypes (
  )
 import Cardano.Ledger.Binary (
   DecCBOR (..),
-  DecCBORGroup (..),
   EncCBOR (..),
-  EncCBORGroup (..),
   FromCBOR (..),
   ToCBOR (..),
   decodeMapContents,
@@ -195,7 +193,7 @@ instance EraPParams ShelleyEra where
 instance Era era => EncCBOR (ShelleyPParams Identity era) where
   encCBOR
     ShelleyPParams {..} =
-      encodeListLen 18
+      encodeListLen 17
         <> encCBOR sppMinFeeA
         <> encCBOR sppMinFeeB
         <> encCBOR sppMaxBBSize
@@ -210,13 +208,13 @@ instance Era era => EncCBOR (ShelleyPParams Identity era) where
         <> encCBOR sppTau
         <> encCBOR sppD
         <> encCBOR sppExtraEntropy
-        <> encCBORGroup sppProtocolVersion
+        <> encCBOR sppProtocolVersion
         <> encCBOR sppMinUTxOValue
         <> encCBOR sppMinPoolCost
 
 instance Era era => DecCBOR (ShelleyPParams Identity era) where
   decCBOR = do
-    decodeRecordNamed "ShelleyPParams" (const 18) $
+    decodeRecordNamed "ShelleyPParams" (const 17) $
       ShelleyPParams @Identity
         <$> decCBOR -- sppMinFeeA         :: Integer
         <*> decCBOR -- sppMinFeeB         :: Natural
@@ -232,7 +230,7 @@ instance Era era => DecCBOR (ShelleyPParams Identity era) where
         <*> decCBOR -- sppTau             :: UnitInterval
         <*> decCBOR -- sppD               :: UnitInterval
         <*> decCBOR -- sppExtraEntropy    :: Nonce
-        <*> decCBORGroup -- sppProtocolVersion :: ProtVer
+        <*> decCBOR -- sppProtocolVersion :: ProtVer
         <*> decCBOR -- sppMinUTxOValue    :: Natural
         <*> decCBOR -- sppMinPoolCost     :: Natural
 

eras/shelley/test-suite/test/Test/Cardano/Ledger/Shelley/Serialisation/Golden/Encoding.hs

@@ -1104,9 +1104,9 @@ tests =
               , "03e8828284a0a0a0a08482a0a0a0a084a0a0000086a15822ee155ace9c40292074cb6aff"
               , "8c9ccdd273c81648ff1149ef36bcea6ebb8a3e250000583d003900cb9358529df4729c32"
               , "46a2a033cb9821abbfd16de4888005904abc410d6a577e9441ad8ed9663931906e4d43ec"
-              , "e8f82c712b1d0235affb06000a1903e80185a0a092000000190800000000001864d81e82"
-              , "0001d81e820001d81e820001d81e82000181000200010092000000190800000000001864"
-              , "d81e820001d81e820001d81e820001d81e820001810002000000810082a0a0008483a0a0"
+              , "e8f82c712b1d0235affb06000a1903e80185a0a091000000190800000000001864d81e82"
+              , "0001d81e820001d81e820001d81e8200018100820200010091000000190800000000001864"
+              , "d81e820001d81e820001d81e820001d81e82000181008202000000810082a0a0008483a0a0"
               , "a083a0a0a083a0a0a00082a000818300880082020082a000000000a0a0840185a0800082"
               , "0200a0a082a0a082a1581ce0a714319812c3f773ba04ec5d6b3ffcd5aad85006805b047b"
               , "08254183820101015820c5e21ab1c9f6022d81c3b25e3436cb7f1df77f9652ae3e1310c2"

eras/shelley/test-suite/test/Test/Cardano/Ledger/Shelley/Serialisation/Golden/Genesis.hs

@@ -94,7 +94,7 @@ golden_cbor_ShelleyGenesis =
         . TkInt 8000000 -- sgSlotLength
         . TkInt 16991 -- sgUpdateQuorum
         . TkInt 71 -- sgMaxLovelaceSupply
-        . TkListLen 18 -- sgProtocolParams
+        . TkListLen 17 -- sgProtocolParams
         . TkInt 0
         . TkInt 0
         . TkInt 239857
@@ -122,6 +122,7 @@ golden_cbor_ShelleyGenesis =
         . TkInt 1000
         . TkListLen 1
         . TkInt 0
+        . TkListLen 2
         . TkInt 2
         . TkInt 0
         . TkInt 0