Skip to content

Rename numFinalizedBlocks and sendEspressoTx #275

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
shenkeyao merged 1 commit into from
Nov 14, 2025
Merged

Rename numFinalizedBlocks and sendEspressoTx #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 op-batcher/batcher/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ func (l *BatchSubmitter) sendTx(txdata txData, isCancel bool, candidate *txmgr.T
if l.Config.UseEspresso && !isCancel {
l.teeAuthGroup.Go(
func() error {
l.sendEspressoTx(txdata, isCancel, candidate, queue, receiptsCh)
l.sendTxWithEspresso(txdata, isCancel, candidate, queue, receiptsCh)
return nil
},
)
Expand Down
12 changes: 6 additions & 6 deletions op-batcher/batcher/espresso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,13 +892,13 @@ func (l *BlockLoader) nextBlockRange(newSyncStatus *eth.SyncStatus) (inclusiveBl
}

if safeL2.Number > firstQueuedBlock.Number {
numFinalizedBlocks := safeL2.Number - firstQueuedBlock.Number
numFinalizedBlocksInQueue := safeL2.Number - firstQueuedBlock.Number
l.batcher.Log.Warn(
"Removing finalized blocks from queued",
"numFinalizedBlocks", numFinalizedBlocks,
"numFinalizedBlocksInQueue", numFinalizedBlocksInQueue,
"safeL2", safeL2,
"firstQueuedBlock", firstQueuedBlock)
l.queuedBlocks = l.queuedBlocks[numFinalizedBlocks:]
l.queuedBlocks = l.queuedBlocks[numFinalizedBlocksInQueue:]
}

return inclusiveBlockRange{lastQueuedBlock.Number + 1, newSyncStatus.UnsafeL2.Number}, ActionEnqueue
Expand Down Expand Up @@ -1111,9 +1111,9 @@ func (l *BatchSubmitter) registerBatcher(ctx context.Context) error {
return nil
}

// sendEspressoTx uses the txmgr queue to send the given transaction candidate after setting its
// gaslimit. It will block if the txmgr queue has reached its MaxPendingTransactions limit.
func (l *BatchSubmitter) sendEspressoTx(txdata txData, isCancel bool, candidate *txmgr.TxCandidate, queue TxSender[txRef], receiptsCh chan txmgr.TxReceipt[txRef]) {
// sendTxWithEspresso uses the txmgr queue to send the given transaction candidate after setting
// its gaslimit. It will block if the txmgr queue has reached its MaxPendingTransactions limit.
func (l *BatchSubmitter) sendTxWithEspresso(txdata txData, isCancel bool, candidate *txmgr.TxCandidate, queue TxSender[txRef], receiptsCh chan txmgr.TxReceipt[txRef]) {
transactionReference := txRef{id: txdata.ID(), isCancel: isCancel, isBlob: txdata.daType == DaTypeBlob}
l.Log.Debug("Sending Espresso-enabled L1 transaction", "txRef", transactionReference)

Expand Down
Loading