Port get_current_derivation_index

Author: Quexington

chia/cmds/wallet_funcs.py

@@ -433,7 +433,7 @@ async def delete_unconfirmed_transactions(
 async def get_derivation_index(root_path: pathlib.Path, wallet_rpc_port: Optional[int], fp: Optional[int]) -> None:
     async with get_wallet_client(root_path, wallet_rpc_port, fp) as (wallet_client, _, _):
         res = await wallet_client.get_current_derivation_index()
-        print(f"Last derivation index: {res}")
+        print(f"Last derivation index: {res.index}")
 
 
 async def update_derivation_index(

chia/wallet/wallet_request_types.py

@@ -433,6 +433,12 @@ class DeleteUnconfirmedTransactions(Streamable):
     wallet_id: uint32
 
 
+@streamable
+@dataclass(frozen=True)
+class GetCurrentDerivationIndexResponse(Streamable):
+    index: Optional[uint32]
+
+
 @streamable
 @dataclass(frozen=True)
 class GetOffersCountResponse(Streamable):

chia/wallet/wallet_rpc_api.py

@@ -169,6 +169,7 @@
     GatherSigningInfo,
     GatherSigningInfoResponse,
     GenerateMnemonicResponse,
+    GetCurrentDerivationIndexResponse,
     GetHeightInfoResponse,
     GetLoggedInFingerprintResponse,
     GetNextAddress,
@@ -1870,12 +1871,13 @@ async def get_coin_records_by_names(self, request: dict[str, Any]) -> EndpointRe
 
         return {"coin_records": [cr.to_json_dict() for cr in coin_records]}
 
-    async def get_current_derivation_index(self, request: dict[str, Any]) -> dict[str, Any]:
+    @marshal
+    async def get_current_derivation_index(self, request: Empty) -> GetCurrentDerivationIndexResponse:
         assert self.service.wallet_state_manager is not None
 
         index: Optional[uint32] = await self.service.wallet_state_manager.puzzle_store.get_last_derivation_path()
 
-        return {"success": True, "index": index}
+        return GetCurrentDerivationIndexResponse(index)
 
     async def extend_derivation_index(self, request: dict[str, Any]) -> dict[str, Any]:
         assert self.service.wallet_state_manager is not None

chia/wallet/wallet_rpc_client.py

@@ -86,6 +86,7 @@
     GatherSigningInfoResponse,
     GenerateMnemonicResponse,
     GetCATListResponse,
+    GetCurrentDerivationIndexResponse,
     GetHeightInfoResponse,
     GetLoggedInFingerprintResponse,
     GetNextAddress,
@@ -369,10 +370,8 @@ async def spend_clawback_coins(
     async def delete_unconfirmed_transactions(self, request: DeleteUnconfirmedTransactions) -> None:
         await self.fetch("delete_unconfirmed_transactions", request.to_json_dict())
 
-    async def get_current_derivation_index(self) -> str:
-        response = await self.fetch("get_current_derivation_index", {})
-        index = response["index"]
-        return str(index)
+    async def get_current_derivation_index(self) -> GetCurrentDerivationIndexResponse:
+        return GetCurrentDerivationIndexResponse.from_json_dict(await self.fetch("get_current_derivation_index", {}))
 
     async def extend_derivation_index(self, index: int) -> str:
         response = await self.fetch("extend_derivation_index", {"index": index})