Add some more hardcoded

Author: leolara

scripts/filler_to_python/analyzer.py

@@ -141,9 +141,17 @@ class NoIntResolver(_yaml.SafeLoader):  # type: ignore[no-redef]
     # OUTPUT_DIFFERS — remaining 2 (Categories F, H)
     "stEIP3651_warmcoinbase/test_coinbase_warm_account_call_gas.py",
     "stWalletTest/test_multi_owned_is_owner_true.py",
-    # STRUCTURAL (2) — CREATE collision behaviour
+    # STRUCTURAL — CREATE collision / EIP-3607 rejection behaviour.
+    # With dynamic addresses the collision doesn't happen, so the tx
+    # runs instead of being rejected → traces appear where baseline
+    # had none.
     "stCreateTest/test_transaction_collision_to_empty_but_code.py",
+    "stCreateTest/test_transaction_collision_to_empty_but_nonce.py",
     "stEIP3607/test_init_colliding_with_non_empty_account.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py",
+    "stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py",
 }
 
 

tests/ported_static/stCreateTest/test_transaction_collision_to_empty_but_nonce.py

@@ -7,6 +7,7 @@
 
 import pytest
 from execution_testing import (
+    EOA,
     Account,
     Address,
     Alloc,
@@ -67,7 +68,10 @@ def test_transaction_collision_to_empty_but_nonce(
 ) -> None:
     """Test_transaction_collision_to_empty_but_nonce."""
     coinbase = Address(0x2ADC25665018AA1FE0E6BC666DAC8FC2697FF9BA)
-    sender = pre.fund_eoa(amount=0xE8D4A51000)
+    contract_0 = Address(0x6295EE1B4F6DD65047762F924ECD367C17EABF8F)
+    sender = EOA(
+        key=0x45A915E4D060149EB4365960E6A7A45F334393093061116B197E3240065FF2D8
+    )
 
     env = Environment(
         fee_recipient=coinbase,
@@ -78,7 +82,8 @@ def test_transaction_collision_to_empty_but_nonce(
         gas_limit=10000000,
     )
 
-    contract_0 = pre.fund_eoa(amount=0)
+    pre[sender] = Account(balance=0xE8D4A51000)
+    pre[contract_0] = Account(balance=0, nonce=1)
 
     tx_data = [
         Op.SSTORE(key=0x1, value=0x1),

tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls.py

@@ -7,6 +7,8 @@
 
 import pytest
 from execution_testing import (
+    EOA,
+    Account,
     Address,
     Alloc,
     Bytes,
@@ -35,7 +37,9 @@ def test_transaction_colliding_with_non_empty_account_calls(
 ) -> None:
     """Account with non-empty code attempts to send tx to call a contract."""
     coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
-    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
+    sender = EOA(
+        key=0x402790500EA083A617EC567407D9EC3BBB3A5C8B812547D9F66E8D7878B8A75D
+    )
 
     env = Environment(
         fee_recipient=coinbase,
@@ -46,12 +50,16 @@ def test_transaction_colliding_with_non_empty_account_calls(
         gas_limit=71794957647893862,
     )
 
-    coinbase = pre.fund_eoa(amount=0)
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(
+        balance=0xDE0B6B3A7640000, code=Op.SSTORE(key=0x1, value=0x0)
+    )
     # Source: raw
     # 0x6000600155
     target = pre.deploy_contract(  # noqa: F841
         code=Op.SSTORE(key=0x1, value=0x0),
         nonce=0,
+        address=Address(0xD857DAD5866E190FD86B79F027FB8EE8E60FBDA7),  # noqa: E501
     )
 
     tx = Transaction(

tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_calls_itself.py

@@ -7,6 +7,8 @@
 
 import pytest
 from execution_testing import (
+    EOA,
+    Account,
     Address,
     Alloc,
     Bytes,
@@ -15,6 +17,7 @@
     Transaction,
     TransactionException,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -34,7 +37,9 @@ def test_transaction_colliding_with_non_empty_account_calls_itself(
 ) -> None:
     """Account with non-empty code attempts to send tx to call itself."""
     coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
-    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
+    sender = EOA(
+        key=0x402790500EA083A617EC567407D9EC3BBB3A5C8B812547D9F66E8D7878B8A75D
+    )
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,7 +50,10 @@ def test_transaction_colliding_with_non_empty_account_calls_itself(
         gas_limit=71794957647893862,
     )
 
-    coinbase = pre.fund_eoa(amount=0)
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(
+        balance=0xDE0B6B3A7640000, code=Op.SSTORE(key=0x1, value=0x0)
+    )
 
     tx = Transaction(
         sender=sender,

tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_init_paris.py

@@ -7,6 +7,8 @@
 
 import pytest
 from execution_testing import (
+    EOA,
+    Account,
     Address,
     Alloc,
     Environment,
@@ -74,7 +76,10 @@ def test_transaction_colliding_with_non_empty_account_init_paris(
 ) -> None:
     """Account with non-empty code attempts to send tx to create a contract."""
     coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
-    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
+    addr = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
+    sender = EOA(
+        key=0x3696BFBDBC65B14F4DC76D7762E0567E1DD55F053314276E47969D22E70A554E
+    )
 
     env = Environment(
         fee_recipient=coinbase,
@@ -85,14 +90,16 @@ def test_transaction_colliding_with_non_empty_account_init_paris(
         gas_limit=71794957647893862,
     )
 
-    coinbase = pre.fund_eoa(amount=0)
-    addr = pre.fund_eoa(amount=10)
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(balance=0xDE0B6B3A7640000, code=Op.STOP)
+    pre[addr] = Account(balance=10)
     # Source: raw
     # 0x00
     addr_2 = pre.deploy_contract(  # noqa: F841
         code=Op.STOP,
         balance=10,
         nonce=0,
+        address=Address(0xCC7C3C64708397216F5F8AEB34A43F1749693FA9),  # noqa: E501
     )
 
     expect_entries_: list[dict] = [

tests/ported_static/stEIP3607/test_transaction_colliding_with_non_empty_account_send_paris.py

@@ -7,6 +7,8 @@
 
 import pytest
 from execution_testing import (
+    EOA,
+    Account,
     Address,
     Alloc,
     Bytes,
@@ -15,6 +17,7 @@
     Transaction,
     TransactionException,
 )
+from execution_testing.vm import Op
 
 REFERENCE_SPEC_GIT_PATH = "N/A"
 REFERENCE_SPEC_VERSION = "N/A"
@@ -34,7 +37,10 @@ def test_transaction_colliding_with_non_empty_account_send_paris(
 ) -> None:
     """Account with non-empty code attempts to send tx to another account..."""
     coinbase = Address(0xEB201D2887816E041F6E807E804F64F3A7A226FE)
-    sender = pre.fund_eoa(amount=0xDE0B6B3A7640000)
+    addr = Address(0x76FAE819612A29489A1A43208613D8F8557B8898)
+    sender = EOA(
+        key=0x402790500EA083A617EC567407D9EC3BBB3A5C8B812547D9F66E8D7878B8A75D
+    )
 
     env = Environment(
         fee_recipient=coinbase,
@@ -45,8 +51,11 @@ def test_transaction_colliding_with_non_empty_account_send_paris(
         gas_limit=71794957647893862,
     )
 
-    coinbase = pre.fund_eoa(amount=0)
-    addr = pre.fund_eoa(amount=10)
+    pre[coinbase] = Account(balance=0, nonce=1)
+    pre[sender] = Account(
+        balance=0xDE0B6B3A7640000, code=Op.SSTORE(key=0x1, value=0x0)
+    )
+    pre[addr] = Account(balance=10)
 
     tx = Transaction(
         sender=sender,