Skip to content

Commit e02eb22

Browse files
authored
build: upgrade revm to v12 (#557)
* build: upgrade revm to v12 * test: remove invalid test * misc: add changeset
1 parent 7aa2f61 commit e02eb22

File tree

6 files changed

+26
-52
lines changed

6 files changed

+26
-52
lines changed

.changeset/thick-impalas-sparkle.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nomicfoundation/edr": patch
3+
---
4+
5+
Fixed a bug in the JSON-RPC where we previously allowed a null value for storage keys of an access list

Cargo.lock

+18-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/edr_eth/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ itertools = { version = "0.10.5", default-features = false, features = ["use_all
1515
k256 = { version = "0.13.1", default-features = false, features = ["arithmetic", "ecdsa", "pkcs8", ] }
1616
log = { version = "0.4.17", default-features = false }
1717
once_cell = { version = "1.18.0", default-features = false, features = ["alloc", "race", "std"] }
18-
# revm-primitives = { version = "5.0", default-features = false, features = ["c-kzg", "hashbrown"] }
19-
revm-primitives = { git = "https://github.com/NomicFoundation/revm", rev = "be50b38", version = "6.0", default-features = false, features = ["c-kzg", "hashbrown"] }
18+
revm-primitives = { version = "7.0", default-features = false, features = ["c-kzg", "hashbrown"] }
2019
serde = { version = "1.0.147", default-features = false, features = ["derive"], optional = true }
2120
sha2 = { version = "0.10.8", default-features = false }
2221
sha3 = { version = "0.10.8", default-features = false }

crates/edr_evm/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ parking_lot = { version = "0.12.1", default-features = false }
1919
edr_defaults = { version = "0.3.5", path = "../edr_defaults" }
2020
edr_eth = { version = "0.3.5", path = "../edr_eth", features = ["rand", "serde"] }
2121
edr_rpc_eth = { version = "0.3.5", path = "../edr_rpc_eth" }
22-
# revm = { version = "10.0", default-features = false, features = ["c-kzg", "dev", "serde", "std"] }
23-
revm = { git = "https://github.com/NomicFoundation/revm", rev = "be50b38", version = "11.0", default-features = false, features = ["c-kzg", "dev", "serde", "std"] }
22+
revm = { version = "12.0", default-features = false, features = ["c-kzg", "dev", "serde", "std"] }
2423
rpds = { version = "1.1.0", default-features = false, features = ["std"] }
2524
serde = { version = "1.0.158", default-features = false, features = ["std"] }
2625
serde_json = { version = "1.0.94", default-features = false, features = ["std"] }

crates/edr_provider/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ lazy_static = { version = "1.4.0", default-features = false }
2020
log = { version = "0.4.20", default-features = false }
2121
parking_lot = { version = "0.12.1", default-features = false }
2222
rand = { version = "0.8.5", default-features = false }
23-
# revm-precompile = { version = "8.0", default-features = false, features = ["c-kzg", "secp256r1", "std"] }
24-
revm-precompile = { git = "https://github.com/NomicFoundation/revm", rev = "be50b38", version = "9.0", default-features = false, features = ["c-kzg", "secp256r1", "std"] }
23+
revm-precompile = { version = "9.1", default-features = false, features = ["c-kzg", "secp256r1", "std"] }
2524
rpds = { version = "1.1.0", default-features = false, features = ["std"] }
2625
serde = { version = "1.0.147", default-features = false, features = ["derive"] }
2726
serde_json = { version = "1.0.89" }

hardhat-tests/test/internal/hardhat-network/provider/modules/eth/hardforks.ts

-33
Original file line numberDiff line numberDiff line change
@@ -532,39 +532,6 @@ describe("Eth module - hardfork dependant tests", function () {
532532
);
533533
assert.deepEqual(tx.accessList, accessList);
534534
});
535-
536-
it("Should accept access lists with null storageKeys", async function () {
537-
const accessList = [
538-
{
539-
address: "0x1234567890123456789012345678901234567890",
540-
storageKeys: null,
541-
},
542-
];
543-
const [sender] = await this.provider.send("eth_accounts");
544-
const txHash = await this.provider.send("eth_sendTransaction", [
545-
{
546-
from: sender,
547-
to: sender,
548-
accessList,
549-
},
550-
]);
551-
552-
const tx = await this.provider.send("eth_getTransactionByHash", [
553-
txHash,
554-
]);
555-
556-
assert.equal(tx.type, numberToRpcQuantity(1));
557-
assert.equal(
558-
tx.chainId,
559-
numberToRpcQuantity(this.common.chainId())
560-
);
561-
assert.deepEqual(tx.accessList, [
562-
{
563-
address: "0x1234567890123456789012345678901234567890",
564-
storageKeys: [],
565-
},
566-
]);
567-
});
568535
});
569536
});
570537

0 commit comments

Comments
 (0)