chia-blockchain 2.5.4rc2__py3-none-any.whl → 2.5.5__py3-none-any.whl

chia/_tests/wallet/did_wallet/test_did.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import dataclasses
 import json
+from typing import Any, Optional, Union
 
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, G2Element
@@ -12,8 +13,7 @@ from chia._tests.conftest import ConsensusMode
 from chia._tests.environments.wallet import WalletStateTransition, WalletTestFramework
 from chia._tests.util.setup_nodes import OldSimulatorsAndWallets
 from chia._tests.util.time_out_assert import time_out_assert
-from chia.rpc.wallet_request_types import DIDGetCurrentCoinInfo, DIDGetRecoveryInfo
-from chia.rpc.wallet_rpc_api import WalletRpcApi
+from chia.consensus.condition_tools import conditions_dict_for_solution
 from chia.server.server import ChiaServer
 from chia.simulator.block_tools import BlockTools
 from chia.simulator.full_node_simulator import FullNodeSimulator
@@ -23,13 +23,23 @@ from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.peer_info import PeerInfo
 from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX
 from chia.util.bech32m import decode_puzzle_hash, encode_puzzle_hash
-from chia.util.condition_tools import conditions_dict_for_solution
 from chia.wallet.did_wallet.did_wallet import DIDWallet
-from chia.wallet.singleton import create_singleton_puzzle
+from chia.wallet.did_wallet.did_wallet_puzzles import (
+    DID_INNERPUZ_MOD,
+)
+from chia.wallet.singleton import (
+    SINGLETON_LAUNCHER_PUZZLE_HASH,
+    SINGLETON_TOP_LAYER_MOD_HASH,
+    create_singleton_puzzle,
+)
 from chia.wallet.util.address_type import AddressType
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_types import WalletType
+from chia.wallet.wallet import Wallet
+from chia.wallet.wallet_action_scope import WalletActionScope
 from chia.wallet.wallet_node import WalletNode
+from chia.wallet.wallet_request_types import DIDFindLostDID, DIDGetCurrentCoinInfo, DIDGetInfo, DIDGetRecoveryInfo
+from chia.wallet.wallet_rpc_api import WalletRpcApi
 from chia.wallet.wallet_spend_bundle import WalletSpendBundle
 
 
@@ -41,2185 +51,2297 @@ def get_parent_num(did_wallet: DIDWallet):
     return len(did_wallet.did_info.parent_info)
 
 
-class TestDIDWallet:
-    #  TODO: See Issue CHIA-1544
-    #  This test should be ported to WalletTestFramework once we can replace keys in the wallet node
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
-    )
-    @pytest.mark.anyio
-    async def test_creation_from_coin_spend(
-        self, self_hostname: str, two_nodes_two_wallets_with_same_keys: OldSimulatorsAndWallets, trusted: bool
-    ) -> None:
-        """
-        Verify that DIDWallet.create_new_did_wallet_from_coin_spend() is called after Singleton creation on
-        the blockchain, and that the wallet is created in the second wallet node.
-        """
-        full_nodes, wallets, _ = two_nodes_two_wallets_with_same_keys
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node_0, server_0 = wallets[0]
-        wallet_node_1, server_1 = wallets[1]
-
-        wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
-        wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
-
-        ph0 = await wallet_0.get_new_puzzlehash()
-        ph1 = await wallet_1.get_new_puzzlehash()
-
-        sk0 = await wallet_node_0.wallet_state_manager.get_private_key(ph0)
-        sk1 = await wallet_node_1.wallet_state_manager.get_private_key(ph1)
-        assert sk0 == sk1
-
-        if trusted:
-            wallet_node_0.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
-            wallet_node_1.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
+async def make_did_wallet(
+    wallet_state_manager: Any,
+    wallet: Wallet,
+    amount: uint64,
+    action_scope: WalletActionScope,
+    recovery_list: list[bytes32] = [],
+    metadata: dict[str, str] = {},
+    fee: uint64 = uint64(0),
+    use_alternate_recovery: bool = False,
+) -> DIDWallet:
+    def alt_create_innerpuz(
+        p2_puzzle_or_hash: Union[Program, bytes32],
+        recovery_list: list[bytes32],
+        num_of_backup_ids_needed: uint64,
+        launcher_id: bytes32,
+        metadata: Program = Program.to([]),
+        recovery_list_hash: Optional[Program] = None,
+    ) -> Program:
+        # override the default of NIL_TREEHASH with NIL to match other wallet implementations
+        nil_recovery = Program.to(None)
+        singleton_struct = Program.to((SINGLETON_TOP_LAYER_MOD_HASH, (launcher_id, SINGLETON_LAUNCHER_PUZZLE_HASH)))
+        return DID_INNERPUZ_MOD.curry(p2_puzzle_or_hash, nil_recovery, 0, singleton_struct, metadata)
+
+    if use_alternate_recovery:
+        with pytest.MonkeyPatch.context() as m:
+            m.setattr("chia.wallet.did_wallet.did_wallet_puzzles.create_innerpuz", alt_create_innerpuz)
+            did_wallet = await DIDWallet.create_new_did_wallet(
+                wallet_state_manager, wallet, uint64(101), action_scope, metadata=metadata, fee=fee
+            )
+    else:
+        did_wallet = await DIDWallet.create_new_did_wallet(
+            wallet_state_manager, wallet, amount, action_scope, backups_ids=recovery_list, metadata=metadata, fee=fee
+        )
 
-        else:
-            wallet_node_0.config["trusted_peers"] = {}
-            wallet_node_1.config["trusted_peers"] = {}
-        await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    return did_wallet
 
-        await full_node_api.farm_blocks_to_wallet(1, wallet_0)
-        await full_node_api.farm_blocks_to_wallet(1, wallet_1)
 
-        # Wallet1 sets up DIDWallet1 without any backup set
-        async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            did_wallet_0: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager, wallet_0, uint64(101), action_scope
-            )
+#  TODO: See Issue CHIA-1544
+#  This test should be ported to WalletTestFramework once we can replace keys in the wallet node
+@pytest.mark.parametrize(
+    "trusted",
+    [True, False],
+)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_creation_from_coin_spend(
+    self_hostname: str,
+    two_nodes_two_wallets_with_same_keys: OldSimulatorsAndWallets,
+    trusted: bool,
+    use_alternate_recovery: bool,
+) -> None:
+    """
+    Verify that DIDWallet.create_new_did_wallet_from_coin_spend() is called after Singleton creation on
+    the blockchain, and that the wallet is created in the second wallet node.
+    """
+    full_nodes, wallets, _ = two_nodes_two_wallets_with_same_keys
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node_0, server_0 = wallets[0]
+    wallet_node_1, server_1 = wallets[1]
+
+    wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
+    wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
+
+    async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph0 = await action_scope.get_puzzle_hash(wallet_0.wallet_state_manager)
+    async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph1 = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
+
+    sk0 = await wallet_node_0.wallet_state_manager.get_private_key(ph0)
+    sk1 = await wallet_node_1.wallet_state_manager.get_private_key(ph1)
+    assert sk0 == sk1
+
+    if trusted:
+        wallet_node_0.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
+        wallet_node_1.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
 
-        with pytest.raises(RuntimeError):
-            assert await did_wallet_0.get_coin() == set()
-        assert await did_wallet_0.get_info_for_recovery() is None
+    else:
+        wallet_node_0.config["trusted_peers"] = {}
+        wallet_node_1.config["trusted_peers"] = {}
+    await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+
+    await full_node_api.farm_blocks_to_wallet(1, wallet_0)
+    await full_node_api.farm_blocks_to_wallet(1, wallet_1)
+
+    # Wallet1 sets up DIDWallet1 without any backup set
+    async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        did_wallet_0: DIDWallet = await make_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
+        )
 
-        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1])
+    with pytest.raises(RuntimeError):
+        assert await did_wallet_0.get_coin() == set()
+    assert await did_wallet_0.get_info_for_recovery() is None
 
-        await time_out_assert(15, did_wallet_0.get_confirmed_balance, 101)
-        await time_out_assert(15, did_wallet_0.get_unconfirmed_balance, 101)
-        await time_out_assert(15, did_wallet_0.get_pending_change_balance, 0)
+    await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1])
 
-        await full_node_api.farm_blocks_to_wallet(1, wallet_0)
+    await time_out_assert(15, did_wallet_0.get_confirmed_balance, 101)
+    await time_out_assert(15, did_wallet_0.get_unconfirmed_balance, 101)
+    await time_out_assert(15, did_wallet_0.get_pending_change_balance, 0)
 
-        #######################
-        all_node_0_wallets = await wallet_node_0.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        all_node_1_wallets = await wallet_node_1.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        assert (
-            json.loads(all_node_0_wallets[1].data)["current_inner"]
-            == json.loads(all_node_1_wallets[1].data)["current_inner"]
-        )
+    await full_node_api.farm_blocks_to_wallet(1, wallet_0)
 
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize(
-        "wallet_environments",
-        [
-            {
-                "num_environments": 3,
-                "blocks_needed": [1, 1, 1],
-            }
-        ],
-        indirect=True,
+    #######################
+    all_node_0_wallets = await wallet_node_0.wallet_state_manager.user_store.get_all_wallet_info_entries()
+    all_node_1_wallets = await wallet_node_1.wallet_state_manager.user_store.get_all_wallet_info_entries()
+    assert (
+        json.loads(all_node_0_wallets[1].data)["current_inner"]
+        == json.loads(all_node_1_wallets[1].data)["current_inner"]
     )
-    @pytest.mark.anyio
-    @pytest.mark.limit_consensus_modes(reason="irrelevant")
-    async def test_creation_from_backup_file(self, wallet_environments: WalletTestFramework) -> None:
-        env_0 = wallet_environments.environments[0]
-        env_1 = wallet_environments.environments[1]
-        env_2 = wallet_environments.environments[2]
-
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-        env_1.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-        env_2.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
 
-        # Wallet1 sets up DIDWallet1 without any backup set
-        async with env_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_0: DIDWallet = await DIDWallet.create_new_did_wallet(
-                env_0.wallet_state_manager, env_0.xch_wallet, uint64(101), action_scope
-            )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "unconfirmed_wallet_balance": -101,
-                            "<=#spendable_balance": -101,
-                            "<=#max_send_amount": -101,
-                            ">=#pending_change": 1,
-                            "pending_coin_removal_count": 1,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
-                    },
-                    post_block_balance_updates={
-                        "xch": {
-                            "confirmed_wallet_balance": -101,
-                            ">=#spendable_balance": 1,
-                            ">=#max_send_amount": 1,
-                            "<=#pending_change": -1,
-                            "pending_coin_removal_count": -1,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
-                    },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-            ]
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize(
+    "wallet_environments",
+    [
+        {
+            "num_environments": 3,
+            "blocks_needed": [1, 1, 1],
+        }
+    ],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+@pytest.mark.limit_consensus_modes(reason="irrelevant")
+async def test_creation_from_backup_file(
+    wallet_environments: WalletTestFramework, use_alternate_recovery: bool
+) -> None:
+    env_0 = wallet_environments.environments[0]
+    env_1 = wallet_environments.environments[1]
+    env_2 = wallet_environments.environments[2]
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    env_1.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    env_2.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    # Wallet1 sets up DIDWallet1 without any backup set
+    async with env_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_0: DIDWallet = await make_did_wallet(
+            env_0.wallet_state_manager,
+            env_0.xch_wallet,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
         )
 
-        # Wallet1 sets up DIDWallet_1 with DIDWallet_0 as backup
-        backup_ids = [bytes32.from_hexstr(did_wallet_0.get_my_DID())]
-
-        async with env_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                env_1.wallet_state_manager, env_1.xch_wallet, uint64(201), action_scope, backup_ids
-            )
-
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "unconfirmed_wallet_balance": -201,
-                            "<=#spendable_balance": -201,
-                            "<=#max_send_amount": -201,
-                            ">=#pending_change": 1,
-                            "pending_coin_removal_count": 1,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 201,
-                            "pending_change": 201,
-                            "pending_coin_removal_count": 1,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "unconfirmed_wallet_balance": -101,
+                        "<=#spendable_balance": -101,
+                        "<=#max_send_amount": -101,
+                        ">=#pending_change": 1,
+                        "pending_coin_removal_count": 1,
+                    },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "confirmed_wallet_balance": -201,
-                            ">=#spendable_balance": 1,
-                            ">=#max_send_amount": 1,
-                            "<=#pending_change": -1,
-                            "pending_coin_removal_count": -1,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 201,
-                            "spendable_balance": 201,
-                            "max_send_amount": 201,
-                            "unspent_coin_count": 1,
-                            "pending_change": -201,
-                            "pending_coin_removal_count": -1,
-                        },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "confirmed_wallet_balance": -101,
+                        ">=#spendable_balance": 1,
+                        ">=#max_send_amount": 1,
+                        "<=#pending_change": -1,
+                        "pending_coin_removal_count": -1,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-            ]
-        )
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+        ]
+    )
 
-        backup_data = did_wallet_1.create_backup()
+    # Wallet1 sets up DIDWallet_1 with DIDWallet_0 as backup
+    backup_ids = [bytes32.from_hexstr(did_wallet_0.get_my_DID())]
 
-        # Wallet2 recovers DIDWallet2 to a new set of keys
-        await env_2.rpc_client.create_new_did_wallet(
-            uint64(1),
-            DEFAULT_TX_CONFIG,
-            type="recovery",
-            backup_data=backup_data,
+    async with env_1.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
+            env_1.wallet_state_manager, env_1.xch_wallet, uint64(201), action_scope, backup_ids
         )
