added address after checks (#1129)

* address gets added only after checks

* linting corrected

* refactored as per geth impl

Author: Shashwat-Nautiyal

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

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -75,8 +76,6 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -95,6 +94,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

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

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -76,8 +77,6 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -96,6 +95,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

src/ethereum/cancun/vm/instructions/system.py

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -84,8 +85,6 @@ def generic_create(
     if len(call_data) > 2 * MAX_CODE_SIZE:
         raise OutOfGasError
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -104,6 +103,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

src/ethereum/gray_glacier/vm/instructions/system.py

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -75,8 +76,6 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -95,6 +94,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

src/ethereum/london/vm/instructions/system.py

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -75,8 +76,6 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -95,6 +94,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

src/ethereum/paris/vm/instructions/system.py

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -75,8 +76,6 @@ def generic_create(
         evm.memory, memory_start_position, memory_size
     )
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -95,6 +94,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

src/ethereum/prague/vm/instructions/system.py

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -85,8 +86,6 @@ def generic_create(
     if len(call_data) > 2 * MAX_CODE_SIZE:
         raise OutOfGasError
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -105,6 +104,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):

src/ethereum/shanghai/vm/instructions/system.py

@@ -11,6 +11,7 @@
 
 Implementations of the EVM system related instructions.
 """
+
 from ethereum_types.bytes import Bytes0
 from ethereum_types.numeric import U256, Uint
 
@@ -83,8 +84,6 @@ def generic_create(
     if len(call_data) > 2 * MAX_CODE_SIZE:
         raise OutOfGasError
 
-    evm.accessed_addresses.add(contract_address)
-
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
     evm.gas_left -= create_message_gas
     if evm.message.is_static:
@@ -103,6 +102,8 @@ def generic_create(
         push(evm.stack, U256(0))
         return
 
+    evm.accessed_addresses.add(contract_address)
+
     if account_has_code_or_nonce(
         evm.message.block_env.state, contract_address
     ) or account_has_storage(evm.message.block_env.state, contract_address):