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

Jump to bottom

fix(rpc/rpc): gas and gasUsed in trace root only for ParityTrace #9761

Merged
merged 6 commits into from
Jul 25, 2024
Merged

fix(rpc/rpc): gas and gasUsed in trace root only for ParityTrace #9761

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65e932e
Fix gas and gasUsed in trace root only for ParityTrace
ZzPoLariszZ Jul 24, 2024
d039669
Remove the redundant clone
ZzPoLariszZ Jul 25, 2024
c82e148
Update the revm-inspectors version
ZzPoLariszZ Jul 25, 2024
26a301e
Update Cargo.toml
mattsse Jul 25, 2024
f9e13f0
Correct the copy of tx_gas_limit
ZzPoLariszZ Jul 25, 2024
d8ac277
Resolved merge conflicts
ZzPoLariszZ Jul 25, 2024
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
66 changes: 37 additions & 29 deletions crates/rpc/rpc/src/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,9 @@ where
.inner
.eth_api
.spawn_with_call_at(call, at, overrides, move |db, env| {
let (res, _) = this.eth_api().inspect(db, env, &mut inspector)?;
let (res, env) = this.eth_api().inspect(db, env, &mut inspector)?;
let frame = inspector
.with_transaction_gas_limit(env.tx.gas_limit)
.into_geth_builder()
.geth_call_traces(call_config, res.result.gas_used());
Ok(frame.into())
Expand All @@ -330,22 +331,23 @@ where
TracingInspectorConfig::from_geth_prestate_config(&prestate_config),
);

let frame =
self.inner
.eth_api
.spawn_with_call_at(call, at, overrides, move |db, env| {
// wrapper is hack to get around 'higher-ranked lifetime error',
// see <https://github.com/rust-lang/rust/issues/100013>
let db = db.0;

let (res, _) =
this.eth_api().inspect(&mut *db, env, &mut inspector)?;
let frame = inspector
.into_geth_builder()
.geth_prestate_traces(&res, prestate_config, db)?;
Ok(frame)
})
.await?;
let frame = self
.inner
.eth_api
.spawn_with_call_at(call, at, overrides, move |db, env| {
// wrapper is hack to get around 'higher-ranked lifetime error',
// see <https://github.com/rust-lang/rust/issues/100013>
let db = db.0;

let (res, env) =
this.eth_api().inspect(&mut *db, env, &mut inspector)?;
let frame = inspector
.with_transaction_gas_limit(env.tx.gas_limit)
.into_geth_builder()
.geth_prestate_traces(&res, prestate_config, db)?;
Ok(frame)
})
.await?;
return Ok(frame.into())
}
GethDebugBuiltInTracerType::NoopTracer => Ok(NoopFrame::default().into()),
Expand Down Expand Up @@ -403,17 +405,20 @@ where

let mut inspector = TracingInspector::new(inspector_config);

let (res, inspector) = self
let (res, tx_gas_limit, inspector) = self
.inner
.eth_api
.spawn_with_call_at(call, at, overrides, move |db, env| {
let (res, _) = this.eth_api().inspect(db, env, &mut inspector)?;
Ok((res, inspector))
Ok((res, env.tx.gas_limit, inspector))
})
.await?;
let gas_used = res.result.gas_used();
let return_value = res.result.into_output().unwrap_or_default();
let frame = inspector.into_geth_builder().geth_traces(gas_used, return_value, config);
let frame = inspector
.with_transaction_gas_limit(tx_gas_limit)
.into_geth_builder()
.geth_traces(gas_used, return_value, config);

Ok(frame.into())
}
Expand Down Expand Up @@ -566,9 +571,10 @@ where
TracingInspectorConfig::from_geth_call_config(&call_config),
);

let (res, _) = self.eth_api().inspect(db, env, &mut inspector)?;
let (res, env) = self.eth_api().inspect(db, env, &mut inspector)?;

let frame = inspector
.with_transaction_gas_limit(env.tx.gas_limit)
.into_geth_builder()
.geth_call_traces(call_config, res.result.gas_used());

Expand All @@ -582,13 +588,12 @@ where
let mut inspector = TracingInspector::new(
TracingInspectorConfig::from_geth_prestate_config(&prestate_config),
);
let (res, _) = self.eth_api().inspect(&mut *db, env, &mut inspector)?;
let (res, env) = self.eth_api().inspect(&mut *db, env, &mut inspector)?;

let frame = inspector.into_geth_builder().geth_prestate_traces(
&res,
prestate_config,
db,
)?;
let frame = inspector
.with_transaction_gas_limit(env.tx.gas_limit)
.into_geth_builder()
.geth_prestate_traces(&res, prestate_config, db)?;

return Ok((frame.into(), res.state))
}
Expand Down Expand Up @@ -628,10 +633,13 @@ where

let mut inspector = TracingInspector::new(inspector_config);

let (res, _) = self.eth_api().inspect(db, env, &mut inspector)?;
let (res, env) = self.eth_api().inspect(db, env, &mut inspector)?;
let gas_used = res.result.gas_used();
let return_value = res.result.into_output().unwrap_or_default();
let frame = inspector.into_geth_builder().geth_traces(gas_used, return_value, config);
let frame = inspector
.with_transaction_gas_limit(env.tx.gas_limit)
.into_geth_builder()
.geth_traces(gas_used, return_value, config);

Ok((frame.into(), res.state))
}
Expand Down
24 changes: 9 additions & 15 deletions crates/rpc/rpc/src/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,17 +302,15 @@ where
num.into(),
Some(highest_idx),
TracingInspectorConfig::default_parity(),
move |tx_info, inspector, res, _, _| {
move |tx_info, inspector, _, _, _| {
if let Some(idx) = tx_info.index {
if !indices.contains(&idx) {
// only record traces for relevant transactions
return Ok(None)
}
}
let traces = inspector
.with_transaction_gas_used(res.gas_used())
.into_parity_builder()
.into_localized_transaction_traces(tx_info);
let traces =
inspector.into_parity_builder().into_localized_transaction_traces(tx_info);
Ok(Some(traces))
},
);
Expand Down Expand Up @@ -368,11 +366,9 @@ where
.spawn_trace_transaction_in_block(
hash,
TracingInspectorConfig::default_parity(),
move |tx_info, inspector, res, _| {
let traces = inspector
.with_transaction_gas_used(res.result.gas_used())
.into_parity_builder()
.into_localized_transaction_traces(tx_info);
move |tx_info, inspector, _, _| {
let traces =
inspector.into_parity_builder().into_localized_transaction_traces(tx_info);
Ok(traces)
},
)
Expand All @@ -387,11 +383,9 @@ where
let traces = self.inner.eth_api.trace_block_with(
block_id,
TracingInspectorConfig::default_parity(),
|tx_info, inspector, res, _, _| {
let traces = inspector
.with_transaction_gas_used(res.gas_used())
.into_parity_builder()
.into_localized_transaction_traces(tx_info);
|tx_info, inspector, _, _, _| {
let traces =
inspector.into_parity_builder().into_localized_transaction_traces(tx_info);
Ok(traces)
},
);
Expand Down
Loading