AaronFiore/electrum
1
0
Fork 0
Code Activity

coldcard: fix p2pkh signing for new fw (1.1.0)

Browse Source 
PSBT was serialised incorrectly but old fw did not complain
This commit is contained in:
SomberNight
2018-11-29 20:28:27 +01:00
parent 1253e3db1d
commit ee287740a7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/plugins/coldcard/coldcard.py
View File

@@ -118,6 +118,8 @@ class CKCCClient:
or (self.dev.master_fingerprint != expected_xfp) or (self.dev.master_fingerprint != expected_xfp)
or (self.dev.master_xpub != expected_xpub)): or (self.dev.master_xpub != expected_xpub)):
# probably indicating programing error, not hacking # probably indicating programing error, not hacking
print_error("[coldcard]", f"xpubs. reported by device: {self.dev.master_xpub}. "
f"stored in file: {expected_xpub}")
raise RuntimeError("Expecting 0x%08x but that's not whats connected?!" % raise RuntimeError("Expecting 0x%08x but that's not whats connected?!" %
expected_xfp) expected_xfp)
@@ -454,9 +456,12 @@ class Coldcard_KeyStore(Hardware_KeyStore):
# inputs section # inputs section
for txin in inputs: for txin in inputs:
utxo = txin['prev_tx'].outputs()[txin['prevout_n']] if Transaction.is_segwit_input(txin):
spendable = txin['prev_tx'].serialize_output(utxo) utxo = txin['prev_tx'].outputs()[txin['prevout_n']]
write_kv(PSBT_IN_WITNESS_UTXO, spendable) spendable = txin['prev_tx'].serialize_output(utxo)
write_kv(PSBT_IN_WITNESS_UTXO, spendable)
else:
write_kv(PSBT_IN_NON_WITNESS_UTXO, str(txin['prev_tx']))
pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin) pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin)