build: upgrade revm to v12 (#557)

* build: upgrade revm to v12 * test: remove invalid test * misc: add changeset
NomicFoundation · Jul 18, 2024 · e02eb22 · e02eb22
1 parent 7aa2f61
commit e02eb22
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 52 deletions.
diff --git a/.changeset/thick-impalas-sparkle.md b/.changeset/thick-impalas-sparkle.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/edr": patch
+---
+
+Fixed a bug in the JSON-RPC where we previously allowed a null value for storage keys of an access list
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/edr_eth/Cargo.toml b/crates/edr_eth/Cargo.toml
@@ -15,8 +15,7 @@ itertools = { version = "0.10.5", default-features = false, features = ["use_all
 k256 = { version = "0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "pkcs8", ] }
 log = { version = "0.4.17", default-features = false }
 once_cell = { version = "1.18.0", default-features = false, features = ["alloc", "race", "std"] }
-# revm-primitives = { version = "5.0", default-features = false, features = ["c-kzg", "hashbrown"] }
-revm-primitives = { git = "https://github.com/NomicFoundation/revm", rev = "be50b38", version = "6.0", default-features = false, features = ["c-kzg", "hashbrown"] }
+revm-primitives = { version = "7.0", default-features = false, features = ["c-kzg", "hashbrown"] }
 serde = { version = "1.0.147", default-features = false, features = ["derive"], optional = true }
 sha2 = { version = "0.10.8", default-features = false }
 sha3 = { version = "0.10.8", default-features = false }

diff --git a/crates/edr_evm/Cargo.toml b/crates/edr_evm/Cargo.toml
@@ -19,8 +19,7 @@ parking_lot = { version = "0.12.1", default-features = false }
 edr_defaults = { version = "0.3.5", path = "../edr_defaults" }
 edr_eth = { version = "0.3.5", path = "../edr_eth", features = ["rand", "serde"] }
 edr_rpc_eth = { version = "0.3.5", path = "../edr_rpc_eth" }
-# revm = { version = "10.0", default-features = false, features = ["c-kzg", "dev", "serde", "std"] }
-revm = { git = "https://github.com/NomicFoundation/revm", rev = "be50b38", version = "11.0", default-features = false, features = ["c-kzg", "dev", "serde", "std"] }
+revm = { version = "12.0", default-features = false, features = ["c-kzg", "dev", "serde", "std"] }
 rpds = { version = "1.1.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.158", default-features = false, features = ["std"] }
 serde_json = { version = "1.0.94", default-features = false, features = ["std"] }

diff --git a/crates/edr_provider/Cargo.toml b/crates/edr_provider/Cargo.toml
@@ -20,8 +20,7 @@ lazy_static = { version = "1.4.0", default-features = false }
 log = { version = "0.4.20", default-features = false }
 parking_lot = { version = "0.12.1", default-features = false }
 rand = { version = "0.8.5", default-features = false }
-# revm-precompile = { version = "8.0", default-features = false, features = ["c-kzg", "secp256r1", "std"] }
-revm-precompile = { git = "https://github.com/NomicFoundation/revm", rev = "be50b38", version = "9.0", default-features = false, features = ["c-kzg", "secp256r1", "std"] }
+revm-precompile = { version = "9.1", default-features = false, features = ["c-kzg", "secp256r1", "std"] }
 rpds = { version = "1.1.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.147", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.89" }

diff --git a/hardhat-tests/test/internal/hardhat-network/provider/modules/eth/hardforks.ts b/hardhat-tests/test/internal/hardhat-network/provider/modules/eth/hardforks.ts
@@ -532,39 +532,6 @@ describe("Eth module - hardfork dependant tests", function () {
             );
             assert.deepEqual(tx.accessList, accessList);
           });
-
-          it("Should accept access lists with null storageKeys", async function () {
-            const accessList = [
-              {
-                address: "0x1234567890123456789012345678901234567890",
-                storageKeys: null,
-              },
-            ];
-            const [sender] = await this.provider.send("eth_accounts");
-            const txHash = await this.provider.send("eth_sendTransaction", [
-              {
-                from: sender,
-                to: sender,
-                accessList,
-              },
-            ]);
-
-            const tx = await this.provider.send("eth_getTransactionByHash", [
-              txHash,
-            ]);
-
-            assert.equal(tx.type, numberToRpcQuantity(1));
-            assert.equal(
-              tx.chainId,
-              numberToRpcQuantity(this.common.chainId())
-            );
-            assert.deepEqual(tx.accessList, [
-              {
-                address: "0x1234567890123456789012345678901234567890",
-                storageKeys: [],
-              },
-            ]);
-          });
         });
       });