RanchiMall/bitcoinjs-lib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripthash.input.check / decode: allow situation where chunks length ==1, and don't attempt to classifyInput if witness

Browse Source
This commit is contained in:
Thomas Kerin 2016-11-12 19:25:51 +01:00
parent fdcd277ba9
commit 244c3d4f18
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/templates/scripthash/input.js
View File

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