build: upgrade to latest REVM #669

Wodann · 2024-09-16T23:18:45Z

This PR bumps our REVM dependency to Wodann/revm@31771cc, which is the latest commit of REVM with some minor modifications:

Revert of a yanked dependency
Splitting of the trait EvmWiring into an additional trait ChainSpec such that we can have a compile-time constant ChainSpec without depending on the Database and ExternalContext associated types.
Revert changes to REVM that require Rust v1.81.

NOTE
Support for Rust v1.81 is blocked by a bug introduced in Rust v1.81. Unfortunately, REVM requires v1.81 without the changes made in our fork and EDR, preventing us from reverting to an older version of Rust.

Compiler errors in REVM using Rust v1.80 - without changes

``` error[E0658]: use of unstable library feature 'error_in_core' --> crates/primitives/src/eip7702/bytecode.rs:96:6 | 96 | impl core::error::Error for Eip7702DecodeError {} | ^^^^^^^^^^^^^^^^^^ | = note: see issue #103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/bytecode.rs:238:6
|
238 | impl core::error::Error for BytecodeDecodeError {}
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/bytecode/eof.rs:185:6
|
185 | impl core::error::Error for EofDecodeError {}
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/evm_wiring.rs:21:35
|
21 | type ValidationError: Debug + core::error::Error;
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/precompile.rs:143:6
|
143 | impl core::error::Error for PrecompileErrors {}
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/precompile.rs:198:6
|
198 | impl core::error::Error for PrecompileError {}
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/result.rs:316:6
|
316 | impl core::error::Error for InvalidTransaction {}
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information

error[E0658]: use of unstable library feature 'error_in_core'
--> crates/primitives/src/result.rs:392:6
|
392 | impl core::error::Error for InvalidHeader {}
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #103765 rust-lang/rust#103765 for more information


</details>

changeset-bot · 2024-09-16T23:18:49Z

🦋 Changeset detected

Latest commit: 3fa7969

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
@nomicfoundation/edr	Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

codecov · 2024-09-17T05:03:56Z

Codecov Report

Attention: Patch coverage is 62.07865% with 135 lines in your changes missing coverage. Please review.

Please upload report for BASE (feat/multichain@bcdcafa). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
crates/edr_napi_core/src/logger.rs	0.00%	29 Missing ⚠️
crates/edr_napi_core/src/spec.rs	0.00%	23 Missing ⚠️
crates/edr_provider/src/data.rs	73.68%	9 Missing and 6 partials ⚠️
crates/edr_evm/src/runtime.rs	30.76%	9 Missing ⚠️
crates/edr_optimism/src/spec.rs	42.85%	8 Missing ⚠️
crates/edr_provider/src/error.rs	0.00%	7 Missing ⚠️
crates/edr_provider/src/requests/eth/call.rs	16.66%	5 Missing ⚠️
crates/edr_evm/src/block/builder.rs	20.00%	4 Missing ⚠️
crates/edr_provider/src/data/gas.rs	42.85%	4 Missing ⚠️
crates/edr_provider/src/requests/eth/config.rs	20.00%	4 Missing ⚠️
... and 18 more

Additional details and impacted files

@@                Coverage Diff                 @@
##             feat/multichain     #669   +/-   ##
==================================================
  Coverage                   ?   63.04%           
==================================================
  Files                      ?      215           
  Lines                      ?    23677           
  Branches                   ?    23677           
==================================================
  Hits                       ?    14926           
  Misses                     ?     7837           
  Partials                   ?      914

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

agostbiro

Thanks, LGTM

Xanewok

Thanks for simplifying some of the traits/ADTs! The changes make sense and strictly improve what we have, so I'm fine with landing this if that's possible, left one thread about the naming but that's non-blocking.

For the Rust 1.81, would it be possible to submit a patch that downgrades MSRV for revm to use the std Error types for now? I looked at the upstream rustc issue and I'm not sure that's going to be backported soon, so it looks like we're stuck on <1.81 for a while.

crates/edr_optimism/Cargo.toml

crates/edr_provider/Cargo.toml

Xanewok · 2024-09-18T08:57:06Z

crates/edr_generic/src/spec.rs


-    const MIN_ETHASH_DIFFICULTY: u64 = 131072;
+    const MIN_ETHASH_DIFFICULTY: u64 = L1ChainSpec::MIN_ETHASH_DIFFICULTY;


That's better, thanks!

Xanewok · 2024-09-18T08:57:24Z

crates/edr_generic/src/spec.rs

-            remainder => TransactionFailureReason::Inner(remainder),
-        }
+    fn cast_halt_reason(reason: Self::HaltReason) -> TransactionFailureReason<Self::HaltReason> {
+        <L1ChainSpec as ProviderSpec<TimerT>>::cast_halt_reason(reason)


Thanks for simplifying this!

crates/edr_evm/src/chain_spec.rs

Wodann added the no changeset needed This PR doesn't require a changeset label Sep 16, 2024

Wodann self-assigned this Sep 16, 2024

Wodann had a problem deploying to github-action-benchmark September 16, 2024 23:18 — with GitHub Actions Failure

Base automatically changed from refactor/single-npm-package to feat/multichain September 17, 2024 00:42

Wodann added 7 commits September 17, 2024 00:56

WIP: build: upgrade to latest REVM

adfcbef

fix: use dummy values for DB and external context

d411c29

refactor: adopt REVM in edr_evm

91716b5

WIP

037f8c0

WIP

78518db

WIP

0e42157

fix: edr_optimism build errors

52f11b3

Wodann force-pushed the build/upgrade-revm branch from cfc180b to 52f11b3 Compare September 17, 2024 01:00

Wodann had a problem deploying to github-action-benchmark September 17, 2024 01:00 — with GitHub Actions Error

misc: update index.d.ts

6622fda

Wodann removed the no changeset needed This PR doesn't require a changeset label Sep 17, 2024

Wodann had a problem deploying to github-action-benchmark September 17, 2024 01:12 — with GitHub Actions Failure

Wodann added 2 commits September 17, 2024 04:26

fix: always set external context

26423b5

fix: style

eedeac1

Wodann had a problem deploying to github-action-benchmark September 17, 2024 04:26 — with GitHub Actions Error

chore: remove dead code

6c24beb

Wodann had a problem deploying to github-action-benchmark September 17, 2024 04:39 — with GitHub Actions Failure

fix: set hardfork

4c9d3b6

Wodann temporarily deployed to github-action-benchmark September 17, 2024 04:55 — with GitHub Actions Inactive

bump: napi

6f4f031

Wodann temporarily deployed to github-action-benchmark September 17, 2024 19:05 — with GitHub Actions Inactive

Wodann added 2 commits September 17, 2024 21:41

fix: clippy and doc comments

f233377

update index.d.ts

16bb38c

Wodann temporarily deployed to github-action-benchmark September 17, 2024 21:50 — with GitHub Actions Inactive

revert to Rust 1.80

6075480

Wodann temporarily deployed to github-action-benchmark September 17, 2024 22:23 — with GitHub Actions Inactive

Wodann marked this pull request as ready for review September 17, 2024 22:25

Wodann requested a review from a team September 17, 2024 22:50

agostbiro approved these changes Sep 18, 2024

View reviewed changes

Xanewok approved these changes Sep 18, 2024

View reviewed changes

Wodann linked an issue Sep 18, 2024 that may be closed by this pull request

Consider updating chain specification traits based on findings from GenericChainSpec implementation #656

Open

refactor: rename EvmSpec

043cabc

Wodann temporarily deployed to github-action-benchmark September 18, 2024 18:38 — with GitHub Actions Inactive

Wodann added 2 commits September 18, 2024 18:43

refactor: rename chain_spec.rs to spec.rs

6d0ed6d

fix: formatting

feb0d9b

Wodann temporarily deployed to github-action-benchmark September 18, 2024 19:25 — with GitHub Actions Inactive

fix: docs

3fa7969

Wodann temporarily deployed to github-action-benchmark September 18, 2024 20:19 — with GitHub Actions Inactive

Wodann merged commit 618da93 into feat/multichain Sep 18, 2024
41 checks passed

Wodann deleted the build/upgrade-revm branch September 18, 2024 20:58

github-actions bot locked as resolved and limited conversation to collaborators Dec 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: upgrade to latest REVM #669

build: upgrade to latest REVM #669

Wodann commented Sep 16, 2024 •

edited

Loading

changeset-bot bot commented Sep 16, 2024 •

edited

Loading

codecov bot commented Sep 17, 2024 •

edited

Loading

agostbiro left a comment

Xanewok left a comment

Xanewok Sep 18, 2024

Xanewok Sep 18, 2024


		const MIN_ETHASH_DIFFICULTY: u64 = 131072;
		const MIN_ETHASH_DIFFICULTY: u64 = L1ChainSpec::MIN_ETHASH_DIFFICULTY;

build: upgrade to latest REVM #669

build: upgrade to latest REVM #669

Conversation

Wodann commented Sep 16, 2024 • edited Loading

changeset-bot bot commented Sep 16, 2024 • edited Loading

🦋 Changeset detected

codecov bot commented Sep 17, 2024 • edited Loading

Codecov Report

agostbiro left a comment

Choose a reason for hiding this comment

Xanewok left a comment

Choose a reason for hiding this comment

Xanewok Sep 18, 2024

Choose a reason for hiding this comment

Xanewok Sep 18, 2024

Choose a reason for hiding this comment

Wodann commented Sep 16, 2024 •

edited

Loading

changeset-bot bot commented Sep 16, 2024 •

edited

Loading

codecov bot commented Sep 17, 2024 •

edited

Loading