necessary changes to rename types.py to eest_types.py without breaking anything

Author: felix314159

src/cli/eofwrap.py

@@ -32,8 +32,8 @@
 from ethereum_test_specs.eof import EOFParse
 from ethereum_test_tools import Opcodes as Op
 from ethereum_test_types import Transaction
+from ethereum_test_types.eest_types import Environment
 from ethereum_test_types.eof.v1 import Container
-from ethereum_test_types.types import Environment
 from ethereum_test_vm.bytecode import Bytecode
 
 

src/ethereum_test_fixtures/blockchain.py

@@ -33,7 +33,7 @@
 )
 from ethereum_test_exceptions import EngineAPIError, ExceptionInstanceOrList
 from ethereum_test_forks import Fork, Paris
-from ethereum_test_types.types import (
+from ethereum_test_types.eest_types import (
     Transaction,
     TransactionFixtureConverter,
     TransactionGeneric,

src/ethereum_test_fixtures/common.py

@@ -11,7 +11,7 @@
     SignableRLPSerializable,
     ZeroPaddedHexNumber,
 )
-from ethereum_test_types.types import Address, AuthorizationTupleGeneric
+from ethereum_test_types.eest_types import Address, AuthorizationTupleGeneric
 
 
 class FixtureForkBlobSchedule(CamelModel):

src/ethereum_test_fixtures/state.py

@@ -13,7 +13,7 @@
     ZeroPaddedHexNumber,
 )
 from ethereum_test_exceptions import TransactionExceptionInstanceOrList
