feat: alloy migration by DaniPopes · Pull Request #535 · bluealloy/revm

DaniPopes · 2023-06-30T23:06:29Z

Based on #499, so using that as PR base for better diff for now.
Will need an alloy-primitives v0.2.1 release for hex macros and other stuff.

Main changes:

bits types (B160, B256) are now coming from alloy_primitives, which are type aliases to FixedBytes<N>
- using the tuple constructor (B*([...])) is not allowed, so we use ::new or ::from
- B160 -> Address: Address is its own type, different from B160, with its own methods and trait impls
- a lot of hex::decode moved to use of address!, b256!, bytes! macros
- serde utils such as serde_hex_bytes and other util functions are not needed anymore, since the base serde impls of Bytes and FixedBytes use hex by default.
changed use of sha3::Keccak256 to alloy_primitives::keccak256, which uses tiny_keccak
replaced ruint with alloy_primitives::ruint (which is ruint2 for now which includes many unreleased changes, see: recmo/uint@v1.8.0...alloy-rs:uint:main)
removed usage of rlp in favor of alloy_rlp where possible (revme)
updated documentation accordingly

rakita

two nits and one q, but otherwise this looks great!

Will pause other PR's until this is merged, so you don't have conflicts.

rakita · 2023-08-14T14:45:04Z

bins/revme/Cargo.toml

-rlp = { version = "0.5", default-features = false }
-ruint = { version = "1.8.0", features = ["rlp", "serde"] }
+alloy-rlp = { version = "0.3", default-features = false, features = ["arrayvec"] }
+ruint = { version = "1.9.0", features = ["rlp", "serde"] }


Would be good to reexport it from alloy so the version and all other things are tied to it.

ruint is already reexported so it can be removed, but rlp needs the "arrayvec" feature flag

rakita · 2023-08-14T14:47:33Z

bins/revme/src/statetest/merkle_trie.rs

-
+pub fn log_rlp_hash(logs: &[Log]) -> B256 {
+    let mut out = Vec::with_capacity(alloy_rlp::list_length(logs));
+    alloy_rlp::encode_list(logs, &mut out);


oh, this is nice!

rakita · 2023-08-14T14:51:21Z

bins/revme/src/statetest/models/deserializer.rs

-    Ok(output)
-}
-
-pub fn deserialize_str_as_u256<'de, D>(deserializer: D) -> Result<U256, D::Error>


rakita · 2023-08-14T14:58:36Z

bins/revme/src/statetest/models/mod.rs


 pub type AccessList = Vec<AccessListItem>;

+pub fn deserialize_maybe_empty<'de, D>(deserializer: D) -> Result<Option<Address>, D::Error>


You moved this function from models/deserializalizer.rs file, imo original place seems like a better place?

I removed all the functions preemptively then added them back in because it failed parsing. Just forgot to put it back in its original place

rakita · 2023-08-14T14:59:13Z

bins/revme/src/statetest/runner.rs

+        || name == "Call50000_sha256.json"
+        || name == "static_Call50000_sha256.json"
+        || name == "loopMul.json"
+        || name == "CALLBlake2f_MaxRounds.json"


good cleanup

rakita · 2023-08-14T15:00:15Z

bins/revme/src/statetest/runner.rs

-            )),
-            B160(hex!("dcc5ba93a1ed7e045690d722f2bf460a51c61415")),
+            b256!("fe13266ff57000135fb9aa854bbfe455d8da85b21f626307bf3263a0c2a8e7fe"),
+            address!("dcc5ba93a1ed7e045690d722f2bf460a51c61415"),


love this macros

rakita · 2023-08-15T12:57:40Z

crates/revm/src/db/ethersdb.rs

