Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update revm #43

Merged
merged 1 commit into from
Feb 20, 2024
Merged

update revm #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/reth/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ impl<DB: Database + DatabaseMetrics + DatabaseMetadata + 'static> 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);
}

Expand Down
4 changes: 2 additions & 2 deletions crates/revm/src/processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()
}
}

Expand Down
Loading