feat: l2 block data model update and reorg handling #95
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
frisitano
changed the title
There was a problem hiding this comment.
Pull Request Overview
This PR implements an update to the L2 block data model and introduces reorg handling. Key changes include:
- Replacing the use of BlockInfo with L2BlockInfoWithL1Messages in several engine components.
- Updating migration scripts and database models (including renaming tables and adjusting foreign key actions) to support the new data model.
- Adjusting derivation pipeline and tests to handle the updated message and block representations.
Reviewed Changes
Copilot reviewed 42 out of 42 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| crates/engine/src/future/result.rs | Updates the type for L1 consolidation from BlockInfo to L2BlockInfoWithL1Messages. |
| crates/engine/src/future/mod.rs | Adjusts futures to use the new L2 block info type and converts execution payload accordingly. |
| crates/engine/src/event.rs | Updates the event type for L1 block consolidation to use L2 block info. |
| crates/engine/src/error.rs | Simplifies error conversion using #[from] for PayloadError. |
| crates/engine/src/driver.rs | Adds new public methods for setting safe/head block info and adapts existing reorg handling calls. |
| crates/derivation-pipeline/src/lib.rs | Renames provider cursor functions to set_queue_index_cursor. |
| crates/database/migration/*.rs | Renames migrations and alters foreign key actions (from cascade to set-null) to reflect the new L2 block model. |
| crates/database/db/src/models/* | Updates models for blocks and messages to include new fields and renames columns as needed. |
| crates/database/db/src/operations.rs and db/src/db.rs | Adjusts data access operations and tests to work with the updated block and message types. |
| README.md, Cargo.toml | Minor updates to include new modules and dependency changes. |
Comments suppressed due to low confidence (1)
crates/database/migration/src/m20250411_072004_add_l2_block.rs:25
- The foreign key actions have been changed from Cascade to SetNull. Please confirm that this change aligns with the desired reorg handling behavior and that downstream logic can properly handle null batch information.
.on_delete(ForeignKeyAction::SetNull)
Comment on lines
+147
to
+152
| self.fcs.update_safe_block_info(block_info.block_info); | ||
|
|
||
| // If we reorged, update the head block info | ||
| if reorg { | ||
| tracing::warn!(target: "scroll::engine", ?block_info, "reorging head to l1 derived block"); | ||
| self.fcs.update_head_block_info(block_info); | ||
| self.fcs.update_head_block_info(block_info.block_info); |
There was a problem hiding this comment.
The new methods set_safe_block_info and set_head_block_info still accept a BlockInfo parameter, while later updates access properties from L2BlockInfoWithL1Messages (e.g. block_info.block_info). Consider updating these method signatures to accept L2BlockInfoWithL1Messages for consistency throughout the reorg handling code.
Copilot uses AI. Check for mistakes.
There was a problem hiding this comment.
I don't agree with this proposal. L1 msg hashes are irrelevant to fcs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
The objective of this PR is an initial implementation of reorg handling. Upon reorg, the indexer will emit an event that signals if downstream consumers need to update their internal state. It calculates the event by deleting and processing the data stored in the database.
This PR modifies the data model as such:
Some preliminary tests have been implemented but we should expand coverage and introduce integration tests as well.
closes: #77