Skip to content

fix(levm): fix precompiles problem with eip7702 #2900

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
jrchatruc merged 7 commits into from
May 27, 2025
Merged

fix(levm): fix precompiles problem with eip7702 #2900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
44c124b
fix i think, idk
JereSalo May 22, 2025
6172f79
first iteration of fixing problem
JereSalo May 23, 2025
37350e7
simpler result
JereSalo May 23, 2025
49c6377
fix delegation problem
JereSalo May 23, 2025
32e990f
precompile fix
JereSalo May 23, 2025
4109e81
add comment
JereSalo May 23, 2025
f6e0fea
improve fix
JereSalo May 26, 2025
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
33 changes: 10 additions & 23 deletions crates/vm/levm/src/opcode_handlers/system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ impl<'a> VM<'a> {
(account.is_empty(), address_was_cold)
};

let (is_delegation, eip7702_gas_consumed, code_address, bytecode) =
let (is_delegation_7702, eip7702_gas_consumed, code_address, bytecode) =
eip7702_get_code(self.db, &mut self.substate, callee)?;

let gas_left = self
Expand Down Expand Up @@ -120,7 +120,7 @@ impl<'a> VM<'a> {
return_data_start_offset,
return_data_size,
bytecode,
is_delegation,
is_delegation_7702,
)
}

Expand Down Expand Up @@ -176,7 +176,7 @@ impl<'a> VM<'a> {
let (_account_info, address_was_cold) =
self.db.access_account(&mut self.substate, code_address)?;

let (is_delegation, eip7702_gas_consumed, code_address, bytecode) =
let (is_delegation_7702, eip7702_gas_consumed, code_address, bytecode) =
eip7702_get_code(self.db, &mut self.substate, code_address)?;

let gas_left = self
Expand Down Expand Up @@ -220,7 +220,7 @@ impl<'a> VM<'a> {
return_data_start_offset,
return_data_size,
bytecode,
is_delegation,
is_delegation_7702,
)
}

Expand Down Expand Up @@ -300,7 +300,7 @@ impl<'a> VM<'a> {
calculate_memory_size(return_data_start_offset, return_data_size)?;
let new_memory_size = new_memory_size_for_args.max(new_memory_size_for_return_data);

let (is_delegation, eip7702_gas_consumed, code_address, bytecode) =
let (is_delegation_7702, eip7702_gas_consumed, code_address, bytecode) =
eip7702_get_code(self.db, &mut self.substate, code_address)?;

let gas_left = self
Expand Down Expand Up @@ -344,7 +344,7 @@ impl<'a> VM<'a> {
return_data_start_offset,
return_data_size,
bytecode,
is_delegation,
is_delegation_7702,
)
}

Expand Down Expand Up @@ -396,7 +396,7 @@ impl<'a> VM<'a> {
calculate_memory_size(return_data_start_offset, return_data_size)?;
let new_memory_size = new_memory_size_for_args.max(new_memory_size_for_return_data);

let (is_delegation, eip7702_gas_consumed, _, bytecode) =
let (is_delegation_7702, eip7702_gas_consumed, _, bytecode) =
eip7702_get_code(self.db, &mut self.substate, code_address)?;

let gas_left = self
Expand Down Expand Up @@ -437,7 +437,7 @@ impl<'a> VM<'a> {
return_data_start_offset,
return_data_size,
bytecode,
is_delegation,
is_delegation_7702,
)
}

