Port cat_get_asset_id

Author: Quexington

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,
+    CATGetAssetID,
     CATGetName,
     CATSetName,
     CheckDeleteKey,
@@ -1205,7 +1206,7 @@ async def test_cat_endpoints(wallet_environments: WalletTestFramework, wallet_ty
         env_0.wallet_states[uint32(env_0.wallet_aliases["cat0"])].balance.to_json_dict().items()
         <= (await env_0.rpc_client.get_wallet_balance(GetWalletBalance(cat_0_id))).wallet_balance.to_json_dict().items()
     )
-    asset_id = await env_0.rpc_client.get_cat_asset_id(cat_0_id)
+    asset_id = (await env_0.rpc_client.get_cat_asset_id(CATGetAssetID(cat_0_id))).asset_id
     assert (
         await env_0.rpc_client.get_cat_name(CATGetName(cat_0_id))
     ).name == wallet_type.default_wallet_name_for_unknown_cat(asset_id.hex())

chia/wallet/wallet_request_types.py

@@ -635,6 +635,19 @@ class GetStrayCATsResponse(Streamable):
     stray_cats: list[StrayCAT]
 
 
+@streamable
+@dataclass(frozen=True)
+class CATGetAssetID(Streamable):
+    wallet_id: uint32
+
+
+@streamable
+@dataclass(frozen=True)
+class CATGetAssetIDResponse(Streamable):
+    wallet_id: uint32
+    asset_id: bytes32
+
+
 @streamable
 @dataclass(frozen=True)
 class DIDSetWalletName(Streamable):

chia/wallet/wallet_rpc_api.py

@@ -112,6 +112,8 @@
     ApplySignatures,
     ApplySignaturesResponse,
     BalanceResponse,
+    CATGetAssetID,
+    CATGetAssetIDResponse,
     CATGetName,
     CATGetNameResponse,
     CATSetName,
@@ -2215,11 +2217,11 @@ async def cat_spend(
             "transaction_id": None,  # tx_endpoint wrapper will take care of this
         }
 
-    async def cat_get_asset_id(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)
+    @marshal
+    async def cat_get_asset_id(self, request: CATGetAssetID) -> CATGetAssetIDResponse:
+        wallet = self.service.wallet_state_manager.get_wallet(id=request.wallet_id, required_type=CATWallet)
         asset_id: str = wallet.get_asset_id()
-        return {"asset_id": asset_id, "wallet_id": wallet_id}
+        return CATGetAssetIDResponse(asset_id=bytes32.from_hexstr(asset_id), wallet_id=request.wallet_id)
 
     async def cat_asset_id_to_name(self, request: dict[str, Any]) -> EndpointResult:
         wallet = await self.service.wallet_state_manager.get_wallet_for_asset_id(request["asset_id"])

chia/wallet/wallet_rpc_client.py

@@ -24,6 +24,8 @@
     ApplySignaturesResponse,
     CancelOfferResponse,
     CancelOffersResponse,
+    CATGetAssetID,
+    CATGetAssetIDResponse,
     CATGetName,
     CATGetNameResponse,
     CATSetName,
@@ -629,9 +631,8 @@ async def create_wallet_for_existing_cat(self, asset_id: bytes) -> dict[str, Any
         request = {"wallet_type": "cat_wallet", "asset_id": asset_id.hex(), "mode": "existing"}
         return await self.fetch("create_new_wallet", request)
 
-    async def get_cat_asset_id(self, wallet_id: int) -> bytes32:
-        request = {"wallet_id": wallet_id}
-        return bytes32.from_hexstr((await self.fetch("cat_get_asset_id", request))["asset_id"])
+    async def get_cat_asset_id(self, request: CATGetAssetID) -> CATGetAssetIDResponse:
+        return CATGetAssetIDResponse.from_json_dict(await self.fetch("cat_get_asset_id", request.to_json_dict()))
 
     async def get_stray_cats(self) -> GetStrayCATsResponse:
         return GetStrayCATsResponse.from_json_dict(await self.fetch("get_stray_cats", {}))