Switch block Difficulty/Number/BaseFee from big.Int to uint256 (#17999)

Also, this PR simplifies `rpc/gasprice/gasprice.go‎`.

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: yperbasis

cl/cltypes/beacon_block_test.go

@@ -19,7 +19,6 @@ package cltypes
 import (
 	_ "embed"
 	"encoding/json"
-	"math/big"
 	"testing"
 
 	"github.com/holiman/uint256"
@@ -54,7 +53,7 @@ func TestBeaconBody(t *testing.T) {
 	blobKzgCommitments := solid.NewStaticListSSZ[*KZGCommitment](MaxBlobsCommittmentsPerBlock, 48)
 	version := clparams.DenebVersion
 	block := types.NewBlock(&types.Header{
-		BaseFee: big.NewInt(1),
+		BaseFee: uint256.NewInt(1),
 	}, []types.Transaction{types.NewTransaction(1, [20]byte{}, uint256.NewInt(1), 5, uint256.NewInt(2), nil)}, nil, nil, types.Withdrawals{&types.Withdrawal{
 		Index: 69,
 	}})

cl/cltypes/eth1_block.go

@@ -19,7 +19,6 @@ package cltypes
 import (
 	"encoding/json"
 	"fmt"
-	"math/big"
 
 	"github.com/holiman/uint256"
 
@@ -312,7 +311,7 @@ func (b *Eth1Block) RlpHeader(parentRoot *common.Hash, executionReqHash common.H
 	for i, j := 0, len(reversedBaseFeePerGas)-1; i < j; i, j = i+1, j-1 {
 		reversedBaseFeePerGas[i], reversedBaseFeePerGas[j] = reversedBaseFeePerGas[j], reversedBaseFeePerGas[i]
 	}
-	baseFee := new(big.Int).SetBytes(reversedBaseFeePerGas)
+	baseFee := new(uint256.Int).SetBytes(reversedBaseFeePerGas)
 	// If the block version is Capella or later, calculate the withdrawals hash.
 	var withdrawalsHash *common.Hash
 	if b.version >= clparams.CapellaVersion {
@@ -338,8 +337,7 @@ func (b *Eth1Block) RlpHeader(parentRoot *common.Hash, executionReqHash common.H
 		TxHash:                types.DeriveSha(types.BinaryTransactions(b.Transactions.UnderlyngReference())),
 		ReceiptHash:           b.ReceiptsRoot,
 		Bloom:                 b.LogsBloom,
-		Difficulty:            merge.ProofOfStakeDifficulty,
-		Number:                new(big.Int).SetUint64(b.BlockNumber),
+		Difficulty:            *merge.ProofOfStakeDifficulty,
 		GasLimit:              b.GasLimit,
 		GasUsed:               b.GasUsed,
 		Time:                  b.Time,
@@ -350,6 +348,7 @@ func (b *Eth1Block) RlpHeader(parentRoot *common.Hash, executionReqHash common.H
 		WithdrawalsHash:       withdrawalsHash,
 		ParentBeaconBlockRoot: parentRoot,
 	}
+	header.Number.SetUint64(b.BlockNumber)
 
 	if b.version >= clparams.DenebVersion {
 		blobGasUsed := b.BlobGasUsed

cl/phase1/execution_client/execution_client_rpc.go

@@ -25,6 +25,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/holiman/uint256"
+
 	"github.com/erigontech/erigon/cl/clparams"
 	"github.com/erigontech/erigon/cl/cltypes"
 	"github.com/erigontech/erigon/cl/phase1/execution_client/rpc_helper"
@@ -85,7 +87,7 @@ func (cc *ExecutionClientRpc) NewPayload(
 	for i, j := 0, len(reversedBaseFeePerGas)-1; i < j; i, j = i+1, j-1 {
 		reversedBaseFeePerGas[i], reversedBaseFeePerGas[j] = reversedBaseFeePerGas[j], reversedBaseFeePerGas[i]
 	}
-	baseFee := new(big.Int).SetBytes(reversedBaseFeePerGas)
+	baseFee := new(uint256.Int).SetBytes(reversedBaseFeePerGas)
 	var engineMethod string
 	// determine the engine method
 	switch payload.Version() {
@@ -117,8 +119,7 @@ func (cc *ExecutionClientRpc) NewPayload(
 		BlockHash:    payload.BlockHash,
 	}
 
-	request.BaseFeePerGas = new(hexutil.Big)
-	*request.BaseFeePerGas = hexutil.Big(*baseFee)
+	request.BaseFeePerGas = (*hexutil.Big)(baseFee.ToBig())
 	payloadBody := payload.Body()
 	// Setup transactionbody
 	request.Withdrawals = payloadBody.Withdrawals

cmd/evm/internal/t8ntool/execution.go

@@ -20,8 +20,6 @@
 package t8ntool
 
 import (
-	"math/big"
-
 	"github.com/holiman/uint256"
 
 	"github.com/erigontech/erigon/common"
@@ -51,17 +49,17 @@ type ommer struct {
 //go:generate gencodec -type stEnv -field-override stEnvMarshaling -out gen_stenv.go
 type stEnv struct {
 	Coinbase         common.Address                      `json:"currentCoinbase"   gencodec:"required"`
-	Difficulty       *big.Int                            `json:"currentDifficulty"`
-	Random           *big.Int                            `json:"currentRandom"`
+	Difficulty       *uint256.Int                        `json:"currentDifficulty"`
+	Random           *uint256.Int                        `json:"currentRandom"`
 	MixDigest        common.Hash                         `json:"mixHash,omitempty"`
-	ParentDifficulty *big.Int                            `json:"parentDifficulty"`
+	ParentDifficulty *uint256.Int                        `json:"parentDifficulty"`
 	GasLimit         uint64                              `json:"currentGasLimit"   gencodec:"required"`
 	Number           uint64                              `json:"currentNumber"     gencodec:"required"`
 	Timestamp        uint64                              `json:"currentTimestamp"  gencodec:"required"`
 	ParentTimestamp  uint64                              `json:"parentTimestamp,omitempty"`
 	BlockHashes      map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
 	Ommers           []ommer                             `json:"ommers,omitempty"`
-	BaseFee          *big.Int                            `json:"currentBaseFee,omitempty"`
+	BaseFee          *uint256.Int                        `json:"currentBaseFee,omitempty"`
 	ParentUncleHash  common.Hash                         `json:"parentUncleHash"`
 	UncleHash        common.Hash                         `json:"uncleHash,omitempty"`
 	Withdrawals      []*types.Withdrawal                 `json:"withdrawals,omitempty"`
@@ -116,7 +114,7 @@ func MakePreState(chainRules *chain.Rules, tx kv.TemporalRwTx, sd *execctx.Share
 // parent timestamp + difficulty.
 // Note: this method only works for ethash engine.
 func calcDifficulty(config *chain.Config, number, currentTime, parentTime uint64,
-	parentDifficulty *big.Int, parentUncleHash common.Hash) *big.Int {
+	parentDifficulty uint256.Int, parentUncleHash common.Hash) *uint256.Int {
 	uncleHash := parentUncleHash
 	if uncleHash == (common.Hash{}) {
 		uncleHash = empty.UncleHash
@@ -125,8 +123,9 @@ func calcDifficulty(config *chain.Config, number, currentTime, parentTime uint64
 		ParentHash: common.Hash{},
 		UncleHash:  uncleHash,
 		Difficulty: parentDifficulty,
-		Number:     new(big.Int).SetUint64(number - 1), // nolint:govet
 		Time:       parentTime,
 	}
-	return ethash.CalcDifficulty(config, currentTime, parent.Time, parent.Difficulty, number-1, parent.UncleHash)
+	parent.Number.SetUint64(number - 1)
+	diff := ethash.CalcDifficulty(config, currentTime, parent.Time, parent.Difficulty, number-1, parent.UncleHash)
+	return &diff
 }

cmd/evm/internal/t8ntool/gen_stenv.go

@@ -271,18 +271,18 @@ func Main(ctx *cli.Context) error {
 				env.Timestamp, env.ParentTimestamp))
 		}
 		prestate.Env.Difficulty = calcDifficulty(chainConfig, env.Number, env.Timestamp,
-			env.ParentTimestamp, env.ParentDifficulty, env.ParentUncleHash)
+			env.ParentTimestamp, *env.ParentDifficulty, env.ParentUncleHash)
 	}
 
 	// manufacture block from above inputs
 	header := NewHeader(prestate.Env)
 
 	var ommerHeaders = make([]*types.Header, len(prestate.Env.Ommers))
-	header.Number.Add(header.Number, big.NewInt(int64(len(prestate.Env.Ommers))))
+	header.Number.AddUint64(&header.Number, uint64(len(prestate.Env.Ommers)))
 	for i, ommer := range prestate.Env.Ommers {
-		var ommerN big.Int
+		var ommerN uint256.Int
 		ommerN.SetUint64(header.Number.Uint64() - ommer.Delta)
-		ommerHeaders[i] = &types.Header{Coinbase: ommer.Address, Number: &ommerN}
+		ommerHeaders[i] = &types.Header{Coinbase: ommer.Address, Number: ommerN}
 	}
 	block := types.NewBlock(header, txs, ommerHeaders, nil /* receipts */, prestate.Env.Withdrawals)
 
@@ -628,9 +628,11 @@ func dispatchOutput(ctx *cli.Context, baseDir string, result *protocol.Ephemeral
 func NewHeader(env stEnv) *types.Header {
 	var header types.Header
 	header.Coinbase = env.Coinbase
-	header.Difficulty = env.Difficulty
+	if env.Difficulty != nil {
+		header.Difficulty = *env.Difficulty
+	}
 	header.GasLimit = env.GasLimit
-	header.Number = new(big.Int).SetUint64(env.Number)
+	header.Number.SetUint64(env.Number)
 	header.Time = env.Timestamp
 	header.BaseFee = env.BaseFee
 	header.MixDigest = env.MixDigest

cmd/evm/internal/t8ntool/transition.go

@@ -25,7 +25,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"math/big"
 	"os"
 	goruntime "runtime"
 	"runtime/pprof"
@@ -265,9 +264,9 @@ func runCmd(ctx *cli.Context) error {
 		GasPrice:    *gasPrice,
 		Value:       *value,
 		Difficulty:  genesisConfig.Difficulty,
-		Time:        new(big.Int).SetUint64(genesisConfig.Timestamp),
+		Time:        genesisConfig.Timestamp,
 		Coinbase:    accounts.InternAddress(genesisConfig.Coinbase),
-		BlockNumber: new(big.Int).SetUint64(genesisConfig.Number),
+		BlockNumber: genesisConfig.Number,
 	}
 
 	if tracer != nil {
@@ -329,8 +328,8 @@ func runCmd(ctx *cli.Context) error {
 		rules := &chain.Rules{}
 		if chainConfig != nil {
 			blockContext := evmtypes.BlockContext{
-				BlockNumber: runtimeConfig.BlockNumber.Uint64(),
-				Time:        runtimeConfig.Time.Uint64(),
+				BlockNumber: runtimeConfig.BlockNumber,
+				Time:        runtimeConfig.Time,
 			}
 			rules = blockContext.Rules(chainConfig)
 		}

cmd/evm/runner.go

@@ -3,9 +3,10 @@ package testing
 import (
 	"math/big"
 
+	"github.com/holiman/uint256"
+
 	"github.com/erigontech/erigon/common"
 	"github.com/erigontech/erigon/execution/types"
-	"github.com/holiman/uint256"
 )
 
 type TestingStruct struct {

cmd/rlpgen/testing/testing_struct.go

@@ -21,7 +21,6 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	"math/big"
 	"net"
 	"net/http"
 	"net/url"
@@ -30,6 +29,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/holiman/uint256"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sync/semaphore"
@@ -1128,7 +1128,7 @@ func (e *remoteRulesEngine) SealHash(_ *types.Header) common.Hash {
 	panic("remoteRulesEngine.SealHash not supported")
 }
 
-func (e *remoteRulesEngine) CalcDifficulty(_ rules.ChainHeaderReader, _ uint64, _ uint64, _ *big.Int, _ uint64, _ common.Hash, _ common.Hash, _ uint64) *big.Int {
+func (e *remoteRulesEngine) CalcDifficulty(_ rules.ChainHeaderReader, _ uint64, _ uint64, _ uint256.Int, _ uint64, _ common.Hash, _ common.Hash, _ uint64) uint256.Int {
 	panic("remoteRulesEngine.CalcDifficulty not supported")
 }
 

cmd/rpcdaemon/cli/config.go

@@ -59,16 +59,16 @@ type BlockJson struct {
 	TxHash      common.Hash      `json:"transactionsRoot" gencodec:"required"`
 	ReceiptHash common.Hash      `json:"receiptsRoot"     gencodec:"required"`
 	Bloom       types.Bloom      `json:"logsBloom"        gencodec:"required"`
-	Difficulty  *hexutil.Big     `json:"difficulty"       gencodec:"required"`
-	Number      *hexutil.Big     `json:"number"           gencodec:"required"`
+	Difficulty  uint256.Int      `json:"difficulty"       gencodec:"required"`
+	Number      uint256.Int      `json:"number"           gencodec:"required"`
 	GasLimit    hexutil.Uint64   `json:"gasLimit"         gencodec:"required"`
 	GasUsed     hexutil.Uint64   `json:"gasUsed"          gencodec:"required"`
 	Time        hexutil.Uint64   `json:"timestamp"        gencodec:"required"`
 	Extra       hexutil.Bytes    `json:"extraData"        gencodec:"required"`
 	MixDigest   common.Hash      `json:"mixHash"` // prevRandao after EIP-4399
 	Nonce       types.BlockNonce `json:"nonce"`
 
-	BaseFee         *hexutil.Big    `json:"baseFeePerGas"`   // EIP-1559
+	BaseFee         *uint256.Int    `json:"baseFeePerGas"`   // EIP-1559
 	WithdrawalsHash *common.Hash    `json:"withdrawalsRoot"` // EIP-4895
 	BlobGasUsed     *hexutil.Uint64 `json:"blobGasUsed"`
 	ExcessBlobGas   *hexutil.Uint64 `json:"excessBlobGas"`
@@ -359,15 +359,15 @@ func getBlockByNumber(client *rpc.Client, blockNumber *big.Int, verify bool) (*t
 		TxHash:          block.TxHash,
 		ReceiptHash:     block.ReceiptHash,
 		Bloom:           block.Bloom,
-		Difficulty:      (*big.Int)(block.Difficulty),
-		Number:          (*big.Int)(block.Number),
+		Difficulty:      block.Difficulty,
+		Number:          block.Number,
 		GasLimit:        block.GasLimit.Uint64(),
 		GasUsed:         block.GasUsed.Uint64(),
 		Time:            block.Time.Uint64(),
 		Extra:           block.Extra,
 		MixDigest:       block.MixDigest,
 		Nonce:           block.Nonce,
-		BaseFee:         (*big.Int)(block.BaseFee),
+		BaseFee:         block.BaseFee,
 		WithdrawalsHash: block.WithdrawalsHash,
 		BlobGasUsed:     (*uint64)(block.BlobGasUsed),
 		ExcessBlobGas:   (*uint64)(block.ExcessBlobGas),