-    fn basic(&mut self, address: B160) -> Result<Option<AccountInfo>, Self::Error> {
-        let add = eH160::from(address.0);
+    fn basic(&mut self, address: Address) -> Result<Option<AccountInfo>, Self::Error> {
+        let add = eH160::from(address.0 .0);


Is this correct?

Suggested change

let add = eH160::from(address.0 .0);

let add = eH160::from(address.0);

Yes, Address is a wrapper around FixedBytes<20>, which itself is a wrapper around [u8; 20]: https://docs.rs/alloy-primitives/latest/alloy_primitives/struct.Address.html

I thought that Address wraps only [u8; 20], makes sense

rakita · 2023-08-15T12:58:16Z

crates/revm/src/db/ethersdb.rs

-    fn storage(&mut self, address: B160, index: U256) -> Result<U256, Self::Error> {
-        let add = eH160::from(address.0);
+    fn storage(&mut self, address: Address, index: U256) -> Result<U256, Self::Error> {
+        let add = eH160::from(address.0 .0);


same here?

Suggested change

let add = eH160::from(address.0 .0);

let add = eH160::from(address.0);

This reverts commit f95b7a4.

This reverts commit f95b7a4

This reverts commit eb6a9f0.

This reverts commit f95b7a4

Wodann mentioned this pull request Jul 20, 2023

Adopt alloy primitives NomicFoundation/edr#139

Closed

DaniPopes force-pushed the alloy branch 2 times, most recently from 5686acc to b36e3e4 Compare July 26, 2023 15:13

DaniPopes mentioned this pull request Jul 26, 2023

feat: migrate RLP to alloy-rlp paradigmxyz/reth#3939

Closed

DaniPopes force-pushed the alloy branch 6 times, most recently from 8b3fd9a to 67414f3 Compare August 5, 2023 19:42

DaniPopes force-pushed the alloy branch from 67414f3 to f3054f5 Compare August 8, 2023 23:10

DaniPopes changed the base branch from account_states to main August 8, 2023 23:14

DaniPopes force-pushed the alloy branch 4 times, most recently from 6173cc0 to d577f07 Compare August 9, 2023 01:49

DaniPopes marked this pull request as ready for review August 9, 2023 02:11

Evalir mentioned this pull request Aug 9, 2023

meta: Foundry Cancun readiness foundry-rs/foundry#5574

Closed

10 tasks

DaniPopes mentioned this pull request Aug 9, 2023

chore: bump revm to latest main paradigmxyz/reth#4135

Closed

DaniPopes force-pushed the alloy branch 2 times, most recently from 8341293 to 01d2fb6 Compare August 15, 2023 10:25

rakita reviewed Aug 15, 2023

View reviewed changes

feat: alloy migration

2aff194

DaniPopes force-pushed the alloy branch from 01d2fb6 to 2aff194 Compare August 15, 2023 16:44

rakita merged commit f95b7a4 into bluealloy:main Aug 16, 2023

DaniPopes deleted the alloy branch August 16, 2023 10:41

Evalir added a commit to Evalir/revm that referenced this pull request Aug 17, 2023

Revert "feat: alloy migration (bluealloy#535)"

07d03d0

This reverts commit f95b7a4.

rakita added a commit that referenced this pull request Aug 18, 2023

Revert "feat: alloy migration (#535)"

2d0aed7

This reverts commit f95b7a4.

rakita added a commit that referenced this pull request Aug 18, 2023

Revert "feat: alloy migration (#535)"

e2a7033

This reverts commit f95b7a4

rakita added a commit that referenced this pull request Aug 18, 2023

Revert "feat: alloy migration (#535)" (#616)

eb6a9f0

This reverts commit f95b7a4

rakita added a commit that referenced this pull request Aug 18, 2023

Revert "Revert feat: alloy migration (#535)" (#616)"

6b7e4b5

This reverts commit eb6a9f0.

mikelodder7 pushed a commit to LIT-Protocol/revm that referenced this pull request Sep 12, 2023

Revert "feat: alloy migration (bluealloy#535)" (bluealloy#616)

fa3a673

This reverts commit f95b7a4

github-actions bot mentioned this pull request Jan 12, 2024

chore: release #973

Closed

github-actions bot mentioned this pull request Feb 10, 2025

chore: release abipalli/revm#1

Open

This was referenced Mar 10, 2025

chore: release #2168

Closed

chore: release #2175

Closed


		pub type AccessList = Vec<AccessListItem>;

		pub fn deserialize_maybe_empty<'de, D>(deserializer: D) -> Result<Option<Address>, D::Error>

	let add = eH160::from(address.0 .0);
	let add = eH160::from(address.0);

Comments

Conversation

DaniPopes commented Jun 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rakita 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!

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rakita Aug 16, 2023 • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

DaniPopes commented Jun 30, 2023 •

edited

Loading

rakita left a comment •

edited

Loading

rakita Aug 16, 2023 •

edited

Loading