Merge branch 'projects/zkevm' into projects/zkevm-bal-devnet-3

Author: jsign

src/ethereum/forks/amsterdam/stateless_host.py

@@ -73,7 +73,13 @@ def build_stateless_input(
             tx_bytes_list.append(Bytes(rlp.encode(tx)))
         else:
             tx_bytes_list.append(Bytes(tx))
-            tx_obj = decode_transaction(tx)
+            # A typed tx may be malformed (pre-execution-rejected by
+            # t8n but still committed to by the block's transactions
+            # trie).
+            try:
+                tx_obj = decode_transaction(tx)
+            except Exception:
+                continue
             if isinstance(tx_obj, BlobTransaction):
                 versioned_hashes.extend(tx_obj.blob_versioned_hashes)
 

src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py

@@ -412,16 +412,16 @@ def update(self, t8n: "T8N", block_env: Any, block_output: Any) -> None:
                 slot_number=block_env.slot_number,
             )
 
-            # TODO: perhaps change this for t8n.all_txs minus rejected_txs?
-            included_txs = []
-            for key in block_output.receipt_keys:
+            payload_txs = []
+            for tx_index in range(len(t8n.txs.transactions)):
+                key = rlp.encode(Uint(tx_index))
                 tx = t8n.fork.trie_get(block_output.transactions_trie, key)
                 assert tx is not None
-                included_txs.append(tx)
+                payload_txs.append(tx)
 
             block = t8n.fork.Block(
                 header=header,
-                transactions=tuple(included_txs),
+                transactions=tuple(payload_txs),
                 ommers=(),
                 withdrawals=withdrawals,
             )