-        did_wallet_2 = env_2.wallet_state_manager.get_wallet(id=uint32(2), required_type=DIDWallet)
-        recovery_info = await env_2.rpc_client.did_get_recovery_info(
-            DIDGetRecoveryInfo(uint32(env_2.wallet_aliases["did"]))
-        )
-        assert recovery_info.wallet_id == env_2.wallet_aliases["did"]
-        assert recovery_info.backup_dids == backup_ids
-        current_coin_info_response = await env_0.rpc_client.did_get_current_coin_info(
-            DIDGetCurrentCoinInfo(uint32(env_0.wallet_aliases["did"]))
-        )
-        # TODO: this check is kind of weak, we should research when this endpoint might actually be useful
-        assert current_coin_info_response.wallet_id == env_0.wallet_aliases["did"]
-        async with env_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            message_spend_bundle, attest_data = await did_wallet_0.create_attestment(
-                recovery_info.coin_name, recovery_info.newpuzhash, recovery_info.pubkey, action_scope
-            )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "spendable_balance": -101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                            "max_send_amount": -101,
-                        }
-                    },
-                    post_block_balance_updates={
-                        "did": {
-                            "spendable_balance": 101,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                            "max_send_amount": 101,
-                        }
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "unconfirmed_wallet_balance": -201,
+                        "<=#spendable_balance": -201,
+                        "<=#max_send_amount": -201,
+                        ">=#pending_change": 1,
+                        "pending_coin_removal_count": 1,
+                    },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 201,
+                        "pending_change": 201,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "init": True,
-                        }
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "confirmed_wallet_balance": -201,
+                        ">=#spendable_balance": 1,
+                        ">=#max_send_amount": 1,
+                        "<=#pending_change": -1,
+                        "pending_coin_removal_count": -1,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 201,
+                        "spendable_balance": 201,
+                        "max_send_amount": 201,
+                        "unspent_coin_count": 1,
+                        "pending_change": -201,
+                        "pending_coin_removal_count": -1,
                     },
-                    post_block_balance_updates={},
-                ),
-            ]
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+        ]
+    )
+
+    backup_data = did_wallet_1.create_backup()
+
+    # Wallet2 recovers DIDWallet2 to a new set of keys
+    await env_2.rpc_client.create_new_did_wallet(
+        uint64(1),
+        DEFAULT_TX_CONFIG,
+        type="recovery",
+        backup_data=backup_data,
+    )
+    did_wallet_2 = env_2.wallet_state_manager.get_wallet(id=uint32(2), required_type=DIDWallet)
+    recovery_info = await env_2.rpc_client.did_get_recovery_info(
+        DIDGetRecoveryInfo(uint32(env_2.wallet_aliases["did"]))
+    )
+    assert recovery_info.wallet_id == env_2.wallet_aliases["did"]
+    assert recovery_info.backup_dids == backup_ids
+    current_coin_info_response = await env_0.rpc_client.did_get_current_coin_info(
+        DIDGetCurrentCoinInfo(uint32(env_0.wallet_aliases["did"]))
+    )
+    # TODO: this check is kind of weak, we should research when this endpoint might actually be useful
+    assert current_coin_info_response.wallet_id == env_0.wallet_aliases["did"]
+    async with env_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        assert recovery_info.pubkey is not None
+        assert recovery_info.newpuzhash is not None
+        message_spend_bundle, attest_data = await did_wallet_0.create_attestment(
+            recovery_info.coin_name, recovery_info.newpuzhash, recovery_info.pubkey, action_scope
         )
 
-        (
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "spendable_balance": -101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
+                        "max_send_amount": -101,
+                    }
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "spendable_balance": 101,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                        "max_send_amount": 101,
+                    }
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "init": True,
+                    }
+                },
+                post_block_balance_updates={},
+            ),
+        ]
+    )
+
+    (
+        test_info_list,
+        test_message_spend_bundle,
+    ) = await did_wallet_2.load_attest_files_for_recovery_spend([attest_data])
+    assert message_spend_bundle == test_message_spend_bundle
+
+    async with env_2.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        assert did_wallet_2.did_info.temp_coin is not None
+        await did_wallet_2.recovery_spend(
+            did_wallet_2.did_info.temp_coin,
+            recovery_info.newpuzhash,
             test_info_list,
+            recovery_info.pubkey,
             test_message_spend_bundle,
-        ) = await did_wallet_2.load_attest_files_for_recovery_spend([attest_data])
-        assert message_spend_bundle == test_message_spend_bundle
+            action_scope,
+        )
 
-        async with env_2.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            assert did_wallet_2.did_info.temp_coin is not None
-            await did_wallet_2.recovery_spend(
-                did_wallet_2.did_info.temp_coin,
-                recovery_info.newpuzhash,
-                test_info_list,
-                recovery_info.pubkey,
-                test_message_spend_bundle,
-                action_scope,
-            )
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={
+                    "did": {
+                        "confirmed_wallet_balance": -201,
+                        "unconfirmed_wallet_balance": -201,
+                        "spendable_balance": -201,
+                        "max_send_amount": -201,
+                        "unspent_coin_count": -1,
+                    }
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "unconfirmed_wallet_balance": 201,
+                        "pending_coin_removal_count": 2,
+                    }
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "confirmed_wallet_balance": 201,
+                        "spendable_balance": 201,
+                        "max_send_amount": 201,
+                        "unspent_coin_count": 1,
+                        "pending_coin_removal_count": -2,
+                    }
+                },
+            ),
+        ]
+    )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={
-                        "did": {
-                            "confirmed_wallet_balance": -201,
-                            "unconfirmed_wallet_balance": -201,
-                            "spendable_balance": -201,
-                            "max_send_amount": -201,
-                            "unspent_coin_count": -1,
-                        }
-                    },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "unconfirmed_wallet_balance": 201,
-                            "pending_coin_removal_count": 2,
-                        }
-                    },
-                    post_block_balance_updates={
-                        "did": {
-                            "confirmed_wallet_balance": 201,
-                            "spendable_balance": 201,
-                            "max_send_amount": 201,
-                            "unspent_coin_count": 1,
-                            "pending_coin_removal_count": -2,
-                        }
-                    },
-                ),
-            ]
-        )
+    for wallet in [did_wallet_0, did_wallet_1, did_wallet_2]:
+        assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
 
-        for wallet in [did_wallet_0, did_wallet_1, did_wallet_2]:
-            assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
+    some_ph = bytes32(32 * b"\2")
+    async with env_2.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        await did_wallet_2.create_exit_spend(some_ph, action_scope)
 
-        some_ph = bytes32(32 * b"\2")
-        async with env_2.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            await did_wallet_2.create_exit_spend(some_ph, action_scope)
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "unconfirmed_wallet_balance": -201,
+                        "spendable_balance": -201,
+                        "max_send_amount": -201,
+                        "pending_coin_removal_count": 1,
+                    }
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "confirmed_wallet_balance": -201,
+                        "unspent_coin_count": -1,
+                        "pending_coin_removal_count": -1,
+                    }
+                },
+            ),
+        ]
+    )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "unconfirmed_wallet_balance": -201,
-                            "spendable_balance": -201,
-                            "max_send_amount": -201,
-                            "pending_coin_removal_count": 1,
-                        }
-                    },
-                    post_block_balance_updates={
-                        "did": {
-                            "confirmed_wallet_balance": -201,
-                            "unspent_coin_count": -1,
-                            "pending_coin_removal_count": -1,
-                        }
-                    },
-                ),
-            ]
-        )
+    async def get_coins_with_ph() -> bool:
+        coins = await wallet_environments.full_node.full_node.coin_store.get_coin_records_by_puzzle_hash(True, some_ph)
+        return len(coins) == 1
 
-        async def get_coins_with_ph() -> bool:
-            coins = await wallet_environments.full_node.full_node.coin_store.get_coin_records_by_puzzle_hash(
-                True, some_ph
-            )
-            return len(coins) == 1
-
-        await time_out_assert(15, get_coins_with_ph, True)
-
-        for wallet in [did_wallet_0, did_wallet_1]:
-            assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_did_recovery_with_multiple_backup_dids(self, wallet_environments: WalletTestFramework):
-        env_0 = wallet_environments.environments[0]
-        env_1 = wallet_environments.environments[1]
-        wallet_node_0 = env_0.node
-        wallet_node_1 = env_1.node
-        wallet_0 = env_0.xch_wallet
-        wallet_1 = env_1.xch_wallet
-
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-        env_1.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
+    await time_out_assert(15, get_coins_with_ph, True)
 
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager, wallet_0, uint64(101), action_scope
-            )
-        assert did_wallet.get_name() == "Profile 1"
-        recovery_list = [bytes32.from_hexstr(did_wallet.get_my_DID())]
+    for wallet in [did_wallet_0, did_wallet_1]:
+        assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
 
-        async with wallet_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_2: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_1.wallet_state_manager, wallet_1, uint64(101), action_scope, recovery_list
-            )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_recovery_with_multiple_backup_dids(
+    wallet_environments: WalletTestFramework, use_alternate_recovery: bool
+) -> None:
+    env_0 = wallet_environments.environments[0]
+    env_1 = wallet_environments.environments[1]
+    wallet_node_0 = env_0.node
+    wallet_node_1 = env_1.node
+    wallet_0 = env_0.xch_wallet
+    wallet_1 = env_1.xch_wallet
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    env_1.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet: DIDWallet = await make_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
+        )
+    assert did_wallet.get_name() == "Profile 1"
+    recovery_list = [bytes32.from_hexstr(did_wallet.get_my_DID())]
+
+    async with wallet_1.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_2: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_1.wallet_state_manager, wallet_1, uint64(101), action_scope, recovery_list
+        )
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-            ]
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
+                    },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
+    assert did_wallet_2.did_info.backup_ids == recovery_list
+
+    recovery_list.append(bytes32.from_hexstr(did_wallet_2.get_my_DID()))
+
+    async with wallet_1.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_3: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_1.wallet_state_manager, wallet_1, uint64(201), action_scope, recovery_list
         )
-        assert did_wallet_2.did_info.backup_ids == recovery_list
 
-        recovery_list.append(bytes32.from_hexstr(did_wallet_2.get_my_DID()))
+    env_1.wallet_aliases["did_2"] = 3
 
-        async with wallet_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_3: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_1.wallet_state_manager, wallet_1, uint64(201), action_scope, recovery_list
-            )
-
-        env_1.wallet_aliases["did_2"] = 3
-
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={},
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "set_remainder": True,
-                        },
-                        "did_2": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 201,
-                            "pending_change": 201,
-                            "pending_coin_removal_count": 1,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={},
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "set_remainder": True,
-                        },
-                        "did_2": {
-                            "confirmed_wallet_balance": 201,
-                            "spendable_balance": 201,
-                            "max_send_amount": 201,
-                            "unspent_coin_count": 1,
-                            "pending_change": -201,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "set_remainder": True,
                     },
