bugfix: disallow label for ranged descriptors & allow external non-ranged descriptors to have label

* do not only check user provided range data to decide whether descriptor is ranged
* properly handle std::optional<bool> when checking if descriptor is internal

test/functional/wallet_importdescriptors.py

@@ -118,6 +118,9 @@ class ImportDescriptorsTest(BitcoinTestFramework):
                              error_code=-8,
                              error_message="Internal addresses should not have a label")
 
+        self.log.info("External non-ranged addresses can have labels")
+        self.test_importdesc({**import_request, "internal": False}, success=True)
+
         self.log.info("Internal addresses should be detected as such")
         key = get_generate_key()
         self.test_importdesc({"desc": descsum_create("pkh(" + key.pubkey + ")"),
@@ -219,6 +222,16 @@ class ImportDescriptorsTest(BitcoinTestFramework):
                               error_code=-8,
                               error_message='Ranged descriptors should not have a label')
 
+        self.log.info("Ranged descriptors cannot have labels - even if range not provided by user and only implied by asterisk (*)")
+        self.test_importdesc({"desc":descsum_create("wpkh(" + xpub + "/100/0/*)"),
+                              "timestamp": "now",
+                              "label": "test",
+                              "active": True},
+                              success=False,
+                              warnings=['Range not given, using default keypool range'],
+                              error_code=-8,
+                              error_message='Ranged descriptors should not have a label')
+
         self.log.info("Private keys required for private keys enabled wallet")
         self.test_importdesc({"desc":descsum_create(desc),
                               "timestamp": "now",

test/functional/wallet_rescan_unconfirmed.py

@@ -65,7 +65,8 @@ class WalletRescanUnconfirmed(BitcoinTestFramework):
         assert tx_parent_to_reorg["txid"] in node.getrawmempool()
 
         self.log.info("Import descriptor wallet on another node")
-        descriptors_to_import = [{"desc": w0.getaddressinfo(parent_address)['parent_desc'], "timestamp": 0, "label": "w0 import"}]
+        # descriptor is ranged - label not allowed
+        descriptors_to_import = [{"desc": w0.getaddressinfo(parent_address)['parent_desc'], "timestamp": 0}]
 
         node.createwallet(wallet_name="w1", disable_private_keys=True)
         w1 = node.get_wallet_rpc("w1")