Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions src/executor/stack/executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1079,8 +1079,20 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet>

// EIP-7702: Get execution code, following delegations if enabled
let code = if self.config.has_eip_7702 {
self.delegated_code(code_address)
.unwrap_or_else(|| self.code(code_address))
// Check for delegation and record external operation if needed
let original_code = self.code(code_address);
if let Some(delegated_address) = evm_core::extract_delegation_address(&original_code) {
if let Err(e) = self.record_external_operation(
crate::ExternalOperation::DelegationResolution(delegated_address),
) {
let _ = self.exit_substate(StackExitKind::Failed);
return Capture::Exit((ExitReason::Error(e), Vec::new()));
}

self.code(delegated_address)
} else {
original_code
}
} else {
self.code(code_address)
};
Expand Down