fixed import issue with specs, added fork.blobs_supported()

Author: felix314159

src/ethereum_test_forks/__init__.py

@@ -1,5 +1,7 @@
 """Ethereum test fork definitions."""
 
+from typing import Literal
+
 from .base_fork import Fork, ForkAttribute
 from .forks.forks import (
     ArrowGlacier,
@@ -98,3 +100,23 @@
     "transition_fork_to",
     "GasCosts",
 ]
+
+# 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

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, Mapping, Optional, Sized, Tuple
+from typing import List, Literal, Mapping, Optional, Sized, Tuple
 
 from semver import Version
 
@@ -27,6 +27,26 @@
 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"):
@@ -543,6 +563,11 @@ def pre_allocation_blockchain(cls) -> Mapping:
         """
         return {}
 
+    @classmethod
+    def blobs_supported(cls) -> bool:
+        """Return whether blobs are supported in this fork."""
+        return False
+
 
 class Homestead(Frontier):
     """Homestead fork."""
@@ -1040,6 +1065,11 @@ def valid_opcodes(
             Opcodes.MCOPY,
         ] + super(Cancun, cls).valid_opcodes()
 
+    @classmethod
+    def blobs_supported(cls) -> bool:
+        """Return whether blobs are supported in this fork."""
+        return True
+
 
 class Prague(Cancun):
     """Prague fork."""

src/ethereum_test_types/blob.py

@@ -4,30 +4,41 @@
 """  # noqa: E501
 
 import random
-import sys
 from enum import Enum
 from hashlib import sha256
-from os.path import abspath, dirname, join, realpath
+from os.path import realpath
 from pathlib import Path
 from typing import List
 
 import ckzg
 
 from ethereum_test_base_types.base_types import Bytes, Hash
 from ethereum_test_base_types.pydantic import CamelModel
-from ethereum_test_forks import Cancun, Fork, Osaka, Prague
-
-sys.path.insert(0, abspath(join(dirname(__file__), "../../")))  # TODO: find better workaround
-from tests.osaka.eip7594_peerdas.spec import Spec, ref_spec_7594
+from ethereum_test_forks import (
+    # BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE,
+    BLS_MODULUS,
+    BYTES_PER_BLOB,
+    BYTES_PER_COMMITMENT,
+    BYTES_PER_FIELD_ELEMENT,
+    # BYTES_PER_PROOF,
+    # CELL_LENGTH,
+    FIELD_ELEMENTS_PER_BLOB,
+    KZG_ENDIANNESS,
+    # MAX_BLOB_GAS_PER_BLOCK,
+    # MAX_BLOBS_PER_BLOCK_ELECTRA,
+    # TARGET_BLOB_GAS_PER_BLOCK,
+    # TARGET_BLOBS_PER_BLOCK_ELECTRA,
+    Cancun,
+    Fork,
+    Osaka,
+    Prague,
+)
 
 TRUSTED_SETUP_FILE_NAME = "blob_trusted_setup.txt"
 TRUSTED_SETUP_PATH = Path(realpath(__file__)).parent / TRUSTED_SETUP_FILE_NAME
 TRUSTED_SETUP = ckzg.load_trusted_setup(str(TRUSTED_SETUP_PATH), 0)
 print(f"{TRUSTED_SETUP_FILE_NAME} has been loaded")
 
-REFERENCE_SPEC_GIT_PATH = ref_spec_7594.git_path
-REFERENCE_SPEC_VERSION = ref_spec_7594.version
-
 
 def get_eest_root_folder(marker_files=("pyproject.toml", ".git", "tests", "src")) -> Path:
     """Search for a folder where all files/folders listed above exist (root of project)."""
@@ -88,6 +99,10 @@ def get_filepath(fork: str, seed: int, timestamp: int):
     @staticmethod
     def NewBlob(fork: Fork, seed: int = 0, timestamp: int = 0) -> "Blob":  # noqa: N802
         """Construct Blob instances. Fork-specific logic is encapsulated within nested functions."""  # noqa: E501
+        assert fork.blobs_supported(), (
+            f"You provided fork {fork.name()} but it does not support blobs!"
+        )  # TODO: why does mypy complain? this line works
+
         fork_str: str = fork.name().lower()
 
         # if this blob already exists then load from file
@@ -103,11 +118,11 @@ def generate_blob_data(rng_seed: int = 0) -> Bytes:
 
             # generate blob
             ints: list[int] = [
-                random.randrange(Spec.BLS_MODULUS) for _ in range(Spec.FIELD_ELEMENTS_PER_BLOB)
+                random.randrange(BLS_MODULUS) for _ in range(FIELD_ELEMENTS_PER_BLOB)
             ]
 
             encoded: list[bytes] = [
-                i.to_bytes(Spec.BYTES_PER_FIELD_ELEMENT, Spec.KZG_ENDIANNESS) for i in ints
+                i.to_bytes(BYTES_PER_FIELD_ELEMENT, KZG_ENDIANNESS) for i in ints
             ]
             blob: bytes = b"".join(encoded)  # without 0x
 
@@ -125,23 +140,23 @@ def get_name(fork_str: str, seed: int, timestamp: int) -> str:
         def get_commitment(data: Bytes) -> Bytes:
             """Take a blob and returns a cryptographic commitment to it. Note: Each cell seems to hold a copy of this commitment."""  # noqa: E501
             # sanity check
-            assert len(data) == Spec.BYTES_PER_BLOB, (
-                f"Expected blob of length {Spec.BYTES_PER_BLOB} but got blob of length {len(data)}"
+            assert len(data) == BYTES_PER_BLOB, (
+                f"Expected blob of length {BYTES_PER_BLOB} but got blob of length {len(data)}"
             )
 
             # calculate commitment
             commitment = ckzg.blob_to_kzg_commitment(data, TRUSTED_SETUP)
 
-            assert len(commitment) == Spec.BYTES_PER_COMMITMENT, (
-                f"Expected {Spec.BYTES_PER_COMMITMENT} resulting commitments but got {len(commitment)} commitments"  # noqa: E501
+            assert len(commitment) == BYTES_PER_COMMITMENT, (
+                f"Expected {BYTES_PER_COMMITMENT} resulting commitments but got {len(commitment)} commitments"  # noqa: E501
             )
 
             return commitment
 
         def get_proof(data: Bytes) -> List[Bytes] | Bytes:
             if fork_str in ["cancun", "prague"]:
                 z = 2  # 2 is one of many possible valid field elements z (https://github.com/ethereum/consensus-specs/blob/ad884507f7a1d5962cd3dfb5f7b3e41aab728c55/tests/core/pyspec/eth2spec/test/utils/kzg_tests.py#L58-L66)
-                z_valid_size: bytes = z.to_bytes(Spec.BYTES_PER_FIELD_ELEMENT, byteorder="big")
+                z_valid_size: bytes = z.to_bytes(BYTES_PER_FIELD_ELEMENT, byteorder="big")
                 proof, _ = ckzg.compute_kzg_proof(data, z_valid_size, TRUSTED_SETUP)
                 return proof
 
@@ -368,7 +383,7 @@ def corrupt_byte(b: bytes) -> Bytes:
             self.proof = Bytes(b"".join(corrupt_byte(bytes([byte])) for byte in self.proof))
 
 
-# TODO: currently u can only run this file from ./blob.py but not from eest root, fix it
+# TODO: BlobFromFile supports both construction via blob parameters (works fine), and via provided path (here do some where testing which path is cwd if u use it within a test)
 
 # TODO after merge: update test_blob_txs_full.py to make use of actual blobs
 
@@ -405,12 +420,10 @@ def corrupt_byte(b: bytes) -> Bytes:
 # assert b.fork == restored.fork
 # assert b.timestamp == restored.timestamp
 # print(type(b.proof), len(b.proof))
-# print(Spec.BYTES_PER_FIELD_ELEMENT)
+# print(BYTES_PER_FIELD_ELEMENT)
 # print(len(b.data))
 # b.write_to_file()
-# c: Blob = Blob.LoadBlobFromFile(
-#     "blob_" + "osaka" + "_" + str(myseed) + "_" + str(mytimestamp)
-# )
+# 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
@@ -437,25 +450,25 @@ def corrupt_byte(b: bytes) -> Bytes:
 # #     "/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"
+#     "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
-# d: Blob = Blob.NewBlob(Osaka, testseed + 10)
-# oldValue = d.proof[0][5]
+# ddd: Blob = Blob.NewBlob(Osaka, testseed + 10)
+# oldValue = ddd.proof[0][5]
 # for m in Blob.ProofCorruptionMode:
-#     d.corrupt_proof(m)
-# print("proof corruption works (osaka):", oldValue != d.proof[0][5])
+#     ddd.corrupt_proof(m)
+# print("proof corruption works (osaka):", oldValue != ddd.proof[0][5])
 # #   prague
-# e: Blob = Blob.NewBlob(Prague, testseed + 11)
-# oldValue = e.proof[5]
+# eeeeeeeeee: Blob = Blob.NewBlob(Prague, testseed + 11)
+# oldValue = eeeeeeeeee.proof[5]
 # for m in Blob.ProofCorruptionMode:
-#     e.corrupt_proof(m)
-# print("proof corruption works (prague):", oldValue != e.proof[5])
+#     eeeeeeeeee.corrupt_proof(m)
+# print("proof corruption works (prague):", oldValue != eeeeeeeeee.proof[5])
 # print("pydantic model works")
-
-# ckzg.compute_cells(blob, TRUSTED_SETUP) returns a list of length 128
-# ckzg.compute_cells_and_kzg_proofs(blob, TRUSTED_SETUP)

tests/osaka/eip7594_peerdas/spec.py

@@ -22,21 +22,4 @@ class Spec:
     https://eips.ethereum.org/EIPS/eip-7594.
     """
 
-    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
+    pass