[ETCM-1165] use tx1 accesslist in evm

src/main/scala/io/iohk/ethereum/consensus/validators/std/StdSignedTransactionValidator.scala

@@ -117,7 +117,8 @@ object StdSignedTransactionValidator extends SignedTransactionValidator {
   )(implicit blockchainConfig: BlockchainConfig): Either[SignedTransactionError, SignedTransactionValid] = {
     import stx.tx
     val config = EvmConfig.forBlock(blockHeaderNumber, blockchainConfig)
-    val txIntrinsicGas = config.calcTransactionIntrinsicGas(tx.payload, tx.isContractInit)
+    val txIntrinsicGas =
+      config.calcTransactionIntrinsicGas(tx.payload, tx.isContractInit, Transaction.accessList(tx))
     if (stx.tx.gasLimit >= txIntrinsicGas) Right(SignedTransactionValid)
     else Left(TransactionNotEnoughGasForIntrinsicError(stx.tx.gasLimit, txIntrinsicGas))
   }

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

@@ -35,6 +35,12 @@ object Transaction {
     case tx: TransactionWithAccessList => tx.copy(gasLimit = gl)
   }
 
+  def accessList(tx: Transaction): List[AccessListItem] =
+    tx match {
+      case transaction: TransactionWithAccessList                                         => transaction.accessList
+      case LegacyTransaction(nonce, gasPrice, gasLimit, receivingAddress, value, payload) => Nil
+    }
+
   implicit class TransactionTypeValidator(val transactionType: Byte) extends AnyVal {
     def isValidTransactionType: Boolean = transactionType >= MinAllowedType && transactionType <= MaxAllowedType
   }
@@ -70,6 +76,7 @@ case class LegacyTransaction(
     value: BigInt,
     payload: ByteString
 ) extends Transaction {
+
   override def toString: String =
     s"LegacyTransaction {" +
       s"nonce: $nonce " +

src/main/scala/io/iohk/ethereum/extvm/ExtVMInterface.scala

@@ -16,6 +16,7 @@ import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
 
+import io.iohk.ethereum.domain.AccessListItem
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxyStorage
 import io.iohk.ethereum.utils.BlockchainConfig

src/main/scala/io/iohk/ethereum/extvm/VMServer.scala

@@ -151,7 +151,10 @@ class VMServer(messageHandler: MessageHandler) extends Logger {
       world = world,
       initialAddressesToDelete = Set(),
       evmConfig = vmConfig,
-      originalWorld = world
+      originalWorld = world,
+      // TODO ETCM-1202 use access list from CallContext
+      warmAddresses = Set.empty,
+      warmStorage = Set.empty
     )
   }
 

src/main/scala/io/iohk/ethereum/vm/EvmConfig.scala

@@ -4,6 +4,8 @@ import akka.util.ByteString
 
 import io.iohk.ethereum
 
+import io.iohk.ethereum.domain.AccessListItem
+import io.iohk.ethereum.domain.TransactionWithAccessList
 import io.iohk.ethereum.domain.UInt256
 import io.iohk.ethereum.utils.BlockchainConfig
 import io.iohk.ethereum.vm
