Skip to content
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.

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

Chore merge upstream b263b5c62 #146

Merged
merged 95 commits into from
Jan 28, 2025
Merged

Conversation

greged93
Copy link
Collaborator

@greged93 greged93 commented Jan 24, 2025

Because of the major changes done upstream related to how custom node types were added, this PR had to update quite a lot of the previous codebase and introduce various custom Scroll types.

This PR also bump revm to v54.

  • Resync node up to block 2M
  • Verify state root against l2geth MPT
Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/stage.yml
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   bin/reth/src/commands/debug_cmd/in_memory_merkle.rs
	both modified:   crates/chain-state/src/in_memory.rs
	both modified:   crates/engine/tree/src/tree/mod.rs
	both modified:   crates/optimism/bin/src/main.rs
	both modified:   crates/optimism/consensus/Cargo.toml
	both modified:   crates/optimism/payload/src/payload.rs
	both modified:   crates/primitives-traits/Cargo.toml
	both modified:   crates/primitives/Cargo.toml
	deleted by them: crates/primitives/src/alloy_compat.rs
	both modified:   crates/primitives/src/block.rs
	both modified:   crates/primitives/src/proofs.rs
	both modified:   crates/primitives/src/receipt.rs
	both modified:   crates/primitives/src/transaction/mod.rs
	both modified:   crates/primitives/src/transaction/tx_type.rs
	both modified:   crates/stages/stages/src/stages/merkle.rs
	both modified:   examples/custom-beacon-withdrawals/Cargo.toml
	both modified:   examples/custom-beacon-withdrawals/src/main.rs

Sorry, something went wrong.

klkvr and others added 30 commits January 13, 2025 15:25
Copy link

codspeed-hq bot commented Jan 24, 2025

CodSpeed Performance Report

Merging #146 will not alter performance

Comparing chore-merge-upstream-b263b5c62 (cd10dd9) with scroll (d08f7d0)

Summary

✅ 77 untouched benchmarks

Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
@greged93
Copy link
Collaborator Author

Sync up to 2M successful:

l2geth
Screenshot 2025-01-27 at 18 48 11

Reth
Screenshot 2025-01-27 at 18 47 58

Copy link
Collaborator

@frisitano frisitano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for this! Left a comment inline but not a blocker. LGTM

@frisitano frisitano merged commit 34fbede into scroll Jan 28, 2025
44 of 47 checks passed
@frisitano frisitano deleted the chore-merge-upstream-b263b5c62 branch January 28, 2025 08:28
@frisitano frisitano mentioned this pull request Feb 3, 2025
@greged93 greged93 mentioned this pull request Feb 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet