feat: rearrange and export modules

tests/parser/environment/test_call_context_manager.py

@@ -38,7 +38,7 @@
     StorageAccesses,
     StorageWrites,
 )
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def get_add(call_context: CallContext) -> Instruction:

tests/parser/information_flow/test_information_flow_dsl.py

@@ -47,13 +47,13 @@
     FlowNodeWithResult,
     FlowWithResult,
 )
-from traces_parser.parser.storage.storage_value import StorageByteGroup
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
 from traces_parser.parser.storage.storage_writes import (
     ReturnDataAccess,
     StorageAccesses,
     StorageWrites,
 )
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 class _TestFlowNode(FlowNodeWithResult):

tests/parser/instructions/test_instructions.py

@@ -172,7 +172,7 @@
 )
 from traces_parser.parser.instructions_parser import InstructionMetadata
 from traces_parser.parser.trace_evm.trace_evm import parse_instruction
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 _opcodes_to_instruction = [

tests/parser/storage/test_address_key_storage.py

@@ -4,7 +4,7 @@
     _test_group32,
     _test_address_key_storage,
 )
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def test_address_key_storage_get():

tests/parser/storage/test_balances.py

@@ -4,7 +4,7 @@
     SPECIAL_STEP_INDEXES,
 )
 from traces_parser.parser.storage.balances import InvalidAddressException
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def test_balances_last_modified_at_step_index():

tests/parser/storage/test_stack.py

@@ -1,7 +1,7 @@
 import pytest
 from tests.test_utils.test_utils import _test_group, _test_group32, _test_stack
 from traces_parser.parser.storage.stack import Stack
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def test_stack_empty():

tests/parser/storage/test_storage_value.py

@@ -1,5 +1,5 @@
-from traces_parser.parser.storage.storage_value import StorageByteGroup
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
+from traces_parser.datatypes.hexstring import HexString
 
 
 def test_storage_byte_group_empty():

tests/parser/test_events_parser.py

@@ -1,5 +1,5 @@
 from traces_parser.parser.events_parser import parse_events
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def test_events_parser():

tests/parser/test_instructions_parser.py

@@ -15,7 +15,7 @@
     parse_transaction,
 )
 from traces_parser.parser.trace_evm.trace_evm import parse_instruction
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def get_parsing_info(verify_storages=True) -> TransactionParsingInfo:

tests/test_utils/test_utils.py

@@ -25,7 +25,7 @@
 from traces_parser.parser.storage.balances import Balances
 from traces_parser.parser.storage.memory import Memory
 from traces_parser.parser.storage.stack import Stack
-from traces_parser.parser.storage.storage_value import StorageByteGroup
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
 from traces_parser.parser.storage.storage_writes import (
     MemoryAccess,
     PersistentStorageAccess,
@@ -36,7 +36,7 @@
     StorageWrites,
 )
 from traces_parser.parser.trace_evm.trace_evm import InstructionMetadata
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 from traces_parser.utils.mnemonics import opcode_to_name
 
 TestVal = str | HexString | StorageByteGroup

tests/utils/test_hexstring.py

@@ -1,4 +1,4 @@
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def test_hexstring_equals_str():

tests/utils/test_precompiled_contracts.py

@@ -1,4 +1,4 @@
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 from traces_parser.utils.precompiled_contracts import (
     addr_to_precompiled_contract_name,
     is_precompiled_contract,

traces_parser/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/cli.py

@@ -4,9 +4,7 @@
 from pathlib import Path
 
 from traces_parser.parser.events_parser import parse_events
-from traces_parser.parser.instructions_parser import (
-    parse_transaction,
-)
+from traces_parser.parser.instructions_parser import parse_transaction
 from traces_parser.utils.metadata_file_loader import load_metadata_file
 
 

traces_parser/datatypes/__init__.py

@@ -0,0 +1,4 @@
+from traces_parser.datatypes.hexstring import HexString as HexString
+from traces_parser.datatypes.storage_byte_group import (
+    StorageByteGroup as StorageByteGroup,
+)

traces_parser/parser/storage/storage_value.py → traces_parser/datatypes/storage_byte_group.py

@@ -1,4 +1,4 @@
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 class StorageByte:

traces_parser/parser/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/parser/environment/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/parser/environment/call_context.py

@@ -6,8 +6,8 @@
 
 from typing_extensions import Self
 
-from traces_parser.parser.storage.storage_value import StorageByteGroup
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
+from traces_parser.datatypes.hexstring import HexString
 
 if TYPE_CHECKING:
     from traces_parser.parser.instructions.instructions import (

traces_parser/parser/environment/parsing_environment.py

@@ -13,7 +13,7 @@
     RevertableStorage,
     Storage,
 )
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 class ParsingEnvironment:

traces_parser/parser/events_parser.py

@@ -2,7 +2,7 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
 
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 @dataclass(frozen=True)

traces_parser/parser/information_flow/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/parser/information_flow/information_flow_dsl_implementation.py

@@ -11,7 +11,7 @@
     SPECIAL_STEP_INDEXES,
 )
 from traces_parser.parser.information_flow.information_flow_spec import Flow, FlowSpec
-from traces_parser.parser.storage.storage_value import StorageByteGroup
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
 from traces_parser.parser.storage.storage_writes import (
     BalanceAccess,
     BalanceTransferWrite,
@@ -34,7 +34,7 @@
     TransientStorageAccess,
     TransientStorageWrite,
 )
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 @dataclass(frozen=True)

traces_parser/parser/instructions/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/parser/instructions/instructions.py

