Port cat_set_name

Author: Quexington

chia/_tests/cmds/wallet/test_wallet.py

@@ -43,6 +43,8 @@
 from chia.wallet.wallet_request_types import (
     BalanceResponse,
     CancelOfferResponse,
+    CATSetName,
+    CATSetNameResponse,
     CATSpendResponse,
     ClawbackPuzzleDecoratorOverride,
     CreateOfferForIDsResponse,
@@ -683,8 +685,9 @@ async def create_wallet_for_existing_cat(self, asset_id: bytes) -> dict[str, int
             self.add_to_log("create_wallet_for_existing_cat", (asset_id,))
             return {"wallet_id": 3}
 
-        async def set_cat_name(self, wallet_id: int, name: str) -> None:
-            self.add_to_log("set_cat_name", (wallet_id, name))
+        async def set_cat_name(self, request: CATSetName) -> CATSetNameResponse:
+            self.add_to_log("set_cat_name", (request.wallet_id, request.name))
+            return CATSetNameResponse(wallet_id=request.wallet_id)
 
     inst_rpc_client = AddTokenRpcClient()
     test_rpc_clients.wallet_rpc_client = inst_rpc_client

chia/_tests/wallet/rpc/test_wallet_rpc.py

@@ -104,6 +104,7 @@
 from chia.wallet.wallet_protocol import WalletProtocol
 from chia.wallet.wallet_request_types import (
     AddKey,
+    CATSetName,
     CheckDeleteKey,
     ClawbackPuzzleDecoratorOverride,
     CombineCoins,
@@ -1207,7 +1208,7 @@ async def test_cat_endpoints(wallet_environments: WalletTestFramework, wallet_ty
     assert (await env_0.rpc_client.get_cat_name(cat_0_id)) == wallet_type.default_wallet_name_for_unknown_cat(
         asset_id.hex()
     )
-    await env_0.rpc_client.set_cat_name(cat_0_id, "My cat")
+    await env_0.rpc_client.set_cat_name(CATSetName(cat_0_id, "My cat"))
     assert (await env_0.rpc_client.get_cat_name(cat_0_id)) == "My cat"
     result = await env_0.rpc_client.cat_asset_id_to_name(asset_id)
     assert result is not None

chia/cmds/wallet_funcs.py

@@ -45,6 +45,7 @@
 from chia.wallet.vc_wallet.vc_store import VCProofs
 from chia.wallet.wallet_coin_store import GetCoinRecords
 from chia.wallet.wallet_request_types import (
+    CATSetName,
     CATSpendResponse,
     ClawbackPuzzleDecoratorOverride,
     DeleteNotifications,
@@ -479,10 +480,10 @@ async def add_token(
         if wallet_id is None:
             response = await wallet_client.create_wallet_for_existing_cat(asset_id)
             wallet_id = response["wallet_id"]
-            await wallet_client.set_cat_name(wallet_id, token_name)
+            await wallet_client.set_cat_name(CATSetName(wallet_id, token_name))
             print(f"Successfully added {token_name} with wallet id {wallet_id} on key {fingerprint}")
         else:
-            await wallet_client.set_cat_name(wallet_id, token_name)
+            await wallet_client.set_cat_name(CATSetName(wallet_id, token_name))
             print(f"Successfully renamed {old_name} with wallet_id {wallet_id} on key {fingerprint} to {token_name}")
 
 

chia/wallet/wallet_request_types.py

@@ -594,6 +594,19 @@ class GetCATListResponse(Streamable):
     cat_list: list[DefaultCAT]
 
 
+@streamable
+@dataclass(frozen=True)
+class CATSetName(Streamable):
+    wallet_id: uint32
+    name: str
+
+
+@streamable
+@dataclass(frozen=True)
+class CATSetNameResponse(Streamable):
+    wallet_id: uint32
+
+
 @streamable
 @dataclass(frozen=True)
 class DIDSetWalletName(Streamable):

chia/wallet/wallet_rpc_api.py

@@ -112,6 +112,8 @@
     ApplySignatures,
     ApplySignaturesResponse,
     BalanceResponse,
+    CATSetName,
+    CATSetNameResponse,
     CheckDeleteKey,
     CheckDeleteKeyResponse,
     CombineCoins,
@@ -2098,11 +2100,11 @@ async def sign_message_by_id(self, request: SignMessageByID) -> SignMessageByIDR
     async def get_cat_list(self, request: Empty) -> GetCATListResponse:
         return GetCATListResponse([DefaultCAT.from_json_dict(default_cat) for default_cat in DEFAULT_CATS.values()])
 
-    async def cat_set_name(self, request: dict[str, Any]) -> EndpointResult:
-        wallet_id = uint32(request["wallet_id"])
-        wallet = self.service.wallet_state_manager.get_wallet(id=wallet_id, required_type=CATWallet)
-        await wallet.set_name(str(request["name"]))
-        return {"wallet_id": wallet_id}
+    @marshal
+    async def cat_set_name(self, request: CATSetName) -> CATSetNameResponse:
+        wallet = self.service.wallet_state_manager.get_wallet(id=request.wallet_id, required_type=CATWallet)
+        await wallet.set_name(request.name)
+        return CATSetNameResponse(wallet_id=request.wallet_id)
 
     async def cat_get_name(self, request: dict[str, Any]) -> EndpointResult:
         wallet_id = uint32(request["wallet_id"])

chia/wallet/wallet_rpc_client.py

@@ -24,6 +24,8 @@
     ApplySignaturesResponse,
     CancelOfferResponse,
     CancelOffersResponse,
+    CATSetName,
+    CATSetNameResponse,
     CATSpendResponse,
     CheckDeleteKey,
     CheckDeleteKeyResponse,
@@ -649,12 +651,8 @@ async def get_cat_name(self, wallet_id: int) -> str:
         # TODO: casting due to lack of type checked deserialization
         return cast(str, response["name"])
 
-    async def set_cat_name(self, wallet_id: int, name: str) -> None:
-        request: dict[str, Any] = {
-            "wallet_id": wallet_id,
-            "name": name,
-        }
-        await self.fetch("cat_set_name", request)
+    async def set_cat_name(self, request: CATSetName) -> CATSetNameResponse:
+        return CATSetNameResponse.from_json_dict(await self.fetch("cat_set_name", request.to_json_dict()))
 
     async def cat_spend(
         self,