Skip to content

new(tests): EOF - EXTDELEGATECALL blocking vs 7702 #1309

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
marioevz merged 5 commits into from
Apr 1, 2025
Merged

new(tests): EOF - EXTDELEGATECALL blocking vs 7702 #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9f3ca0
new(tests): EOF - EXTDELEGATECALL blocking vs 7702
pdobacz Mar 13, 2025
1c4cd6f
new(tests): EOF - EXT*CALL backfill test cases
pdobacz Mar 13, 2025
627beff
Apply code review suggestions
pdobacz Mar 17, 2025
6903d3e
Refactor target_address to fixture
pdobacz Mar 17, 2025
9c59dd2
Apply code review
pdobacz Apr 1, 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
202 changes: 155 additions & 47 deletions tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""test calls across EOF and Legacy."""

import itertools
from enum import Enum, auto, unique

import pytest

Expand All @@ -13,6 +14,7 @@
StateTestFiller,
Storage,
Transaction,
compute_create_address,
)
from ethereum_test_tools.eof.v1 import Container, Section
from ethereum_test_tools.vm.opcode import Opcodes as Op
Expand Down Expand Up @@ -57,12 +59,67 @@
)


@unique
class TargetAccountType(Enum):
"""Kinds of target accounts for calls."""

EMPTY = auto()
EOA = auto()
LEGACY_CONTRACT = auto()
EOF_CONTRACT = auto()
LEGACY_CONTRACT_INVALID = auto()
EOF_CONTRACT_INVALID = auto()
LEGACY_CONTRACT_REVERT = auto()
EOF_CONTRACT_REVERT = auto()
IDENTITY_PRECOMPILE = auto()

def __str__(self) -> str:
"""Return string representation of the enum."""
return f"{self.name}"


@pytest.fixture
def sender(pre: Alloc) -> EOA:
"""Sender of the transaction."""
return pre.fund_eoa()


@pytest.fixture
def target_address(pre: Alloc, target_account_type: TargetAccountType) -> Address:
"""Target address of the call depending on required type of account."""
match target_account_type:
case TargetAccountType.EMPTY:
return pre.fund_eoa(amount=0)
case TargetAccountType.EOA:
return pre.fund_eoa()
case TargetAccountType.LEGACY_CONTRACT:
return pre.deploy_contract(
code=Op.STOP,
)
case TargetAccountType.EOF_CONTRACT:
return pre.deploy_contract(
code=Container.Code(Op.STOP),
)
case TargetAccountType.LEGACY_CONTRACT_INVALID:
return pre.deploy_contract(
code=Op.INVALID,
)
case TargetAccountType.EOF_CONTRACT_INVALID:
return pre.deploy_contract(
code=Container.Code(Op.INVALID),
)
case TargetAccountType.LEGACY_CONTRACT_REVERT:
return pre.deploy_contract(
code=Op.REVERT(0, 0),
)
case TargetAccountType.EOF_CONTRACT_REVERT:
return pre.deploy_contract(
code=Container.Code(Op.REVERT(0, 0)),
)
case TargetAccountType.IDENTITY_PRECOMPILE:
return identity


@pytest.mark.parametrize(
"opcode",
[
Expand Down Expand Up @@ -90,7 +147,7 @@ def test_legacy_calls_eof_sstore(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -162,7 +219,7 @@ def test_legacy_calls_eof_mstore(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -217,7 +274,7 @@ def test_eof_calls_eof_sstore(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -290,7 +347,7 @@ def test_eof_calls_eof_mstore(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -361,7 +418,7 @@ def test_eof_calls_precompile(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=5000000,
)

Expand Down Expand Up @@ -418,7 +475,7 @@ def test_eof_calls_legacy_sstore(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -485,7 +542,7 @@ def test_eof_calls_legacy_mstore(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -557,7 +614,7 @@ def test_callee_fails(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=4000000,
)

Expand Down Expand Up @@ -628,7 +685,7 @@ def test_callee_context(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=100000,
value=tx_value,
)
Expand Down Expand Up @@ -695,7 +752,7 @@ def test_eof_calls_eof_then_fails(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand All @@ -722,23 +779,15 @@ def test_eof_calls_eof_then_fails(
)
@pytest.mark.parametrize(
"target_account_type",
(
"empty",
"EOA",
"LegacyContract",
"EOFContract",
"LegacyContractInvalid",
"EOFContractInvalid",
),
ids=lambda x: x,
TargetAccountType,
)
@pytest.mark.parametrize("value", [0, 1])
def test_eof_calls_clear_return_buffer(
state_test: StateTestFiller,
pre: Alloc,
sender: EOA,
opcode: Op,
target_account_type: str,
target_address: Address,
value: int,
):
"""Test EOF contracts calling clears returndata buffer."""
Expand All @@ -748,28 +797,6 @@ def test_eof_calls_clear_return_buffer(
)
filling_callee_address = pre.deploy_contract(filling_contract_code)

match target_account_type:
case "empty":
target_address = b"\x78" * 20
case "EOA":
target_address = pre.fund_eoa()
case "LegacyContract":
target_address = pre.deploy_contract(
code=Op.STOP,
)
case "EOFContract":
target_address = pre.deploy_contract(
code=Container.Code(Op.STOP),
)
case "LegacyContractInvalid":
target_address = pre.deploy_contract(
code=Op.INVALID,
)
case "EOFContractInvalid":
target_address = pre.deploy_contract(
code=Container.Code(Op.INVALID),
)

caller_contract = Container.Code(
# First fill the return buffer and sanity check
Op.EXTCALL(filling_callee_address, 0, 0, 0)
Expand All @@ -785,7 +812,7 @@ def test_eof_calls_clear_return_buffer(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -845,7 +872,7 @@ def test_eof_calls_static_flag_with_value(
)
tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=5_000_000,
)

Expand Down Expand Up @@ -942,7 +969,7 @@ def test_eof_calls_min_callee_gas(

tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=no_oog_gas + extra_gas_limit,
)

Expand Down Expand Up @@ -988,7 +1015,7 @@ def test_eof_calls_with_value(
)
tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=50000000,
)

Expand Down Expand Up @@ -1084,7 +1111,7 @@ def test_eof_calls_msg_depth(
)
tx = Transaction(
sender=sender,
to=Address(calling_contract_address),
to=calling_contract_address,
gas_limit=gas_limit,
)

Expand All @@ -1104,3 +1131,84 @@ def test_eof_calls_msg_depth(
post=post,
tx=tx,
)


@pytest.mark.parametrize("target_account_type", TargetAccountType)
@pytest.mark.parametrize("delegate", [True, False])
@pytest.mark.parametrize("call_from_initcode", [True, False])
def test_extdelegate_call_targets(
state_test: StateTestFiller,
pre: Alloc,
target_account_type: TargetAccountType,
target_address: Address,
delegate: bool,
call_from_initcode: bool,
):
"""
Test EOF contracts extdelegatecalling various targets, especially resolved via 7702
delegation.
"""
env = Environment()

if delegate:
target_address = pre.fund_eoa(0, delegation=target_address)

sender = pre.fund_eoa()
delegate_call_code = Op.SSTORE(
slot_call_result, Op.EXTDELEGATECALL(address=target_address)
) + Op.SSTORE(slot_code_worked, value_code_worked)

if call_from_initcode:
# Call from initcode
caller_contract = Container(
sections=[
Section.Code(
code=delegate_call_code + Op.RETURNCODE[0](0, 0),
),
Section.Container(Container.Code(Op.STOP)),
]
)
tx = Transaction(
sender=sender,
to=None,
data=caller_contract,
gas_limit=4_000_000,
)
calling_contract_address = tx.created_contract
else:
# Normal call from existing contract
caller_contract = Container.Code(
delegate_call_code + Op.STOP,
)
calling_contract_address = pre.deploy_contract(caller_contract)

tx = Transaction(
sender=sender,
to=calling_contract_address,
gas_limit=4_000_000,
)

calling_storage = {
slot_code_worked: value_code_worked,
slot_call_result: EXTCALL_SUCCESS
if target_account_type == TargetAccountType.EOF_CONTRACT
else EXTCALL_FAILURE
if target_account_type == TargetAccountType.EOF_CONTRACT_INVALID
else EXTCALL_REVERT,
}
storage_address = (
compute_create_address(address=sender, nonce=0)
if call_from_initcode
else calling_contract_address
)

post = {
storage_address: Account(storage=calling_storage),
}

state_test(
env=env,
pre=pre,
post=post,
tx=tx,
)
13 changes: 7 additions & 6 deletions tests/osaka/eip7692_eof_v1/eof_tracker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@
- [x] Legacy executing EXTCODESIZE of EOF contract ([`tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_extcode.py::test_legacy_calls_eof_sstore`](./eip3540_eof_v1/test_extcode/test_legacy_calls_eof_sstore.md))
- [x] Legacy executing EXTCODEHASH of EOF contract ([`tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_extcode.py::test_legacy_calls_eof_sstore`](./eip3540_eof_v1/test_extcode/test_legacy_calls_eof_sstore.md))
- [x] Legacy executing EXTCODECOPY of EOF contract ([`tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_extcode.py::test_legacy_calls_eof_sstore`](./eip3540_eof_v1/test_extcode/test_legacy_calls_eof_sstore.md))
- [ ] `*CALLs` from legacy contracts to EOF contracts (ethereum/tests: src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_CallsFiller.yml)
- [ ] `EXT*CALLs` from EOF to legacy contracts (ethereum/tests: src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_CallsFiller.yml)
- [ ] EXTDELEGATECALL from EOF to EOF contract (ethereum/tests: src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_CallsFiller.yml)
- [ ] EXTDELEGATECALL from EOF to legacy contract failing (ethereum/tests: src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_CallsFiller.yml)
- [ ] EXTDELEGATECALL from EOF to EOA failing
- [ ] EXTDELEGATECALL from EOF to empty account failing

## EIP-3670: EOF - Code Validation

Expand Down Expand Up @@ -420,6 +414,13 @@
- [x] EXTSTATICCALL from EOF to non-pure legacy contract failing ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_legacy_sstore`](./eip7069_extcall/test_calls/test_eof_calls_legacy_sstore.md))
- [x] EXTSTATICCALL from EOF to pure EOF contract ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_legacy_mstore`](./eip7069_extcall/test_calls/test_eof_calls_legacy_mstore.md))
- [x] EXTSTATICCALL from EOF to non-pure EOF contract failing ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_eof_sstore`](./eip7069_extcall/test_calls/test_eof_calls_eof_sstore.md))
- [x] `*CALLs` from legacy contracts to EOF contracts (ethereum/tests: ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_legacy_calls_eof_sstore`](./eip7069_extcall/test_calls/test_eof_calls_eof_sstore.md))
- [x] `EXT*CALLs` from EOF to legacy contracts ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_legacy_sstore`](./eip7069_extcall/test_calls/test_eof_calls_eof_sstore.md))
- [x] EXTDELEGATECALL from EOF to EOF contract ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_eof_calls_eof_sstore`](./eip7069_extcall/test_calls/test_eof_calls_eof_sstore.md))
- [x] EXTDELEGATECALL from EOF to legacy contract failing ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_extdelegate_call_targets`](./eip7069_extcall/test_calls/test_extdelegate_call_targets.md))
- [x] EXTDELEGATECALL from EOF to EOA failing ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_extdelegate_call_targets`](./eip7069_extcall/test_calls/test_extdelegate_call_targets.md))
- [x] EXTDELEGATECALL from EOF to empty account failing ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_extdelegate_call_targets`](./eip7069_extcall/test_calls/test_extdelegate_call_targets.md))
- [x] EXTDELEGATECALL to EIP-7702 delegate ([`./tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py::test_extdelegate_call_targets`](./eip7069_extcall/test_calls/test_extdelegate_call_targets.md))


## EIP-7620: EOF Contract Creation
Expand Down