nmc: Use descriptor wallets by default.

tests/basicswap/extended/test_nmc.py

@@ -54,7 +54,7 @@ NAMECOIND = os.getenv("NAMECOIND", "namecoind" + cfg.bin_suffix)
 NAMECOIN_CLI = os.getenv("NAMECOIN_CLI", "namecoin-cli" + cfg.bin_suffix)
 NAMECOIN_TX = os.getenv("NAMECOIN_TX", "namecoin-tx" + cfg.bin_suffix)
 
-USE_DESCRIPTOR_WALLETS = toBool(os.getenv("USE_DESCRIPTOR_WALLETS", False))
+NMC_USE_DESCRIPTORS = toBool(os.getenv("NMC_USE_DESCRIPTORS", True))
 
 NMC_BASE_PORT = 8136
 NMC_BASE_RPC_PORT = 8146
@@ -112,7 +112,7 @@ class TestNMC(BasicSwapTest):
     base_rpc_port = NMC_BASE_RPC_PORT
     nmc_addr = None
     max_fee: int = 200000
-    test_fee_rate: int = 10000  # sats/kvB
+    test_fee_rate: int = 100000  # sats/kvB
 
     def mineBlock(self, num_blocks: int = 1) -> None:
         self.callnoderpc("generatetoaddress", [num_blocks, self.nmc_addr])
@@ -160,8 +160,13 @@ class TestNMC(BasicSwapTest):
         if len(nmc_rpc("listwallets")) < 1:
             nmc_rpc(
                 "createwallet",
-                ["wallet.dat", False, False, "", False, USE_DESCRIPTOR_WALLETS],
+                ["wallet.dat", False, True, "", False, NMC_USE_DESCRIPTORS],
             )
+            if NMC_USE_DESCRIPTORS:
+                nmc_rpc(
+                    "createwallet",
+                    ["bsx_watch", True, True, "", False, True],
+                )
 
     @classmethod
     def addPIDInfo(cls, sc, i):
@@ -180,12 +185,18 @@ class TestNMC(BasicSwapTest):
             "use_csv": True,
             "use_segwit": True,
             "blocks_confirmed": 1,
+            "use_descriptors": NMC_USE_DESCRIPTORS,
         }
+        if NMC_USE_DESCRIPTORS:
+            settings["chainclients"]["namecoin"]["watch_wallet_name"] = "bsx_watch"
 
     @classmethod
     def prepareExtraCoins(cls):
         ci0 = cls.swap_clients[0].ci(cls.test_coin)
         if not cls.restore_instance:
