consensus/bor: don't leak the live tracer into non-import system transactions

consensus/bor/bor.go

@@ -1622,6 +1622,34 @@ func (c *Bor) runMilestoneFetcher() {
 	}
 }
 
+// stateTracingHooks is implemented by state wrappers (state.NewHookedState)
+// that emit tracing hooks for the state they wrap.
+type stateTracingHooks interface {
+	Hooks() *tracing.Hooks
+}
+
+// systemTxVMConfig returns the vm.Config to use when applying bor system
+// transactions (span commits and state-sync events) over the given state.
+//
+// The tracer is derived from the state itself rather than taken from
+// c.vmConfig: canonical block import passes a hooked state when a live tracer
+// is configured, so system transactions keep being traced there. Every other
+// caller — the miner and eth_simulateV1 via FinalizeAndAssemble, or historical
+// state regeneration via Finalize — passes a plain state and must not fire the
+// node-wide live tracer: those run outside the import goroutine, and invoking
+// the singleton live tracer concurrently corrupts its state and can crash the
+// node.
+func (c *Bor) systemTxVMConfig(state vm.StateDB) vm.Config {
+	cfg := c.vmConfig
+	if hooked, ok := state.(stateTracingHooks); ok {
+		cfg.Tracer = hooked.Hooks()
+	} else {
+		cfg.Tracer = nil
+	}
+
+	return cfg
+}
+
 func (c *Bor) checkAndCommitSpan(
 	state vm.StateDB,
 	header *types.Header,
@@ -1744,7 +1772,7 @@ func (c *Bor) FetchAndCommitSpan(
 		)
 	}
 
-	return c.spanner.CommitSpan(ctx, minSpan, validators, producers, state, header, chain, c.vmConfig)
+	return c.spanner.CommitSpan(ctx, minSpan, validators, producers, state, header, chain, c.systemTxVMConfig(state))
 }
 
 // CommitStates commit states
