Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for release v1.5.6 #2895

Merged
merged 2 commits into from
Feb 14, 2025
+20 −2
Merged

Patch for release v1.5.6 #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c662bd
config: update BSC Testnet hardfork date: Pascal & Praque (#2894)
zzzckck Feb 14, 2025
c84a7f8
fix: wait builder's final bid during the peak time (#2892)
Jolly23 Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading