Skip to content

fix(builder): Resolve bugs on upstream flashblocks timing scheduler #169

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
louisliu2048 merged 8 commits into from
Mar 5, 2026
Merged

fix(builder): Resolve bugs on upstream flashblocks timing scheduler #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad3bf14
fix(builder): resolve flashblocks timing bugs introduced from upstream
sieniven Mar 3, 2026
5b83c51
Merge branch 'main' of github.com:okx/xlayer-reth into niven/flashblo…
sieniven Mar 3, 2026
49bf4d2
fix(builder): simplify flashblock scheduler and add integration tests
sieniven Mar 3, 2026
64983a1
fix(builder): revert timing to original logic on late fcu, add tests
sieniven Mar 4, 2026
efa9add
Merge branch 'main' of github.com:okx/xlayer-reth into niven/flashblo…
sieniven Mar 4, 2026
b698798
fix(builder): remove incorrect missing flashblocks warning log
sieniven Mar 4, 2026
a9c4702
style(builder): fix stale test comment and trailing semicolon
sieniven Mar 4, 2026
9bb8366
chore(builder): add comment on fb count check
sieniven Mar 4, 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
1 change: 1 addition & 0 deletions crates/builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ nanoid = { version = "0.4" }
reth-ipc.workspace = true
reth-optimism-rpc = { workspace = true, features = ["client"] }
rlimit = { version = "0.10" }
tokio = { workspace = true, features = ["test-util"] }

[features]
default = []
Expand Down
13 changes: 13 additions & 0 deletions crates/builder/src/payload/flashblocks/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,13 @@ where
schedule = ?flashblock_scheduler,
"Computed flashblock timing schedule"
);
// Get target number of flashblocks to build. If no flashblocks are scheduled, return early.
let target_flashblocks = flashblock_scheduler.target_flashblocks();
if target_flashblocks == 0 {
self.resolve_best_payload(&ctx, best_payload, fallback_payload, &resolve_payload);
self.record_flashblocks_metrics(&ctx, &fb_state, &info, 0);
return Ok(());
}

let expected_flashblocks = self.config.flashblocks_per_block();
if target_flashblocks < expected_flashblocks {
Expand Down Expand Up @@ -555,6 +561,13 @@ where
return Ok(());
}

// Check if we have reached target flashblocks count
if fb_state.flashblock_index() > fb_state.target_flashblock_count() {
self.resolve_best_payload(&ctx, best_payload, fallback_payload, &resolve_payload);
self.record_flashblocks_metrics(&ctx, &fb_state, &info, target_flashblocks);
return Ok(());
}

// Build flashblock after receiving signal
let next_fb_state = match self.build_next_flashblock(
&ctx,
Expand Down
Loading