Merge branch 'main' into dependabot/pip/cryptography-gte-44.0.1-and-lt-48

Author: AntonioCeppellini

src/hiero_sdk_python/query/transaction_get_receipt_query.py

@@ -277,17 +277,22 @@ def _map_status_error(self, response: response_pb2.Response) -> PrecheckError |
             TransactionReceipt._from_proto(response.transactionGetReceipt.receipt, self.transaction_id),
         )
 
-    def _map_receipt_list(self, receipts: list[transaction_receipt_pb2.TransactionReceipt]) -> list[TransactionReceipt]:
+    def _map_receipt_list(
+        self, receipts: list[transaction_receipt_pb2.TransactionReceipt], include_parent_tx_id: bool = False
+    ) -> list[TransactionReceipt]:
         """
         Maps a list of protobuf transaction receipts to TransactionReceipt objects.
 
         Args:
             receipts: A list of protobuf TransactionReceipt objects
+            include_parent_tx_id: If True, pass parent transaction_id to mapped receipts (for duplicates).
+                                 If False, pass None (for child receipts).
 
         Returns:
             A list of TransactionReceipt objects
         """
-        return [TransactionReceipt._from_proto(receipt_proto, self.transaction_id) for receipt_proto in receipts]
+        transaction_id = self.transaction_id if include_parent_tx_id else None
+        return [TransactionReceipt._from_proto(receipt_proto, transaction_id) for receipt_proto in receipts]
 
     def execute(self, client: Client, timeout: int | float | None = None) -> TransactionReceipt:
         """
@@ -315,12 +320,18 @@ def execute(self, client: Client, timeout: int | float | None = None) -> Transac
         parent = TransactionReceipt._from_proto(response.transactionGetReceipt.receipt, self.transaction_id)
 
         if self.include_children:
-            children = self._map_receipt_list(response.transactionGetReceipt.child_transaction_receipts)
+            # Child receipts are sub-transactions; they don't need parent transaction_id
+            children = self._map_receipt_list(
+                response.transactionGetReceipt.child_transaction_receipts, include_parent_tx_id=False
+            )
 
             parent._set_children(children)
 
         if self.include_duplicates:
-            duplicates = self._map_receipt_list(response.transactionGetReceipt.duplicateTransactionReceipts)
+            # Duplicate receipts are related to parent; keep parent transaction_id for context
+            duplicates = self._map_receipt_list(
+                response.transactionGetReceipt.duplicateTransactionReceipts, include_parent_tx_id=True
+            )
 
             parent._set_duplicates(duplicates)
 

src/hiero_sdk_python/transaction/transaction_receipt.py

@@ -88,10 +88,15 @@ def account_id(self) -> AccountId | None:
         """
         Retrieves the AccountId associated with the transaction receipt, if available.
 
+        Unlike other ID properties (token_id, file_id, etc.), this returns the AccountId
+        even when accountNum is 0. This is intentional to support EVM auto-account creation
+        scenarios where the protobuf may contain an AccountID with num=0 to identify the
+        newly created account before it's fully initialized on-chain.
+
         Returns:
-            AccountId or None: The AccountId if present; otherwise, None.
+            AccountId or None: The AccountId if present (including num=0); otherwise, None.
         """
-        if self._receipt_proto.HasField("accountID") and self._receipt_proto.accountID.accountNum != 0:
+        if self._receipt_proto.HasField("accountID"):
             return AccountId._from_proto(self._receipt_proto.accountID)
         return None
 
@@ -107,7 +112,9 @@ def serial_numbers(self) -> list[int]:
 
     @property
     def file_id(self) -> FileId | None:
-        """Returns the file ID associated with this receipt."""
+        """
+        Returns the file ID associated with this receipt.
+        """
         if self._receipt_proto.HasField("fileID") and self._receipt_proto.fileID.fileNum != 0:
             return FileId._from_proto(self._receipt_proto.fileID)
         return None
@@ -243,14 +250,14 @@ def _to_proto(self):
 
     @classmethod
     def _from_proto(
-        cls, proto: transaction_receipt_pb2.TransactionReceipt, transaction_id: TransactionId
+        cls, proto: transaction_receipt_pb2.TransactionReceipt, transaction_id: TransactionId | None
     ) -> TransactionReceipt:
         """
         Creates a TransactionReceipt instance from a protobuf TransactionReceipt object.
 
         Args:
             proto (transaction_receipt_pb2.TransactionReceipt): The protobuf TransactionReceipt object.
-            transaction_id (TransactionId): The transaction ID associated with this receipt.
+            transaction_id (TransactionId | None): The transaction ID associated with this receipt. Can be None for child receipts.
 
         Returns:
             TransactionReceipt: A new instance of TransactionReceipt populated with data from the protobuf object.

tests/integration/account_records_query_e2e_test.py

@@ -20,9 +20,10 @@ def test_integration_account_record_query_can_execute(env):
     account = env.create_account()
 
     # Perform transfer transaction
+    transfer_tx = TransferTransaction()
+    transfer_tx.transaction_fee = Hbar(2).to_tinybars()
     transfer_receipt = (
-        TransferTransaction()
-        .add_hbar_transfer(account.id, Hbar(1).to_tinybars())
+        transfer_tx.add_hbar_transfer(account.id, Hbar(1).to_tinybars())
         .add_hbar_transfer(env.operator_id, -Hbar(1).to_tinybars())
         .execute(env.client)
     )
@@ -50,9 +51,10 @@ def test_integration_account_record_query_get_cost(env):
     """Test that AccountRecordsQuery can calculate query costs."""
     account = env.create_account()
 
+    transfer_tx = TransferTransaction()
+    transfer_tx.transaction_fee = Hbar(2).to_tinybars()
     transfer_receipt = (
-        TransferTransaction()
-        .add_hbar_transfer(account.id, Hbar(1).to_tinybars())
+        transfer_tx.add_hbar_transfer(account.id, Hbar(1).to_tinybars())
         .add_hbar_transfer(env.operator_id, -Hbar(1).to_tinybars())
         .execute(env.client)
     )
@@ -75,9 +77,10 @@ def test_integration_account_record_query_insufficient_payment(env):
     """Test that AccountRecordsQuery fails with insufficient payment."""
     account = env.create_account()
 
+    transfer_tx = TransferTransaction()
+    transfer_tx.transaction_fee = Hbar(2).to_tinybars()
     transfer_receipt = (
-        TransferTransaction()
-        .add_hbar_transfer(account.id, Hbar(1).to_tinybars())
+        transfer_tx.add_hbar_transfer(account.id, Hbar(1).to_tinybars())
         .add_hbar_transfer(env.operator_id, -Hbar(1).to_tinybars())
         .execute(env.client)
     )