nit

Author: Thegaram

cmd/evm/internal/t8ntool/execution.go

@@ -150,7 +150,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 	}
 	// Apply Scroll hard fork state transitions on state
 	misc.ApplyForkStateTransitions(chainConfig, statedb, pre.Env.Number, pre.Env.Timestamp, pre.Env.ParentTimestamp)
-	// Apply EIP-2935
+	// Apply EIP-2935: Insert parent hash in history contract.
 	if pre.Env.BlockHashes != nil && chainConfig.IsFeynman(pre.Env.Timestamp) {
 		var (
 			prevNumber = pre.Env.Number - 1

consensus/misc/curie.go

@@ -7,9 +7,9 @@ import (
 	"github.com/scroll-tech/go-ethereum/rollup/rcfg"
 )
 
-// ApplyCurieHardFork modifies the state database according to the Curie hard-fork rules,
+// applyCurieHardFork modifies the state database according to the Curie hard-fork rules,
 // updating the bytecode and storage of the L1GasPriceOracle contract.
-func ApplyCurieHardFork(statedb *state.StateDB) {
+func applyCurieHardFork(statedb *state.StateDB) {
 	log.Info("Applying Curie hard fork")
 
 	// update contract byte code

consensus/misc/feynman.go

@@ -7,9 +7,9 @@ import (
 	"github.com/scroll-tech/go-ethereum/rollup/rcfg"
 )
 
-// ApplyFeynmanHardFork modifies the state database according to the Feynman hard-fork rules,
+// applyFeynmanHardFork modifies the state database according to the Feynman hard-fork rules,
 // updating the bytecode and storage of the L1GasPriceOracle contract.
-func ApplyFeynmanHardFork(statedb *state.StateDB) {
+func applyFeynmanHardFork(statedb *state.StateDB) {
 	log.Info("Applying Feynman hard fork")
 
 	// update contract byte code

consensus/misc/forks.go

@@ -49,14 +49,14 @@ func VerifyForkHashes(config *params.ChainConfig, header *types.Header, uncle bo
 func ApplyForkStateTransitions(config *params.ChainConfig, statedb *state.StateDB, blockNumber, blockTimestamp, parentTimestamp uint64) {
 	// Apply Curie hard fork
 	if config.CurieBlock != nil && config.CurieBlock.Cmp(new(big.Int).SetUint64(blockNumber)) == 0 {
-		ApplyCurieHardFork(statedb)
+		applyCurieHardFork(statedb)
 	}
 	// Apply Feynman hard fork
 	if config.IsFeynmanTransitionBlock(blockTimestamp, parentTimestamp) {
-		ApplyFeynmanHardFork(statedb)
+		applyFeynmanHardFork(statedb)
 	}
 	// Apply GalileoV2 hard fork
 	if config.IsGalileoV2TransitionBlock(blockTimestamp, parentTimestamp) {
-		ApplyGalileoV2HardFork(statedb)
+		applyGalileoV2HardFork(statedb)
 	}
 }

consensus/misc/galileoV2.go

@@ -7,9 +7,9 @@ import (
 	"github.com/scroll-tech/go-ethereum/rollup/rcfg"
 )
 
-// ApplyGalileoV2HardFork modifies the state database according to the GalileoV2 hard-fork rules,
+// applyGalileoV2HardFork modifies the state database according to the GalileoV2 hard-fork rules,
 // updating the bytecode and storage of the L1GasPriceOracle contract.
-func ApplyGalileoV2HardFork(statedb *state.StateDB) {
+func applyGalileoV2HardFork(statedb *state.StateDB) {
 	log.Info("Applying GalileoV2 hard fork")
 
 	// update contract byte code

core/chain_makers.go

@@ -247,7 +247,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
 			misc.ApplyDAOHardFork(statedb)
 		}
 		// Apply Scroll hard fork state transitions on state
-		misc.ApplyForkStateTransitions(config, statedb, b.header.Number.Uint64(), b.header.Time, parent.Time())
+		misc.ApplyForkStateTransitions(config, statedb, b.header.Number.Uint64(), b.Time(), parent.Time())
 		// Execute any user modifications to the block
 		if gen != nil {
 			gen(i, b)

core/state_processor.go

@@ -91,7 +91,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 	// Apply Scroll hard fork state transitions on state
 	parent := p.bc.GetHeaderByHash(block.ParentHash())
 	misc.ApplyForkStateTransitions(p.config, statedb, blockNumber.Uint64(), blockTime, parent.Time)
-	// Apply EIP-2935
+	// Apply EIP-2935: Insert parent hash in history contract.
 	blockContext := NewEVMBlockContext(header, p.bc, p.config, nil)
 	vmenv := vm.NewEVM(blockContext, vm.TxContext{}, statedb, p.config, cfg)
 	processorBlockTransactionGauge.Update(int64(block.Transactions().Len()))

eth/state_accessor.go

@@ -179,7 +179,7 @@ func (eth *Ethereum) stateAtTransaction(block *types.Block, txIndex int, reexec
 	}
 	// Apply Scroll hard fork state transitions on state
 	misc.ApplyForkStateTransitions(eth.blockchain.Config(), statedb, block.NumberU64(), block.Time(), parent.Time())
-	// If feynman hardfork, insert parent block hash in the state as per EIP-2935.
+	// Apply EIP-2935: Insert parent hash in history contract.
 	if eth.blockchain.Config().IsFeynman(block.Time()) {
 		context := core.NewEVMBlockContext(block.Header(), eth.blockchain, eth.blockchain.Config(), nil)
 		vmenv := vm.NewEVM(context, vm.TxContext{}, statedb, eth.blockchain.Config(), vm.Config{})

eth/tracers/api.go

@@ -205,7 +205,7 @@ type txTraceResult struct {
 type blockTraceTask struct {
 	statedb     *state.StateDB   // Intermediate state prepped for tracing
 	block       *types.Block     // Block to trace the transactions from
-	parentBlock *types.Block     // Block to trace the transactions from
+	parentBlock *types.Block     // Parent block of the block to trace
 	rootref     common.Hash      // Trie root reference held for this task
 	results     []*txTraceResult // Trace results procudes by the task
 }
@@ -283,7 +283,7 @@ func (api *API) traceChain(ctx context.Context, start, end *types.Block, config
 				// Apply Scroll hard fork state transitions on state
 				misc.ApplyForkStateTransitions(api.backend.ChainConfig(), task.statedb, task.block.NumberU64(), task.block.Time(), task.parentBlock.Time())
 
-				// EIP-2935: Insert parent hash in history contract.
+				// Apply EIP-2935: Insert parent hash in history contract.
 				if api.backend.ChainConfig().IsFeynman(task.block.Time()) {
 					evm := vm.NewEVM(blockCtx, vm.TxContext{}, task.statedb, api.backend.ChainConfig(), vm.Config{})
 					core.ProcessParentBlockHash(task.block.ParentHash(), evm, task.statedb)
@@ -555,7 +555,7 @@ func (api *API) IntermediateRoots(ctx context.Context, hash common.Hash, config
 	// Apply Scroll hard fork state transitions on state
 	misc.ApplyForkStateTransitions(api.backend.ChainConfig(), statedb, block.NumberU64(), block.Time(), parent.Time())
 
-	// EIP-2935: Insert parent hash in history contract.
+	// Apply EIP-2935: Insert parent hash in history contract.
 	if api.backend.ChainConfig().IsFeynman(block.Time()) {
 		vmenv := vm.NewEVM(vmctx, vm.TxContext{}, statedb, chainConfig, vm.Config{})
 		core.ProcessParentBlockHash(block.ParentHash(), vmenv, statedb)
@@ -639,7 +639,7 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
 	// Apply Scroll hard fork state transitions on state
 	misc.ApplyForkStateTransitions(api.backend.ChainConfig(), statedb, block.NumberU64(), block.Time(), parent.Time())
 
-	// EIP-2935: Insert parent hash in history contract.
+	// Apply EIP-2935: Insert parent hash in history contract.
 	if api.backend.ChainConfig().IsFeynman(block.Time()) {
 		evm := vm.NewEVM(blockCtx, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})
 		core.ProcessParentBlockHash(block.ParentHash(), evm, statedb)
@@ -783,7 +783,7 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
 	// Apply Scroll hard fork state transitions on state
 	misc.ApplyForkStateTransitions(api.backend.ChainConfig(), statedb, block.NumberU64(), block.Time(), parent.Time())
 
-	// EIP-2935: Insert parent hash in history contract.
+	// Apply EIP-2935: Insert parent hash in history contract.
 	if api.backend.ChainConfig().IsFeynman(block.Time()) {
 		evm := vm.NewEVM(vmctx, vm.TxContext{}, statedb, api.backend.ChainConfig(), vm.Config{})
 		core.ProcessParentBlockHash(block.ParentHash(), evm, statedb)

miner/scroll_worker.go

@@ -633,7 +633,7 @@ func (w *worker) handleForks(parent *types.Block) (bool, error) {
 	// Apply Scroll hard fork state transitions on state
 	misc.ApplyForkStateTransitions(w.chainConfig, w.current.state, w.current.header.Number.Uint64(), w.current.header.Time, parent.Time())
 
-	// Apply EIP-2935
+	// Apply EIP-2935: Insert parent hash in history contract.
 	if w.chainConfig.IsFeynman(w.current.header.Time) {
 		context := core.NewEVMBlockContext(w.current.header, w.chain, w.chainConfig, nil)
 		vmenv := vm.NewEVM(context, vm.TxContext{}, w.current.state, w.chainConfig, vm.Config{})