Skip to content

feat(tests): Port oog create refund test; add BAL >= Amsterdam #1831

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

Open
fselmo wants to merge 1 commit into
base: eips/amsterdam/eip-7928
Choose a base branch
from
+439 −489
Open

feat(tests): Port oog create refund test; add BAL >= Amsterdam #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions src/ethereum/forks/amsterdam/vm/interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def process_create_message(message: Message) -> Evm:
create_frame = create_child_frame(parent_frame)

increment_nonce(state, message.current_target, create_frame)
evm = process_message(message)
evm = process_message(message, parent_state_frame=create_frame)
Copy link
Contributor

@gurukamath gurukamath Dec 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Instead of passing the parent_state_frame as a function parameter to process_message, would it be possible to recreate it within the function? I think process_message(message: Message) -> Evm is very clean as it stands. Alternatively, we could consider adding parent_state_frame to the Message dataclass (on similar lines as parent_evm)

if not evm.error:
contract_code = evm.output
contract_code_gas = Uint(len(contract_code)) * GAS_CODE_DEPOSIT
Expand Down Expand Up @@ -296,14 +296,23 @@ def process_create_message(message: Message) -> Evm:
return evm


def process_message(message: Message) -> Evm:
def process_message(
message: Message,
parent_state_frame: Optional[StateChanges] = None,
) -> Evm:
"""
Move ether and execute the relevant code.

Parameters
----------
message :
Transaction specific items.
parent_state_frame :
Optional parent frame for state tracking. When provided (e.g., for
CREATE's init code), state changes are tracked as a child of this
frame instead of the default parent determined by the message.
This ensures proper frame hierarchy for CREATE operations where
init code changes must be children of the CREATE frame.

Returns
-------
Expand All @@ -318,8 +327,15 @@ def process_message(message: Message) -> Evm:

begin_transaction(state, transient_storage)

parent_frame = get_parent_frame(message)
state_changes = get_message_state_frame(message)
if parent_state_frame is not None:
# Use provided parent for CREATE's init code execution.
# This ensures init code state changes are children of create_frame,
# so they are properly converted to reads if code deposit fails.
parent_changes = parent_state_frame
state_changes = create_child_frame(parent_state_frame)
else:
parent_changes = get_parent_frame(message)
state_changes = get_message_state_frame(message)

track_address(state_changes, message.current_target)

Expand All @@ -335,11 +351,11 @@ def process_message(message: Message) -> Evm:
evm = execute_code(message, state_changes)
if evm.error:
rollback_transaction(state, transient_storage)
if state_changes != parent_frame:
if state_changes != parent_changes:
merge_on_failure(evm.state_changes)
else:
commit_transaction(state, transient_storage)
if state_changes != parent_frame:
if state_changes != parent_changes:
merge_on_success(evm.state_changes)
return evm

Expand Down
Loading
Loading