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 ac25fd8c1 #133

Merged
merged 116 commits into from
Jan 14, 2025
Merged

Conversation

greged93
Copy link
Collaborator

@greged93 greged93 commented Jan 13, 2025

Bumps the Scroll revm fork to v53. In the updated fork, we remove the code_size "shortcut" that is taken in the Scroll revm fork for the extcodesize, and instead retrieve the code from database and return its length as done in the latest commit on the scroll-evm-executor/reth/v53 branch. This resolves #130.

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	deleted by them: crates/blockchain-tree/Cargo.toml
	deleted by them: crates/blockchain-tree/src/blockchain_tree.rs
	deleted by them: crates/blockchain-tree/src/chain.rs
	deleted by them: crates/blockchain-tree/src/lib.rs
	both modified:   crates/engine/tree/src/tree/mod.rs
	both modified:   crates/optimism/bin/src/main.rs
	both modified:   crates/optimism/consensus/src/lib.rs
	both modified:   crates/primitives-traits/Cargo.toml
	both modified:   crates/primitives/src/transaction/mod.rs

davidcardenasus and others added 30 commits January 3, 2025 11:28
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Rjected and others added 24 commits January 9, 2025 05:32
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@greged93 greged93 mentioned this pull request Jan 13, 2025
Copy link

codspeed-hq bot commented Jan 13, 2025

CodSpeed Performance Report

Merging #133 will not alter performance

Comparing chore-merge-upstream-ac25fd8c1 (79b356b) with scroll (88e9188)

Summary

✅ 77 untouched benchmarks

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
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.

Thanks, looks great! LGTM.

@frisitano frisitano merged commit d88ff28 into scroll Jan 14, 2025
46 checks passed
@frisitano frisitano deleted the chore-merge-upstream-ac25fd8c1 branch January 14, 2025 06:04
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.

bug: sync failure on block 3404