remove label from bitcoin core export - in 24.1 label is no longer supported with ranged descriptors

(cherry picked from commit 0874324372)

releases/ChangeLog.md

@@ -6,6 +6,8 @@
 - Bugfix: correct `scriptPubkey` parsing for segwit v1-v16
 - Bugfix: do not infer segwit just by availability of `PSBT_IN_WITNESS_UTXO` in PSBT. Improves
   compatibility with Bitcoin Core.
+- Bugfix: remove label from Bitcoin Core `importdescriptors` export as it is no longer supported
+  with ranged descriptors in version `24.1`
 
 ## 5.1.2 - 2023-04-07
 

shared/export.py

@@ -345,7 +345,6 @@ def generate_unchained_export(account_num=0):
 
 def generate_generic_export(account_num=0):
     # Generate data that other programers will use to import Coldcard (single-signer)
-    from descriptor import Descriptor, multisig_descriptor_template
 
     chain = chains.current_chain()
     master_xfp = settings.get("xfp")

testing/pytest.ini

@@ -1,7 +1,7 @@
 [pytest]
-addopts = -vvx --disable-warnings
+;addopts = -vvx --disable-warnings
 # you need to comment above and uncomment below to use run_sim_tests.py
-#addopts = -vv --disable-warnings
+addopts = -vv --disable-warnings
 markers = 
     bitcoind: indicates local bitcoind (testnet) will be needed
     onetime: test cant be combined with any others, likely needs board reset

testing/test_export.py

@@ -142,7 +142,9 @@ def test_export_core(way, dev, use_regtest, acct_num, pick_menu_item, goto_home,
         assert expect+f'/{n}/*' in desc
 
         # test against bitcoind -- needs a "descriptor native" wallet
-        bitcoind_d_wallet.importdescriptors(obj)
+        res = bitcoind_d_wallet.importdescriptors(obj)
+        assert res[0]["success"]
+        assert res[1]["success"]
         x = bitcoind_d_wallet.getaddressinfo(addrs[2])
         pprint(x)
         assert x['address'] == addrs[2]
@@ -171,7 +173,9 @@ def test_export_core(way, dev, use_regtest, acct_num, pick_menu_item, goto_home,
         assert expect + f'/{n}/*' in desc
 
         # test against bitcoind -- needs a "descriptor native" wallet
-        bitcoind_d_wallet.importdescriptors(obj)
+        res = bitcoind_d_wallet.importdescriptors(obj)
+        assert res[0]["success"]
+        assert res[1]["success"]
 
         x = bitcoind_d_wallet.getaddressinfo(addrs[-1])
         pprint(x)

unix/variant/pyb.py

@@ -36,10 +36,10 @@ class USB_HID:
         import usocket as socket
         self.pipe = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
         # If on linux, try commenting the following line
-        addr = bytes([len(self.fn)+2, socket.AF_UNIX] + list(self.fn))
+        # addr = bytes([len(self.fn)+2, socket.AF_UNIX] + list(self.fn))
         # If on linux, try uncommenting the following two lines
-        #import struct
-        #addr = struct.pack('H108s', socket.AF_UNIX, self.fn)
+        import struct
+        addr = struct.pack('H108s', socket.AF_UNIX, self.fn)
         while 1:
             try:
                 self.pipe.bind(addr)