[ETCM-911] Replace LegacyTX with trait Transaction in SignedTransaction

src/main/scala/io/iohk/ethereum/domain/SignedTransaction.scala

@@ -165,7 +165,7 @@ object SignedTransaction {
   }
 }
 
-case class SignedTransaction(tx: LegacyTransaction, signature: ECDSASignature) {
+case class SignedTransaction(tx: Transaction, signature: ECDSASignature) {
 
   def safeSenderIsEqualTo(address: Address): Boolean =
     SignedTransaction.getSender(this).contains(address)

src/main/scala/io/iohk/ethereum/domain/Transaction.scala

@@ -4,7 +4,7 @@ import akka.util.ByteString
 
 import org.bouncycastle.util.encoders.Hex
 
-sealed trait Transaction {
+sealed trait Transaction extends Product with Serializable {
   def nonce: BigInt
   def gasPrice: BigInt
   def gasLimit: BigInt
@@ -25,6 +25,32 @@ object Transaction {
   val Type01: Int = 1
   val LegacyThresholdLowerBound: Int = 0xc0
   val LegacyThresholdUpperBound: Int = 0xfe
+
+  def typed(
+      nonce: BigInt,
+      gasPrice: BigInt,
+      gasLimit: BigInt,
+      receivingAddress: Address,
+      value: BigInt,
+      payload: ByteString,
+      accessList: Option[List[AccessListItem]]
+  ): Transaction =
+    TransactionWithAccessList(nonce, gasPrice, gasLimit, Some(receivingAddress), value, payload, accessList)
+
+  def legacy(
+      nonce: BigInt,
+      gasPrice: BigInt,
+      gasLimit: BigInt,
+      receivingAddress: Address,
+      value: BigInt,
+      payload: ByteString
+  ): Transaction =
+    LegacyTransaction(nonce, gasPrice, gasLimit, Some(receivingAddress), value, payload)
+
+  def withGasLimit(gl: BigInt): Transaction => Transaction = {
+    case tx: LegacyTransaction         => tx.copy(gasLimit = gl)
+    case tx: TransactionWithAccessList => tx.copy(gasLimit = gl)
+  }
 }
 
 sealed trait TypedTransaction extends Transaction
@@ -73,7 +99,7 @@ case class TransactionWithAccessList(
     receivingAddress: Option[Address],
     value: BigInt,
     payload: ByteString,
-    accessList: List[AccessListItem]
+    accessList: Option[List[AccessListItem]]
 ) extends TypedTransaction {
   override def toString: String =
     s"TransactionWithAccessList {" +

src/main/scala/io/iohk/ethereum/ledger/BlockPreparator.scala

@@ -98,14 +98,14 @@ class BlockPreparator(
     * @param tx Target transaction
     * @return Upfront cost
     */
-  private[ledger] def calculateUpfrontGas(tx: LegacyTransaction): UInt256 = UInt256(tx.gasLimit * tx.gasPrice)
+  private[ledger] def calculateUpfrontGas(tx: Transaction): UInt256 = UInt256(tx.gasLimit * tx.gasPrice)
 
   /** v0 ≡ Tg (Tx gas limit) * Tp (Tx gas price) + Tv (Tx value). See YP equation number (65)
     *
     * @param tx Target transaction
     * @return Upfront cost
     */
-  private[ledger] def calculateUpfrontCost(tx: LegacyTransaction): UInt256 =
+  private[ledger] def calculateUpfrontCost(tx: Transaction): UInt256 =
     UInt256(calculateUpfrontGas(tx) + tx.value)
 
   /** Increments account nonce by 1 stated in YP equation (69) and

src/main/scala/io/iohk/ethereum/ledger/StxLedger.scala

@@ -1,13 +1,15 @@
 package io.iohk.ethereum.ledger
 
 import scala.annotation.tailrec
-
 import io.iohk.ethereum.db.storage.EvmCodeStorage
-import io.iohk.ethereum.domain.Account
-import io.iohk.ethereum.domain.BlockHeader
-import io.iohk.ethereum.domain.BlockchainImpl
-import io.iohk.ethereum.domain.BlockchainReader
-import io.iohk.ethereum.domain.SignedTransactionWithSender
+import io.iohk.ethereum.domain.{
+  Account,
+  BlockHeader,
+  BlockchainImpl,
+  BlockchainReader,
+  SignedTransactionWithSender,
+  Transaction
+}
 import io.iohk.ethereum.ledger.TxResult
 import io.iohk.ethereum.nodebuilder.BlockchainConfigBuilder
 import io.iohk.ethereum.vm.EvmConfig
@@ -68,7 +70,11 @@ class StxLedger(
       highLimit
     } else {
       StxLedger.binaryChop(lowLimit, highLimit) { gasLimit =>
-        simulateTransaction(stx.copy(tx = tx.copy(tx = tx.tx.copy(gasLimit = gasLimit))), blockHeader, world).vmError
+        simulateTransaction(
+          stx.copy(tx = tx.copy(tx = Transaction.withGasLimit(gasLimit)(tx.tx))),
+          blockHeader,
+          world
+        ).vmError
       }
     }
   }

src/main/scala/io/iohk/ethereum/utils/Picklers.scala

@@ -1,19 +1,22 @@
 package io.iohk.ethereum.utils
 
 import akka.util.ByteString
-
 import boopickle.DefaultBasic._
 import boopickle.Pickler
-
 import io.iohk.ethereum.crypto.ECDSASignature
-import io.iohk.ethereum.domain.Address
-import io.iohk.ethereum.domain.BlockBody
-import io.iohk.ethereum.domain.BlockHeader
+import io.iohk.ethereum.domain.{
+  AccessListItem,
+  Address,
+  BlockBody,
+  BlockHeader,
+  Checkpoint,
+  LegacyTransaction,
+  SignedTransaction,
+  Transaction,
+  TransactionWithAccessList
+}
 import io.iohk.ethereum.domain.BlockHeader.HeaderExtraFields
 import io.iohk.ethereum.domain.BlockHeader.HeaderExtraFields._
-import io.iohk.ethereum.domain.Checkpoint
-import io.iohk.ethereum.domain.LegacyTransaction
-import io.iohk.ethereum.domain.SignedTransaction
 
 object Picklers {
   implicit val byteStringPickler: Pickler[ByteString] =
@@ -30,9 +33,18 @@ object Picklers {
 
   implicit val addressPickler: Pickler[Address] =
     transformPickler[Address, ByteString](bytes => Address(bytes))(address => address.bytes)
-  implicit val transactionPickler: Pickler[LegacyTransaction] = generatePickler[LegacyTransaction]
+  implicit val accessListItemPickler: Pickler[AccessListItem] = generatePickler[AccessListItem]
+
+  implicit val legacyTransactionPickler: Pickler[LegacyTransaction] = generatePickler[LegacyTransaction]
+  implicit val transactionWithAccessListPickler: Pickler[TransactionWithAccessList] =
+    generatePickler[TransactionWithAccessList]
+
+  implicit val transactionPickler: Pickler[Transaction] = compositePickler[Transaction]
+    .addConcreteType[LegacyTransaction]
+    .addConcreteType[TransactionWithAccessList]
+
   implicit val signedTransactionPickler: Pickler[SignedTransaction] =
-    transformPickler[SignedTransaction, (LegacyTransaction, ECDSASignature)] { case (tx, signature) =>
+    transformPickler[SignedTransaction, (Transaction, ECDSASignature)] { case (tx, signature) =>
       new SignedTransaction(tx, signature)
     }(stx => (stx.tx, stx.signature))
 

src/test/scala/io/iohk/ethereum/ledger/BlockExecutionSpec.scala

@@ -242,7 +242,7 @@ class BlockExecutionSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         txsExecResult.isRight shouldBe true
         val BlockResult(resultingWorldState, resultingGasUsed, resultingReceipts) = txsExecResult.toOption.get
 
-        val transaction: LegacyTransaction = validStxSignedByOrigin.tx
+        val transaction: Transaction = validStxSignedByOrigin.tx
         // Check valid world
         val minerPaymentForTxs = UInt256(transaction.gasLimit * transaction.gasPrice)
         val changes = Seq(

src/test/scala/io/iohk/ethereum/ledger/StxLedgerSpec.scala

@@ -47,7 +47,7 @@ class StxLedgerSpec extends AnyFlatSpec with Matchers with Logger {
 
     // Execute transaction with gasLimit lesser by one that estimated minimum
     val errorExecResult: TxResult = mining.blockPreparator.executeTransaction(
-      stx.copy(tx = stx.tx.copy(gasLimit = estimationResult - 1)),
+      stx.copy(tx = Transaction.withGasLimit(estimationResult - 1)(stx.tx)),
       fromAddress,
       genesisHeader,
       worldWithAccount