new(tests): add more test cases for request types

docs/CHANGELOG.md

@@ -83,6 +83,7 @@ The following changes may be potentially breaking (all clients were tested with
 - ✨ Add gas cost of delegation access in CALL opcode ([#1208](https://github.com/ethereum/execution-spec-tests/pull/1208)).
 - ✨ Add EIP-7698 failed nonce and short data tests ([#1211](https://github.com/ethereum/execution-spec-tests/pull/1211)).
 - ✨ Add EIP-2537 additional pairing precompile tests cases, and then update all BLS12 test vectors ([#1275](https://github.com/ethereum/execution-spec-tests/pull/1275), [#1289](https://github.com/ethereum/execution-spec-tests/pull/1289)).
+- ✨ Add EIP-7685 and EIP-7002 test cases for additional request type combinations and modified withdrawal contract that allows more withdrawals ([#1340](https://github.com/ethereum/execution-spec-tests/pull/1340)).
 
 ## [v4.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.0.0) - 2025-02-14 - 💕
 

tests/prague/eip7002_el_triggerable_withdrawals/helpers.py

@@ -121,7 +121,7 @@ def valid_requests(self, current_minimum_fee: int) -> List[WithdrawalRequest]:
 
 @dataclass(kw_only=True)
 class WithdrawalRequestContract(WithdrawalRequestInteractionBase):
-    """Class used to describe a deposit originated from a contract."""
+    """Class used to describe a withdrawal originated from a contract."""
 
     tx_gas_limit: int = 1_000_000
     """
@@ -176,7 +176,7 @@ def contract_code(self) -> Bytecode:
         return code + self.extra_code
 
     def transactions(self) -> List[Transaction]:
-        """Return a transaction for the deposit request."""
+        """Return a transaction for the withdrawal request."""
         assert self.entry_address is not None, "Entry address not initialized"
         return [
             Transaction(

tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py

@@ -0,0 +1,206 @@
+"""
+abstract: Tests [EIP-7002: Execution layer triggerable withdrawals](https://eips.ethereum.org/EIPS/eip-7002)
+    Test execution layer triggered exits [EIP-7002: Execution layer triggerable withdrawals](https://eips.ethereum.org/EIPS/eip-7002).
+
+"""  # noqa: E501
+
+from typing import List
+
+import pytest
+
+from ethereum_test_tools import (
+    Account,
+    Alloc,
+    Block,
+    BlockchainTestFiller,
+    Bytecode,
+    Transaction,
+)
+from ethereum_test_tools import Macros as Om
+from ethereum_test_tools import Opcodes as Op
+from ethereum_test_types import Requests
+
+from .helpers import (
+    WithdrawalRequest,
+    # WithdrawalRequestBase,
+    # WithdrawalRequestContract,
+    WithdrawalRequestTransaction,
+)
+from .spec import Spec as Spec_EIP7002
+from .spec import ref_spec_7002
+
+REFERENCE_SPEC_GIT_PATH: str = ref_spec_7002.git_path
+REFERENCE_SPEC_VERSION: str = ref_spec_7002.version
+
+pytestmark: pytest.MarkDecorator = pytest.mark.valid_from("Prague")
+
+
+def withdrawal_list_with_custom_fee(n: int) -> List[WithdrawalRequest]:  # noqa: D103
+    return [
+        WithdrawalRequest(
+            validator_pubkey=i + 1,
+            amount=0,
+            fee=Spec_EIP7002.get_fee(0),
+        )
+        for i in range(n)
+    ]
+
+
+@pytest.mark.parametrize(
+    "requests_list",
+    [
+        pytest.param(
+            [],
+            id="empty_request_list",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(1),
+            ],
+            id="1_withdrawal_request",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(15),
+            ],
+            id="15_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(16),
+            ],
+            id="16_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(17),
+            ],
+            id="17_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(18),
+            ],
+            id="18_withdrawal_requests",
+        ),
+    ],
+)
+def test_extra_withdrawals(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    requests_list: List[WithdrawalRequest],
+):
+    """Test how clients were to behave when more than 16 withdrawals (here: 18 withdrawals) would be allowed per block."""  # noqa: E501
+    # Source of code (change value of this line to 18 and re-compile with fjl/geas): https://github.com/lightclient/sys-asm/blob/f1c13e285b6aeef2b19793995e00861bf0f32c9a/src/withdrawals/main.eas#L37  # noqa: E501, W291
+    modified_code: bytes = b"3373fffffffffffffffffffffffffffffffffffffffe1460cb5760115f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff146101f457600182026001905f5b5f82111560685781019083028483029004916001019190604d565b909390049250505036603814608857366101f457346101f4575f5260205ff35b34106101f457600154600101600155600354806003026004013381556001015f35815560010160203590553360601b5f5260385f601437604c5fa0600101600355005b6003546002548082038060121160df575060125b5f5b8181146101835782810160030260040181604c02815460601b8152601401816001015481526020019060020154807fffffffffffffffffffffffffffffffff00000000000000000000000000000000168252906010019060401c908160381c81600701538160301c81600601538160281c81600501538160201c81600401538160181c81600301538160101c81600201538160081c81600101535360010160e1565b910180921461019557906002556101a0565b90505f6002555f6003555b5f54807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff14156101cd57505f5b6001546002828201116101e25750505f6101e8565b01600290035b5f555f600155604c025ff35b5f5ffd"  # noqa: E501
+    pre[Spec_EIP7002.WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS] = Account(
+        code=modified_code,
+        nonce=1,
+        balance=0,
+    )
+
+    # given a list of withdrawal requests construct a withdrawal request transaction
+    withdrawal_request_transaction = WithdrawalRequestTransaction(requests=requests_list)
+    # prepare withdrawal senders
+    withdrawal_request_transaction.update_pre(pre=pre)
+    # get transaction list
+    txs: List[Transaction] = withdrawal_request_transaction.transactions()
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                requests_hash=Requests(*requests_list),
+            ),
+        ],
+        post={},
+    )
+
+
+@pytest.mark.parametrize(
+    "requests_list",
+    [
+        pytest.param(
+            [],
+            id="empty_request_list",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(1),
+            ],
+            id="1_withdrawal_request",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(15),
+            ],
+            id="15_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(16),
+            ],
+            id="16_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(17),
+            ],
+            id="17_withdrawal_requests",
+        ),
+        pytest.param(
+            [
+                *withdrawal_list_with_custom_fee(18),
+            ],
+            id="18_withdrawal_requests",
+        ),
+    ],
+)
+def test_extra_withdrawals_pseudo_contract(
+    blockchain_test: BlockchainTestFiller,
+    pre: Alloc,
+    requests_list: List[WithdrawalRequest],
+):
+    """Test how clients were to behave when more than 16 withdrawals would be allowed per block."""
+    modified_code: Bytecode = Bytecode()
+    memory_offset: int = 0
+    amount_of_requests: int = 0
+
+    for withdrawal_request in requests_list:
+        # update memory_offset with the correct value
+        withdrawal_request_bytes_amount: int = len(bytes(withdrawal_request))
+        assert withdrawal_request_bytes_amount == 76, (
+            "Expected withdrawal request to be of size 76 but got size "
+            f"{withdrawal_request_bytes_amount}"
+        )
+        memory_offset += withdrawal_request_bytes_amount
+
+        modified_code += Om.MSTORE(bytes(withdrawal_request), memory_offset)
+        amount_of_requests += 1
+
+    modified_code += Op.RETURN(0, Op.MSIZE())
+
+    pre[Spec_EIP7002.WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS] = Account(
+        code=modified_code,
+        nonce=1,
+        balance=0,
+    )
+
+    # given a list of withdrawal requests construct a withdrawal request transaction
+    withdrawal_request_transaction = WithdrawalRequestTransaction(requests=requests_list)
+    # prepare withdrawal senders
+    withdrawal_request_transaction.update_pre(pre=pre)
+    # get transaction list
+    txs: List[Transaction] = withdrawal_request_transaction.transactions()
+
+    blockchain_test(
+        pre=pre,
+        blocks=[
+            Block(
+                txs=txs,
+                requests_hash=Requests(*requests_list),
+            ),
+        ],
+        post={},
+    )