-                ),
-            ]
-        )
-        coin = await did_wallet_3.get_coin()
-
-        backup_data = did_wallet_3.create_backup()
+                    "did_2": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 201,
+                        "pending_change": 201,
+                        "pending_coin_removal_count": 1,
+                    },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "set_remainder": True,
+                    },
+                    "did_2": {
+                        "confirmed_wallet_balance": 201,
+                        "spendable_balance": 201,
+                        "max_send_amount": 201,
+                        "unspent_coin_count": 1,
+                        "pending_change": -201,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
+    coin = await did_wallet_3.get_coin()
 
-        async with wallet_node_0.wallet_state_manager.lock:
-            did_wallet_4 = await DIDWallet.create_new_did_wallet_from_recovery(
-                wallet_node_0.wallet_state_manager,
-                wallet_0,
-                backup_data,
-            )
-        assert did_wallet_4.get_name() == "Profile 2"
-        env_0.wallet_aliases["did_2"] = 3
+    backup_data = did_wallet_3.create_backup()
 
-        pubkey = (
-            await did_wallet_4.wallet_state_manager.get_unused_derivation_record(did_wallet_2.wallet_info.id)
-        ).pubkey
-        new_ph = did_wallet_4.did_info.temp_puzhash
-        async with did_wallet.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            message_spend_bundle, attest1 = await did_wallet.create_attestment(
-                coin.name(), new_ph, pubkey, action_scope
-            )
+    async with wallet_node_0.wallet_state_manager.lock:
+        did_wallet_4 = await DIDWallet.create_new_did_wallet_from_recovery(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            backup_data,
+        )
+    assert did_wallet_4.get_name() == "Profile 2"
+    env_0.wallet_aliases["did_2"] = 3
+
+    pubkey = (await did_wallet_4.wallet_state_manager.get_unused_derivation_record(did_wallet_2.wallet_info.id)).pubkey
+    new_ph = did_wallet_4.did_info.temp_puzhash
+    async with did_wallet.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        message_spend_bundle, attest1 = await did_wallet.create_attestment(coin.name(), new_ph, pubkey, action_scope)
+
+    async with did_wallet_2.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope_2:
+        message_spend_bundle2, attest2 = await did_wallet_2.create_attestment(
+            coin.name(), new_ph, pubkey, action_scope_2
+        )
 
-        async with did_wallet_2.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope_2:
-            message_spend_bundle2, attest2 = await did_wallet_2.create_attestment(
-                coin.name(), new_ph, pubkey, action_scope_2
-            )
+    message_spend_bundle = message_spend_bundle.aggregate([message_spend_bundle, message_spend_bundle2])
 
-        message_spend_bundle = message_spend_bundle.aggregate([message_spend_bundle, message_spend_bundle2])
+    (
+        test_info_list,
+        test_message_spend_bundle,
+    ) = await did_wallet_4.load_attest_files_for_recovery_spend([attest1, attest2])
+    assert message_spend_bundle == test_message_spend_bundle
 
-        (
-            test_info_list,
-            test_message_spend_bundle,
-        ) = await did_wallet_4.load_attest_files_for_recovery_spend([attest1, attest2])
-        assert message_spend_bundle == test_message_spend_bundle
-
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "spendable_balance": -101,
-                            "pending_change": 101,
-                            "max_send_amount": -101,
-                            "pending_coin_removal_count": 1,
-                            "set_remainder": True,
-                        },
-                        "did_2": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 0,
-                            "pending_change": 0,
-                            "pending_coin_removal_count": 0,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "spendable_balance": -101,
+                        "pending_change": 101,
+                        "max_send_amount": -101,
+                        "pending_coin_removal_count": 1,
+                        "set_remainder": True,
+                    },
+                    "did_2": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 0,
+                        "pending_change": 0,
+                        "pending_coin_removal_count": 0,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "spendable_balance": 101,
-                            "pending_change": -101,
-                            "max_send_amount": 101,
-                            "pending_coin_removal_count": -1,
-                        },
-                        "did_2": {
-                            "confirmed_wallet_balance": 0,
-                            "spendable_balance": 0,
-                            "max_send_amount": 0,
-                            "unspent_coin_count": 0,
-                            "pending_change": 0,
-                            "pending_coin_removal_count": 0,
-                        },
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "spendable_balance": 101,
+                        "pending_change": -101,
+                        "max_send_amount": 101,
+                        "pending_coin_removal_count": -1,
+                    },
+                    "did_2": {
+                        "confirmed_wallet_balance": 0,
+                        "spendable_balance": 0,
+                        "max_send_amount": 0,
+                        "unspent_coin_count": 0,
+                        "pending_change": 0,
+                        "pending_coin_removal_count": 0,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "spendable_balance": -101,
-                            "pending_change": 101,
-                            "max_send_amount": -101,
-                            "pending_coin_removal_count": 1,
-                            "set_remainder": True,
-                        },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "spendable_balance": -101,
+                        "pending_change": 101,
+                        "max_send_amount": -101,
+                        "pending_coin_removal_count": 1,
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "spendable_balance": 101,
-                            "pending_change": -101,
-                            "max_send_amount": 101,
-                            "pending_coin_removal_count": -1,
-                        },
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "spendable_balance": 101,
+                        "pending_change": -101,
+                        "max_send_amount": 101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-            ]
-        )
+                },
+            ),
+        ]
+    )
 
-        async with did_wallet_4.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            await did_wallet_4.recovery_spend(coin, new_ph, test_info_list, pubkey, message_spend_bundle, action_scope)
+    async with did_wallet_4.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        await did_wallet_4.recovery_spend(coin, new_ph, test_info_list, pubkey, message_spend_bundle, action_scope)
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_2": {
-                            "unconfirmed_wallet_balance": 201,
-                            "pending_change": 0,
-                            "pending_coin_removal_count": 3,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_2": {
+                        "unconfirmed_wallet_balance": 201,
+                        "pending_change": 0,
+                        "pending_coin_removal_count": 3,
                     },
-                    post_block_balance_updates={
-                        "did_2": {
-                            "confirmed_wallet_balance": 201,
-                            "spendable_balance": 201,
-                            "max_send_amount": 201,
-                            "unspent_coin_count": 1,
-                            "pending_change": 0,
-                            "pending_coin_removal_count": -3,
-                        },
+                },
+                post_block_balance_updates={
+                    "did_2": {
+                        "confirmed_wallet_balance": 201,
+                        "spendable_balance": 201,
+                        "max_send_amount": 201,
+                        "unspent_coin_count": 1,
+                        "pending_change": 0,
+                        "pending_coin_removal_count": -3,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_2": {
-                            "unconfirmed_wallet_balance": 0,  # TODO: fix pre-block balances for recovery
-                            "spendable_balance": 0,
-                            "pending_change": 0,
-                            "max_send_amount": 0,
-                            "pending_coin_removal_count": 0,
-                            "set_remainder": True,
-                        },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_2": {
+                        "unconfirmed_wallet_balance": 0,  # TODO: fix pre-block balances for recovery
+                        "spendable_balance": 0,
+                        "pending_change": 0,
+                        "max_send_amount": 0,
+                        "pending_coin_removal_count": 0,
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did_2": {
-                            "confirmed_wallet_balance": -201,
-                            "spendable_balance": -201,
-                            "max_send_amount": -201,
-                            "unspent_coin_count": -1,
-                            "set_remainder": True,
-                        },
+                },
+                post_block_balance_updates={
+                    "did_2": {
+                        "confirmed_wallet_balance": -201,
+                        "spendable_balance": -201,
+                        "max_send_amount": -201,
+                        "unspent_coin_count": -1,
+                        "set_remainder": True,
                     },
-                ),
-            ]
-        )
-
-        for wallet in [did_wallet, did_wallet_2, did_wallet_3, did_wallet_4]:
-            assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_did_recovery_with_empty_set(self, wallet_environments: WalletTestFramework):
-        env_0 = wallet_environments.environments[0]
-        wallet_node_0 = env_0.node
-        wallet_0 = env_0.xch_wallet
+                },
+            ),
+        ]
+    )
 
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
+    for wallet in [did_wallet, did_wallet_2, did_wallet_3, did_wallet_4]:
+        assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
 
-        ph = await wallet_0.get_new_puzzlehash()
 
-        async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager, wallet_0, uint64(101), action_scope
-            )
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_recovery_with_empty_set(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env_0 = wallet_environments.environments[0]
+    wallet_node_0 = env_0.node
+    wallet_0 = env_0.xch_wallet
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet_0.wallet_state_manager)
+
+    async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        did_wallet: DIDWallet = await make_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
+        )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-            ]
-        )
-        coin = await did_wallet.get_coin()
-        info: list[tuple[bytes, bytes, int]] = []
-        pubkey = (await did_wallet.wallet_state_manager.get_unused_derivation_record(did_wallet.wallet_info.id)).pubkey
-        with pytest.raises(Exception):  # We expect a CLVM 80 error for this test
-            async with did_wallet.wallet_state_manager.new_action_scope(
-                wallet_environments.tx_config, push=False
-            ) as action_scope:
-                await did_wallet.recovery_spend(
-                    coin,
-                    ph,
-                    info,
-                    pubkey,
-                    WalletSpendBundle([], AugSchemeMPL.aggregate([])),
-                    action_scope,
-                )
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_did_find_lost_did(self, wallet_environments: WalletTestFramework):
-        env_0 = wallet_environments.environments[0]
-        wallet_node_0 = env_0.node
-        wallet_0 = env_0.xch_wallet
-        api_0 = env_0.rpc_api
-
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
+    coin = await did_wallet.get_coin()
+    info: list[tuple[bytes, bytes, int]] = []
+    pubkey = (await did_wallet.wallet_state_manager.get_unused_derivation_record(did_wallet.wallet_info.id)).pubkey
+    with pytest.raises(Exception):  # We expect a CLVM 80 error for this test
+        async with did_wallet.wallet_state_manager.new_action_scope(
+            wallet_environments.tx_config, push=False
         ) as action_scope:
-            did_wallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager, wallet_0, uint64(101), action_scope
+            await did_wallet.recovery_spend(
+                coin,
+                ph,
+                info,
+                pubkey,
+                WalletSpendBundle([], AugSchemeMPL.aggregate([])),
+                action_scope,
             )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_find_lost_did(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env_0 = wallet_environments.environments[0]
+    wallet_node_0 = env_0.node
+    wallet_0 = env_0.xch_wallet
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_0 = await make_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
+        )
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-            ]
-        )
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
 
-        # Delete the coin and wallet
-        coin = await did_wallet.get_coin()
-        await wallet_node_0.wallet_state_manager.coin_store.delete_coin_record(coin.name())
-        await wallet_node_0.wallet_state_manager.delete_wallet(did_wallet.wallet_info.id)
-        wallet_node_0.wallet_state_manager.wallets.pop(did_wallet.wallet_info.id)
-        assert len(wallet_node_0.wallet_state_manager.wallets) == 1
-        # Find lost DID
-        assert did_wallet.did_info.origin_coin is not None  # mypy
-        resp = await api_0.did_find_lost_did({"coin_id": did_wallet.did_info.origin_coin.name().hex()})
-        assert resp["success"]
-        did_wallets = list(
-            filter(
-                lambda w: (w.type == WalletType.DECENTRALIZED_ID),
-                await wallet_node_0.wallet_state_manager.get_all_wallet_info_entries(),
-            )
+    # Delete the coin and wallet
+    coin = await did_wallet_0.get_coin()
+    await wallet_node_0.wallet_state_manager.coin_store.delete_coin_record(coin.name())
+    await wallet_node_0.wallet_state_manager.delete_wallet(did_wallet_0.wallet_info.id)
+    wallet_node_0.wallet_state_manager.wallets.pop(did_wallet_0.wallet_info.id)
+    assert len(wallet_node_0.wallet_state_manager.wallets) == 1
+    # Find lost DID
+    assert did_wallet_0.did_info.origin_coin is not None  # mypy
+    await env_0.rpc_client.find_lost_did(DIDFindLostDID(did_wallet_0.did_info.origin_coin.name().hex()))
+    did_wallets = list(
+        filter(
+            lambda w: (w.type == WalletType.DECENTRALIZED_ID),
+            await wallet_node_0.wallet_state_manager.get_all_wallet_info_entries(),
         )
-        did_wallet = wallet_node_0.wallet_state_manager.wallets[did_wallets[0].id]
-        env_0.wallet_aliases["did_found"] = did_wallets[0].id
-        await env_0.change_balances(
-            {
-                "did_found": {
-                    "init": True,
-                    "confirmed_wallet_balance": 101,
-                    "unconfirmed_wallet_balance": 101,
-                    "spendable_balance": 101,
-                    "max_send_amount": 101,
-                    "unspent_coin_count": 1,
-                }
+    )
+    did_wallet = wallet_node_0.wallet_state_manager.wallets[did_wallets[0].id]
+    assert isinstance(did_wallet, DIDWallet)
+    env_0.wallet_aliases["did_found"] = did_wallets[0].id
+    await env_0.change_balances(
+        {
+            "did_found": {
+                "init": True,
+                "confirmed_wallet_balance": 101,
+                "unconfirmed_wallet_balance": 101,
+                "spendable_balance": 101,
+                "max_send_amount": 101,
+                "unspent_coin_count": 1,
             }
-        )
-        await env_0.check_balances()
+        }
+    )
+    await env_0.check_balances()
 
-        # Spend DID
-        recovery_list = [bytes32.fromhex(did_wallet.get_my_DID())]
-        await did_wallet.update_recovery_list(recovery_list, uint64(1))
-        assert did_wallet.did_info.backup_ids == recovery_list
-        async with did_wallet.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            await did_wallet.create_update_spend(action_scope)
+    # Spend DID
+    recovery_list = [bytes32.fromhex(did_wallet.get_my_DID())]
+    await did_wallet.update_recovery_list(recovery_list, uint64(1))
+    assert did_wallet.did_info.backup_ids == recovery_list
+    async with did_wallet.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        await did_wallet.create_update_spend(action_scope)
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_found": {
-                            "spendable_balance": -101,
-                            "max_send_amount": -101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_found": {
+                        "spendable_balance": -101,
+                        "max_send_amount": -101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                    post_block_balance_updates={
-                        "did_found": {
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                },
+                post_block_balance_updates={
+                    "did_found": {
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-            ]
-        )
-
-        # Delete the coin and change inner puzzle
-        coin = await did_wallet.get_coin()
-        await wallet_node_0.wallet_state_manager.coin_store.delete_coin_record(coin.name())
-        new_inner_puzzle = await did_wallet.get_did_innerpuz(new=True)
-        did_wallet.did_info = dataclasses.replace(did_wallet.did_info, current_inner=new_inner_puzzle)
-        # Recovery the coin
-        assert did_wallet.did_info.origin_coin is not None  # mypy
-        resp = await api_0.did_find_lost_did({"coin_id": did_wallet.did_info.origin_coin.name().hex()})
-        assert resp["success"]
-        found_coin = await did_wallet.get_coin()
-        assert found_coin == coin
-        assert did_wallet.did_info.current_inner != new_inner_puzzle
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_did_attest_after_recovery(self, wallet_environments: WalletTestFramework):
-        env_0 = wallet_environments.environments[0]
-        env_1 = wallet_environments.environments[1]
-        wallet_node_0 = env_0.node
-        wallet_node_1 = env_1.node
-        wallet_0 = env_0.xch_wallet
-        wallet_1 = env_1.xch_wallet
-
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-        env_1.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
+                },
+            ),
+        ]
+    )
 
