fix: align setup_client usage across token examples (hiero-ledger#1406)

Signed-off-by: Kushagra Kaushik <kushagra.k25239@nst.rishihood.edu.in>
Signed-off-by: kushagrakaushik <kushagra.k25239@nst.rishihood.edu.in>

Author: kushagrakaushik

CHANGELOG.md

@@ -1,4 +1,4 @@
-# Changelog
+# Changelog
 
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org).
@@ -186,6 +186,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Fixed `cron-check-broken-links.yml` string parsing issue in context input `dry_run` (#1235)
 - Flaky tests by disabling TLS in mock Hedera nodes in `mock_server.py`
 - Fixed LinkBot permission issue for fork PRs by changing trigger to pull_request_target and adding proper permissions.
+- Fixed token examples to consistently use setup_client without tuple unpacking.(#1397)
 - Fixed duplicate comment prevention in issue reminder bot by adding hidden HTML marker for reliable comment detection (.github/scripts/bot-issue-reminder-no-pr.sh) (#1372)
 - Fixed bot-pr-missing-linked-issue to skip commenting on pull requests created by automated bots. (#1382)
 - Updated `.github/scripts/bot-community-calls.sh` to skip posting reminders on issues created by bot accounts. (#1383)

examples/tokens/account_allowance_approve_transaction.py

@@ -5,12 +5,10 @@
 
 """
 
-import os
 import sys
 
-from dotenv import load_dotenv
 
-from hiero_sdk_python import AccountId, Client, Hbar, Network, PrivateKey, TransactionId
+from hiero_sdk_python import Client, Hbar, PrivateKey, TransactionId
 from hiero_sdk_python.account.account_allowance_approve_transaction import (
     AccountAllowanceApproveTransaction,
 )
@@ -24,22 +22,11 @@
 from hiero_sdk_python.tokens.token_type import TokenType
 from hiero_sdk_python.transaction.transfer_transaction import TransferTransaction
 
-load_dotenv()
-
-network_name = os.getenv("NETWORK", "testnet").lower()
-
 
 def setup_client():
-    """Initialize and set up the client with operator account"""
-    network = Network(network_name)
-    print(f"Connecting to Hedera {network_name} network!")
-    client = Client(network)
-
-    operator_id = AccountId.from_string(os.getenv("OPERATOR_ID", ""))
-    operator_key = PrivateKey.from_string(os.getenv("OPERATOR_KEY", ""))
-    client.set_operator(operator_id, operator_key)
+    client = Client.from_env()
+    print(f"Network: {client.network.network}")
     print(f"Client set up with operator id {client.operator_account_id}")
-
     return client
 
 

examples/tokens/custom_fee_fixed.py

@@ -4,15 +4,11 @@
 python examples/tokens/custom_fixed_fee.py
 """
 
-import os
 import sys
-from dotenv import load_dotenv
 
-from hiero_sdk_python.client.network import Network
 from hiero_sdk_python.crypto.private_key import PrivateKey
 from hiero_sdk_python.client.client import Client
 from hiero_sdk_python.query.token_info_query import TokenInfoQuery
-from hiero_sdk_python.account.account_id import AccountId
 from hiero_sdk_python.response_code import ResponseCode
 from hiero_sdk_python.tokens.supply_type import SupplyType
 from hiero_sdk_python.tokens.custom_fixed_fee import CustomFixedFee
@@ -21,43 +17,11 @@
 from hiero_sdk_python.tokens.token_type import TokenType
 
 
-load_dotenv()
-network_name = os.getenv("NETWORK", "testnet").lower()
-
-
 def setup_client():
-    """Initialize and set up the client with operator account"""
-    # Initialize network and client
-    network = Network(network_name)
-    print(f"Connecting to Hedera {network_name} network!")
-    client = Client(network)
-
-    # This disables the SSL error in the local development environment (Keep commented for production) #
-
-    # client.set_transport_security(False)
-    # client.set_verify_certificates(False)
-
-    try:
-        operator_id_str = os.getenv("OPERATOR_ID")
-        operator_key_str = os.getenv("OPERATOR_KEY")
-
-        if not operator_id_str or not operator_key_str:
-            raise ValueError(
-                "Environment variables OPERATOR_ID or OPERATOR_KEY are missing."
-            )
-
-        operator_id = AccountId.from_string(operator_id_str)
-        operator_key = PrivateKey.from_string(operator_key_str)
-
-        client.set_operator(operator_id, operator_key)
-        print(f"Client set up with operator id {client.operator_account_id}")
-        return client, operator_id, operator_key
-
-    except (TypeError, ValueError) as e:
-        print(f"Error: {e}")
-        print("Please check OPERATOR_ID and OPERATOR_KEY in your .env file.")
-        sys.exit(1)
-
+    client = Client.from_env()
+    print(f"Network: {client.network.network}")
+    print(f"Client set up with operator id {client.operator_account_id}")
+    return client
 
 def custom_fixed_fee_example():
     """
@@ -66,32 +30,32 @@ def custom_fixed_fee_example():
 
     """
 
-    client, operator_id, operator_key = setup_client()
+    client = setup_client()
 
     print("\n--- Creating Custom Fixed Fee ---")
 
     fixed_fee = CustomFixedFee(
         amount=Hbar(1).to_tinybars(),
-        fee_collector_account_id=operator_id,
+        fee_collector_account_id=client.operator_account_id,
         all_collectors_are_exempt=False,
     )
 
-    print(f"Fee Definition: Pay 1 HBAR to {operator_id}")
+    print(f"Fee Definition: Pay 1 HBAR to {client.operator_account_id}")
 
     print("\n--- Creating Token with Fee ---")
     transaction = (
         TokenCreateTransaction()
         .set_token_name("Fixed Fee Example Token")
         .set_token_symbol("FFET")
         .set_decimals(2)
-        .set_treasury_account_id(operator_id)
+        .set_treasury_account_id(client.operator_account_id)
         .set_token_type(TokenType.FUNGIBLE_COMMON)
         .set_supply_type(SupplyType.INFINITE)
         .set_initial_supply(1000)
-        .set_admin_key(operator_key)
+        .set_admin_key(client.operator_private_key)
         .set_custom_fees([fixed_fee])
         .freeze_with(client)
-        .sign(operator_key)
+        .sign(client.operator_private_key)
     )
 
     try:

examples/tokens/custom_fee_fractional.py

@@ -1,12 +1,10 @@
 """
 Run with:
-uv run examples/tokens/custom_fractional_fee.py
 python examples/tokens/custom_fractional_fee.py
+uv run examples/tokens/custom_fractional_fee.py
 """
 
-import os
 import sys
-from dotenv import load_dotenv
 
 from hiero_sdk_python.tokens.token_create_transaction import (
     TokenCreateTransaction,
@@ -15,65 +13,42 @@
 from hiero_sdk_python.tokens.custom_fractional_fee import CustomFractionalFee
 from hiero_sdk_python.tokens.fee_assessment_method import FeeAssessmentMethod
 from hiero_sdk_python.query.token_info_query import TokenInfoQuery
-from hiero_sdk_python.crypto.private_key import PrivateKey
 from hiero_sdk_python.account.account_id import AccountId
 from hiero_sdk_python.response_code import ResponseCode
-from hiero_sdk_python.client.network import Network
 from hiero_sdk_python.client.client import Client
 from hiero_sdk_python.tokens.token_type import TokenType
 from hiero_sdk_python.tokens.supply_type import SupplyType
 
 
-load_dotenv()
-
-
 def setup_client():
-    network_name = os.getenv("NETWORK", "testnet")
-
-    # Validate environment variables
-    if not os.getenv("OPERATOR_ID") or not os.getenv("OPERATOR_KEY"):
-        print("❌ Missing OPERATOR_ID or OPERATOR_KEY in .env file.")
-        sys.exit(1)
-
-    try:
-        network = Network(network_name)
-        print(f"Connecting to Hedera {network_name} network!")
-        client = Client(network)
-
-        operator_id = AccountId.from_string(os.getenv("OPERATOR_ID", ""))
-        operator_key = PrivateKey.from_string(os.getenv("OPERATOR_KEY", ""))
-        client.set_operator(operator_id, operator_key)
-        print(f"Client set up with operator id {client.operator_account_id}")
-
-    except Exception as e:
-        raise ConnectionError(f"Error initializing client: {e}") from e
-
-    print(f"✅ Connected to Hedera {network_name} network as operator: {operator_id}")
-    return client, operator_id, operator_key
+    client = Client.from_env()
+    print(f"Network: {client.network.network}")
+    print(f"Client set up with operator id {client.operator_account_id}")
+    return client
 
 
-def build_fractional_fee(operator_account: AccountId) -> CustomFractionalFee:
+def build_fractional_fee(operator_account_id: AccountId) -> CustomFractionalFee:
     """Creates a CustomFractionalFee instance."""
     return CustomFractionalFee(
         numerator=1,
         denominator=10,
         min_amount=1,
         max_amount=100,
         assessment_method=FeeAssessmentMethod.INCLUSIVE,
-        fee_collector_account_id=operator_account,
+        fee_collector_account_id=operator_account_id,
         all_collectors_are_exempt=True,
     )
 
 
-def create_token_with_fee_key(client, operator_id, fractional_fee: CustomFractionalFee):
+def create_token_with_fee_key(client, fractional_fee: CustomFractionalFee):
     """Create a fungible token with a fee_schedule_key."""
     print("Creating fungible token with fee_schedule_key...")
     fractional_fee = [fractional_fee]
 
     token_params = TokenParams(
         token_name="Fee Key Token",
         token_symbol="FKT",
-        treasury_account_id=operator_id,
+        treasury_account_id=client.operator_account_id,
         initial_supply=1000,
         decimals=2,
         token_type=TokenType.FUNGIBLE_COMMON,
@@ -112,10 +87,10 @@ def query_and_validate_fractional_fee(client: Client, token_id):
 
 
 def main():
-    client, operator_id, _ = setup_client()
+    client = setup_client()
     # Build fractional fee
-    fractional_fee = build_fractional_fee(operator_id)
-    token_id = create_token_with_fee_key(client, operator_id, fractional_fee)
+    fractional_fee = build_fractional_fee(client.operator_account_id)
+    token_id = create_token_with_fee_key(client, fractional_fee)
 
     # Query and validate fractional fee
     token_info = query_and_validate_fractional_fee(client, token_id)

examples/tokens/custom_royalty_fee.py

@@ -4,94 +4,66 @@
 python examples/tokens/custom_royalty_fee.py
 """
 
-import os
 import sys
-from dotenv import load_dotenv
 
-from hiero_sdk_python.client.network import Network
 from hiero_sdk_python.crypto.private_key import PrivateKey
 from hiero_sdk_python.client.client import Client
-from hiero_sdk_python.query.token_info_query import TokenInfoQuery
-from hiero_sdk_python.account.account_id import AccountId
 from hiero_sdk_python.response_code import ResponseCode
 from hiero_sdk_python.tokens.supply_type import SupplyType
+from hiero_sdk_python.query.token_info_query import TokenInfoQuery
 from hiero_sdk_python.tokens.custom_fixed_fee import CustomFixedFee
 from hiero_sdk_python.tokens.custom_royalty_fee import CustomRoyaltyFee
 from hiero_sdk_python.hbar import Hbar
 from hiero_sdk_python.tokens.token_create_transaction import TokenCreateTransaction
 from hiero_sdk_python.tokens.token_type import TokenType
 
-load_dotenv()
-
 
 def setup_client():
-    """Initialize and set up the client with operator account"""
-
-    try:
-        network_name = os.getenv("NETWORK", "testnet").lower()
-        network = Network(network_name)
-        print(f"Connecting to the Hedera {network_name} network")
-        client = Client(network)
-
-        operator_id_str = os.getenv("OPERATOR_ID")
-        operator_key_str = os.getenv("OPERATOR_KEY")
-
-        if not operator_id_str or not operator_key_str:
-            raise ValueError(
-                "Environment variables OPERATOR_ID or OPERATOR_KEY are missing."
-            )
-
-        operator_id = AccountId.from_string(operator_id_str)
-        operator_key = PrivateKey.from_string(operator_key_str)
-
-        client.set_operator(operator_id, operator_key)
-        print(f"Client set up with operator id {client.operator_account_id}")
-        return client, operator_id, operator_key
-
-    except (TypeError, ValueError) as e:
-        print(f"Error: {e}")
-        sys.exit(1)
+    client = Client.from_env()
+    print(f"Network: {client.network.network}")
+    print(f"Client set up with operator id {client.operator_account_id}")
+    return client
 
 
-def create_royalty_fee_object(operator_id):
+def create_royalty_fee_object(client):
     """Creates the CustomRoyaltyFee object with a fallback fee."""
     fallback_fee = CustomFixedFee(
         amount=Hbar(1).to_tinybars(),
-        fee_collector_account_id=operator_id,
+        fee_collector_account_id=client.operator_account_id,
         all_collectors_are_exempt=False,
     )
 
     royalty_fee = CustomRoyaltyFee(
         numerator=5,
         denominator=100,
         fallback_fee=fallback_fee,
-        fee_collector_account_id=operator_id,
+        fee_collector_account_id=client.operator_account_id,
         all_collectors_are_exempt=False,
     )
     print(f"Royalty Fee Configured: {royalty_fee.numerator}/{royalty_fee.denominator}")
     print(f"Fallback Fee: {Hbar.from_tinybars(fallback_fee.amount)} HBAR")
     return royalty_fee
 
 
-def create_token_with_fee(client, operator_id, operator_key, royalty_fee):
+def create_token_with_fee(client, royalty_fee):
     """Creates a token with the specified royalty fee attached."""
 
     print("\n--- Creating Token with Royalty Fee ---")
     transaction = (
         TokenCreateTransaction()
         .set_token_name("Royalty NFT Collection")
         .set_token_symbol("RNFT")
-        .set_treasury_account_id(operator_id)
-        .set_admin_key(operator_key)
-        .set_supply_key(operator_key)
+        .set_treasury_account_id(client.operator_account_id)
+        .set_admin_key(client.operator_private_key)
+        .set_supply_key(client.operator_private_key)
         .set_token_type(TokenType.NON_FUNGIBLE_UNIQUE)
         .set_decimals(0)
         .set_initial_supply(0)
         .set_supply_type(SupplyType.FINITE)
         .set_max_supply(100)
         .set_custom_fees([royalty_fee])
         .freeze_with(client)
-        .sign(operator_key)
+        .sign(client.operator_private_key)
     )
 
     receipt = transaction.execute(client)
@@ -124,14 +96,12 @@ def verify_token_fee(client, token_id):
 
 def main():
     """Main execution flow."""
-    client, operator_id, operator_key = setup_client()
+    client = setup_client()
 
     with client:
         try:
-            royalty_fee = create_royalty_fee_object(operator_id)
-            token_id = create_token_with_fee(
-                client, operator_id, operator_key, royalty_fee
-            )
+            royalty_fee = create_royalty_fee_object(client)
+            token_id = create_token_with_fee(client, royalty_fee)
             verify_token_fee(client, token_id)
         except Exception as e:
             print(f"Execution failed: {e}")