Skip to content

feat(rpc): perform js inspector on spawn_with_call_at async tracing task #3957

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

Merged
mattsse merged 2 commits into from
Jul 27, 2023
Merged

feat(rpc): perform js inspector on spawn_with_call_at async tracing task #3957

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cad14b1
add async spawn_with_call_at for JsTracer
tcoratger Jul 27, 2023
2c9845f
fix return formatting
tcoratger Jul 27, 2023
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
29 changes: 13 additions & 16 deletions crates/rpc/rpc/src/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ use crate::{
eth::{
error::{EthApiError, EthResult},
revm_utils::{
clone_into_empty_db, inspect, prepare_call_env, replay_transactions_until,
result_output, EvmOverrides,
clone_into_empty_db, inspect, replay_transactions_until, result_output, EvmOverrides,
},
EthTransactions, TransactionSource,
},
Expand Down Expand Up @@ -266,18 +265,10 @@ where

// for JS tracing we need to setup all async work before we can start tracing
// because JSTracer and all JS types are not Send
let (cfg, block_env, at) = self.inner.eth_api.evm_env_at(at).await?;
let (_, _, at) = self.inner.eth_api.evm_env_at(at).await?;
let state = self.inner.eth_api.state_at(at)?;
let mut db = SubState::new(State::new(state));
let db = SubState::new(State::new(state));
let has_state_overrides = overrides.has_state();
let env = prepare_call_env(
cfg,
block_env,
call,
self.inner.eth_api.call_gas_limit(),
&mut db,
overrides,
)?;

// If the caller provided state overrides we need to clone the DB so the js
// service has access these modifications
Expand All @@ -288,11 +279,17 @@ where

let to_db_service = self.spawn_js_trace_service(at, maybe_override_db)?;

let mut inspector = JsInspector::new(code, config, to_db_service)?;
let (res, env) = inspect(db, env, &mut inspector)?;
let res = self
.inner
.eth_api
.spawn_with_call_at(call, at, overrides, move |db, env| {
let mut inspector = JsInspector::new(code, config, to_db_service)?;
let (res, _) = inspect(db, env.clone(), &mut inspector)?;
Ok(inspector.json_result(res, &env)?)
})
.await?;

let result = inspector.json_result(res, &env)?;
Ok(GethTrace::JS(result))
Ok(GethTrace::JS(res))
}
}
}
Expand Down