added kzg functions for peerdas tests

Author: felix314159

pyproject.toml

@@ -50,6 +50,7 @@ dependencies = [
     "pytest-regex>=0.2.0,<0.3",
     "eth-abi>=5.2.0",
     "joblib>=1.4.2",
+    "ckzg>=2.1.1",
 ]
 
 [project.urls]

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/__init__.py

@@ -24,6 +24,7 @@
     BerlinToLondonAt5,
     CancunToPragueAtTime15k,
     ParisToShanghaiAtTime15k,
+    PragueToOsakaAtTime15k,
     ShanghaiToCancunAtTime15k,
 )
 from .gas_costs import GasCosts
@@ -76,6 +77,7 @@
     "Cancun",
     "CancunToPragueAtTime15k",
     "Prague",
+    "PragueToOsakaAtTime15k",
     "Osaka",
     "get_transition_forks",
     "forks_from",

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, 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
 
@@ -155,6 +168,14 @@ class BaseFork(ABC, metaclass=BaseForkMeta):
     _solc_name: ClassVar[Optional[str]] = None
     _ignore: ClassVar[bool] = False
 
+    # make mypy happy
+    BLOB_CONSTANTS: ClassVar[Dict[str, Union[int, Literal["big"]]]] = {}
+
+    @classmethod
+    def get_blob_constant(cls, name: str) -> int | Literal["big"]:
+        """Return value of requested blob constant."""
+        raise NotImplementedError
+
     def __init_subclass__(
         cls,
         *,

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
 
@@ -894,6 +894,27 @@ def valid_opcodes(
 class Cancun(Shanghai):
     """Cancun fork."""
 
+    BLOB_CONSTANTS = {  # every value is an int or a Literal
+        "FIELD_ELEMENTS_PER_BLOB": 4096,
+        "BYTES_PER_FIELD_ELEMENT": 32,
+        "CELL_LENGTH": 2048,
+        "BLS_MODULUS": 0x73EDA753299D7D483339D80809A1D80553BDA402FFFE5BFEFFFFFFFF00000001,  # EIP-2537: Main subgroup order = q, due to this BLS_MODULUS every blob byte (uint256) must be smaller than 116  # noqa: E501
+        # 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": "big",
+        "AMOUNT_CELL_PROOFS": 0,
+    }
+
+    @classmethod
+    def get_blob_constant(cls, name: str) -> int | Literal["big"]:
+        """Return blob constant if it exists."""
+        retrieved_constant = cls.BLOB_CONSTANTS.get(name)
+        assert retrieved_constant is not None, (
+            f"You tried to retrieve the blob constant {name} but it does not exist!"
+        )
+        return retrieved_constant
+
     @classmethod
     def solc_min_version(cls) -> Version:
         """Return minimum version of solc that supports this fork."""
@@ -1077,6 +1098,16 @@ def valid_opcodes(
 class Prague(Cancun):
     """Prague fork."""
 
+    # update some blob constants
+    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,
+        "MAX_BLOB_GAS_PER_BLOCK": 1179648,
+        "TARGET_BLOB_GAS_PER_BLOCK": 786432,
+        "BLOB_BASE_FEE_UPDATE_FRACTION": 5007716,
+    }
+
     @classmethod
     def is_deployed(cls) -> bool:
         """
@@ -1328,6 +1359,12 @@ def engine_forkchoice_updated_version(
 class Osaka(Prague, solc_name="cancun"):
     """Osaka fork."""
 
+    # update some blob constants
+    BLOB_CONSTANTS = {
+        **Prague.BLOB_CONSTANTS,  # same base constants as prague
+        "AMOUNT_CELL_PROOFS": 128,
+    }
+
     @classmethod
     def engine_get_payload_version(
         cls, block_number: int = 0, timestamp: int = 0

src/ethereum_test_forks/forks/transition.py

@@ -1,7 +1,7 @@
 """List of all transition fork definitions."""
 
 from ..transition_base_fork import transition_fork
-from .forks import Berlin, Cancun, London, Paris, Prague, Shanghai
+from .forks import Berlin, Cancun, London, Osaka, Paris, Prague, Shanghai
 
 
 # Transition Forks
@@ -31,3 +31,10 @@ class CancunToPragueAtTime15k(Cancun):
     """Cancun to Prague transition at Timestamp 15k."""
 
     pass
+
+
+@transition_fork(to_fork=Osaka, at_timestamp=15_000)
+class PragueToOsakaAtTime15k(Prague):
+    """Prague to Cancun transition at Timestamp 15k."""
+
+    pass

src/ethereum_test_types/__init__.py

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