@@ -196,12 +198,20 @@ case class EvmConfig(
 
   /** Calculates transaction intrinsic gas. See YP section 6.2
     */
-  def calcTransactionIntrinsicGas(txData: ByteString, isContractCreation: Boolean): BigInt = {
+  def calcTransactionIntrinsicGas(
+      txData: ByteString,
+      isContractCreation: Boolean,
+      accessList: Seq[AccessListItem]
+  ): BigInt = {
     val txDataZero = txData.count(_ == 0)
     val txDataNonZero = txData.length - txDataZero
 
+    val accessListPrice =
+      accessList.size * G_access_list_address +
+        accessList.map(_.storageKeys.size).sum * G_access_list_storage
+
     txDataZero * G_txdatazero +
-      txDataNonZero * G_txdatanonzero +
+      txDataNonZero * G_txdatanonzero + accessListPrice +
       (if (isContractCreation) G_txcreate else 0) +
       G_transaction
   }
@@ -262,9 +272,13 @@ object FeeSchedule {
     override val G_copy = 3
     override val G_blockhash = 20
     override val G_extcode = 20
+
+    // note: the access list and cold/warm access do not exist until magneto hard fork
     override val G_cold_sload = 2100
     override val G_cold_account_access = 2600
     override val G_warm_storage_read = 100
+    override val G_access_list_address = 2400
+    override val G_access_list_storage = 1900
   }
 
   class HomesteadFeeSchedule extends FrontierFeeSchedule {
@@ -300,6 +314,8 @@ object FeeSchedule {
   class MagnetoFeeSchedule extends PhoenixFeeSchedule {
     override val G_sload: BigInt = G_warm_storage_read
     override val G_sreset: BigInt = 5000 - G_cold_sload
+    override val G_access_list_address: BigInt = 2400
+    override val G_access_list_storage: BigInt = 1900
   }
 }
 
@@ -342,4 +358,6 @@ trait FeeSchedule {
   val G_cold_sload: BigInt
   val G_cold_account_access: BigInt
   val G_warm_storage_read: BigInt
+  val G_access_list_address: BigInt
+  val G_access_list_storage: BigInt
 }

src/main/scala/io/iohk/ethereum/vm/OpCode.scala

@@ -973,7 +973,9 @@ abstract class CreateOp(code: Int, delta: Int) extends OpCode(code, delta, 1, _.
       world = world1,
       initialAddressesToDelete = state.addressesToDelete,
       evmConfig = state.config,
-      originalWorld = state.originalWorld
+      originalWorld = state.originalWorld,
+      warmAddresses = state.accessedAddresses,
+      warmStorage = state.accessedStorageKeys
     )
 
     val ((result, newAddress), stack2) = this match {
@@ -1079,7 +1081,9 @@ abstract class CallOp(code: Int, delta: Int, alpha: Int) extends OpCode(code, de
       initialAddressesToDelete = state.addressesToDelete,
       evmConfig = state.config,
       staticCtx = static,
-      originalWorld = state.originalWorld
+      originalWorld = state.originalWorld,
+      warmAddresses = state.accessedAddresses,
+      warmStorage = state.accessedStorageKeys
     )
 
     val result = state.vm.call(context, owner)

src/main/scala/io/iohk/ethereum/vm/ProgramContext.scala

@@ -12,9 +12,10 @@ object ProgramContext {
       world: W,
       evmConfig: EvmConfig
   ): ProgramContext[W, S] = {
-
     import stx.tx
-    val gasLimit = tx.gasLimit - evmConfig.calcTransactionIntrinsicGas(tx.payload, tx.isContractInit)
+    val accessList = Transaction.accessList(tx)
+    val gasLimit =
+      tx.gasLimit - evmConfig.calcTransactionIntrinsicGas(tx.payload, tx.isContractInit, accessList)
 
     ProgramContext(
       callerAddr = senderAddress,
@@ -31,7 +32,9 @@ object ProgramContext {
       world = world,
       initialAddressesToDelete = Set(),
       evmConfig = evmConfig,
-      originalWorld = world
+      originalWorld = world,
+      warmAddresses = accessList.map(_.address).toSet,
+      warmStorage = accessList.flatMap(i => i.storageKeys.map((i.address, _))).toSet
     )
   }
 }
@@ -81,5 +84,7 @@ case class ProgramContext[W <: WorldStateProxy[W, S], S <: Storage[S]](
     initialAddressesToDelete: Set[Address],
     evmConfig: EvmConfig,
     staticCtx: Boolean = false,
-    originalWorld: W
+    originalWorld: W,
+    warmAddresses: Set[Address],
+    warmStorage: Set[(Address, BigInt)]
 )

src/main/scala/io/iohk/ethereum/vm/ProgramState.scala

@@ -2,6 +2,7 @@ package io.iohk.ethereum.vm
 
 import akka.util.ByteString
 
+import io.iohk.ethereum.domain.AccessListItem
 import io.iohk.ethereum.domain.Address
 import io.iohk.ethereum.domain.TxLogEntry
 import io.iohk.ethereum.domain.UInt256
@@ -23,8 +24,8 @@ object ProgramState {
       accessedAddresses = PrecompiledContracts.getContracts(context).keySet ++ Set(
         context.originAddr,
         context.recipientAddr.getOrElse(context.callerAddr)
-      ),
-      accessedStorageKeys = Set.empty
+      ) ++ context.warmAddresses,
+      accessedStorageKeys = context.warmStorage
     )
 }
 

src/main/scala/io/iohk/ethereum/vm/VM.scala

@@ -4,6 +4,7 @@ import akka.util.ByteString
 
 import scala.annotation.tailrec
 
+import io.iohk.ethereum.domain.AccessListItem
 import io.iohk.ethereum.domain.Address
 import io.iohk.ethereum.domain.UInt256
 import io.iohk.ethereum.utils.Logger
@@ -63,7 +64,10 @@ class VM[W <: WorldStateProxy[W, S], S <: Storage[S]] extends Logger {
   /** Contract creation - Λ function in YP
     * salt is used to create contract by CREATE2 opcode. See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1014.md
     */
-  private[vm] def create(context: PC, salt: Option[UInt256] = None): (PR, Address) =
+  private[vm] def create(
+      context: PC,
+      salt: Option[UInt256] = None
+  ): (PR, Address) =
     if (!isValidCall(context))
       (invalidCallResult(context), Address(0))
     else {

src/test/scala/io/iohk/ethereum/consensus/validators/std/StdSignedLegacyTransactionValidatorSpec.scala

@@ -200,7 +200,7 @@ class StdSignedLegacyTransactionValidatorSpec extends AnyFlatSpec with Matchers
   it should "report as invalid a tx with too low gas limit for intrinsic gas" in {
     val txIntrinsicGas = EvmConfig
       .forBlock(blockHeaderAfterHomestead.number, blockchainConfig)
-      .calcTransactionIntrinsicGas(txAfterHomestead.payload, txAfterHomestead.isContractInit)
+      .calcTransactionIntrinsicGas(txAfterHomestead.payload, txAfterHomestead.isContractInit, Nil)
     val txWithInvalidGasLimit = txAfterHomestead.copy(gasLimit = txIntrinsicGas / 2)
     val signedTxWithInvalidGasLimit = signedTxAfterHomestead.copy(tx = txWithInvalidGasLimit)
     validateStx(signedTxWithInvalidGasLimit, fromBeforeHomestead = false) match {

src/test/scala/io/iohk/ethereum/vm/CallOpFixture.scala

@@ -178,7 +178,9 @@ class CallOpFixture(val config: EvmConfig, val startState: MockWorldState) {
     world = worldWithExtAccount,
     initialAddressesToDelete = Set(),
     evmConfig = config,
-    originalWorld = worldWithExtAccount
+    originalWorld = worldWithExtAccount,
+    warmAddresses = Set.empty,
+    warmStorage = Set.empty
   )
 
   case class ExecuteCall(

src/test/scala/io/iohk/ethereum/vm/CreateOpcodeSpec.scala

@@ -176,7 +176,9 @@ class CreateOpcodeSpec extends AnyWordSpec with Matchers with ScalaCheckProperty
       world = initWorld,
       initialAddressesToDelete = Set(),
       evmConfig = config,
-      originalWorld = initWorld
+      originalWorld = initWorld,
+      warmAddresses = Set.empty,
+      warmStorage = Set.empty
     )
   }
 

src/test/scala/io/iohk/ethereum/vm/Generators.scala

@@ -120,7 +120,9 @@ object Generators extends ObjectGenerators {
         world = world,
         initialAddressesToDelete = Set(),
         evmConfig = evmConfig,
-        originalWorld = world
+        originalWorld = world,
+        warmAddresses = Set.empty,
+        warmStorage = Set.empty
       )
 
       env = ExecEnv(context, code, ownerAddr)

src/test/scala/io/iohk/ethereum/vm/OpCodeGasSpecPostEip2929.scala

@@ -298,7 +298,9 @@ trait OpCodeGasSpecPostEip2929 extends AnyFunSuite with OpCodeTesting with Match
         world = defaultWorld,
         initialAddressesToDelete = Set(),
         evmConfig = config,
-        originalWorld = defaultWorld
+        originalWorld = defaultWorld,
+        warmAddresses = Set.empty,
+        warmStorage = Set.empty
       )
 
       val env = ExecEnv(context, ByteString(Hex.decode(code)), context.originAddr)

src/test/scala/io/iohk/ethereum/vm/PrecompiledContractsSpec.scala

@@ -57,7 +57,9 @@ class PrecompiledContractsSpec
       world = world,
       initialAddressesToDelete = Set(),
       evmConfig = EvmConfig.PostEIP161ConfigBuilder(blockchainConfig),
-      originalWorld = world
+      originalWorld = world,
+      warmAddresses = Set.empty,
+      warmStorage = Set.empty
     )
   }
 

src/test/scala/io/iohk/ethereum/vm/SSTOREOpCodeGasPostConstantinopleSpec.scala

@@ -131,7 +131,9 @@ trait TestSetup {
       world = world,
       initialAddressesToDelete = Set(),
       evmConfig = eipToCheck.config,
-      originalWorld = world
+      originalWorld = world,
+      warmAddresses = Set.empty,
+      warmStorage = Set.empty
     )
 
   def prepareProgramState(

src/test/scala/io/iohk/ethereum/vm/ShiftingOpCodeSpec.scala

@@ -188,7 +188,9 @@ class ShiftingOpCodeSpec extends AnyWordSpec with Matchers with ScalaCheckProper
         world = world,
         initialAddressesToDelete = Set(),
         evmConfig = config,
-        originalWorld = world
+        originalWorld = world,
+        warmAddresses = Set.empty,
+        warmStorage = Set.empty
       )
 
     def prepareProgramState(

src/test/scala/io/iohk/ethereum/vm/VMSpec.scala

@@ -195,7 +195,9 @@ class VMSpec extends AnyWordSpec with ScalaCheckPropertyChecks with Matchers {
         world = world,
         initialAddressesToDelete = Set(),
         evmConfig = evmConfig,
-        originalWorld = world
+        originalWorld = world,
+        warmAddresses = Set.empty,
+        warmStorage = Set.empty
       )
 
     def recipientAddr: Option[Address]