fix(tokens): align TokenGrantKyc/RevokeKyc validation with TCK spec

Signed-off-by: iron-prog <dt915725@gmail.com>

Author: iron-prog

src/hiero_sdk_python/tokens/token_grant_kyc_transaction.py

@@ -74,19 +74,25 @@ def _build_proto_body(self) -> token_grant_kyc_pb2.TokenGrantKycTransactionBody:
         """
         Returns the protobuf body for the token grant KYC transaction.
 
+        A missing token_id/account_id is intentionally NOT validated here.
+        Per the TCK spec (see hiero-sdk-tck test-token-grant-kyc-transaction.ts,
+        "Token ID" #4 and "Account ID" #3), a request with a missing tokenId or
+        accountId must reach the network and receive a real precheck/receipt
+        rejection (INVALID_TOKEN_ID / INVALID_ACCOUNT_ID), not a local
+        validation error. An explicitly empty string ("") still fails earlier,
+        in TokenId.from_string()/AccountId.from_string(), which matches the
+        TCK spec's expectation of a local/internal error for that case.
+
         Returns:
             TokenGrantKycTransactionBody: The protobuf body for this transaction.
-
-        Raises:
-            ValueError: If the token ID or account ID is not set.
         """
-        if self.token_id is None:
-            raise ValueError("Missing token ID")
-
-        if self.account_id is None:
-            raise ValueError("Missing account ID")
+        kwargs = {}
+        if self.token_id is not None:
+            kwargs["token"] = self.token_id._to_proto()
+        if self.account_id is not None:
+            kwargs["account"] = self.account_id._to_proto()
 
-        return TokenGrantKycTransactionBody(token=self.token_id._to_proto(), account=self.account_id._to_proto())
+        return TokenGrantKycTransactionBody(**kwargs)
 
     def build_transaction_body(self) -> transaction_pb2.TransactionBody:
         """

src/hiero_sdk_python/tokens/token_revoke_kyc_transaction.py

@@ -73,21 +73,21 @@ def set_account_id(self, account_id: AccountId) -> TokenRevokeKycTransaction:
 
     def _build_proto_body(self) -> token_revoke_kyc_pb2.TokenRevokeKycTransactionBody:
         """
-        Returns the protobuf body for the token revoke KYC transaction.
+        Builds the protobuf body for this token revoke KYC transaction.
 
-        Returns:
-            TokenRevokeKycTransactionBody: The protobuf body for this transaction.
+        Missing token_id/account_id are intentionally omitted so validation is
+        performed by the network, in accordance with the TCK specification.
 
-        Raises:
-            ValueError: If the token ID or account ID is not set.
+        Returns:
+            TokenRevokeKycTransactionBody: The built protobuf body.
         """
-        if self.token_id is None:
-            raise ValueError("Missing token ID")
-
-        if self.account_id is None:
-            raise ValueError("Missing account ID")
+        kwargs = {}
+        if self.token_id is not None:
+            kwargs["token"] = self.token_id._to_proto()
+        if self.account_id is not None:
+            kwargs["account"] = self.account_id._to_proto()
 
-        return TokenRevokeKycTransactionBody(token=self.token_id._to_proto(), account=self.account_id._to_proto())
+        return TokenRevokeKycTransactionBody(**kwargs)
 
     def build_transaction_body(self) -> transaction_pb2.AtomicBatchTransactionBody:
         """

tck/handlers/token.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Protocol
+
 from hiero_sdk_python.account.account_id import AccountId
 from hiero_sdk_python.Duration import Duration
 from hiero_sdk_python.hbar import Hbar
@@ -32,6 +34,7 @@
 from hiero_sdk_python.tokens.token_pause_transaction import TokenPauseTransaction
 from hiero_sdk_python.tokens.token_revoke_kyc_transaction import TokenRevokeKycTransaction
 from hiero_sdk_python.tokens.token_type import TokenType
+from hiero_sdk_python.transaction.transaction import Transaction
 from hiero_sdk_python.transaction.transaction_receipt import TransactionReceipt
 from tck.handlers.registry import rpc_method
 from tck.param.custom_fee import CustomFeeParams, FixedFeeParams
@@ -299,16 +302,30 @@ def _build_delete_token_transaction(params: DeleteTokenParams) -> TokenDeleteTra
     return transaction
 
 
-def _build_freeze_token_transaction(params: FreezeTokenParams) -> TokenFreezeTransaction:
-    """Build a TokenFreezeTransaction from TCK params."""
-    transaction = TokenFreezeTransaction().set_grpc_deadline(DEFAULT_GRPC_TIMEOUT)
+class _HasTokenAndAccountId(Protocol):
+    """Structural type for TCK params that carry an optional tokenId/accountId.
+
+    Matches FreezeTokenParams, GrantTokenKycParams, RevokeTokenKycParams, and
+    any future status-only endpoint (e.g. unfreezeToken) with this same shape.
+    """
+
+    tokenId: str | None
+    accountId: str | None
+
 
+def _apply_token_account_ids(transaction: Transaction, params: _HasTokenAndAccountId) -> None:
+    """Apply tokenId/accountId from TCK params onto a transaction, if present."""
     if params.tokenId is not None:
         transaction.set_token_id(TokenId.from_string(params.tokenId))
 
     if params.accountId is not None:
         transaction.set_account_id(AccountId.from_string(params.accountId))
 
+
+def _build_freeze_token_transaction(params: FreezeTokenParams) -> TokenFreezeTransaction:
+    """Build a TokenFreezeTransaction from TCK params."""
+    transaction = TokenFreezeTransaction().set_grpc_deadline(DEFAULT_GRPC_TIMEOUT)
+    _apply_token_account_ids(transaction, params)
     return transaction
 
 
@@ -325,26 +342,14 @@ def _build_pause_token_transaction(params: PauseTokenParams) -> TokenPauseTransa
 def _build_grant_token_kyc_transaction(params: GrantTokenKycParams) -> TokenGrantKycTransaction:
     """Build a TokenGrantKycTransaction from TCK params."""
     transaction = TokenGrantKycTransaction().set_grpc_deadline(DEFAULT_GRPC_TIMEOUT)
-
-    if params.tokenId is not None:
-        transaction.set_token_id(TokenId.from_string(params.tokenId))
-
-    if params.accountId is not None:
-        transaction.set_account_id(AccountId.from_string(params.accountId))
-
+    _apply_token_account_ids(transaction, params)
     return transaction
 
 
 def _build_revoke_token_kyc_transaction(params: RevokeTokenKycParams) -> TokenRevokeKycTransaction:
     """Build a TokenRevokeKycTransaction from TCK params."""
     transaction = TokenRevokeKycTransaction().set_grpc_deadline(DEFAULT_GRPC_TIMEOUT)
-
-    if params.tokenId is not None:
-        transaction.set_token_id(TokenId.from_string(params.tokenId))
-
-    if params.accountId is not None:
-        transaction.set_account_id(AccountId.from_string(params.accountId))
-
+    _apply_token_account_ids(transaction, params)
     return transaction