Merge pull request #1288 from ethereum/set-auth-from-account-with-code

new(tests): EIP-7702: Sender not EOA test

Author: winsvega

src/ethereum_clis/clis/execution_specs.py

@@ -136,6 +136,10 @@ def _mapping_data(self):
                 TransactionException.TYPE_4_EMPTY_AUTHORIZATION_LIST,
                 "Failed transaction: InvalidBlock()",
             ),
+            ExceptionMessage(
+                TransactionException.SENDER_NOT_EOA,
+                "Failed transaction: InvalidSenderError('not EOA')",
+            ),
             ExceptionMessage(
                 TransactionException.TYPE_4_TX_CONTRACT_CREATION,
                 "Failed transaction: ",

tests/prague/eip7702_set_code_tx/test_set_code_txs.py

@@ -3487,3 +3487,82 @@ def test_authorization_reusing_nonce(
             sender: Account(nonce=1),
         },
     )
+
+
+@pytest.mark.parametrize(
+    "set_code_type",
+    list(AddressType),
+    ids=lambda address_type: address_type.name,
+)
+@pytest.mark.parametrize(
+    "self_sponsored",
+    [True, False],
+)
+@pytest.mark.execute(pytest.mark.skip(reason="Requires contract-eoa address collision"))
+def test_set_code_from_account_with_non_delegating_code(
+    state_test: StateTestFiller,
+    pre: Alloc,
+    set_code_type: AddressType,
+    self_sponsored: bool,
+):
+    """
+    Test that a transaction is correctly rejected,
+    if the sender account has a non-delegating code set.
+
+    The auth transaction is sent from sender which has contract code (not delegating)
+    But at the same time it has auth tuple that will point this sender account
+    To be eoa, delegation, contract .. etc
+    """
+    sender = pre.fund_eoa()
+    random_address = pre.fund_eoa(0)
+
+    set_code_to_address: Address
+    match set_code_type:
+        case AddressType.EMPTY_ACCOUNT:
+            set_code_to_address = pre.fund_eoa(0)
+        case AddressType.EOA:
+            set_code_to_address = pre.fund_eoa(1)
+        case AddressType.EOA_WITH_SET_CODE:
+            set_code_account = pre.fund_eoa(0)
+            set_code_to_address = pre.fund_eoa(1, delegation=set_code_account)
+        case AddressType.CONTRACT:
+            set_code_to_address = pre.deploy_contract(Op.STOP)
+        case _:
+            raise ValueError(f"Unsupported set code type: {set_code_type}")
+    callee_address = pre.deploy_contract(Op.SSTORE(0, 1) + Op.STOP)
+
+    # Set the sender account to have some code, that is specifically not a delegation.
+    sender_account = pre[sender]
+    assert sender_account is not None
+    sender_account.code = Bytes(Op.STOP)
+
+    tx = Transaction(
+        gas_limit=100_000,
+        to=callee_address,
+        authorization_list=[
+            AuthorizationTuple(
+                address=set_code_to_address,
+                nonce=1 if self_sponsored else 0,
+                signer=sender if self_sponsored else random_address,
+            ),
+        ],
+        sender=sender,
+        error=TransactionException.SENDER_NOT_EOA,
+    )
+
+    state_test(
+        env=Environment(),
+        pre=pre,
+        tx=tx,
+        post={
+            set_code_to_address: (
+                Account.NONEXISTENT
+                if set_code_type == AddressType.EMPTY_ACCOUNT
+                else Account(storage={})
+            ),
+            random_address: Account.NONEXISTENT
+            if not self_sponsored
+            else Account(code=Bytes(Op.STOP)),
+            callee_address: Account(storage={0: 0}),
+        },
+    )