-        async with wallet_0.wallet_state_manager.new_action_scope(
+    # Delete the coin and change inner puzzle
+    coin = await did_wallet.get_coin()
+    await wallet_node_0.wallet_state_manager.coin_store.delete_coin_record(coin.name())
+    with wallet_environments.new_puzzle_hashes_allowed():
+        async with did_wallet.wallet_state_manager.new_action_scope(
             wallet_environments.tx_config, push=True
         ) as action_scope:
-            did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager, wallet_0, uint64(101), action_scope
-            )
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+            new_inner_puzzle = await did_wallet.get_did_innerpuz(action_scope, override_reuse_puzhash_with=False)
+    did_wallet.did_info = dataclasses.replace(did_wallet.did_info, current_inner=new_inner_puzzle)
+    # Recovery the coin
+    assert did_wallet.did_info.origin_coin is not None  # mypy
+    await env_0.rpc_client.find_lost_did(DIDFindLostDID(did_wallet.did_info.origin_coin.name().hex()))
+    found_coin = await did_wallet.get_coin()
+    assert found_coin == coin
+    assert did_wallet.did_info.current_inner != new_inner_puzzle
+
+
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_attest_after_recovery(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env_0 = wallet_environments.environments[0]
+    env_1 = wallet_environments.environments[1]
+    wallet_node_0 = env_0.node
+    wallet_node_1 = env_1.node
+    wallet_0 = env_0.xch_wallet
+    wallet_1 = env_1.xch_wallet
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    env_1.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet: DIDWallet = await make_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
+        )
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-                WalletStateTransition(),
-            ]
-        )
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+            WalletStateTransition(),
+        ]
+    )
 
-        await time_out_assert(15, did_wallet.get_confirmed_balance, 101)
-        await time_out_assert(15, did_wallet.get_unconfirmed_balance, 101)
-        recovery_list = [bytes32.from_hexstr(did_wallet.get_my_DID())]
+    await time_out_assert(15, did_wallet.get_confirmed_balance, 101)
+    await time_out_assert(15, did_wallet.get_unconfirmed_balance, 101)
+    recovery_list = [bytes32.from_hexstr(did_wallet.get_my_DID())]
 
-        async with wallet_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_2: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_1.wallet_state_manager, wallet_1, uint64(101), action_scope, recovery_list
-            )
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+    async with wallet_1.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_2: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_1.wallet_state_manager, wallet_1, uint64(101), action_scope, recovery_list
+        )
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-            ]
-        )
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
 
-        assert did_wallet_2.did_info.backup_ids == recovery_list
+    assert did_wallet_2.did_info.backup_ids == recovery_list
 
-        # Update coin with new ID info
-        recovery_list = [bytes32.from_hexstr(did_wallet_2.get_my_DID())]
-        await did_wallet.update_recovery_list(recovery_list, uint64(1))
-        assert did_wallet.did_info.backup_ids == recovery_list
-        async with did_wallet.wallet_state_manager.new_action_scope(
+    # Update coin with new ID info
+    recovery_list = [bytes32.from_hexstr(did_wallet_2.get_my_DID())]
+    await did_wallet.update_recovery_list(recovery_list, uint64(1))
+    assert did_wallet.did_info.backup_ids == recovery_list
+    async with did_wallet.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        await did_wallet.create_update_spend(action_scope)
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
+                    }
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
+                    }
+                },
+            ),
+            WalletStateTransition(),
+        ]
+    )
+
+    # DID Wallet 2 recovers into DID Wallet 3 with new innerpuz
+    backup_data = did_wallet_2.create_backup()
+
+    async with wallet_node_0.wallet_state_manager.lock:
+        did_wallet_3 = await DIDWallet.create_new_did_wallet_from_recovery(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            backup_data,
+        )
+    env_0.wallet_aliases["did_2"] = 3
+    with wallet_environments.new_puzzle_hashes_allowed():
+        async with did_wallet_3.wallet_state_manager.new_action_scope(
             wallet_environments.tx_config, push=True
         ) as action_scope:
-            await did_wallet.create_update_spend(action_scope)
-
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        }
+            new_ph = (
+                await did_wallet_3.get_did_innerpuz(action_scope, override_reuse_puzhash_with=False)
+            ).get_tree_hash()
+    coin = await did_wallet_2.get_coin()
+    pubkey = (await did_wallet_3.wallet_state_manager.get_unused_derivation_record(did_wallet_3.wallet_info.id)).pubkey
+
+    async with did_wallet.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        message_spend_bundle, attest_data = await did_wallet.create_attestment(
+            coin.name(), new_ph, pubkey, action_scope
+        )
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        }
+                    "did_2": {
+                        "init": True,
+                        "set_remainder": True,
                     },
-                ),
-                WalletStateTransition(),
-            ]
-        )
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
+                    },
+                    "did_2": {
+                        "set_remainder": True,
+                    },
+                },
+            ),
+            WalletStateTransition(),
+        ]
+    )
 
-        # DID Wallet 2 recovers into DID Wallet 3 with new innerpuz
-        backup_data = did_wallet_2.create_backup()
+    (
+        info,
+        message_spend_bundle,
+    ) = await did_wallet_3.load_attest_files_for_recovery_spend([attest_data])
+    async with did_wallet_3.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        await did_wallet_3.recovery_spend(coin, new_ph, info, pubkey, message_spend_bundle, action_scope)
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_2": {
+                        "unconfirmed_wallet_balance": 101,
+                        "set_remainder": True,
+                    },
+                },
+                post_block_balance_updates={
+                    "did_2": {
+                        "confirmed_wallet_balance": 101,
+                        "set_remainder": True,
+                    },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "unconfirmed_wallet_balance": 0,  # TODO: fix pre-block balances for recovery
+                        "set_remainder": True,
+                    },
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "confirmed_wallet_balance": -101,
+                        "set_remainder": True,
+                    },
+                },
+            ),
+        ]
+    )
 
-        async with wallet_node_0.wallet_state_manager.lock:
-            did_wallet_3 = await DIDWallet.create_new_did_wallet_from_recovery(
-                wallet_node_0.wallet_state_manager,
-                wallet_0,
-                backup_data,
-            )
-        env_0.wallet_aliases["did_2"] = 3
-        new_ph = await did_wallet_3.get_did_inner_hash(new=True)
-        coin = await did_wallet_2.get_coin()
-        pubkey = (
-            await did_wallet_3.wallet_state_manager.get_unused_derivation_record(did_wallet_3.wallet_info.id)
-        ).pubkey
+    # DID Wallet 1 recovery spends into DID Wallet 4
+    backup_data = did_wallet.create_backup()
 
-        async with did_wallet.wallet_state_manager.new_action_scope(
+    async with wallet_node_1.wallet_state_manager.lock:
+        did_wallet_4 = await DIDWallet.create_new_did_wallet_from_recovery(
+            wallet_node_1.wallet_state_manager,
+            wallet_1,
+            backup_data,
+        )
+    env_1.wallet_aliases["did_2"] = 3
+    coin = await did_wallet.get_coin()
+    with wallet_environments.new_puzzle_hashes_allowed():
+        async with did_wallet_4.wallet_state_manager.new_action_scope(
             wallet_environments.tx_config, push=True
         ) as action_scope:
-            message_spend_bundle, attest_data = await did_wallet.create_attestment(
-                coin.name(), new_ph, pubkey, action_scope
-            )
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        },
-                        "did_2": {
-                            "init": True,
-                            "set_remainder": True,
-                        },
+            new_ph = (
+                await did_wallet_4.get_did_innerpuz(action_scope, override_reuse_puzhash_with=False)
+            ).get_tree_hash()
+    pubkey = (await did_wallet_4.wallet_state_manager.get_unused_derivation_record(did_wallet_4.wallet_info.id)).pubkey
+    async with did_wallet_3.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        message_spend_bundle, attest1 = await did_wallet_3.create_attestment(coin.name(), new_ph, pubkey, action_scope)
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_2": {
+                        "unconfirmed_wallet_balance": 0,
+                        "set_remainder": True,
+                    },
+                },
+                post_block_balance_updates={
+                    "did_2": {
+                        "confirmed_wallet_balance": 0,
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        },
-                        "did_2": {
-                            "set_remainder": True,
-                        },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_2": {
+                        "init": True,
+                        "set_remainder": True,
                     },
-                ),
-                WalletStateTransition(),
-            ]
-        )
+                },
+                post_block_balance_updates={
+                    "did_2": {
+                        "confirmed_wallet_balance": 0,
+                        "set_remainder": True,
+                    },
+                },
+            ),
+        ]
+    )
 
-        (
-            info,
-            message_spend_bundle,
-        ) = await did_wallet_3.load_attest_files_for_recovery_spend([attest_data])
-        async with did_wallet_3.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            await did_wallet_3.recovery_spend(coin, new_ph, info, pubkey, message_spend_bundle, action_scope)
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_2": {
-                            "unconfirmed_wallet_balance": 101,
-                            "set_remainder": True,
-                        },
+    (
+        test_info_list,
+        test_message_spend_bundle,
+    ) = await did_wallet_4.load_attest_files_for_recovery_spend([attest1])
+    async with did_wallet_4.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        await did_wallet_4.recovery_spend(coin, new_ph, test_info_list, pubkey, test_message_spend_bundle, action_scope)
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did_2": {
-                            "confirmed_wallet_balance": 101,
-                            "set_remainder": True,
-                        },
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "confirmed_wallet_balance": -101,
+                        "set_remainder": True,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "unconfirmed_wallet_balance": 0,  # TODO: fix pre-block balances for recovery
-                            "set_remainder": True,
-                        },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did_2": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "confirmed_wallet_balance": -101,
-                            "set_remainder": True,
-                        },
+                },
+                post_block_balance_updates={
+                    "did_2": {
+                        "confirmed_wallet_balance": 101,
+                        "set_remainder": True,
                     },
-                ),
-            ]
-        )
+                },
+            ),
+        ]
+    )
 
-        # DID Wallet 1 recovery spends into DID Wallet 4
-        backup_data = did_wallet.create_backup()
+    for wallet in [did_wallet, did_wallet_3, did_wallet_4]:
+        assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
 
-        async with wallet_node_1.wallet_state_manager.lock:
-            did_wallet_4 = await DIDWallet.create_new_did_wallet_from_recovery(
-                wallet_node_1.wallet_state_manager,
-                wallet_1,
-                backup_data,
-            )
-        env_1.wallet_aliases["did_2"] = 3
-        coin = await did_wallet.get_coin()
-        new_ph = await did_wallet_4.get_did_inner_hash(new=True)
-        pubkey = (
-            await did_wallet_4.wallet_state_manager.get_unused_derivation_record(did_wallet_4.wallet_info.id)
-        ).pubkey
-        async with did_wallet_3.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            message_spend_bundle, attest1 = await did_wallet_3.create_attestment(
-                coin.name(), new_ph, pubkey, action_scope
-            )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_2": {
-                            "unconfirmed_wallet_balance": 0,
-                            "set_remainder": True,
-                        },
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
+@pytest.mark.parametrize(
+    "with_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_transfer(wallet_environments: WalletTestFramework, with_recovery: bool):
+    env_0 = wallet_environments.environments[0]
+    env_1 = wallet_environments.environments[1]
+    wallet_node_0 = env_0.node
+    wallet_node_1 = env_1.node
+    wallet_0 = env_0.xch_wallet
+    wallet_1 = env_1.xch_wallet
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    env_1.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet_0.wallet_state_manager)
+    fee = uint64(1000)
+
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            [ph],
+            uint64(1),
+            {"Twitter": "Test", "GitHub": "测试"},
+            fee=fee,
+        )
+    assert did_wallet_1.get_name() == "Profile 1"
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did_2": {
-                            "confirmed_wallet_balance": 0,
-                            "set_remainder": True,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_2": {
-                            "init": True,
-                            "set_remainder": True,
-                        },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did_2": {
-                            "confirmed_wallet_balance": 0,
-                            "set_remainder": True,
-                        },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-            ]
-        )
+                },
+            ),
+            WalletStateTransition(),
+        ]
+    )
 
-        (
-            test_info_list,
-            test_message_spend_bundle,
-        ) = await did_wallet_4.load_attest_files_for_recovery_spend([attest1])
-        async with did_wallet_4.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            await did_wallet_4.recovery_spend(
-                coin, new_ph, test_info_list, pubkey, test_message_spend_bundle, action_scope
-            )
+    # Transfer DID
+    async with wallet_1.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        new_puzhash = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
+    async with did_wallet_1.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        await did_wallet_1.transfer_did(new_puzhash, fee, with_recovery, action_scope)
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "confirmed_wallet_balance": -101,
-                            "set_remainder": True,
-                        },
+                    "did": {
+                        "unconfirmed_wallet_balance": -101,
+                        "set_remainder": True,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did_2": {
-                            "set_remainder": True,
-                        },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did_2": {
-                            "confirmed_wallet_balance": 101,
-                            "set_remainder": True,
-                        },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={},
+                post_block_balance_updates={
+                    "did": {
+                        "init": True,
+                        "confirmed_wallet_balance": 101,
+                        "set_remainder": True,
                     },
-                ),
-            ]
+                },
+            ),
+        ]
+    )
+
+    # Get the new DID wallet
+    did_wallets = list(
+        filter(
+            lambda w: (w.type == WalletType.DECENTRALIZED_ID),
+            await wallet_node_1.wallet_state_manager.get_all_wallet_info_entries(),
         )
+    )
+    did_wallet_2 = wallet_node_1.wallet_state_manager.wallets[did_wallets[0].id]
+    assert isinstance(did_wallet_2, DIDWallet)  # mypy
+    assert len(wallet_node_0.wallet_state_manager.wallets) == 1
+    assert did_wallet_1.did_info.origin_coin == did_wallet_2.did_info.origin_coin
+    if with_recovery:
+        assert did_wallet_1.did_info.backup_ids[0] == did_wallet_2.did_info.backup_ids[0]
+        assert did_wallet_1.did_info.num_of_backup_ids_needed == did_wallet_2.did_info.num_of_backup_ids_needed
+    metadata = json.loads(did_wallet_2.did_info.metadata)
+    assert metadata["Twitter"] == "Test"
+    assert metadata["GitHub"] == "测试"
+
+    # Test match_hinted_coin
+    assert await did_wallet_2.match_hinted_coin(
+        await did_wallet_2.get_coin(),
+        new_puzhash,
+    )
 
