Disable all EIP-7685 request handling

Essentially, the arbitrum chains do not support anything analogous to the L1
ethereum consensus layer. So, there is no need to perform special handling for
those requests when running arbitrum nodes.

Author: eljobe

cmd/evm/internal/t8ntool/execution.go

@@ -355,7 +355,8 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 
 	// Gather the execution-layer triggered requests.
 	var requests [][]byte
-	if chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time, vmContext.ArbOSVersion) {
+	// Arbitrum doesn't support Deposit/Withdrawal/Consolidation requests.
+	if !chainConfig.IsArbitrum() && chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time, vmContext.ArbOSVersion) {
 		requests = [][]byte{}
 		// EIP-6110
 		var allLogs []*types.Log

core/chain_makers.go

@@ -316,7 +316,8 @@ func (b *BlockGen) collectRequests(readonly bool) (requests [][]byte) {
 	}
 
 	blockContext := NewEVMBlockContext(b.header, b.cm, &b.header.Coinbase)
-	if b.cm.config.IsPrague(b.header.Number, b.header.Time, blockContext.ArbOSVersion) {
+	// Arbitrum doesn't support Deposit, Withdrawal, or Consolidation requests.
+	if !b.cm.config.IsArbitrum() && b.cm.config.IsPrague(b.header.Number, b.header.Time, blockContext.ArbOSVersion) {
 		requests = [][]byte{}
 		// EIP-6110 deposits
 		var blockLogs []*types.Log

core/state_processor.go

@@ -107,7 +107,8 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 
 	// Read requests if Prague is enabled.
 	var requests [][]byte
-	if p.config.IsPrague(block.Number(), block.Time(), context.ArbOSVersion) {
+	// Arbitrum has no Deposit, Witdrawal, or Consolidation requests.
+	if !p.config.IsArbitrum() && p.config.IsPrague(block.Number(), block.Time(), context.ArbOSVersion) {
 		requests = [][]byte{}
 		// EIP-6110
 		if err := ParseDepositLogs(&requests, allLogs, p.config); err != nil {

internal/ethapi/simulate.go

@@ -208,7 +208,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
 	if precompiles != nil {
 		evm.SetPrecompiles(precompiles)
 	}
-	if sim.chainConfig.IsPrague(header.Number, header.Time, arbOSVersion) || sim.chainConfig.IsVerkle(header.Number, header.Time) {
+	if sim.chainConfig.IsPrague(header.Number, header.Time, parentArbOSVersion) || sim.chainConfig.IsVerkle(header.Number, header.Time) {
 		core.ProcessParentBlockHash(header.ParentHash, evm)
 	}
 	var allLogs []*types.Log
@@ -257,8 +257,8 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
 		callResults[i] = callRes
 	}
 	var requests [][]byte
-	// Process EIP-7685 requests
-	if sim.chainConfig.IsPrague(header.Number, header.Time, arbOSVersion) {
+	// Process EIP-7685 requests unless Arbitrum is enabled.
+	if !sim.chainConfig.IsArbitrum() && sim.chainConfig.IsPrague(header.Number, header.Time, parentArbOSVersion) {
 		requests = [][]byte{}
 		// EIP-6110
 		if err := core.ParseDepositLogs(&requests, allLogs, sim.chainConfig); err != nil {
@@ -271,11 +271,11 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
 	}
 	header.Root = sim.state.IntermediateRoot(true)
 	header.GasUsed = gasUsed
-	if sim.chainConfig.IsCancun(header.Number, header.Time, arbOSVersion) {
+	if sim.chainConfig.IsCancun(header.Number, header.Time, parentArbOSVersion) {
 		header.BlobGasUsed = &blobGasUsed
 	}
 	var withdrawals types.Withdrawals
-	if sim.chainConfig.IsShanghai(header.Number, header.Time, arbOSVersion) {
+	if sim.chainConfig.IsShanghai(header.Number, header.Time, parentArbOSVersion) {
 		withdrawals = make([]*types.Withdrawal, 0)
 	}
 	if requests != nil {