Remove EIP-3074

ethereumjs · Aug 12, 2024 · 527784e · 527784e
1 parent a930add
commit 527784e
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 1,112 deletions.
diff --git a/packages/common/src/eips.ts b/packages/common/src/eips.ts
@@ -133,14 +133,6 @@ export const eipsDict: EIPsDict = {
   2935: {
     minimumHardfork: Hardfork.Chainstart,
   },
-  /**
-   * Description : AUTH and AUTHCALL opcodes
-   * URL         : https://github.com/ethereum/EIPs/commit/eca4416ff3c025fcb6ec8cd4eac481e74e108481
-   * Status      : Review
-   */
-  3074: {
-    minimumHardfork: Hardfork.London,
-  },
   /**
    * Description : BASEFEE opcode
    * URL         : https://eips.ethereum.org/EIPS/eip-3198

diff --git a/packages/evm/src/evm.ts b/packages/evm/src/evm.ts
@@ -177,12 +177,11 @@ export class EVM implements EVMInterface {
 
     // Supported EIPs
     const supportedEIPs = [
-      663, 1153, 1153, 1559, 1559, 2537, 2537, 2565, 2565, 2718, 2718, 2929, 2929, 2930, 2930, 2935,
-      2935, 3074, 3074, 3198, 3198, 3529, 3529, 3540, 3540, 3541, 3541, 3607, 3607, 3651, 3651,
-      3670, 3670, 3855, 3855, 3860, 3860, 4200, 4399, 4399, 4750, 4788, 4788, 4844, 4844, 4895,
-      4895, 5133, 5133, 5450, 5656, 5656, 6110, 6110, 6206, 6780, 6780, 6800, 6800, 7002, 7002,
-      7069, 7251, 7251, 7480, 7516, 7516, 7620, 7685, 7685, 7692, 7698, 7702, 7702, 7709, 7709,
+      663, 1153, 1559, 2537, 2565, 2718, 2929, 2930, 2935, 3198, 3529, 3540, 3541, 3607, 3651, 3670,
+      3855, 3860, 4200, 4399, 4750, 4788, 4844, 4895, 5133, 5450, 5656, 6110, 6206, 6780, 6800,
+      7002, 7069, 7251, 7480, 7516, 7620, 7685, 7692, 7698, 7702, 7709,
     ]
+
     for (const eip of this.common.eips()) {
       if (!supportedEIPs.includes(eip)) {
         throw new Error(`EIP-${eip} is not supported by the EVM`)

diff --git a/packages/evm/src/interpreter.ts b/packages/evm/src/interpreter.ts
@@ -93,7 +93,6 @@ export interface RunState {
   interpreter: Interpreter
   gasRefund: bigint // Tracks the current refund
   gasLeft: bigint // Current gas left
-  auth?: Address /** EIP-3074 AUTH parameter */
   returnBytes: Uint8Array /* Current bytes in the return Uint8Array. Cleared each time a CALL/CREATE is made in the current frame. */
 }
 
@@ -867,31 +866,6 @@ export class Interpreter {
     return this._baseCall(msg)
   }
 
-  /**
-   * Sends a message with arbitrary data to a given address path.
-   */
-  async authcall(
-    gasLimit: bigint,
-    address: Address,
-    value: bigint,
-    data: Uint8Array,
-  ): Promise<bigint> {
-    const msg = new Message({
-      caller: this._runState.auth,
-      gasLimit,
-      to: address,
-      value,
-      data,
-      isStatic: this._env.isStatic,
-      depth: this._env.depth + 1,
-      authcallOrigin: this._env.address,
-      blobVersionedHashes: this._env.blobVersionedHashes,
-      accessWitness: this._env.accessWitness,
-    })
-
-    return this._baseCall(msg)
-  }
-
   /**
    * Message-call into this account with an alternative account's code.
    */

diff --git a/packages/evm/src/opcodes/codes.ts b/packages/evm/src/opcodes/codes.ts
@@ -294,13 +294,6 @@ const eipOpcodes: { eip: number; opcodes: OpcodeEntry }[] = [
       0x5f: { name: 'PUSH0', isAsync: false, dynamicGas: false },
     },
   },
-  {
-    eip: 3074,
-    opcodes: {
-      0xf6: { name: 'AUTH', isAsync: true, dynamicGas: true },
-      0xf7: { name: 'AUTHCALL', isAsync: true, dynamicGas: true },
-    },
-  },
   {
     eip: 4200,
     opcodes: {

diff --git a/packages/evm/src/opcodes/functions.ts b/packages/evm/src/opcodes/functions.ts
@@ -1,5 +1,4 @@
 import {
-  Account,
   Address,
   BIGINT_0,
   BIGINT_1,
@@ -8,7 +7,6 @@ import {
   BIGINT_224,
   BIGINT_255,
   BIGINT_256,
-  BIGINT_27,
   BIGINT_2EXP160,
   BIGINT_2EXP224,
   BIGINT_2EXP96,
@@ -18,20 +16,15 @@ import {
   BIGINT_8,
   BIGINT_96,
   MAX_INTEGER_BIGINT,
-  SECP256K1_ORDER_DIV_2,
   TWO_POW256,
   bigIntToAddressBytes,
   bigIntToBytes,
   bytesToBigInt,
   bytesToHex,
   bytesToInt,
   concatBytes,
-  ecrecover,
   getVerkleTreeIndexesForStorageSlot,
-  hexToBytes,
-  publicToAddress,
   setLengthLeft,
-  setLengthRight,
 } from '@ethereumjs/util'
 import { keccak256 } from 'ethereum-cryptography/keccak.js'
 
@@ -56,8 +49,6 @@ import {
 import type { RunState } from '../interpreter.js'
 import type { Common } from '@ethereumjs/common'
 
-const EIP3074MAGIC = hexToBytes('0x04')
-
 export interface SyncOpHandler {
   (runState: RunState, common: Common): void
 }
@@ -1492,119 +1483,6 @@ export const handlers: Map<number, OpHandler> = new Map([
       runState.stack.push(ret)
     },
   ],
-  // 0xf6: AUTH
-  [
-    0xf6,
-    async function (runState) {
-      // eslint-disable-next-line prefer-const
-      let [authority, memOffset, memLength] = runState.stack.popN(3)
-
-      if (memLength > BigInt(97)) {
-        memLength = BigInt(97)
-      }
-
-      let mem = runState.memory.read(Number(memOffset), Number(memLength))
-      if (mem.length < 97) {
-        mem = setLengthRight(mem, 97)
-      }
-
-      const yParity = BigInt(mem[0])
-      const r = mem.subarray(1, 33)
-      const s = mem.subarray(33, 65)
-      const commit = mem.subarray(65, 97)
-
-      if (bytesToBigInt(s) > SECP256K1_ORDER_DIV_2) {
-        runState.stack.push(BIGINT_0)
-        runState.auth = undefined
-        return
-      }
-      if (yParity > BIGINT_1) {
-        runState.stack.push(BIGINT_0)
-        runState.auth = undefined
-        return
-      }
-
-      // we don't want strick check here on authority being in address range just last 20 bytes
-      const expectedAddress = new Address(bigIntToAddressBytes(authority, false))
-      const account = (await runState.stateManager.getAccount(expectedAddress)) ?? new Account()
-
-      if (account.isContract()) {
-        // EXTCODESIZE > 0
-        runState.stack.push(BIGINT_0)
-        runState.auth = undefined
-        return
-      }
-
-      const accountNonce = account.nonce
-
-      const invokedAddress = setLengthLeft(runState.interpreter._env.address.bytes, 32)
-      const chainId = setLengthLeft(bigIntToBytes(runState.interpreter.getChainId()), 32)
-      const nonce = setLengthLeft(bigIntToBytes(accountNonce), 32)
-      const message = concatBytes(EIP3074MAGIC, chainId, nonce, invokedAddress, commit)
-
-      const keccakFunction = runState.interpreter._evm.common.customCrypto.keccak256 ?? keccak256
-      const msgHash = keccakFunction(message)
-
-      let recover
-      const ecrecoverFunction = runState.interpreter._evm.common.customCrypto.ecrecover ?? ecrecover
-      try {
-        recover = ecrecoverFunction(msgHash, yParity + BIGINT_27, r, s)
-      } catch (e) {
-        // Malformed signature, push 0 on stack, clear auth variable
-        runState.stack.push(BIGINT_0)
-        runState.auth = undefined
-        return
-      }
-
-      const addressBuffer = publicToAddress(recover)
-      const address = new Address(addressBuffer)
-      runState.auth = address
-
-      if (!expectedAddress.equals(address)) {
-        // expected address does not equal the recovered address, clear auth variable
-        runState.stack.push(BIGINT_0)
-        runState.auth = undefined
-        return
-      }
-
-      runState.auth = address
-      runState.stack.push(BIGINT_1)
-    },
-  ],
-  // 0xf7: AUTHCALL (3074) / RETURNDATALOAD (7069)
-  [
-    0xf7,
-    async function (runState, common) {
-      if (common.isActivatedEIP(3074) && runState.env.eof === undefined) {
-        // AUTHCALL logic
-        const [_currentGasLimit, addr, value, argsOffset, argsLength, retOffset, retLength] =
-          runState.stack.popN(7)
-
-        const toAddress = createAddressFromStackBigInt(addr)
-
-        const gasLimit = runState.messageGasLimit!
-        runState.messageGasLimit = undefined
-
-        let data = new Uint8Array(0)
-        if (argsLength !== BIGINT_0) {
-          data = runState.memory.read(Number(argsOffset), Number(argsLength))
-        }
-
-        const ret = await runState.interpreter.authcall(gasLimit, toAddress, value, data)
-        // Write return data to memory
-        writeCallOutput(runState, retOffset, retLength)
-        runState.stack.push(ret)
-      } else if (common.isActivatedEIP(7069)) {
-        // RETURNDATALOAD logic
-        const returnDataOffset = runState.stack.pop()
-        const data = getDataSlice(runState.interpreter.getReturnData(), returnDataOffset, BIGINT_32)
-        runState.stack.push(bytesToBigInt(data))
-      } else {
-        // This should be unreachable
-        trap(ERROR.INVALID_OPCODE)
-      }
-    },
-  ],
   // 0xf8: EXTCALL
   [
     0xf8,

diff --git a/packages/evm/src/opcodes/gas.ts b/packages/evm/src/opcodes/gas.ts
@@ -1,6 +1,5 @@
 import { Hardfork } from '@ethereumjs/common'
 import {
-  Account,
   BIGINT_0,
   BIGINT_1,
   BIGINT_3,
@@ -769,78 +768,6 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
         return gas
       },
     ],
-    [
-      /* AUTH */
-      0xf6,
-      async function (runState, gas, common): Promise<bigint> {
-        const [address, memOffset, memLength] = runState.stack.peek(3)
-        // Note: 2929 is always active if AUTH can be reached,
-        // since it needs London as minimum hardfork
-        gas += accessAddressEIP2929(runState, bigIntToBytes(address), common)
-        gas += subMemUsage(runState, memOffset, memLength, common)
-        return gas
-      },
-    ],
-    [
-      /* AUTHCALL */
-      0xf7,
-      async function (runState, gas, common): Promise<bigint> {
-        if (runState.auth === undefined) {
-          trap(ERROR.AUTHCALL_UNSET)
-        }
-
-        const [currentGasLimit, addr, value, argsOffset, argsLength, retOffset, retLength] =
-          runState.stack.peek(7)
-
-        const toAddress = createAddressFromStackBigInt(addr)
-
-        gas += common.param('warmstoragereadGas')
-
-        gas += accessAddressEIP2929(runState, toAddress.bytes, common, true, true)
-
-        gas += subMemUsage(runState, argsOffset, argsLength, common)
-        gas += subMemUsage(runState, retOffset, retLength, common)
-
-        if (value > BIGINT_0) {
-          gas += common.param('authcallValueTransferGas')
-          const account = await runState.stateManager.getAccount(toAddress)
-          if (!account) {
-            gas += common.param('callNewAccountGas')
-          }
-        }
-
-        let gasLimit = maxCallGas(
-          runState.interpreter.getGasLeft() - gas,
-          runState.interpreter.getGasLeft() - gas,
-          runState,
-          common,
-        )
-        if (currentGasLimit !== BIGINT_0) {
-          if (currentGasLimit > gasLimit) {
-            trap(ERROR.OUT_OF_GAS)
-          }
-          gasLimit = currentGasLimit
-        }
-
-        runState.messageGasLimit = gasLimit
-
-        if (value > BIGINT_0) {
-          const account = (await runState.stateManager.getAccount(runState.auth!)) ?? new Account()
-          if (account.balance < value) {
-            trap(ERROR.OUT_OF_GAS)
-          }
-          account.balance -= value
-
-          const toAddr = createAddressFromStackBigInt(addr)
-          const target = (await runState.stateManager.getAccount(toAddr)) ?? new Account()
-          target.balance += value
-
-          await runState.stateManager.putAccount(toAddr, target)
-        }
-
-        return gas
-      },
-    ],
     /* EXTCALL */
     [
       0xf8,

diff --git a/packages/evm/src/params.ts b/packages/evm/src/params.ts
@@ -278,15 +278,6 @@ export const paramsEVM: ParamsDict = {
     historyServeWindow: 8192, // The amount of blocks to be served by the historical blockhash contract
   },
   /**
-.  * AUTH and AUTHCALL opcodes
-.  */
-  3074: {
-    // gasPrices
-    authGas: 3100, // Gas cost of the AUTH opcode
-    authcallGas: 0, // Gas cost of the AUTHCALL opcode
-    authcallValueTransferGas: 6700, // Paid for CALL when the value transfer is non-zero
-  },
-  /**
 .  * BASEFEE opcode
 .  */
   3198: {

diff --git a/packages/evm/src/types.ts b/packages/evm/src/types.ts
@@ -191,7 +191,6 @@ export interface EVMOpts {
    * - [EIP-2935](https://eips.ethereum.org/EIPS/eip-2935) - Save historical block hashes in state (`experimental`)
    * - [EIP-2929](https://eips.ethereum.org/EIPS/eip-2929) - gas cost increases for state access opcodes
    * - [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930) - Optional access list tx type
-   * - [EIP-3074](https://eips.ethereum.org/EIPS/eip-3074) - AUTH and AUTHCALL opcodes
    * - [EIP-3198](https://eips.ethereum.org/EIPS/eip-3198) - Base fee Opcode
    * - [EIP-3529](https://eips.ethereum.org/EIPS/eip-3529) - Reduction in refunds
    * - [EIP-3540](https://eips.ethereum.org/EIPS/eip-3541) - EVM Object Format (EOF) v1 (`outdated`)