From fabf01ca3f541de9d4a5473f3d2a7b8da969f0b6 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 28 May 2024 23:28:48 +0200 Subject: [PATCH] fix --- Cargo.lock | 119 +++++++++--------- Cargo.toml | 28 ++--- crates/rpc/rpc-testing-util/src/debug.rs | 4 +- crates/rpc/rpc/src/debug.rs | 2 +- crates/rpc/rpc/src/eth/api/transactions.rs | 14 +-- crates/rpc/rpc/src/eth/revm_utils.rs | 10 +- .../bundle_state_with_receipts.rs | 4 +- 7 files changed, 95 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55095a16f2f3..d3d4dda04c13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,14 +133,16 @@ dependencies = [ [[package]] name = "alloy-consensus" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "arbitrary", "c-kzg", + "proptest", + "proptest-derive", "serde", ] @@ -178,11 +180,11 @@ dependencies = [ [[package]] name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "arbitrary", "c-kzg", "derive_more", @@ -210,10 +212,10 @@ dependencies = [ [[package]] name = "alloy-genesis" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "serde", "serde_json", ] @@ -244,7 +246,7 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", "serde", @@ -256,13 +258,13 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-json-rpc", "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-signer", "alloy-sol-types", "async-trait", @@ -274,9 +276,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "k256", "serde_json", @@ -316,15 +318,16 @@ dependencies = [ [[package]] name = "alloy-provider" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-chains", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-json-rpc", "alloy-network", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-rpc-types-trace", "alloy-transport", "alloy-transport-http", @@ -369,7 +372,7 @@ dependencies = [ [[package]] name = "alloy-rpc-client" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -389,14 +392,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "alloy-rlp", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-sol-types", "arbitrary", "itertools 0.12.1", @@ -429,19 +432,19 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "serde", ] [[package]] name = "alloy-rpc-types-beacon" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "alloy-rpc-types-engine", "serde", @@ -452,14 +455,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "jsonrpsee-types", "jsonwebtoken 9.3.0", "rand 0.8.5", @@ -470,11 +473,11 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-serde 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "serde", "serde_json", ] @@ -482,7 +485,7 @@ dependencies = [ [[package]] name = "alloy-serde" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", "serde", @@ -502,7 +505,7 @@ dependencies = [ [[package]] name = "alloy-signer" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-primitives", "async-trait", @@ -515,9 +518,9 @@ dependencies = [ [[package]] name = "alloy-signer-wallet" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-network", "alloy-primitives", "alloy-signer", @@ -604,7 +607,7 @@ dependencies = [ [[package]] name = "alloy-transport" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -622,7 +625,7 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy?rev=5940871#5940871a103ed9332956959a9f2efcc2caa73bf0" +source = "git+https://github.com/alloy-rs/alloy?rev=bd39117#bd391179fb4ebf64fe13484e44f2e432baf9b6c2" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -2977,7 +2980,7 @@ dependencies = [ name = "exex-rollup" version = "0.0.0" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-rlp", "alloy-sol-types", "eyre", @@ -6614,9 +6617,9 @@ dependencies = [ name = "reth-codecs" version = "0.2.0-beta.7" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "arbitrary", "bytes", @@ -6842,9 +6845,9 @@ dependencies = [ name = "reth-e2e-test-utils" version = "0.2.0-beta.7" dependencies = [ - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-network", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-signer", "alloy-signer-wallet", "eyre", @@ -7065,7 +7068,7 @@ dependencies = [ name = "reth-evm-ethereum" version = "0.2.0-beta.7" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "reth-ethereum-consensus", "reth-evm", "reth-primitives", @@ -7658,12 +7661,12 @@ name = "reth-primitives" version = "0.2.0-beta.7" dependencies = [ "alloy-chains", - "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-consensus 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-trie", "arbitrary", "assert_matches", @@ -7765,7 +7768,7 @@ dependencies = [ name = "reth-revm" version = "0.2.0-beta.7" dependencies = [ - "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-eips 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "reth-consensus-common", "reth-execution-errors", "reth-primitives", @@ -7950,7 +7953,7 @@ name = "reth-rpc-types" version = "0.2.0-beta.7" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-rpc-types-anvil", "alloy-rpc-types-beacon", "alloy-rpc-types-engine", @@ -7971,7 +7974,7 @@ name = "reth-rpc-types-compat" version = "0.2.0-beta.7" dependencies = [ "alloy-rlp", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "reth-primitives", "reth-rpc-types", "serde_json", @@ -8114,7 +8117,7 @@ dependencies = [ name = "reth-testing-utils" version = "0.2.0-beta.7" dependencies = [ - "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-genesis 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "rand 0.8.5", "reth-primitives", "secp256k1 0.28.2", @@ -8248,10 +8251,10 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=96dea69#96dea695f113d933af918e9a0add1ae47f861a10" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=ed5450e#ed5450e7169ce0237e791fed661688c55997a0ac" dependencies = [ "alloy-primitives", - "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=5940871)", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=bd39117)", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index 2b6045c49e89..a94a65c65866 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -312,7 +312,7 @@ revm = { version = "9.0.0", features = [ revm-primitives = { version = "4.0.0", features = [ "std", ], default-features = false } -revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "96dea69" } +revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "ed5450e" } # eth alloy-chains = "0.1.15" @@ -321,21 +321,21 @@ alloy-dyn-abi = "0.7.2" alloy-sol-types = "0.7.2" alloy-rlp = "0.3.4" alloy-trie = "0.4" -alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "5940871", default-features = false, features = [ +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117", default-features = false, features = [ "reqwest", ] } -alloy-eips = { git = "https://github.com/alloy-rs/alloy", default-features = false, rev = "5940871" } -alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } -alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "5940871" } +alloy-eips = { git = "https://github.com/alloy-rs/alloy", default-features = false, rev = "bd39117" } +alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } +alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "bd39117" } # misc auto_impl = "1" diff --git a/crates/rpc/rpc-testing-util/src/debug.rs b/crates/rpc/rpc-testing-util/src/debug.rs index bdb549c30370..f409c3ce3d97 100644 --- a/crates/rpc/rpc-testing-util/src/debug.rs +++ b/crates/rpc/rpc-testing-util/src/debug.rs @@ -413,8 +413,8 @@ mod tests { let url = parse_env_url("RETH_RPC_TEST_NODE_URL").unwrap(); let client = HttpClientBuilder::default().build(url).unwrap(); - let opts = - GethDebugTracingOptions::default().call_config(CallConfig::default().only_top_call()); + let opts = GethDebugTracingOptions::default() + .with_call_config(CallConfig::default().only_top_call()); let mut stream = client.debug_trace_transactions_in_block(block, opts).await.unwrap(); while let Some(res) = stream.next().await { diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index ebc52877d848..f5c9ed2fe4d4 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -519,7 +519,7 @@ where env: EnvWithHandlerCfg, db: &mut CacheDB>, transaction_context: Option, - ) -> EthResult<(GethTrace, revm_primitives::State)> { + ) -> EthResult<(GethTrace, revm_primitives::EvmState)> { let GethDebugTracingOptions { config, tracer, tracer_config, .. } = opts; if let Some(tracer) = tracer { diff --git a/crates/rpc/rpc/src/eth/api/transactions.rs b/crates/rpc/rpc/src/eth/api/transactions.rs index 538aa606b816..7c03c4c21dc8 100644 --- a/crates/rpc/rpc/src/eth/api/transactions.rs +++ b/crates/rpc/rpc/src/eth/api/transactions.rs @@ -39,8 +39,8 @@ use reth_transaction_pool::{TransactionOrigin, TransactionPool}; use revm::{ db::CacheDB, primitives::{ - db::DatabaseCommit, BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ExecutionResult, - ResultAndState, SpecId, State, + db::DatabaseCommit, BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, EvmState, + ExecutionResult, ResultAndState, SpecId, }, GetInspector, Inspector, }; @@ -425,7 +425,7 @@ pub trait EthTransactions: Send + Sync { TransactionInfo, TracingInspector, ExecutionResult, - &'a State, + &'a EvmState, &'a StateCacheDB, ) -> EthResult + Send @@ -462,7 +462,7 @@ pub trait EthTransactions: Send + Sync { TransactionInfo, Insp, ExecutionResult, - &'a State, + &'a EvmState, &'a StateCacheDB, ) -> EthResult + Send @@ -491,7 +491,7 @@ pub trait EthTransactions: Send + Sync { TransactionInfo, TracingInspector, ExecutionResult, - &'a State, + &'a EvmState, &'a StateCacheDB, ) -> EthResult + Send @@ -529,7 +529,7 @@ pub trait EthTransactions: Send + Sync { TransactionInfo, Insp, ExecutionResult, - &'a State, + &'a EvmState, &'a StateCacheDB, ) -> EthResult + Send @@ -1278,7 +1278,7 @@ where TransactionInfo, Insp, ExecutionResult, - &'a State, + &'a EvmState, &'a StateCacheDB, ) -> EthResult + Send diff --git a/crates/rpc/rpc/src/eth/revm_utils.rs b/crates/rpc/rpc/src/eth/revm_utils.rs index c2855163bad4..fcd132bfec1a 100644 --- a/crates/rpc/rpc/src/eth/revm_utils.rs +++ b/crates/rpc/rpc/src/eth/revm_utils.rs @@ -537,13 +537,19 @@ where account, new_account_state .into_iter() - .map(|(slot, value)| (U256::from_be_bytes(slot.0), value)) + .map(|(slot, value)| { + (U256::from_be_bytes(slot.0), U256::from_be_bytes(value.0)) + }) .collect(), )?; } (None, Some(account_state_diff)) => { for (slot, value) in account_state_diff { - db.insert_account_storage(account, U256::from_be_bytes(slot.0), value)?; + db.insert_account_storage( + account, + U256::from_be_bytes(slot.0), + U256::from_be_bytes(value.0), + )?; } } }; diff --git a/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs b/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs index b185ff08570a..71992152ed4f 100644 --- a/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs +++ b/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs @@ -946,7 +946,7 @@ mod tests { info: into_revm_acc(account2.0), storage: HashMap::from_iter([( slot2, - StorageSlot::new_changed(account2_slot2_old_value, account2_slot2_new_value), + EvmStorageSlot::new_changed(account2_slot2_old_value, account2_slot2_new_value), )]), }, )])); @@ -1014,7 +1014,7 @@ mod tests { info: into_revm_acc(account1_new), storage: HashMap::from_iter([( slot20, - StorageSlot::new_changed(U256::ZERO, account1_slot20_value), + EvmStorageSlot::new_changed(U256::ZERO, account1_slot20_value), )]), }, )]));