miner: preserve builder vanity in BidBlock extra-data

Author: flywukong

consensus/parlia/parlia.go

@@ -1179,18 +1179,39 @@ func (p *Parlia) prepareHeader(chain consensus.ChainHeaderReader, header *types.
 		header.MixDigest = common.Hash{}
 	}
 
+	p.fillExtraDataVanity(chain, header)
 	return p.SetExtraData(chain, header)
 }
 
-// SetExtraData rebuilds the validator-controlled extra-data section.
-func (p *Parlia) SetExtraData(chain consensus.ChainHeaderReader, header *types.Header) error {
+// fillExtraDataVanity pads vanity and writes nextForkHash to produce the 32-byte vanity prefix.
+func (p *Parlia) fillExtraDataVanity(chain consensus.ChainHeaderReader, header *types.Header) {
 	if len(header.Extra) < extraVanity-nextForkHashSize {
 		header.Extra = append(header.Extra, bytes.Repeat([]byte{0x00}, extraVanity-nextForkHashSize-len(header.Extra))...)
 	}
-
 	header.Extra = header.Extra[:extraVanity-nextForkHashSize]
 	nextForkHash := forkid.NextForkHash(p.chainConfig, p.genesisHash, chain.GenesisHeader().Time, header.Number.Uint64(), header.Time)
 	header.Extra = append(header.Extra, nextForkHash[:]...)
+}
+
+// VerifyExtraDataVanity checks the nextForkHash inside the 32-byte vanity prefix.
+func (p *Parlia) VerifyExtraDataVanity(chain consensus.ChainHeaderReader, header *types.Header) error {
+	if len(header.Extra) < extraVanity {
+		return fmt.Errorf("extra data too short for vanity prefix: %d < %d", len(header.Extra), extraVanity)
+	}
+	expected := forkid.NextForkHash(p.chainConfig, p.genesisHash, chain.GenesisHeader().Time, header.Number.Uint64(), header.Time)
+	got := header.Extra[extraVanity-nextForkHashSize : extraVanity]
+	if !bytes.Equal(got, expected[:]) {
+		return fmt.Errorf("invalid nextForkHash: got %x, want %x", got, expected)
+	}
+	return nil
+}
+
+// SetExtraData appends validator-set, turnLength and reserved seal space after the 32-byte vanity prefix.
+func (p *Parlia) SetExtraData(chain consensus.ChainHeaderReader, header *types.Header) error {
+	if len(header.Extra) < extraVanity {
+		return fmt.Errorf("extra data too short for vanity prefix: %d < %d", len(header.Extra), extraVanity)
+	}
+	header.Extra = header.Extra[:extraVanity]
 
 	if err := p.prepareValidators(chain, header); err != nil {
 		return err

miner/bid_block.go

@@ -88,10 +88,9 @@ func bindSignBidBlockSystemTxs(
 }
 
 // prepareBidBlockTask signs system txs and assembles a BidBlock task.
-// Validator computes only Extra (SetExtraData here + seal signature in engine.Seal)
-// and TxHash (re-derived after bind-signing the trailing system txs). All other
-// header fields flow from decoded.Header via CopyHeader; any lie is caught by
-// InsertChain.
+// Validator rewrites only the post-vanity portion of Extra (via SetExtraData,
+// + seal signature in Seal) and recomputes TxHash; all other header fields
+// flow verbatim from decoded.Header.
 func (w *worker) prepareBidBlockTask(
 	decoded *types.DecodedBidBlock,
 	start time.Time,
@@ -100,20 +99,16 @@ func (w *worker) prepareBidBlockTask(
 		return nil, errors.New("worker is not running")
 	}
 
-	// preSealVerifyBidBlock already enforced engine == parlia.
 	p := w.engine.(*parlia.Parlia)
 
-	// Shallow-copy the tx slice so bind-signing does not mutate the cached BidBlock.
+	// Copy the tx slice so bind-signing does not mutate the cached BidBlock.
 	allTxs := make([]*types.Transaction, len(decoded.Txs))
 	copy(allTxs, decoded.Txs)
 	if err := bindSignBidBlockSystemTxs(allTxs[decoded.SystemTxStart:], w.chainConfig.ChainID, p); err != nil {
 		return nil, err
 	}
 
 	header := types.CopyHeader(decoded.Header)
-	w.confMu.RLock()
-	header.Extra = common.CopyBytes(w.extra)
-	w.confMu.RUnlock()
 	if err := p.SetExtraData(w.chain, header); err != nil {
 		return nil, err
 	}

miner/bid_simulator.go

@@ -17,7 +17,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/bidutil"
 	"github.com/ethereum/go-ethereum/consensus"
-	"github.com/ethereum/go-ethereum/consensus/misc/eip1559"
 	"github.com/ethereum/go-ethereum/consensus/misc/eip4844"
 	"github.com/ethereum/go-ethereum/consensus/parlia"
 	"github.com/ethereum/go-ethereum/core"
@@ -670,59 +669,31 @@ func (b *bidSimulator) GetBestBidBlock(parentHash common.Hash) *types.DecodedBid
 	return b.bestBidBlock[parentHash]
 }
 
-// preSealVerifyBidBlock validates deterministic header fields before selection.
-// Execution-result fields are deferred to InsertChain.
-// TODO: extract shared deterministic Parlia header checks when this path grows.
+// preSealVerifyBidBlock validates a BidBlock before admission.
 func (b *bidSimulator) preSealVerifyBidBlock(decoded *types.DecodedBidBlock) error {
 	parliaEngine, ok := b.engine.(*parlia.Parlia)
 	if !ok {
 		return errors.New("consensus engine is not parlia")
 	}
-
 	header := decoded.Header
-	// RPC admission checks the parent hash, but pre-seal must not assume the lookup succeeds.
-	parent := b.chain.GetHeaderByHash(header.ParentHash)
-	if parent == nil {
-		return fmt.Errorf("parent header not found: %s", header.ParentHash.Hex())
-	}
 
-	// 1. Coinbase must be the in-turn validator (this node).
-	expectedCoinbase := b.bidWorker.etherbase()
-	if header.Coinbase != expectedCoinbase {
+	if header.Coinbase != b.bidWorker.etherbase() {
 		return fmt.Errorf("invalid coinbase: got %s, want %s",
-			header.Coinbase.Hex(), expectedCoinbase.Hex())
+			header.Coinbase.Hex(), b.bidWorker.etherbase().Hex())
 	}
-
-	// 2. TODO: add full GasLimit bounds check when BidBlock pre-seal rules define it.
-
-	// 3. GasUsed must not exceed GasLimit (consensus hard rule).
-	if header.GasUsed > header.GasLimit {
-		return fmt.Errorf("invalid gasUsed: %d > gasLimit %d", header.GasUsed, header.GasLimit)
+	if err := parliaEngine.VerifyUnsealedHeader(b.chain, header, nil); err != nil {
+		return fmt.Errorf("invalid header: %v", err)
 	}
-
-	// 4. BaseFee must match the EIP-1559 derived value.
-	expectedBaseFee := eip1559.CalcBaseFee(b.chainConfig, parent)
-	if header.BaseFee == nil || header.BaseFee.Cmp(expectedBaseFee) != 0 {
-		return fmt.Errorf("invalid baseFee: got %v, want %v", header.BaseFee, expectedBaseFee)
+	if err := parliaEngine.VerifyExtraDataVanity(b.chain, header); err != nil {
+		return fmt.Errorf("invalid extra-data vanity: %v", err)
 	}
 
-	// 5. Difficulty must be in-turn.
-	if header.Difficulty == nil || header.Difficulty.Cmp(diffInTurn) != 0 {
-		return fmt.Errorf("invalid difficulty: got %v, want %v", header.Difficulty, diffInTurn)
-	}
-
-	// 6. Timestamp must match the deterministic BidBlock time.
-	if err := parliaEngine.VerifyBlockTime(b.chain, header, parent); err != nil {
-		return fmt.Errorf("invalid block time: %v", err)
-	}
-
-	// 7. GasFee is derived from the unsigned deposit tx.
 	decoded.GasFee = parliaEngine.ExtractBidBlockDepositValue(decoded.Txs)
 	if decoded.GasFee.Sign() <= 0 {
 		return errors.New("empty gasFee")
 	}
 
-	// 8. Validate and locate the trailing unsigned system-tx region.
+	parent := b.chain.GetHeaderByHash(header.ParentHash)
 	systemTxStart, err := parliaEngine.VerifyBidBlockSystemTxs(decoded, parent)
 	if err != nil {
 		return err