Skip to content

Commit

Permalink
Integrate with revm interpreter
Browse files Browse the repository at this point in the history
  • Loading branch information
ChenxingLi committed Oct 16, 2024
1 parent 8513c83 commit 9d0985c
Show file tree
Hide file tree
Showing 10 changed files with 602 additions and 4 deletions.
101 changes: 98 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ members = [
"crates/dbs/storage",
"crates/cfxcore/vm-interpreter",
"crates/cfxcore/vm-types",
"crates/util/alloy-type-conversions",
"crates/util/cfx-vm-tracer-derive",
"crates/util/dag",
"crates/util/delegate",
Expand Down Expand Up @@ -150,6 +151,7 @@ cfx-rpc-primitives = { path = "./crates/rpc/rpc-primitives" }
cfx-rpc-cfx-types = { path = "./crates/rpc/rpc-cfx-types" }
cfx-parity-trace-types = { path = "./crates/cfxcore/parity-trace-types" }
cfx-rpc-eth-api = { path = "./crates/rpc/rpc-eth-api" }
alloy-type-conversions = { path = "./crates/util/alloy-type-conversions" }

serde = { version = "1.0", features = ["derive", "alloc"] }
serde_json = "1.0"
Expand Down Expand Up @@ -182,6 +184,11 @@ alloy-primitives = "0.7.2"
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
revm = "8.0"
# revm-interpreter = "6.0"
# revm-primitives = "5.0"
revm-interpreter = { git = "https://github.com/Conflux-Chain/revm.git", branch = "dev"}
revm-primitives = { git = "https://github.com/Conflux-Chain/revm.git", branch = "dev"}


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

Expand Down
2 changes: 2 additions & 0 deletions crates/cfxcore/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ c-kzg = { version = "1.0.2", default-features = false}
once_cell = "1.19"
rayon = { workspace = true }
cfx-parity-trace-types = { workspace = true }
revm-interpreter = { workspace = true }
alloy-type-conversions = { workspace = true }

[dev-dependencies]
cfx-statedb = { workspace = true, features = ["testonly_code"]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
// Conflux is free software and distributed under GNU General Public License.
// See http://www.gnu.org/licenses/

mod revm;

pub(crate) use revm::EvmHost;

// Transaction execution environment.
use crate::{
executive::contract_address,
Expand Down
Loading

0 comments on commit 9d0985c

Please sign in to comment.