Merge #361: add is_witness check before is_p2sh for non-witness utxos
a78f8d68f6add not is_wit check to trezor (Kevin Mulcrone) Pull request description: Fixes #360 Correctly assigns the script type of an input when an input has a witnessScript but no witnessUtxo. ACKs for top commit: achow101: ACKa78f8d68f6Tree-SHA512: 4fbb61f327e8feb94ff69f09a094c8b9427168ac13ae311859a15074a351b7a4b5bd8d65d723d64f60232ad407e31cc24f6ac427c48f25745ad714f76a04685b
This commit is contained in:
commit
4be273bf45
@ -257,7 +257,7 @@ class TrezorClient(HardwareWalletClient):
|
||||
if is_ms:
|
||||
# Add to txinputtype
|
||||
txinputtype.multisig = multisig
|
||||
if not psbt_in.witness_utxo:
|
||||
if not is_wit:
|
||||
if utxo.is_p2sh:
|
||||
txinputtype.script_type = proto.InputScriptType.SPENDMULTISIG
|
||||
else:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user