✨ feat: Align TransactionHashByResponse to Transaction (ethereum#1755)

* ✨ feat: Align TransactionHashByResponse to Transaction

* ✨ feat: Update provider reference to tx model

---------

Co-authored-by: raxhvl <raxhvl@users.noreply.github.com>

Author: raxhvl

src/cli/gentest/test_context_providers.py

@@ -19,6 +19,7 @@
 from pydantic import BaseModel
 
 from ethereum_test_base_types import Account, Hash
+from ethereum_test_rpc.types import TransactionByHashResponse
 from ethereum_test_tools import Environment, Transaction
 
 from .request_manager import RPCRequest
@@ -39,7 +40,7 @@ class StateTestProvider(Provider):
 
     transaction_hash: Hash
     block: Optional[Environment] = None
-    transaction: Optional[Transaction] = None
+    transaction_response: Optional[TransactionByHashResponse] = None
     state: Optional[Dict[str, Dict]] = None
 
     def _make_rpc_calls(self):
@@ -48,13 +49,13 @@ def _make_rpc_calls(self):
             f"Perform tx request: eth_get_transaction_by_hash({self.transaction_hash})",
             file=stderr,
         )
-        self.transaction = request.eth_get_transaction_by_hash(self.transaction_hash)
+        self.transaction_response = request.eth_get_transaction_by_hash(self.transaction_hash)
 
         print("Perform debug_trace_call", file=stderr)
-        self.state = request.debug_trace_call(self.transaction)
+        self.state = request.debug_trace_call(self.transaction_response)
 
         print("Perform eth_get_block_by_number", file=stderr)
-        self.block = request.eth_get_block_by_number(self.transaction.block_number)
+        self.block = request.eth_get_block_by_number(self.transaction_response.block_number)
 
         print("Generate py test", file=stderr)
 
@@ -64,22 +65,23 @@ def _get_environment(self) -> Environment:
 
     def _get_pre_state(self) -> Dict[str, Account]:
         assert self.state is not None
-        assert self.transaction is not None
+        assert self.transaction_response is not None
 
         pre_state: Dict[str, Account] = {}
         for address, account_data in self.state.items():
             # TODO: Check if this is required. Ideally,
             # the pre-state tracer should have the correct
             # values without requiring any additional modifications.
-            if address == self.transaction.sender:
-                account_data["nonce"] = self.transaction.nonce
+            if address == self.transaction_response.sender:
+                account_data["nonce"] = self.transaction_response.nonce
 
             pre_state[address] = Account(**account_data)
         return pre_state
 
     def _get_transaction(self) -> Transaction:
-        assert self.transaction is not None
-        return self.transaction
+        assert self.transaction_response is not None
+        # Validate the RPC TransactionHashResponse and convert it to a Transaction instance.
+        return Transaction.model_validate(self.transaction_response.model_dump())
 
     def get_context(self) -> Dict[str, Any]:
         """

src/ethereum_test_rpc/types.py

@@ -22,7 +22,7 @@
     UndefinedException,
 )
 from ethereum_test_fixtures.blockchain import FixtureExecutionPayload
-from ethereum_test_types import Transaction, Withdrawal
+from ethereum_test_types import EOA, Transaction, Withdrawal
 
 
 class JSONRPCError(Exception):
@@ -49,8 +49,10 @@ class TransactionByHashResponse(Transaction):
 
     gas_limit: HexNumber = Field(HexNumber(21_000), alias="gas")
     transaction_hash: Hash = Field(..., alias="hash")
-    from_address: Address = Field(..., alias="from")
-    to_address: Address | None = Field(..., alias="to")
+    sender: EOA | None = Field(None, alias="from")
+
+    # The to field can have different names in different clients, so we use AliasChoices.
+    to: Address | None = Field(..., validation_alias=AliasChoices("to_address", "to", "toAddress"))
 
     v: HexNumber = Field(0, validation_alias=AliasChoices("v", "yParity"))  # type: ignore