@@ -41,13 +41,13 @@
 )
 from traces_parser.parser.information_flow.information_flow_spec import FlowSpec
 from traces_parser.parser.instructions.instruction import Instruction
-from traces_parser.parser.storage.storage_value import StorageByteGroup
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
 from traces_parser.parser.storage.storage_writes import (
     MemoryWrite,
     StackPush,
     StorageWrites,
 )
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 CallDataNew = TypedDict(
     "CallDataNew",

traces_parser/parser/instructions_parser.py

@@ -1,12 +1,8 @@
 from collections.abc import Iterable
-from dataclasses import dataclass
 from typing import Sequence
 
 from traces_parser.parser.environment.call_context import CallContext
-from traces_parser.parser.environment.call_context_manager import (
-    CallTree,
-    build_call_tree,
-)
+from traces_parser.parser.environment.call_context_manager import build_call_tree
 from traces_parser.parser.environment.parsing_environment import (
     InstructionOutputOracle,
     ParsingEnvironment,
@@ -16,24 +12,13 @@
     SPECIAL_STEP_INDEXES,
 )
 from traces_parser.parser.instructions.instruction import Instruction
-from traces_parser.parser.storage.storage_value import StorageByteGroup
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
 from traces_parser.parser.trace_evm.trace_evm import InstructionMetadata, TraceEVM
-from traces_parser.utils.hexstring import HexString
-
-
-@dataclass
-class TransactionParsingInfo:
-    sender: HexString
-    to: HexString
-    calldata: HexString
-    value: HexString
-    verify_storages: bool = True
-
-
-@dataclass
-class ParsedTransaction:
-    instructions: Sequence[Instruction]
-    call_tree: CallTree
+from traces_parser.parser.transaction_parsing_info import (
+    ParsedTransaction,
+    TransactionParsingInfo,
+)
+from traces_parser.datatypes.hexstring import HexString
 
 
 def parse_transaction(

traces_parser/parser/storage/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/parser/storage/address_key_storage.py

@@ -1,8 +1,8 @@
 from typing_extensions import Self
 
 from traces_parser.parser.storage.storage import CloneableStorage
-from traces_parser.parser.storage.storage_value import StorageByteGroup
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
+from traces_parser.datatypes.hexstring import HexString
 
 
 class AddressKeyStorage(CloneableStorage):

traces_parser/parser/storage/balances.py

@@ -4,7 +4,7 @@
     SPECIAL_STEP_INDEXES,
 )
 from traces_parser.parser.storage.storage import CloneableStorage
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 class InvalidAddressException(Exception):

traces_parser/parser/storage/memory.py

@@ -1,5 +1,5 @@
-from traces_parser.parser.storage.storage_value import StorageByteGroup
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
+from traces_parser.datatypes.hexstring import HexString
 
 
 class Memory:

traces_parser/parser/storage/stack.py

@@ -3,8 +3,8 @@
 from traces_parser.parser.information_flow.constant_step_indexes import (
     SPECIAL_STEP_INDEXES,
 )
-from traces_parser.parser.storage.storage_value import StorageByteGroup
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
+from traces_parser.datatypes.hexstring import HexString
 
 
 class Stack:

traces_parser/parser/storage/storage_writes.py

@@ -2,8 +2,8 @@
 from dataclasses import dataclass
 from typing import Iterable, Sequence
 
-from traces_parser.parser.storage.storage_value import StorageByteGroup
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
+from traces_parser.datatypes.hexstring import HexString
 
 
 @dataclass

traces_parser/parser/trace_evm/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/parser/trace_evm/trace_evm.py

@@ -15,9 +15,9 @@
     CallInstruction,
     get_instruction_class,
 )
-from traces_parser.parser.storage.storage_value import StorageByteGroup
+from traces_parser.datatypes.storage_byte_group import StorageByteGroup
 from traces_parser.parser.storage.storage_writes import StorageAccesses, StorageWrites
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 from traces_parser.utils.mnemonics import opcode_to_name
 
 

traces_parser/parser/transaction_parsing_info.py

@@ -0,0 +1,21 @@
+from dataclasses import dataclass
+from typing import Sequence
+
+from traces_parser.parser.environment.call_context_manager import CallTree
+from traces_parser.parser.instructions.instruction import Instruction
+from traces_parser.datatypes.hexstring import HexString
+
+
+@dataclass
+class TransactionParsingInfo:
+    sender: HexString
+    to: HexString
+    calldata: HexString
+    value: HexString
+    verify_storages: bool = True
+
+
+@dataclass
+class ParsedTransaction:
+    instructions: Sequence[Instruction]
+    call_tree: CallTree

traces_parser/utils/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/utils/metadata_file_loader.py

@@ -1,7 +1,7 @@
 import json
 from pathlib import Path
 from traces_parser.parser.instructions_parser import TransactionParsingInfo
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 def load_metadata_file(path: Path) -> TransactionParsingInfo:

traces_parser/utils/precompiled_contracts.py

@@ -1,4 +1,4 @@
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 _ADDR_TO_NAME = {
     1: "ecRecover",

traces_parser/utils/signatures/__init__.py

@@ -0,0 +1 @@
+# from . import *

traces_parser/utils/signatures/signature_lookup.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 
 
 class SignatureLookup(ABC):

traces_parser/utils/signatures/signature_registry.py

@@ -2,7 +2,7 @@
 
 import requests
 
-from traces_parser.utils.hexstring import HexString
+from traces_parser.datatypes.hexstring import HexString
 from traces_parser.utils.signatures.signature_lookup import SignatureLookup