LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-27 07:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4784 from Coldcard/fix4729

Browse source 
Fix Coldcard plugin's p2wpkh-p2sh support (see issue #4729)
This commit is contained in:
ghost43 2018-10-19 22:27:46 +02:00 • committed by GitHub
commit c47533f6cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
electrum/plugins/coldcard/coldcard.py
View file

@ -31,7 +31,7 @@ try:
from ckcc.constants import ( from ckcc.constants import (
PSBT_GLOBAL_UNSIGNED_TX, PSBT_IN_NON_WITNESS_UTXO, PSBT_IN_WITNESS_UTXO, PSBT_GLOBAL_UNSIGNED_TX, PSBT_IN_NON_WITNESS_UTXO, PSBT_IN_WITNESS_UTXO,
PSBT_IN_SIGHASH_TYPE, PSBT_IN_REDEEM_SCRIPT, PSBT_IN_WITNESS_SCRIPT, PSBT_IN_SIGHASH_TYPE, PSBT_IN_REDEEM_SCRIPT, PSBT_IN_WITNESS_SCRIPT,
PSBT_IN_BIP32_DERIVATION, PSBT_OUT_BIP32_DERIVATION) PSBT_IN_BIP32_DERIVATION, PSBT_OUT_BIP32_DERIVATION, PSBT_OUT_REDEEM_SCRIPT)
from ckcc.client import ColdcardDevice, COINKITE_VID, CKCC_PID, CKCC_SIMULATOR_PATH from ckcc.client import ColdcardDevice, COINKITE_VID, CKCC_PID, CKCC_SIMULATOR_PATH
@ -423,13 +423,10 @@ class Coldcard_KeyStore(Hardware_KeyStore):
for txin in inputs: for txin in inputs:
if txin['type'] == 'coinbase': if txin['type'] == 'coinbase':
self.give_error("Coinbase not supported") # but why not? self.give_error("Coinbase not supported")
if txin['type'] in ['p2sh']: if txin['type'] in ['p2sh', 'p2wsh-p2sh', 'p2wsh']:
self.give_error('Not ready for multisig transactions yet') self.give_error('No support yet for inputs of type: ' + txin['type'])
#if txin['type'] in ['p2wpkh-p2sh', 'p2wsh-p2sh']:
#if txin['type'] in ['p2wpkh', 'p2wsh']:
# Construct PSBT from start to finish. # Construct PSBT from start to finish.
out_fd = io.BytesIO() out_fd = io.BytesIO()
@ -452,6 +449,7 @@ class Coldcard_KeyStore(Hardware_KeyStore):
@classmethod @classmethod
def input_script(cls, txin, estimate_size=False): def input_script(cls, txin, estimate_size=False):
return '' return ''
unsigned = bfh(CustomTXSerialization(tx.serialize()).serialize_to_network(witness=False)) unsigned = bfh(CustomTXSerialization(tx.serialize()).serialize_to_network(witness=False))
write_kv(PSBT_GLOBAL_UNSIGNED_TX, unsigned) write_kv(PSBT_GLOBAL_UNSIGNED_TX, unsigned)
@ -471,6 +469,12 @@ class Coldcard_KeyStore(Hardware_KeyStore):
for k in pubkeys: for k in pubkeys:
write_kv(PSBT_IN_BIP32_DERIVATION, subkeys[k], k) write_kv(PSBT_IN_BIP32_DERIVATION, subkeys[k], k)
if txin['type'] == 'p2wpkh-p2sh':
assert len(pubkeys) == 1, 'can be only one redeem script per input'
pa = hash_160(k)
assert len(pa) == 20
write_kv(PSBT_IN_REDEEM_SCRIPT, b'\x00\x14'+pa)
out_fd.write(b'\x00') out_fd.write(b'\x00')
# outputs section # outputs section
@ -493,9 +497,14 @@ class Coldcard_KeyStore(Hardware_KeyStore):
assert 0 <= bb < 0x80000000 assert 0 <= bb < 0x80000000
deriv = base_path + pack('<II', aa, bb) deriv = base_path + pack('<II', aa, bb)
pubkey = self.get_pubkey_from_xpub(xpubkey, index) pubkey = bfh(self.get_pubkey_from_xpub(xpubkey, index))
write_kv(PSBT_OUT_BIP32_DERIVATION, deriv, bfh(pubkey)) write_kv(PSBT_OUT_BIP32_DERIVATION, deriv, pubkey)
if output_info.script_type == 'p2wpkh-p2sh':
pa = hash_160(pubkey)
assert len(pa) == 20
write_kv(PSBT_OUT_REDEEM_SCRIPT, b'\x00\x14' + pa)
out_fd.write(b'\x00') out_fd.write(b'\x00')
@ -595,7 +604,7 @@ class ColdcardPlugin(HW_PluginBase):
] ]
#SUPPORTED_XTYPES = ('standard', 'p2wpkh-p2sh', 'p2wpkh', 'p2wsh-p2sh', 'p2wsh') #SUPPORTED_XTYPES = ('standard', 'p2wpkh-p2sh', 'p2wpkh', 'p2wsh-p2sh', 'p2wsh')
SUPPORTED_XTYPES = ('standard', 'p2wpkh') SUPPORTED_XTYPES = ('standard', 'p2wpkh', 'p2wpkh-p2sh')
def __init__(self, parent, config, name): def __init__(self, parent, config, name):
HW_PluginBase.__init__(self, parent, config, name) HW_PluginBase.__init__(self, parent, config, name)