Merge branch 'main' into phase2-final

Signed-off-by: Akshat8510 <akshat230405@gmail.com>

Author: Akshat8510

CHANGELOG.md

@@ -8,8 +8,10 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ### Added
 - 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.
 - Added a github template for good first issues
 - Added `.github/workflows/bot-assignment-check.yml` to limit non-maintainers to 2 concurrent issue assignments.
+- Added all missing fields to __str__() method and updated `test_tokem_info.py`
 - Add examples/tokens/token_create_transaction_pause_key.py example demonstrating token pause/unpause behavior and pause key usage (#833)
 - Added `docs/sdk_developers/training/transaction_lifecycle.md` to explain the typical lifecycle of executing a transaction using the Hedera Python SDK.
 - Add inactivity bot workflow to unassign stale issue assignees (#952)
@@ -20,6 +22,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ### Fixed
 - Fixed inactivity bot workflow not checking out repository before running (#964)
+- Fixed the topic_message_query integarion test
 
 ### Breaking Change
 

README.md

@@ -134,4 +134,4 @@ This project is licensed under the [Apache License 2.0](LICENSE).
 
 ---
 
-**Latest release:** Check [PyPI](https://pypi.org/project/hiero-sdk-python/) or [GitHub Releases](https://github.com/hiero-ledger/hiero-sdk-python/releases)
+**Latest release:** Check [PyPI](https://pypi.org/project/hiero-sdk-python/) or [GitHub Releases](https://github.com/hiero-ledger/hiero-sdk-python/releases)

examples/tokens/custom_fixed_fee.py

@@ -14,11 +14,9 @@ def custom_fixed_fee():
         fee_collector_account_id=AccountId(0, 0, 456),
         all_collectors_are_exempt=False,
     )
-    print("CustomFixedFee:")
-    print(f"Amount: {fixed_fee.amount}")
-    print(f"Denominating Token ID: {fixed_fee.denominating_token_id}")
-    print(f"Fee Collector Account ID: {fixed_fee.fee_collector_account_id}")
-    print(f"All Collectors Exempt: {fixed_fee.all_collectors_are_exempt}")
+    print("\n--- Custom Fixed Fee ---")
+    print(fixed_fee)
+
     # Convert to protobuf
     fixed_fee_proto = fixed_fee._to_proto()
 

src/hiero_sdk_python/tokens/custom_fixed_fee.py

@@ -61,6 +61,30 @@ def __init__(
         super().__init__(fee_collector_account_id, all_collectors_are_exempt)
         self.amount = amount
         self.denominating_token_id = denominating_token_id
+        
+    def __str__(self) -> str:
+        """Return a user-friendly string representation of the CustomFixedFee.
+
+        Displays all fields in insertion order with aligned formatting.
+        TokenId and AccountId objects are displayed in Hedera notation (e.g., 0.0.123).
+        """
+
+        fields = {
+            key.replace("_", " ").title(): value
+            for key, value in self.__dict__.items()
+        }
+
+        if not fields:
+            return f"{self.__class__.__name__}()"
+
+        max_len = max(len(name) for name in fields)
+
+        lines = [f"{self.__class__.__name__}:"]
+        for name, value in fields.items():  # preserves insertion order
+            lines.append(f"    {name:<{max_len}} = {value}")  # uses __str__()
+
+        return "\n".join(lines)
+
 
     def set_amount_in_tinybars(self, amount: int) -> "CustomFixedFee":
         """Sets the fee amount in tinybars.

src/hiero_sdk_python/tokens/token_info.py

@@ -240,8 +240,25 @@ def __str__(self) -> str:
             f"is_deleted={self.is_deleted}",
             f"memo={self.memo!r}",
             f"token_type={self.token_type}",
+            f"supply_type={self.supply_type}",
             f"max_supply={self.max_supply}",
             f"ledger_id={self.ledger_id!r}",
             f"metadata={self.metadata!r}",
+            f"custom_fees={self.custom_fees!r}",
+            f"admin_key={self.admin_key}",
+            f"kyc_key={self.kyc_key}",
+            f"freeze_key={self.freeze_key}",
+            f"wipe_key={self.wipe_key}",
+            f"supply_key={self.supply_key}",
+            f"metadata_key={self.metadata_key}",
+            f"fee_schedule_key={self.fee_schedule_key}",
+            f"pause_key={self.pause_key}",
+            f"default_freeze_status={self.default_freeze_status}",
+            f"default_kyc_status={self.default_kyc_status}",
+            f"pause_status={self.pause_status}",
+            f"auto_renew_account={self.auto_renew_account}",
+            f"auto_renew_period={self.auto_renew_period}",
+            f"expiry={self.expiry}",
         ]
+
         return f"TokenInfo({', '.join(parts)})"

tests/integration/topic_message_query_e2e_test.py

@@ -58,7 +58,9 @@ def create_topic(client):
 def test_topic_message_query_receives_messages(env):
     """Test that topic message query receives a message."""
     topic_id = create_topic(env.client)
-    
+
+    time.sleep(3)
+
     messages: List[str] = []
 
     def get_message(m: TopicMessage):
@@ -78,6 +80,8 @@ def on_error_handler(e):
         on_message=get_message,
         on_error=on_error_handler
     )
+    
+    time.sleep(3)
 
     message_receipt = (
         TopicMessageSubmitTransaction(
@@ -96,9 +100,9 @@ def on_error_handler(e):
     start = datetime.now()
 
     while len(messages) == 0:
-        if datetime.now() - start > timedelta(seconds=120):
+        if datetime.now() - start > timedelta(seconds=180):
             raise TimeoutError("TopicMessage was not received in time")
-        time.sleep(1)
+        time.sleep(5)
 
     assert messages[0] == "Hello, Python SDK!"
     handle.cancel()
@@ -113,6 +117,8 @@ def test_topic_message_query_limit(env):
     def on_message(m: TopicMessage):
         messages.append(m.contents.decode("utf-8"))
 
+    time.sleep(3)
+
     query = TopicMessageQuery(
         topic_id=topic_id,
         start_time=datetime.now(timezone.utc),
@@ -121,6 +127,7 @@ def on_message(m: TopicMessage):
 
     handle = query.subscribe(env.client, on_message=on_message)
 
+    time.sleep(3)
     # Submit 3 messages
     try:
         for i in range(3):
@@ -133,9 +140,9 @@ def on_message(m: TopicMessage):
         start = datetime.now()
 
         while len(messages) != 2:
-            if datetime.now() - start > timedelta(seconds=120):
+            if datetime.now() - start > timedelta(seconds=180):
                 raise TimeoutError("TopicMessage was not received in time")
-            time.sleep(1)
+            time.sleep(5)
 
         # Should stop at limit=2
         assert messages == ["msg0", "msg1"]
@@ -149,6 +156,7 @@ def test_topic_message_query_large_message_chunking(env):
     """Test that topic message query receives chunked message."""
     topic_id = create_topic(env.client)
     messages: List[str] = []
+    time.sleep(3)
 
     def get_message(m: TopicMessage):
         messages.append(m.contents.decode('utf-8'))
@@ -168,7 +176,9 @@ def on_error_handler(e):
         on_message=get_message,
         on_error=on_error_handler
     )
-    
+
+    time.sleep(3)
+
     message_receipt = (
         TopicMessageSubmitTransaction(
             topic_id=topic_id,
@@ -187,9 +197,9 @@ def on_error_handler(e):
     start = datetime.now()
 
     while len(messages) == 0:
-        if datetime.now() - start > timedelta(seconds=120):
+        if datetime.now() - start > timedelta(seconds=180):
             raise TimeoutError("TopicMessage was not received in time")
-        time.sleep(1)
+        time.sleep(5)
 
     assert messages[0] == BIG_CONTENT
     handle.cancel()

tests/unit/test_custom_fee.py

@@ -9,23 +9,60 @@
 
 pytestmark = pytest.mark.unit
 
-def test_custom_fixed_fee():
+def test_custom_fixed_fee_proto_round_trip():
+    """Ensure CustomFixedFee protobuf serialization and deserialization behave correctly."""
     fee = CustomFixedFee(
         amount=100,
         denominating_token_id=TokenId(0, 0, 123),
         fee_collector_account_id=AccountId(0, 0, 456),
         all_collectors_are_exempt=True,
     )
 
-    proto = fee._to_proto()  # Changed from _to_protobuf
-    new_fee = CustomFixedFee._from_proto(proto)  # Changed from CustomFee._from_protobuf
+    proto = fee._to_proto()
+    new_fee = CustomFixedFee._from_proto(proto)
 
     assert isinstance(new_fee, CustomFixedFee)
     assert new_fee.amount == 100
     assert new_fee.denominating_token_id == TokenId(0, 0, 123)
     assert new_fee.fee_collector_account_id == AccountId(0, 0, 456)
     assert new_fee.all_collectors_are_exempt is True
 
+def test_custom_fixed_fee_str():
+    """Test the string representation of CustomFixedFee."""
+    fee = CustomFixedFee(
+        amount=100,
+        denominating_token_id=TokenId(0, 0, 123),
+        fee_collector_account_id=AccountId(0, 0, 456),
+        all_collectors_are_exempt=False,
+    )
+
+    fee_str = fee.__str__()
+
+    # Basic checks
+    assert "CustomFixedFee" in fee_str
+    assert "Amount" in fee_str
+    assert "Denominating Token Id" in fee_str
+    assert "Fee Collector Account Id" in fee_str
+    assert "All Collectors Are Exempt" in fee_str
+
+    # Key-value extraction
+    kv = {}
+    for ln in fee_str.splitlines()[1:]:
+        if "=" in ln:
+            key, val = ln.split("=", 1)
+            kv[key.strip()] = val.strip()
+
+    expected = {
+        "Amount": "100",
+        "Denominating Token Id": "0.0.123",
+        "Fee Collector Account Id": "0.0.456",
+        "All Collectors Are Exempt": "False",
+    }
+
+    for key, val in expected.items():
+        assert kv[key] == val, f"{key} incorrect in string representation"
+
+
 def test_custom_fractional_fee_str():
     """Test the string representation of CustomFractionalFee."""
     fee = CustomFractionalFee(

tests/unit/test_token_info.py

@@ -186,7 +186,18 @@ def test_str_representation(token_info):
         f"symbol={token_info.symbol!r}, decimals={token_info.decimals}, "
         f"total_supply={token_info.total_supply}, treasury={token_info.treasury}, "
         f"is_deleted={token_info.is_deleted}, memo={token_info.memo!r}, "
-        f"token_type={token_info.token_type}, max_supply={token_info.max_supply}, "
-        f"ledger_id={token_info.ledger_id!r}, metadata={token_info.metadata!r})"
+        f"token_type={token_info.token_type}, supply_type={token_info.supply_type}, "
+        f"max_supply={token_info.max_supply}, ledger_id={token_info.ledger_id!r}, "
+        f"metadata={token_info.metadata!r}, custom_fees={token_info.custom_fees!r}, "
+        f"admin_key={token_info.admin_key}, kyc_key={token_info.kyc_key}, "
+        f"freeze_key={token_info.freeze_key}, wipe_key={token_info.wipe_key}, "
+        f"supply_key={token_info.supply_key}, metadata_key={token_info.metadata_key}, "
+        f"fee_schedule_key={token_info.fee_schedule_key}, pause_key={token_info.pause_key}, "
+        f"default_freeze_status={token_info.default_freeze_status}, "
+        f"default_kyc_status={token_info.default_kyc_status}, "
+        f"pause_status={token_info.pause_status}, "
+        f"auto_renew_account={token_info.auto_renew_account}, "
+        f"auto_renew_period={token_info.auto_renew_period}, "
+        f"expiry={token_info.expiry})"
     )
     assert str(token_info) == expected