jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply foundry improvements to reth (#4518)

Browse Source
This commit is contained in:
Arsenii Kulikov
2023-09-08 16:29:53 +03:00
committed by GitHub
parent 5f329e78b6
commit 95fe20886b
3 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/revm/revm-inspectors/src/access_list.rs
View File

@ -68,10 +68,7 @@ where
_data: &mut EVMData<'_, DB>,
_is_static: bool,
) -> InstructionResult {
let pc = interpreter.program_counter();
let op = interpreter.contract.bytecode.bytecode()[pc];
match op {
match interpreter.current_opcode() {
opcode::SLOAD | opcode::SSTORE => {
if let Ok(slot) = interpreter.stack().peek(0) {
let cur_contract = interpreter.contract.address;

10
crates/revm/revm-inspectors/src/tracing/js/mod.rs
View File

@ -299,12 +299,11 @@ where
let db = EvmDb::new(data.journaled_state.state.clone(), self.to_db_service.clone());
let pc = interp.program_counter();
let step = StepLog {
stack: StackObj(interp.stack.clone()),
op: interp.contract.bytecode.bytecode()[pc].into(),
op: interp.current_opcode().into(),
memory: MemoryObj(interp.memory.clone()),
pc: pc as u64,
pc: interp.program_counter() as u64,
gas_remaining: interp.gas.remaining(),
cost: interp.gas.spend(),
depth: data.journaled_state.depth(),
@ -342,12 +341,11 @@ where
if matches!(eval, return_revert!()) {
let db = EvmDb::new(data.journaled_state.state.clone(), self.to_db_service.clone());
let pc = interp.program_counter();
let step = StepLog {
stack: StackObj(interp.stack.clone()),
op: interp.contract.bytecode.bytecode()[pc].into(),
op: interp.current_opcode().into(),
memory: MemoryObj(interp.memory.clone()),
pc: pc as u64,
pc: interp.program_counter() as u64,
gas_remaining: interp.gas.remaining(),
cost: interp.gas.spend(),
depth: data.journaled_state.depth(),

61
crates/revm/revm-inspectors/src/tracing/mod.rs
View File

@ -254,14 +254,12 @@ impl TracingInspector {
self.step_stack.push(StackStep { trace_idx, step_idx: trace.trace.steps.len() });
let pc = interp.program_counter();
let memory =
self.config.record_memory_snapshots.then(|| interp.memory.clone()).unwrap_or_default();
let stack =
self.config.record_stack_snapshots.then(|| interp.stack.clone()).unwrap_or_default();
let op = OpCode::try_from_u8(interp.contract.bytecode.bytecode()[pc])
let op = OpCode::try_from_u8(interp.current_opcode())
.or_else(|| {
// if the opcode is invalid, we'll use the invalid opcode to represent it because
// this is invoked before the opcode is executed, the evm will eventually return a
@ -273,7 +271,7 @@ impl TracingInspector {
trace.trace.steps.push(CallTraceStep {
depth: data.journaled_state.depth(),
pc,
pc: interp.program_counter(),
op,
contract: interp.contract.address,
stack,
@ -315,39 +313,36 @@ impl TracingInspector {
}
}
if let Some(pc) = interp.program_counter().checked_sub(1) {
if self.config.record_state_diff {
let op = interp.contract.bytecode.bytecode()[pc];
if self.config.record_state_diff {
let op = interp.current_opcode();
let journal_entry = data
.journaled_state
.journal
.last()
// This should always work because revm initializes it as `vec![vec![]]`
// See [JournaledState::new](revm::JournaledState)
.expect("exists; initialized with vec")
.last();
let journal_entry = data
.journaled_state
.journal
.last()
// This should always work because revm initializes it as `vec![vec![]]`
// See [JournaledState::new](revm::JournaledState)
.expect("exists; initialized with vec")
.last();
step.storage_change = match (op, journal_entry) {
(
opcode::SLOAD | opcode::SSTORE,
Some(JournalEntry::StorageChange { address, key, had_value }),
) => {
// SAFETY: (Address,key) exists if part if StorageChange
let value =
data.journaled_state.state[address].storage[key].present_value();
let change = StorageChange { key: *key, value, had_value: *had_value };
Some(change)
}
_ => None,
};
}
// The gas cost is the difference between the recorded gas remaining at the start of the
// step the remaining gas here, at the end of the step.
step.gas_cost = step.gas_remaining - self.gas_inspector.gas_remaining();
step.storage_change = match (op, journal_entry) {
(
opcode::SLOAD | opcode::SSTORE,
Some(JournalEntry::StorageChange { address, key, had_value }),
) => {
// SAFETY: (Address,key) exists if part if StorageChange
let value = data.journaled_state.state[address].storage[key].present_value();
let change = StorageChange { key: *key, value, had_value: *had_value };
Some(change)
}
_ => None,
};
}
// The gas cost is the difference between the recorded gas remaining at the start of the
// step the remaining gas here, at the end of the step.
step.gas_cost = step.gas_remaining - self.gas_inspector.gas_remaining();
// set the status
step.status = status;
}