WIP: implement EIP-5806

packages/client/bin/cli.ts

@@ -654,6 +654,9 @@ async function setupDevnet(prefundAddress: Address) {
       istanbulBlock: 0,
       berlinBlock: 0,
       londonBlock: 0,
+      mergeForkBlock: 0,
+      shanghaiTime: 0,
+      cancunTime: 0,
       ...consensusConfig,
     },
     nonce: '0x0',
@@ -674,7 +677,11 @@ async function setupDevnet(prefundAddress: Address) {
     extraData,
     alloc: { [addr]: { balance: '0x10000000000000000000' } },
   }
-  const common = Common.fromGethGenesis(chainData, { chain: 'devnet', hardfork: Hardfork.London })
+  const common = Common.fromGethGenesis(chainData, {
+    chain: 'devnet',
+    hardfork: Hardfork.Cancun,
+    eips: [5806], // TODO: remove
+  })
   const customGenesisState = parseGethGenesisState(chainData)
   return { common, customGenesisState }
 }

packages/client/src/net/protocol/ethprotocol.ts

@@ -6,6 +6,7 @@
   TransactionFactory,
   isAccessListEIP2930Tx,
   isBlobEIP4844Tx,
+  isDelegateEIP5806Tx,
   isFeeMarketEIP1559Tx,
   isLegacyTx,
 } from '@ethereumjs/tx'
@@ -262,7 +263,11 @@
           // serialize txs as per type
           if (isBlobEIP4844Tx(tx)) {
             serializedTxs.push(tx.serializeNetworkWrapper())
-          } else if (isFeeMarketEIP1559Tx(tx) || isAccessListEIP2930Tx(tx)) {
+          } else if (
+            isAccessListEIP2930Tx(tx) ||
+            isFeeMarketEIP1559Tx(tx) ||
+            isDelegateEIP5806Tx(tx)
+          ) {
             serializedTxs.push(tx.serialize())
           } else if (isLegacyTx(tx)) {
             serializedTxs.push(tx.raw())

packages/client/src/service/txpool.ts

@@ -3,6 +3,7 @@ import {
   Capability,
   isAccessListEIP2930Tx,
   isBlobEIP4844Tx,
+  isDelegateEIP5806Tx,
   isFeeMarketEIP1559Tx,
   isLegacyTx,
 } from '@ethereumjs/tx'
@@ -710,7 +711,7 @@ export class TxPool {
       }
     }
 