-from ethereum_test_types.types import (
+from ethereum_test_types.eest_types import (
     CamelModel,
     EnvironmentGeneric,
     Transaction,

src/ethereum_test_fixtures/transaction.py

@@ -6,7 +6,7 @@
 
 from ethereum_test_base_types import Address, Bytes, Hash, ZeroPaddedHexNumber
 from ethereum_test_exceptions import TransactionExceptionInstanceOrList
-from ethereum_test_types.types import CamelModel
+from ethereum_test_types.eest_types import CamelModel
 
 from .base import BaseFixture
 

src/ethereum_test_forks/forks/forks.py

@@ -4,7 +4,7 @@
 from hashlib import sha256
 from os.path import realpath
 from pathlib import Path
-from typing import List, Literal, Mapping, Optional, Sized, Tuple
+from typing import List, Mapping, Optional, Sized, Tuple
 
 from semver import Version
 
@@ -27,26 +27,6 @@
 CURRENT_FILE = Path(realpath(__file__))
 CURRENT_FOLDER = CURRENT_FILE.parent
 
-# blob-related constants
-FIELD_ELEMENTS_PER_BLOB = 4096
-BYTES_PER_FIELD_ELEMENT = 32
-BYTES_PER_BLOB = FIELD_ELEMENTS_PER_BLOB * BYTES_PER_FIELD_ELEMENT  # 131072
-CELL_LENGTH = 2048
-BLS_MODULUS = 0x73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001  # EIP-2537: Main subgroup order = q  # noqa: E501
-#       due to BLS_MODULUS every blob byte (uint256) must be smaller than 116
-
-#       deneb constants that have not changed (https://github.com/ethereum/consensus-specs/blob/cc6996c22692d70e41b7a453d925172ee4b719ad/specs/deneb/polynomial-commitments.md?plain=1#L78)
-BYTES_PER_PROOF = 48
-BYTES_PER_COMMITMENT = 48
-KZG_ENDIANNESS: Literal["big"] = "big"
-
-#       eip-7691
-MAX_BLOBS_PER_BLOCK_ELECTRA = 9
-TARGET_BLOBS_PER_BLOCK_ELECTRA = 6
-MAX_BLOB_GAS_PER_BLOCK = 1179648
-TARGET_BLOB_GAS_PER_BLOCK = 786432
-BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE = 5007716
-
 
 # All forks must be listed here !!! in the order they were introduced !!!
 class Frontier(BaseFork, solc_name="homestead"):

src/ethereum_test_types/__init__.py

@@ -1,18 +1,11 @@
 """Common definitions and types."""
 
-from .helpers import (
-    TestParameterGroup,
-    add_kzg_version,
-    ceiling_division,
-    compute_create2_address,
-    compute_create_address,
-    compute_eofcreate_address,
-)
-from .types import (
+from .eest_types import (
     EOA,
     Account,
     Alloc,
     AuthorizationTuple,
+    # Blob,
     CamelModel,
     ConsolidationRequest,
     DepositRequest,
@@ -29,6 +22,14 @@
     WithdrawalRequest,
     keccak256,
 )
+from .helpers import (
+    TestParameterGroup,
+    add_kzg_version,
+    ceiling_division,
+    compute_create2_address,
+    compute_create_address,
+    compute_eofcreate_address,
+)
 
 __all__ = (
     "Account",

src/ethereum_test_types/blob.py

@@ -1,7 +1,4 @@
-"""
-abstract: Tests [EIP-7594: PeerDAS - Peer Data Availability Sampling](https://eips.ethereum.org/EIPS/eip-7594)
-    Tests [EIP-7594: PeerDAS - Peer Data Availability Sampling](https://eips.ethereum.org/EIPS/eip-7594).
-"""  # noqa: E501
+"""Blob class and functionality."""
 
 import random
 from enum import Enum
@@ -403,72 +400,72 @@ def corrupt_byte(b: bytes) -> Bytes:
 #         static_blob.write_to_file()
 # --------------------------------------------
 
-# myosaka: Fork = Osaka
-# myprague: Fork = Prague
-# mycancun: Fork = Cancun
-# myseed: int = 1337  # fork+seed is the unique ID of a blob
-# mytimestamp: int = 168123123
-# b: Blob = Blob.NewBlob(myosaka, myseed, mytimestamp)
-# json_str: str = b.model_dump_json()
-# restored: Blob = Blob.model_validate_json(json_str)
-# assert b.data == restored.data
-# assert b.commitment == restored.commitment
-# assert b.proof == restored.proof
-# assert b.cells == restored.cells
-# assert b.versioned_hash == restored.versioned_hash
-# assert b.name == restored.name
-# assert b.fork == restored.fork
-# assert b.timestamp == restored.timestamp
-# print(type(b.proof), len(b.proof))
-# print(BYTES_PER_FIELD_ELEMENT)
-# print(len(b.data))
-# b.write_to_file()
-# c: Blob = Blob.LoadBlobFromFile("blob_" + "osaka" + "_" + str(myseed) + "_" + str(mytimestamp))
-# assert b.data == c.data
-# assert b.commitment == c.commitment
-# assert b.proof == c.proof
-# assert b.cells == c.cells
-# assert b.versioned_hash == c.versioned_hash
-# assert b.name == c.name
-# assert b.fork == c.fork
-# assert b.timestamp == c.timestamp
-# d: Blob = Blob.NewBlob(myprague, myseed, 123)
-# d.write_to_file()
-# e: Blob = Blob.NewBlob(myprague, myseed, 123)
-# print("Line above should say blob already existed and was loaded from file")
-# ee: Blob = Blob.NewBlob(myprague, myseed, 1234)
-# newtimestamp = 999999
-# f: Blob = Blob.NewBlob(mycancun, 1337, newtimestamp)
-# f.write_to_file()
-# h: Blob = Blob.NewBlob(myosaka, myseed)
-# h.write_to_file()
-# zz: Blob = Blob.NewBlob(myosaka, myseed)
-# print("Line above should say blob already existed and was loaded from file")
-# # you can load a blob either via just filename or via absolute path or via relative path (cwd is ./src/ethereum_test_types)  # noqa: E501
-# yyy: Blob = Blob.LoadBlobFromFile("blob_cancun_1337_999999.json")
-# # yyyy: Blob = Blob.LoadBlobFromFile(
-# #     "/home/user/Documents/execution-spec-tests/tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337.json"  # noqa: E501
-# # )  # you must replace user with ur actual username as $USER not supported here
-# yyyyy: Blob = Blob.LoadBlobFromFile(
-#     "tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
-# )
-# zzzzzzz: Blob = Blob.LoadBlobFromFile(
-#     "./tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
-# )
-
-
-# # test proof corruption
-# #   osaka
-# testseed = 55
-# ddd: Blob = Blob.NewBlob(Osaka, testseed + 10)
-# oldValue = ddd.proof[0][5]
-# for m in Blob.ProofCorruptionMode:
-#     ddd.corrupt_proof(m)
-# print("proof corruption works (osaka):", oldValue != ddd.proof[0][5])
-# #   prague
-# eeeeeeeeee: Blob = Blob.NewBlob(Prague, testseed + 11)
-# oldValue = eeeeeeeeee.proof[5]
-# for m in Blob.ProofCorruptionMode:
-#     eeeeeeeeee.corrupt_proof(m)
-# print("proof corruption works (prague):", oldValue != eeeeeeeeee.proof[5])
-# print("pydantic model works")
+myosaka: Fork = Osaka
+myprague: Fork = Prague
+mycancun: Fork = Cancun
+myseed: int = 1337  # fork+seed is the unique ID of a blob
+mytimestamp: int = 168123123
+b: Blob = Blob.NewBlob(myosaka, myseed, mytimestamp)
+json_str: str = b.model_dump_json()
+restored: Blob = Blob.model_validate_json(json_str)
+assert b.data == restored.data
+assert b.commitment == restored.commitment
+assert b.proof == restored.proof
+assert b.cells == restored.cells
+assert b.versioned_hash == restored.versioned_hash
+assert b.name == restored.name
+assert b.fork == restored.fork
+assert b.timestamp == restored.timestamp
+print(type(b.proof), len(b.proof))
+print(BYTES_PER_FIELD_ELEMENT)
+print(len(b.data))
+b.write_to_file()
+c: Blob = Blob.LoadBlobFromFile("blob_" + "osaka" + "_" + str(myseed) + "_" + str(mytimestamp))
+assert b.data == c.data
+assert b.commitment == c.commitment
+assert b.proof == c.proof
+assert b.cells == c.cells
+assert b.versioned_hash == c.versioned_hash
+assert b.name == c.name
+assert b.fork == c.fork
+assert b.timestamp == c.timestamp
+d: Blob = Blob.NewBlob(myprague, myseed, 123)
+d.write_to_file()
+e: Blob = Blob.NewBlob(myprague, myseed, 123)
+print("Line above should say blob already existed and was loaded from file")
+ee: Blob = Blob.NewBlob(myprague, myseed, 1234)
+newtimestamp = 999999
+f: Blob = Blob.NewBlob(mycancun, 1337, newtimestamp)
+f.write_to_file()
+h: Blob = Blob.NewBlob(myosaka, myseed)
+h.write_to_file()
+zz: Blob = Blob.NewBlob(myosaka, myseed)
+print("Line above should say blob already existed and was loaded from file")
+# you can load a blob either via just filename or via absolute path or via relative path (cwd is ./src/ethereum_test_types)  # noqa: E501
+yyy: Blob = Blob.LoadBlobFromFile("blob_cancun_1337_999999.json")
+# yyyy: Blob = Blob.LoadBlobFromFile(
+#     "/home/user/Documents/execution-spec-tests/tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337.json"  # noqa: E501
+# )  # you must replace user with ur actual username as $USER not supported here
+yyyyy: Blob = Blob.LoadBlobFromFile(
+    "tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
+)
+zzzzzzz: Blob = Blob.LoadBlobFromFile(
+    "./tests/cancun/eip4844_blobs/static_blobs/blob_cancun_1337_999999.json"
+)
+
+
+# test proof corruption
+#   osaka
+testseed = 55
+ddd: Blob = Blob.NewBlob(Osaka, testseed + 10)
+oldValue = ddd.proof[0][5]
+for m in Blob.ProofCorruptionMode:
+    ddd.corrupt_proof(m)
+print("proof corruption works (osaka):", oldValue != ddd.proof[0][5])
+#   prague
+eeeeeeeeee: Blob = Blob.NewBlob(Prague, testseed + 11)
+oldValue = eeeeeeeeee.proof[5]
+for m in Blob.ProofCorruptionMode:
+    eeeeeeeeee.corrupt_proof(m)
+print("proof corruption works (prague):", oldValue != eeeeeeeeee.proof[5])
+print("pydantic model works")

src/ethereum_test_types/helpers.py

@@ -9,7 +9,7 @@
 from ethereum_test_base_types.conversions import BytesConvertible, FixedSizeBytesConvertible
 from ethereum_test_vm import Opcodes as Op
 
-from .types import EOA, int_to_bytes
+from .eest_types import EOA, int_to_bytes
 
 """
 Helper functions

src/ethereum_test_types/tests/test_transactions.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from ..types import AccessList, Hash, Transaction
+from ..eest_types import AccessList, Hash, Transaction
 
 
 @pytest.mark.parametrize(