(#1) Alloy Migration: first batch (type conversions) #5768

Evalir · 2023-08-31T18:53:06Z

Motivation

This migrates the main Executor and Backend structs to use alloy types. None of the wrappers around the executor/backend or related builders were migrated, and instead, glue was added between them for this PR to serve as a checkpoint in the migration.

Beyond this point, preventing more type-spill is probably not possible as many evm constructs are used directly from the runners and anvil. From here, the entire executor folder will be migrated, and from there the rest of the evm crate.

* feat: migrate non-cheatcode inspectors * fix: properly create both create and create2 addresses * chore: clippy * (#3) Alloy Migration: migrate fork-adjacent files to alloy primitives (#5771) * chore: use create2_from_code * borrow it brah * chore: use from word * chore: drop to_be_bytes * fmt * chore: use from_word on both palces

crates/evm/src/executor/backend/mod.rs

mattsse

more (temporary!!!) conversions

gakonst

Supportive - needless to say calling this project "complete" implies we have no more x_to_y & vice versa conversion code so we still have a lot of work to do...

Next steps IMO:

Keep pushing the conversions to the outer layers
Use alloy-dyn-abi instead of ethabi

In my ideal world, if you switch the ABI types and the CLI result types to Alloy, the only place where I'd expect to see any type conversion code is Anvil's RPC code (which is blocked on alloy-rpc) and the Forking code (which is blocked on alloy-rpc & alloy-providers integrating with Ethereum Mainnet)

gakonst · 2023-09-15T22:13:13Z

Cargo.toml

 [patch.crates-io]
-revm = { git = "https://github.com/bluealloy/revm/", rev = "429da731cd8efdc0939ed912240b2667b9155834" }
-revm-interpreter = { git = "https://github.com/bluealloy/revm/", rev = "429da731cd8efdc0939ed912240b2667b9155834" }
-revm-precompile = { git = "https://github.com/bluealloy/revm/", rev = "429da731cd8efdc0939ed912240b2667b9155834" }
-revm-primitives = { git = "https://github.com/bluealloy/revm/", rev = "429da731cd8efdc0939ed912240b2667b9155834" }
+revm = { git = "https://github.com/Evalir/revm/", branch = "reintroduce-alloy-rebased" }
+revm-interpreter = { git = "https://github.com/Evalir/revm/", branch = "reintroduce-alloy-rebased" }
+revm-precompile = { git = "https://github.com/Evalir/revm/", branch = "reintroduce-alloy-rebased" }
+revm-primitives = { git = "https://github.com/Evalir/revm/", branch = "reintroduce-alloy-rebased" }


mental note that once we merge that PR we're able to finally get rid of all patches

gakonst · 2023-09-15T22:14:12Z

crates/anvil/core/src/eth/proof.rs

    types::{H256, U256},
    utils::rlp,
 };
+use foundry_evm::utils::b256_to_h256;


Is the plan still to transition the Anvil types to Alloy U256? And we just are going to do for this file and other untouched ones in follow-up?

Yep eventually we'll get to them—just letting it happen somewhat naturally by pushing the migration out of the evm crate first.

crates/anvil/core/src/eth/utils.rs

gakonst · 2023-09-15T22:19:16Z

crates/evm/src/executor/abi/mod.rs

 /// `address(bytes20(uint160(uint256(keccak256('hevm cheat code')))))`
-pub const CHEATCODE_ADDRESS: Address = H160([
+pub const CHEATCODE_ADDRESS: Address = Address::new([
    0x71, 0x09, 0x70, 0x9E, 0xcf, 0xa9, 0x1a, 0x80, 0x62, 0x6f, 0xf3, 0x98, 0x9d, 0x68, 0xf6, 0x7f,
    0x5b, 0x1d, 0xd1, 0x2d,
 ]);


nit we can prob use const-keccak here and instead of hardcoding the hash have the pre-image in it, but no need

gakonst · 2023-09-15T22:23:38Z

crates/evm/src/executor/backend/mod.rs

    fn next_id(&mut self) -> U256 {
        let id = self.next_fork_id;
-        self.next_fork_id += U256::one();
+        self.next_fork_id += U256::from(1);


::ONE works i think

seems ZERO's the only constant available: https://docs.rs/ruint/1.10.1/ruint/struct.Uint.html#associatedconstant.ZERO

gakonst · 2023-09-15T22:30:10Z

crates/evm/src/executor/inspector/cheatcodes/env.rs

-            data.journaled_state
-                .set_code(h160_to_b160(inner.0), Bytecode::new_raw(code.0).to_checked());
+            data.journaled_state.set_code(
+                h160_to_b160(inner.0),


I am realizing some of this code snafu could've been avoided if we had added a From<ethers::U256> for alloy::U256 etc. compatibility layer in Alloy, to make the migration easier - as an optional feature, and then remove it

Yep. We'll introduce a conversion trait on foundry to aid with this after we merge this PR!

crates/evm/src/executor/inspector/cheatcodes/fork.rs

Evalir · 2023-09-18T14:13:11Z

CI failure unrelated, fixed in 2ffb568

Evalir added 23 commits August 22, 2023 10:12

feat: use alloy revm branch

7065921

Merge branch 'master' into alloy-migration

6dff335

Merge branch 'master' into alloy-migration

754bb74

fuzz/mod migrated

e5753e2

progress

74c9289

progress, fmt

bcc5845

fix imdb

49b01a2

feat: cheatcodes compile

c0fd7e2

feat: fork backend compiles

c9995d7

feat: trace

d1c85b5

fuzz

21c8003

anvil progress

75b456b

chore: mem, fmt

1501643

chore: db.rs

346e7ad

chore: it lives

4179eb9

fix test

5ab8140

chore: clippy

433a647

Merge branch 'master' into alloy-migration

5997661

workin

820dc99

main backend stuff migrated

db9c877

chore: add glue on other crates

4280315

chore: make executor use alloy types

0e6e956

add glue for executor migration

dc79a19

Evalir marked this pull request as draft September 1, 2023 00:09

Evalir added 3 commits September 1, 2023 13:42

chore: use workspace alloy

eaf9f07

Merge branch 'master' into evalir/make-executor-alloy

568c151

chore: undo revm bump changes

f3ab764

Evalir changed the base branch from alloy-migration to master September 13, 2023 13:22

Evalir added 2 commits September 13, 2023 09:37

chore: remove unneded prefix

32a1134

chore: fix fork fixture

ab27e35

Evalir mentioned this pull request Sep 15, 2023

(#2) Alloy Migration: Migrate non-cheatcode inspectors #5770

Merged

Evalir added 8 commits September 15, 2023 11:45

chore: use address::random

50ff141

chore: make failure slot b256

f3a400a

chore: use address::random

e6f2728

chore: fix indexes

2715489

chore: use contract.hash

e48bde7

chore: do not collect

3e18639

chore: use display on alloy nums

a602104

Evalir force-pushed the evalir/make-executor-alloy branch from e9f5719 to a602104 Compare September 15, 2023 16:26

Evalir added 2 commits September 15, 2023 12:41

use + operator

2b48fb1

chore: unwrap bytes and replace import

6efba29

Evalir force-pushed the evalir/make-executor-alloy branch from 9110744 to 6efba29 Compare September 15, 2023 17:08

Evalir requested a review from DaniPopes September 15, 2023 17:52

DaniPopes approved these changes Sep 15, 2023

View reviewed changes

crates/evm/src/executor/backend/mod.rs Outdated Show resolved Hide resolved

Evalir added 2 commits September 15, 2023 15:41

chore: Into:: -> ::from

0a68a7c

chore: fix test

f40198a

mattsse approved these changes Sep 15, 2023

View reviewed changes

gakonst approved these changes Sep 15, 2023

View reviewed changes

chore: use alloy imports

efd5751

Evalir force-pushed the evalir/make-executor-alloy branch from 7730916 to efd5751 Compare September 16, 2023 04:42

Evalir changed the title ~~(#1) Alloy Migration: Migrate executor / backend structs~~ (#1) Alloy Migration: first update batch. Sep 18, 2023

Evalir changed the title ~~(#1) Alloy Migration: first update batch.~~ (#1) Alloy Migration: first batch (type conversions) Sep 18, 2023

Evalir added 2 commits September 18, 2023 09:50

chore: switch to alloy typesd

69e06ee

chore: fix test

2ffb568

Evalir merged commit 49f4530 into master Sep 18, 2023

Evalir deleted the evalir/make-executor-alloy branch September 18, 2023 14:31

This was referenced Sep 18, 2023

feat(evm): Migrate SolError trait to use dyn-abi, adapt cheatcodes #5849

Merged

Meta: Alloy migration #5216

Closed

(#1) Alloy Migration: first batch (type conversions) #5768

(#1) Alloy Migration: first batch (type conversions) #5768

Uh oh!

Conversation

Evalir commented Aug 31, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation

Uh oh!

Uh oh!

mattsse left a comment

Choose a reason for hiding this comment

Uh oh!

gakonst left a comment • 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Evalir commented Sep 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Evalir commented Aug 31, 2023 •

edited

Loading

gakonst left a comment •

edited

Loading