[wip]: more pydantic fixes

Author: fselmo

scripts/convert_addresses.py

@@ -6,11 +6,12 @@
 2. Replace all occurrences with tags
 """
 
-import re
 import argparse
-from typing import Dict, Set, Optional, List
-from pathlib import Path
+import re
 from enum import Enum, auto
+from pathlib import Path
+from typing import Dict, List, Optional, Set
+
 from ethereum_test_forks import Prague
 
 
@@ -66,7 +67,8 @@ class Context(Enum):
 INCOMPATIBLE_PATH_PATTERNS = {
     # Exact filenames (existing)
     "push0Filler.yml",
-    "push0Gas2Filler.yml"
+    "push0Gas2Filler.yml",
+    "ContractCreationSpamFiller.json",
     "create2InitCodeSizeLimitFiller.yml",
     "createInitCodeSizeLimitFiller.yml",
     "creationTxInitCodeSizeLimitFiller.yml",
@@ -108,6 +110,10 @@ class Context(Enum):
     "delegatecallInInitcodeToExistingContractOOGFiller.json",
     "delegatecodeDynamicCode2SelfCallFiller.json",
     "delegatecodeDynamicCodeFiller.json",
+    "RawCreateFailGasValueTransferFiller.json",
+    "RawCreateFailGasValueTransfer2Filler.json",
+    "ExtCodeCopyTestsParisFiller.json",
+    "EXTCODESIZE_toNonExistentFiller.json",
     "CreateAndGasInsideCreateFiller.json",
     "RawCreateGasFiller.json",
     "RawCreateGasMemoryFiller.json",
@@ -127,6 +133,12 @@ class Context(Enum):
     "storageCostsFiller.yml",
     "variedContextFiller.yml",
     "vitalikTransactionTestParisFiller.json",
+
+    # stExample
+    "add11_ymlFiller.yml",
+    "add11Filler.json",
+   
+    # stExtCodeHash
     "extcodehashEmpty_ParisFiller.yml",
     "extCodeHashSelfInInitFiller.json",
     "extCodeHashSubcallSuicideCancunFiller.yml",
@@ -143,18 +155,41 @@ class Context(Enum):
     "extCodeHashSubcallSuicideFiller.yml",
     "CreateAndGasInsideCreateWithMemExpandingCallsFiller.json",
     "codeCopyZero_ParisFiller.yml",
-    "createEmptyThenExtcodehashFiller.json",
     "extCodeHashInInitCodeFiller.json",
     "extCodeHashSelfFiller.json",
+    "extCodeHashNonExistingAccountFiller.yml",
+    "extCodeHashSubcallOOGFiller.yml",
+    "extCodeHashPrecompilesFiller.yml",
+    "contractCreationOOGdontLeaveEmptyContractFiller.json",
+    "extCodeHashCreatedAndDeletedAccountCallFiller.json",
+    "createEmptyThenExtcodehashFiller.json",
     "contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json",
+    
+    # Really only `ReturnTestFiller` and `ReturnTest2Filler` are compatible inside `stInitCodeTest`
     "CallContractToCreateContractAndCallItOOGFiller.json",
     "CallContractToCreateContractOOGBonusGasFiller.json",
     "CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json",
     "CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json",
+    "CallRecursiveContractFiller.json",
+    "StackUnderFlowContractCreationFiller.json",
+    "TransactionCreateRandomInitCodeFiller.json",
+    "TransactionCreateAutoSuicideContractFiller.json",
+    "TransactionCreateSuicideInInitcodeFiller.json",
     "CallTheContractToCreateEmptyContractFiller.json",
     "OutOfGasContractCreationFiller.json",
     "OutOfGasPrefundedContractCreationFiller.json",
     "TransactionCreateStopInInitcodeFiller.json",
+
+
+    # stInitCodeTest
+    "ReturnTestFiller.json",
+    "ReturnTest2Filler.json",
+    "CREATE_Bounds2Filler.json",
+    "CREATE_Bounds3Filler.json",
+    "CREATE_BoundsFiller.json",
+    "NonZeroValue_CALLCODEFiller.json",
+    "NonZeroValue_DELEGATECALLFiller.json",
+
     "bufferFiller.yml",
     "bufferSrcOffsetFiller.yml",
     "callDataCopyOffsetFiller.json",
@@ -207,6 +242,22 @@ class Context(Enum):
     "randomStatetest545Filler.json",
     "randomStatetest537Filler.json",
     "randomStatetest564Filler.json",
+    "randomStatetest307Filler.json",
+    "randomStatetest646Filler.json",
+    "Call50000_sha256Filler.json",
+    "Create1000ByzantiumFiller.json",
+    "Create1000Filler.json",
+
+    # stRecursiveCreate
+    "RecursiveCreateContractsCreate4ContractsFiller.json",
+    "RecursiveCreateContractsFiller.json",
+
+    # stStackTests
+    "shallowStackFiller.json",
+    "stackOverflowFiller.json",
+    "stackOverflowDUPFiller.json",
+    "stackOverflowPUSHFiller.json",
+
     "revertRetDataSizeFiller.yml",
     "returndatacopy_0_0_following_successful_createFiller.json",
     "RevertPrefoundFiller.json",
@@ -216,6 +267,9 @@ class Context(Enum):
     "LoopCallsDepthThenRevert2Filler.json",
     "LoopCallsDepthThenRevert3Filler.json",
     "CreateContractFromMethodFiller.json",
+    "RevertOpcodeCreateFiller.json",
+    "RevertOpcodeInInitFiller.json",
+    "RevertOpcodeWithBigOutputInInitFiller.json",
     "ByZeroFiller.json",
     "RecursiveCreateContractsCreate4ContractsFiller.json",
     "RecursiveCreateContractsFiller.json",
@@ -232,6 +286,11 @@ class Context(Enum):
     "stackOverflowSWAPFiller.json",
     "stacksanitySWAPFiller.json",
     # TODO: See if any of these can be turned on with fine tuning
+    "static_ABAcallsSuicide1Filler.json",
+    "static_CREATE_ContractSuicideDuringInitFiller.json",
+    "static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json",
+    "static_CREATE_ContractSuicideDuringInit_WithValueFiller.json",
+    "static_ZeroValue_CALL_OOGRevertFiller.json",
     "static_CREATE_EmptyContractAndCallIt_0weiFiller.json",
     "static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json",
     "static_RawCallGasAskFiller.json",
@@ -317,6 +376,20 @@ class Context(Enum):
     "SuicidesAndInternalCallSuicidesSuccessFiller.json",
     "StoreGasOnCreateFiller.json",
     "TransactionSendingToEmptyFiller.json",
+    "ZeroValue_DELEGATECALLFiller.json",
+    "ZeroValue_SUICIDEFiller.json",
+    "ZeroValue_TransactionCALLFiller.json",
+    "ZeroValue_CALLCODE_OOGRevertFiller.json",
+    "ZeroValue_TransactionCALLwithDataFiller.json",
+    "ZeroValue_CALL_OOGRevertFiller.json",
+    "ZeroValue_DELEGATECALL_OOGRevertFiller.json",
+    "ZeroValue_CALLCODEFiller.json",
+    "ZeroValue_CALLFiller.json",
+    "createNameRegistratorValueTooHighFiller.json",
+    "suicideCallerAddresTooBigLeftFiller.json",
+    "ABAcallsSuicide1Filler.json",
+
+    
     # Directory patterns (examples - add as needed)
     "/stCreate2/",
     "/stCreateTest/",
@@ -555,20 +628,22 @@ def detect_context_change(self, line: str) -> Optional[Context]:
                 return None  # Don't change context for empty storage
             return Context.STORAGE
         # Known fields that indicate we're back in NORMAL context
-        elif any(kw in stripped for kw in {"balance:", "nonce:", "secretKey:", "gasLimit:", 
+        elif any(kw in stripped for kw in {"balance:", "nonce:", "secretKey:", "gasLimit:",
                                            "gasPrice:", "value:", "to:", "from:", "address:",
                                            "shouldnotexist:", "indexes:", "network:", "result:"}):
             return Context.NORMAL
         return None
 
     def create_short_name(self, addr: str) -> Optional[str]:
-        """Create a short name from an address by stripping leading/trailing zeros.
+        """
+        Create a short name from an address by stripping leading/trailing zeros.
 
         Args:
             addr: Normalized address (40 chars, lowercase, no 0x prefix)
 
         Returns:
             Short name with 0x prefix, or None if the address is all zeros or too short
+
         """
         if not addr or len(addr) != 40:
             return None
