Skip to content

getNextBlockToRead does not deped on FillInBatchGasField #3851

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

getNextBlockToRead does not deped on FillInBatchGasField #3851

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 arbnode/inbox_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ func (r *InboxReader) getNextBlockToRead(ctx context.Context) (*big.Int, error)
if delayedCount == 0 {
return new(big.Int).Set(r.firstMessageBlock), nil
}
_, _, parentChainBlockNumber, err := r.tracker.GetDelayedMessageAccumulatorAndParentChainBlockNumber(ctx, delayedCount-1)
parentChainBlockNumber, err := r.tracker.GetParentChainBlockNumberFor(ctx, delayedCount-1)
if err != nil {
return nil, err
}
Expand Down
27 changes: 19 additions & 8 deletions arbnode/inbox_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,25 @@ func (t *InboxTracker) legacyGetDelayedMessageAndAccumulator(ctx context.Context
}

func (t *InboxTracker) GetDelayedMessageAccumulatorAndParentChainBlockNumber(ctx context.Context, seqNum uint64) (*arbostypes.L1IncomingMessage, common.Hash, uint64, error) {
msg, acc, blockNum, err := t.getRawDelayedMessageAccumulatorAndParentChainBlockNumber(ctx, seqNum)
if err != nil {
return msg, acc, blockNum, err
}
err = msg.FillInBatchGasFields(func(batchNum uint64) ([]byte, error) {
data, _, err := t.txStreamer.inboxReader.GetSequencerMessageBytes(ctx, batchNum)
return data, err
})
return msg, acc, blockNum, err
}

// does not return message, so does not need to fill in batchGasFields
func (t *InboxTracker) GetParentChainBlockNumberFor(ctx context.Context, seqNum uint64) (uint64, error) {
_, _, blockNum, err := t.getRawDelayedMessageAccumulatorAndParentChainBlockNumber(ctx, seqNum)
return blockNum, err
}

// this function will not error
func (t *InboxTracker) getRawDelayedMessageAccumulatorAndParentChainBlockNumber(ctx context.Context, seqNum uint64) (*arbostypes.L1IncomingMessage, common.Hash, uint64, error) {
delayedMessageKey := dbKey(rlpDelayedMessagePrefix, seqNum)
exists, err := t.db.Has(delayedMessageKey)
if err != nil {
Expand All @@ -371,14 +390,6 @@ func (t *InboxTracker) GetDelayedMessageAccumulatorAndParentChainBlockNumber(ctx
return msg, acc, 0, err
}

err = msg.FillInBatchGasFields(func(batchNum uint64) ([]byte, error) {
data, _, err := t.txStreamer.inboxReader.GetSequencerMessageBytes(ctx, batchNum)
return data, err
})
if err != nil {
return msg, acc, 0, err
}

parentChainBlockNumberKey := dbKey(parentChainBlockNumberPrefix, seqNum)
exists, err = t.db.Has(parentChainBlockNumberKey)
if err != nil {
Expand Down
Loading