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

Author: felix314159

docs/CHANGELOG.md

@@ -66,6 +66,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - ✨ Added automatic checklist generation for every EIP inside of the `tests` folder. The checklist is appended to each EIP in the documentation in the "Test Case Reference" section ([#1679](https://github.com/ethereum/execution-spec-tests/pull/1679), [#1718](https://github.com/ethereum/execution-spec-tests/pull/1718)).
 - 🔀 Add macOS hive development mode workaround to the docs [#1786](https://github.com/ethereum/execution-spec-tests/pull/1786).
 - 🔀 Refactor and clean up of exceptions including EOF exceptions within client specific mappers [#1803](https://github.com/ethereum/execution-spec-tests/pull/1803).
+- ✨ Improved RLP logging in rpc.py. Errors shown in console are shortened and full RLP data is logged to file if an exception occurs ([#1614](https://github.com/ethereum/execution-spec-tests/pull/1614)).
 
 ### 🧪 Test Cases
 

pytest-execute-hive.ini

@@ -15,6 +15,7 @@ addopts =
     -p pytest_plugins.execute.rpc.hive
     -p pytest_plugins.execute.execute
     -p pytest_plugins.shared.execute_fill
+    -p pytest_plugins.logging.logging
     -p pytest_plugins.forks.forks
     -p pytest_plugins.pytest_hive.pytest_hive
     -p pytest_plugins.help.help

pytest-execute.ini

@@ -15,6 +15,7 @@ addopts =
     -p pytest_plugins.solc.solc
     -p pytest_plugins.execute.execute
     -p pytest_plugins.shared.execute_fill
+    -p pytest_plugins.logging.logging
     -p pytest_plugins.execute.rpc.remote_seed_sender
     -p pytest_plugins.execute.rpc.remote
     -p pytest_plugins.forks.forks

pytest.ini

@@ -16,6 +16,7 @@ addopts =
     -p pytest_plugins.filler.static_filler
     -p pytest_plugins.filler.ported_tests
     -p pytest_plugins.shared.execute_fill
+    -p pytest_plugins.logging.logging
     -p pytest_plugins.forks.forks
     -p pytest_plugins.eels_resolver
     -p pytest_plugins.help.help

src/ethereum_test_base_types/conversions.py

@@ -3,11 +3,12 @@
 from re import sub
 from typing import Any, List, Optional, SupportsBytes, TypeAlias
 
+from pytest_plugins.logging import get_logger
+
 BytesConvertible: TypeAlias = str | bytes | SupportsBytes | List[int]
 FixedSizeBytesConvertible: TypeAlias = str | bytes | SupportsBytes | List[int] | int
 NumberConvertible: TypeAlias = str | bytes | SupportsBytes | int
 
-from pytest_plugins.logging import get_logger
 
 logger = get_logger(__name__)
 

src/ethereum_test_execution/blob_transaction.py

@@ -31,8 +31,8 @@ def versioned_hashes_with_blobs_and_proofs(
             )
         else:
             raise ValueError(
-                f"Blob with versioned hash {blob.versioned_hash.hex()} requires either proof "
-                "or cells, but both are None"
+                f"Blob with versioned hash {blob.versioned_hash.hex()} requires a proof "
+                "that is not None"
             )
 
     return versioned_hashes

src/ethereum_test_rpc/rpc.py

@@ -136,7 +136,7 @@ def post_request(self, method: str, *params: Any, extra_headers: Dict | None = N
         payload_json = json.dumps(payload)  # pydantic.json
         payload_size_bytes = len(payload_json.encode("utf-8"))
         payload_size_mb = payload_size_bytes / (1024 * 1024)
-        logger.info(
+        logger.debug(
             f"I am about to send a POST request of approximated size: {payload_size_mb:.2f} MB "
             f"({payload_size_bytes} bytes)"
         )
@@ -231,12 +231,11 @@ def send_raw_transaction(self, transaction_rlp: Bytes) -> Hash:
             tx_rlp_hex = transaction_rlp.hex()
             result_hash = Hash(self.post_request("sendRawTransaction", f"{tx_rlp_hex}"))
             assert result_hash is not None, "result_hash seems to be None, critical error!"
-            # debug: also log successful rpc calls
-            print(
-                SendTransactionExceptionError(
-                    str("no error"), tx_rlp=transaction_rlp, shorten_errors=True, log_rlp_data=True
-                )
-            )  # print triggers __str__ which triggers logging
+
+            # if you wrap SendTransactionExceptionError in print() it will get logged to file
+            SendTransactionExceptionError(
+                str("no error"), tx_rlp=transaction_rlp, shorten_errors=True, log_rlp_data=False
+            )
 
             return result_hash
         except Exception as e:
@@ -253,12 +252,10 @@ def send_transaction(self, transaction: Transaction) -> Hash:
             assert result_hash == transaction.hash
             assert result_hash is not None
 
-            # debug: also log successful rpc calls
-            print(
-                SendTransactionExceptionError(
-                    str("no error"), tx_rlp=transaction_rlp, shorten_errors=True, log_rlp_data=True
-                )
-            )  # print triggers __str__ which triggers logging
+            # if you wrap SendTransactionExceptionError in print() it will get logged to file
+            SendTransactionExceptionError(
+                str("no error"), tx_rlp=transaction_rlp, shorten_errors=True, log_rlp_data=False
+            )
 
             return transaction.hash
         except Exception as e:

src/ethereum_test_types/transaction_types.py

@@ -599,8 +599,6 @@ 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""
@@ -695,65 +693,20 @@ def proofs(self) -> Sequence[Bytes] | None:
 
         return proofs
 
-    # original cell proofs with length 4098
-    # error: InvalidBlobDataSize: Blob data fields are of incorrect size.
-    #   -> i think its cuz each cell_proof has length 4098, but for some reason it wants length 98 (but ofc if we just shorten it it will expect a different proof)
     @computed_field  # type: ignore[prop-decorator]
     @property
-    def cell_proofs(self) -> Sequence[Sequence[Bytes]] | Sequence[Bytes] | None:
+    def cell_proofs(self) -> Sequence[Bytes] | None:
         """Return a list of cells (returns None < Osaka)."""
         if self.wrapper_version is None:
             return None
 
-        cells: list[list[Bytes]] = []
+        cells: list[Bytes] = []
         for blob in self.blob_objects:
             assert isinstance(blob.proof, list)
-            cells.append(blob.proof)
-
-        # if you remove below you instead get error: Invalid RLP. (which means getting what we have to work NWT that hold many blobs will be even more work)  # noqa: E501
-        if len(cells) == 1:
-            return cells[0]
+            cells.extend(blob.proof)
 
         return cells
 
-    # shortened cell proofs of length 98 ( 48*2 + len(0x00) + len(0x03) )
-    # unlocks new error: proofs dont match cells
-    # @computed_field  # type: ignore[prop-decorator]
-    # @property
-    # def cell_proofs(self) -> Sequence[Bytes] | None:
-    #     """Return a list of cells (returns None < Osaka)."""
-    #     if self.wrapper_version is None:
-    #         return None
-
-    #     cells: list[Bytes] = []
-    #     for blob in self.blob_objects:
-    #         assert isinstance(blob.cells, list)
-    #         # code below gives: InvalidBlobDataSize: Blob data fields are of incorrect size:
-    #         # cells.extend(
-    #         #     Bytes(cell)
-    #         #     for cell in blob.cells  # Bytes(cell[:48])
-    #         # )  # extend unpacks the elements instead of adding it as list
-
-    #         # code below gives: InvalidBlobProof: Proofs do not match the blobs.
-    #         cells.extend(
-    #             Bytes(cell[:48]) for cell in blob.cells
-    #         )  # extend unpacks the elements instead of adding it as list
-
-    #     return cells
-
-    # just trying to match the 'before.txt' even more closely
-    # # unlocks new error: proofs dont match cells
-    # @computed_field  # type: ignore[prop-decorator]
-    # @property
-    # def cell_proofs(self) -> Sequence[Bytes] | None:
-    #     """Return a list of cells (returns None < Osaka)."""
-    #     if self.wrapper_version is None:
-    #         return None
-
-    #     cells: list[Bytes] = [self.commitments[0]] * 128
-
-    #     return cells
-
     def get_rlp_fields(self) -> List[str]:
         """
         Return an ordered list of field names to be included in RLP serialization.
@@ -777,7 +730,7 @@ def get_rlp_fields(self) -> List[str]:
         if self.cell_proofs is not None:
             rlp_cell_proofs = ["cell_proofs"]
 
-        # GETH FUSAKA_DEVNET_0 EXPECTS:
+        # Geth expects:
         #   type blobTxWithBlobs struct {
         #       BlobTx      *BlobTx
         #       Blobs       []kzg4844.Blob
@@ -796,12 +749,12 @@ def get_rlp_fields(self) -> List[str]:
         rlp_fields: List[
             str
         ] = [  # structure explained in https://eips.ethereum.org/EIPS/eip-7594#Networking
-            "tx",  # tx_payload_body, in geth: BlobTx, https://github.com/ethereum/go-ethereum/blob/e17f97a8242c55b6fba66317d3720b9728a12f78/core/types/tx_blob.go#L122
-            *wrapper,  # wrapper_version, which is always 1 for osaka (was non-existing before), in geth: Version  # noqa: E501
-            "blobs",  # Blob.data, in geth: Blobs
-            "commitments",  # in geth: Commitments
-            *rlp_proofs,  # only included < osaka, in geth: Proofs
-            *rlp_cell_proofs,  # only included >=osaka, in geth this does not exist(always uses Proofs)
+            "tx",  # tx_payload_body
+            *wrapper,  # wrapper_version, which is always 1 for osaka (was non-existing before)
+            "blobs",  # Blob.data
+            "commitments",
+            *rlp_proofs,
+            *rlp_cell_proofs,
         ]
 
         assert ("proofs" in rlp_fields) or ("cell_proofs" in rlp_fields), (
@@ -812,21 +765,11 @@ def get_rlp_fields(self) -> List[str]:
 
         return rlp_fields
 
-    # GETH PROBLEM:
-    # osaka without wrapper: too few elements for types.blobTxWithBlobs
-    # osaka with wrapper: it tries to deserialize into blobTxWithBlobs instead of versionedBlobTxWithBlobs, so it complains about unexpectedly seeing wrapper instead of blob data  # noqa: E501
-
-    # NETHERMIND PROBLEM:
-    # osaka without wrapper: code=-32602, message=Specified argument was out of the range of valid values.
-    # osaka with wrapper: code=-32602, message=Specified argument was out of the range of valid values
-
     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

@@ -197,7 +197,6 @@ def txs(  # noqa: D103
             blob_objects=tx_blobs,
         )
         txs.append(network_wrapped_tx)
-        break  # TODO: remove this
     return txs
 
 
@@ -209,7 +208,7 @@ def generate_full_blob_tests(
     parametrized for each different fork.
     """
     max_blobs = fork.max_blobs_per_block()
-    logger.info(f"MAX_BLOBS value for fork {fork}: {max_blobs}")
+    logger.debug(f"MAX_BLOBS value for fork {fork}: {max_blobs}")
 
     return [
         pytest.param(
@@ -220,24 +219,23 @@ def generate_full_blob_tests(
             ],
             id="single_blob_transaction",
         ),
-        # pytest.param(
-        #     [  # Txs
-        #         [  # Blobs per transaction
-        #             Blob.from_fork(fork) for _ in range(max_blobs)
-        #         ]
-        #     ],
-        #     id="max_blobs_transaction",
-        # ),
-        # pytest.param(
-        #     [  # Txs
-        #         [  # Blobs per transaction
-        #             Blob.from_fork(fork),
-        #         ]
-        #         for _ in range(max_blobs)
-        #     ],
-        #     id="single_blob_max_txs",
-        # ),
-        # TODO: uncomment above
+        pytest.param(
+            [  # Txs
+                [  # Blobs per transaction
+                    Blob.from_fork(fork) for _ in range(max_blobs)
+                ]
+            ],
+            id="max_blobs_transaction",
+        ),
+        pytest.param(
+            [  # Txs
+                [  # Blobs per transaction
+                    Blob.from_fork(fork),
+                ]
+                for _ in range(max_blobs)
+            ],
+            id="single_blob_max_txs",
+        ),
     ]