blobtx mining pass

consensus/parlia/parlia.go

@@ -1503,7 +1503,7 @@ func (p *Parlia) Seal(chain consensus.ChainHeaderReader, block *types.Block, res
 		}
 
 		select {
-		case results <- block.WithSeal(header):
+		case results <- block.WithSeal(header).WithBlobs(block.Blobs()):
 		default:
 			log.Warn("Sealing result is not read by miner", "sealhash", types.SealHash(header, p.chainConfig.ChainID))
 		}

core/block_validator.go

@@ -96,7 +96,7 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 		},
 		func() error {
 			// Withdrawals are present after the Shanghai fork.
-			if header.WithdrawalsHash != nil {
+			if (header.WithdrawalsHash != nil && *header.WithdrawalsHash != common.Hash{}) {
 				// Withdrawals list must be present in body after Shanghai.
 				if block.Withdrawals() == nil {
 					return errors.New("missing withdrawals in block body")

core/data_availability.go

@@ -2,7 +2,6 @@ package core
 
 import (
 	"crypto/sha256"
-	"errors"
 	"fmt"
 	"sync"
 
@@ -74,7 +73,7 @@ func IsDataAvailable(chain consensus.ChainHeaderReader, block *types.Block) (err
 	}
 	blobs := block.Blobs()
 	if len(versionedHashes) != len(blobs) {
-		return errors.New("blobs do not match the versionedHashes length")
+		return fmt.Errorf("blob info mismatch: blobs %d, versionedHashes:%d", len(blobs), len(versionedHashes))
 	}
 
 	// check blob amount

core/evm.go

@@ -18,7 +18,6 @@ package core
 
 import (
 	"math/big"
-	"reflect"
 
 	"github.com/ethereum/go-ethereum/params"
 
@@ -62,7 +61,11 @@ func NewEVMBlockContext(header *types.Header, chain ChainContext, author *common
 		baseFee = new(big.Int).Set(header.BaseFee)
 	}
 	if header.ExcessBlobGas != nil {
-		blobBaseFee = eip4844.CalcBlobFee(*header.ExcessBlobGas, getChainConfig(chain))
+		var config *params.ChainConfig
+		if chain != nil {
+			config = chain.Config()
+		}
+		blobBaseFee = eip4844.CalcBlobFee(*header.ExcessBlobGas, config)
 	}
 	if header.Difficulty.Cmp(common.Big0) == 0 {
 		random = &header.MixDigest
@@ -145,10 +148,3 @@ func Transfer(db vm.StateDB, sender, recipient common.Address, amount *uint256.I
 	db.SubBalance(sender, amount)
 	db.AddBalance(recipient, amount)
 }
-
-func getChainConfig(bc ChainContext) *params.ChainConfig {
-	if bc == nil || reflect.ValueOf(bc).IsNil() {
-		return nil
-	}
-	return bc.Config()
-}

eth/protocols/eth/broadcast.go

@@ -33,9 +33,8 @@ const (
 // blockPropagation is a block propagation event, waiting for its turn in the
 // broadcast queue.
 type blockPropagation struct {
-	block    *types.Block
-	td       *big.Int
-	sidecars types.BlobTxSidecars `rlp:"optional"`
+	block *types.Block
+	td    *big.Int
 }
 
 // broadcastBlocks is a write loop that multiplexes blocks and block announcements
@@ -48,11 +47,7 @@ func (p *Peer) broadcastBlocks() {
 			if err := p.SendNewBlock(prop.block, prop.td); err != nil {
 				return
 			}
-			if len(prop.sidecars) > 0 {
-				p.Log().Trace("Propagated block", "number", prop.block.Number(), "hash", prop.block.Hash(), "td", prop.td, "sidecars", prop.sidecars.Len())
-			} else {
-				p.Log().Trace("Propagated block", "number", prop.block.Number(), "hash", prop.block.Hash(), "td", prop.td)
-			}
+			p.Log().Trace("Propagated block", "number", prop.block.Number(), "hash", prop.block.Hash(), "td", prop.td, "sidecars", len(prop.block.Blobs()))
 
 		case block := <-p.queuedBlockAnns:
 			if err := p.SendNewBlockHashes([]common.Hash{block.Hash()}, []uint64{block.NumberU64()}); err != nil {

eth/protocols/eth/peer.go

@@ -316,9 +316,8 @@ func (p *Peer) SendNewBlock(block *types.Block, td *big.Int) error {
 // the peer's broadcast queue is full, the event is silently dropped.
 func (p *Peer) AsyncSendNewBlock(block *types.Block, td *big.Int) {
 	bp := &blockPropagation{
-		block:    block,
-		td:       td,
-		sidecars: block.Blobs(),
+		block: block,
+		td:    td,
 	}
 
 	select {

miner/worker.go

@@ -993,6 +993,12 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 			header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil)
 		}
 	}
+	// Run the consensus preparation with the default or customized consensus engine.
+	// Note that the `header.Time` may be changed.
+	if err := w.engine.Prepare(w.chain, header); err != nil {
+		log.Error("Failed to prepare header for sealing", "err", err)
+		return nil, err
+	}
 	// Apply EIP-4844, EIP-4788.
 	if w.chainConfig.IsCancun(header.Number, header.Time) {
 		var excessBlobGas uint64
@@ -1011,11 +1017,6 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 			header.ParentBeaconRoot = genParams.beaconRoot
 		}
 	}
-	// Run the consensus preparation with the default or customized consensus engine.
-	if err := w.engine.Prepare(w.chain, header); err != nil {
-		log.Error("Failed to prepare header for sealing", "err", err)
-		return nil, err
-	}
 	// Could potentially happen if starting to mine in an odd state.
 	// Note genParams.coinbase can be different with header.Coinbase
 	// since clique algorithm can modify the coinbase field in header.