fix: hbar cov fix

Signed-off-by: prajeeta pal <[email protected]>

Author: prajeeta15

CHANGELOG.md

@@ -6,10 +6,9 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ## [Unreleased]
 
-
-
 ### Added
-- Added Hbar object support for TransferTransaction HBAR transfers: methods now accept Union[int, Hbar] for amount parameters, with immediate normalization to tinybars. Includes comprehensive unit tests covering various Hbar units (HBAR, MICROBAR, NANOBAR, TINYBAR) and accumulation behavior with mixed int and Hbar inputs.
+
+- Added Hbar object support for TransferTransaction HBAR transfers: methods now accept Union[int, Hbar] for amount parameters, with immediate normalization to tinybars- includes comprehensive unit tests covering various Hbar units (HBAR, MICROBAR, NANOBAR, TINYBAR) and accumulation behavior with mixed int and Hbar inputs.
 - examples/mypy.ini for stricter type checking in example scripts
 - Added a GitHub Actions workflow that reminds contributors to link pull requests to issues.
 - Added `__str__` and `__repr__` methods to `AccountInfo` class for improved logging and debugging experience (#1098)
@@ -24,7 +23,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Added unit tests for `SubscriptionHandle` class covering cancellation state, thread management, and join operations.
 - Refactored `account_create_transaction_create_with_alias.py` example by splitting monolithic function into modular functions: `generate_main_and_alias_keys()`, `create_account_with_ecdsa_alias()`, `fetch_account_info()`, `print_account_summary()` (#1016)
 - Added `.github/workflows/bot-pr-auto-draft-on-changes.yml` to automatically convert PRs to draft and notify authors when reviewers request changes.
-- 
+-
 - Modularized `transfer_transaction_fungible` example by introducing `account_balance_query()` & `transfer_transaction()`.Renamed `transfer_tokens()` → `main()`
 - Phase 2 of the inactivity-unassign bot: Automatically detects stale open pull requests (no commit activity for 21+ days), comments with a helpful InactivityBot message, closes the stale PR, and unassigns the contributor from the linked issue.
 - Added `__str__()` to CustomFixedFee and updated examples and tests accordingly.
@@ -44,7 +43,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Support selecting specific node account ID(s) for queries and transactions and added `Network._get_node()` with updated execution flow (#362)
 - Add TLS support with two-stage control (`set_transport_security()` and `set_verify_certificates()`) for encrypted connections to Hedera networks. TLS is enabled by default for hosted networks (mainnet, testnet, previewnet) and disabled for local networks (solo, localhost) (#855)
 - Add PR inactivity reminder bot for stale pull requests `.github/workflows/pr-inactivity-reminder-bot.yml`
-- Add comprehensive training documentation for _Executable class `docs/sdk_developers/training/executable.md`
+- Add comprehensive training documentation for \_Executable class `docs/sdk_developers/training/executable.md`
 - Added empty `docs/maintainers/good_first_issues.md` file for maintainers to write Good First Issue guidelines (#1034)
 - Added new `.github/ISSUE_TEMPLATE/04_good_first_issue_candidate.yml` file (1068)(https://github.com/hiero-ledger/hiero-sdk-python/issues/1068)
 - Enhanced `.github/ISSUE_TEMPLATE/01_good_first_issue.yml` with welcoming message and acceptance criteria sections to guide contributors in creating quality GFIs (#1052)
@@ -53,15 +52,16 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Add support for include_children in TransactionGetReceiptQuery (#1100)(https://github.com/hiero-ledger/hiero-sdk-python/issues/1100)
 - Add new `.github/ISSUE_TEMPLATE/05_intermediate_issue.yml` file (1072)(https://github.com/hiero-ledger/hiero-sdk-python/issues/1072)
 - Add a workflow to notify the team when issues are labeled as “good first issues” or identified as candidates for that label: `bot-gfi-notify-team.yml`(#1115)
-- Added __str__ and __repr__ to AccountBalance
+- Added **str** and **repr** to AccountBalance
 - Added GitHub workflow that makes sure newly added test files follow pytest test files naming conventions (#1054)
 - Added advanced issue template for contributors `.github/ISSUE_TEMPLATE/06_advanced_issue.yml`.
 - Add new tests to `tests/unit/topic_info_query_test.py` (#1124)
 - Added `coding_token_transactions.md` for a high level overview training on how token transactions are created in the python sdk.
-- Added prompt for codeRabbit on how to review /examples ([#1180](https://github.com/hiero-ledger/hiero-sdk-python/issues/1180)) 
+- Added prompt for codeRabbit on how to review /examples ([#1180](https://github.com/hiero-ledger/hiero-sdk-python/issues/1180))
 - Add Linked Issue Enforcer to automatically close PRs without linked issues `.github/workflows/bot-linked-issue-enforcer.yml`.
 
 ### Changed
+
 - Updated Codecov coverage thresholds in 'codecov.yml' to require 90% of project coverage and 92% of patch coverage (#1157)
 - Reduce office-hours reminder spam by posting only on each user's most recent open PR, grouping by author and sorting by creation time (#1121)
 - Pylint cleanup for token_airdrop_transaction_cancel.py (#1081) [@tiya-15](https://github.com/tiya-15)
@@ -82,20 +82,17 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Cleaned up `token_airdrop_claim_auto` example for pylint compliance (no functional changes). (#1079)
 - Formatted `examples/query` using black (#1082)(https://github.com/hiero-ledger/hiero-sdk-python/issues/1082)
 - Update team notification script and workflow for P0 issues 'p0_issues_notify_team.js'
-- Rename test files across the repository to ensure they consistently end with _test.py (#1055)
+- Rename test files across the repository to ensure they consistently end with \_test.py (#1055)
 - Cleaned up `token_airdrop_claim_signature_required` example for pylint compliance (no functional changes). (#1080)
-- Rename the file 'test_token_fee_schedule_update_transaction_e2e.py' to make it ends with _test.py as all other test files.(#1117)
+- Rename the file 'test_token_fee_schedule_update_transaction_e2e.py' to make it ends with \_test.py as all other test files.(#1117)
 - Format token examples with Black for consistent code style and improved readability (#1119)
 - Transformed `examples/tokens/custom_fee_fixed.py` to be an end-to-end example, that interacts with the Hedera network, rather than a static object demo.
-- Format token examples with Black for consistent code style and improved readability (#1119) 
-- Replaced `ResponseCode.get_name(receipt.status)` with the  `ResponseCode(receipt.status).name` across examples and integration tests for consistency. (#1136)
+- Format token examples with Black for consistent code style and improved readability (#1119)
+- Replaced `ResponseCode.get_name(receipt.status)` with the `ResponseCode(receipt.status).name` across examples and integration tests for consistency. (#1136)
 - Moved helpful references to Additional Context section and added clickable links.
 - Transformed `examples\tokens\custom_royalty_fee.py` to be an end-to-end example, that interacts with the Hedera network, rather than a static object demo.
 - Refactored `examples/tokens/custom_royalty_fee.py` by splitting monolithic function custom_royalty_fee_example() into modular functions create_royalty_fee_object(), create_token_with_fee(), verify_token_fee(), and main() to improve readability, cleaned up setup_client() (#1169)
 
-
-
-
 ### Fixed
 
 - Fix token association verification in `token_airdrop_transaction.py` to correctly check if tokens are associated by using `token_id in token_balances` instead of incorrectly displaying zero balances which was misleading (#[815])
@@ -107,7 +104,6 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - TLS Hostname Mismatch & Certificate Verification Failure for Nodes
 - Workflow does not contain permissions for `pr-check-test-files` and `pr-check-codecov`
 
-
 ### Breaking Change
 
 - Remove deprecated 'in_tinybars' parameter and update related tests `/src/hiero_sdk_python/hbar.py`, `/tests/unit/hbar_test.py` and `/src/hiero_sdk_python/tokens/custom_fixed_fee.py`.
@@ -673,4 +669,3 @@ contract_call_local_pb2.ContractLoginfo -> contract_types_pb2.ContractLoginfo
 ### Removed
 
 - N/A
-

tests/integration/transfer_transaction_e2e_test.py

@@ -448,3 +448,71 @@ def test_integration_transfer_transaction_approved_token_transfer():
 
     finally:
         env.close()
+
+
+@pytest.mark.integration
+def test_integration_transfer_transaction_approved_nft_transfer():
+    """Test NFT transfer with approval flag set to True."""
+    env = IntegrationTestEnv()
+
+    try:
+        new_account_private_key = PrivateKey.generate()
+        new_account_public_key = new_account_private_key.public_key()
+
+        initial_balance = Hbar(10)
+
+        account_transaction = AccountCreateTransaction(
+            key=new_account_public_key, initial_balance=initial_balance, memo="Recipient Account"
+        )
+
+        receipt = account_transaction.execute(env.client)
+
+        assert (
+            receipt.status == ResponseCode.SUCCESS
+        ), f"Account creation failed with status: {ResponseCode(receipt.status).name}"
+
+        account_id = receipt.account_id
+        assert account_id is not None
+
+        token_id = create_nft_token(env)
+        assert token_id is not None
+
+        mint_transaction = TokenMintTransaction(token_id=token_id, metadata=[b"test"])
+
+        receipt = mint_transaction.execute(env.client)
+
+        assert (
+            receipt.status == ResponseCode.SUCCESS
+        ), f"NFT mint failed with status: {ResponseCode(receipt.status).name}"
+
+        serial_number = receipt.serial_numbers[0]
+
+        nft_id = NftId(token_id, serial_number)
+
+        associate_transaction = TokenAssociateTransaction(
+            account_id=account_id, token_ids=[token_id]
+        )
+
+        associate_transaction.freeze_with(env.client)
+        associate_transaction.sign(new_account_private_key)
+        receipt = associate_transaction.execute(env.client)
+
+        assert (
+            receipt.status == ResponseCode.SUCCESS
+        ), f"NFT association failed with status: {ResponseCode(receipt.status).name}"
+
+        transfer_transaction = TransferTransaction()
+        transfer_transaction.add_approved_nft_transfer(nft_id, env.operator_id, account_id)
+
+        receipt = transfer_transaction.execute(env.client)
+
+        assert (
+            receipt.status == ResponseCode.SUCCESS
+        ), f"NFT transfer failed with status: {ResponseCode(receipt.status).name}"
+
+        query_transaction = CryptoGetAccountBalanceQuery(account_id)
+        balance = query_transaction.execute(env.client)
+
+        assert balance and balance.token_balances == {token_id: serial_number}
+    finally:
+        env.close()

tests/unit/transfer_transaction_test.py

@@ -632,3 +632,167 @@ def test_invalid_amount_type_hbar_transfer(mock_account_ids):
 
     with pytest.raises(TypeError, match="amount must be an int or Hbar instance"):
         transfer_tx.add_hbar_transfer(account_id_1, 123.45)
+
+
+def test_token_transfer_with_expected_decimals_building(mock_account_ids):
+    """Test token transfer with expected_decimals is properly built in transaction body."""
+    account_id_1, account_id_2, node_account_id, token_id_1, _ = mock_account_ids
+    transfer_tx = TransferTransaction()
+
+    transfer_tx.add_token_transfer_with_decimals(token_id_1, account_id_1, -100, 8)
+    transfer_tx.add_token_transfer_with_decimals(token_id_1, account_id_2, 100, 8)
+    transfer_tx.node_account_id = node_account_id
+    transfer_tx.operator_account_id = account_id_1
+
+    result = transfer_tx.build_transaction_body()
+
+    assert result.HasField("cryptoTransfer")
+    token_transfers = result.cryptoTransfer.tokenTransfers
+    assert len(token_transfers) == 1
+    assert token_transfers[0].token == token_id_1._to_proto()
+
+    token_amounts = token_transfers[0].transfers
+    assert len(token_amounts) == 2
+    for transfer in token_amounts:
+        if transfer.accountID.accountNum == account_id_1.num:
+            assert transfer.amount == -100
+        elif transfer.accountID.accountNum == account_id_2.num:
+            assert transfer.amount == 100
+
+
+def test_nft_transfer_with_approval_building(mock_account_ids):
+    """Test NFT transfers with approval flag are properly built."""
+    account_id_sender, account_id_recipient, node_account_id, token_id_1, _ = mock_account_ids
+    transfer_tx = TransferTransaction()
+
+    transfer_tx.add_nft_transfer(
+        NftId(token_id_1, 1), account_id_sender, account_id_recipient, False
+    )
+    transfer_tx.add_nft_transfer(
+        NftId(token_id_1, 2), account_id_sender, account_id_recipient, True
+    )
+    transfer_tx.node_account_id = node_account_id
+    transfer_tx.operator_account_id = account_id_sender
+
+    result = transfer_tx.build_transaction_body()
+
+    assert result.HasField("cryptoTransfer")
+    token_transfers = result.cryptoTransfer.tokenTransfers
+    assert len(token_transfers) == 1
+
+    nft_transfers = token_transfers[0].nftTransfers
+    assert len(nft_transfers) == 2
+
+    assert nft_transfers[0].serialNumber == 1
+    assert nft_transfers[0].is_approval is False
+    assert nft_transfers[1].serialNumber == 2
+    assert nft_transfers[1].is_approval is True
+
+
+def test_nft_transfer_reconstruction_from_protobuf(mock_account_ids, mock_client):
+    """Test NFT transfer reconstruction from protobuf preserves all fields."""
+    account_id_sender, account_id_recipient, node_account_id, token_id_1, _ = mock_account_ids
+    transfer_tx = TransferTransaction()
+
+    transfer_tx.add_nft_transfer(
+        NftId(token_id_1, 5), account_id_sender, account_id_recipient, True
+    )
+    transfer_tx.node_account_id = node_account_id
+    transfer_tx.operator_account_id = account_id_sender
+
+    body = transfer_tx.build_transaction_body()
+    body_bytes = body.SerializeToString()
+
+    reconstructed = TransferTransaction._from_protobuf(body, body_bytes, None)
+
+    assert len(reconstructed.nft_transfers[token_id_1]) == 1
+    nft = reconstructed.nft_transfers[token_id_1][0]
+    assert nft.token_id == token_id_1
+    assert nft.sender_id == account_id_sender
+    assert nft.receiver_id == account_id_recipient
+    assert nft.serial_number == 5
+    assert nft.is_approved is True
+
+
+def test_nft_transfers_unapproved_reconstruction(mock_account_ids):
+    """Test NFT transfer reconstruction with is_approved=False."""
+    account_id_sender, account_id_recipient, node_account_id, token_id_1, _ = mock_account_ids
+    transfer_tx = TransferTransaction()
+
+    transfer_tx.add_nft_transfer(
+        NftId(token_id_1, 10), account_id_sender, account_id_recipient, False
+    )
+    transfer_tx.node_account_id = node_account_id
+    transfer_tx.operator_account_id = account_id_sender
+
+    body = transfer_tx.build_transaction_body()
+    body_bytes = body.SerializeToString()
+
+    reconstructed = TransferTransaction._from_protobuf(body, body_bytes, None)
+
+    assert len(reconstructed.nft_transfers[token_id_1]) == 1
+    nft = reconstructed.nft_transfers[token_id_1][0]
+    assert nft.is_approved is False
+
+
+def test_token_transfer_with_expected_decimals_reconstruction(mock_account_ids):
+    """Test token transfer with expected_decimals reconstruction from protobuf."""
+    account_id_sender, account_id_recipient, node_account_id, token_id_1, _ = mock_account_ids
+    transfer_tx = TransferTransaction()
+
+    transfer_tx.add_token_transfer_with_decimals(
+        token_id_1, account_id_sender, -100, 6
+    )
+    transfer_tx.add_token_transfer_with_decimals(
+        token_id_1, account_id_recipient, 100, 6
+    )
+    transfer_tx.node_account_id = node_account_id
+    transfer_tx.operator_account_id = account_id_sender
+
+    body = transfer_tx.build_transaction_body()
+    body_bytes = body.SerializeToString()
+
+    reconstructed = TransferTransaction._from_protobuf(body, body_bytes, None)
+
+    assert len(reconstructed.token_transfers[token_id_1]) == 2
+    for token_transfer in reconstructed.token_transfers[token_id_1]:
+        assert token_transfer.expected_decimals == 6
+        if token_transfer.account_id == account_id_sender:
+            assert token_transfer.amount == -100
+        elif token_transfer.account_id == account_id_recipient:
+            assert token_transfer.amount == 100
+
+
+def test_combined_transfers_reconstruction(mock_account_ids):
+    """Test reconstruction of transaction with HBAR, token, and NFT transfers."""
+    account_id_sender, account_id_recipient, node_account_id, token_id_1, _ = mock_account_ids
+    transfer_tx = TransferTransaction()
+
+    transfer_tx.add_hbar_transfer(account_id_sender, -1000)
+    transfer_tx.add_hbar_transfer(account_id_recipient, 1000)
+    transfer_tx.add_token_transfer_with_decimals(
+        token_id_1, account_id_sender, -50, 8
+    )
+    transfer_tx.add_token_transfer_with_decimals(
+        token_id_1, account_id_recipient, 50, 8
+    )
+    transfer_tx.add_nft_transfer(
+        NftId(token_id_1, 1), account_id_sender, account_id_recipient, True
+    )
+    transfer_tx.node_account_id = node_account_id
+    transfer_tx.operator_account_id = account_id_sender
+
+    body = transfer_tx.build_transaction_body()
+    body_bytes = body.SerializeToString()
+
+    reconstructed = TransferTransaction._from_protobuf(body, body_bytes, None)
+
+    assert len(reconstructed.hbar_transfers) == 2
+    assert len(reconstructed.token_transfers[token_id_1]) == 2
+    assert len(reconstructed.nft_transfers[token_id_1]) == 1
+
+    nft = reconstructed.nft_transfers[token_id_1][0]
+    assert nft.sender_id == account_id_sender
+    assert nft.receiver_id == account_id_recipient
+    assert nft.serial_number == 1
+    assert nft.is_approved is True