Merge pull request #5038 from IntersectMBO/jj/remove-shelley-tx-memo

Remove `MemoBytes` from `ShelleyTx`

Author: lehins

eras/allegra/impl/src/Cardano/Ledger/Allegra/Tx.hs

@@ -31,7 +31,6 @@ import Cardano.Ledger.Shelley.Tx (
   mkBasicShelleyTx,
   shelleyMinFeeTx,
   sizeShelleyTxF,
-  wireSizeShelleyTxF,
   witsShelleyTxL,
  )
 import qualified Data.Set as Set (map)
@@ -56,9 +55,6 @@ instance EraTx AllegraEra where
   sizeTxF = sizeShelleyTxF
   {-# INLINE sizeTxF #-}
 
-  wireSizeTxF = wireSizeShelleyTxF
-  {-# INLINE wireSizeTxF #-}
-
   validateNativeScript = validateTimelock
   {-# INLINE validateNativeScript #-}
 

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

@@ -48,7 +48,6 @@ module Cardano.Ledger.Alonzo.Tx (
   witsAlonzoTxL,
   auxDataAlonzoTxL,
   sizeAlonzoTxF,
-  wireSizeAlonzoTxF,
   isValidAlonzoTxL,
   txdats',
   txscripts',
@@ -127,7 +126,6 @@ import Data.Maybe.Strict (
  )
 import Data.Set (Set)
 import Data.Typeable (Typeable)
-import Data.Word (Word32)
 import GHC.Generics (Generic)
 import Lens.Micro hiding (set)
 import NoThunks.Class (NoThunks)
@@ -169,9 +167,6 @@ instance EraTx AlonzoEra where
   sizeTxF = sizeAlonzoTxF
   {-# INLINE sizeTxF #-}
 
-  wireSizeTxF = wireSizeAlonzoTxF
-  {-# INLINE wireSizeTxF #-}
-
   validateNativeScript = validateTimelock
   {-# INLINE validateNativeScript #-}
 
@@ -226,21 +221,6 @@ sizeAlonzoTxF =
       . toCBORForSizeComputation
 {-# INLINEABLE sizeAlonzoTxF #-}
 
--- | txsize computes the length of the serialised bytes (actual size)
-wireSizeAlonzoTxF :: forall era. EraTx era => SimpleGetter (AlonzoTx era) Word32
-wireSizeAlonzoTxF =
-  to $
-    checkedFromIntegral
-      . LBS.length
-      . serialize (eraProtVerLow @era)
-      . encCBOR
-  where
-    checkedFromIntegral n =
-      if n <= fromIntegral (maxBound :: Word32)
-        then fromIntegral n
-        else error $ "Impossible: Size of the transaction is too big: " ++ show n
-{-# INLINEABLE wireSizeAlonzoTxF #-}
-
 isValidAlonzoTxL :: Lens' (AlonzoTx era) IsValid
 isValidAlonzoTxL = lens isValid (\tx valid -> tx {isValid = valid})
 {-# INLINEABLE isValidAlonzoTxL #-}

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

@@ -46,9 +46,6 @@ instance EraTx BabbageEra where
   sizeTxF = sizeAlonzoTxF
   {-# INLINE sizeTxF #-}
 
-  wireSizeTxF = wireSizeAlonzoTxF
-  {-# INLINE wireSizeTxF #-}
-
   validateNativeScript = validateTimelock
   {-# INLINE validateNativeScript #-}
 

eras/conway/impl/src/Cardano/Ledger/Conway/Tx.hs

@@ -21,7 +21,6 @@ import Cardano.Ledger.Alonzo.Tx (
   isValidAlonzoTxL,
   mkBasicAlonzoTx,
   sizeAlonzoTxF,
-  wireSizeAlonzoTxF,
   witsAlonzoTxL,
  )
 import Cardano.Ledger.Alonzo.TxSeq (
@@ -62,9 +61,6 @@ instance EraTx ConwayEra where
   sizeTxF = sizeAlonzoTxF
   {-# INLINE sizeTxF #-}
 
-  wireSizeTxF = wireSizeAlonzoTxF
-  {-# INLINE wireSizeTxF #-}
-
   validateNativeScript = validateTimelock
   {-# INLINE validateNativeScript #-}
 

eras/mary/impl/src/Cardano/Ledger/Mary/Tx.hs

@@ -21,7 +21,6 @@ import Cardano.Ledger.Shelley.Tx (
   mkBasicShelleyTx,
   shelleyMinFeeTx,
   sizeShelleyTxF,
-  wireSizeShelleyTxF,
   witsShelleyTxL,
  )
 
@@ -44,9 +43,6 @@ instance EraTx MaryEra where
   sizeTxF = sizeShelleyTxF
   {-# INLINE sizeTxF #-}
 
-  wireSizeTxF = wireSizeShelleyTxF
-  {-# INLINE wireSizeTxF #-}
-
   validateNativeScript = validateTimelock
   {-# INLINE validateNativeScript #-}
 

eras/shelley/impl/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.17.0.0
 
+* Remove `ShelleyTxRaw`, `MkShelleyTx`, `segWitTx`, `unsafeConstructTxWithBytes`
 * Added `Generic` instances for:
   * `ShelleyBbodyState`
   * `ShelleyScriptsNeeded`

eras/shelley/impl/cardano-ledger-shelley.cabal

@@ -53,7 +53,6 @@ library
     Cardano.Ledger.Shelley.Transition
     Cardano.Ledger.Shelley.Translation
     Cardano.Ledger.Shelley.Tx
-    Cardano.Ledger.Shelley.Tx.Internal
     Cardano.Ledger.Shelley.TxAuxData
     Cardano.Ledger.Shelley.TxBody
     Cardano.Ledger.Shelley.TxCert

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

@@ -33,11 +33,12 @@ import Cardano.Ledger.BaseTypes (
   BlocksMade (..),
   Nonce (..),
   StrictMaybe (..),
+  maybeToStrictMaybe,
   mkNonceFromNumber,
   strictMaybeToMaybe,
  )
 import Cardano.Ledger.Binary (
-  Annotator,
+  Annotator (..),
   DecCBOR (decCBOR),
   Decoder,
   EncCBOR (..),
@@ -50,7 +51,7 @@ import Cardano.Ledger.Binary (
  )
 import Cardano.Ledger.Core
 import Cardano.Ledger.Shelley.Era (ShelleyEra)
-import Cardano.Ledger.Shelley.Tx (ShelleyTx, segWitAnnTx)
+import Cardano.Ledger.Shelley.Tx (ShelleyTx (..))
 import Cardano.Ledger.Slot (SlotNo (..))
 import Control.Monad (unless)
 import Data.ByteString (ByteString)
@@ -232,10 +233,19 @@ instance
             <> ")"
       )
 
-    let txns =
-          sequenceA $
-            StrictSeq.forceToStrict $
-              Seq.zipWith3 segWitAnnTx bodies wits metadata
+    let
+      segWitAnnTx bodyAnn witsAnn' metaAnn = Annotator $ \bytes ->
+        let body' = runAnnotator bodyAnn bytes
+            witnessSet = runAnnotator witsAnn' bytes
+            metadata' = flip runAnnotator bytes <$> metaAnn
+         in ShelleyTx
+              body'
+              witnessSet
+              (maybeToStrictMaybe metadata')
+      txns =
+        sequenceA $
+          StrictSeq.forceToStrict $
+            Seq.zipWith3 segWitAnnTx bodies wits metadata
     pure $ TxSeq' <$> txns <*> bodiesAnn <*> witsAnn <*> metadataAnn
 
 slotToNonce :: SlotNo -> Nonce