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 b69c2ebee #123

Merged
merged 133 commits into from
Jan 7, 2025
Merged

Conversation

greged93
Copy link
Collaborator

@greged93 greged93 commented Jan 3, 2025

Merges upstream changes.

Required a bump of revm to v51, which was pushed on the scroll revm fork on branch scroll-evm-executor/reth/v51.

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/assets/check_wasm.sh
	both modified:   .github/workflows/bench.yml
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   bin/reth/src/commands/debug_cmd/in_memory_merkle.rs
	both modified:   crates/blockchain-tree/Cargo.toml
	both modified:   crates/chain-state/src/memory_overlay.rs
	both modified:   crates/cli/commands/src/recover/storage_tries.rs
	both modified:   crates/engine/invalid-block-hooks/src/witness.rs
	both modified:   crates/engine/tree/Cargo.toml
	both modified:   crates/engine/tree/benches/state_root_task.rs
	both modified:   crates/engine/tree/src/tree/mod.rs
	both modified:   crates/engine/util/src/reorg.rs
	both modified:   crates/ethereum/engine-primitives/src/payload.rs
	both modified:   crates/evm/Cargo.toml
	both modified:   crates/evm/src/execute.rs
	both modified:   crates/evm/src/test_utils.rs
	both modified:   crates/net/network/src/session/active.rs
	both modified:   crates/optimism/evm/src/execute.rs
	both modified:   crates/optimism/payload/Cargo.toml
	both modified:   crates/optimism/payload/src/builder.rs
	both modified:   crates/optimism/payload/src/payload.rs
	both modified:   crates/optimism/rpc/src/eth/pending_block.rs
	both modified:   crates/primitives-traits/src/account.rs
	deleted by them: crates/primitives/src/transaction/compat.rs
	both modified:   crates/primitives/src/transaction/mod.rs
	both modified:   crates/rpc/rpc/src/debug.rs
	both modified:   crates/rpc/rpc/src/eth/helpers/pending_block.rs
	both modified:   crates/rpc/rpc/src/validation.rs
	both modified:   crates/storage/db-api/Cargo.toml
	both modified:   crates/storage/provider/src/providers/database/provider.rs
	both modified:   crates/trie/common/src/updates.rs
	both modified:   crates/trie/trie/Cargo.toml

compact codec is falling in the same fashion as paradigmxyz#13594, due to a change in the chain_id field of the Authorization.

rkrasiuk and others added 30 commits December 17, 2024 15:14
aviggiano and others added 22 commits December 29, 2024 13:48
Signed-off-by: Gregory Edison <[email protected]>
Signed-off-by: Gregory Edison <[email protected]>
@greged93 greged93 marked this pull request as draft January 3, 2025 12:11
Signed-off-by: Gregory Edison <[email protected]>
@greged93 greged93 marked this pull request as ready for review January 6, 2025 09:09
Copy link

codspeed-hq bot commented Jan 6, 2025

CodSpeed Performance Report

Congrats! CodSpeed is installed 🎉

🆕 77 new benchmarks were detected.

You will start to see performance impacts in the reports once the benchmarks are run from your default branch.