@@ -1849,6 +1877,8 @@ func (c *Bor) CommitStates(
 
 	var gasUsed uint64
 
+	vmConfig := c.systemTxVMConfig(state)
+
 	for _, eventRecord := range eventRecords {
 		if eventRecord.ID <= lastStateID {
 			continue
@@ -1894,7 +1924,7 @@ func (c *Bor) CommitStates(
 
 		// Receipt construction expects the receiver call to emit at least one log.
 		// A receiver without code can complete without producing one.
-		gasUsed, err = c.GenesisContractsClient.CommitState(eventRecord, state, header, chain, c.vmConfig)
+		gasUsed, err = c.GenesisContractsClient.CommitState(eventRecord, state, header, chain, vmConfig)
 		if err != nil {
 			return nil, err
 		}

consensus/bor/vmconfig_test.go

@@ -0,0 +1,117 @@
+package bor
+
+import (
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/consensus/bor/clerk"
+	"github.com/ethereum/go-ethereum/consensus/bor/statefull"
+	"github.com/ethereum/go-ethereum/consensus/bor/valset"
+	"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"
+)
+
+// TestSystemTxVMConfig verifies that system transactions (span commits and
+// state-sync events) are traced only when the caller traces the state they
+// are applied to. The node-wide live tracer stored in c.vmConfig must never
+// leak into contexts that pass a plain state (miner and eth_simulateV1 via
+// FinalizeAndAssemble, historical state regeneration via Finalize): those run
+// outside the import goroutine, and invoking the singleton live tracer
+// concurrently corrupts it.
+func TestSystemTxVMConfig(t *testing.T) {
+	t.Parallel()
+
+	liveTracer := &tracing.Hooks{
+		OnEnter: func(depth int, typ byte, from, to common.Address, input []byte, gas uint64, value *big.Int) {
+			t.Error("live tracer must not be invoked for untraced states")
+		},
+	}
+	c := &Bor{vmConfig: vm.Config{Tracer: liveTracer, NoBaseFee: true}}
+
+	plainState, err := state.New(types.EmptyRootHash, state.NewDatabaseForTesting())
+	require.NoError(t, err)
+
+	// A plain state (regeneration, miner, eth_simulateV1) must not get the
+	// live tracer, but keeps the rest of the config.
+	cfg := c.systemTxVMConfig(plainState)
+	require.Nil(t, cfg.Tracer)
+	require.True(t, cfg.NoBaseFee)
+
+	// A hooked state (canonical import with a live tracer) keeps being traced
+	// with the hooks that trace the state itself.
+	importHooks := &tracing.Hooks{}
+	cfg = c.systemTxVMConfig(state.NewHookedState(plainState, importHooks))
+	require.Same(t, importHooks, cfg.Tracer)
+}
+
+// capturingGenesisContract records the vm.Config each CommitState call receives.
+type capturingGenesisContract struct {
+	lastStateID uint64
+	captured    []vm.Config
+}
+
+func (m *capturingGenesisContract) CommitState(event *clerk.EventRecordWithTime, state vm.StateDB, header *types.Header, chCtx statefull.ChainContext, vmCfg vm.Config) (uint64, error) {
+	m.captured = append(m.captured, vmCfg)
+	return 0, nil
+}
+
+func (m *capturingGenesisContract) LastStateId(st *state.StateDB, number uint64, hash common.Hash) (*big.Int, error) {
+	return big.NewInt(int64(m.lastStateID)), nil
+}
+
+// TestCommitStates_SystemTxTracer asserts end to end through CommitStates that
+// state-sync system transactions receive the tracer of the state they mutate:
+// the hooks tracing the state during canonical import, and no tracer at all
+// for plain states (miner and eth_simulateV1 via FinalizeAndAssemble,
+// historical state regeneration via Finalize) — never the node-wide live
+// tracer stored in c.vmConfig.
+func TestCommitStates_SystemTxTracer(t *testing.T) {
+	t.Parallel()
+
+	addr1 := common.HexToAddress("0x1")
+	sp := &fakeSpanner{vals: []*valset.Validator{{Address: addr1, VotingPower: 1}}}
+
+	now := time.Now()
+	chain, b := newChainAndBorForTest(t, sp, indoreBorConfig(), true, addr1, uint64(now.Unix()))
+
+	// The node-wide live tracer configured at startup: must never reach system txs.
+	b.vmConfig = vm.Config{Tracer: &tracing.Hooks{}, NoBaseFee: true}
+
+	gc := &capturingGenesisContract{lastStateID: 0}
+	b.GenesisContractsClient = gc
+	b.SetHeimdallClient(&mockHeimdallClient{
+		events: []*clerk.EventRecordWithTime{
+			{
+				EventRecord: clerk.EventRecord{ID: 1, Contract: common.HexToAddress("0x1001"), Data: []byte{0x01}, ChainID: "1"},
+				Time:        now.Add(-10 * time.Second),
+			},
+		},
+	})
+
+	genesis := chain.HeaderChain().GetHeaderByNumber(0)
+	header := &types.Header{Number: big.NewInt(16), ParentHash: genesis.Hash(), Time: uint64(now.Unix())}
+	cx := statefull.ChainContext{Chain: chain.HeaderChain(), Bor: b}
+
+	// Plain state (regeneration, miner, eth_simulateV1): no tracer, rest of the
+	// engine config preserved.
+	_, err := b.CommitStates(newStateDBForTest(t, genesis.Root), header, cx)
+	require.NoError(t, err)
+	require.Len(t, gc.captured, 1)
+	require.Nil(t, gc.captured[0].Tracer)
+	require.True(t, gc.captured[0].NoBaseFee)
+
+	// Hooked state (canonical import with a live tracer): traced with the hooks
+	// tracing the state itself.
+	gc.captured = nil
+	importHooks := &tracing.Hooks{}
+	_, err = b.CommitStates(state.NewHookedState(newStateDBForTest(t, genesis.Root), importHooks), header, cx)
+	require.NoError(t, err)
+	require.Len(t, gc.captured, 1)
+	require.Same(t, importHooks, gc.captured[0].Tracer)
+}

core/parallel_state_processor.go

@@ -301,7 +301,17 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
 
 	context := NewEVMBlockContext(header, p.bc.hc, author)
 
-	vmenv := vm.NewEVM(context, statedb, config, cfg)
+	// Mirror the serial processor: when the caller configured a tracer, run the
+	// pre-execution system calls and bor system transactions (span commits and
+	// state-sync events, via Finalize below) over a hooked state so they are
+	// traced with the caller's hooks and the tracer's VMContext reports the
+	// same state instance those calls mutate.
+	var tracingStateDB = vm.StateDB(statedb)
+	if hooks := cfg.Tracer; hooks != nil {
+		tracingStateDB = state.NewHookedState(statedb, hooks)
+	}
+
+	vmenv := vm.NewEVM(context, tracingStateDB, config, cfg)
 
 	if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
 		ProcessBeaconBlockRoot(*beaconRoot, vmenv)
@@ -404,11 +414,27 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
 	// Polygon/bor: EIP-6110, EIP-7002, and EIP-7251 are not supported
 	var requests [][]byte
 
+	// State-sync transactions (post-Madhugiri) are the last tx in body. In order to produce
+	// accurate traces for state-sync transactions, we fire the OnTxStart and OnTxEnd hooks
+	// here before calling Finalize, mirroring the serial processor.
+	var (
+		hasStateSyncTx   = len(txs) > 0 && txs[len(txs)-1].Type() == types.StateSyncTxType
+		stateSyncReceipt *types.Receipt
+		stateSyncEndErr  error
+	)
+	if hooks := cfg.Tracer; hooks != nil && hasStateSyncTx && hooks.OnTxStart != nil && hooks.OnTxEnd != nil {
+		hooks.OnTxStart(vmenv.GetVMContext(), txs[len(txs)-1], params.BorSystemAddress)
+		defer func() {
+			hooks.OnTxEnd(stateSyncReceipt, stateSyncEndErr)
+		}()
+	}
+
 	// Finalize the block, applying any consensus engine specific extras (e.g. block rewards), apply
 	// state sync event (if any), and append the receipt.
 	receiptsCountBeforeFinalize := len(receipts)
-	receipts, err = p.chain.Engine().Finalize(p.bc.hc, header, statedb, block.Body(), receipts)
+	receipts, err = p.chain.Engine().Finalize(p.bc.hc, header, tracingStateDB, block.Body(), receipts)
 	if err != nil {
+		stateSyncEndErr = err
 		return nil, err
 	}
 
@@ -417,12 +443,14 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
 		// Defense-in-depth: if insertStateSyncTransactionAndCalculateReceipt silently failed
 		// to add the receipt, the count will be off.
 		if len(block.Transactions()) != len(receipts) {
-			return nil, fmt.Errorf("%w: receipt count mismatch, txs=%d receipts=%d", ErrStateSyncMismatch, len(block.Transactions()), len(receipts))
+			stateSyncEndErr = fmt.Errorf("%w: receipt count mismatch, txs=%d receipts=%d", ErrStateSyncMismatch, len(block.Transactions()), len(receipts))
+			return nil, stateSyncEndErr
 		}
 		appliedNewStateSyncReceipt := receiptsCountBeforeFinalize+1 == len(receipts)
 
 		if appliedNewStateSyncReceipt {
 			allLogs = append(allLogs, receipts[len(receipts)-1].Logs...)
+			stateSyncReceipt = receipts[len(receipts)-1]
 		}
 	}
 

core/state/statedb_hooked.go

@@ -309,3 +309,8 @@ func (s *hookedStateDB) Logs() []*types.Log {
 func (s *hookedStateDB) Inner() *StateDB {
 	return s.inner
 }
+
+// Hooks returns the tracing hooks this state emits to.
+func (s *hookedStateDB) Hooks() *tracing.Hooks {
+	return s.hooks
+}