TransactionBuilder: avoid input mutation until after exception possib…

…ility
bitcoinjs · Oct 6, 2016 · 8a96c7c · 8a96c7c
1 parent 8e72b05
commit 8a96c7c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/transaction_builder.js b/src/transaction_builder.js
@@ -193,16 +193,17 @@ function prepareInput (input, kpPubKey, redeemScript, hashType) {
 
       var prevOutScriptScriptHash = bscript.decompile(input.prevOutScript)[1]
       if (!bufferEquals(prevOutScriptScriptHash, redeemScriptHash)) throw new Error('Inconsistent hash160(RedeemScript)')
-
-    // or, we don't have a prevOutScript, so generate a P2SH script
-    } else {
-      input.prevOutScript = bscript.scriptHashOutput(redeemScriptHash)
-      input.prevOutType = 'scripthash'
     }
 
     var expanded = expandOutput(redeemScript, undefined, kpPubKey)
     if (!expanded.pubKeys) throw new Error('RedeemScript not supported "' + bscript.toASM(redeemScript) + '"')
 
+    // if we don't have a prevOutScript, generate a P2SH script
+    if (!input.prevOutType) {
+      input.prevOutScript = bscript.scriptHashOutput(redeemScriptHash)
+      input.prevOutType = 'scripthash'
+    }
+
     input.pubKeys = expanded.pubKeys
     input.redeemScript = redeemScript
     input.redeemScriptType = expanded.scriptType