-    if (isFeeMarketEIP1559Tx(tx) || isBlobEIP4844Tx(tx)) {
+    if (isFeeMarketEIP1559Tx(tx) || isBlobEIP4844Tx(tx) || isDelegateEIP5806Tx(tx)) {
       return {
         maxFee: tx.maxFeePerGas,
         tip: tx.maxPriorityFeePerGas,

packages/common/src/eips.ts

@@ -482,6 +482,13 @@ export const EIPs: EIPsDict = {
       },
     },
   },
+  5806: {
+    comment: 'Deleate transaction',
+    url: 'https://eips.ethereum.org/EIPS/eip-5806',
+    status: Status.Draft,
+    minimumHardfork: Hardfork.Cancun, // TODO: Hardfork.Prague
+    requiredEIPs: [2718, 2930],
+  },
   6780: {
     comment: 'SELFDESTRUCT only in same transaction',
     url: 'https://eips.ethereum.org/EIPS/eip-6780',

packages/evm/src/evm.ts

@@ -86,6 +86,7 @@ export class EVM implements EVMInterface {
   protected _tx?: {
     gasPrice: bigint
     origin: Address
+    isEIP5806: boolean
   }
   protected _block?: Block
 
@@ -183,7 +184,7 @@ export class EVM implements EVMInterface {
     // Supported EIPs
     const supportedEIPs = [
       1153, 1559, 2315, 2565, 2718, 2929, 2930, 2935, 3074, 3198, 3529, 3540, 3541, 3607, 3651,
-      3670, 3855, 3860, 4399, 4895, 4788, 4844, 5133, 5656, 6780, 6800, 7516,
+      3670, 3855, 3860, 4399, 4895, 4788, 4844, 5133, 5656, 5806, 6780, 6800, 7516,
     ]
 
     for (const eip of this.common.eips()) {
@@ -750,6 +751,7 @@ export class EVM implements EVMInterface {
       blobVersionedHashes: message.blobVersionedHashes ?? [],
       accessWitness: message.accessWitness,
       createdAddresses: message.createdAddresses,
+      isEIP5806: this._tx!.isEIP5806,
     }
 
     const interpreter = new Interpreter(
@@ -825,6 +827,7 @@ export class EVM implements EVMInterface {
       this._tx = {
         gasPrice: opts.gasPrice ?? BIGINT_0,
         origin: opts.origin ?? opts.caller ?? Address.zero(),
+        isEIP5806: opts.isEIP5806 ?? false,
       }
       const caller = opts.caller ?? Address.zero()
 
@@ -848,6 +851,7 @@ export class EVM implements EVMInterface {
         value,
         data: opts.data,
         code: opts.code,
+        codeAddress: opts.codeAddress,
         depth: opts.depth,
         isCompiled: opts.isCompiled,
         isStatic: opts.isStatic,
@@ -963,6 +967,7 @@ export class EVM implements EVMInterface {
     this._tx = {
       gasPrice: opts.gasPrice ?? BIGINT_0,
       origin: opts.origin ?? opts.caller ?? Address.zero(),
+      isEIP5806: false,
     }
 
     const message = new Message({

packages/evm/src/exceptions.ts

@@ -9,6 +9,7 @@ export enum ERROR {
   OUT_OF_RANGE = 'value out of range',
   REVERT = 'revert',
   STATIC_STATE_CHANGE = 'static state change',
+  EIP5806_WRITE = 'write attempt in EIP-5806 transaction',
   INTERNAL_ERROR = 'internal error',
   CREATE_COLLISION = 'create collision',
   STOP = 'stop',

packages/evm/src/interpreter.ts

@@ -71,6 +71,7 @@ export interface Env {
   createdAddresses?: Set<string>
   accessWitness?: AccessWitness
   chargeCodeAccesses?: boolean
+  isEIP5806?: boolean
 }
 
 export interface RunState {

packages/evm/src/opcodes/functions.ts

@@ -757,6 +757,13 @@
   [
     0x55,
     async function (runState) {
+      if (
+        runState.interpreter._env.isEIP5806 === true &&
+        runState.interpreter._env.origin.equals(runState.interpreter._env.address)
+      ) {
+        trap(ERROR.EIP5806_WRITE)
+      }
+
       const [key, val] = runState.stack.popN(2)
 
       const keyBuf = setLengthLeft(bigIntToBytes(key), 32)
@@ -994,6 +1001,13 @@
   [
     0xf0,
     async function (runState, common) {
+      if (
+        runState.interpreter._env.isEIP5806 === true &&
+        runState.interpreter._env.origin.equals(runState.interpreter._env.address)
+      ) {
+        trap(ERROR.EIP5806_WRITE)
+      }
+
       const [value, offset, length] = runState.stack.popN(3)
 
       if (
@@ -1020,6 +1034,13 @@
   [
     0xf5,
     async function (runState, common) {
+      if (
+        runState.interpreter._env.isEIP5806 === true &&
+        runState.interpreter._env.origin.equals(runState.interpreter._env.address)
+      ) {
+        trap(ERROR.EIP5806_WRITE)
+      }
+
       if (runState.interpreter.isStatic()) {
         trap(ERROR.STATIC_STATE_CHANGE)
       }
@@ -1273,6 +1294,13 @@
   [
     0xff,
     async function (runState) {
+      if (
+        runState.interpreter._env.isEIP5806 === true &&
+        runState.interpreter._env.origin.equals(runState.interpreter._env.address)
+      ) {
+        trap(ERROR.EIP5806_WRITE)
+      }
+
       const selfdestructToAddressBigInt = runState.stack.pop()
       const selfdestructToAddress = new Address(addresstoBytes(selfdestructToAddressBigInt))
       return runState.interpreter.selfDestruct(selfdestructToAddress)

packages/evm/src/types.ts

@@ -125,6 +125,10 @@ export interface EVMRunCallOpts extends EVMRunOpts {
   message?: Message
 
   accessWitness?: AccessWitness
+
+  codeAddress?: Address
+
+  isEIP5806?: boolean
 }
 
 interface NewContractEvent {