Skip to content

Commit 9d0985c

Browse files
committed
Integrate with revm interpreter
1 parent 8513c83 commit 9d0985c

File tree

10 files changed

+602
-4
lines changed

10 files changed

+602
-4
lines changed

Cargo.lock

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

Cargo.toml

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ members = [
3131
"crates/dbs/storage",
3232
"crates/cfxcore/vm-interpreter",
3333
"crates/cfxcore/vm-types",
34+
"crates/util/alloy-type-conversions",
3435
"crates/util/cfx-vm-tracer-derive",
3536
"crates/util/dag",
3637
"crates/util/delegate",
@@ -150,6 +151,7 @@ cfx-rpc-primitives = { path = "./crates/rpc/rpc-primitives" }
150151
cfx-rpc-cfx-types = { path = "./crates/rpc/rpc-cfx-types" }
151152
cfx-parity-trace-types = { path = "./crates/cfxcore/parity-trace-types" }
152153
cfx-rpc-eth-api = { path = "./crates/rpc/rpc-eth-api" }
154+
alloy-type-conversions = { path = "./crates/util/alloy-type-conversions" }
153155

154156
serde = { version = "1.0", features = ["derive", "alloc"] }
155157
serde_json = "1.0"
@@ -182,6 +184,11 @@ alloy-primitives = "0.7.2"
182184
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
183185
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
184186
revm = "8.0"
187+
# revm-interpreter = "6.0"
188+
# revm-primitives = "5.0"
189+
revm-interpreter = { git = "https://github.com/Conflux-Chain/revm.git", branch = "dev"}
190+
revm-primitives = { git = "https://github.com/Conflux-Chain/revm.git", branch = "dev"}
191+
185192

186193
bls-signatures = { git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore", "blst"] }
187194

crates/cfxcore/executor/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ c-kzg = { version = "1.0.2", default-features = false}
5454
once_cell = "1.19"
5555
rayon = { workspace = true }
5656
cfx-parity-trace-types = { workspace = true }
57+
revm-interpreter = { workspace = true }
58+
alloy-type-conversions = { workspace = true }
5759

5860
[dev-dependencies]
5961
cfx-statedb = { workspace = true, features = ["testonly_code"]}

crates/cfxcore/executor/src/context.rs crates/cfxcore/executor/src/context/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// Conflux is free software and distributed under GNU General Public License.
33
// See http://www.gnu.org/licenses/
44

5+
mod revm;
6+
7+
pub(crate) use revm::EvmHost;
8+
59
// Transaction execution environment.
610
use crate::{
711
executive::contract_address,

0 commit comments

Comments
 (0)