Merge pull request #4831 from IntersectMBO/lehins/cleanup-pointer-serialization

Cleanup pointer serialization

Author: lehins

eras/allegra/impl/cddl-files/allegra.cddl

@@ -237,7 +237,7 @@ transaction_body = {0 : set<transaction_input>
 
 transaction_index = uint .size 2
 
-transaction_input = [transaction_id : $hash32, index : uint]
+transaction_input = [transaction_id : $hash32, index : uint .size 2]
 
 transaction_metadatum = {* transaction_metadatum => transaction_metadatum}
                          / [* transaction_metadatum]

eras/alonzo/impl/cddl-files/alonzo.cddl

@@ -426,7 +426,7 @@ transaction_body = {0 : set<transaction_input>
 
 transaction_index = uint .size 2
 
-transaction_input = [transaction_id : $hash32, index : uint]
+transaction_input = [transaction_id : $hash32, index : uint .size 2]
 
 transaction_metadatum = {* transaction_metadatum => transaction_metadatum}
                          / [* transaction_metadatum]

eras/alonzo/impl/golden/translations.cbor

@@ -443,7 +443,7 @@ transaction_body = {0 : set<transaction_input>
 
 transaction_index = uint .size 2
 
-transaction_input = [transaction_id : $hash32, index : uint]
+transaction_input = [transaction_id : $hash32, index : uint .size 2]
 
 transaction_metadatum = {* transaction_metadatum => transaction_metadatum}
                          / [* transaction_metadatum]

eras/babbage/impl/cddl-files/babbage.cddl

@@ -22,7 +22,7 @@ import Cardano.Ledger.UTxO (UTxO (..), coinBalance)
 import Cardano.Ledger.Val ((<->))
 import qualified Data.Map.Strict as Map
 import Data.Maybe.Strict (StrictMaybe (..))
-import Data.Word (Word16, Word64)
+import Data.Word (Word16)
 import Lens.Micro
 
 -- ============================================================
@@ -54,4 +54,4 @@ collOuts txBody =
           -- In the impossible event that there are more transaction outputs
           -- in the transaction than will fit into a Word16 (which backs the TxIx),
           -- we give the collateral return output an index of maxBound.
-          Nothing -> TxIx ((fromIntegral :: Word16 -> Word64) (maxBound :: Word16))
+          Nothing -> TxIx (maxBound :: Word16)

eras/babbage/impl/golden/translations.cbor

@@ -46,8 +46,8 @@ import Cardano.Ledger.Address (
   CompactAddr,
   compactAddr,
   decompactAddr,
-  fromCborBackwardsBothAddr,
   fromCborBothAddr,
+  fromCborRigorousBothAddr,
  )
 import Cardano.Ledger.Alonzo.Core
 import Cardano.Ledger.Alonzo.TxBody (
@@ -463,10 +463,7 @@ instance (EraScript era, Val (Value era)) => DecCBOR (BabbageTxOut era) where
 instance (EraScript era, Val (Value era)) => DecShareCBOR (BabbageTxOut era) where
   type Share (BabbageTxOut era) = Interns (Credential 'Staking)
   decShareCBOR credsInterns =
-    -- Even in Babbage the ledger state still contains garbage pointers that we need to
-    -- deal with. This will be taken care of upon entry to Conway era. After which this
-    -- backwards compatibility shim can be removed.
-    internBabbageTxOut (interns credsInterns) <$!> decodeBabbageTxOut fromCborBackwardsBothAddr
+    internBabbageTxOut (interns credsInterns) <$!> decodeBabbageTxOut fromCborRigorousBothAddr
   {-# INLINEABLE decShareCBOR #-}
 
 internBabbageTxOut ::

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

@@ -8,4 +8,4 @@ import Test.Cardano.Ledger.Babbage.Translation.TranslatableGen ()
 
 -- | Generates golden translation file for Babbage era
 main :: IO ()
-main = generateGoldenFile @BabbageEra "eras/babbage/test-suite/golden/translations.cbor"
+main = generateGoldenFile @BabbageEra "eras/babbage/impl/golden/translations.cbor"

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

@@ -261,7 +261,6 @@ test-suite tests
     cardano-ledger-alonzo,
     cardano-ledger-alonzo:testlib,
     cardano-ledger-babbage,
-    cardano-ledger-binary,
     cardano-ledger-binary:testlib,
     cardano-ledger-conway,
     cardano-ledger-core,

eras/babbage/impl/test/GenerateGoldenFileMain.hs

@@ -11,7 +11,6 @@
 
 module Cardano.Ledger.Conway.TxOut () where
 
-import Cardano.Ledger.Address (addrPtrNormalize)
 import Cardano.Ledger.Babbage.Core
 import Cardano.Ledger.Babbage.TxOut (
   BabbageTxOut (..),
@@ -37,7 +36,7 @@ instance EraTxOut ConwayEra where
   mkBasicTxOut addr vl = BabbageTxOut addr vl NoDatum SNothing
 
   upgradeTxOut (BabbageTxOut addr value d s) =
-    BabbageTxOut (addrPtrNormalize addr) value (translateDatum d) (upgradeScript <$> s)
+    BabbageTxOut addr value (translateDatum d) (upgradeScript <$> s)
 
   addrEitherTxOutL = addrEitherBabbageTxOutL
   {-# INLINE addrEitherTxOutL #-}