refactor: reorganize directory structure

Author: minaminao

erever/__init__.py

@@ -1,5 +1,5 @@
 from .assemble import assemble
-from .context import Context
+from .data_structure.context import Context
 from .disassemble import disassemble
 from .disassemble_mermaid import disassemble_mermaid
 from .disassemble_symbolic import disassemble_symbolic

erever/__main__.py

@@ -5,13 +5,13 @@
 import tomllib
 
 from .assemble import assemble
-from .colors import Colors
-from .context import Context
+from .data_structure.context import Context
 from .disassemble import MemoryDisplay, disassemble
 from .disassemble_mermaid import disassemble_mermaid
 from .disassemble_symbolic import disassemble_symbolic
 from .find_gadgets import find_gadgets
-from .utils import UINT256_MAX
+from .utils.colors import Colors
+from .utils.general import UINT256_MAX
 
 
 class CustomHelpFormatter(argparse.HelpFormatter):

erever/assemble.py

@@ -1,4 +1,4 @@
-from .opcodes import OPCODES
+from .opcodes.cancun import OPCODES
 
 
 def assemble(mnemonics_str: str) -> bytes:

erever/data_structure/__init__.py

@@ -4,11 +4,11 @@
 from web3 import HTTPProvider, Web3
 from web3.types import BlockData, TxData
 
-from .eof import EOF
-from .precompiled_contracts import PRECOMPILED_CONTRACTS
+from ..eof import EOF
+from ..precompiled_contracts.shanghai import PRECOMPILED_CONTRACTS
+from ..types import AddressInt, Gas
+from ..utils.general import UINT256_MAX, int_to_check_sum_address
 from .storage import Storage
-from .types import AddressInt, Gas
-from .utils import UINT256_MAX, int_to_check_sum_address
 
 StateDict = dict[str, dict[str, str | int | dict[str, str]]]
 

erever/context.py erever/data_structure/context.py

@@ -1,8 +1,8 @@
 from Crypto.Util.number import bytes_to_long
 
-from .colors import Colors
-from .types import Gas
-from .utils import decode_printable_with_color, is_overlapping
+from ..types import Gas
+from ..utils.colors import Colors
+from ..utils.general import decode_printable_with_color, is_overlapping
 
 
 class Memory:

erever/memory.py erever/data_structure/memory.py

@@ -1,5 +1,5 @@
-from .colors import Colors
-from .utils import pad_even
+from ..utils.colors import Colors
+from ..utils.general import pad_even
 
 NodeValue = str | int | list["Node"]
 

erever/node.py erever/data_structure/node.py

@@ -1,5 +1,5 @@
-from .colors import Colors
-from .utils import UINT256_MAX, decode_printable_with_color, pad_even
+from ..utils.colors import Colors
+from ..utils.general import UINT256_MAX, decode_printable_with_color, pad_even
 
 
 class Stack:

erever/stack.py erever/data_structure/stack.py

@@ -1,4 +1,4 @@
-from .utils import UINT256_MAX
+from ..utils.general import UINT256_MAX
 
 
 class Storage:

erever/storage.py erever/data_structure/storage.py

@@ -6,26 +6,16 @@
 from Crypto.Hash import SHA256, keccak
 from Crypto.Util.number import bytes_to_long
 
-from .colors import Colors
-from .context import Context
+from .data_structure.context import Context
+from .data_structure.memory import Memory
+from .data_structure.stack import Stack
 from .eof import EOF, parse_eof_body, parse_eof_header
 from .gas import GAS_CODE_WARM_COLD_DIFF, calculate_message_call_gas
-from .memory import Memory
-from .opcodes import OPCODES
-from .opcodes_eof import OPCODES_EOF
-from .precompiled_contracts import PRECOMPILED_CONTRACTS
-from .stack import Stack
-from .utils import (
-    SIGN_MASK,
-    TAB_SIZE,
-    UINT256_MAX,
-    compute_contract_address,
-    int256,
-    is_invocation_mnemonic,
-    pad,
-    pad_even,
-    uint256,
-)
+from .opcodes.cancun import OPCODES
+from .opcodes.eof import OPCODES_EOF
+from .precompiled_contracts.shanghai import PRECOMPILED_CONTRACTS
+from .utils.colors import Colors
+from .utils.general import SIGN_MASK, TAB_SIZE, UINT256_MAX, compute_contract_address, int256, is_invocation_mnemonic, pad, pad_even, uint256
 
 
 @dataclass

erever/symbolic_stack.py erever/data_structure/symbolic_stack.py

@@ -1,9 +1,9 @@
 from enum import Enum
 
-from .context import Context
+from .data_structure.context import Context
 from .disassemble import disassemble
-from .opcodes import OPCODES
-from .utils import UINT256_MAX, pad
+from .opcodes.cancun import OPCODES
+from .utils.general import UINT256_MAX, pad
 
 
 class ControlType(Enum):

erever/disassemble.py

@@ -3,12 +3,12 @@
 
 from Crypto.Util.number import bytes_to_long
 
-from .colors import Colors
-from .context import Context
-from .node import Node
-from .opcodes import OPCODES
-from .symbolic_stack import SymbolicStack
-from .utils import TAB_SIZE, UINT256_MAX, pad
+from .data_structure.context import Context
+from .data_structure.node import Node
+from .data_structure.symbolic_stack import SymbolicStack
+from .opcodes.cancun import OPCODES
+from .utils.colors import Colors
+from .utils.general import TAB_SIZE, UINT256_MAX, pad
 
 Gadget = tuple[int, Node | None, int, SymbolicStack, list[Node], list[tuple[Node, int, bool]]]
 

erever/disassemble_mermaid.py

@@ -1,8 +1,8 @@
-from .colors import Colors
-from .context import Context
+from .data_structure.context import Context
 from .disassemble import disassemble
 from .disassemble_symbolic import disassemble_symbolic
-from .utils import pad
+from .utils.colors import Colors
+from .utils.general import pad
 
 
 def find_gadgets(

erever/disassemble_symbolic.py

@@ -4,8 +4,8 @@
 from eth_typing import ChecksumAddress
 from web3 import Web3
 
+from ..types import AddressInt
 from .colors import Colors
-from .types import AddressInt
 
 UINT256_MAX = (1 << 256) - 1
 SIGN_MASK = 1 << 255

erever/find_gadgets.py

@@ -17,7 +17,7 @@ dependencies = [
 requires-python = ">=3.12"
 
 [project.scripts]
-erever = "erever.__main__:main"
+erever = "__main__:main"
 
 [build-system]
 requires = ["hatchling"]
@@ -41,5 +41,8 @@ precommit = { chain = ["fix", "type-check-strict"] }
 [tool.hatch.metadata]
 allow-direct-references = true
 
+[tool.hatch.build.targets.wheel]
+packages = ["erever"]
+
 [tool.ruff]
 line-length = 120

erever/opcodes/__init__.py

@@ -1,4 +1,4 @@
-from erever.utils import compute_contract_address
+from erever.utils.general import compute_contract_address
 
 
 def test() -> None:

erever/opcodes.py erever/opcodes/cancun.py

@@ -1,4 +1,4 @@
-from erever.context import Context
+from erever.data_structure.context import Context
 from erever.disassemble import disassemble
 
 

erever/opcodes_eof.py erever/opcodes/eof.py

@@ -1,4 +1,4 @@
-from erever.secp256k1 import ECDSA, ECPoint, Fp, G, n
+from erever.utils.secp256k1 import ECDSA, ECPoint, Fp, G, n
 
 
 def test_key_pair() -> None: