From 96cb2894b405bbe2441dcd63f01ef55a67d3a0fd Mon Sep 17 00:00:00 2001 From: rjl493456442 Date: Tue, 1 Aug 2023 15:09:20 +0800 Subject: [PATCH] core/txpool/blobpool: remove error log when finalized block is nil (#27822) * core/txpool/blobpool: remove error log when finalized block is nil * core/txpool/blobpool: take peter's suggestion --- core/txpool/blobpool/blobpool.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index fb6257b5af462..2888172b32ff6 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -768,8 +768,9 @@ func (p *BlobPool) Reset(oldHead, newHead *types.Header) { } } // Flush out any blobs from limbo that are older than the latest finality - p.limbo.finalize(p.chain.CurrentFinalBlock()) - + if p.chain.Config().IsCancun(p.head.Number, p.head.Time) { + p.limbo.finalize(p.chain.CurrentFinalBlock()) + } // Reset the price heap for the new set of basefee/blobfee pairs var ( basefee = uint256.MustFromBig(misc.CalcBaseFee(p.chain.Config(), newHead))