chia-blockchain 2.5.7rc4__py3-none-any.whl → 2.5.8rc1__py3-none-any.whl

chia/_tests/blockchain/test_build_chains.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import pytest
 from chia_rs import Coin, ConsensusConstants, FullBlock, additions_and_removals, get_flags_for_height_and_constants
 from chia_rs.sized_ints import uint64
@@ -102,8 +100,8 @@ def validate_chain(
     normalized_to_identity_icc_eos: bool = False,
     normalized_to_identity_cc_sp: bool = False,
     normalized_to_identity_cc_ip: bool = False,
-    block_list_input: Optional[list[FullBlock]] = None,
-    time_per_block: Optional[float] = None,
+    block_list_input: list[FullBlock] | None = None,
+    time_per_block: float | None = None,
     dummy_block_references: bool = False,
     include_transactions: bool = False,
 ) -> None:

chia/_tests/blockchain/test_get_block_generator.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
 
 import pytest
 from chia_rs.sized_bytes import bytes32
@@ -16,14 +15,14 @@ from chia.util.casts import int_to_bytes
 @dataclass(frozen=True)
 class BR:
     prev_header_hash: bytes32
-    transactions_generator: Optional[SerializedProgram]
+    transactions_generator: SerializedProgram | None
     transactions_generator_ref_list: list[uint32]
 
 
 @dataclass(frozen=True)
 class FB:
     prev_header_hash: bytes32
-    transactions_generator: Optional[SerializedProgram]
+    transactions_generator: SerializedProgram | None
     height: uint32
 
 

chia/_tests/clvm/coin_store.py

@@ -2,19 +2,16 @@ from __future__ import annotations
 
 from collections import defaultdict
 from collections.abc import Iterator
-from dataclasses import dataclass, replace
-from typing import Optional
+from dataclasses import dataclass
 
-from chia_rs import ConsensusConstants, SpendBundle
+from chia_rs import CoinRecord, ConsensusConstants, SpendBundle, check_time_locks
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
 from chia._tests.util.get_name_puzzle_conditions import get_name_puzzle_conditions
-from chia.consensus.check_time_locks import check_time_locks
 from chia.consensus.cost_calculator import NPCResult
 from chia.full_node.bundle_tools import simple_solution_generator
 from chia.types.blockchain_format.coin import Coin
-from chia.types.coin_record import CoinRecord
 from chia.util.errors import Err
 
 MAX_COST = 11000000000
@@ -115,7 +112,7 @@ class CoinStore:
         for spent_coin in removals:
             coin_name = spent_coin.name()
             coin_record = self._db[coin_name]
-            self._db[coin_name] = replace(coin_record, spent_block_index=now.height)
+            self._db[coin_name] = coin_record.replace(spent_block_index=now.height)
         return additions, spend_bundle.coin_spends
 
     def coins_for_puzzle_hash(self, puzzle_hash: bytes32) -> Iterator[Coin]:
@@ -145,5 +142,5 @@ class CoinStore:
         )
         self._ph_index[coin.puzzle_hash].append(name)
 
-    def coin_record(self, coin_id: bytes32) -> Optional[CoinRecord]:
+    def coin_record(self, coin_id: bytes32) -> CoinRecord | None:
         return self._db.get(coin_id)

chia/_tests/clvm/test_clvm_step.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any
 
