feat: wait for new blocks when build is in progress #18831

lean-apple · 2025-10-02T09:15:26Z

Closes #18799.

mattsse

cool, some suggestions

cc @loocapro

crates/optimism/flashblocks/src/lib.rs

crates/optimism/rpc/src/eth/mod.rs

loocapro

Nice!

crates/optimism/rpc/src/eth/mod.rs

…e helpers

mattsse

this looks pretty good, I have one more idea that makes the index check redundant and is perhaps useful in general for awaiting

mattsse · 2025-10-02T15:35:15Z

crates/optimism/flashblocks/src/service.rs

+    /// Signals when a block build is in progress
+    build_state_tx: watch::Sender<bool>,


what if use Option<FbInfo> here where FbInfo is parenthash + index + blocknumber

then we can easily check from the pendingblock pov if the Fb in progress is the next index

mattsse · 2025-10-02T15:49:11Z

crates/optimism/rpc/src/eth/mod.rs

+            if tokio::time::timeout(MAX_WAIT_DURATION, rx_clone.changed()).await.is_ok() {
+                let fresh = rx_clone.borrow();
+                if let Some(block) = self.extract_matching_block(fresh.as_ref(), parent_hash) {
+                    return Ok(Some(block));
+                }
+            }
+        }


I think we can simplify this and only need to keep tokio::time::timeout(MAX_WAIT_DURATION, rx_clone.changed()).await

because borrow always returns the most recent value

crates/optimism/rpc/src/eth/mod.rs

lean-apple · 2025-10-07T07:57:05Z

It's good for another round of reviews @RomanHodulak :)

All addressed

RomanHodulak

LGTM

