Port get_transaction_count

Author: Quexington

chia/_tests/wallet/rpc/test_wallet_rpc.py

@@ -123,6 +123,7 @@
     GetSyncStatusResponse,
     GetTimestampForHeight,
     GetTransaction,
+    GetTransactionCount,
     GetTransactions,
     GetWalletBalance,
     GetWalletBalances,
@@ -1096,14 +1097,16 @@ async def test_get_transaction_count(wallet_rpc_environment: WalletRpcTestEnviro
 
     all_transactions = (await client.get_transactions(GetTransactions(uint32(1)))).transactions
     assert len(all_transactions) > 0
-    transaction_count = await client.get_transaction_count(1)
-    assert transaction_count == len(all_transactions)
-    transaction_count = await client.get_transaction_count(1, confirmed=False)
-    assert transaction_count == 0
-    transaction_count = await client.get_transaction_count(
-        1, type_filter=TransactionTypeFilter.include([TransactionType.INCOMING_CLAWBACK_SEND])
-    )
-    assert transaction_count == 0
+    transaction_count_response = await client.get_transaction_count(GetTransactionCount(uint32(1)))
+    assert transaction_count_response.count == len(all_transactions)
+    transaction_count_response = await client.get_transaction_count(GetTransactionCount(uint32(1), confirmed=False))
+    assert transaction_count_response.count == 0
+    transaction_count_response = await client.get_transaction_count(
+        GetTransactionCount(
+            uint32(1), type_filter=TransactionTypeFilter.include([TransactionType.INCOMING_CLAWBACK_SEND])
+        )
+    )
+    assert transaction_count_response.count == 0
 
 
 @pytest.mark.parametrize(

chia/wallet/wallet_request_types.py

@@ -397,6 +397,21 @@ def from_json_dict(cls, json_dict: dict[str, Any]) -> GetTransactionMemoResponse
         )
 
 
+@streamable
+@dataclass(frozen=True)
+class GetTransactionCount(Streamable):
+    wallet_id: uint32
+    confirmed: Optional[bool] = None
+    type_filter: Optional[TransactionTypeFilter] = None
+
+
+@streamable
+@dataclass(frozen=True)
+class GetTransactionCountResponse(Streamable):
+    wallet_id: uint32
+    count: uint16
+
+
 @streamable
 @dataclass(frozen=True)
 class GetOffersCountResponse(Streamable):

chia/wallet/wallet_rpc_api.py

@@ -90,7 +90,7 @@
 from chia.wallet.util.compute_hints import compute_spend_hints_and_additions
 from chia.wallet.util.compute_memos import compute_memos
 from chia.wallet.util.curry_and_treehash import NIL_TREEHASH
-from chia.wallet.util.query_filter import FilterMode, HashFilter, TransactionTypeFilter
+from chia.wallet.util.query_filter import FilterMode, HashFilter
 from chia.wallet.util.transaction_type import CLAWBACK_INCOMING_TRANSACTION_TYPES, TransactionType
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig, TXConfigLoader
 from chia.wallet.util.wallet_sync_utils import fetch_coin_spend_for_coin_state
@@ -180,6 +180,8 @@
     GetTimestampForHeight,
     GetTimestampForHeightResponse,
     GetTransaction,
+    GetTransactionCount,
+    GetTransactionCountResponse,
     GetTransactionMemo,
     GetTransactionMemoResponse,
     GetTransactionResponse,
@@ -1538,18 +1540,15 @@ async def get_transactions(self, request: GetTransactions) -> GetTransactionsRes
             wallet_id=request.wallet_id,
         )
 
-    async def get_transaction_count(self, request: dict[str, Any]) -> EndpointResult:
-        wallet_id = int(request["wallet_id"])
-        type_filter = None
-        if "type_filter" in request:
-            type_filter = TransactionTypeFilter.from_json_dict(request["type_filter"])
+    @marshal
+    async def get_transaction_count(self, request: GetTransactionCount) -> GetTransactionCountResponse:
         count = await self.service.wallet_state_manager.tx_store.get_transaction_count_for_wallet(
-            wallet_id, confirmed=request.get("confirmed", None), type_filter=type_filter
+            request.wallet_id, confirmed=request.confirmed, type_filter=request.type_filter
+        )
+        return GetTransactionCountResponse(
+            request.wallet_id,
+            uint16(count),
         )
-        return {
-            "count": count,
-            "wallet_id": wallet_id,
-        }
 
     async def get_next_address(self, request: dict[str, Any]) -> EndpointResult:
         """

chia/wallet/wallet_rpc_client.py

@@ -17,7 +17,6 @@
 from chia.wallet.trading.offer import Offer
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.clvm_streamable import json_deserialize_with_clvm_streamable
-from chia.wallet.util.query_filter import TransactionTypeFilter
 from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig
 from chia.wallet.wallet_coin_store import GetCoinRecords
 from chia.wallet.wallet_request_types import (
@@ -98,6 +97,8 @@
     GetTimestampForHeight,
     GetTimestampForHeightResponse,
     GetTransaction,
+    GetTransactionCount,
+    GetTransactionCountResponse,
     GetTransactionMemo,
     GetTransactionMemoResponse,
     GetTransactionResponse,
@@ -275,17 +276,10 @@ async def get_transaction(self, request: GetTransaction) -> GetTransactionRespon
     async def get_transactions(self, request: GetTransactions) -> GetTransactionsResponse:
         return GetTransactionsResponse.from_json_dict(await self.fetch("get_transactions", request.to_json_dict()))
 
-    async def get_transaction_count(
-        self, wallet_id: int, confirmed: Optional[bool] = None, type_filter: Optional[TransactionTypeFilter] = None
-    ) -> int:
-        request: dict[str, Any] = {"wallet_id": wallet_id}
-        if type_filter is not None:
-            request["type_filter"] = type_filter.to_json_dict()
-        if confirmed is not None:
-            request["confirmed"] = confirmed
-        res = await self.fetch("get_transaction_count", request)
-        # TODO: casting due to lack of type checked deserialization
-        return cast(int, res["count"])
+    async def get_transaction_count(self, request: GetTransactionCount) -> GetTransactionCountResponse:
+        return GetTransactionCountResponse.from_json_dict(
+            await self.fetch("get_transaction_count", request.to_json_dict())
+        )
 
     async def get_next_address(self, wallet_id: int, new_address: bool) -> str:
         request = {"wallet_id": wallet_id, "new_address": new_address}