-from clvm_tools_rs import start_clvm_program
+from chialisp import start_clvm_program
 
 factorial = (
     "ff02ffff01ff02ff02ffff04ff02ffff04ff05ff80808080ffff04ffff01ff02"
@@ -17,8 +17,8 @@ factorial_sym = {factorial_function_hash: "factorial"}
 def test_simple_program_run() -> None:
     p = start_clvm_program(factorial, "ff0580", factorial_sym)
 
-    last: Optional[Any] = None
-    location: Optional[Any] = None
+    last: Any | None = None
+    location: Any | None = None
 
     while not p.is_ended():
         step_result = p.step()

chia/_tests/clvm/test_puzzle_compression.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, SupportsBytes
+from typing import SupportsBytes
 
 import pytest
 from chia_rs import CoinSpend, G1Element, G2Element, SpendBundle

chia/_tests/clvm/test_puzzle_drivers.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Union
+from typing import Any
 
 import pytest
 
@@ -35,7 +35,7 @@ def test_puzzle_info() -> None:
     assert solver == Solver(capitalize_bytes)
     assert puzzle_info == PuzzleInfo(capitalize_bytes)
 
-    obj: Union[PuzzleInfo, Solver]
+    obj: PuzzleInfo | Solver
     for obj in (puzzle_info, solver):
         assert obj["string"] == "hello"
         assert obj["bytes"] == bytes.fromhex("cafef00d")

chia/_tests/clvm/test_singletons.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 import pytest
 from chia_rs import AugSchemeMPL, CoinSpend, G1Element, G2Element, PrivateKey, SpendBundle
 from chia_rs.sized_bytes import bytes32
@@ -54,9 +52,9 @@ async def make_and_spend_bundle(
     coin: Coin,
     delegated_puzzle: Program,
     coinsols: list[CoinSpend],
-    ex_error: Optional[Err] = None,
+    ex_error: Err | None = None,
     fail_msg: str = "",
-    cost_logger: Optional[CostLogger] = None,
+    cost_logger: CostLogger | None = None,
     cost_log_msg: str = "",
 ):
     signature: G2Element = sign_delegated_puz(delegated_puzzle, coin)

chia/_tests/clvm/test_spend_sim.py

@@ -73,8 +73,8 @@ async def test_all_endpoints():
         assert len(coin_records) == 2
         coin_records = await sim_client.get_coin_records_by_hint(non_existent_hint)
         assert len(coin_records) == 0
-        coin_records = await sim_client.get_coin_records_by_puzzle_hash(acs.get_tree_hash())
-        next_coin = coin_records[-1].coin
+        coin_records = await sim_client.get_coin_records_by_puzzle_hash(acs.get_tree_hash(), include_spent_coins=False)
+        next_coin = next(cr.coin for cr in coin_records if cr.coin.amount >= 2)
         height = sim.get_height()
         acs_hint_next_coin = make_spend(
             next_coin,

chia/_tests/cmds/cmd_test_utils.py

@@ -5,7 +5,7 @@ from collections.abc import AsyncIterator, Iterable
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 from chia_rs import BlockRecord, Coin, G1Element, G2Element
 from chia_rs.sized_bytes import bytes32
@@ -25,7 +25,7 @@ from chia.simulator.simulator_full_node_rpc_client import SimulatorFullNodeRpcCl
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
-from chia.wallet.conditions import ConditionValidTimes
+from chia.wallet.conditions import Condition, ConditionValidTimes
 from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.nft_wallet.nft_wallet import NFTWallet
 from chia.wallet.transaction_record import TransactionRecord
@@ -37,6 +37,9 @@ from chia.wallet.wallet_request_types import (
     CATAssetIDToNameResponse,
     CATGetName,
     CATGetNameResponse,
+    CreateNewWallet,
+    CreateNewWalletResponse,
+    CreateNewWalletType,
     GetSyncStatusResponse,
     GetTransaction,
     GetTransactionResponse,
@@ -46,7 +49,6 @@ from chia.wallet.wallet_request_types import (
     NFTCalculateRoyaltiesResponse,
     NFTGetInfo,
     NFTGetInfoResponse,
-    SendTransactionMultiResponse,
     SignMessageByAddress,
     SignMessageByAddressResponse,
     SignMessageByID,
@@ -59,15 +61,15 @@ from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 # Any functions that are the same for every command being tested should be below.
 # Functions that are specific to a command should be in the test file for that command.
 
-logType = dict[str, Optional[list[tuple[Any, ...]]]]
+logType = dict[str, list[tuple[Any, ...]] | None]
 
 
 @dataclass
 class TestRpcClient:
     client_type: type[RpcClient]
-    rpc_port: Optional[uint16] = None
-    root_path: Optional[Path] = None
-    config: Optional[dict[str, Any]] = None
+    rpc_port: uint16 | None = None
+    root_path: Path | None = None
+    config: dict[str, Any] | None = None
     create_called: bool = field(init=False, default=False)
     rpc_log: dict[str, list[tuple[Any, ...]]] = field(init=False, default_factory=dict)
 
@@ -235,42 +237,22 @@ class TestWalletRpcClient(TestRpcClient):
             )
         )
 
-    async def send_transaction_multi(
+    async def create_new_wallet(
         self,
-        wallet_id: int,
-        additions: list[dict[str, object]],
+        request: CreateNewWallet,
         tx_config: TXConfig,
-        coins: Optional[list[Coin]] = None,
-        fee: uint64 = uint64(0),
-        push: bool = True,
+        extra_conditions: tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
-    ) -> SendTransactionMultiResponse:
-        self.add_to_log("send_transaction_multi", (wallet_id, additions, tx_config, coins, fee, push, timelock_info))
-        name = bytes32([2] * 32)
-        return SendTransactionMultiResponse(
+    ) -> CreateNewWalletResponse:
+        self.add_to_log("create_new_wallet", (request, tx_config, extra_conditions, timelock_info))
+        return CreateNewWalletResponse(
             [STD_UTX],
             [STD_TX],
-            TransactionRecord(
-                confirmed_at_height=uint32(1),
-                created_at_time=uint64(1234),
-                to_puzzle_hash=bytes32([1] * 32),
-                to_address=encode_puzzle_hash(bytes32([1] * 32), "xch"),
-                amount=uint64(12345678),
-                fee_amount=uint64(1234567),
-                confirmed=False,
-                sent=uint32(0),
-                spend_bundle=WalletSpendBundle([], G2Element()),
-                additions=[Coin(bytes32([1] * 32), bytes32([2] * 32), uint64(12345678))],
-                removals=[Coin(bytes32([2] * 32), bytes32([4] * 32), uint64(12345678))],
-                wallet_id=uint32(1),
-                sent_to=[("aaaaa", uint8(1), None)],
-                trade_id=None,
-                type=uint32(TransactionType.OUTGOING_TX.value),
-                name=name,
-                memos={bytes32([3] * 32): [bytes([4] * 32)]},
-                valid_times=ConditionValidTimes(),
-            ),
-            name,
+            type=(
+                WalletType.NFT if request.wallet_type == CreateNewWalletType.NFT_WALLET else WalletType.DECENTRALIZED_ID
+            ).name,
+            wallet_id=uint32(4 if request.wallet_type == CreateNewWalletType.NFT_WALLET else 3),
+            my_did="did:chia:1qgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpq4msw0c",
         )
 
 
@@ -280,8 +262,8 @@ class TestFullNodeRpcClient(TestRpcClient):
 
     async def get_fee_estimate(
         self,
-        target_times: Optional[list[int]],
-        cost: Optional[int],
+        target_times: list[int] | None,
+        cost: int | None,
     ) -> dict[str, Any]:
         return {}
 
@@ -313,11 +295,11 @@ class TestFullNodeRpcClient(TestRpcClient):
         self.add_to_log("get_blockchain_state", ())
         return response
 
-    async def get_block_record_by_height(self, height: int) -> Optional[BlockRecord]:
+    async def get_block_record_by_height(self, height: int) -> BlockRecord | None:
         self.add_to_log("get_block_record_by_height", (height,))
         return cast(BlockRecord, create_test_block_record(height=uint32(height)))
 
-    async def get_block_record(self, header_hash: bytes32) -> Optional[BlockRecord]:
+    async def get_block_record(self, header_hash: bytes32) -> BlockRecord | None:
         self.add_to_log("get_block_record", (header_hash,))
         return cast(BlockRecord, create_test_block_record(header_hash=header_hash))
 
@@ -374,7 +356,7 @@ def create_service_and_wallet_client_generators(test_rpc_clients: TestRpcClients
     async def test_get_any_service_client(
         client_type: type[_T_RpcClient],
         root_path: Path,
-        rpc_port: Optional[int] = None,
+        rpc_port: int | None = None,
         consume_errors: bool = True,
         use_ssl: bool = True,
     ) -> AsyncIterator[tuple[_T_RpcClient, dict[str, Any]]]:
@@ -402,8 +384,8 @@ def create_service_and_wallet_client_generators(test_rpc_clients: TestRpcClients
     @asynccontextmanager
     async def test_get_wallet_client(
         root_path: Path = default_root,
-        wallet_rpc_port: Optional[int] = None,
-        fingerprint: Optional[int] = None,
+        wallet_rpc_port: int | None = None,
+        fingerprint: int | None = None,
     ) -> AsyncIterator[tuple[WalletRpcClient, int, dict[str, Any]]]:
         async with test_get_any_service_client(WalletRpcClient, root_path, wallet_rpc_port) as (wallet_client, config):
             wallet_client.fingerprint = fingerprint  # type: ignore

chia/_tests/cmds/test_cmd_framework.py

@@ -5,7 +5,7 @@ import textwrap
 from collections.abc import Sequence
 from dataclasses import asdict
 from decimal import Decimal
-from typing import Any, Optional
+from typing import Any
 
 import click
 import pytest
@@ -32,7 +32,7 @@ from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.tx_config import CoinSelectionConfig, TXConfig
 
 
-def check_click_parsing(cmd: ChiaCommand, *args: str, context: Optional[ChiaCliContext] = None) -> None:
+def check_click_parsing(cmd: ChiaCommand, *args: str, context: ChiaCliContext | None = None) -> None:
     @click.group()
     def _cmd() -> None:
         pass
@@ -232,7 +232,7 @@ def test_typing() -> None:
     # Test optional
     @chia_command(group=cmd, name="temp_cmd_optional", short_help="blah", help="n/a")
     class TempCMDOptional:
-        optional: Optional[int] = option("--optional", required=False)
+        optional: int | None = option("--optional", required=False)
 
         def run(self) -> None: ...
 
@@ -244,7 +244,7 @@ def test_typing() -> None:
 
         @chia_command(group=cmd, name="temp_cmd_optional_bad", short_help="blah", help="n/a")
         class TempCMDOptionalBad2:
-            optional: Optional[int] = option("--optional", required=True)
+            optional: int | None = option("--optional", required=True)
 
             def run(self) -> None: ...
 
@@ -252,13 +252,13 @@ def test_typing() -> None:
 
         @chia_command(group=cmd, name="temp_cmd_optional_bad", short_help="blah", help="n/a")
         class TempCMDOptionalBad3:
-            optional: Optional[int] = option("--optional", default="string", required=False)
+            optional: int | None = option("--optional", default="string", required=False)
 
             def run(self) -> None: ...
 
     @chia_command(group=cmd, name="temp_cmd_optional_fine", short_help="blah", help="n/a")
     class TempCMDOptionalBad4:
-        optional: Optional[int] = option("--optional", default=None, required=False)
+        optional: int | None = option("--optional", default=None, required=False)
 
         def run(self) -> None: ...
 

chia/_tests/cmds/test_daemon.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import sys
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from _pytest.capture import CaptureFixture
@@ -33,10 +33,10 @@ async def test_daemon(
 
     class DummyKeychain:
         @staticmethod
-        def get_cached_master_passphrase() -> Optional[str]:
+        def get_cached_master_passphrase() -> str | None:
             return None
 
-    def get_current_passphrase() -> Optional[str]:
+    def get_current_passphrase() -> str | None:
         return "a-passphrase"
 
     mocker.patch("chia.cmds.start_funcs.connect_to_daemon_and_validate", side_effect=connect_to_daemon_and_validate)

chia/_tests/cmds/test_show.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from chia_rs import FoliageTransactionBlock, FullBlock
 from chia_rs.sized_bytes import bytes32
@@ -16,7 +16,7 @@ from chia.types.blockchain_format.serialized_program import SerializedProgram
 
 @dataclass
 class ShowFullNodeRpcClient(TestFullNodeRpcClient):
-    async def get_fee_estimate(self, target_times: Optional[list[int]], cost: Optional[int]) -> dict[str, Any]:
+    async def get_fee_estimate(self, target_times: list[int] | None, cost: int | None) -> dict[str, Any]:
         self.add_to_log("get_fee_estimate", (target_times, cost))
         response: dict[str, Any] = {
             "current_fee_rate": 0,
@@ -38,7 +38,7 @@ class ShowFullNodeRpcClient(TestFullNodeRpcClient):
         }
         return response
 
-    async def get_block(self, header_hash: bytes32) -> Optional[FullBlock]:
+    async def get_block(self, header_hash: bytes32) -> FullBlock | None:
         # we return a block with the height matching the header hash
         self.add_to_log("get_block", (header_hash,))
         height = hash_to_height(header_hash)
@@ -106,7 +106,7 @@ def test_chia_show(capsys: object, get_test_cli_clients: tuple[TestRpcClients, P
         "Is a Transaction Block?True",
     ]
     run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
-    expected_calls: dict[str, Optional[list[tuple[Any, ...]]]] = {  # name of rpc: (args)
+    expected_calls: dict[str, list[tuple[Any, ...]] | None] = {  # name of rpc: (args)
         "get_blockchain_state": None,
         "get_block_record": [(height_hash(height),) for height in [11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 11, 10]],
         "get_block_record_by_height": [(10,)],

chia/_tests/cmds/test_tx_config_args.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 from pathlib import Path
-from typing import Optional
 
 import click
 from chia_rs.sized_bytes import bytes32
@@ -102,7 +101,7 @@ def test_tx_config_args() -> None:
             max_coin_amount: CliAmount,
             coins_to_exclude: Sequence[bytes32],
             amounts_to_exclude: Sequence[CliAmount],
-            reuse: Optional[bool],
+            reuse: bool | None,
         ) -> None:
             print(
                 CMDTXConfigLoader(

chia/_tests/cmds/testing_classes.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
 
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint32, uint64
@@ -17,10 +16,10 @@ class TestBlockRecord:
 
     header_hash: bytes32
     height: uint32
-    timestamp: Optional[uint64]
+    timestamp: uint64 | None
     prev_transaction_block_height: uint32
-    prev_transaction_block_hash: Optional[bytes32]
-    prev_hash: Optional[bytes32]
+    prev_transaction_block_hash: bytes32 | None
+    prev_hash: bytes32 | None
     weight: uint64 = uint64(10000)
     fees: uint64 = uint64(5000)
     farmer_puzzle_hash: bytes32 = bytes32([1] * 32)
@@ -43,7 +42,7 @@ def hash_to_height(int_bytes: bytes32) -> int:
 
 
 def create_test_block_record(
-    *, height: uint32 = uint32(11), timestamp: uint64 = uint64(10040), header_hash: Optional[bytes32] = None
+    *, height: uint32 = uint32(11), timestamp: uint64 = uint64(10040), header_hash: bytes32 | None = None
 ) -> TestBlockRecord:
     if header_hash is None:
         header_hash = height_hash(height)

chia/_tests/cmds/wallet/test_did.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional, Union
 
 import pytest
 from chia_rs import G2Element
@@ -10,7 +9,7 @@ from chia_rs.sized_ints import uint16, uint32, uint64
 
 from chia._tests.cmds.cmd_test_utils import TestRpcClients, TestWalletRpcClient, logType, run_cli_command_and_assert
 from chia._tests.cmds.wallet.test_consts import FINGERPRINT_ARG, STD_TX, STD_UTX, get_bytes32
-from chia.types.blockchain_format.program import NIL, Program
+from chia.types.blockchain_format.program import Program
 from chia.types.signing_mode import SigningMode
 from chia.util.bech32m import encode_puzzle_hash
 from chia.wallet.conditions import Condition, ConditionValidTimes, CreateCoinAnnouncement, CreatePuzzleAnnouncement
@@ -18,6 +17,8 @@ from chia.wallet.did_wallet.did_info import did_recovery_is_nil
 from chia.wallet.util.curry_and_treehash import NIL_TREEHASH
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig
 from chia.wallet.wallet_request_types import (
+    CreateNewWallet,
+    CreateNewWalletType,
     DIDFindLostDID,
     DIDFindLostDIDResponse,
     DIDGetDID,
@@ -30,6 +31,7 @@ from chia.wallet.wallet_request_types import (
     DIDSetWalletNameResponse,
     DIDTransferDID,
     DIDTransferDIDResponse,
+    DIDType,
     DIDUpdateMetadata,
     DIDUpdateMetadataResponse,
 )
@@ -42,7 +44,7 @@ test_condition_valid_times: ConditionValidTimes = ConditionValidTimes(min_time=u
     argnames=["program", "result"],
     argvalues=[
         (Program.to(NIL_TREEHASH), True),
-        (NIL, True),
+        (Program.NIL, True),
         (Program.to(bytes32([1] * 32)), False),
     ],
 )
@@ -55,27 +57,7 @@ def test_did_recovery_is_nil(program: Program, result: bool) -> None:
 def test_did_create(capsys: object, get_test_cli_clients: tuple[TestRpcClients, Path]) -> None:
     test_rpc_clients, root_dir = get_test_cli_clients
 
-    # set RPC Client
-    class DidCreateRpcClient(TestWalletRpcClient):
-        async def create_new_did_wallet(
-            self,
-            amount: int,
-            tx_config: TXConfig,
-            fee: int = 0,
-            name: Optional[str] = "DID Wallet",
-            backup_ids: Optional[list[str]] = None,
-            required_num: int = 0,
-            push: bool = True,
-            timelock_info: ConditionValidTimes = ConditionValidTimes(),
-        ) -> dict[str, Union[str, int]]:
-            if backup_ids is None:
-                backup_ids = []
-            self.add_to_log(
-                "create_new_did_wallet", (amount, tx_config, fee, name, backup_ids, required_num, push, timelock_info)
-            )
-            return {"wallet_id": 3, "my_did": "did:chia:testdid123456"}
-
-    inst_rpc_client = DidCreateRpcClient()
+    inst_rpc_client = TestWalletRpcClient()
     test_rpc_clients.wallet_rpc_client = inst_rpc_client
     command_args = [
         "wallet",
@@ -93,12 +75,27 @@ def test_did_create(capsys: object, get_test_cli_clients: tuple[TestRpcClients,
     # these are various things that should be in the output
     assert_list = [
         "Successfully created a DID wallet with name test and id 3 on key 123456",
-        "Successfully created a DID did:chia:testdid123456 in the newly created DID wallet",
+        (
+            "Successfully created a DID did:chia:1qgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpq4msw0c"
+            " in the newly created DID wallet"
+        ),
     ]
     run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
     expected_calls: logType = {
-        "create_new_did_wallet": [
-            (3, DEFAULT_TX_CONFIG, 100000000000, "test", [], 0, True, test_condition_valid_times)
+        "create_new_wallet": [
+            (
+                CreateNewWallet(
+                    wallet_type=CreateNewWalletType.DID_WALLET,
+                    did_type=DIDType.NEW,
+                    amount=uint64(3),
+                    wallet_name="test",
+                    fee=uint64(100_000_000_000),
+                    push=True,
+                ),
+                DEFAULT_TX_CONFIG,
+                tuple(),
+                test_condition_valid_times,
+            )
         ],
     }
     test_rpc_clients.wallet_rpc_client.check_log(expected_calls)

chia/_tests/cmds/wallet/test_nft.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, Optional
 
 from chia_rs import G2Element
 from chia_rs.sized_bytes import bytes32
@@ -15,6 +14,8 @@ from chia.wallet.conditions import Condition, ConditionValidTimes
 from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG, TXConfig
 from chia.wallet.wallet_request_types import (
+    CreateNewWallet,
+    CreateNewWalletType,
     NFTAddURI,
     NFTAddURIResponse,
     NFTGetNFTs,
@@ -38,21 +39,22 @@ test_condition_valid_times: ConditionValidTimes = ConditionValidTimes(min_time=u
 def test_nft_create(capsys: object, get_test_cli_clients: tuple[TestRpcClients, Path]) -> None:
     test_rpc_clients, root_dir = get_test_cli_clients
 
-    # set RPC Client
-    class NFTCreateRpcClient(TestWalletRpcClient):
-        async def create_new_nft_wallet(self, did_id: str, name: Optional[str] = None) -> dict[str, Any]:
-            self.add_to_log("create_new_nft_wallet", (did_id, name))
-            return {"wallet_id": 4}
-
-    inst_rpc_client = NFTCreateRpcClient()
-    did_id = encode_puzzle_hash(get_bytes32(2), "did:chia:")
+    inst_rpc_client = TestWalletRpcClient()
+    did_id = "did:chia:1qgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpq4msw0c"
     test_rpc_clients.wallet_rpc_client = inst_rpc_client
     command_args = ["wallet", "nft", "create", FINGERPRINT_ARG, "-ntest", "--did-id", did_id]
     # these are various things that should be in the output
     assert_list = [f"Successfully created an NFT wallet with id 4 on key {FINGERPRINT}"]
     run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
     expected_calls: logType = {
-        "create_new_nft_wallet": [(did_id, "test")],
+        "create_new_wallet": [
+            (
+                CreateNewWallet(wallet_type=CreateNewWalletType.NFT_WALLET, name="test", did_id=did_id, push=True),
+                DEFAULT_TX_CONFIG,
+                tuple(),
+                ConditionValidTimes(),
+            )
+        ],
     }
     test_rpc_clients.wallet_rpc_client.check_log(expected_calls)