set p2sh=true only if redeemScriptType is set

Thomas Kerin · dcousens · commit 798ec3512c9b · 2017-08-09T15:11:05.000+10:00
diff --git a/src/transaction_builder.js b/src/transaction_builder.js
@@ -409,12 +409,15 @@ function buildInput (input, allowIncomplete) {
     if (P2SH.indexOf(input.redeemScriptType) === -1 && !allowIncomplete) {
       throw new Error('Impossible to sign this type')
     }
-    p2sh = true
+
     if (SIGNABLE.indexOf(input.redeemScriptType) !== -1) {
       sig = buildStack(input.redeemScriptType, input.signatures, input.pubKeys, allowIncomplete)
     }
     // 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) {

Original file line number	Diff line number	Diff line change
`@@ -409,12 +409,15 @@ function buildInput (input, allowIncomplete) {`
`409`	`409`	`if (P2SH.indexOf(input.redeemScriptType) === -1 && !allowIncomplete) {`
`410`	`410`	`throw new Error('Impossible to sign this type')`
`411`	`411`	`}`
`412`		`- p2sh = true`
	`412`	`+`
`413`	`413`	`if (SIGNABLE.indexOf(input.redeemScriptType) !== -1) {`
`414`	`414`	`sig = buildStack(input.redeemScriptType, input.signatures, input.pubKeys, allowIncomplete)`
`415`	`415`	`}`
`416`	`416`	`// If it wasn't SIGNABLE, it's witness, defer to that`
`417`		`- scriptType = input.redeemScriptType`
	`417`	`+ if (input.redeemScriptType) {`
	`418`	`+ p2sh = true`
	`419`	`+ scriptType = input.redeemScriptType`
	`420`	`+ }`
`418`	`421`	`}`
`419`	`422`
`420`	`423`	`if (scriptType === bscript.types.P2WPKH) {`