testing stuff WIP

Author: felix314159

src/ethereum_test_rpc/rpc.py

@@ -1,8 +1,10 @@
 """JSON-RPC methods and helper functions for EEST consume based hive simulators."""
 
 import json
+import logging
 import time
 from itertools import count
+from pathlib import Path
 from pprint import pprint
 from typing import Any, ClassVar, Dict, List, Literal, Union
 
@@ -34,22 +36,55 @@ class SendTransactionExceptionError(Exception):
 
     tx: Transaction | None = None
     tx_rlp: Bytes | None = None
+    shorten_errors: bool = False
+    log_rlp_data: bool = False
 
-    def __init__(self, *args, tx: Transaction | None = None, tx_rlp: Bytes | None = None):
+    def __init__(
+        self,
+        *args,
+        tx: Transaction | None = None,
+        tx_rlp: Bytes | None = None,
+        shorten_errors: bool = False,
+        log_rlp_data: bool = False,
+    ):
         """Initialize SendTransactionExceptionError class with the given transaction."""
         super().__init__(*args)
         self.tx = tx
         self.tx_rlp = tx_rlp
+        self.shorten_errors = shorten_errors
+        self.log_rlp_data = log_rlp_data
 
     def __str__(self):
         """Return string representation of the exception."""
+        # create ./logs/rlp folder for detailed rlp logging
+        rlp_logs_folder = Path(".") / "logs" / "rlp"
+        rlp_logs_folder.mkdir(parents=True, exist_ok=True)
+
         if self.tx is not None:
             f"{super().__str__()} Transaction={self.tx.model_dump_json()}"
         elif self.tx_rlp is not None:
             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
+
+            # log rpc call data to file (each rlp object gets dumped in its own file)
+            if self.log_rlp_data:
+                #   create and config a temporary logger (unique filename via timestamp)
+                timestamp = time.time_ns()
+                file_name = rlp_logs_folder / f"{timestamp}_rlp_data.log"
+                temp_logger = logging.getLogger(f"rlp_{timestamp}")
+                temp_logger.setLevel(logging.ERROR)
+                temp_logger.propagate = False
+                file_handler = logging.FileHandler(file_name)
+                temp_logger.addHandler(file_handler)
+                #   log rlp to file
+                temp_logger.error(tx_rlp_hex)
+                #   cleanup
+                temp_logger.removeHandler(file_handler)
+                file_handler.close()
+
+            if self.shorten_errors:
+                tx_rlp_hex = tx_rlp_hex[:50]  # just print first few chars
             return f"{super().__str__()} Transaction RLP={tx_rlp_hex}"
+
         return super().__str__()
 
 
@@ -198,9 +233,8 @@ def send_raw_transaction(self, transaction_rlp: Bytes) -> Hash:
             assert result_hash is not None, "result_hash seems to be None, critical error!"
             return result_hash
         except Exception as 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
+                str(e), tx_rlp=transaction_rlp, shorten_errors=True, log_rlp_data=True
             ) from e
 
     def send_transaction(self, transaction: Transaction) -> Hash:
@@ -213,7 +247,9 @@ def send_transaction(self, transaction: Transaction) -> Hash:
             assert result_hash is not None
             return transaction.hash
         except Exception as e:
-            raise SendTransactionExceptionError(str(e), tx=transaction) from e
+            raise SendTransactionExceptionError(
+                str(e), tx=transaction, shorten_errors=True, log_rlp_data=True
+            ) from e
 
     def send_transactions(self, transactions: List[Transaction]) -> List[Hash]:
         """Use `eth_sendRawTransaction` to send a list of transactions to the client."""

src/ethereum_test_types/transaction_types.py

@@ -599,6 +599,8 @@ def get_rlp_prefix(self) -> bytes:
         Return the transaction type as bytes to be appended at the beginning of the
         serialized transaction if type is not 0.
         """
+        # if self.ty == 3:  # dont add 0x03 to the rlp
+        #     return b""
         if self.ty > 0:
             return bytes([self.ty])
         return b""
@@ -778,6 +780,8 @@ def get_rlp_prefix(self) -> bytes:
         Return the transaction type as bytes to be appended at the beginning of the
         serialized transaction if type is not 0.
         """
+        if self.tx.ty == 3:  # don't add 0x03 to the rlp
+            return b""
         if self.tx.ty > 0:
             return bytes([self.tx.ty])
         return b""

tests/osaka/eip7594_peerdas/test_get_blobs.py

@@ -189,6 +189,7 @@ def txs(  # noqa: D103
             blob_objects=tx_blobs,
         )
         txs.append(network_wrapped_tx)
+        # break  # TODO: remove this
     return txs
 
 
@@ -228,6 +229,7 @@ def generate_full_blob_tests(
             ],
             id="single_blob_max_txs",
         ),
+        # TODO: uncomment above
     ]