chore: merge upstream e9598ba5a #346

greged93 · 2025-10-07T11:28:53Z

No big changes in this upstream merge.

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

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

…ashblocks (paradigmxyz#18374) Co-authored-by: Nathaniel Bajo <nathanielbajo@Nathaniels-MacBook-Pro.local> Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de> Co-authored-by: Arsenii Kulikov <klkvrr@gmail.com>

Co-authored-by: Federico Gimenez <federico.gimenez@gmail.com>

…arse-trie semantics (paradigmxyz#18478)

…adigmxyz#18490)

…yz#18504)

…gmxyz#18502)

)

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

…xyz#18509)

…gmxyz#18842)

…aradigmxyz#18845)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Signed-off-by: bakhtin <a@bakhtin.net>

…18864)

…aradigmxyz#18870) Co-authored-by: sprites0 <199826320+sprites0@users.noreply.github.com>

…aradigmxyz#18788)

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

greged93 · 2025-10-07T11:29:37Z

Cargo.toml

+revm = { git = "https://github.com/scroll-tech/revm", default-features = false, features = ["enable_eip7702", "enable_eip7623"], branch = "feat/v87" }
+revm-bytecode = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-database = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-state = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-primitives = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-interpreter = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-inspector = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-context = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-context-interface = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+revm-database-interface = { git = "https://github.com/scroll-tech/revm", default-features = false, branch = "feat/v87" }
+op-revm = { git = "https://github.com/scroll-tech/revm", default-features = false , branch = "feat/v87"}
+revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false, branch = "feat/v87" }


TODO: revert back to default branch once other PRs are merged.

greged93 · 2025-10-07T11:30:14Z

crates/scroll/alloy/evm/src/block/mod.rs

@@ -174,6 +175,7 @@ where
        }

        // apply gas oracle predeploy upgrade at Feynman transition block.
+        #[allow(clippy::collapsible_if)]


I think it looks more readable without the collapse, but let me know what you think

I generally think it's a good idea to respect clippys standards but I'm not strongly opinionated.

greged93 · 2025-10-07T11:30:50Z

crates/scroll/consensus/src/validation.rs

@@ -62,6 +62,7 @@ impl<
        }

        // verify the receipts logs bloom and root
+        #[allow(clippy::collapsible_if)]


codspeed-hq · 2025-10-07T11:38:33Z

CodSpeed Performance Report

Merging #346 will not alter performance

_{Comparing chore-merge-upstream-e9598ba5a (2d9fb76) with scroll (61d5c38)}

Summary

✅ 77 untouched

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

greged93 · 2025-10-08T07:43:02Z

compact-codec is expected to fail, base does not have compaction on EthereumReceipt. Read and writes work locally.

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

fgimenez and others added 30 commits September 15, 2025 09:23

