Skip to content

fix: L1 message L1MessageKey::BlockNumber lookup edge case #402

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 6 commits into from
Nov 3, 2025
Merged

fix: L1 message L1MessageKey::BlockNumber lookup edge case #402

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db8932c
fix: L1 message L1MessageKey::BlockNumber lookup edge case
yiweichi Oct 29, 2025
5b03fe0
update comment
yiweichi Oct 29, 2025
b9f5ac6
update comment
yiweichi Oct 29, 2025
a6bef19
address comment
yiweichi Oct 30, 2025
a551226
Merge branch 'main' into fix-l1-message-lookup-edge-case
yiweichi Oct 30, 2025
6e994f0
address comment
yiweichi Oct 30, 2025
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
14 changes: 9 additions & 5 deletions crates/database/db/src/operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,12 +854,15 @@ impl<T: ReadConnectionProvider + Sync + ?Sized> DatabaseReadOperations for T {
.one(self.get_connection())
.await?
{
// Yield n messages starting from the found queue index + 1.
// Yield n messages starting from the found queue index + 1. Only return
// messages that have not been skipped (skipped = false) to handle the edge
// case where the last message in a batch is skipped.
let condition = Condition::all()
// We add 1 to the queue index to constrain across block boundaries
.add(models::l1_message::Column::QueueIndex.gte(record.queue_index + 1))
.add(models::l1_message::Column::Skipped.eq(false));
Ok(models::l1_message::Entity::find()
.filter(
// We add 1 to the queue index to constrain across block boundaries
models::l1_message::Column::QueueIndex.gte(record.queue_index + 1),
)
.filter(condition)
.order_by_asc(models::l1_message::Column::QueueIndex)
.limit(Some(n as u64))
.all(self.get_connection())
Expand All @@ -871,6 +874,7 @@ impl<T: ReadConnectionProvider + Sync + ?Sized> DatabaseReadOperations for T {
// index starting from the beginning.
else {
Ok(models::l1_message::Entity::find()
.filter(models::l1_message::Column::Skipped.eq(false))
.order_by_asc(models::l1_message::Column::QueueIndex)
.limit(Some(n as u64))
.all(self.get_connection())
Expand Down
Loading