fix script.args.

This commit is contained in:
Christopher Jeffrey 2016-01-14 01:34:40 -08:00
parent 6154b1f7a1
commit 077588e90a

View File

@ -1684,23 +1684,21 @@ script.sigopsScripthash = function sigopsScripthash(s) {
};
script.args = function args(s) {
var type, keys, m;
var keys, m;
s = bcoin.script.subscript(s);
if (script.lockTime(s))
s = s.slice(3);
type = script.standard(s);
if (type === 'pubkey')
if (script.isPubkey(s))
return 1;
if (type === 'pubkeyhash')
if (script.isPubkeyhash(s))
return 2;
if (type === 'multisig') {
keys = bcoin.script.isMultisig(s);
if (script.isMultisig(s)) {
keys = s.slice(1, -2);
if (!pub)
return -1;
m = new bn(s[0]).toNumber();
@ -1709,10 +1707,10 @@ script.args = function args(s) {
return m + 1;
}
if (type === 'scripthash')
if (script.isScripthash(s))
return 1;
if (type === 'nulldata')
if (script.isNulldata(s))
return -1;
return -1;