@@ -779,10 +854,8 @@ def build_tags(self) -> None:
                 continue
 
             if addr == KNOWN_SENDER_ADDRESS:
-                if addr in self.addresses_with_code:
-                    self.address_mappings[addr] = f"<contract:sender:0x{addr}>"
-                else:
-                    self.address_mappings[addr] = f"<eoa:sender:0x{addr}>"
+                # Always use eoa tag for sender - the pre-state will add code if needed
+                self.address_mappings[addr] = f"<eoa:sender:0x{addr}>"
             elif addr in self.creation_addresses:
                 self.address_mappings[addr] = f"<contract:creation:0x{addr}>"
             elif addr == self.coinbase_addr and addr not in self.pre_addresses:
@@ -803,15 +876,15 @@ def build_tags(self) -> None:
                         self.short_name_mappings[short_name] = tag
 
     def convert_line(self, line: str, section: Section, context: Context) -> str:
-        """Second pass: convert addresses to tags.
+        """
+        Second pass: convert addresses to tags.
 
         IMPORTANT: This method should ONLY replace raw addresses with their tags.
         It should NEVER re-tag already tagged addresses to prevent double-tagging
         like <tag:<tag:0xaddr>>. The first pass identifies addresses and assigns
         tags. This second pass finds those raw addresses in the content and
         replaces them with their assigned tags.
         """
-
         # Special handling for CALL to address 0 when we have 0x0000...0000 in pre-state
         if context == Context.CODE:
             zero_addr = "0" * 40