diff --git a/Cargo.lock b/Cargo.lock index fbad27afa5a1..78116cf6498c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4972,7 +4972,7 @@ dependencies = [ "libc", "minstant", "reth-mdbx-sys", - "revm 6.0.0", + "revm", "revm-utils", "tokio", ] @@ -5814,7 +5814,7 @@ dependencies = [ "reth-tracing", "reth-transaction-pool", "reth-trie", - "revm 6.0.0", + "revm", "revm-inspectors", "revm-utils", "secp256k1 0.27.0", @@ -5869,7 +5869,7 @@ dependencies = [ "reth-revm", "reth-tasks", "reth-transaction-pool", - "revm 6.0.0", + "revm", "tokio", "tracing", ] @@ -6194,7 +6194,7 @@ dependencies = [ "reth-provider", "reth-revm", "reth-transaction-pool", - "revm 6.0.0", + "revm", "tracing", ] @@ -6414,7 +6414,7 @@ version = "0.1.0-alpha.18" dependencies = [ "reth-primitives", "reth-rpc-types", - "revm-primitives 2.0.1", + "revm-primitives", "serde", "thiserror", ] @@ -6573,7 +6573,7 @@ dependencies = [ "reth-provider", "reth-revm", "reth-transaction-pool", - "revm 6.0.0", + "revm", "thiserror", "tracing", ] @@ -6595,8 +6595,8 @@ dependencies = [ "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", - "revm 6.0.0", - "revm-primitives 2.0.1", + "revm", + "revm-primitives", "serde", "sha2", "thiserror", @@ -6649,8 +6649,8 @@ dependencies = [ "reth-codecs", "reth-ethereum-forks", "reth-rpc-types", - "revm 6.0.0", - "revm-primitives 2.0.1", + "revm", + "revm-primitives", "secp256k1 0.27.0", "serde", "serde_json", @@ -6688,7 +6688,7 @@ dependencies = [ "reth-node-api", "reth-primitives", "reth-trie", - "revm 6.0.0", + "revm", "strum 0.26.1", "tempfile", "tokio", @@ -6732,7 +6732,7 @@ dependencies = [ "reth-primitives", "reth-provider", "reth-trie", - "revm 6.0.0", + "revm", "revm-inspectors", "tracing", ] @@ -6778,9 +6778,9 @@ dependencies = [ "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", - "revm 6.0.0", + "revm", "revm-inspectors", - "revm-primitives 2.0.1", + "revm-primitives", "schnellru", "secp256k1 0.27.0", "serde", @@ -6976,7 +6976,7 @@ dependencies = [ "reth-revm", "reth-tokio-util", "reth-trie", - "revm 6.0.0", + "revm", "serde", "serde_json", "thiserror", @@ -7047,7 +7047,7 @@ dependencies = [ "reth-revm", "reth-tasks", "reth-tracing", - "revm 6.0.0", + "revm", "schnellru", "serde", "serde_json", @@ -7073,7 +7073,7 @@ dependencies = [ "reth-interfaces", "reth-primitives", "reth-provider", - "revm 6.0.0", + "revm", "serde_json", "similar-asserts", "thiserror", @@ -7090,31 +7090,16 @@ dependencies = [ "auto_impl", "cfg-if", "hashbrown 0.14.3", - "revm-interpreter 3.0.0", - "revm-precompile 4.0.1", + "revm-interpreter", + "revm-precompile", "revm-utils", "serde", "serde_json", ] -[[package]] -name = "revm" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8154cec6f8c4f543a379cf00a839cf47c67f405e8a92361a7791c55196c9b7e2" -dependencies = [ - "auto_impl", - "cfg-if", - "revm-interpreter 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "revm-precompile 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_json", -] - [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=ac63f06#ac63f069977d04cd68d96fe7ad9dd4b74ceab44e" dependencies = [ "alloy-primitives", "alloy-rpc-trace-types", @@ -7124,7 +7109,7 @@ dependencies = [ "boa_engine", "boa_gc", "colorchoice", - "revm 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm", "serde", "serde_json", "thiserror", @@ -7134,21 +7119,11 @@ dependencies = [ name = "revm-interpreter" version = "3.0.0" dependencies = [ - "revm-primitives 2.0.1", + "revm-primitives", "revm-utils", "serde", ] -[[package]] -name = "revm-interpreter" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff72cc825a9c44b28749a6181e21fa85ba45ac8d4b5732a7ded165a770ecbd9" -dependencies = [ - "revm-primitives 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", -] - [[package]] name = "revm-precompile" version = "4.0.1" @@ -7158,24 +7133,7 @@ dependencies = [ "c-kzg", "k256", "once_cell", - "revm-primitives 2.0.1", - "ripemd", - "secp256k1 0.28.2", - "sha2", - "substrate-bn", -] - -[[package]] -name = "revm-precompile" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186373108c0a46e47368752372cc721d4b0ab4886d6786d180ef9dbf4dd71865" -dependencies = [ - "aurora-engine-modexp", - "c-kzg", - "k256", - "once_cell", - "revm-primitives 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives", "ripemd", "secp256k1 0.28.2", "sha2", @@ -7202,23 +7160,6 @@ dependencies = [ "serde", ] -[[package]] -name = "revm-primitives" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093dc5df253eececaf03ffe0c12d3fd7ce5dea3342bc9de109d1aac2647ffa81" -dependencies = [ - "alloy-primitives", - "auto_impl", - "bitflags 2.4.2", - "bitvec", - "cfg-if", - "enumn", - "hashbrown 0.14.3", - "hex", - "serde", -] - [[package]] name = "revm-utils" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index a306fe5349f3..b202afb50ffa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -173,8 +173,9 @@ reth-trie = { path = "crates/trie" } # revm # revm = { version = "6.0", features = ["std", "secp256k1"], default-features = false } # revm-primitives = { version = "2.0", features = ["std"], default-features = false } -revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "ac63f06" } +# revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "ac63f06" } +revm-inspectors = { path = "/home/andy/Source/work/evm-inspectors" } revm = { path = "/home/andy/Source/work/revm/crates/revm", features = ["std", "secp256k1"], default-features = false } revm-primitives = { path = "/home/andy/Source/work/revm/crates/primitives", features = ["std"], default-features = false } diff --git a/crates/perf-metrics/src/dashboard/displayer.rs b/crates/perf-metrics/src/dashboard/displayer.rs index 73d1f2e0fa78..d8446a6d15ab 100644 --- a/crates/perf-metrics/src/dashboard/displayer.rs +++ b/crates/perf-metrics/src/dashboard/displayer.rs @@ -193,6 +193,10 @@ impl OpcodeStats { self.cat(op).unwrap_or(""), ); } + + println!(); + println!(); + println!("additional rdtsc count: {}", self.opcode_record.additional_count); } fn print_category(&self) { println!("\n");