scriptHash.input.check - should tolerate 1 field in scriptSig if it's P2WSH or P2WPKH

Author: afk11

src/templates/scripthash/input.js

@@ -5,22 +5,26 @@ var typeforce = require('typeforce')
 
 function check (script, allowIncomplete) {
  var chunks = bscript.decompile(script)
- if (chunks.length < 2) return false
+ if (chunks.length < 1) return false
 
  var lastChunk = chunks[chunks.length - 1]
  if (!Buffer.isBuffer(lastChunk)) return false
 
  var scriptSigChunks = chunks.slice(0, -1)
  var redeemScriptChunks = bscript.decompile(lastChunk)
 
- // is redeemScript a valid script?
+ // is redeemScript a valid script?git
  if (redeemScriptChunks.length === 0) return false
 
  // is redeemScriptSig push only?
  if (!bscript.isPushOnly(scriptSigChunks)) return false
 
  var inputType = bscript.classifyInput(scriptSigChunks, allowIncomplete)
  var outputType = bscript.classifyOutput(redeemScriptChunks)
+ if (chunks.length === 1 && (outputType === bscript.types.P2WSH || outputType === bscript.types.P2WPKH)) {
+ return true
+ }
+
  return inputType === outputType
 }
 check.toJSON = function () { return 'scriptHash input' }

test/transaction_builder.js

@@ -346,7 +346,6 @@ describe('TransactionBuilder', function () {
  it('does not throw if buildIncomplete', function () {
  var txb
  if (f.txHex) {
- console.log(f.txHex)
  txb = TransactionBuilder.fromTransaction(Transaction.fromHex(f.txHex))
  } else {
  txb = construct(f)