Expand Down Expand Up @@ -751,7 +751,7 @@ impl<'a> VM<'a> {
ret_offset: U256,
ret_size: usize,
bytecode: Bytes,
is_delegation: bool,
is_delegation_7702: bool,
) -> Result<OpcodeResult, VMError> {
let sender_balance = self
.db
Expand Down Expand Up @@ -803,18 +803,6 @@ impl<'a> VM<'a> {
self.increase_account_balance(to, value)?;
}

if bytecode.is_empty() && is_delegation {

@JereSalo JereSalo May 26, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed because it was just an early return. But the result it the same if the callframe is created and the bytecode is empty. I just thought that it was best to remove it for clarity and say that we execute empty code.

self.current_call_frame_mut()?.gas_used = self
.current_call_frame()?
.gas_used
.checked_sub(gas_limit)
.ok_or(InternalError::GasOverflow)?;
self.current_call_frame_mut()?
.stack
.push(SUCCESS_FOR_CALL)?;
return Ok(OpcodeResult::Continue { pc_increment: 1 });
}

let new_call_frame = CallFrame::new(
msg_sender,
to,
Expand All @@ -832,8 +820,7 @@ impl<'a> VM<'a> {
);
self.call_frames.push(new_call_frame);

if self.is_precompile()? {
// Execute precompile immediately and handle result.
if self.is_precompile(&code_address) && !is_delegation_7702 {

@JereSalo JereSalo May 26, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check was added because precompile shouldn't be executed if it's target of delegation.
See here

let report = self.execute_precompile()?;
self.handle_return(&report)?;
} else {
Expand Down
14 changes: 2 additions & 12 deletions crates/vm/levm/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,11 +605,8 @@ impl<'a> VM<'a> {
Ok(min_gas_used)
}

pub fn is_precompile(&self) -> Result<bool, VMError> {
Ok(is_precompile(
&self.current_call_frame()?.code_address,
self.env.config.fork,
))
pub fn is_precompile(&self, address: &Address) -> bool {
is_precompile(address, self.env.config.fork)
}

/// Backup of Substate, a copy of the current substate to restore if sub-context is reverted
Expand Down Expand Up @@ -705,11 +702,4 @@ impl<'a> VM<'a> {
}
}
}

/// Checks if an address is delegation target in current transaction.
pub fn is_delegation_target(&self, address: Address) -> bool {
self.tx.authorization_list().as_ref().map_or(false, |list| {
list.iter().any(|item| item.address == address)
})
}
}
37 changes: 12 additions & 25 deletions crates/vm/levm/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{
call_frame::CallFrame,
db::gen_db::GeneralizedDatabase,
environment::Environment,
errors::{ExecutionReport, OpcodeResult, PrecompileError, VMError},
errors::{ExecutionReport, OpcodeResult, VMError},
hooks::hook::Hook,
precompiles::execute_precompile,
TransientStorage,
Expand Down Expand Up @@ -138,7 +138,7 @@ impl<'a> VM<'a> {

/// Main execution loop.
pub fn run_execution(&mut self) -> Result<ExecutionReport, VMError> {
if self.is_precompile()? {
if self.is_precompile(&self.current_call_frame()?.to) {
return self.execute_precompile();
}

Expand Down Expand Up @@ -166,30 +166,17 @@ impl<'a> VM<'a> {
}
}

/// Executes precompile and handles the output that it returns, generating a report.
pub fn execute_precompile(&mut self) -> Result<ExecutionReport, VMError> {
let precompile_address = self.current_call_frame()?.code_address;

let precompile_result = match self.is_delegation_target(precompile_address) {
// Avoid executing precompile if it is target of a delegation in EIP-7702 transaction.
true => {
let gas_limit = self.current_call_frame()?.gas_limit;
if gas_limit == 0 {
// `pointer_to_precompile.json` tests that it should fail in a call with zero gas limit.
Err(VMError::PrecompileError(PrecompileError::NotEnoughGas))
} else {
Ok(Bytes::new())
}
}
// Otherwise, execute precompile
false => {
let callframe = self.current_call_frame_mut()?;
execute_precompile(
precompile_address,
&callframe.calldata,
&mut callframe.gas_used,
callframe.gas_limit,
Comment on lines -172 to -190

@JereSalo JereSalo May 26, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need these checks anymore because it's enough with the checks that are being performed in XCALL opcodes. Before we were making checks in external transactions too, which wasn't necessary at all.

)
}
let callframe = self.current_call_frame_mut()?;

let precompile_result = {
execute_precompile(
callframe.code_address,
&callframe.calldata,
&mut callframe.gas_used,
callframe.gas_limit,
)
};

let report = self.handle_precompile_result(precompile_result)?;
Expand Down