From 1e9c35c3cc873d18bef50ae44b36eaccd492df7e Mon Sep 17 00:00:00 2001 From: Keyao Shen Date: Thu, 13 Nov 2025 14:49:20 -0800 Subject: [PATCH] Rename --- op-batcher/batcher/driver.go | 2 +- op-batcher/batcher/espresso.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go index bca560b380f..664d483de67 100644 --- a/op-batcher/batcher/driver.go +++ b/op-batcher/batcher/driver.go @@ -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 }, ) diff --git a/op-batcher/batcher/espresso.go b/op-batcher/batcher/espresso.go index 742c31c7146..82dfca093ef 100644 --- a/op-batcher/batcher/espresso.go +++ b/op-batcher/batcher/espresso.go @@ -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 @@ -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)