Detected benchmarks

  • recover ECDSA (199.6 µs)
  • validate_blob | num blobs: 1 | ValidateBlob (18.3 µs)
  • validate_blob | num blobs: 2 | ValidateBlob (17.8 µs)
  • validate_blob | num blobs: 3 | ValidateBlob (19.2 µs)
  • validate_blob | num blobs: 4 | ValidateBlob (20.1 µs)
  • validate_blob | num blobs: 5 | ValidateBlob (22.2 µs)
  • validate_blob | num blobs: 6 | ValidateBlob (23.7 µs)
  • prefix set | size: 10 | BTreeSetwithBTreeSet:range lookup (6.3 µs)
  • prefix set | size: 10 | BTreeSetwithIterator:any lookup (5.4 µs)
  • prefix set | size: 10 | Vec with binary search lookup (4.6 µs)
  • prefix set | size: 10 | Vec with custom cursor lookup (4.6 µs)
  • prefix set | size: 100 | BTreeSetwithBTreeSet:range lookup (53.7 µs)
  • prefix set | size: 100 | BTreeSetwithIterator:any lookup (199 µs)
  • prefix set | size: 100 | Vec with binary search lookup (28.7 µs)
  • prefix set | size: 100 | Vec with custom cursor lookup (24.3 µs)
  • prefix set | size: 1000 | BTreeSetwithBTreeSet:range lookup (597.4 µs)
  • prefix set | size: 1000 | BTreeSetwithIterator:any lookup (19.9 ms)
  • prefix set | size: 1000 | Vec with binary search lookup (295.2 µs)
  • prefix set | size: 1000 | Vec with custom cursor lookup (208.9 µs)
  • size 100000 | updated 0.1% | depth 0 (4 ms)
  • size 100000 | updated 0.1% | depth 1 (4 ms)
  • size 100000 | updated 0.1% | depth 2 (3.8 ms)
  • size 100000 | updated 0.1% | depth 3 (2.7 ms)
  • size 100000 | updated 0.1% | depth 4 (1.6 ms)
  • size 100000 | updated 0.1% | depth 5 (1.3 ms)
  • size 100000 | updated 1% | depth 0 (26.9 ms)
  • size 100000 | updated 1% | depth 1 (26.9 ms)
  • size 100000 | updated 1% | depth 2 (26.8 ms)
  • size 100000 | updated 1% | depth 3 (23.7 ms)
  • size 100000 | updated 1% | depth 4 (12.6 ms)
  • size 100000 | updated 1% | depth 5 (9.4 ms)
  • hash builder[1000] (4.5 ms)
  • hash builder[5000] (22.7 ms)
  • sparse trie[1000] (6.3 ms)
  • sparse trie[5000] (31.2 ms)
  • hash builder[init size 1000 | update size 100 | num updates 10] (24.7 ms)
  • hash builder[init size 1000 | update size 100 | num updates 1] (2.5 ms)
  • hash builder[init size 1000 | update size 100 | num updates 3] (7.4 ms)
  • hash builder[init size 1000 | update size 100 | num updates 5] (12.4 ms)
  • hash builder[init size 1000 | update size 1000 | num updates 10] (56.2 ms)
  • hash builder[init size 1000 | update size 1000 | num updates 1] (5.6 ms)
  • hash builder[init size 1000 | update size 1000 | num updates 3] (16.9 ms)
  • hash builder[init size 1000 | update size 1000 | num updates 5] (28.2 ms)
  • hash builder[init size 10000 | update size 100 | num updates 10] (88.7 ms)
  • hash builder[init size 10000 | update size 100 | num updates 1] (9.3 ms)
  • hash builder[init size 10000 | update size 100 | num updates 3] (27.3 ms)
  • hash builder[init size 10000 | update size 100 | num updates 5] (44.8 ms)
  • hash builder[init size 10000 | update size 1000 | num updates 10] (247.1 ms)
  • hash builder[init size 10000 | update size 1000 | num updates 1] (25.3 ms)
  • hash builder[init size 10000 | update size 1000 | num updates 3] (74.5 ms)
  • hash builder[init size 10000 | update size 1000 | num updates 5] (124.9 ms)
  • sparse trie[init size 1000 | update size 100 | num updates 10] (11.8 ms)
  • sparse trie[init size 1000 | update size 100 | num updates 1] (1.3 ms)
  • sparse trie[init size 1000 | update size 100 | num updates 3] (3.6 ms)
  • sparse trie[init size 1000 | update size 100 | num updates 5] (6 ms)
  • sparse trie[init size 1000 | update size 1000 | num updates 10] (53.1 ms)
  • sparse trie[init size 1000 | update size 1000 | num updates 1] (5.5 ms)
  • sparse trie[init size 1000 | update size 1000 | num updates 3] (16.1 ms)
  • sparse trie[init size 1000 | update size 1000 | num updates 5] (26.7 ms)
  • sparse trie[init size 10000 | update size 100 | num updates 10] (24.5 ms)
  • sparse trie[init size 10000 | update size 100 | num updates 1] (2.6 ms)
  • sparse trie[init size 10000 | update size 100 | num updates 3] (7.5 ms)
  • sparse trie[init size 10000 | update size 100 | num updates 5] (12.3 ms)
  • sparse trie[init size 10000 | update size 1000 | num updates 10] (119.2 ms)
  • sparse trie[init size 10000 | update size 1000 | num updates 1] (12.6 ms)
  • sparse trie[init size 10000 | update size 1000 | num updates 3] (36.3 ms)
  • sparse trie[init size 10000 | update size 1000 | num updates 5] (60 ms)
  • parallel hashing[1000] (2.6 s)
  • parallel hashing[100] (258.5 ms)
  • sequence hashing[1000] (2.6 s)
  • sequence hashing[100] (259 ms)
  • receipts root | size: 10 | HashBuilder (110.6 µs)
  • ordered_trie_root (128.1 µs)
  • receipts root | size: 100 | HashBuilder (915.1 µs)
  • ordered_trie_root (1.2 ms)
  • receipts root | size: 1000 | HashBuilder (9.2 ms)
  • ordered_trie_root (11.9 ms)

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.

Thank you! Looks good, I tested compact-codec locally and the test passed.

@Thegaram Thegaram merged commit fe3d5ae into scroll Jan 7, 2025
45 of 47 checks passed
@Thegaram Thegaram deleted the chore-merge-upstream-b69c2ebee branch January 7, 2025 10:43
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.