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

@@ -76,17 +76,14 @@ def _build_proto_body(self) -> token_grant_kyc_pb2.TokenGrantKycTransactionBody:
 
         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

@@ -77,17 +77,14 @@ def _build_proto_body(self) -> token_revoke_kyc_pb2.TokenRevokeKycTransactionBod
 
         Returns:
             TokenRevokeKycTransactionBody: 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 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

@@ -299,16 +299,19 @@ 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)
-
+def _apply_token_account_ids(transaction, params) -> 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 +328,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
 
 

tests/tck/token_kyc_handlers_test.py

@@ -35,21 +35,21 @@ def test_build_transaction_body(mock_account_ids):
     assert transaction_body.tokenGrantKyc.account == account_id._to_proto()
 
 
-def test_build_transaction_body_validation(mock_account_ids):
-    """Test validation when building transaction body."""
+def test_build_transaction_body_allows_missing_ids(mock_account_ids):
+    """Do not reject missing IDs locally; defer validation to the network per TCK."""
     account_id, _, _, token_id, _ = mock_account_ids
 
-    # Test missing token ID
+    # Missing token ID: build must succeed, with the token field left unset.
     grant_kyc_tx = TokenGrantKycTransaction(account_id=account_id)
+    body = grant_kyc_tx._build_proto_body()
+    assert not body.HasField("token")
+    assert body.account == account_id._to_proto()
 
-    with pytest.raises(ValueError, match="Missing token ID"):
-        grant_kyc_tx.build_transaction_body()
-
-    # Test missing account ID
+    # Missing account ID: build must succeed, with the account field left unset.
     grant_kyc_tx = TokenGrantKycTransaction(token_id=token_id)
-
-    with pytest.raises(ValueError, match="Missing account ID"):
-        grant_kyc_tx.build_transaction_body()
+    body = grant_kyc_tx._build_proto_body()
+    assert body.token == token_id._to_proto()
+    assert not body.HasField("account")
 
 
 def test_constructor_with_parameters(mock_account_ids):