chore(specs): refactor code deployment functions

Author: SamWilsn

src/ethereum/forks/amsterdam/state_tracker.py

@@ -278,28 +278,18 @@ def account_exists(tx_state: TransactionState, address: Address) -> bool:
     return get_account_optional(tx_state, address) is not None
 
 
-def account_has_code_or_nonce(
-    tx_state: TransactionState, address: Address
-) -> bool:
+def account_deployable(tx_state: TransactionState, address: Address) -> bool:
     """
-    Check if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    tx_state :
-        The transaction state.
-    address :
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : ``bool``
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
+    Check if an account's code can be written to.
     """
     account = get_account(tx_state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+    if account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH:
+        return False
+
+    if account_has_storage(tx_state, address):
+        return False
+
+    return True
 
 
 def account_has_storage(tx_state: TransactionState, address: Address) -> bool:

src/ethereum/forks/amsterdam/vm/instructions/system.py

@@ -18,8 +18,7 @@
 from ethereum.utils.numeric import ceil32
 
 from ...state_tracker import (
-    account_has_code_or_nonce,
-    account_has_storage,
+    account_deployable,
     get_account,
     get_code,
     increment_nonce,
@@ -108,9 +107,7 @@ def generic_create(
 
     evm.accessed_addresses.add(contract_address)
 
-    if account_has_code_or_nonce(
-        tx_state, contract_address
-    ) or account_has_storage(tx_state, contract_address):
+    if not account_deployable(tx_state, contract_address):
         increment_nonce(tx_state, evm.message.current_target)
         push(evm.stack, U256(0))
         return

src/ethereum/forks/amsterdam/vm/interpreter.py

@@ -32,8 +32,7 @@
 
 from ..blocks import Log
 from ..state_tracker import (
-    account_has_code_or_nonce,
-    account_has_storage,
+    account_deployable,
     copy_tx_state,
     destroy_storage,
     get_account,
@@ -108,10 +107,9 @@ def process_message_call(message: Message) -> MessageCallOutput:
     tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
-        is_collision = account_has_code_or_nonce(
-            tx_state, message.current_target
-        ) or account_has_storage(tx_state, message.current_target)
-        if is_collision:
+        if account_deployable(tx_state, message.current_target):
+            evm = process_create_message(message)
+        else:
             return MessageCallOutput(
                 Uint(0),
                 U256(0),
@@ -120,8 +118,6 @@ def process_message_call(message: Message) -> MessageCallOutput:
                 AddressCollision(),
                 Bytes(b""),
             )
-        else:
-            evm = process_create_message(message)
     else:
         if message.tx_env.authorizations != ():
             refund_counter += set_delegation(message)

src/ethereum/forks/arrow_glacier/state_tracker.py

@@ -274,28 +274,18 @@ def account_exists(tx_state: TransactionState, address: Address) -> bool:
     return get_account_optional(tx_state, address) is not None
 
 
-def account_has_code_or_nonce(
-    tx_state: TransactionState, address: Address
-) -> bool:
+def account_deployable(tx_state: TransactionState, address: Address) -> bool:
     """
-    Check if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    tx_state :
-        The transaction state.
-    address :
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : ``bool``
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
+    Check if an account's code can be written to.
     """
     account = get_account(tx_state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+    if account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH:
+        return False
+
+    if account_has_storage(tx_state, address):
+        return False
+
+    return True
 
 
 def account_has_storage(tx_state: TransactionState, address: Address) -> bool:

src/ethereum/forks/arrow_glacier/vm/instructions/system.py

@@ -18,9 +18,8 @@
 from ethereum.utils.numeric import ceil32
 
 from ...state_tracker import (
+    account_deployable,
     account_exists_and_is_empty,
-    account_has_code_or_nonce,
-    account_has_storage,
     get_account,
     get_code,
     increment_nonce,
@@ -88,9 +87,7 @@ def generic_create(
 
     evm.accessed_addresses.add(contract_address)
 
-    if account_has_code_or_nonce(
-        evm.message.tx_env.state, contract_address
-    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+    if not account_deployable(evm.message.tx_env.state, contract_address):
         increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return

src/ethereum/forks/arrow_glacier/vm/interpreter.py

@@ -32,9 +32,8 @@
 
 from ..blocks import Log
 from ..state_tracker import (
+    account_deployable,
     account_exists_and_is_empty,
-    account_has_code_or_nonce,
-    account_has_storage,
     copy_tx_state,
     destroy_storage,
     increment_nonce,
@@ -106,10 +105,9 @@ def process_message_call(message: Message) -> MessageCallOutput:
     tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
-        is_collision = account_has_code_or_nonce(
-            tx_state, message.current_target
-        ) or account_has_storage(tx_state, message.current_target)
-        if is_collision:
+        if account_deployable(tx_state, message.current_target):
+            evm = process_create_message(message)
+        else:
             return MessageCallOutput(
                 gas_left=Uint(0),
                 refund_counter=U256(0),
@@ -118,8 +116,6 @@ def process_message_call(message: Message) -> MessageCallOutput:
                 touched_accounts=set(),
                 error=AddressCollision(),
             )
-        else:
-            evm = process_create_message(message)
     else:
         evm = process_message(message)
         if account_exists_and_is_empty(tx_state, Address(message.target)):

src/ethereum/forks/berlin/state_tracker.py

@@ -274,28 +274,18 @@ def account_exists(tx_state: TransactionState, address: Address) -> bool:
     return get_account_optional(tx_state, address) is not None
 
 
-def account_has_code_or_nonce(
-    tx_state: TransactionState, address: Address
-) -> bool:
+def account_deployable(tx_state: TransactionState, address: Address) -> bool:
     """
-    Check if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    tx_state :
-        The transaction state.
-    address :
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : ``bool``
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
+    Check if an account's code can be written to.
     """
     account = get_account(tx_state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+    if account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH:
+        return False
+
+    if account_has_storage(tx_state, address):
+        return False
+
+    return True
 
 
 def account_has_storage(tx_state: TransactionState, address: Address) -> bool:

src/ethereum/forks/berlin/vm/instructions/system.py

@@ -18,9 +18,8 @@
 from ethereum.utils.numeric import ceil32
 
 from ...state_tracker import (
+    account_deployable,
     account_exists_and_is_empty,
-    account_has_code_or_nonce,
-    account_has_storage,
     get_account,
     get_code,
     increment_nonce,
@@ -88,9 +87,7 @@ def generic_create(
 
     evm.accessed_addresses.add(contract_address)
 
-    if account_has_code_or_nonce(
-        evm.message.tx_env.state, contract_address
-    ) or account_has_storage(evm.message.tx_env.state, contract_address):
+    if not account_deployable(evm.message.tx_env.state, contract_address):
         increment_nonce(evm.message.tx_env.state, evm.message.current_target)
         push(evm.stack, U256(0))
         return

src/ethereum/forks/berlin/vm/interpreter.py

@@ -32,9 +32,8 @@
 
 from ..blocks import Log
 from ..state_tracker import (
+    account_deployable,
     account_exists_and_is_empty,
-    account_has_code_or_nonce,
-    account_has_storage,
     copy_tx_state,
     destroy_storage,
     increment_nonce,
@@ -105,10 +104,9 @@ def process_message_call(message: Message) -> MessageCallOutput:
     tx_state = message.tx_env.state
     refund_counter = U256(0)
     if message.target == Bytes0(b""):
-        is_collision = account_has_code_or_nonce(
-            tx_state, message.current_target
-        ) or account_has_storage(tx_state, message.current_target)
-        if is_collision:
+        if account_deployable(tx_state, message.current_target):
+            evm = process_create_message(message)
+        else:
             return MessageCallOutput(
                 gas_left=Uint(0),
                 refund_counter=U256(0),
@@ -117,8 +115,6 @@ def process_message_call(message: Message) -> MessageCallOutput:
                 touched_accounts=set(),
                 error=AddressCollision(),
             )
-        else:
-            evm = process_create_message(message)
     else:
         evm = process_message(message)
         if account_exists_and_is_empty(tx_state, Address(message.target)):

src/ethereum/forks/bpo1/state_tracker.py

@@ -262,28 +262,18 @@ def account_exists(tx_state: TransactionState, address: Address) -> bool:
     return get_account_optional(tx_state, address) is not None
 
 
-def account_has_code_or_nonce(
-    tx_state: TransactionState, address: Address
-) -> bool:
+def account_deployable(tx_state: TransactionState, address: Address) -> bool:
     """
-    Check if an account has non-zero nonce or non-empty code.
-
-    Parameters
-    ----------
-    tx_state :
-        The transaction state.
-    address :
-        Address of the account that needs to be checked.
-
-    Returns
-    -------
-    has_code_or_nonce : ``bool``
-        True if the account has non-zero nonce or non-empty code,
-        False otherwise.
-
+    Check if an account's code can be written to.
     """
     account = get_account(tx_state, address)
-    return account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH
+    if account.nonce != Uint(0) or account.code_hash != EMPTY_CODE_HASH:
+        return False
+
+    if account_has_storage(tx_state, address):
+        return False
+
+    return True
 
 
 def account_has_storage(tx_state: TransactionState, address: Address) -> bool: