Skip to content

always estimate gas if inbox contract is enabled#64

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
blockchaindevsh merged 1 commit into from
Jul 16, 2025
Merged

always estimate gas if inbox contract is enabled #64

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
31 changes: 1 addition & 30 deletions op-batcher/batcher/driver.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ import (
"math/big"
_ "net/http/pprof"
"sync"
"sync/atomic"
"time"

"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -113,7 +112,6 @@ type BatchSubmitter struct {
txpoolState TxPoolState
txpoolBlockedBlob bool

inboxIsEOA atomic.Pointer[bool]
channelMgrMutex sync.Mutex // guards channelMgr and prevCurrentL1
channelMgr *channelManager
prevCurrentL1 eth.L1BlockRef // cached CurrentL1 from the last syncStatus
Expand DownExpand Up@@ -905,32 +903,8 @@ type TxSender[T any] interface {
// sendTx 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) sendTx(txdata txData, isCancel bool, candidate *txmgr.TxCandidate, queue TxSender[txRef], receiptsCh chan txmgr.TxReceipt[txRef]) {
var isEOAPointer *bool
if l.RollupConfig.UseInboxContract() {
// RollupConfig.UseInboxContract() being true just means the batcher's transaction status matters,
// but the actual inbox may still be an EOA.
isEOAPointer = l.inboxIsEOA.Load()
if isEOAPointer == nil {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
defer cancel()
var code []byte
code, err := l.L1Client.CodeAt(ctx, *candidate.To, nil)
if err != nil {
l.Log.Error("CodeAt failed, assuming code exists", "err", err)
// assume code exist, but don't persist the result
isEOA := false
isEOAPointer = &isEOA
} else {
isEOA := len(code) == 0
isEOAPointer = &isEOA
l.inboxIsEOA.Store(isEOAPointer)
}
}
}

// Set GasLimit as intrinstic gas if the inbox is EOA, otherwise
// Leave GasLimit unset when inbox is contract so that later on `EstimateGas` will be called
if !l.RollupConfig.UseInboxContract() || *isEOAPointer {
if !l.RollupConfig.UseInboxContract() {
floorDataGas, err := core.FloorDataGas(candidate.TxData)
if err != nil {
// We log instead of return an error here because the txmgr will do its own gas estimation.
Expand DownExpand Up@@ -996,9 +970,6 @@ func (l *BatchSubmitter) recordFailedTx(id txID, err error) {
l.channelMgrMutex.Lock()
defer l.channelMgrMutex.Unlock()

if l.RollupConfig.UseInboxContract() {
l.inboxIsEOA.Store(nil)
}
l.Log.Warn("Transaction failed to send", logFields(id, err)...)
l.channelMgr.TxFailed(id)
}
Expand Down