vm -> EIP2929: updated accessAddressEIP2929 to use Address type, test fixes

Author: holgerd77

packages/vm/lib/evm/interpreter.ts

@@ -243,11 +243,11 @@ export default class Interpreter {
   // all the precompiles. (EIP 2929)
   _initAccessedAddresses() {
     this._runState.accessedAddresses.clear()
-    this._runState.accessedAddresses.add(this._eei._env.origin.toString('hex'))
-    this._runState.accessedAddresses.add(this._eei.getAddress().toString('hex'))
+    this._runState.accessedAddresses.add(this._eei._env.origin.toString())
+    this._runState.accessedAddresses.add(this._eei.getAddress().toString())
 
     for (let address of Object.keys(precompiles)) {
-      this._runState.accessedAddresses.add(address)
+      this._runState.accessedAddresses.add(`0x${address}`)
     }
   }
 }

packages/vm/lib/evm/opcodes/EIP2929.ts

@@ -1,4 +1,5 @@
 import BN = require('bn.js')
+import { Address } from 'ethereumjs-util'
 import { RunState } from './../interpreter'
 import { addressToBuffer } from './util'
 
@@ -9,10 +10,10 @@ import { addressToBuffer } from './util'
  * @param {RunState} runState
  * @param {BN}       address
  */
