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 b06682e9a #150

Merged
merged 173 commits into from
Feb 4, 2025
Merged

Conversation

greged93
Copy link
Collaborator

@greged93 greged93 commented Feb 3, 2025

Bumps the revm dep to v55 and incorporates changes to the execution, rpc and payload.

  • Synced up to block 1.5M and verify state root against l2 geth.

Screenshot 2025-02-03 at 20 01 28
Screenshot 2025-02-03 at 20 25 47

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   Makefile
	both modified:   crates/chain-state/src/in_memory.rs
	both modified:   crates/engine/primitives/Cargo.toml
	both modified:   crates/engine/tree/src/tree/mod.rs
	both modified:   crates/ethereum/payload/src/lib.rs
	both modified:   crates/evm/Cargo.toml
	both modified:   crates/evm/src/execute.rs
	both modified:   crates/payload/primitives/Cargo.toml
	both modified:   crates/primitives-traits/Cargo.toml
	both modified:   crates/primitives-traits/src/size.rs
	both modified:   crates/revm/Cargo.toml
	both modified:   crates/storage/db-api/Cargo.toml
	both modified:   crates/storage/provider/src/test_utils/mock.rs
	both modified:   crates/trie/trie/Cargo.toml
	both modified:   crates/trie/trie/src/state.rs
	both modified:   examples/custom-beacon-withdrawals/Cargo.toml
	both modified:   testing/testing-utils/Cargo.toml

fgimenez and others added 30 commits January 22, 2025 11:04
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…digmxyz#13853)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…3858)

Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com>
int88 and others added 23 commits January 31, 2025 20:14
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…radigmxyz#14121)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
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>
Copy link

codspeed-hq bot commented Feb 3, 2025

CodSpeed Performance Report

Merging #150 will not alter performance

Comparing chore-merge-upstream-b06682e9a (ea8e07d) with scroll (018ef11)

Summary

✅ 77 untouched benchmarks

frisitano
frisitano previously approved these changes Feb 4, 2025
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! LGTM

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>
@greged93 greged93 merged commit c13c12d into scroll Feb 4, 2025
47 checks passed
@greged93 greged93 deleted the chore-merge-upstream-b06682e9a branch February 4, 2025 15:59
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.