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: v50 upgrade #39

Conversation

greged93
Copy link
Collaborator

@greged93 greged93 commented Nov 29, 2024

Below are the path that created a conflict during merge:

CONFLICT (content): Merge conflict in CHANGELOG.md
CONFLICT (content): Merge conflict in Cargo.lock
CONFLICT (content): Merge conflict in bins/revm-test/Cargo.toml
CONFLICT (content): Merge conflict in bins/revme/Cargo.toml
CONFLICT (content): Merge conflict in crates/revm/CHANGELOG.md
CONFLICT (content): Merge conflict in crates/revm/Cargo.toml

Following patches need to be updated:

  • alloy-primitives: 0.8.10 -> 0.8.11
  • alloy-sol-types: 0.8.10 -> 0.8.11
  • alloy-eip7702: 0.3.2 -> 0.4

rakita and others added 11 commits October 23, 2024 14:50
* bump alloydb deps

* dev dep
* Osaka Activation

Accept Osaka in unit tests and eof validation tests.

* update test cases

* remove evmone (they are all Prague based)
* remove evmone exclusions
* use [email protected] for eest
* port in EXTDELEGATE precompile fix

* fmt

* Leave space for arbitrary forks in eof validation

* only count validated tests

* remove references to test directories that are not valid with current specs

* refactor flow slightly

* clippy

* fmt
…loy#1845)

* perf(precompile): use secp256k1 global context for ecrecover

* remove secp var
* feat: to_plain_state

* feat: extend to reverts

Co-authored-by: James Prestwich <[email protected]>
* chore: remove Parity re-export

* bump eip7702
@greged93 greged93 marked this pull request as draft November 29, 2024 17:16
@lightsing lightsing changed the base branch from scroll-evm-executor/v49 to scroll-evm-executor/v50 December 5, 2024 00:17
@lightsing
Copy link
Member

I will take it from here. thx @greged93

@lightsing lightsing closed this Dec 5, 2024
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.

7 participants