-        for wallet in [did_wallet, did_wallet_3, did_wallet_4]:
-            assert wallet.wallet_state_manager.wallets[wallet.id()] == wallet
 
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
-    @pytest.mark.parametrize(
-        "with_recovery",
-        [True, False],
-    )
-    @pytest.mark.anyio
-    async def test_did_transfer(self, wallet_environments: WalletTestFramework, with_recovery: bool):
-        env_0 = wallet_environments.environments[0]
-        env_1 = wallet_environments.environments[1]
-        wallet_node_0 = env_0.node
-        wallet_node_1 = env_1.node
-        wallet_0 = env_0.xch_wallet
-        wallet_1 = env_1.xch_wallet
-
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
+@pytest.mark.parametrize(
+    "trusted",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_auto_transfer_limit(
+    self_hostname: str,
+    two_wallet_nodes: tuple[list[FullNodeSimulator], list[tuple[WalletNode, ChiaServer]], BlockTools],
+    trusted: bool,
+) -> None:
+    fee = uint64(1000)
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    server_1 = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet_node_2, server_3 = wallets[1]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    wallet2 = wallet_node_2.wallet_state_manager.main_wallet
+    api_1 = WalletRpcApi(wallet_node_2)
+    async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet.wallet_state_manager)
+
+    if trusted:
+        wallet_node.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
         }
-        env_1.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
+        wallet_node_2.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
         }
-        ph = await wallet_0.get_new_puzzlehash()
-        fee = uint64(1000)
+    else:
+        wallet_node.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
 
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
+    await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
+    await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
+    await full_node_api.farm_blocks_to_wallet(1, wallet)
+
+    # Check that we cap out at 10 DID Wallets automatically created upon transfer received
+    for i in range(14):
+        async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
             did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager,
-                wallet_0,
+                wallet_node.wallet_state_manager,
+                wallet,
                 uint64(101),
                 action_scope,
-                [ph],
+                [bytes32(bytes(ph))],
                 uint64(1),
                 {"Twitter": "Test", "GitHub": "测试"},
                 fee=fee,
             )
         assert did_wallet_1.get_name() == "Profile 1"
-
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
-                    },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
-                    },
-                ),
-                WalletStateTransition(),
-            ]
-        )
-
+        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node, wallet_node_2])
+        await time_out_assert(15, did_wallet_1.get_confirmed_balance, 101)
+        await time_out_assert(15, did_wallet_1.get_unconfirmed_balance, 101)
         # Transfer DID
-        new_puzhash = await wallet_1.get_new_puzzlehash()
-        async with did_wallet_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            await did_wallet_1.transfer_did(new_puzhash, fee, with_recovery, action_scope)
+        assert did_wallet_1.did_info.origin_coin is not None
+        origin_coin = did_wallet_1.did_info.origin_coin
+        async with wallet2.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            new_puzhash = await action_scope.get_puzzle_hash(wallet2.wallet_state_manager)
+        async with did_wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+            await did_wallet_1.transfer_did(new_puzhash, fee, False, action_scope)
+        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node, wallet_node_2])
+        # Check if the DID wallet is created in the wallet2
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "unconfirmed_wallet_balance": -101,
-                            "set_remainder": True,
-                        },
-                    },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                    },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={},
-                    post_block_balance_updates={
-                        "did": {
-                            "init": True,
-                            "confirmed_wallet_balance": 101,
-                            "set_remainder": True,
-                        },
-                    },
-                ),
-            ]
+        await time_out_assert(
+            30, get_wallet_num, min(2 + i, 11), wallet_node_2.wallet_state_manager
+        )  # check we haven't made more than 10 DID wallets
+        await time_out_assert(30, get_wallet_num, 1, wallet_node.wallet_state_manager)
+    # Get the new DID wallets
+    did_wallets = list(
+        filter(
+            lambda w: (w.type == WalletType.DECENTRALIZED_ID),
+            await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
         )
+    )
 
-        # Get the new DID wallet
-        did_wallets = list(
-            filter(
-                lambda w: (w.type == WalletType.DECENTRALIZED_ID),
-                await wallet_node_1.wallet_state_manager.get_all_wallet_info_entries(),
-            )
+    assert len(did_wallets) == 10
+    # Test we can use the DID
+    did_wallet_10 = wallet_node_2.wallet_state_manager.get_wallet(id=uint32(did_wallets[9].id), required_type=DIDWallet)
+    # Delete the coin and change inner puzzle
+    coin = await did_wallet_10.get_coin()
+    # origin_coin = did_wallet_10.did_info.origin_coin
+    backup_data = did_wallet_10.create_backup()
+    await wallet_node_2.wallet_state_manager.coin_store.delete_coin_record(coin.name())
+    await time_out_assert(15, did_wallet_10.get_confirmed_balance, 0)
+    await wallet_node_2.wallet_state_manager.user_store.delete_wallet(did_wallet_10.wallet_info.id)
+    wallet_node_2.wallet_state_manager.wallets.pop(did_wallet_10.wallet_info.id)
+    # Recover the coin
+    async with wallet_node_2.wallet_state_manager.lock:
+        did_wallet_10 = await DIDWallet.create_new_did_wallet_from_recovery(
+            wallet_node_2.wallet_state_manager,
+            wallet2,
+            backup_data,
         )
-        did_wallet_2 = wallet_node_1.wallet_state_manager.wallets[did_wallets[0].id]
-        assert isinstance(did_wallet_2, DIDWallet)  # mypy
-        assert len(wallet_node_0.wallet_state_manager.wallets) == 1
-        assert did_wallet_1.did_info.origin_coin == did_wallet_2.did_info.origin_coin
-        if with_recovery:
-            assert did_wallet_1.did_info.backup_ids[0] == did_wallet_2.did_info.backup_ids[0]
-            assert did_wallet_1.did_info.num_of_backup_ids_needed == did_wallet_2.did_info.num_of_backup_ids_needed
-        metadata = json.loads(did_wallet_2.did_info.metadata)
-        assert metadata["Twitter"] == "Test"
-        assert metadata["GitHub"] == "测试"
-
-        # Test match_hinted_coin
-        assert await did_wallet_2.match_hinted_coin(
-            await did_wallet_2.get_coin(),
-            new_puzhash,
+    assert did_wallet_10.did_info.origin_coin is not None
+    await api_1.did_find_lost_did({"coin_id": did_wallet_10.did_info.origin_coin.name().hex()})
+    await time_out_assert(15, did_wallet_10.get_confirmed_balance, 101)
+    await time_out_assert(15, did_wallet_10.get_unconfirmed_balance, 101)
+
+    # Check we can recover an auto-discarded DID
+    did_wallet_9 = wallet_node_2.wallet_state_manager.get_wallet(id=uint32(did_wallets[8].id), required_type=DIDWallet)
+    # Delete the coin and wallet to make space for a auto-discarded DID
+    coin = await did_wallet_9.get_coin()
+    await wallet_node_2.wallet_state_manager.coin_store.delete_coin_record(coin.name())
+    await time_out_assert(15, did_wallet_9.get_confirmed_balance, 0)
+    await wallet_node_2.wallet_state_manager.user_store.delete_wallet(did_wallet_9.wallet_info.id)
+    wallet_node_2.wallet_state_manager.wallets.pop(did_wallet_9.wallet_info.id)
+
+    did_wallets = list(
+        filter(
+            lambda w: (w.type == WalletType.DECENTRALIZED_ID),
+            await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
         )
-
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
     )
-    @pytest.mark.anyio
-    async def test_did_auto_transfer_limit(
-        self,
-        self_hostname: str,
-        two_wallet_nodes: tuple[list[FullNodeSimulator], list[tuple[WalletNode, ChiaServer]], BlockTools],
-        trusted: bool,
-    ) -> None:
-        fee = uint64(1000)
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        server_1 = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet_node_2, server_3 = wallets[1]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        wallet2 = wallet_node_2.wallet_state_manager.main_wallet
-        api_1 = WalletRpcApi(wallet_node_2)
-        ph = await wallet.get_new_puzzlehash()
-
-        if trusted:
-            wallet_node.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
-            wallet_node_2.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
-        else:
-            wallet_node.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-
-        await server_2.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
-        await server_3.start_client(PeerInfo(self_hostname, server_1.get_port()), None)
-        await full_node_api.farm_blocks_to_wallet(1, wallet)
-
-        # Check that we cap out at 10 DID Wallets automatically created upon transfer received
-        for i in range(0, 14):
-            async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-                did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                    wallet_node.wallet_state_manager,
-                    wallet,
-                    uint64(101),
-                    action_scope,
-                    [bytes32(bytes(ph))],
-                    uint64(1),
-                    {"Twitter": "Test", "GitHub": "测试"},
-                    fee=fee,
-                )
-            assert did_wallet_1.get_name() == "Profile 1"
-            await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-            await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node, wallet_node_2])
-            await time_out_assert(15, did_wallet_1.get_confirmed_balance, 101)
-            await time_out_assert(15, did_wallet_1.get_unconfirmed_balance, 101)
-            # Transfer DID
-            assert did_wallet_1.did_info.origin_coin is not None
-            origin_coin = did_wallet_1.did_info.origin_coin
-            new_puzhash = await wallet2.get_new_puzzlehash()
-            async with did_wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-                await did_wallet_1.transfer_did(new_puzhash, fee, False, action_scope)
-            await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-            await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node, wallet_node_2])
-            # Check if the DID wallet is created in the wallet2
-
-            await time_out_assert(
-                30, get_wallet_num, min(2 + i, 11), wallet_node_2.wallet_state_manager
-            )  # check we haven't made more than 10 DID wallets
-            await time_out_assert(30, get_wallet_num, 1, wallet_node.wallet_state_manager)
-        # Get the new DID wallets
-        did_wallets = list(
-            filter(
-                lambda w: (w.type == WalletType.DECENTRALIZED_ID),
-                await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
-            )
+    assert len(did_wallets) == 9
+
+    # Try and find lost coin
+    await api_1.did_find_lost_did({"coin_id": origin_coin.name().hex()})
+    did_wallets = list(
+        filter(
+            lambda w: (w.type == WalletType.DECENTRALIZED_ID),
+            await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
         )
-
-        assert len(did_wallets) == 10
-        # Test we can use the DID
-        did_wallet_10 = wallet_node_2.wallet_state_manager.get_wallet(
-            id=uint32(did_wallets[9].id), required_type=DIDWallet
-        )
-        # Delete the coin and change inner puzzle
-        coin = await did_wallet_10.get_coin()
-        # origin_coin = did_wallet_10.did_info.origin_coin
-        backup_data = did_wallet_10.create_backup()
-        await wallet_node_2.wallet_state_manager.coin_store.delete_coin_record(coin.name())
-        await time_out_assert(15, did_wallet_10.get_confirmed_balance, 0)
-        await wallet_node_2.wallet_state_manager.user_store.delete_wallet(did_wallet_10.wallet_info.id)
-        wallet_node_2.wallet_state_manager.wallets.pop(did_wallet_10.wallet_info.id)
-        # Recover the coin
-        async with wallet_node_2.wallet_state_manager.lock:
-            did_wallet_10 = await DIDWallet.create_new_did_wallet_from_recovery(
-                wallet_node_2.wallet_state_manager,
-                wallet2,
-                backup_data,
-            )
-        assert did_wallet_10.did_info.origin_coin is not None
-        resp = await api_1.did_find_lost_did({"coin_id": did_wallet_10.did_info.origin_coin.name().hex()})
-        assert resp["success"]
-        await time_out_assert(15, did_wallet_10.get_confirmed_balance, 101)
-        await time_out_assert(15, did_wallet_10.get_unconfirmed_balance, 101)
-
-        # Check we can recover an auto-discarded DID
-        did_wallet_9 = wallet_node_2.wallet_state_manager.get_wallet(
-            id=uint32(did_wallets[8].id), required_type=DIDWallet
+    )
+    assert len(did_wallets) == 10
+
+    # Check we can still manually add new DIDs while at cap
+    await full_node_api.farm_blocks_to_wallet(1, wallet2)
+    async with wallet2.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet2.wallet_state_manager)
+        did_wallet_11: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_2.wallet_state_manager,
+            wallet2,
+            uint64(101),
+            action_scope,
+            [bytes32(bytes(ph))],
+            uint64(1),
+            {"Twitter": "Test", "GitHub": "测试"},
+            fee=fee,
         )
