[ETCM-921] Implement gas calculation changes in *CALL codes

Author: lukasz-golebiewski

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

@@ -164,6 +164,24 @@ object OpCode {
     val end = (offset + size).min(bytes.size).toInt
     bytes.slice(start, end).padToByteString(size.toInt, 0.toByte)
   }
+
+  def addressAccessCost[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S], address: Address)(
+      preGasFn: FeeSchedule => BigInt,
+      postColdGasFn: FeeSchedule => BigInt,
+      postWarmGasFn: FeeSchedule => BigInt
+  ): BigInt = {
+    val currentBlockNumber = state.env.blockHeader.number
+    val etcFork = state.config.blockchainConfig.etcForkForBlockNumber(currentBlockNumber)
+    val eip2929Enabled = isEip2929Enabled(etcFork)
+    if (eip2929Enabled) {
+      val addr = address
+      if (state.accessedAddresses.contains(addr))
+        postWarmGasFn(state.config.feeSchedule)
+      else
+        postColdGasFn(state.config.feeSchedule)
+    } else
+      preGasFn(state.config.feeSchedule)
+  }
 }
 
 /** Base class for all the opcodes of the EVM
@@ -213,22 +231,10 @@ trait AddrAccessGas { self: OpCode =>
   private def coldGasFn: FeeSchedule => BigInt = _.G_cold_account_access
   private def warmGasFn: FeeSchedule => BigInt = _.G_warm_storage_read
 
-  override protected def baseGas[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): BigInt = {
-    val currentBlockNumber = state.env.blockHeader.number
-    val etcFork = state.config.blockchainConfig.etcForkForBlockNumber(currentBlockNumber)
-    val eip2929Enabled = isEip2929Enabled(etcFork)
-    if (eip2929Enabled) {
-      val addr = address(state)
-      if (state.accessedAddresses.contains(addr))
-        warmGasFn(state.config.feeSchedule)
-      else
-        coldGasFn(state.config.feeSchedule)
-    } else
-      baseGasFn(state.config.feeSchedule)
-  }
+  override protected def baseGas[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): BigInt =
+    OpCode.addressAccessCost(state, address(state))(baseGasFn, coldGasFn, warmGasFn)
 
   protected def address[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): Address
-
 }
 
 sealed trait ConstGas { self: OpCode =>
@@ -1065,6 +1071,7 @@ abstract class CallOp(code: Int, delta: Int, alpha: Int) extends OpCode(code, de
           .withInternalTxs(internalTx +: result.internalTxs)
           .withLogs(result.logs)
           .withReturnData(result.returnData)
+          .addAccessedAddress(toAddr)
           .step()
     }
   }
@@ -1159,7 +1166,9 @@ abstract class CallOp(code: Int, delta: Int, alpha: Int) extends OpCode(code, de
       else 0
 
     val c_xfer: BigInt = if (endowment.isZero) 0 else state.config.feeSchedule.G_callvalue
-    state.config.feeSchedule.G_call + c_xfer + c_new
+
+    val callCost: BigInt = OpCode.addressAccessCost(state, to)(_.G_call, _.G_cold_account_access, _.G_warm_storage_read)
+    callCost + c_xfer + c_new
   }
 }
 

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

@@ -163,7 +163,7 @@ class CallOpFixture(val config: EvmConfig, val startState: MockWorldState) {
 
   val fakeHeader: BlockHeader = BlockFixtures.ValidBlock.header.copy(number = 0, unixTimestamp = 0)
 
-  val context: PC = ProgramContext(
+  lazy val context: PC = ProgramContext(
     callerAddr = callerAddr,
     originAddr = callerAddr,
     recipientAddr = Some(ownerAddr),
@@ -191,7 +191,8 @@ class CallOpFixture(val config: EvmConfig, val startState: MockWorldState) {
       inOffset: UInt256 = UInt256.Zero,
       inSize: UInt256 = inputData.size,
       outOffset: UInt256 = inputData.size,
-      outSize: UInt256 = inputData.size / 2
+      outSize: UInt256 = inputData.size / 2,
+      toAccessed: Boolean = false
   ) {
 
     val vm = new TestVM
@@ -205,7 +206,8 @@ class CallOpFixture(val config: EvmConfig, val startState: MockWorldState) {
     private val stack = Stack.empty().push(if (op == DELEGATECALL) paramsForDelegate else params)
     private val mem = Memory.empty.store(UInt256.Zero, inputData)
 
-    val stateIn: PS = ProgramState(vm, context, env).withStack(stack).withMemory(mem)
+    val baseStateIn: PS = ProgramState(vm, context, env).withStack(stack).withMemory(mem)
+    val stateIn: PS = if (toAccessed) baseStateIn.addAccessedAddress(to) else baseStateIn
     val stateOut: PS = op.execute(stateIn)
     val world: MockWorldState = stateOut.world