From 0f2807038396b2e2f9aa4a88e77bb970efc97bb7 Mon Sep 17 00:00:00 2001
From: lightclient <lightclient@protonmail.com>
Date: Thu, 13 Mar 2025 09:24:13 -0600
Subject: [PATCH] all: review feedback from marius

---
 cmd/evm/internal/t8ntool/transition.go | 2 +-
 core/state_transition.go               | 4 ++--
 eth/tracers/api.go                     | 8 ++++----
 internal/ethapi/api.go                 | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
index e946ccddd5..0c7cebd9fe 100644
--- a/cmd/evm/internal/t8ntool/transition.go
+++ b/cmd/evm/internal/t8ntool/transition.go
@@ -245,7 +245,7 @@ func applyMergeChecks(env *stEnv, chainConfig *params.ChainConfig) error {
 	switch {
 	case env.Random == nil:
 		return NewError(ErrorConfig, errors.New("post-merge requires currentRandom to be defined in env"))
-	case env.Difficulty != nil && env.Difficulty.BitLen() != 0:
+	case env.Difficulty != nil && env.Difficulty.Sign() != 0:
 		return NewError(ErrorConfig, errors.New("post-merge difficulty must be zero (or omitted) in env"))
 	}
 	env.Difficulty = nil
diff --git a/core/state_transition.go b/core/state_transition.go
index c325df8fa2..0829e6ff71 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -135,11 +135,11 @@ func TransactionToMessage(tx *types.Transaction, s types.Signer, baseFee *big.In
 		}
 	}
 	// Fill in intrinsic gas.
-	gas, err := tx.IntrinsicGas(rules)
+	intrinsicGas, err := tx.IntrinsicGas(rules)
 	if err != nil {
 		return nil, err
 	}
-	msg.IntrinsicGas = gas
+	msg.IntrinsicGas = intrinsicGas
 
 	// Recover sender.
 	msg.From, err = types.Sender(s, tx)
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index 783aac1023..f8b7e70d85 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -269,7 +269,7 @@ func (api *API) traceChain(start, end *types.Block, config *TraceConfig, closed
 				var (
 					signer   = types.MakeSigner(api.backend.ChainConfig(), task.block.Number(), task.block.Time())
 					blockCtx = core.NewEVMBlockContext(task.block.Header(), api.chainContext(ctx), nil)
-					rules    = api.backend.ChainConfig().Rules(task.block.Number(), task.block.Difficulty().BitLen() == 0, task.block.Time())
+					rules    = api.backend.ChainConfig().Rules(task.block.Number(), blockCtx.Random != nil, task.block.Time())
 				)
 				// Trace all the transactions contained within
 				for i, tx := range task.block.Transactions() {
@@ -657,7 +657,7 @@ func (api *API) traceBlockParallel(ctx context.Context, block *types.Block, stat
 		signer    = types.MakeSigner(api.backend.ChainConfig(), block.Number(), block.Time())
 		results   = make([]*txTraceResult, len(txs))
 		pend      sync.WaitGroup
-		rules     = api.backend.ChainConfig().Rules(block.Number(), block.Difficulty().BitLen() == 0, block.Time())
+		rules     = api.backend.ChainConfig().Rules(block.Number(), block.Difficulty().Sign() == 0, block.Time())
 	)
 	threads := runtime.NumCPU()
 	if threads > len(txs) {
@@ -892,7 +892,7 @@ func (api *API) TraceTransaction(ctx context.Context, hash common.Hash, config *
 		return nil, err
 	}
 	defer release()
-	rules := api.backend.ChainConfig().Rules(block.Number(), block.Difficulty().BitLen() == 0, block.Time())
+	rules := api.backend.ChainConfig().Rules(block.Number(), vmctx.Random != nil, block.Time())
 	msg, err := core.TransactionToMessage(tx, types.MakeSigner(api.backend.ChainConfig(), block.Number(), block.Time()), block.BaseFee(), &rules)
 	if err != nil {
 		return nil, err
@@ -973,7 +973,7 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
 		return nil, err
 	}
 	var (
-		rules       = api.backend.ChainConfig().Rules(block.Number(), block.Difficulty().BitLen() == 0, block.Time())
+		rules       = api.backend.ChainConfig().Rules(block.Number(), vmctx.Random != nil, block.Time())
 		msg         = args.ToMessage(&rules, vmctx.BaseFee, true, true)
 		tx          = args.ToTransaction(types.LegacyTxType)
 		traceConfig *TraceConfig
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index e2e830bcfb..b990aa03fd 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -693,7 +693,7 @@ func applyMessage(ctx context.Context, b Backend, args TransactionArgs, state *s
 	if err := args.CallDefaults(gp.Gas(), blockContext.BaseFee, b.ChainConfig().ChainID); err != nil {
 		return nil, err
 	}
-	rules := b.ChainConfig().Rules(header.Number, header.Difficulty.BitLen() == 0, header.Time)
+	rules := b.ChainConfig().Rules(header.Number, blockContext.Random != nil, header.Time)
 	msg := args.ToMessage(&rules, header.BaseFee, skipChecks, skipChecks)
 	// Lower the basefee to 0 to avoid breaking EVM
 	// invariants (basefee < feecap).
@@ -838,7 +838,7 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 	if err := args.CallDefaults(gasCap, header.BaseFee, b.ChainConfig().ChainID); err != nil {
 		return 0, err
 	}
-	rules := b.ChainConfig().Rules(header.Number, header.Difficulty.BitLen() == 0, header.Time)
+	rules := b.ChainConfig().Rules(header.Number, header.Difficulty.Sign() == 0, header.Time)
 	call := args.ToMessage(&rules, header.BaseFee, true, true)
 
 	// Run the gas estimation and wrap any revertals into a custom return