-        # Delete the coin and wallet to make space for a auto-discarded DID
-        coin = await did_wallet_9.get_coin()
-        await wallet_node_2.wallet_state_manager.coin_store.delete_coin_record(coin.name())
-        await time_out_assert(15, did_wallet_9.get_confirmed_balance, 0)
-        await wallet_node_2.wallet_state_manager.user_store.delete_wallet(did_wallet_9.wallet_info.id)
-        wallet_node_2.wallet_state_manager.wallets.pop(did_wallet_9.wallet_info.id)
-
-        did_wallets = list(
-            filter(
-                lambda w: (w.type == WalletType.DECENTRALIZED_ID),
-                await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
-            )
+    await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node, wallet_node_2])
+    await time_out_assert(15, did_wallet_11.get_confirmed_balance, 101)
+    await time_out_assert(15, did_wallet_11.get_unconfirmed_balance, 101)
+
+    did_wallets = list(
+        filter(
+            lambda w: (w.type == WalletType.DECENTRALIZED_ID),
+            await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
         )
-        assert len(did_wallets) == 9
-
-        # Try and find lost coin
-        resp = await api_1.did_find_lost_did({"coin_id": origin_coin.name().hex()})
-        did_wallets = list(
-            filter(
-                lambda w: (w.type == WalletType.DECENTRALIZED_ID),
-                await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
-            )
+    )
+    assert len(did_wallets) == 11
+
+
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_update_recovery_list(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env = wallet_environments.environments[0]
+    wallet_node = env.node
+    wallet = env.xch_wallet
+
+    env.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    async with wallet.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet.wallet_state_manager)
+        did_wallet_1: DIDWallet = await make_did_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            uint64(101),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
         )
-        assert len(did_wallets) == 10
 
-        # Check we can still manually add new DIDs while at cap
-        await full_node_api.farm_blocks_to_wallet(1, wallet2)
-        ph = await wallet2.get_new_puzzlehash()
-        async with wallet2.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            did_wallet_11: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_2.wallet_state_manager,
-                wallet2,
-                uint64(101),
-                action_scope,
-                [bytes32(bytes(ph))],
-                uint64(1),
-                {"Twitter": "Test", "GitHub": "测试"},
-                fee=fee,
-            )
-        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node, wallet_node_2])
-        await time_out_assert(15, did_wallet_11.get_confirmed_balance, 101)
-        await time_out_assert(15, did_wallet_11.get_unconfirmed_balance, 101)
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
+                    },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
+    await did_wallet_1.update_recovery_list([ph], uint64(1))
+    async with did_wallet_1.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        await did_wallet_1.create_update_spend(action_scope)
 
-        did_wallets = list(
-            filter(
-                lambda w: (w.type == WalletType.DECENTRALIZED_ID),
-                await wallet_node_2.wallet_state_manager.get_all_wallet_info_entries(),
-            )
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
+                    },
+                },
+                post_block_balance_updates={
+                    "did": {
+                        "set_remainder": True,
+                    },
+                },
+            ),
+        ]
+    )
+    assert did_wallet_1.did_info.backup_ids[0] == bytes(ph)
+    assert did_wallet_1.did_info.num_of_backup_ids_needed == 1
+
+
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_get_info(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env_0 = wallet_environments.environments[0]
+    env_1 = wallet_environments.environments[1]
+    wallet_node_0 = env_0.node
+    wallet_0 = env_0.xch_wallet
+    wallet_1 = env_1.xch_wallet
+    api_0 = env_0.rpc_client
+
+    env_0.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    env_1.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    fee = uint64(1000)
+    did_amount = uint64(101)
+    async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph_1 = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
+
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_1: DIDWallet = await make_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            did_amount,
+            action_scope,
+            [],
+            metadata={"twitter": "twitter"},
+            fee=fee,
+            use_alternate_recovery=use_alternate_recovery,
         )
-        assert len(did_wallets) == 11
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_update_recovery_list(self, wallet_environments: WalletTestFramework):
-        env = wallet_environments.environments[0]
-        wallet_node = env.node
-        wallet = env.xch_wallet
-
-        env.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
 
-        ph = await wallet.get_new_puzzlehash()
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": did_amount,
+                        "pending_change": did_amount,
+                        "pending_coin_removal_count": 1,
+                    },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": did_amount,
+                        "spendable_balance": did_amount,
+                        "max_send_amount": did_amount,
+                        "unspent_coin_count": 1,
+                        "pending_change": -did_amount,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+            WalletStateTransition(),
+        ]
+    )
+    assert did_wallet_1.did_info.origin_coin is not None  # mypy
+    coin_id_as_bech32 = encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value)
+    response = await api_0.get_did_info(DIDGetInfo(did_wallet_1.did_info.origin_coin.name().hex()))
+    response_with_bech32 = await api_0.get_did_info(DIDGetInfo(coin_id_as_bech32))
+    assert response == response_with_bech32
+    assert response.did_id == coin_id_as_bech32
+    assert response.launcher_id == did_wallet_1.did_info.origin_coin.name()
+    assert did_wallet_1.did_info.current_inner is not None  # mypy
+    assert response.full_puzzle == create_singleton_puzzle(
+        did_wallet_1.did_info.current_inner, did_wallet_1.did_info.origin_coin.name()
+    )
+    assert response.metadata["twitter"] == "twitter"
+    assert response.latest_coin == (await did_wallet_1.get_coin()).name()
+    assert response.num_verification == 0
+    if use_alternate_recovery:
+        assert response.recovery_list_hash is None
+    else:
+        assert response.recovery_list_hash == Program(Program.to([])).get_tree_hash()
+    assert decode_puzzle_hash(response.p2_address) == response.hints[0]
+
+    # Test non-singleton coin
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        coin = (await wallet_0.select_coins(uint64(1), action_scope)).pop()
+    assert coin.amount % 2 == 1
+    coin_id = coin.name()
+    with pytest.raises(ValueError, match="The coin is not a DID."):
+        await api_0.get_did_info(DIDGetInfo(coin_id.hex()))
+
+    # Test multiple odd coins
+    odd_amount = uint64(1)
+    async with wallet_0.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        async with action_scope.use() as interface:
+            interface.side_effects.selected_coins.append(coin)
+        coin_1 = (await wallet_0.select_coins(odd_amount, action_scope)).pop()
+    assert coin_1.amount % 2 == 0
+    async with wallet_0.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config.override(excluded_coin_ids=[coin_id]), push=True
+    ) as action_scope:
+        await wallet_0.generate_signed_transaction([odd_amount], [ph_1], action_scope, fee)
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "unconfirmed_wallet_balance": -odd_amount - fee,
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "set_remainder": True,
+                    },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "confirmed_wallet_balance": -odd_amount - fee,
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "set_remainder": True,
+                    },
+                },
+            ),
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "unconfirmed_wallet_balance": 0,
+                        "set_remainder": True,
+                    }
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "confirmed_wallet_balance": odd_amount,
+                        "set_remainder": True,
+                    }
+                },
+            ),
+        ]
+    )
+
+    with pytest.raises(ValueError, match="This is not a singleton, multiple children coins found."):
+        await api_0.get_did_info(DIDGetInfo(coin_1.name().hex()))
 
-        async with wallet.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node.wallet_state_manager, wallet, uint64(101), action_scope, []
-            )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_message_spend(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env = wallet_environments.environments[0]
+    wallet_node = env.node
+    wallet = env.xch_wallet
+    api_0 = env.rpc_api
+
+    env.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    fee = uint64(1000)
+
+    async with wallet.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_1: DIDWallet = await make_did_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            uint64(101),
+            action_scope,
+            [],
+            fee=fee,
+            use_alternate_recovery=use_alternate_recovery,
+        )
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-            ]
-        )
-        await did_wallet_1.update_recovery_list([ph], uint64(1))
-        async with did_wallet_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            await did_wallet_1.create_update_spend(action_scope)
-
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        },
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "did": {
-                            "set_remainder": True,
-                        },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-            ]
-        )
-        assert did_wallet_1.did_info.backup_ids[0] == bytes(ph)
-        assert did_wallet_1.did_info.num_of_backup_ids_needed == 1
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 2, "blocks_needed": [1, 1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_get_info(self, wallet_environments: WalletTestFramework):
-        env_0 = wallet_environments.environments[0]
-        env_1 = wallet_environments.environments[1]
-        wallet_node_0 = env_0.node
-        wallet_0 = env_0.xch_wallet
-        wallet_1 = env_1.xch_wallet
-        api_0 = env_0.rpc_api
-
-        env_0.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-        env_1.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
+                },
+            ),
+        ]
+    )
+    response = await api_0.did_message_spend(
+        {"wallet_id": did_wallet_1.wallet_id, "coin_announcements": ["0abc"], "puzzle_announcements": ["0def"]}
+    )
+    spend = response["spend_bundle"].coin_spends[0]
+    conditions = conditions_dict_for_solution(
+        spend.puzzle_reveal, spend.solution, wallet.wallet_state_manager.constants.MAX_BLOCK_COST_CLVM
+    )
 
-        fee = uint64(1000)
-        did_amount = uint64(101)
-        ph_1 = await wallet_1.get_new_puzzlehash()
+    assert len(conditions[ConditionOpcode.CREATE_COIN_ANNOUNCEMENT]) == 1
+    assert conditions[ConditionOpcode.CREATE_COIN_ANNOUNCEMENT][0].vars[0].hex() == "0abc"
+    assert len(conditions[ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT]) == 1
+    assert conditions[ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT][0].vars[0].hex() == "0def"
 
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager,
-                wallet_0,
-                did_amount,
-                action_scope,
-                [],
-                metadata={"twitter": "twitter"},
-                fee=fee,
-            )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": did_amount,
-                            "pending_change": did_amount,
-                            "pending_coin_removal_count": 1,
-                        },
-                    },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": did_amount,
-                            "spendable_balance": did_amount,
-                            "max_send_amount": did_amount,
-                            "unspent_coin_count": 1,
-                            "pending_change": -did_amount,
-                            "pending_coin_removal_count": -1,
-                        },
-                    },
-                ),
-                WalletStateTransition(),
-            ]
-        )
-        assert did_wallet_1.did_info.origin_coin is not None  # mypy
-        response = await api_0.did_get_info({"coin_id": did_wallet_1.did_info.origin_coin.name().hex()})
-        assert response["did_id"] == encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value)
-        assert response["launcher_id"] == did_wallet_1.did_info.origin_coin.name().hex()
-        assert did_wallet_1.did_info.current_inner is not None  # mypy
-        assert response["full_puzzle"].to_program() == create_singleton_puzzle(
-            did_wallet_1.did_info.current_inner, did_wallet_1.did_info.origin_coin.name()
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_update_metadata(wallet_environments: WalletTestFramework, use_alternate_recovery: bool):
+    env = wallet_environments.environments[0]
+    wallet_node = env.node
+    wallet = env.xch_wallet
+
+    env.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+
+    fee = uint64(1000)
+    did_amount = uint64(101)
+
+    async with wallet.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        did_wallet_1: DIDWallet = await make_did_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            did_amount,
+            action_scope,
+            [],
+            fee=fee,
+            use_alternate_recovery=use_alternate_recovery,
         )
-        assert response["metadata"]["twitter"] == "twitter"
-        assert response["latest_coin"] == (await did_wallet_1.get_coin()).name().hex()
-        assert response["num_verification"] == 0
-        assert response["recovery_list_hash"] == Program(Program.to([])).get_tree_hash().hex()
-        assert decode_puzzle_hash(response["p2_address"]).hex() == response["hints"][0]
-
-        # Test non-singleton coin
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            coin = (await wallet_0.select_coins(uint64(1), action_scope)).pop()
-        assert coin.amount % 2 == 1
-        coin_id = coin.name()
-        response = await api_0.did_get_info({"coin_id": coin_id.hex()})
-        assert not response["success"]
-
-        # Test multiple odd coins
-        odd_amount = uint64(1)
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            async with action_scope.use() as interface:
-                interface.side_effects.selected_coins.append(coin)
-            coin_1 = (await wallet_0.select_coins(odd_amount, action_scope)).pop()
-        assert coin_1.amount % 2 == 0
-        async with wallet_0.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config.override(excluded_coin_ids=[coin_id]), push=True
-        ) as action_scope:
-            await wallet_0.generate_signed_transaction([odd_amount], [ph_1], action_scope, fee)
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "unconfirmed_wallet_balance": -odd_amount - fee,
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "set_remainder": True,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "confirmed_wallet_balance": -odd_amount - fee,
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "set_remainder": True,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "unconfirmed_wallet_balance": 0,
-                            "set_remainder": True,
-                        }
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "confirmed_wallet_balance": odd_amount,
-                            "set_remainder": True,
-                        }
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
                     },
-                ),
-            ]
-        )
+                },
+            ),
+        ]
+    )
 
-        with pytest.raises(ValueError):
-            await api_0.did_get_info({"coin_id": coin_1.name().hex()})
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_message_spend(self, wallet_environments: WalletTestFramework):
-        env = wallet_environments.environments[0]
-        wallet_node = env.node
-        wallet = env.xch_wallet
-        api_0 = env.rpc_api
-
-        env.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
+    assert did_wallet_1.did_info.current_inner is not None  # mypy
+    puzhash = did_wallet_1.did_info.current_inner.get_tree_hash()
+    parent_num = get_parent_num(did_wallet_1)
 
-        fee = uint64(1000)
+    bad_metadata = {"Twitter": {"url": "http://www.twitter.com"}}
+    with pytest.raises(ValueError) as e:
+        await did_wallet_1.update_metadata(bad_metadata)  # type: ignore
+    assert e.match("Metadata key value pairs must be strings.")
 
