Merge branch 'toggle-passphrase' of https://github.com/ben-kaufman/specter-desktop into toggle-passphrase

Author: ben-kaufman

src/cryptoadvance/specter/devices/hwi_device.py

@@ -1,12 +1,10 @@
 from ..device import Device
 
-
 class HWIDevice(Device):
     def __init__(self, name, alias, device_type, keys, fullpath, manager):
         Device.__init__(self, name, alias, device_type, keys, fullpath, manager)
         self.hwi_support = True
         self.exportable_to_wallet = False
 
     def create_psbts(self, base64_psbt, wallet):
-        # fills non_witness_utxo for all inputs
         return { 'hwi': wallet.fill_psbt(base64_psbt) }

src/cryptoadvance/specter/devices/sd_card_device.py

@@ -1,7 +1,4 @@
 from .hwi_device import HWIDevice
-from ..helpers import decode_base58, get_xpub_fingerprint, hash160
-from hwilib.serializations import PSBT
-
 
 class SDCardDevice(HWIDevice):
     def __init__(self, name, alias, device_type, keys, fullpath, manager):
@@ -10,43 +7,6 @@ def __init__(self, name, alias, device_type, keys, fullpath, manager):
         self.exportable_to_wallet = True
 
     def create_psbts(self, base64_psbt, wallet):
-        psbts = HWIDevice.create_psbts(self, base64_psbt, wallet)
-        sdcard_psbt = PSBT()
-        sdcard_psbt.deserialize(base64_psbt)
-        if len(wallet.keys) > 1:
-            for k in wallet.keys:
-                key = b'\x01' + decode_base58(k.xpub)
-                if k.fingerprint != '':
-                    fingerprint = bytes.fromhex(k.fingerprint)
-                else:
-                    fingerprint = _get_xpub_fingerprint(k.xpub)
-                if k.derivation != '':
-                    der = _der_to_bytes(k.derivation)
-                else:
-                    der = b''
-                value = fingerprint + der
-                sdcard_psbt.unknown[key] = value
-        psbts['sdcard'] = sdcard_psbt.serialize()
+        psbts = super().create_psbts(base64_psbt, wallet)
+        psbts['sdcard'] = wallet.fill_psbt(base64_psbt, non_witness=False, xpubs=True)
         return psbts
-
-def _get_xpub_fingerprint(xpub):
-    b = decode_base58(xpub)
-    return hash160(b[-33:])[:4]
-
-def _der_to_bytes(derivation):
-    items = derivation.split("/")
-    if len(items) == 0:
-        return b''
-    if items[0] == 'm':
-        items = items[1:]
-    if items[-1] == '':
-        items = items[:-1]
-    res = b''
-    for item in items:
-        index = 0
-        if item[-1] == 'h' or item[-1] == "'":
-            index += 0x80000000
-            item = item[:-1]
-        index += int(item)
-        res += index.to_bytes(4,'big')
-    return res

src/cryptoadvance/specter/devices/specter.py

@@ -2,7 +2,6 @@
 from .hwi_device import HWIDevice
 from hwilib.serializations import PSBT
 
-
 class Specter(HWIDevice):
     def __init__(self, name, alias, device_type, keys, fullpath, manager):
         super().__init__(name, alias, 'specter', keys, fullpath, manager)
@@ -16,6 +15,7 @@ def create_psbts(self, base64_psbt, wallet):
         psbts = super().create_psbts(base64_psbt, wallet)
         qr_psbt = PSBT()
         qr_psbt.deserialize(base64_psbt)
+        # replace with compressed wallet information
         for inp in qr_psbt.inputs + qr_psbt.outputs:
             inp.witness_script = b""
             inp.redeem_script = b""

src/cryptoadvance/specter/helpers.py

@@ -114,6 +114,7 @@ def get_xpub_fingerprint(xpub):
     b = decode_base58(xpub)
     return hash160(b[-33:])[:4]
 
+
 def which(program):
     ''' mimics the "which" command in bash but even for stuff not on the path.
         Also has implicit pyinstaller support 
@@ -273,7 +274,7 @@ def der_to_bytes(derivation):
             index += 0x80000000
             item = item[:-1]
         index += int(item)
-        res += index.to_bytes(4,'big')
+        res += index.to_bytes(4,'little')
     return res
 
 def get_devices_with_keys_by_type(app, cosigners, wallet_type):

src/cryptoadvance/specter/wallet.py

@@ -539,19 +539,35 @@ def createpsbt(self, address:str, amount:float, subtract:bool=False, fee_rate:fl
 
         return psbt
 
-    def fill_psbt(self, b64psbt):
+    def fill_psbt(self, b64psbt, non_witness:bool=True, xpubs:bool=True):
         psbt = PSBT()
         psbt.deserialize(b64psbt)
-        for i, inp in enumerate(psbt.tx.vin):
-            txid = inp.prevout.hash.to_bytes(32,'big').hex()
-            try:
-                res = self.cli.gettransaction(txid)
-            except:
-                raise SpecterError("Can't find previous transaction in the wallet.")
-            stream = BytesIO(bytes.fromhex(res["hex"]))
-            prevtx = CTransaction()
-            prevtx.deserialize(stream)
-            psbt.inputs[i].non_witness_utxo = prevtx
+        if non_witness:
+            for i, inp in enumerate(psbt.tx.vin):
+                txid = inp.prevout.hash.to_bytes(32,'big').hex()
+                try:
+                    res = self.cli.gettransaction(txid)
+                except:
+                    raise SpecterError("Can't find previous transaction in the wallet.")
+                stream = BytesIO(bytes.fromhex(res["hex"]))
+                prevtx = CTransaction()
+                prevtx.deserialize(stream)
+                psbt.inputs[i].non_witness_utxo = prevtx
+        if xpubs:
+            # for multisig add xpub fields
+            if len(self.keys) > 1:
+                for k in self.keys:
+                    key = b'\x01' + decode_base58(k.xpub)
+                    if k.fingerprint != '':
+                        fingerprint = bytes.fromhex(k.fingerprint)
+                    else:
+                        fingerprint = get_xpub_fingerprint(k.xpub)
+                    if k.derivation != '':
+                        der = der_to_bytes(k.derivation)
+                    else:
+                        der = b''
+                    value = fingerprint + der
+                    psbt.unknown[key] = value
         return psbt.serialize()
 
     def get_signed_devices(self, decodedpsbt):