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

build_psbt.py: provide witness vs redeem or both scripts

Browse source
This commit is contained in:
Peter D. Gray 2019-09-16 17:35:43 +02:00 • committed by SomberNight
parent 1692584ae0
commit c77fe6aafd
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
electrum/plugins/coldcard/build_psbt.py
View file

@ -13,13 +13,14 @@ from electrum.logging import get_logger
from electrum.wallet import Standard_Wallet, Multisig_Wallet, Wallet from electrum.wallet import Standard_Wallet, Multisig_Wallet, Wallet
from electrum.keystore import xpubkey_to_pubkey, Xpub from electrum.keystore import xpubkey_to_pubkey, Xpub
from electrum.util import bfh, bh2u from electrum.util import bfh, bh2u
from electrum.crypto import hash_160 from electrum.crypto import hash_160, sha256
from electrum.bitcoin import DecodeBase58Check from electrum.bitcoin import DecodeBase58Check
from .basic_psbt import ( from .basic_psbt import (
PSBT_GLOBAL_UNSIGNED_TX, PSBT_GLOBAL_XPUB, PSBT_IN_NON_WITNESS_UTXO, PSBT_IN_WITNESS_UTXO, PSBT_GLOBAL_UNSIGNED_TX, PSBT_GLOBAL_XPUB, PSBT_IN_NON_WITNESS_UTXO, PSBT_IN_WITNESS_UTXO,
PSBT_IN_SIGHASH_TYPE, PSBT_IN_REDEEM_SCRIPT, PSBT_IN_WITNESS_SCRIPT, PSBT_IN_PARTIAL_SIG, PSBT_IN_SIGHASH_TYPE, PSBT_IN_REDEEM_SCRIPT, PSBT_IN_WITNESS_SCRIPT, PSBT_IN_PARTIAL_SIG,
PSBT_IN_BIP32_DERIVATION, PSBT_OUT_BIP32_DERIVATION, PSBT_OUT_REDEEM_SCRIPT) PSBT_IN_BIP32_DERIVATION, PSBT_OUT_BIP32_DERIVATION,
PSBT_OUT_REDEEM_SCRIPT, PSBT_OUT_WITNESS_SCRIPT)
from .basic_psbt import BasicPSBT from .basic_psbt import BasicPSBT
from electrum.logging import get_logger from electrum.logging import get_logger
@ -66,6 +67,7 @@ def unpacked_xfp_path(xfp, text_path):
# - binary LE32 values, first one is the fingerprint # - binary LE32 values, first one is the fingerprint
# - but as ints, not bytes yet # - but as ints, not bytes yet
rv = [xfp] rv = [xfp]
for x in text_path.split('/'): for x in text_path.split('/'):
if x == 'm': continue if x == 'm': continue
if x.endswith("'"): if x.endswith("'"):
@ -73,6 +75,7 @@ def unpacked_xfp_path(xfp, text_path):
else: else:
x = int(x) x = int(x)
rv.append(x) rv.append(x)
return rv return rv
def xfp_for_keystore(ks): def xfp_for_keystore(ks):
@ -88,7 +91,7 @@ def xfp_for_keystore(ks):
def packed_xfp_path_for_keystore(ks, int_path=[]): def packed_xfp_path_for_keystore(ks, int_path=[]):
# Return XFP + common prefix path for keystore, as binary ready for PSBT # Return XFP + common prefix path for keystore, as binary ready for PSBT
derv = getattr(ks, 'derivation', 'm') derv = getattr(ks, 'derivation', 'm')
return packed_xfp_path(xfp_for_keystore(ks), derv[2:], int_path=int_path) return packed_xfp_path(xfp_for_keystore(ks), derv[2:] or 'm', int_path=int_path)
# Serialization/deserialization tools # Serialization/deserialization tools
def ser_compact_size(l): def ser_compact_size(l):
@ -273,8 +276,7 @@ def build_psbt(tx: Transaction, wallet: Wallet):
if txin['type'] == 'p2wpkh-p2sh': if txin['type'] == 'p2wpkh-p2sh':
assert len(pubkeys) == 1, 'can be only one redeem script per input' assert len(pubkeys) == 1, 'can be only one redeem script per input'
pa = hash_160(k) pa = hash_160(k)
assert len(pa) == 20 write_kv(PSBT_OUT_REDEEM_SCRIPT, b'\x00\x14'+pa)
write_kv(PSBT_IN_REDEEM_SCRIPT, b'\x00\x14'+pa)
# optional? insert (partial) signatures that we already have # optional? insert (partial) signatures that we already have
if sigs and sigs[pk_pos]: if sigs and sigs[pk_pos]:
@ -295,22 +297,32 @@ def build_psbt(tx: Transaction, wallet: Wallet):
# it is a change output (based on our standard derivation path) # it is a change output (based on our standard derivation path)
pubkeys = [bfh(i) for i in wallet.get_public_keys(o.address)] pubkeys = [bfh(i) for i in wallet.get_public_keys(o.address)]
# always need a redeem script for multisig # Add redeem/witness script?
if type(wallet) is Multisig_Wallet: if type(wallet) is Multisig_Wallet:
scr = multisig_script([bh2u(i) for i in sorted(pubkeys)], wallet.m) # always need a redeem script for multisig cases
write_kv(PSBT_OUT_REDEEM_SCRIPT, bfh(scr)) scr = bfh(multisig_script([bh2u(i) for i in sorted(pubkeys)], wallet.m))
# document change output's bip32 derivation(s) if output_info.script_type == 'p2wsh-p2sh':
write_kv(PSBT_OUT_WITNESS_SCRIPT, scr)
write_kv(PSBT_OUT_REDEEM_SCRIPT, b'\x00\x20' + sha256(scr))
elif output_info.script_type == 'p2wsh':
write_kv(PSBT_OUT_WITNESS_SCRIPT, scr)
elif output_info.script_type == 'p2sh':
write_kv(PSBT_OUT_REDEEM_SCRIPT, scr)
else:
raise ValueError(output_info.script_type)
elif output_info.script_type == 'p2wpkh-p2sh':
# need a redeem script when P2SH is used to wrap p2wpkh
assert len(pubkeys) == 1
pa = hash_160(pubkeys[0])
write_kv(PSBT_OUT_REDEEM_SCRIPT, b'\x00\x14' + pa)
# Document change output's bip32 derivation(s)
for pubkey in pubkeys: for pubkey in pubkeys:
sk = subkeys[pubkey] sk = subkeys[pubkey]
write_kv(PSBT_OUT_BIP32_DERIVATION, sk, pubkey) write_kv(PSBT_OUT_BIP32_DERIVATION, sk, pubkey)
if output_info.script_type == 'p2wpkh-p2sh':
assert len(pa) == 20
assert len(pubkeys) == 1
pa = hash_160(pubkey)
write_kv(PSBT_OUT_REDEEM_SCRIPT, b'\x00\x14' + pa)
out_fd.write(b'\x00') out_fd.write(b'\x00')
# capture for later use # capture for later use