feat: Refactor TokenDissociateTransaction to use set_token_ids method (#830)

Signed-off-by: MonaaEid <monaa_eid@hotmail.com>
Signed-off-by: MontyPokemon <59332150+MonaaEid@users.noreply.github.com>

Author: MonaaEid

CHANGELOG.md

@@ -56,6 +56,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Allow `PrivateKey` to be used for keys in `TopicCreateTransaction` for consistency.
 - Update github actions checkout from 5.0.0 to 5.0.1 (#814)
 - changed to add concurrency to workflow bot
+- feat: Refactor `TokenDissociateTransaction` to use set_token_ids method and update transaction fee to Hbar, also update `transaction.py` and expand `examples/token_dissociate.py`, `tests/unit/token_dissociate.py`.
 
 ### Fixed
 

examples/tokens/token_dissociate_transaction.py

@@ -155,8 +155,7 @@ def token_dissociate(client, nft_token_id, fungible_token_id, recipient_id, reci
         receipt = (
             TokenDissociateTransaction()
             .set_account_id(recipient_id)
-            .add_token_id(nft_token_id)
-            .add_token_id(fungible_token_id)
+            .set_token_ids([nft_token_id, fungible_token_id])
             .freeze_with(client)
             .sign(recipient_key) # Recipient must sign to approve
             .execute(client)

src/hiero_sdk_python/tokens/token_dissociate_transaction.py

@@ -22,6 +22,7 @@
 from hiero_sdk_python.channels import _Channel
 from hiero_sdk_python.executable import _Method
 from hiero_sdk_python.tokens.token_id import TokenId
+from hiero_sdk_python.hbar import Hbar
 
 class TokenDissociateTransaction(Transaction):
     """
@@ -49,7 +50,7 @@ def __init__(
         self.account_id: Optional[AccountId] = account_id
         self.token_ids: List[TokenId] = token_ids or []
 
-        self._default_transaction_fee: int = 500_000_000
+        self._default_transaction_fee = Hbar(2)
 
     def set_account_id(self, account_id: AccountId) -> "TokenDissociateTransaction":
         """ Sets the account ID for the token dissociation transaction. """
@@ -63,6 +64,42 @@ def add_token_id(self, token_id: TokenId) -> "TokenDissociateTransaction":
         self.token_ids.append(token_id)
         return self
 
+    def set_token_ids(self, token_ids: List[TokenId]) -> "TokenDissociateTransaction":
+        """Sets the list of token IDs to dissociate from the account.
+        """
+        self._require_not_frozen()
+        self.token_ids = token_ids
+        return self
+
+    def _validate_check_sum(self, client) -> None:
+        """Validates the checksums of the account ID and token IDs against the provided client."""
+        if self.account_id is not None:
+            self.account_id.validate_checksum(client)
+        for token_id in (self.token_ids or []):
+            if token_id is not None:
+                token_id.validate_checksum(client)
+
+
+    @classmethod
+    def _from_proto(cls, proto: token_dissociate_pb2.TokenDissociateTransactionBody) -> "TokenDissociateTransaction":
+        """
+        Creates a TokenDissociateTransaction instance from a protobuf
+        TokenDissociateTransactionBody object.
+
+        Args:
+            proto (TokenDissociateTransactionBody): The protobuf
+            representation of the token dissociate transaction.
+        """
+        account_id = AccountId._from_proto(proto.account)
+        token_ids = [TokenId._from_proto(token_proto) for token_proto in proto.tokens]
+
+        transaction = cls(
+            account_id=account_id,
+            token_ids=token_ids
+        )
+
+        return transaction
+
     def _build_proto_body(self) -> token_dissociate_pb2.TokenDissociateTransactionBody:
         """
         Returns the protobuf body for the token dissociate transaction.

src/hiero_sdk_python/transaction/transaction.py

@@ -12,6 +12,7 @@
 from hiero_sdk_python.hapi.services import (basic_types_pb2, transaction_pb2, transaction_contents_pb2, transaction_pb2)
 from hiero_sdk_python.hapi.services.schedulable_transaction_body_pb2 import SchedulableTransactionBody
 from hiero_sdk_python.hapi.services.transaction_response_pb2 import (TransactionResponse as TransactionResponseProto)
+from hiero_sdk_python.hbar import Hbar
 from hiero_sdk_python.response_code import ResponseCode
 from hiero_sdk_python.transaction.transaction_id import TransactionId
 from hiero_sdk_python.transaction.transaction_response import TransactionResponse
@@ -61,8 +62,9 @@ def __init__(self) -> None:
         # This allows us to maintain the signatures for each unique transaction
         # and ensures that the correct signatures are used when submitting transactions
         self._signature_map: dict[bytes, basic_types_pb2.SignatureMap] = {}
-        self._default_transaction_fee = 2_000_000
-        self.operator_account_id = None
+        # changed from int: 2_000_000 to Hbar: 0.02
+        self._default_transaction_fee = Hbar(0.02)
+        self.operator_account_id = None  
         self.batch_key: Optional[PrivateKey] = None
 
     def _make_request(self):
@@ -419,7 +421,11 @@ def build_base_transaction_body(self) -> transaction_pb2.TransactionBody:
         transaction_body.transactionID.CopyFrom(transaction_id_proto)
         transaction_body.nodeAccountID.CopyFrom(self.node_account_id._to_proto())
 
-        transaction_body.transactionFee = self.transaction_fee or self._default_transaction_fee
+        fee = self.transaction_fee or self._default_transaction_fee
+        if hasattr(fee, "to_tinybars"):
+            transaction_body.transactionFee = int(fee.to_tinybars())
+        else:
+            transaction_body.transactionFee = int(fee)
 
         transaction_body.transactionValidDuration.seconds = self.transaction_valid_duration
         transaction_body.generateRecord = self.generate_record
@@ -441,9 +447,13 @@ def build_base_scheduled_body(self) -> SchedulableTransactionBody:
                 The protobuf SchedulableTransactionBody message with common fields set.
         """
         schedulable_body = SchedulableTransactionBody()
-        schedulable_body.transactionFee = (
-            self.transaction_fee or self._default_transaction_fee
-        )
+
+        fee = self.transaction_fee or self._default_transaction_fee
+        if hasattr(fee, "to_tinybars"):
+            schedulable_body.transactionFee = int(fee.to_tinybars())
+        else:
+            schedulable_body.transactionFee = int(fee)
+
         schedulable_body.memo = self.memo
         custom_fee_limits = [custom_fee._to_proto() for custom_fee in self.custom_fee_limits]
         schedulable_body.max_custom_fees.extend(custom_fee_limits)

tests/unit/test_token_dissociate_transaction.py

@@ -1,11 +1,12 @@
+from unittest.mock import call, MagicMock, Mock
 import pytest
-from unittest.mock import MagicMock
 from hiero_sdk_python.tokens.token_dissociate_transaction import TokenDissociateTransaction
 from hiero_sdk_python.hapi.services import timestamp_pb2
 from hiero_sdk_python.hapi.services.schedulable_transaction_body_pb2 import (
     SchedulableTransactionBody,
 )
 from hiero_sdk_python.transaction.transaction_id import TransactionId
+from hiero_sdk_python.tokens.token_id import TokenId
 
 pytestmark = pytest.mark.unit
 
@@ -54,7 +55,7 @@ def test_transaction_body_with_multiple_tokens(mock_account_ids):
     dissociate_tx.set_account_id(account_id)
     for token_id in token_ids:
         dissociate_tx.add_token_id(token_id)
-    dissociate_tx.operator_account_id = operator_id 
+    dissociate_tx.operator_account_id = operator_id
     dissociate_tx.transaction_id = generate_transaction_id(account_id)
     dissociate_tx.node_account_id = node_account_id
 
@@ -68,6 +69,40 @@ def test_transaction_body_with_multiple_tokens(mock_account_ids):
     for i, token_id in enumerate(token_ids):
         assert transaction_body.tokenDissociate.tokens[i].tokenNum == token_id.num
 
+# This test uses fixture mock_account_ids as parameter
+def test_set_token_ids(mock_account_ids):
+    """Test setting multiple token IDs at once for dissociation."""
+    account_id, _, _, token_id_1, token_id_2 = mock_account_ids
+    token_ids = [token_id_1, token_id_2]
+    
+    dissociate_tx = TokenDissociateTransaction()
+    dissociate_tx.set_account_id(account_id)
+    dissociate_tx.set_token_ids(token_ids)
+
+    assert dissociate_tx.token_ids == token_ids
+
+
+def test_validate_check_sum(mock_account_ids, mock_client, monkeypatch):
+    """Test that validate_check_sum method correctly validates account and token IDs."""
+    account_id, _, _, token_id_1, token_id_2 = mock_account_ids
+
+    dissociate_tx = TokenDissociateTransaction()
+    dissociate_tx.set_account_id(account_id)
+    dissociate_tx.set_token_ids([token_id_1, token_id_2])
+
+    # Mock the validate_checksum methods on the classes to avoid assigning
+    # attributes on frozen dataclass instances.
+    monkeypatch.setattr(type(account_id), "validate_checksum", MagicMock())
+    token_cls = type(token_id_1)
+    monkeypatch.setattr(token_cls, "validate_checksum", MagicMock())
+
+    dissociate_tx._validate_check_sum(mock_client)
+
+    type(account_id).validate_checksum.assert_called_once_with(mock_client)
+    token_validate = type(token_id_1).validate_checksum
+    assert token_validate.call_count == 2
+    token_validate.assert_has_calls([call(mock_client), call(mock_client)])
+
 def test_missing_fields():
     """Test that building the transaction without account ID or token IDs raises a ValueError."""
     dissociate_tx = TokenDissociateTransaction()
@@ -121,7 +156,20 @@ def test_to_proto(mock_account_ids, mock_client):
 
     assert proto.signedTransactionBytes
     assert len(proto.signedTransactionBytes) > 0
-    
+
+def test_from_proto(mock_account_ids):
+    """Test creating a TokenDissociateTransaction from a protobuf object."""
+    account_id, _, _, token_id_1, token_id_2 = mock_account_ids
+    dissociate_tx = TokenDissociateTransaction()
+    dissociate_tx.set_account_id(account_id)
+    dissociate_tx.set_token_ids([token_id_1, token_id_2])
+    proto_body = dissociate_tx._build_proto_body()
+    reconstructed_tx = TokenDissociateTransaction._from_proto(proto_body)
+    assert reconstructed_tx.account_id == account_id
+    assert len(reconstructed_tx.token_ids) == 2
+    assert reconstructed_tx.token_ids[0] == token_id_1
+    assert reconstructed_tx.token_ids[1] == token_id_2
+
 def test_build_scheduled_body(mock_account_ids):
     """Test building a scheduled transaction body for token dissociate transaction."""
     account_id, _, _, token_id_1, token_id_2 = mock_account_ids