diff --git a/Cargo.lock b/Cargo.lock index 78116cf6498c..088080022e2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7086,6 +7086,7 @@ dependencies = [ [[package]] name = "revm" version = "6.0.0" +source = "git+https://github.com/megaeth-labs/revm.git?branch=andy/dev/perf-for-v6.0.0#f4f2987427542ab976ea7a7ce140d55fcb6d3717" dependencies = [ "auto_impl", "cfg-if", @@ -7100,6 +7101,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" +source = "git+https://github.com/megaeth-labs/evm-inspectors.git?branch=match-revm-6.0.0#52c7a76e9107e9cb74912cf265f23dcbffd8e97a" dependencies = [ "alloy-primitives", "alloy-rpc-trace-types", @@ -7118,6 +7120,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "3.0.0" +source = "git+https://github.com/megaeth-labs/revm.git?branch=andy/dev/perf-for-v6.0.0#f4f2987427542ab976ea7a7ce140d55fcb6d3717" dependencies = [ "revm-primitives", "revm-utils", @@ -7127,6 +7130,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "4.0.1" +source = "git+https://github.com/megaeth-labs/revm.git?branch=andy/dev/perf-for-v6.0.0#f4f2987427542ab976ea7a7ce140d55fcb6d3717" dependencies = [ "aurora-engine-modexp", "blst", @@ -7143,6 +7147,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "2.0.1" +source = "git+https://github.com/megaeth-labs/revm.git?branch=andy/dev/perf-for-v6.0.0#f4f2987427542ab976ea7a7ce140d55fcb6d3717" dependencies = [ "alloy-primitives", "auto_impl", @@ -7163,6 +7168,7 @@ dependencies = [ [[package]] name = "revm-utils" version = "0.1.0" +source = "git+https://github.com/megaeth-labs/revm.git?branch=andy/dev/perf-for-v6.0.0#f4f2987427542ab976ea7a7ce140d55fcb6d3717" dependencies = [ "allocator-api2", "ctor 0.2.6", diff --git a/Cargo.toml b/Cargo.toml index b202afb50ffa..5020d20be85c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -175,9 +175,9 @@ reth-trie = { path = "crates/trie" } # revm-primitives = { version = "2.0", features = ["std"], default-features = false } # 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 } +revm = { git = "https://github.com/megaeth-labs/revm.git", branch = "andy/dev/perf-for-v6.0.0", features = ["std", "secp256k1"], default-features = false } +revm-primitives = { git = "https://github.com/megaeth-labs/revm.git", branch = "andy/dev/perf-for-v6.0.0", features = ["std"], default-features = false } +revm-inspectors = { git = "https://github.com/megaeth-labs/evm-inspectors.git", branch = "match-revm-6.0.0" } # eth alloy-chains = { version = "0.1", feature = ["serde", "rlp", "arbitrary"] } @@ -276,7 +276,7 @@ similar-asserts = "1.5.0" ## support perf test perf-metrics = { path = "./crates/perf-metrics"} -revm-utils = { path = "/home/andy/Source/work/revm/crates/utils" } +revm-utils = { git = "https://github.com/megaeth-labs/revm.git", branch = "andy/dev/perf-for-v6.0.0" } [workspace.metadata.cargo-udeps.ignore] # ignored because this is mutually exclusive with the optimism payload builder via feature flags diff --git a/bin/reth/src/builder.rs b/bin/reth/src/builder.rs index ab71c4e8c96e..d976f9eed147 100644 --- a/bin/reth/src/builder.rs +++ b/bin/reth/src/builder.rs @@ -153,7 +153,7 @@ impl NodeBuilderWit { let (dashboard_tx, dashboard_rx) = unbounded_channel(); let dashboard_listener = DashboardListener::new(dashboard_rx); - ctx.task_executor.spawn_critical("dashboard listener task", dashboard_listener); + executor.spawn_critical("dashboard listener task", dashboard_listener); perf_metrics::set_metric_event_sender(dashboard_tx); } diff --git a/crates/revm/src/processor.rs b/crates/revm/src/processor.rs index edfd7ff35ceb..aa2ab96e4415 100644 --- a/crates/revm/src/processor.rs +++ b/crates/revm/src/processor.rs @@ -471,7 +471,7 @@ where let mut cumulative_gas_used = 0; let mut receipts = Vec::with_capacity(block.body.len()); #[cfg(feature = "enable_execute_measure")] - perf_metrics::start_execute_tx_sub_recorder(); + perf_metrics::start_execute_tx_sub_record(); for (sender, transaction) in block.transactions_with_sender() { let time = Instant::now(); // The sum of the transaction’s gas limit, Tg, and the gas utilized in this block prior, @@ -546,7 +546,7 @@ where /// Get state size. #[cfg(feature = "enable_cache_record")] fn get_state_size(&self) -> usize { - self.evm.db.as_ref().map(|db| db.mem_usage()).unwrap_or(0) + self.evm.context.evm.db.mem_usage() } }