-        async with wallet.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node.wallet_state_manager, wallet, uint64(101), action_scope, [], fee=fee
-            )
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+    metadata = {}
+    metadata["Twitter"] = "http://www.twitter.com"
+    await did_wallet_1.update_metadata(metadata)
+    async with did_wallet_1.wallet_state_manager.new_action_scope(
+        wallet_environments.tx_config, push=True
+    ) as action_scope:
+        await did_wallet_1.create_update_spend(action_scope, fee)
+
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "unconfirmed_wallet_balance": -fee,
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "unconfirmed_wallet_balance": 0,
+                        "set_remainder": True,
                     },
-                ),
-            ]
-        )
-        response = await api_0.did_message_spend(
-            {"wallet_id": did_wallet_1.wallet_id, "coin_announcements": ["0abc"], "puzzle_announcements": ["0def"]}
-        )
-        spend = response["spend_bundle"].coin_spends[0]
-        conditions = conditions_dict_for_solution(
-            spend.puzzle_reveal, spend.solution, wallet.wallet_state_manager.constants.MAX_BLOCK_COST_CLVM
-        )
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "confirmed_wallet_balance": -fee,
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 0,
+                        "set_remainder": True,
+                    },
+                },
+            ),
+        ]
+    )
 
-        assert len(conditions[ConditionOpcode.CREATE_COIN_ANNOUNCEMENT]) == 1
-        assert conditions[ConditionOpcode.CREATE_COIN_ANNOUNCEMENT][0].vars[0].hex() == "0abc"
-        assert len(conditions[ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT]) == 1
-        assert conditions[ConditionOpcode.CREATE_PUZZLE_ANNOUNCEMENT][0].vars[0].hex() == "0def"
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_update_metadata(self, wallet_environments: WalletTestFramework):
-        env = wallet_environments.environments[0]
-        wallet_node = env.node
-        wallet = env.xch_wallet
-
-        env.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
+    assert get_parent_num(did_wallet_1) == parent_num + 2
+    assert did_wallet_1.did_info.current_inner is not None  # mypy
+    assert puzhash != did_wallet_1.did_info.current_inner.get_tree_hash()
+    assert did_wallet_1.did_info.metadata.find("Twitter") > 0
 
-        fee = uint64(1000)
-        did_amount = uint64(101)
 
-        async with wallet.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node.wallet_state_manager, wallet, did_amount, action_scope, [], fee=fee
-            )
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
+@pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
+@pytest.mark.anyio
+async def test_did_sign_message(wallet_environments: WalletTestFramework):
+    env = wallet_environments.environments[0]
+    wallet_node = env.node
+    wallet = env.xch_wallet
+    api_0 = env.rpc_api
+
+    env.wallet_aliases = {
+        "xch": 1,
+        "did": 2,
+    }
+    fee = uint64(1000)
+
+    async with wallet.wallet_state_manager.new_action_scope(wallet_environments.tx_config, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet.wallet_state_manager)
+        did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            uint64(101),
+            action_scope,
+            [ph],
+            uint64(1),
+            {"Twitter": "Test", "GitHub": "测试"},
+            fee=fee,
+        )
+    assert did_wallet_1.get_name() == "Profile 1"
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
                     },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
+                    "did": {
+                        "init": True,
+                        "unconfirmed_wallet_balance": 101,
+                        "pending_change": 101,
+                        "pending_coin_removal_count": 1,
                     },
-                ),
-            ]
-        )
+                },
+                post_block_balance_updates={
+                    "xch": {
+                        "set_remainder": True,
+                    },
+                    "did": {
+                        "confirmed_wallet_balance": 101,
+                        "spendable_balance": 101,
+                        "max_send_amount": 101,
+                        "unspent_coin_count": 1,
+                        "pending_change": -101,
+                        "pending_coin_removal_count": -1,
+                    },
+                },
+            ),
+        ]
+    )
+    # Test general string
+    assert did_wallet_1.did_info.origin_coin is not None  # mypy
+    message = "Hello World"
+    assert did_wallet_1.did_info.origin_coin is not None
+    response = await api_0.sign_message_by_id(
+        {
+            "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
+            "message": message,
+        }
+    )
+    puzzle: Program = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, message))
+    assert AugSchemeMPL.verify(
+        G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
+        puzzle.get_tree_hash(),
+        G2Element.from_bytes(bytes.fromhex(response["signature"])),
+    )
+    # Test hex string
+    message = "0123456789ABCDEF"
+    response = await api_0.sign_message_by_id(
+        {
+            "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
+            "message": message,
+            "is_hex": True,
+        }
+    )
+    puzzle = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, bytes.fromhex(message)))
 
-        assert did_wallet_1.did_info.current_inner is not None  # mypy
-        puzhash = did_wallet_1.did_info.current_inner.get_tree_hash()
-        parent_num = get_parent_num(did_wallet_1)
+    assert AugSchemeMPL.verify(
+        G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
+        puzzle.get_tree_hash(),
+        G2Element.from_bytes(bytes.fromhex(response["signature"])),
+    )
 
-        bad_metadata = {"Twitter": {"url": "http://www.twitter.com"}}
-        with pytest.raises(ValueError) as e:
-            await did_wallet_1.update_metadata(bad_metadata)  # type: ignore
-        assert e.match("Metadata key value pairs must be strings.")
+    # Test BLS sign string
+    message = "Hello World"
+    assert did_wallet_1.did_info.origin_coin is not None
+    response = await api_0.sign_message_by_id(
+        {
+            "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
+            "message": message,
+            "is_hex": "False",
+            "safe_mode": "False",
+        }
+    )
 
-        metadata = {}
-        metadata["Twitter"] = "http://www.twitter.com"
-        await did_wallet_1.update_metadata(metadata)
-        async with did_wallet_1.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            await did_wallet_1.create_update_spend(action_scope, fee)
+    assert AugSchemeMPL.verify(
+        G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
+        bytes(message, "utf-8"),
+        G2Element.from_bytes(bytes.fromhex(response["signature"])),
+    )
+    # Test BLS sign hex
+    message = "0123456789ABCDEF"
+    assert did_wallet_1.did_info.origin_coin is not None
+    response = await api_0.sign_message_by_id(
+        {
+            "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
+            "message": message,
+            "is_hex": True,
+            "safe_mode": False,
+        }
+    )
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "unconfirmed_wallet_balance": -fee,
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "unconfirmed_wallet_balance": 0,
-                            "set_remainder": True,
-                        },
-                    },
-                    post_block_balance_updates={
-                        "xch": {
-                            "confirmed_wallet_balance": -fee,
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 0,
-                            "set_remainder": True,
-                        },
-                    },
-                ),
-            ]
-        )
+    assert AugSchemeMPL.verify(
+        G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
+        bytes.fromhex(message),
+        G2Element.from_bytes(bytes.fromhex(response["signature"])),
+    )
 
-        assert get_parent_num(did_wallet_1) == parent_num + 2
-        assert did_wallet_1.did_info.current_inner is not None  # mypy
-        assert puzhash != did_wallet_1.did_info.current_inner.get_tree_hash()
-        assert did_wallet_1.did_info.metadata.find("Twitter") > 0
-
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="irrelevant")
-    @pytest.mark.parametrize("wallet_environments", [{"num_environments": 1, "blocks_needed": [1]}], indirect=True)
-    @pytest.mark.anyio
-    async def test_did_sign_message(self, wallet_environments: WalletTestFramework):
-        env = wallet_environments.environments[0]
-        wallet_node = env.node
-        wallet = env.xch_wallet
-        api_0 = env.rpc_api
-
-        env.wallet_aliases = {
-            "xch": 1,
-            "did": 2,
-        }
-        fee = uint64(1000)
-        ph = await wallet.get_new_puzzlehash()
 
-        async with wallet.wallet_state_manager.new_action_scope(
-            wallet_environments.tx_config, push=True
-        ) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                uint64(101),
-                action_scope,
-                [ph],
-                uint64(1),
-                {"Twitter": "Test", "GitHub": "测试"},
-                fee=fee,
-            )
-        assert did_wallet_1.get_name() == "Profile 1"
+@pytest.mark.parametrize(
+    "trusted",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_create_did_with_recovery_list(
+    self_hostname: str, two_nodes_two_wallets_with_same_keys: OldSimulatorsAndWallets, trusted: bool
+) -> None:
+    """
+    A DID is created on-chain in client0, causing a DID Wallet to be created in client1, which shares the same key.
+    This can happen if someone uses the same key on multiple computers, or is syncing a wallet from scratch.
+
+    For this test, we assign a recovery list hash at DID creation time, but the recovery list is not yet available
+    to the wallet_node that the DID Wallet is being created in (client1).
+
+    """
+    full_nodes, wallets, _ = two_nodes_two_wallets_with_same_keys
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node_0, server_0 = wallets[0]
+    wallet_node_1, server_1 = wallets[1]
+
+    wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
+    wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
+
+    async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph0 = await action_scope.get_puzzle_hash(wallet_0.wallet_state_manager)
+    async with wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph1 = await action_scope.get_puzzle_hash(wallet_1.wallet_state_manager)
+
+    sk0 = await wallet_node_0.wallet_state_manager.get_private_key(ph0)
+    sk1 = await wallet_node_1.wallet_state_manager.get_private_key(ph1)
+    assert sk0 == sk1
+
+    if trusted:
+        wallet_node_0.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
+        wallet_node_1.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
 
-        await wallet_environments.process_pending_states(
-            [
-                WalletStateTransition(
-                    pre_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "init": True,
-                            "unconfirmed_wallet_balance": 101,
-                            "pending_change": 101,
-                            "pending_coin_removal_count": 1,
-                        },
-                    },
-                    post_block_balance_updates={
-                        "xch": {
-                            "set_remainder": True,
-                        },
-                        "did": {
-                            "confirmed_wallet_balance": 101,
-                            "spendable_balance": 101,
-                            "max_send_amount": 101,
-                            "unspent_coin_count": 1,
-                            "pending_change": -101,
-                            "pending_coin_removal_count": -1,
-                        },
-                    },
-                ),
-            ]
-        )
-        # Test general string
-        assert did_wallet_1.did_info.origin_coin is not None  # mypy
-        message = "Hello World"
-        assert did_wallet_1.did_info.origin_coin is not None
-        response = await api_0.sign_message_by_id(
-            {
-                "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
-                "message": message,
-            }
+    else:
+        wallet_node_0.config["trusted_peers"] = {}
+        wallet_node_1.config["trusted_peers"] = {}
+    await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+
+    await full_node_api.farm_blocks_to_wallet(1, wallet_0)
+    await full_node_api.farm_blocks_to_wallet(1, wallet_1)
+
+    # Node 0 sets up a DID Wallet with a backup set, but num_of_backup_ids_needed=0
+    # (a malformed solution, but legal for the clvm puzzle)
+    recovery_list = [bytes32(bytes.fromhex("00" * 32))]
+    async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        did_wallet_0: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            uint64(101),
+            action_scope,
+            backups_ids=recovery_list,
+            num_of_backup_ids_needed=uint64(0),
         )
-        puzzle: Program = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, message))
-        assert AugSchemeMPL.verify(
-            G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
-            puzzle.get_tree_hash(),
-            G2Element.from_bytes(bytes.fromhex(response["signature"])),
-        )
-        # Test hex string
-        message = "0123456789ABCDEF"
-        response = await api_0.sign_message_by_id(
-            {
-                "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
-                "message": message,
-                "is_hex": True,
-            }
-        )
-        puzzle = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, bytes.fromhex(message)))
 
-        assert AugSchemeMPL.verify(
-            G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
-            puzzle.get_tree_hash(),
-            G2Element.from_bytes(bytes.fromhex(response["signature"])),
-        )
+    await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0])
 
-        # Test BLS sign string
-        message = "Hello World"
-        assert did_wallet_1.did_info.origin_coin is not None
-        response = await api_0.sign_message_by_id(
-            {
-                "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
-                "message": message,
-                "is_hex": "False",
-                "safe_mode": "False",
-            }
-        )
+    await time_out_assert(15, did_wallet_0.get_confirmed_balance, 101)
+    await time_out_assert(15, did_wallet_0.get_unconfirmed_balance, 101)
+    await time_out_assert(15, did_wallet_0.get_pending_change_balance, 0)
 
-        assert AugSchemeMPL.verify(
-            G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
-            bytes(message, "utf-8"),
-            G2Element.from_bytes(bytes.fromhex(response["signature"])),
-        )
-        # Test BLS sign hex
-        message = "0123456789ABCDEF"
-        assert did_wallet_1.did_info.origin_coin is not None
-        response = await api_0.sign_message_by_id(
-            {
-                "id": encode_puzzle_hash(did_wallet_1.did_info.origin_coin.name(), AddressType.DID.value),
-                "message": message,
-                "is_hex": True,
-                "safe_mode": False,
-            }
-        )
+    await full_node_api.farm_blocks_to_wallet(1, wallet_0)
 
-        assert AugSchemeMPL.verify(
-            G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
-            bytes.fromhex(message),
-            G2Element.from_bytes(bytes.fromhex(response["signature"])),
-        )
+    #######################
+    all_node_0_wallets = await wallet_node_0.wallet_state_manager.user_store.get_all_wallet_info_entries()
+    all_node_1_wallets = await wallet_node_1.wallet_state_manager.user_store.get_all_wallet_info_entries()
+    assert len(all_node_0_wallets) == len(all_node_1_wallets)
 
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
-    )
-    @pytest.mark.anyio
-    async def test_create_did_with_recovery_list(
-        self, self_hostname: str, two_nodes_two_wallets_with_same_keys: OldSimulatorsAndWallets, trusted: bool
-    ) -> None:
-        """
-        A DID is created on-chain in client0, causing a DID Wallet to be created in client1, which shares the same key.
-        This can happen if someone uses the same key on multiple computers, or is syncing a wallet from scratch.
-
-        For this test, we assign a recovery list hash at DID creation time, but the recovery list is not yet available
-        to the wallet_node that the DID Wallet is being created in (client1).
-
-        """
-        full_nodes, wallets, _ = two_nodes_two_wallets_with_same_keys
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node_0, server_0 = wallets[0]
-        wallet_node_1, server_1 = wallets[1]
-
-        wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
-        wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
-
-        ph0 = await wallet_0.get_new_puzzlehash()
-        ph1 = await wallet_1.get_new_puzzlehash()
-
-        sk0 = await wallet_node_0.wallet_state_manager.get_private_key(ph0)
-        sk1 = await wallet_node_1.wallet_state_manager.get_private_key(ph1)
-        assert sk0 == sk1
-
-        if trusted:
-            wallet_node_0.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
-            wallet_node_1.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
+    # Note that the inner program we expect is different than the on-chain inner.
+    # This means that we have more work to do in the checks for the two different spend cases of
+    # the DID wallet Singleton
+    # assert (
+    #    json.loads(all_node_0_wallets[1].data)["current_inner"]
+    #    == json.loads(all_node_1_wallets[1].data)["current_inner"]
+    # )
 
-        else:
-            wallet_node_0.config["trusted_peers"] = {}
-            wallet_node_1.config["trusted_peers"] = {}
-        await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-
-        await full_node_api.farm_blocks_to_wallet(1, wallet_0)
-        await full_node_api.farm_blocks_to_wallet(1, wallet_1)
-
-        # Node 0 sets up a DID Wallet with a backup set, but num_of_backup_ids_needed=0
-        # (a malformed solution, but legal for the clvm puzzle)
-        recovery_list = [bytes32(bytes.fromhex("00" * 32))]
-        async with wallet_0.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            did_wallet_0: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_0.wallet_state_manager,
-                wallet_0,
-                uint64(101),
-                action_scope,
-                backups_ids=recovery_list,
-                num_of_backup_ids_needed=uint64(0),
-            )
 
-        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0])
-
-        await time_out_assert(15, did_wallet_0.get_confirmed_balance, 101)
-        await time_out_assert(15, did_wallet_0.get_unconfirmed_balance, 101)
-        await time_out_assert(15, did_wallet_0.get_pending_change_balance, 0)
-
-        await full_node_api.farm_blocks_to_wallet(1, wallet_0)
-
-        #######################
-        all_node_0_wallets = await wallet_node_0.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        all_node_1_wallets = await wallet_node_1.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        assert len(all_node_0_wallets) == len(all_node_1_wallets)
-
-        # Note that the inner program we expect is different than the on-chain inner.
-        # This means that we have more work to do in the checks for the two different spend cases of
-        # the DID wallet Singleton
-        # assert (
-        #    json.loads(all_node_0_wallets[1].data)["current_inner"]
-        #    == json.loads(all_node_1_wallets[1].data)["current_inner"]
-        # )
-
-    #  TODO: See Issue CHIA-1544
-    #  This test should be ported to WalletTestFramework once we can replace keys in the wallet node
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
-    )
-    @pytest.mark.anyio
-    async def test_did_resync(
-        self,
-        self_hostname: str,
-        two_wallet_nodes: tuple[list[FullNodeSimulator], list[tuple[WalletNode, ChiaServer]], BlockTools],
-        trusted: bool,
-    ) -> None:
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
-        wallet_node_1, wallet_server_1 = wallets[0]
-        wallet_node_2, wallet_server_2 = wallets[1]
-        wallet = wallet_node_1.wallet_state_manager.main_wallet
-        wallet2 = wallet_node_2.wallet_state_manager.main_wallet
-        fee = uint64(0)
-        wallet_api_1 = WalletRpcApi(wallet_node_1)
-        wallet_api_2 = WalletRpcApi(wallet_node_2)
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node_1.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node_1.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        assert full_node_server._port is not None
-        await wallet_server_1.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
-        await wallet_server_2.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
-        await full_node_api.farm_blocks_to_wallet(1, wallet)
+#  TODO: See Issue CHIA-1544
+#  This test should be ported to WalletTestFramework once we can replace keys in the wallet node
+@pytest.mark.parametrize(
+    "trusted",
+    [True, False],
+)
+@pytest.mark.anyio
+async def test_did_resync(
+    self_hostname: str,
+    two_wallet_nodes: tuple[list[FullNodeSimulator], list[tuple[WalletNode, ChiaServer]], BlockTools],
+    trusted: bool,
+) -> None:
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
+    wallet_node_1, wallet_server_1 = wallets[0]
+    wallet_node_2, wallet_server_2 = wallets[1]
+    wallet = wallet_node_1.wallet_state_manager.main_wallet
+    wallet2 = wallet_node_2.wallet_state_manager.main_wallet
+    fee = uint64(0)
+    wallet_api_1 = WalletRpcApi(wallet_node_1)
+    wallet_api_2 = WalletRpcApi(wallet_node_2)
+    async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        ph = await action_scope.get_puzzle_hash(wallet.wallet_state_manager)
+    if trusted:
+        wallet_node_1.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node_1.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    assert full_node_server._port is not None
+    await wallet_server_1.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
+    await wallet_server_2.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
+    await full_node_api.farm_blocks_to_wallet(1, wallet)
 
-        async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
-                wallet_node_1.wallet_state_manager,
-                wallet,
-                uint64(101),
-                action_scope,
-                [bytes32(ph)],
-                uint64(1),
-                {"Twitter": "Test", "GitHub": "测试"},
-                fee=fee,
-            )
-        assert did_wallet_1.get_name() == "Profile 1"
-        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_1, wallet_node_2])
-        await time_out_assert(15, did_wallet_1.get_confirmed_balance, 101)
-        await time_out_assert(15, did_wallet_1.get_unconfirmed_balance, 101)
-        # Transfer DID
-        new_puzhash = await wallet2.get_new_puzzlehash()
-        async with did_wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-            await did_wallet_1.transfer_did(new_puzhash, fee, True, action_scope=action_scope)
-        await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_1, wallet_node_2])
-        # Check if the DID wallet is created in the wallet2
-        await time_out_assert(30, get_wallet_num, 2, wallet_node_2.wallet_state_manager)
-        await time_out_assert(30, get_wallet_num, 1, wallet_node_1.wallet_state_manager)
-        did_wallet_2 = wallet_node_2.wallet_state_manager.get_wallet(uint32(2), DIDWallet)
-        did_info = did_wallet_2.did_info
-        # set flag to reset wallet sync data on start
-        await wallet_api_1.set_wallet_resync_on_startup({"enable": True})
-        fingerprint_1 = wallet_node_1.logged_in_fingerprint
-        await wallet_api_2.set_wallet_resync_on_startup({"enable": True})
-        fingerprint_2 = wallet_node_2.logged_in_fingerprint
-        # 2 reward coins
-        assert len(await wallet_node_1.wallet_state_manager.coin_store.get_all_unspent_coins()) == 2
-        # Delete tx records
-        await wallet_node_1.wallet_state_manager.tx_store.rollback_to_block(0)
-        wallet_node_1._close()
-        await wallet_node_1._await_closed()
-        wallet_node_2._close()
-        await wallet_node_2._await_closed()
-        wallet_node_1.config["database_path"] = "wallet/db/blockchain_wallet_v2_test_1_CHALLENGE_KEY.sqlite"
-        wallet_node_2.config["database_path"] = "wallet/db/blockchain_wallet_v2_test_2_CHALLENGE_KEY.sqlite"
-        # Start resync
-        await wallet_node_1._start_with_fingerprint(fingerprint_1)
-        await wallet_node_2._start_with_fingerprint(fingerprint_2)
-        assert full_node_server._port is not None
-        await wallet_server_1.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
-        await wallet_server_2.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(b"\00" * 32)))
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_1, timeout=20)
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_2, timeout=20)
-        await time_out_assert(30, get_wallet_num, 1, wallet_node_1.wallet_state_manager)
-        await time_out_assert(30, get_wallet_num, 2, wallet_node_2.wallet_state_manager)
-        did_wallet_2 = wallet_node_2.wallet_state_manager.get_wallet(uint32(2), DIDWallet)
-        assert did_info == did_wallet_2.did_info
+    async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        did_wallet_1: DIDWallet = await DIDWallet.create_new_did_wallet(
+            wallet_node_1.wallet_state_manager,
+            wallet,
+            uint64(101),
+            action_scope,
+            [bytes32(ph)],
+            uint64(1),
+            {"Twitter": "Test", "GitHub": "测试"},
+            fee=fee,
+        )
+    assert did_wallet_1.get_name() == "Profile 1"
+    await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_1, wallet_node_2])
+    await time_out_assert(15, did_wallet_1.get_confirmed_balance, 101)
+    await time_out_assert(15, did_wallet_1.get_unconfirmed_balance, 101)
+    # Transfer DID
+    async with wallet2.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        new_puzhash = await action_scope.get_puzzle_hash(wallet2.wallet_state_manager)
+    async with did_wallet_1.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        await did_wallet_1.transfer_did(new_puzhash, fee, True, action_scope=action_scope)
+    await full_node_api.process_transaction_records(records=action_scope.side_effects.transactions)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_1, wallet_node_2])
+    # Check if the DID wallet is created in the wallet2
+    await time_out_assert(30, get_wallet_num, 2, wallet_node_2.wallet_state_manager)
+    await time_out_assert(30, get_wallet_num, 1, wallet_node_1.wallet_state_manager)
+    did_wallet_2 = wallet_node_2.wallet_state_manager.get_wallet(uint32(2), DIDWallet)
+    did_info = did_wallet_2.did_info
+    # set flag to reset wallet sync data on start
+    await wallet_api_1.set_wallet_resync_on_startup({"enable": True})
+    fingerprint_1 = wallet_node_1.logged_in_fingerprint
+    await wallet_api_2.set_wallet_resync_on_startup({"enable": True})
+    fingerprint_2 = wallet_node_2.logged_in_fingerprint
+    # 2 reward coins
+    assert len(await wallet_node_1.wallet_state_manager.coin_store.get_all_unspent_coins()) == 2
+    # Delete tx records
+    await wallet_node_1.wallet_state_manager.tx_store.rollback_to_block(0)
+    wallet_node_1._close()
+    await wallet_node_1._await_closed()
+    wallet_node_2._close()
+    await wallet_node_2._await_closed()
+    wallet_node_1.config["database_path"] = "wallet/db/blockchain_wallet_v2_test_1_CHALLENGE_KEY.sqlite"
+    wallet_node_2.config["database_path"] = "wallet/db/blockchain_wallet_v2_test_2_CHALLENGE_KEY.sqlite"
+    # Start resync
+    await wallet_node_1._start_with_fingerprint(fingerprint_1)
+    await wallet_node_2._start_with_fingerprint(fingerprint_2)
+    assert full_node_server._port is not None
+    await wallet_server_1.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
+    await wallet_server_2.start_client(PeerInfo(self_hostname, uint16(full_node_server._port)), None)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(b"\00" * 32)))
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_1, timeout=20)
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_2, timeout=20)
+    await time_out_assert(30, get_wallet_num, 1, wallet_node_1.wallet_state_manager)
+    await time_out_assert(30, get_wallet_num, 2, wallet_node_2.wallet_state_manager)
+    did_wallet_2 = wallet_node_2.wallet_state_manager.get_wallet(uint32(2), DIDWallet)
+    assert did_info == did_wallet_2.did_info
 
 
 @pytest.mark.parametrize(
@@ -2232,16 +2354,24 @@ class TestDIDWallet:
     ],
     indirect=True,
 )
+@pytest.mark.parametrize(
+    "use_alternate_recovery",
+    [True, False],
+)
 @pytest.mark.anyio
-async def test_did_coin_records(wallet_environments: WalletTestFramework, monkeypatch: pytest.MonkeyPatch) -> None:
+async def test_did_coin_records(wallet_environments: WalletTestFramework, use_alternate_recovery: bool) -> None:
     # Setup
     wallet_node = wallet_environments.environments[0].node
     wallet = wallet_environments.environments[0].xch_wallet
 
     # Generate DID wallet
     async with wallet.wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
-        did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-            wallet_node.wallet_state_manager, wallet, uint64(1), action_scope
+        did_wallet: DIDWallet = await make_did_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            uint64(1),
+            action_scope,
+            use_alternate_recovery=use_alternate_recovery,
         )
 
     await wallet_environments.process_pending_states(
@@ -2260,11 +2390,13 @@ async def test_did_coin_records(wallet_environments: WalletTestFramework, monkey
         ]
     )
 
-    for _ in range(0, 2):
+    for _ in range(2):
         async with did_wallet.wallet_state_manager.new_action_scope(
             wallet_environments.tx_config, push=True
         ) as action_scope:
-            await did_wallet.transfer_did(await wallet.get_puzzle_hash(new=False), uint64(0), True, action_scope)
+            await did_wallet.transfer_did(
+                await action_scope.get_puzzle_hash(did_wallet.wallet_state_manager), uint64(0), True, action_scope
+            )
         await wallet_environments.process_pending_states(
             [
                 WalletStateTransition(