Skip to content

miner: avoid to commit a bid twice #3336

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

Merged
buddh0 merged 6 commits into from
Sep 3, 2025
Merged

miner: avoid to commit a bid twice #3336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1c86b3
miner: avoid to commit a bid twice
allformless Sep 2, 2025
be9131e
core: wait db writing before setting head
allformless Sep 2, 2025
e1204cc
miner: fix comment for tcount
allformless Sep 3, 2025
7f82b17
miner: improve warn log for committed work
allformless Sep 3, 2025
90c4392
miner: add committed flag for environment
allformless Sep 3, 2025
814b8ad
miner: improve func commit
allformless Sep 3, 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
2 changes: 1 addition & 1 deletion core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,6 @@ func (bc *BlockChain) ExportN(w io.Writer, first uint64, last uint64) error {
func (bc *BlockChain) writeHeadBlock(block *types.Block) {
var dbWg sync.WaitGroup
dbWg.Add(2)
defer dbWg.Wait()
go func() {
defer dbWg.Done()
// Add the block to the canonical chain number scheme and mark as the head
Expand All @@ -1423,6 +1422,7 @@ func (bc *BlockChain) writeHeadBlock(block *types.Block) {
log.Crit("Failed to update chain indexes in chain db", "err", err)
}
}()
dbWg.Wait()

// Update all in-memory chain markers in the last step
bc.hc.SetCurrentHeader(block.Header())
Expand Down
10 changes: 5 additions & 5 deletions internal/ethapi/api_mev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ func (m *MevAPI) SendBid(ctx context.Context, args types.BidArgs) (common.Hash,
}

var (
rawBid = args.RawBid
currentHeader = m.b.CurrentHeader() // `currentHeader` might change during use.
rawBid = args.RawBid
currentBlock = m.b.CurrentBlock() // `CurrentBlock` might change during use.
)

if rawBid == nil {
return common.Hash{}, types.NewInvalidBidError("rawBid should not be nil")
}

// only support bidding for the next block not for the future block
if latestBlockNumber := currentHeader.Number.Uint64(); rawBid.BlockNumber < latestBlockNumber+1 {
if latestBlockNumber := currentBlock.Number.Uint64(); rawBid.BlockNumber < latestBlockNumber+1 {
return common.Hash{}, types.NewInvalidBidError(
fmt.Sprintf("stale block number: %d, latest block: %d", rawBid.BlockNumber, latestBlockNumber))
} else if rawBid.BlockNumber > latestBlockNumber+1 {
Expand All @@ -55,9 +55,9 @@ func (m *MevAPI) SendBid(ctx context.Context, args types.BidArgs) (common.Hash,
return common.Hash{}, types.ErrMevNotInTurn
}

if rawBid.ParentHash != currentHeader.Hash() {
if rawBid.ParentHash != currentBlock.Hash() {
return common.Hash{}, types.NewInvalidBidError(
fmt.Sprintf("non-aligned parent hash: %v", currentHeader.Hash()))
fmt.Sprintf("non-aligned parent hash: %v", currentBlock.Hash()))
}

if rawBid.GasFee == nil || rawBid.GasFee.Cmp(common.Big0) == 0 || rawBid.GasUsed == 0 {
Expand Down
40 changes: 22 additions & 18 deletions miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ var (
type environment struct {
signer types.Signer
state *state.StateDB // apply state changes here
tcount int // tx count in cycle
tcount int // count of non-system transactions in cycle
gasPool *core.GasPool // available gas used to pack transactions
coinbase common.Address
evm *vm.EVM
Expand All @@ -106,17 +106,20 @@ type environment struct {
blobs int

witness *stateless.Witness

committed bool
}

// copy creates a deep copy of environment.
func (env *environment) copy() *environment {
cpy := &environment{
signer: env.signer,
state: env.state.Copy(),
tcount: env.tcount,
coinbase: env.coinbase,
header: types.CopyHeader(env.header),
receipts: copyReceipts(env.receipts),
signer: env.signer,
state: env.state.Copy(),
tcount: env.tcount,
coinbase: env.coinbase,
header: types.CopyHeader(env.header),
receipts: copyReceipts(env.receipts),
committed: env.committed,
}
if env.gasPool != nil {
gasPool := *env.gasPool
Expand Down Expand Up @@ -705,14 +708,8 @@ func (w *worker) makeEnv(parent *types.Header, header *types.Header, coinbase co
} else {
if prevEnv == nil {
state.StartPrefetcher("miner", nil)
} else if prevEnv.header.Number.Uint64() == header.Number.Uint64() {
state.TransferPrefetcher(prevEnv.state)
} else {
// in some corner case, new block was just imported and preEnv was for the previous block
// in this case, the prefetcher can not be transferred
log.Debug("new block was just imported, start prefetcher from scratch",
"prev number", prevEnv.header.Number.Uint64(), "cur number", header.Number.Uint64())
state.StartPrefetcher("miner", nil)
state.TransferPrefetcher(prevEnv.state)
}
}

Expand Down Expand Up @@ -1285,6 +1282,7 @@ func (w *worker) commitWork(interruptCh chan int32, timestamp int64) {
// validator can try several times to get the most profitable block,
// as long as the timestamp is not reached.
workList := make([]*environment, 0, 10)
parentHash := w.chain.CurrentBlock().Hash()
var prevWork *environment
// workList clean up
defer func() {
Expand All @@ -1300,9 +1298,10 @@ func (w *worker) commitWork(interruptCh chan int32, timestamp int64) {
LOOP:
for {
work, err := w.prepareWork(&generateParams{
timestamp: uint64(timestamp),
coinbase: coinbase,
prevWork: prevWork,
timestamp: uint64(timestamp),
parentHash: parentHash,
coinbase: coinbase,
prevWork: prevWork,
}, false)
if err != nil {
return
Expand Down Expand Up @@ -1504,6 +1503,10 @@ func (w *worker) inTurn() bool {
// the deep copy first.
func (w *worker) commit(env *environment, interval func(), update bool, start time.Time) error {
if w.isRunning() {
if env.committed {
log.Warn("Invalid work commit: already committed", "number", env.header.Number.Uint64())
return nil
}
if interval != nil {
interval()
}
Expand All @@ -1516,6 +1519,7 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti
body.Withdrawals = make([]*types.Withdrawal, 0)
}
block, receipts, err := w.engine.FinalizeAndAssemble(w.chain, types.CopyHeader(env.header), env.state, &body, env.receipts, nil)
env.committed = true
if err != nil {
return err
}
Expand All @@ -1536,7 +1540,7 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti
select {
case w.taskCh <- &task{receipts: receipts, state: env.state, block: block, createdAt: time.Now(), miningStartAt: start}:
log.Info("Commit new sealing work", "number", block.Number(), "sealhash", w.engine.SealHash(block.Header()),
"txs", env.tcount, "blobs", env.blobs, "gas", block.GasUsed(), "fees", feesInEther, "elapsed", common.PrettyDuration(time.Since(start)))
"txs", len(env.txs), "blobs", env.blobs, "gas", block.GasUsed(), "fees", feesInEther, "elapsed", common.PrettyDuration(time.Since(start)))

case <-w.exitCh:
log.Info("Worker has exited")
Expand Down