set p2sh=true only if redeemScriptType is set

This commit is contained in:
Thomas Kerin 2017-08-07 15:18:42 +02:00 committed by Daniel Cousens
parent 912f5d4d03
commit 798ec3512c

View file

@ -409,12 +409,15 @@ function buildInput (input, allowIncomplete) {
if (P2SH.indexOf(input.redeemScriptType) === -1 && !allowIncomplete) { if (P2SH.indexOf(input.redeemScriptType) === -1 && !allowIncomplete) {
throw new Error('Impossible to sign this type') throw new Error('Impossible to sign this type')
} }
p2sh = true
if (SIGNABLE.indexOf(input.redeemScriptType) !== -1) { if (SIGNABLE.indexOf(input.redeemScriptType) !== -1) {
sig = buildStack(input.redeemScriptType, input.signatures, input.pubKeys, allowIncomplete) sig = buildStack(input.redeemScriptType, input.signatures, input.pubKeys, allowIncomplete)
} }
// If it wasn't SIGNABLE, it's witness, defer to that // If it wasn't SIGNABLE, it's witness, defer to that
scriptType = input.redeemScriptType if (input.redeemScriptType) {
p2sh = true
scriptType = input.redeemScriptType
}
} }
if (scriptType === bscript.types.P2WPKH) { if (scriptType === bscript.types.P2WPKH) {