Resolve conflicts from #3066 and #3138

Author: relyt29

arbnode/node.go

@@ -74,7 +74,6 @@ type Config struct {
 	ResourceMgmt             resourcemanager.Config         `koanf:"resource-mgmt" reload:"hot"`
 	BlockMetadataFetcher     BlockMetadataFetcherConfig     `koanf:"block-metadata-fetcher" reload:"hot"`
 	ConsensusExecutionSyncer ConsensusExecutionSyncerConfig `koanf:"consensus-execution-syncer"`
-	VMTrace                  arbostypes.VMTraceConfig       `koanf:"vmtrace" reload:"hot"`
 	// SnapSyncConfig is only used for testing purposes, these should not be configured in production.
 	SnapSyncTest SnapSyncConfig
 }
@@ -146,7 +145,6 @@ func ConfigAddOptions(prefix string, f *flag.FlagSet, feedInputEnable bool, feed
 	MaintenanceConfigAddOptions(prefix+".maintenance", f)
 	BlockMetadataFetcherConfigAddOptions(prefix+".block-metadata-fetcher", f)
 	ConsensusExecutionSyncerConfigAddOptions(prefix+".consensus-execution-syncer", f)
-	VMTraceConfigAddOptions(prefix+".vmtrace", f)
 }
 
 var ConfigDefault = Config{
@@ -169,7 +167,6 @@ var ConfigDefault = Config{
 	BlockMetadataFetcher:     DefaultBlockMetadataFetcherConfig,
 	Maintenance:              DefaultMaintenanceConfig,
 	ConsensusExecutionSyncer: DefaultConsensusExecutionSyncerConfig,
-	VMTrace:                  DefaultVMTraceConfig,
 	SnapSyncTest:             DefaultSnapSyncConfig,
 }
 
@@ -221,21 +218,6 @@ func ConfigDefaultL2Test() *Config {
 	return &config
 }
 
-var DefaultVMTraceConfig = arbostypes.VMTraceConfig{
-	TracerName: "",
-	JSONConfig: "{}",
-}
-
-var TestVMTraceConfig = arbostypes.VMTraceConfig{
-	TracerName: "",
-	JSONConfig: "{}",
-}
-
-func VMTraceConfigAddOptions(prefix string, f *flag.FlagSet) {
-	f.String(prefix+".tracername", DefaultVMTraceConfig.TracerName, "Name of tracer which should record internal VM operations (costly)")
-	f.String(prefix+".jsonconfig", DefaultVMTraceConfig.JSONConfig, "Tracer configuration (JSON)")
-}
-
 type DangerousConfig struct {
 	NoL1Listener           bool `koanf:"no-l1-listener"`
 	NoSequencerCoordinator bool `koanf:"no-sequencer-coordinator"`

arbos/arbostypes/vmtraceconfig.go

@@ -14,7 +14,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/log"
@@ -147,7 +146,6 @@ func ProduceBlock(
 	chainContext core.ChainContext,
 	isMsgForPrefetch bool,
 	runMode core.MessageRunMode,
-	liveTracingHooks *tracing.Hooks,
 ) (*types.Block, types.Receipts, error) {
 	chainConfig := chainContext.Config()
 	txes, err := ParseL2Transactions(message, chainConfig.ChainID)
@@ -158,19 +156,11 @@ func ProduceBlock(
 
 	hooks := NoopSequencingHooks()
 	return ProduceBlockAdvanced(
-		message.Header,
-		txes,
-		delayedMessagesRead,
-		lastBlockHeader,
-		statedb,
-		chainContext,
-		hooks,
-		isMsgForPrefetch,
-		runMode,
-		liveTracingHooks,
+		message.Header, txes, delayedMessagesRead, lastBlockHeader, statedb, chainContext, hooks, isMsgForPrefetch, runMode,
 	)
 }
 
+// A bit more flexible than ProduceBlock for use in the sequencer.
 func ProduceBlockAdvanced(
 	l1Header *arbostypes.L1IncomingMessageHeader,
 	txes types.Transactions,
@@ -181,7 +171,6 @@ func ProduceBlockAdvanced(
 	sequencingHooks *SequencingHooks,
 	isMsgForPrefetch bool,
 	runMode core.MessageRunMode,
-	liveTracingHooks *tracing.Hooks,
 ) (*types.Block, types.Receipts, error) {
 
 	arbState, err := arbosState.OpenSystemArbosState(statedb, nil, true)
@@ -224,18 +213,6 @@ func ProduceBlockAdvanced(
 	// We'll check that the block can fit each message, so this pool is set to not run out
 	gethGas := core.GasPool(l2pricing.GethBlockGasLimit)
 
-	if liveTracingHooks != nil && runMode == core.MessageCommitMode {
-		if liveTracingHooks.OnBlockStart != nil {
-			tmpBlock := types.NewBlock(header, &types.Body{Transactions: complete}, receipts, trie.NewStackTrie(nil))
-
-			liveTracingHooks.OnBlockStart(tracing.BlockEvent{
-				Block:     tmpBlock,
-				Finalized: header,
-				Safe:      header,
-			})
-		}
-	}
-
 	for len(txes) > 0 || len(redeems) > 0 {
 		// repeatedly process the next tx, doing redeems created along the way in FIFO order
 
@@ -339,18 +316,7 @@ func ProduceBlockAdvanced(
 
 			gasPool := gethGas
 			blockContext := core.NewEVMBlockContext(header, chainContext, &header.Coinbase)
-
-			var evm *vm.EVM
-
-			if isMsgForPrefetch || liveTracingHooks == nil {
-				evm = vm.NewEVM(blockContext, statedb, chainConfig, vm.Config{})
-			} else {
-				// Enable tracing
-				tracingStateDB := state.NewHookedState(statedb, liveTracingHooks)
-				evm = vm.NewEVM(blockContext, tracingStateDB, chainConfig, vm.Config{
-					Tracer: liveTracingHooks,
-				})
-			}
+			evm := vm.NewEVM(blockContext, statedb, chainConfig, vm.Config{})
 			receipt, result, err := core.ApplyTransactionWithResultFilter(
 				evm,
 				&gasPool,
@@ -536,12 +502,6 @@ func ProduceBlockAdvanced(
 		log.Error("Unexpected total balance delta", "delta", balanceDelta, "expected", expectedBalanceDelta)
 	}
 
-	if liveTracingHooks != nil && runMode == core.MessageCommitMode {
-		if liveTracingHooks.OnBlockEnd != nil {
-			liveTracingHooks.OnBlockEnd(nil)
-		}
-	}
-
 	return block, receipts, nil
 }
 

arbos/block_processor.go

@@ -299,7 +299,7 @@ func main() {
 		message := readMessage(chainConfig.ArbitrumChainParams.DataAvailabilityCommittee)
 
 		chainContext := WavmChainContext{chainConfig: chainConfig}
-		newBlock, _, err = arbos.ProduceBlock(message.Message, message.DelayedMessagesRead, lastBlockHeader, statedb, chainContext, false, core.MessageReplayMode, nil)
+		newBlock, _, err = arbos.ProduceBlock(message.Message, message.DelayedMessagesRead, lastBlockHeader, statedb, chainContext, false, core.MessageReplayMode)
 		if err != nil {
 			panic(err)
 		}

cmd/replay/main.go

@@ -159,7 +159,6 @@ func (r *BlockRecorder) RecordBlockCreation(
 			chaincontext,
 			false,
 			core.MessageReplayMode,
-			nil,
 		)
 		if err != nil {
 			return nil, err

execution/gethexec/block_recorder.go

@@ -1,7 +1,6 @@
 package gethexec
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"time"
@@ -14,7 +13,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
-	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
@@ -234,16 +232,6 @@ func GetBlockChain(
 		Tracer:                  tracer,
 	}
 
-	if vmTraceConfig != nil && vmTraceConfig.TracerName != "" {
-		t, err := tracers.LiveDirectory.New(vmTraceConfig.TracerName, json.RawMessage(vmTraceConfig.JSONConfig))
-		if err == nil {
-			log.Info(vmTraceConfig.TracerName + " live tracer activated")
-			vmConfig.Tracer = t
-		} else {
-			log.Error("Custom tracer error: " + err.Error())
-		}
-	}
-
 	return core.NewBlockChain(chainDb, cacheConfig, chainConfig, nil, nil, engine, vmConfig, &txLookupLimit)
 }
 

execution/gethexec/blockchain.go

@@ -579,7 +579,6 @@ func (s *ExecutionEngine) sequenceTransactionsWithBlockMutex(header *arbostypes.
 		hooks,
 		false,
 		core.MessageCommitMode,
-		s.bc.GetVMConfig().Tracer,
 	)
 	if err != nil {
 		return nil, err
@@ -779,7 +778,6 @@ func (s *ExecutionEngine) createBlockFromNextMessage(msg *arbostypes.MessageWith
 		s.bc,
 		isMsgForPrefetch,
 		runMode,
-		s.bc.GetVMConfig().Tracer,
 	)
 
 	return block, statedb, receipts, err

execution/gethexec/executionengine.go

@@ -66,7 +66,7 @@ func BuildBlock(
 	}
 
 	block, _, err := arbos.ProduceBlock(
-		l1Message, delayedMessagesRead, lastBlockHeader, statedb, chainContext, false, runMode, nil,
+		l1Message, delayedMessagesRead, lastBlockHeader, statedb, chainContext, false, runMode,
 	)
 	return block, err
 }