chore(ci): unpin kurtosis op package (paradigmxyz#18456)

5516ad2

perf: Enforce EIP-7825 transaction gas limit for Osaka (paradigmxyz#1…

7d5415a

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

fix(engine): perform cache updates with guard (paradigmxyz#18435)

d61349b

fix(engine): remove redundant method-level where bound in InvalidBloc…

d2b9c57

…kWitnessHook (paradigmxyz#18459)

perf(db): open MDBX DBIs only once at startup (paradigmxyz#18424)

ef85d93

fix(rpc): add validation for missing headers in debug execution witne…

ec2a898

…ss (paradigmxyz#18444)

chore(ci): update ignored hive tests (paradigmxyz#18412)

e578b1b

feat: add CliApp wrapper for ethereum CLI configuration and execution (…

7cf239a

…paradigmxyz#18458)

fix(rpc): disable tx gas limit in calls (paradigmxyz#18473)

2dabb23

feat(storage): bump MDBX map size to 8TB (paradigmxyz#18360)

5844ff7

feat: Block::iter_recovered (paradigmxyz#18476)

5f38ff7

feat(network): add shadowfork block hash filtering for peers (paradig…

b7e9f76

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

fix: missing generic type hint for cursor (paradigmxyz#18483)

8e65a1d

chore: update superchain commit (paradigmxyz#18481)

976939a

Co-authored-by: Federico Gimenez <federico.gimenez@gmail.com>

chore: deconstruct non-exhaustive (paradigmxyz#18492)

1697826

docs(engine): fix LiveSync target doc and clarify disable-parallel-sp…

1805283

…arse-trie semantics (paradigmxyz#18478)

docs: fix incorrect transaction type count (paradigmxyz#18437)

d1c9660

fix(cli): disallow --instance 0 (paradigmxyz#18496)

847330c

fix(engine): exit MultiProofTask loop on closed internal channel (par…

1185514

…adigmxyz#18490)

chore: skip prewarm transact errors (paradigmxyz#18498)

5274f09

feat: more flexible rpc receipts (paradigmxyz#18501)

bf58089

feat: make EthBuiltPayload generic over NodePrimitives (paradigmx…

7af829e

…yz#18504)

feat: relax EthBlockAssembler (paradigmxyz#18505)

7296fc6

chore(engine): avoid panic on mpsc send in sparse trie worker (paradi…

c45817c

…gmxyz#18502)

fix: don't require closure to be Debug (paradigmxyz#18507)

9fc8949

chore: add myself to CODEOWNERS for engine and stages (paradigmxyz#18512

9c892b0

)

fix: don't override existing tables in create_tables_for (paradigmx…

04c5820

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

feat(metrics): add transaction error counter for prewarming (paradigm…

088eb6c

…xyz#18509)

chore: add myself to CODEOWNERS (paradigmxyz#18514)

31ce037

klkvr and others added 13 commits October 3, 2025 11:58

chore: do not generate fuzz tests in Compact macro (paradigmxyz#18849)

871bc82

chore: relax trait bounds for EmptyBodyStorage in storage API (paradi…

5c05beb

…gmxyz#18842)

chore(cli): remove unnecessary ProviderFactory clone in db_ro_exec! (p…

3735767

…aradigmxyz#18845)

feat: OverlayStateProvider (paradigmxyz#18822)

d276ce5

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

feat: Add building and publishing of *.deb packages (paradigmxyz#18615)

fe10c07

Signed-off-by: bakhtin <a@bakhtin.net>

feat: make ChainSpec generic over header (paradigmxyz#18856)

78535b0

chore: update hive expected/ignored failures (paradigmxyz#18863)

b550387

docs(engine): fix outdated comment on TreeMetrics (paradigmxyz#18855)

978b8a2

fix: streamline payload conversion in custom engine API (paradigmxyz#…

f54741c

…18864)

feat: Use generic HeaderTy for reth db get static-file headers (p…

d77bfd8

…aradigmxyz#18870) Co-authored-by: sprites0 <199826320+sprites0@users.noreply.github.com>

feat(storage): read headers and transactions only from static files (p…

e9598ba

…aradigmxyz#18788)

update fork base commit

28deb3c

feat: reconcile upstream merge

f3f7027

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

greged93 commented Oct 7, 2025

View reviewed changes

greged93 requested review from Thegaram, frisitano and jonastheis October 7, 2025 11:31

fix: lints and format

348a029

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

greged93 force-pushed the chore-merge-upstream-e9598ba5a branch from 220c772 to 348a029 Compare October 7, 2025 11:43

greged93 mentioned this pull request Oct 7, 2025

chore(deps): weekly cargo update #330

Closed

greged93 added 3 commits October 8, 2025 09:43

fix: doc lints

94f1046

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

fix: make clippy happy

94403ca

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

chore: point revm to default branch

2d9fb76

Signed-off-by: Gregory Edison <gregory.edison1993@gmail.com>

frisitano approved these changes Oct 9, 2025

View reviewed changes

greged93 merged commit 32019bc into scroll Oct 9, 2025
42 of 45 checks passed

greged93 deleted the chore-merge-upstream-e9598ba5a branch October 9, 2025 15:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: merge upstream e9598ba5a #346

chore: merge upstream e9598ba5a #346

Uh oh!

greged93 commented Oct 7, 2025

Uh oh!

greged93 Oct 7, 2025 •

edited

Loading

Uh oh!

greged93 Oct 7, 2025

Uh oh!

frisitano Oct 8, 2025

Uh oh!

greged93 Oct 7, 2025

Uh oh!

codspeed-hq bot commented Oct 7, 2025 •

edited

Loading

Uh oh!

greged93 commented Oct 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

71 participants

chore: merge upstream e9598ba5a #346

chore: merge upstream e9598ba5a #346

Uh oh!

Conversation

greged93 commented Oct 7, 2025

Uh oh!

greged93 Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

greged93 Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

frisitano Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

greged93 Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

codspeed-hq bot commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging #346 will not alter performance

Summary

Uh oh!

greged93 commented Oct 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

71 participants

greged93 Oct 7, 2025 •

edited

Loading

codspeed-hq bot commented Oct 7, 2025 •

edited

Loading