Remove traces array from TxEnv (#909)

SamWilsn · SamWilsn · commit d619d102bd0c · 2025-08-06T13:47:38.000-04:00
diff --git a/src/ethereum/arrow_glacier/fork.py b/src/ethereum/arrow_glacier/fork.py
@@ -771,7 +771,6 @@ def process_transaction(
         access_list_storage_keys=access_list_storage_keys,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/arrow_glacier/vm/__init__.py b/src/ethereum/arrow_glacier/vm/__init__.py
@@ -93,7 +93,6 @@ class TransactionEnvironment:
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/berlin/fork.py b/src/ethereum/berlin/fork.py
@@ -658,7 +658,6 @@ def process_transaction(
         access_list_storage_keys=access_list_storage_keys,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/berlin/vm/__init__.py b/src/ethereum/berlin/vm/__init__.py
@@ -92,7 +92,6 @@ class TransactionEnvironment:
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/byzantium/fork.py b/src/ethereum/byzantium/fork.py
@@ -635,7 +635,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/byzantium/vm/__init__.py b/src/ethereum/byzantium/vm/__init__.py
@@ -90,7 +90,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/cancun/fork.py b/src/ethereum/cancun/fork.py
@@ -563,7 +563,6 @@ def process_system_transaction(
         blob_versioned_hashes=(),
         index_in_block=None,
         tx_hash=None,
-        traces=[],
     )
 
     system_tx_message = Message(
@@ -755,7 +754,6 @@ def process_transaction(
         blob_versioned_hashes=blob_versioned_hashes,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/cancun/vm/__init__.py b/src/ethereum/cancun/vm/__init__.py
@@ -104,7 +104,6 @@ class TransactionEnvironment:
     blob_versioned_hashes: Tuple[VersionedHash, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/constantinople/fork.py b/src/ethereum/constantinople/fork.py
@@ -635,7 +635,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/constantinople/vm/__init__.py b/src/ethereum/constantinople/vm/__init__.py
@@ -90,7 +90,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/dao_fork/fork.py b/src/ethereum/dao_fork/fork.py
@@ -647,7 +647,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/dao_fork/vm/__init__.py b/src/ethereum/dao_fork/vm/__init__.py
@@ -89,7 +89,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/frontier/fork.py b/src/ethereum/frontier/fork.py
@@ -630,7 +630,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/frontier/vm/__init__.py b/src/ethereum/frontier/vm/__init__.py
@@ -89,7 +89,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/gray_glacier/fork.py b/src/ethereum/gray_glacier/fork.py
@@ -771,7 +771,6 @@ def process_transaction(
         access_list_storage_keys=access_list_storage_keys,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/gray_glacier/vm/__init__.py b/src/ethereum/gray_glacier/vm/__init__.py
@@ -93,7 +93,6 @@ class TransactionEnvironment:
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/homestead/fork.py b/src/ethereum/homestead/fork.py
@@ -630,7 +630,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/homestead/vm/__init__.py b/src/ethereum/homestead/vm/__init__.py
@@ -89,7 +89,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/istanbul/fork.py b/src/ethereum/istanbul/fork.py
@@ -635,7 +635,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/istanbul/vm/__init__.py b/src/ethereum/istanbul/vm/__init__.py
@@ -90,7 +90,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/london/fork.py b/src/ethereum/london/fork.py
@@ -777,7 +777,6 @@ def process_transaction(
         access_list_storage_keys=access_list_storage_keys,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/london/vm/__init__.py b/src/ethereum/london/vm/__init__.py
@@ -93,7 +93,6 @@ class TransactionEnvironment:
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/muir_glacier/fork.py b/src/ethereum/muir_glacier/fork.py
@@ -637,7 +637,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/muir_glacier/vm/__init__.py b/src/ethereum/muir_glacier/vm/__init__.py
@@ -90,7 +90,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/osaka/fork.py b/src/ethereum/osaka/fork.py
@@ -616,7 +616,6 @@ def process_system_transaction(
         authorizations=(),
         index_in_block=None,
         tx_hash=None,
-        traces=[],
     )
 
     system_tx_message = Message(
@@ -922,7 +921,6 @@ def process_transaction(
         authorizations=authorizations,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/osaka/vm/__init__.py b/src/ethereum/osaka/vm/__init__.py
@@ -108,7 +108,6 @@ class TransactionEnvironment:
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/paris/fork.py b/src/ethereum/paris/fork.py
@@ -549,7 +549,6 @@ def process_transaction(
         access_list_storage_keys=access_list_storage_keys,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/paris/vm/__init__.py b/src/ethereum/paris/vm/__init__.py
@@ -92,7 +92,6 @@ class TransactionEnvironment:
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/prague/fork.py b/src/ethereum/prague/fork.py
@@ -601,7 +601,6 @@ def process_system_transaction(
         authorizations=(),
         index_in_block=None,
         tx_hash=None,
-        traces=[],
     )
 
     system_tx_message = Message(
@@ -907,7 +906,6 @@ def process_transaction(
         authorizations=authorizations,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/prague/vm/__init__.py b/src/ethereum/prague/vm/__init__.py
@@ -108,7 +108,6 @@ class TransactionEnvironment:
     authorizations: Tuple[Authorization, ...]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/shanghai/fork.py b/src/ethereum/shanghai/fork.py
@@ -562,7 +562,6 @@ def process_transaction(
         access_list_storage_keys=access_list_storage_keys,
         index_in_block=index,
         tx_hash=get_transaction_hash(encode_transaction(tx)),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/shanghai/vm/__init__.py b/src/ethereum/shanghai/vm/__init__.py
@@ -97,7 +97,6 @@ class TransactionEnvironment:
     access_list_storage_keys: Set[Tuple[Address, Bytes32]]
     index_in_block: Optional[Uint]
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/spurious_dragon/fork.py b/src/ethereum/spurious_dragon/fork.py
@@ -631,7 +631,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/spurious_dragon/vm/__init__.py b/src/ethereum/spurious_dragon/vm/__init__.py
@@ -90,7 +90,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum/tangerine_whistle/fork.py b/src/ethereum/tangerine_whistle/fork.py
@@ -629,7 +629,6 @@ def process_transaction(
         gas=gas,
         index_in_block=index,
         tx_hash=get_transaction_hash(tx),
-        traces=[],
     )
 
     message = prepare_message(block_env, tx_env, tx)
diff --git a/src/ethereum/tangerine_whistle/vm/__init__.py b/src/ethereum/tangerine_whistle/vm/__init__.py
@@ -89,7 +89,6 @@ class TransactionEnvironment:
     gas: Uint
     index_in_block: Uint
     tx_hash: Optional[Hash32]
-    traces: List[dict]
 
 
 @dataclass
diff --git a/src/ethereum_spec_tools/evm_tools/t8n/evm_trace.py b/src/ethereum_spec_tools/evm_tools/t8n/evm_trace.py
@@ -12,6 +12,7 @@
     Optional,
     Protocol,
     TextIO,
+    TypeAlias,
     Union,
     runtime_checkable,
 )
@@ -86,7 +87,6 @@ class TransactionEnvironment(Protocol):
 
     index_in_block: Optional[Uint]
     tx_hash: Optional[Bytes]
-    traces: List[Union["Trace", "FinalTrace"]]
 
 
 @runtime_checkable
@@ -136,6 +136,12 @@ class EvmWithReturnData(Protocol):
 Evm = Union[EvmWithoutReturnData, EvmWithReturnData]
 
 
+_ActiveTraces: TypeAlias = tuple[
+    TransactionEnvironment, list[Trace | FinalTrace]
+]
+_active_traces: _ActiveTraces | None = None
+
+
 def evm_trace(
     evm: Any,
     event: TraceEvent,
@@ -147,6 +153,8 @@ def evm_trace(
     """
     Create a trace of the event.
     """
+    global _active_traces
+
     # System Transaction do not have a tx_hash or index
     if (
         evm.message.tx_env.index_in_block is None
@@ -156,7 +164,12 @@ def evm_trace(
 
     assert isinstance(evm, (EvmWithoutReturnData, EvmWithReturnData))
 
-    traces = evm.message.tx_env.traces
+    if _active_traces and _active_traces[0] is evm.message.tx_env:
+        traces = _active_traces[1]
+    else:
+        traces = []
+        _active_traces = (evm.message.tx_env, traces)
+
     last_trace = None
     if traces:
         last_trace = traces[-1]
diff --git a/tests/helpers/load_vm_tests.py b/tests/helpers/load_vm_tests.py
@@ -127,7 +127,6 @@ def load_test(self, test_dir: str, test_file: str) -> Any:
             gas=tx.gas,
             index_in_block=Uint(0),
             tx_hash=b"56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            traces=[],
         )
 
         return {

Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,6 @@ def process_transaction(`
`771`	`771`	`access_list_storage_keys=access_list_storage_keys,`
`772`	`772`	`index_in_block=index,`
`773`	`773`	`tx_hash=get_transaction_hash(encode_transaction(tx)),`
`774`		`- traces=[],`
`775`	`774`	`)`
`776`	`775`
`777`	`776`	`message = prepare_message(block_env, tx_env, tx)`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,6 @@ def process_transaction(`
`658`	`658`	`access_list_storage_keys=access_list_storage_keys,`
`659`	`659`	`index_in_block=index,`
`660`	`660`	`tx_hash=get_transaction_hash(encode_transaction(tx)),`
`661`		`- traces=[],`
`662`	`661`	`)`
`663`	`662`
`664`	`663`	`message = prepare_message(block_env, tx_env, tx)`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,6 @@ def process_transaction(`
`635`	`635`	`gas=gas,`
`636`	`636`	`index_in_block=index,`
`637`	`637`	`tx_hash=get_transaction_hash(tx),`
`638`		`- traces=[],`
`639`	`638`	`)`
`640`	`639`
`641`	`640`	`message = prepare_message(block_env, tx_env, tx)`
Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,6 @@ def process_system_transaction(`
`563`	`563`	`blob_versioned_hashes=(),`
`564`	`564`	`index_in_block=None,`
`565`	`565`	`tx_hash=None,`
`566`		`- traces=[],`
`567`	`566`	`)`
`568`	`567`
`569`	`568`	`system_tx_message = Message(`
`@@ -755,7 +754,6 @@ def process_transaction(`
`755`	`754`	`blob_versioned_hashes=blob_versioned_hashes,`
`756`	`755`	`index_in_block=index,`
`757`	`756`	`tx_hash=get_transaction_hash(encode_transaction(tx)),`
`758`		`- traces=[],`
`759`	`757`	`)`
`760`	`758`
`761`	`759`	`message = prepare_message(block_env, tx_env, tx)`