Skip to content

fix(derivation): advance L1 message cursor for skipped blocks #942

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

Open
curryxbo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(derivation): advance L1 message cursor for skipped blocks #942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c5f29
fix(derivation): advance L1 message cursor for skipped blocks
Apr 24, 2026
f8d9645
Merge branch 'main' into fix/derivation-l1-cursor-skipped-blocks
curryxbo Apr 28, 2026
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
8 changes: 6 additions & 2 deletions node/derivation/derivation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,12 @@ func (d *Derivation) parseBatch(batch geth.RPCRollupBatch, l2Height uint64) (*Ba
func (d *Derivation) handleL1Message(rollupData *BatchInfo, parentTotalL1MessagePopped, l2Height uint64) error {
totalL1MessagePopped := parentTotalL1MessagePopped
for bIndex, block := range rollupData.blockContexts {
// This may happen to nodes started from snapshot, in which case we will no longer handle L1Msg
// Nodes started from a snapshot may have already executed earlier blocks in
// this batch. We skip injecting L1 messages for those blocks, but the L1
// message cursor must still advance so that subsequent blocks in the same
// batch read their L1 messages from the correct offset.
if block.Number <= l2Height {
totalL1MessagePopped += uint64(block.l1MsgNum)
continue
}
var l1Transactions []*eth.Transaction
Expand All @@ -525,7 +529,7 @@ func (d *Derivation) handleL1Message(rollupData *BatchInfo, parentTotalL1Message
return fmt.Errorf("get l1 message error:%v", err)
}
if len(l1Messages) != int(block.l1MsgNum) {
return fmt.Errorf("invalid l1 msg num,expect %v,have %v", block.l1MsgNum, l1Messages)
return fmt.Errorf("invalid l1 msg num,expect %v,have %v", block.l1MsgNum, len(l1Messages))
}
totalL1MessagePopped += uint64(block.l1MsgNum)
if len(l1Messages) > 0 {
Expand Down
Loading