evm: fix CALL(CODE) gas (#3195)

Author: jochem-brouwer

packages/evm/src/opcodes/functions.ts

@@ -1025,7 +1025,7 @@ export const handlers: Map<number, OpHandler> = new Map([
   // 0xf1: CALL
   [
     0xf1,
-    async function (runState: RunState) {
+    async function (runState: RunState, common: Common) {
       const [_currentGasLimit, toAddr, value, inOffset, inLength, outOffset, outLength] =
         runState.stack.popN(7)
       const toAddress = new Address(addresstoBytes(toAddr))
@@ -1035,7 +1035,13 @@ export const handlers: Map<number, OpHandler> = new Map([
         data = runState.memory.read(Number(inOffset), Number(inLength), true)
       }
 
-      const gasLimit = runState.messageGasLimit!
+      let gasLimit = runState.messageGasLimit!
+      if (value !== BIGINT_0) {
+        const callStipend = common.param('gasPrices', 'callStipend')
+        runState.interpreter.addStipend(callStipend)
+        gasLimit += callStipend
+      }
+
       runState.messageGasLimit = undefined
 
       const ret = await runState.interpreter.call(gasLimit, toAddress, value, data)
@@ -1047,12 +1053,18 @@ export const handlers: Map<number, OpHandler> = new Map([
   // 0xf2: CALLCODE
   [
     0xf2,
-    async function (runState: RunState) {
+    async function (runState: RunState, common: Common) {
       const [_currentGasLimit, toAddr, value, inOffset, inLength, outOffset, outLength] =
         runState.stack.popN(7)
       const toAddress = new Address(addresstoBytes(toAddr))
 
-      const gasLimit = runState.messageGasLimit!
+      let gasLimit = runState.messageGasLimit!
+      if (value !== BIGINT_0) {
+        const callStipend = common.param('gasPrices', 'callStipend')
+        runState.interpreter.addStipend(callStipend)
+        gasLimit += callStipend
+      }
+
       runState.messageGasLimit = undefined
 
       let data = new Uint8Array(0)

packages/evm/src/opcodes/gas.ts

@@ -372,7 +372,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           gas += common.param('gasPrices', 'callNewAccount')
         }
 
-        let gasLimit = maxCallGas(
+        const gasLimit = maxCallGas(
           currentGasLimit,
           runState.interpreter.getGasLeft() - gas,
           runState,
@@ -388,12 +388,6 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           trap(ERROR.OUT_OF_GAS)
         }
 
-        if (value !== BIGINT_0) {
-          const callStipend = common.param('gasPrices', 'callStipend')
-          runState.interpreter.addStipend(callStipend)
-          gasLimit += callStipend
-        }
-
         runState.messageGasLimit = gasLimit
         return gas
       },
@@ -415,7 +409,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
         if (value !== BIGINT_0) {
           gas += common.param('gasPrices', 'callValueTransfer')
         }
-        let gasLimit = maxCallGas(
+        const gasLimit = maxCallGas(
           currentGasLimit,
           runState.interpreter.getGasLeft() - gas,
           runState,
@@ -426,11 +420,6 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
         if (gasLimit > runState.interpreter.getGasLeft() - gas) {
           trap(ERROR.OUT_OF_GAS)
         }
-        if (value !== BIGINT_0) {
-          const callStipend = common.param('gasPrices', 'callStipend')
-          runState.interpreter.addStipend(callStipend)
-          gasLimit += callStipend
-        }
 
         runState.messageGasLimit = gasLimit
         return gas

packages/evm/test/runCall.spec.ts

@@ -2,6 +2,7 @@ import { Chain, Common, Hardfork } from '@ethereumjs/common'
 import {
   Account,
   Address,
+  BIGINT_100,
   MAX_UINT64,
   bytesToBigInt,
   bytesToHex,
@@ -716,4 +717,45 @@ describe('RunCall tests', () => {
     const res2 = await evm.runCall(runCallArgs2)
     assert.ok(res2.execResult.exceptionError?.error === ERROR.OUT_OF_GAS)
   })
+
+  it('ensure call and callcode handle gas stipend correctly', async () => {
+    // See: https://github.com/ethereumjs/ethereumjs-monorepo/issues/3194
+    const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Shanghai })
+    const evm = new EVM({
+      common,
+    })
+    for (const opcode of ['f1', 'f2']) {
+      // Code to either CALL or CALLCODE into the own address, with value 1
+      // JUMPDEST added at the start to track how much CALL(CODE)s are made
+      const contractCode = hexToBytes(`0x5B6000808080600130611a90${opcode}`)
+      const contractAddress = Address.fromString('0x000000000000000000000000636F6E7472616374')
+      await evm.stateManager.putContractCode(contractAddress, contractCode)
+
+      const account = await evm.stateManager.getAccount(contractAddress)
+      account!.balance = BIGINT_100
+
+      await evm.stateManager.putAccount(contractAddress, account)
+
+      const runCallArgs = {
+        gasLimit: BigInt(50000 - 21000),
+        to: contractAddress,
+      }
+
+      let jumpdestCalls = 0
+
+      evm.events.on('step', (e) => {
+        if (e.opcode.name === 'JUMPDEST') {
+          jumpdestCalls++
+        }
+      })
+
+      await evm.runCall(runCallArgs)
+      // JUMPDEST should be called twice:
+      // 1: call into the contract (externally, via tx)
+      // 2: call(code) into the contract (internally)
+      // If jumpdest would run >=3 times, it means the (2) has enough gas to pay for CALL(CODE)
+      // This is not correct
+      assert.ok(jumpdestCalls === 2, 'called JUMPDEST twice')
+    }
+  })
 })