easier debugging with shortened error messages, also blobs doesnt spam reuse of existing blobs in console

Author: felix314159

src/ethereum_test_execution/blob_transaction.py

@@ -26,12 +26,12 @@ def versioned_hashes_with_blobs_and_proofs(
             )
         elif isinstance(blob.proof, list):
             versioned_hashes[blob.versioned_hash] = BlobAndProofV2(
-                blob=blob.data, proofs=blob.proof
+                blob=blob.data, proofs=blob.cells
             )
         else:
             raise ValueError(
-                f"Blob with versioned hash {blob.versioned_hash.hex()} requires either kzg_proof "
-                "or kzg_cell_proofs, but both are None"
+                f"Blob with versioned hash {blob.versioned_hash.hex()} requires either proof "
+                "or cells, but both are None"
             )
 
     return versioned_hashes

src/ethereum_test_rpc/rpc.py

@@ -43,7 +43,10 @@ def __str__(self):
         if self.tx is not None:
             f"{super().__str__()} Transaction={self.tx.model_dump_json()}"
         elif self.tx_rlp is not None:
-            return f"{super().__str__()} Transaction RLP={self.tx_rlp.hex()}"
+            tx_rlp_hex = self.tx_rlp.hex()
+            if len(tx_rlp_hex) > 1000:
+                tx_rlp_hex = tx_rlp_hex[:50]  # if it's very long just print first few chars
+            return f"{super().__str__()} Transaction RLP={tx_rlp_hex}"
         return super().__str__()
 
 
@@ -182,7 +185,10 @@ def send_raw_transaction(self, transaction_rlp: Bytes) -> Hash:
             assert result_hash is not None
             return result_hash
         except Exception as e:
-            raise SendTransactionExceptionError(str(e), tx_rlp=transaction_rlp) from e
+            shortened_rlp_error_message = str(e)  # signal in console that you don't see full rlp
+            raise SendTransactionExceptionError(
+                shortened_rlp_error_message, tx_rlp=transaction_rlp
+            ) from e
 
     def send_transaction(self, transaction: Transaction) -> Hash:
         """`eth_sendRawTransaction`: Send a transaction to the client."""

src/ethereum_test_rpc/types.py

@@ -150,14 +150,14 @@ def blob_versioned_hashes(self, versioned_hash_version: int = 1) -> List[Hash]:
 
 
 class BlobAndProofV1(CamelModel):
-    """Represents a blob and single-proof structure."""
+    """Represents a blob and single-proof structure (< Osaka)."""
 
     blob: Bytes
     proof: Bytes
 
 
 class BlobAndProofV2(CamelModel):
-    """Represents a blob and proof structure."""
+    """Represents a blob and cell proof structure (>= Osaka)."""
 
     blob: Bytes
     proofs: List[Bytes]

src/ethereum_test_types/blob_types.py

@@ -14,10 +14,12 @@
 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
+from pytest_plugins.logging import get_logger
 
 CACHED_BLOBS_DIRECTORY: Path = (
     Path(platformdirs.user_cache_dir("ethereum-execution-spec-tests")) / "cached_blobs"
 )
+logger = get_logger(__name__)
 
 
 def clear_blob_cache(cached_blobs_folder_path: Path):
@@ -220,7 +222,7 @@ def get_cells(fork: Fork, data: Bytes) -> List[Bytes] | None:
         # if this blob already exists then load from file
         blob_location: Path = Blob.get_filepath(fork, seed)
         if blob_location.exists():
-            print(f"Blob exists already, reading it from file {blob_location}")
+            logger.debug(f"Blob exists already, reading it from file {blob_location}")
             return Blob.from_file(Blob.get_filename(fork, seed))
 
         assert fork.supports_blobs(), f"Provided fork {fork.name()} does not support blobs!"
@@ -289,7 +291,7 @@ def write_to_file(self):
 
         # warn if existing static_blob gets overwritten
         if output_location.exists():
-            print(f"Blob {output_location} already exists. It will be overwritten.")
+            logger.debug(f"Blob {output_location} already exists. It will be overwritten.")
 
         with open(output_location, "w", encoding="utf-8") as f:  # overwrite existing
             f.write(json_str)

src/ethereum_test_types/transaction_types.py

@@ -761,8 +761,7 @@ def get_rlp_fields(self) -> List[str]:
             "Neither proofs nor cell_proofs are in rlp_fields. Critical error!"
         )
 
-        logger.warning(f"Ended up with this rlp field list: {rlp_fields}")
-        # print("with this")
+        logger.debug(f"Ended up with this rlp field list: {rlp_fields}")
 
         return rlp_fields