feat(test-client-clis): add stream-mode opcode count support for geth (#2170)

* feat(client_clis): add stream-mode opcode count support for geth t8n

* fix(test-types): strip geth blockTimestamp from transaction logs

* fix(test-types): ignore extra geth fields in FixtureTransactionLog

* fix(test-types): address review feedback for geth opcode count support

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: spencer-tb

packages/testing/src/execution_testing/client_clis/clis/geth.py

@@ -258,6 +258,7 @@ class GethTransitionTool(GethEvm, TransitionTool):
     subcommand: Optional[str] = "t8n"
     trace: bool
     t8n_use_stream = True
+    supports_opcode_count: ClassVar[bool] = True
 
     def __init__(
         self,

packages/testing/src/execution_testing/client_clis/transition_tool.py

@@ -643,6 +643,23 @@ def _evaluate_stream(
                     },
                 )
 
+        if self.supports_opcode_count:
+            opcode_count_file_path = Path(temp_dir.name) / "opcodes.json"
+            if opcode_count_file_path.exists():
+                opcode_count = OpcodeCount.model_validate_json(
+                    opcode_count_file_path.read_text()
+                )
+                output.result.opcode_count = opcode_count
+
+                if debug_output_path:
+                    with profiler.pause():
+                        dump_files_to_directory(
+                            debug_output_path,
+                            {
+                                "opcodes.json": opcode_count.model_dump(),
+                            },
+                        )
+
         if self.trace:
             output.result.traces = self.collect_traces(
                 output.result.receipts, temp_dir, debug_output_path
@@ -694,8 +711,12 @@ def safe_t8n_args(
             f"--state.reward={reward}",
         ]
 
-        if self.trace and temp_dir:
-            args.extend([trace_flag, f"--output.basedir={temp_dir.name}"])
+        if temp_dir and (self.trace or self.supports_opcode_count):
+            args.append(f"--output.basedir={temp_dir.name}")
+        if self.trace:
+            args.append(trace_flag)
+        if self.supports_opcode_count and temp_dir:
+            args.extend(["--opcode.count", "opcodes.json"])
 
         return args
 

packages/testing/src/execution_testing/fixtures/common.py

@@ -2,7 +2,12 @@
 
 from typing import Any, ClassVar, Dict, List
 
-from pydantic import AliasChoices, Field, computed_field, model_validator
+from pydantic import (
+    AliasChoices,
+    Field,
+    computed_field,
+    model_validator,
+)
 
 from execution_testing.base_types import (
     BlobSchedule,
@@ -102,6 +107,8 @@ def sign(self) -> None:
 class FixtureTransactionLog(CamelModel, RLPSerializable):
     """Fixture variant of the TransactionLog type."""
 
+    model_config = CamelModel.model_config | {"extra": "ignore"}
+
     address: Address | None = None
     topics: List[Hash] | None = None
     data: Bytes | None = None

packages/testing/src/execution_testing/test_types/receipt_types.py

@@ -26,6 +26,7 @@ class TransactionLog(CamelModel):
     block_hash: Hash | None = None
     log_index: HexNumber | None = None
     removed: bool | None = None
+    block_timestamp: HexNumber | None = None
 
 
 class ReceiptDelegation(CamelModel):