-export function accessAddressEIP2929(runState: RunState, address: BN | Buffer, baseFee?: number) {
+export function accessAddressEIP2929(runState: RunState, address: Address, baseFee?: number) {
   if (!runState._common.eips().includes(2929)) return
 
-  const addressStr = addressToBuffer(address).toString('hex')
+  const addressStr = address.toString()
 
   // Cold
   if (!runState.accessedAddresses.has(addressStr)) {
@@ -43,7 +44,7 @@ export function accessStorageEIP2929(runState: RunState, key: Buffer, isSstore:
 
   const keyStr = key.toString('hex')
   const baseFee = !isSstore ? runState._common.param('gasPrices', 'sload') : 0
-  const address = runState.eei.getAddress().toString('hex')
+  const address = runState.eei.getAddress().toString()
   const keysAtAddress = runState.accessedStorage.get(address)
 
   // Cold (SLOAD and SSTORE)
@@ -79,7 +80,7 @@ export function adjustSstoreGasEIP2929(
   if (!runState._common.eips().includes(2929)) return defaultCost
 
   const keyStr = key.toString('hex')
-  const address = runState.eei.getAddress().toString('hex')
+  const address = runState.eei.getAddress().toString()
   const warmRead = runState._common.param('gasPrices', 'warmstorageread')
   const coldSload = runState._common.param('gasPrices', 'coldsload')
 

packages/vm/lib/evm/opcodes/functions.ts

@@ -410,7 +410,7 @@ export const handlers: Map<number, OpHandler> = new Map([
     async function (runState: RunState) {
       const addressBN = runState.stack.pop()
       const address = new Address(addressToBuffer(addressBN))
-      accessAddressEIP2929(runState, address.buf, runState._common.param('gasPrices', 'balance'))
+      accessAddressEIP2929(runState, address, runState._common.param('gasPrices', 'balance'))
       const balance = await runState.eei.getExternalBalance(address)
       runState.stack.push(balance)
     },
@@ -509,27 +509,29 @@ export const handlers: Map<number, OpHandler> = new Map([
   [
     0x3b,
     async function (runState: RunState) {
-      const address = runState.stack.pop()
+      const addressBN = runState.stack.pop()
+      const address = new Address(addressToBuffer(addressBN))
       accessAddressEIP2929(runState, address, runState._common.param('gasPrices', 'extcodesize'))
-      const size = await runState.eei.getExternalCodeSize(address)
+      const size = await runState.eei.getExternalCodeSize(addressBN)
       runState.stack.push(size)
     },
   ],
   // 0x3c: EXTCODECOPY
   [
     0x3c,
     async function (runState: RunState) {
-      const [address, memOffset, codeOffset, length] = runState.stack.popN(4)
+      const [addressBN, memOffset, codeOffset, length] = runState.stack.popN(4)
 
       // FIXME: for some reason this must come before subGas
       subMemUsage(runState, memOffset, length)
+      const address = new Address(addressToBuffer(addressBN))
       accessAddressEIP2929(runState, address, runState._common.param('gasPrices', 'extcodecopy'))
       // copy fee
       runState.eei.useGas(
         new BN(runState._common.param('gasPrices', 'copy')).imul(divCeil(length, new BN(32)))
       )
 
-      const code = await runState.eei.getExternalCode(address)
+      const code = await runState.eei.getExternalCode(addressBN)
 
       const data = getDataSlice(code, codeOffset, length)
       const memOffsetNum = memOffset.toNumber()
@@ -544,7 +546,7 @@ export const handlers: Map<number, OpHandler> = new Map([
     async function (runState: RunState) {
       const addressBN = runState.stack.pop()
       const address = new Address(addressToBuffer(addressBN))
-      accessAddressEIP2929(runState, address.buf, runState._common.param('gasPrices', 'extcodehash'))
+      accessAddressEIP2929(runState, address, runState._common.param('gasPrices', 'extcodehash'))
       const empty = await runState.eei.isAccountEmpty(address)
       if (empty) {
         runState.stack.push(new BN(0))
@@ -986,7 +988,7 @@ export const handlers: Map<number, OpHandler> = new Map([
       }
       subMemUsage(runState, inOffset, inLength)
       subMemUsage(runState, outOffset, outLength)
-      accessAddressEIP2929(runState, toAddressBuf, runState._common.param('gasPrices', 'call'))
+      accessAddressEIP2929(runState, toAddress, runState._common.param('gasPrices', 'call'))
 
       if (!value.isZero()) {
         runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callValueTransfer')))
@@ -1038,7 +1040,7 @@ export const handlers: Map<number, OpHandler> = new Map([
 
       subMemUsage(runState, inOffset, inLength)
       subMemUsage(runState, outOffset, outLength)
-      accessAddressEIP2929(runState, toAddressBuf, runState._common.param('gasPrices', 'callcode'))
+      accessAddressEIP2929(runState, toAddress, runState._common.param('gasPrices', 'callcode'))
 
       if (!value.isZero()) {
         runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callValueTransfer')))
@@ -1075,11 +1077,7 @@ export const handlers: Map<number, OpHandler> = new Map([
 
       subMemUsage(runState, inOffset, inLength)
       subMemUsage(runState, outOffset, outLength)
-      accessAddressEIP2929(
-        runState,
-        toAddressBuf,
-        runState._common.param('gasPrices', 'delegatecall')
-      )
+      accessAddressEIP2929(runState, toAddress, runState._common.param('gasPrices', 'delegatecall'))
 
       gasLimit = maxCallGas(gasLimit, runState.eei.getGasLeft(), runState)
       // note that TangerineWhistle or later this cannot happen (it could have ran out of gas prior to getting here though)
@@ -1108,11 +1106,7 @@ export const handlers: Map<number, OpHandler> = new Map([
 
       subMemUsage(runState, inOffset, inLength)
       subMemUsage(runState, outOffset, outLength)
-      accessAddressEIP2929(
-        runState,
-        toAddressBuf,
-        runState._common.param('gasPrices', 'staticcall')
-      )
+      accessAddressEIP2929(runState, toAddress, runState._common.param('gasPrices', 'staticcall'))
       gasLimit = maxCallGas(gasLimit, runState.eei.getGasLeft(), runState) // we set TangerineWhistle or later to true here, as STATICCALL was available from Byzantium (which is after TangerineWhistle)
 
       let data = Buffer.alloc(0)
@@ -1187,7 +1181,7 @@ export const handlers: Map<number, OpHandler> = new Map([
         runState.eei.useGas(new BN(runState._common.param('gasPrices', 'callNewAccount')))
       }
 
-      accessAddressEIP2929(runState, selfdestructToAddress.buf, 0)
+      accessAddressEIP2929(runState, selfdestructToAddress, 0)
       return runState.eei.selfDestruct(selfdestructToAddress)
     },
   ],

packages/vm/tests/api/EIPs/eip-2929.spec.ts

@@ -1,13 +1,13 @@
 import tape from 'tape'
-import { BN } from 'ethereumjs-util'
+import { Address, BN } from 'ethereumjs-util'
 import VM from '../../../lib'
 import Common from '@ethereumjs/common'
 import { inspect } from 'util'
 
 // Test cases source: https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a
 tape('EIP 2929: gas cost tests', (t) => {
   const initialGas = new BN(0xffffffffff)
-  const address = Buffer.from('000000000000000000000000636F6E7472616374', 'hex')
+  const address = new Address(Buffer.from('000000000000000000000000636F6E7472616374', 'hex'))
   const common = new Common({ chain: 'mainnet', hardfork: 'berlin', eips: [2929] })
 
   const runTest = async function (test: any, st: tape.Test) {
@@ -20,14 +20,15 @@ tape('EIP 2929: gas cost tests', (t) => {
       currentGas = step.gasLeft
 
       if (test.steps.length) {
-        st.equal(step.opcode.name, test.steps[i].expectedOpcode)
+        st.equal(step.opcode.name, test.steps[i].expectedOpcode, `Expected Opcode: ${test.steps[i].expectedOpcode}`)
 
         // Validates the gas consumption of the (i - 1)th opcode
         // b/c the step event fires before gas is debited.
         // The first opcode of every test should be +/- irrelevant
         // (ex: PUSH) and the last opcode is always STOP
         if (i > 0) {
-          st.equal(true, gasUsed.eq(new BN(test.steps[i - 1].expectedGasUsed)))
+          const expectedGasUsed = new BN(test.steps[i - 1].expectedGasUsed)
+          st.equal(true, gasUsed.eq(expectedGasUsed), `Opcode: ${test.steps[i - 1].expectedOpcode}, Gase Used: ${gasUsed}, Expected: ${expectedGasUsed}`)
         }
       }
       i++