feat(tests): ckzg functions for peerdas tests (#1614)

* added kzg functions for peerdas tests

* fix: use proofs only instead of full cells

* tests passing except for third one, too much gas (nethermind) or too many blobs (7vs9, geth)

* implemented feedback

* function that loads trusted setup now has to return trusted setup otherwise it cant be used as input to function that requires trusted setup to be passed

* removed debug print

* added filelock for r/w blobs

* removed logging changes from this PR

* removed changes to conversions.py

* fixes

* fix

* fixes

---------

Co-authored-by: Mario Vega <[email protected]>

Author: felix314159

cancun/eip4844_blobs/test_blob_txs_full.py

@@ -8,6 +8,7 @@
 
 import pytest
 
+from ethereum_test_base_types.base_types import Hash
 from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     Address,
@@ -23,8 +24,7 @@
     TransactionException,
 )
 
-from .common import INF_POINT
-from .spec import Spec, SpecHelpers, ref_spec_4844
+from .spec import Spec, ref_spec_4844
 
 REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
 REFERENCE_SPEC_VERSION = ref_spec_4844.version
@@ -91,9 +91,12 @@ def tx_max_priority_fee_per_gas() -> int:
 
 
 @pytest.fixture
-def txs_versioned_hashes(txs_blobs: List[List[Blob]]) -> List[List[bytes]]:
+def txs_versioned_hashes(txs_blobs: List[List[Blob]]) -> List[List[Hash]]:
     """List of blob versioned hashes derived from the blobs."""
-    return [[blob.versioned_hash() for blob in blob_tx] for blob_tx in txs_blobs]
+    version_hashes: List[List[Hash]] = [
+        [blob.versioned_hash for blob in blob_tx] for blob_tx in txs_blobs
+    ]
+    return version_hashes
 
 
 @pytest.fixture(autouse=True)