* main: (280 commits) refactor: remove needless collect() calls in trie tests (paradigmxyz#18937) chore(grafana): use precompile address as legend (paradigmxyz#18913) perf(tree): worker pooling for storage in multiproof generation (paradigmxyz#18887) feat: wait for new blocks when build is in progress (paradigmxyz#18831) chore: align node_config threshold constant (paradigmxyz#18914) docs: duplicate comment in Eip4844PoolTransactionError (paradigmxyz#18858) ci: cache hive simulator images to reduce prepare-hive job time (paradigmxyz#18899) refactor: replace collect().is_empty() with next().is_none() in tests (paradigmxyz#18902) feat(provider): add get_account_before_block to ChangesetReader (paradigmxyz#18898) refactor(engine): separate concerns in on_forkchoice_updated for better maintainability (paradigmxyz#18661) chore(node): simplify EngineApiExt bounds by removing redundant constraints (paradigmxyz#18905) fix(trie): Reveal extension child when extension is last remaining child of a branch (paradigmxyz#18891) chore: make clippy happy (paradigmxyz#18900) chore: relax `ChainSpec` impls (paradigmxyz#18894) refactor: eliminate redundant allocation in precompile cache example (paradigmxyz#18886) fix(era-utils): fix off-by-one for Excluded end bound in process_iter (paradigmxyz#18731) docs: yellowpaper sections in consensus implementation (paradigmxyz#18881) feat(storage): read headers and transactions only from static files (paradigmxyz#18788) feat: Use generic `HeaderTy` for `reth db get static-file headers` (paradigmxyz#18870) fix: streamline payload conversion in custom engine API (paradigmxyz#18864) ...

* docs: yellowpaper sections in consensus implementation (paradigmxyz#18881) * fix(era-utils): fix off-by-one for Excluded end bound in process_iter (paradigmxyz#18731) Co-authored-by: Roman Hodulák <[email protected]> * refactor: eliminate redundant allocation in precompile cache example (paradigmxyz#18886) * chore: relax `ChainSpec` impls (paradigmxyz#18894) * chore: make clippy happy (paradigmxyz#18900) * fix(trie): Reveal extension child when extension is last remaining child of a branch (paradigmxyz#18891) * chore(node): simplify EngineApiExt bounds by removing redundant constraints (paradigmxyz#18905) * refactor(engine): separate concerns in on_forkchoice_updated for better maintainability (paradigmxyz#18661) Co-authored-by: Nathaniel Bajo <[email protected]> Co-authored-by: YK <[email protected]> Co-authored-by: Brian Picciano <[email protected]> * feat(provider): add get_account_before_block to ChangesetReader (paradigmxyz#18898) * refactor: replace collect().is_empty() with next().is_none() in tests (paradigmxyz#18902) Co-authored-by: Alexey Shekhirin <[email protected]> * ci: cache hive simulator images to reduce prepare-hive job time (paradigmxyz#18899) * docs: duplicate comment in Eip4844PoolTransactionError (paradigmxyz#18858) * chore: align node_config threshold constant (paradigmxyz#18914) * feat: wait for new blocks when build is in progress (paradigmxyz#18831) Co-authored-by: Roman Hodulák <[email protected]> * perf(tree): worker pooling for storage in multiproof generation (paradigmxyz#18887) Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> * chore(grafana): use precompile address as legend (paradigmxyz#18913) * refactor: remove needless collect() calls in trie tests (paradigmxyz#18937) * fix(examples): change method to launch with debug capabilities (paradigmxyz#18946) * fix(example): launch with debug capabilities (paradigmxyz#18947) * fix(testsuite): Fix unused updates in e2e-test-utils (paradigmxyz#18953) * fix(payload): correct Debug label for PayloadTimestamp in PayloadServiceCommand (paradigmxyz#18954) * chore(rpc): Moves `SequencerMetrics` into `reth-optimism-rpc` (paradigmxyz#18921) * refactor: replace println! with structured logging in test_vectors (paradigmxyz#18956) * refactor(cli): use structured logging (tracing) in p2p command (paradigmxyz#18957) * perf(tree): add elapsed time to parallel state root completion log (paradigmxyz#18959) * fix(trie): Properly upsert into StoragesTrie in repair-trie (paradigmxyz#18941) * fix: misleading error message in db list: show actual table name (paradigmxyz#18896) * fix: remove noisy stderr prints in ERA1 cleanup (EraClient::delete_outside_range) (paradigmxyz#18895) * fix: use max B256 for upper bound in empty-storage check (paradigmxyz#18962) * ci: remove reproducible build from release.yml (paradigmxyz#18958) * chore(rpc): Remove redundant U256::from in suggested_priority_fee (paradigmxyz#18969) * chore(ci): update eest 7594 issue link in hive expected failures file (paradigmxyz#18976) * perf(tests): remove redundant format! in ef-tests run_only (paradigmxyz#18909) * feat(cli): enable traces export via `tracing-otlp` cli arg (paradigmxyz#18242) Co-authored-by: Dan Cline <[email protected]> * feat: allow otlp level to be configurable (paradigmxyz#18981) * chore(optimism): remove unnecessary Debug bounds from header generics (paradigmxyz#18989) * refactor: convert satisfy_base_fee_ids to use closure (paradigmxyz#18979) * chore: bump otlp crates (paradigmxyz#18984) * fix(network): prevent metric leak in outgoing message queue on session teardown (paradigmxyz#18847) * chore: remove unused imports in blockchain_provider (paradigmxyz#18867) Co-authored-by: Matthias Seitz <[email protected]> * fix(stateless): enforce BLOCKHASH ancestor header limit (paradigmxyz#18920) * chore(evm): mark ExecuteOutput as unused and slated for removal (paradigmxyz#18754) * refactor: unify `Pipeline` creation codepaths (paradigmxyz#18955) * fix(engine): flatten storage cache (paradigmxyz#18880) * perf(tree): worker pooling for account proofs (paradigmxyz#18901) Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> * refactor(storage): fix ChainStateKey enum variant name (paradigmxyz#18992) * refactor(trie): remove proof task manager (paradigmxyz#18934) Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> * fix: required optimism primitives features in db-api (paradigmxyz#19005) * refactor(engine): simplify InvalidBlockWitnessHook::on_invalid_block for better testability (paradigmxyz#18696) * chore: replace poll_next_unpin loop with poll_recv_many (paradigmxyz#18978) * fix: Set Era pipeline stage to last checkpoint when there is no target (paradigmxyz#19000) * ci: Add tests for Paris scenario in hive.yml (paradigmxyz#19013) * chore: bump book timeout (paradigmxyz#19016) * feat: add metrics for safe and finalized block heights (paradigmxyz#18987) * chore(privitives-traits): remove unused serde derives and camelCase attribute (paradigmxyz#19014) * chore: refactor loop in `add_new_transactions` (paradigmxyz#19006) * chore(ci): bump hive eest to v5.3.0 (paradigmxyz#19021) * feat(devp2p): make eth p2p networkId configurable (paradigmxyz#19020) Co-authored-by: frankudoags <frankudoags.com> * chore: remove unused Args struct from exex-subscription example (paradigmxyz#19019) * feat: add pending sequence as pub (paradigmxyz#19022) * chore: bump alloy-core (paradigmxyz#19026) * fix: unused warnings for tracing (paradigmxyz#19025) * fix: respect cli blob size setting (paradigmxyz#19024) * feat(engine): deprecate TestPipelineBuilder::with_executor_results (paradigmxyz#19017) * perf: background init of workers (paradigmxyz#19012) * chore(ci): update expected failures (paradigmxyz#19034) * fix: use header type generic for mask (paradigmxyz#19037) * fix: correct `Compact` impl for `Option` (paradigmxyz#19042) * chore: increase versioned hash index cache (paradigmxyz#19038) * chore(primitives-traits): relax SignerRecoverable bounds for Extended<B,T> (paradigmxyz#19045) * feat: bump revm (paradigmxyz#18999) * fix: resolve upstream merge Signed-off-by: Gregory Edison <[email protected]> * bump revm * update deps and fix lints * update openvm deps * skip exex wal storage test * pin revm tag scroll-v91 * bump openvm compat --------- Signed-off-by: Gregory Edison <[email protected]> Co-authored-by: josé v <[email protected]> Co-authored-by: Forostovec <[email protected]> Co-authored-by: Roman Hodulák <[email protected]> Co-authored-by: Skylar Ray <[email protected]> Co-authored-by: Arsenii Kulikov <[email protected]> Co-authored-by: Léa Narzis <[email protected]> Co-authored-by: Brian Picciano <[email protected]> Co-authored-by: radik878 <[email protected]> Co-authored-by: William Nwoke <[email protected]> Co-authored-by: Nathaniel Bajo <[email protected]> Co-authored-by: YK <[email protected]> Co-authored-by: Dan Cline <[email protected]> Co-authored-by: Merkel Tranjes <[email protected]> Co-authored-by: Alexey Shekhirin <[email protected]> Co-authored-by: Federico Gimenez <[email protected]> Co-authored-by: stevencartavia <[email protected]> Co-authored-by: emmmm <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: MIHAO PARK <[email protected]> Co-authored-by: Tilak Madichetti <[email protected]> Co-authored-by: Emilia Hane <[email protected]> Co-authored-by: maradini77 <[email protected]> Co-authored-by: sashaodessa <[email protected]> Co-authored-by: Alvarez <[email protected]> Co-authored-by: MozirDmitriy <[email protected]> Co-authored-by: drhgencer <[email protected]> Co-authored-by: Matthias Seitz <[email protected]> Co-authored-by: anim001k <[email protected]> Co-authored-by: Julian Meyer <[email protected]> Co-authored-by: Karl Yu <[email protected]> Co-authored-by: Jennifer <[email protected]> Co-authored-by: Ivan Wang <[email protected]> Co-authored-by: GarmashAlex <[email protected]> Co-authored-by: Udoagwa Franklin <[email protected]> Co-authored-by: Luca Provini <[email protected]> Co-authored-by: Galoretka <[email protected]> Co-authored-by: sashass1315 <[email protected]> Co-authored-by: frisitano <[email protected]>

feat: wait for new blocks when build is in progress

a85b438

github-project-automation bot added this to Reth Tracker Oct 2, 2025

github-project-automation bot moved this to Backlog in Reth Tracker Oct 2, 2025

chore: fmt

6542096

mattsse requested changes Oct 2, 2025

View reviewed changes

crates/optimism/flashblocks/src/lib.rs Outdated Show resolved Hide resolved

crates/optimism/rpc/src/eth/mod.rs Outdated Show resolved Hide resolved

crates/optimism/rpc/src/eth/mod.rs Outdated Show resolved Hide resolved

github-project-automation bot moved this from Backlog to In Progress in Reth Tracker Oct 2, 2025

loocapro previously requested changes Oct 2, 2025

View reviewed changes

crates/optimism/rpc/src/eth/mod.rs Outdated Show resolved Hide resolved

lean-apple added 3 commits October 2, 2025 15:03

style: improve import

6174fd5

refactor: remove early timeout check

bb39aa3

refactor: remove some waiitng logic in proper helper and add even mor…

c741447

…e helpers

lean-apple force-pushed the await-progress-block branch from 48cf7f9 to c43faed Compare October 2, 2025 15:28

lean-apple marked this pull request as ready for review October 2, 2025 15:29

lean-apple requested review from Rjected and fgimenez as code owners October 2, 2025 15:29

mattsse requested changes Oct 2, 2025

View reviewed changes

mattsse previously requested changes Oct 2, 2025

View reviewed changes

mattsse reviewed Oct 2, 2025

View reviewed changes

crates/optimism/rpc/src/eth/mod.rs Outdated Show resolved Hide resolved

jenpaff assigned RomanHodulak Oct 6, 2025

lean-apple added 5 commits October 7, 2025 08:03

chore: update to 50 max duration

5bebb4c

fix: remove redundant check

81b0832

refactor: enrish build state with more flashblock info in channel

8946e15

docs: update code doc

3620a99

docs: update code doc

ffb1ea3

RomanHodulak force-pushed the await-progress-block branch from 756f1ca to ffb1ea3 Compare October 9, 2025 16:22

chore: Naming nit

9e5bdbe

RomanHodulak approved these changes Oct 9, 2025

View reviewed changes

RomanHodulak enabled auto-merge October 9, 2025 16:31

RomanHodulak added this pull request to the merge queue Oct 9, 2025

Merged via the queue into paradigmxyz:main with commit d2070f4 Oct 9, 2025
41 checks passed

github-project-automation bot moved this from In Progress to Done in Reth Tracker Oct 9, 2025

lean-apple deleted the await-progress-block branch October 9, 2025 17:18

jenpaff moved this from Done to Completed in Reth Tracker Oct 30, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: wait for new blocks when build is in progress #18831

feat: wait for new blocks when build is in progress #18831

lean-apple commented Oct 2, 2025

Uh oh!

mattsse left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

loocapro left a comment

Uh oh!

Uh oh!

mattsse left a comment

Uh oh!

mattsse Oct 2, 2025

Uh oh!

lean-apple Oct 7, 2025

Uh oh!

mattsse Oct 2, 2025

Uh oh!

lean-apple Oct 7, 2025

Uh oh!

Uh oh!

lean-apple commented Oct 7, 2025 •

edited

Loading

Uh oh!

RomanHodulak left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		/// Signals when a block build is in progress
		build_state_tx: watch::Sender<bool>,

feat: wait for new blocks when build is in progress #18831

feat: wait for new blocks when build is in progress #18831

Conversation

lean-apple commented Oct 2, 2025

Uh oh!

mattsse left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

loocapro left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mattsse left a comment

Choose a reason for hiding this comment

Uh oh!

mattsse Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

lean-apple Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

mattsse Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

lean-apple Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lean-apple commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RomanHodulak left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lean-apple commented Oct 7, 2025 •

edited

Loading