Merge pull request bnb-chain#2895 from bnb-chain/develop

Patch for release v1.5.6

Author: zzzckck

miner/worker.go

@@ -1391,6 +1391,24 @@ LOOP:
 	// when in-turn, compare with remote work.
 	from := bestWork.coinbase
 	if w.bidFetcher != nil && bestWork.header.Difficulty.Cmp(diffInTurn) == 0 {
+		// We want to start sealing the block as late as possible here if mev is enabled, so we could give builder the chance to send their final bid.
+		// Time left till sealing the block.
+		tillSealingTime := time.Until(time.Unix(int64(bestWork.header.Time), 0)) - w.config.DelayLeftOver
+		if tillSealingTime > max(100*time.Millisecond, w.config.DelayLeftOver) {
+			// Still a lot of time left, wait for the best bid.
+			// This happens during the peak time of the network, the local block building LOOP would break earlier than
+			// the final sealing time by meeting the errBlockInterruptedByOutOfGas criteria.
+
+			log.Info("commitWork local building finished, wait for the best bid", "tillSealingTime", common.PrettyDuration(tillSealingTime))
+			stopTimer.Reset(tillSealingTime)
+			select {
+			case <-stopTimer.C:
+			case <-interruptCh:
+				log.Debug("commitWork interruptCh closed, new block imported or resubmit triggered")
+				return
+			}
+		}
+
 		if pendingBid := w.bidFetcher.GetSimulatingBid(bestWork.header.ParentHash); pendingBid != nil {
 			waitBidTimer := time.NewTimer(waitMEVMinerEndTimeLimit)
 			defer waitBidTimer.Stop()

params/config.go

@@ -235,8 +235,8 @@ var (
 		HaberTime:           newUint64(1716962820), // 2024-05-29 06:07:00 AM UTC
 		HaberFixTime:        newUint64(1719986788), // 2024-07-03 06:06:28 AM UTC
 		BohrTime:            newUint64(1724116996), // 2024-08-20 01:23:16 AM UTC
-		PascalTime:          newUint64(1740021480), // 2025-02-20 03:18:00 AM UTC
-		PragueTime:          newUint64(1740021480), // 2025-02-20 03:18:00 AM UTC
+		PascalTime:          newUint64(1740452880), // 2025-02-25 03:08:00 AM UTC
+		PragueTime:          newUint64(1740452880), // 2025-02-25 03:08:00 AM UTC
 
 		Parlia: &ParliaConfig{
 			Period: 3,