Skip to content

Move evm.message_is_static check to top of function #22

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
fselmo merged 1 commit into from
Oct 30, 2025
Merged

Move evm.message_is_static check to top of function #22

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
17 changes: 11 additions & 6 deletions src/ethereum/forks/amsterdam/vm/instructions/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,22 @@ def generic_create(
process_create_message,
)

# Check static context first
if evm.message.is_static:
raise WriteInStaticContext

# Check max init code size early before memory read
if memory_size > U256(MAX_INIT_CODE_SIZE):
raise OutOfGasError

state = evm.message.block_env.state

call_data = memory_read_bytes(
evm.memory, memory_start_position, memory_size
)
if len(call_data) > MAX_INIT_CODE_SIZE:
raise OutOfGasError

create_message_gas = max_message_call_gas(Uint(evm.gas_left))
evm.gas_left -= create_message_gas
if evm.message.is_static:
raise WriteInStaticContext
evm.return_data = b""

sender_address = evm.message.current_target
Expand Down Expand Up @@ -544,6 +548,9 @@ def selfdestruct(evm: Evm) -> None:
The current EVM frame.

"""
if evm.message.is_static:
raise WriteInStaticContext

# STACK
beneficiary = to_address_masked(pop(evm.stack))

Expand All @@ -563,8 +570,6 @@ def selfdestruct(evm: Evm) -> None:
gas_cost += GAS_SELF_DESTRUCT_NEW_ACCOUNT

charge_gas(evm, gas_cost)
if evm.message.is_static:
raise WriteInStaticContext

originator = evm.message.current_target
originator_balance = get_account(
Expand Down
Loading