AaronFiore/electrum
1
0
Fork 0
Code Activity

ledger: fix sign_transaction for Ypub / sh(wsh(multi())) wallets

Browse Source 
regression from https://github.com/spesmilo/electrum/pull/8041
This commit is contained in:
SomberNight
2023-02-22 14:02:24 +00:00
parent 4e9ddf6ddd
commit 2242a506a9
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
electrum/plugins/ledger/ledger.py
View File

@@ -1095,15 +1095,20 @@ class Ledger_Client_New(Ledger_Client):
if utxo is None:
continue
scriptcode = utxo.scriptPubKey
p2sh = False
if electrum_txin.script_type in ['p2sh', 'p2wpkh-p2sh']:
if len(psbt_in.redeem_script) == 0:
continue
scriptcode = psbt_in.redeem_script
elif electrum_txin.script_type in ['p2wsh', 'p2wsh-p2sh']:
if len(psbt_in.witness_script) == 0:
continue
scriptcode = psbt_in.witness_script
p2sh = False
if electrum_txin.script_type in ['p2sh', 'p2wpkh-p2sh', 'p2wsh-p2sh']:
p2sh = True
is_wit, wit_ver, __ = is_witness(scriptcode)
is_wit, wit_ver, __ = is_witness(psbt_in.redeem_script or utxo.scriptPubKey)
script_addrtype = AddressType.LEGACY
if is_wit:
@@ -1123,12 +1128,6 @@ class Ledger_Client_New(Ledger_Client):
else:
continue
# Check if P2WSH
if electrum_txin.script_type in ['p2wsh']:
if len(psbt_in.witness_script) == 0:
continue
scriptcode = psbt_in.witness_script
multisig = parse_multisig(scriptcode)
if multisig is not None:
k, ms_pubkeys = multisig