+            for sc in cls.swap_clients:
+                ci = sc.ci(cls.test_coin)
+                ci.initialiseWallet(ci.getNewRandomKey())
             cls.nmc_addr = ci0.rpc_wallet("getnewaddress", ["mining_addr", "bech32"])
         else:
             addrs = ci0.rpc_wallet(
@@ -214,7 +225,7 @@ class TestNMC(BasicSwapTest):
         new_wallet_name = random.randbytes(10).hex()
         self.callnoderpc(
             "createwallet",
-            [new_wallet_name, False, False, "", False, USE_DESCRIPTOR_WALLETS],
+            [new_wallet_name, False, False, "", False, NMC_USE_DESCRIPTORS],
         )
         self.callnoderpc("sethdseed", [True, test_wif], wallet=new_wallet_name)
         addr = self.callnoderpc(

tests/basicswap/test_btc_xmr.py

@@ -26,6 +26,9 @@ from basicswap.db import (
 from basicswap.util import (
     make_int,
 )
+from basicswap.util.address import (
+    decodeAddress,
+)
 from basicswap.util.extkey import ExtKeyPair
 from basicswap.interface.base import Curves
 from tests.basicswap.util import (
@@ -182,7 +185,7 @@ class TestFunctions(BaseTest):
         bid0 = read_json_api(1800 + id_offerer, f"bids/{bid_id.hex()}")
         bid1 = read_json_api(1800 + id_bidder, f"bids/{bid_id.hex()}")
 
-        tolerance = 1
+        tolerance = 2
         assert bid0["ticker_from"] == ci_from.ticker()
         assert bid1["ticker_from"] == ci_from.ticker()
         assert bid0["ticker_to"] == ci_to.ticker()
@@ -1180,6 +1183,10 @@ class BasicSwapTest(TestFunctions):
         logging.info("---------- Test {} hdwallet".format(self.test_coin_from.name))
         ci = self.swap_clients[0].ci(self.test_coin_from)
 
+        if hasattr(ci, "_use_descriptors") and ci._use_descriptors:
+            logging.warning("Skipping test")
+            return
+
         test_wif = (
             self.swap_clients[0]
             .ci(self.test_coin_from)
@@ -1310,7 +1317,7 @@ class BasicSwapTest(TestFunctions):
 
         # Record unspents before createSCLockTx as the used ones will be locked
         unspents = ci.rpc_wallet("listunspent")
-
+        lockedunspents_before = ci.rpc_wallet("listlockunspent")
         a = ci.getNewRandomKey()
         b = ci.getNewRandomKey()
 
@@ -1322,8 +1329,17 @@ class BasicSwapTest(TestFunctions):
         lock_tx = ci.fundSCLockTx(lock_tx, self.test_fee_rate)
         lock_tx = ci.signTxWithWallet(lock_tx)
 
+        # Check that inputs were locked
+        lockedunspents = ci.rpc_wallet("listlockunspent")
+        assert len(lockedunspents) > len(lockedunspents_before)
         unspents_after = ci.rpc_wallet("listunspent")
-        assert len(unspents) > len(unspents_after)
+        for utxo in unspents_after:
+            for locked_utxo in lockedunspents:
+                if (
+                    locked_utxo["txid"] == utxo["txid"]
+                    and locked_utxo["vout"] == utxo["vout"]
+                ):
+                    raise ValueError("Locked utxo in listunspent")
 
         tx_decoded = ci.rpc("decoderawtransaction", [lock_tx.hex()])
         txid = tx_decoded["txid"]
@@ -1679,6 +1695,49 @@ class BasicSwapTest(TestFunctions):
                 wallet=new_wallet_name,
             )
 
+        # https://github.com/bitcoin/bitcoin/issues/10542
+        # https://github.com/bitcoin/bitcoin/issues/26046
+        sign_for_address: str = self.callnoderpc(
+            "getnewaddress",
+            [
+                "sign address",
+            ],
+            wallet=new_wallet_name,
+        )
+        priv_keys = self.callnoderpc("listdescriptors", [True], wallet=new_wallet_name)
+        addr_info = self.callnoderpc(
+            "getaddressinfo", [sign_for_address], wallet=new_wallet_name
+        )
+        hdkeypath = addr_info["hdkeypath"]
+
+        sign_for_address_key = None
+        for descriptor in priv_keys["descriptors"]:
+            if descriptor["active"] is False or descriptor["internal"] is True:
+                continue
+            desc = descriptor["desc"]
+            assert desc.startswith("wpkh(")
+            ext_key = desc[5:].split(")")[0].split("/", 1)[0]
+            ext_key_data = decodeAddress(ext_key)[4:]
+            ci_part = self.swap_clients[0].ci(Coins.PART)
+            ext_key_data_part = ci_part.encode_secret_extkey(ext_key_data)
+            rv = ci_part.rpc_wallet("extkey", ["info", ext_key_data_part, hdkeypath])
+            extkey_derived = rv["key_info"]["result"]
+            ext_key_data = decodeAddress(extkey_derived)[4:]
+            ek = ExtKeyPair()
+            ek.decode(ext_key_data)
+            addr = ci.encodeSegwitAddress(ci.getAddressHashFromKey(ek._key))
+            assert addr == sign_for_address
+            sign_for_address_key = ci.encodeKey(ek._key)
+            break
+        assert sign_for_address_key is not None
+        sign_message: str = "Would be better if dumpprivkey or signmessage worked"
+        sig = self.callnoderpc(
+            "signmessagewithprivkey",
+            [sign_for_address_key, sign_message],
+            wallet=new_wallet_name,
+        )
+        assert ci.verifyMessage(sign_for_address, sign_message, sig)
+
         self.callnoderpc("unloadwallet", [new_wallet_name])
         self.callnoderpc("unloadwallet", [new_watch_wallet_name])