@@ -150,7 +153,7 @@ def txs(  # noqa: D103
     tx_max_fee_per_gas: int,
     tx_max_fee_per_blob_gas: int,
     tx_max_priority_fee_per_gas: int,
-    txs_versioned_hashes: List[List[bytes]],
+    txs_versioned_hashes: List[List[Hash]],
     tx_error: Optional[TransactionException],
     txs_blobs: List[List[Blob]],
     txs_wrapped_blobs: List[bool],
@@ -179,7 +182,7 @@ def txs(  # noqa: D103
             wrapped_blob_transaction=tx_wrapped_blobs,
         )
         if tx_wrapped_blobs:
-            network_wrapped_tx = NetworkWrappedTransaction(tx=tx, blobs=tx_blobs)
+            network_wrapped_tx = NetworkWrappedTransaction(tx=tx, blob_objects=tx_blobs)
             tx.rlp_override = network_wrapped_tx.rlp()
         txs.append(tx)
     return txs
@@ -237,17 +240,12 @@ def generate_full_blob_tests(
     Return a list of tests for invalid blob transactions due to insufficient max fee per blob gas
     parametrized for each different fork.
     """
-    blob_size = Spec.FIELD_ELEMENTS_PER_BLOB * SpecHelpers.BYTES_PER_FIELD_ELEMENT
     max_blobs = fork.max_blobs_per_block()
     return [
         pytest.param(
             [  # Txs
                 [  # Blobs per transaction
-                    Blob(
-                        data=bytes(blob_size),
-                        kzg_commitment=INF_POINT,
-                        kzg_proof=INF_POINT,
-                    ),
+                    Blob.from_fork(fork),
                 ]
             ],
             [True],
@@ -256,27 +254,19 @@ def generate_full_blob_tests(
         pytest.param(
             [  # Txs
                 [  # Blobs per transaction
-                    Blob(
-                        data=bytes(blob_size),
-                        kzg_commitment=INF_POINT,
-                        kzg_proof=INF_POINT,
-                    )
+                    Blob.from_fork(fork, s),
                 ]
-                for _ in range(max_blobs)
+                for s in range(max_blobs)
             ],
             [True] + ([False] * (max_blobs - 1)),
             id="one_full_blob_max_txs",
         ),
         pytest.param(
             [  # Txs
                 [  # Blobs per transaction
-                    Blob(
-                        data=bytes(blob_size),
-                        kzg_commitment=INF_POINT,
-                        kzg_proof=INF_POINT,
-                    )
+                    Blob.from_fork(fork, s),
                 ]
-                for _ in range(max_blobs)
+                for s in range(max_blobs)
             ],
             ([False] * (max_blobs - 1)) + [True],
             id="one_full_blob_at_the_end_max_txs",

osaka/eip7594_peerdas/spec.py

@@ -0,0 +1,24 @@
+"""Defines EIP-7594 specification constants and functions."""
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ReferenceSpec:
+    """Defines the reference spec version and git path."""
+
+    git_path: str
+    version: str
+
+
+ref_spec_7594 = ReferenceSpec("EIPS/eip-7594.md", "45d03a84a8ad0160ed3fb03af52c49bd39e802ba")
+
+
+@dataclass(frozen=True)
+class Spec:
+    """
+    Parameters from the EIP-7594 specifications as defined at
+    https://eips.ethereum.org/EIPS/eip-7594.
+    """
+
+    pass

osaka/eip7594_peerdas/test_get_blobs.py

@@ -18,15 +18,14 @@
     Transaction,
     TransactionException,
 )
+from pytest_plugins.logging import get_logger
 
-from ...cancun.eip4844_blobs.common import INF_POINT
-from ...cancun.eip4844_blobs.spec import Spec as Spec4844
-from ...cancun.eip4844_blobs.spec import SpecHelpers, ref_spec_4844
+from .spec import ref_spec_7594
 
-CELLS_PER_EXT_BLOB = 128
+REFERENCE_SPEC_GIT_PATH = ref_spec_7594.git_path
+REFERENCE_SPEC_VERSION = ref_spec_7594.version
 
-REFERENCE_SPEC_GIT_PATH = ref_spec_4844.git_path
-REFERENCE_SPEC_VERSION = ref_spec_4844.version
+logger = get_logger(__name__)
 
 
 @pytest.fixture
@@ -124,7 +123,7 @@ def blob_gas_price(
 @pytest.fixture
 def txs_versioned_hashes(txs_blobs: List[List[Blob]]) -> List[List[bytes]]:
     """List of blob versioned hashes derived from the blobs."""
-    return [[blob.versioned_hash() for blob in blob_tx] for blob_tx in txs_blobs]
+    return [[blob.versioned_hash for blob in blob_tx] for blob_tx in txs_blobs]
 
 
 @pytest.fixture
@@ -181,7 +180,7 @@ def txs(  # noqa: D103
     txs: List[NetworkWrappedTransaction | Transaction] = []
     for tx_blobs, tx_versioned_hashes in zip(txs_blobs, txs_versioned_hashes, strict=False):
         tx = Transaction(
-            ty=Spec4844.BLOB_TX_TYPE,
+            # type=3,
             sender=pre.fund_eoa(),
             to=destination_account,
             value=tx_value,
@@ -194,8 +193,8 @@ def txs(  # noqa: D103
         )
         network_wrapped_tx = NetworkWrappedTransaction(
             tx=tx,
-            blobs=tx_blobs,
             wrapper_version=tx_wrapper_version,
+            blob_objects=tx_blobs,
         )
         txs.append(network_wrapped_tx)
     return txs
@@ -208,44 +207,32 @@ def generate_full_blob_tests(
     Return a list of tests for invalid blob transactions due to insufficient max fee per blob gas
     parametrized for each different fork.
     """
-    blob_size = Spec4844.FIELD_ELEMENTS_PER_BLOB * SpecHelpers.BYTES_PER_FIELD_ELEMENT
     max_blobs = fork.max_blobs_per_block()
+    logger.debug(f"MAX_BLOBS value for fork {fork}: {max_blobs}")
+
     return [
         pytest.param(
             [  # Txs
                 [  # Blobs per transaction
-                    Blob(
-                        data=bytes(blob_size),
-                        kzg_commitment=INF_POINT,
-                        kzg_cell_proofs=[INF_POINT] * CELLS_PER_EXT_BLOB,
-                    ),
+                    Blob.from_fork(fork),
                 ]
             ],
             id="single_blob_transaction",
         ),
         pytest.param(
             [  # Txs
                 [  # Blobs per transaction
-                    Blob(
-                        data=bytes(blob_size),
-                        kzg_commitment=INF_POINT,
-                        kzg_cell_proofs=[INF_POINT] * CELLS_PER_EXT_BLOB,
-                    )
-                    for _ in range(max_blobs)
+                    Blob.from_fork(fork, s) for s in range(max_blobs)
                 ]
             ],
             id="max_blobs_transaction",
         ),
         pytest.param(
             [  # Txs
                 [  # Blobs per transaction
-                    Blob(
-                        data=bytes(blob_size),
-                        kzg_commitment=INF_POINT,
-                        kzg_cell_proofs=[INF_POINT] * CELLS_PER_EXT_BLOB,
-                    )
+                    Blob.from_fork(fork, s),
                 ]
-                for _ in range(max_blobs)
+                for s in range(max_blobs)
             ],
             id="single_blob_max_txs",
         ),