fixes

Author: felix314159

src/ethereum_test_execution/blob_transaction.py

@@ -3,6 +3,7 @@
 from typing import ClassVar, Dict, List
 
 from ethereum_test_base_types import Hash
+from ethereum_test_base_types.base_types import Bytes
 from ethereum_test_forks import Fork
 from ethereum_test_rpc import BlobAndProofV1, BlobAndProofV2, EngineRPC, EthRPC
 from ethereum_test_types import NetworkWrappedTransaction, Transaction
@@ -19,16 +20,17 @@ def versioned_hashes_with_blobs_and_proofs(
     """
     versioned_hashes: Dict[Hash, BlobAndProofV1 | BlobAndProofV2] = {}
     for blob in tx.blobs:
-        versioned_hash = blob.versioned_hash()
-        if blob.kzg_proof is not None:
-            versioned_hashes[versioned_hash] = BlobAndProofV1(blob=blob.data, proof=blob.kzg_proof)
-        elif blob.kzg_cell_proofs is not None:
-            versioned_hashes[versioned_hash] = BlobAndProofV2(
-                blob=blob.data, proofs=blob.kzg_cell_proofs
+        if isinstance(blob.proof, Bytes):
+            versioned_hashes[blob.versioned_hash] = BlobAndProofV1(
+                blob=blob.data, proof=blob.proof
+            )
+        elif isinstance(blob.proof, list):
+            versioned_hashes[blob.versioned_hash] = BlobAndProofV2(
+                blob=blob.data, proofs=blob.proof
             )
         else:
             raise ValueError(
-                f"Blob with versioned hash {versioned_hash.hex()} requires either kzg_proof "
+                f"Blob with versioned hash {blob.versioned_hash.hex()} requires either kzg_proof "
                 "or kzg_cell_proofs, but both are None"
             )
 

src/ethereum_test_forks/base_fork.py

@@ -1,7 +1,20 @@
 """Abstract base class for Ethereum forks."""
 
 from abc import ABC, ABCMeta, abstractmethod
-from typing import Any, ClassVar, List, Literal, Mapping, Optional, Protocol, Sized, Tuple, Type
+from typing import (
+    Any,
+    ClassVar,
+    Dict,
+    List,
+    Literal,
+    Mapping,
+    Optional,
+    Protocol,
+    Sized,
+    Tuple,
+    Type,
+    Union,
+)
 
 from semver import Version
 
@@ -156,7 +169,7 @@ class BaseFork(ABC, metaclass=BaseForkMeta):
     _ignore: ClassVar[bool] = False
 
     # make mypy happy
-    BLOB_CONSTANTS: ClassVar[dict[str, int | Literal["big"]]] = {}
+    BLOB_CONSTANTS: ClassVar[Dict[str, Union[int, Literal["big"]]]] = {}
 
     @classmethod
     def get_blob_constant(cls, name: str) -> int | Literal["big"]:

src/ethereum_test_forks/forks/forks.py

@@ -871,7 +871,7 @@ def valid_opcodes(
 class Cancun(Shanghai):
     """Cancun fork."""
 
-    BLOB_CONSTANTS: Dict[str, Union[int, Literal["big"]]] = {  # every value is an int or a Literal
+    BLOB_CONSTANTS = {  # every value is an int or a Literal
         "FIELD_ELEMENTS_PER_BLOB": 4096,
         "BYTES_PER_FIELD_ELEMENT": 32,
         "CELL_LENGTH": 2048,
@@ -1076,7 +1076,7 @@ class Prague(Cancun):
     """Prague fork."""
 
     # update some blob constants
-    BLOB_CONSTANTS: Dict[str, Union[int, Literal["big"]]] = {
+    BLOB_CONSTANTS = {
         **Cancun.BLOB_CONSTANTS,  # same base constants as cancun
         "MAX_BLOBS_PER_BLOCK": 9,  # but overwrite or add these
         "TARGET_BLOBS_PER_BLOCK": 6,
@@ -1337,7 +1337,7 @@ class Osaka(Prague, solc_name="cancun"):
     """Osaka fork."""
 
     # update some blob constants
-    BLOB_CONSTANTS: Dict[str, Union[int, Literal["big"]]] = {
+    BLOB_CONSTANTS = {
         **Prague.BLOB_CONSTANTS,  # same base constants as prague
         "AMOUNT_CELL_PROOFS": 128,
     }

src/ethereum_test_types/__init__.py

@@ -1,7 +1,7 @@
 """Common definitions and types."""
 
 from .account_types import EOA, Alloc
-from .blob import Blob
+from .blob_types import Blob
 from .block_types import (
     Environment,
     EnvironmentDefaults,
@@ -24,7 +24,6 @@
 )
 from .transaction_types import (
     AuthorizationTuple,
-    Blob,
     NetworkWrappedTransaction,
     Transaction,
     TransactionDefaults,

src/ethereum_test_types/transaction_types.py

@@ -657,18 +657,15 @@ def blob_data(self) -> Sequence[Bytes]:
     @property
     def blob_kzg_commitments(self) -> Sequence[Bytes]:
         """Return a list of kzg commitments."""
-        return [blob.kzg_commitment for blob in self.blobs]
+        return [blob.commitment for blob in self.blobs]
 
     @computed_field  # type: ignore[prop-decorator]
     @property
-    def blob_kzg_proofs(self) -> Sequence[Bytes]:
+    def blob_kzg_proofs(self) -> Sequence[Sequence[Bytes]] | Sequence[Bytes]:
         """Return a list of kzg proofs."""
-        proofs: List[Bytes] = []
+        proofs: List[List[Bytes]] | List[Bytes] = []
         for blob in self.blobs:
-            if blob.kzg_proof is not None:
-                proofs.append(blob.kzg_proof)
-            elif blob.kzg_cell_proofs is not None:
-                proofs.extend(blob.kzg_cell_proofs)
+            proofs.append(blob.proof)  # type: ignore[arg-type]
         return proofs
 
     def get_rlp_fields(self) -> List[str]: