This commit is contained in:
Christopher Jeffrey 2016-02-22 21:30:09 -08:00
parent 73d3291ee9
commit 9e36ecd62e

View File

@ -1140,7 +1140,7 @@ script.num = function num(value, useNum, minimaldata) {
script.array = function(value) { script.array = function(value) {
if (Buffer.isBuffer(value)) if (Buffer.isBuffer(value))
return value.slice(); return value;
if (utils.isFinite(value)) if (utils.isFinite(value))
value = new bn(value, 'le'); value = new bn(value, 'le');
@ -1306,23 +1306,23 @@ script.getSize = function getSize(s) {
// Legacy // Legacy
script.size = script.getSize; script.size = script.getSize;
script.isEncoded = function isEncoded(s) { script.isScript = function isScript(s) {
var i, b; var i, b;
if (!s) if (!s)
return false; return false;
if (!Buffer.isBuffer(s))
return false;
s = script.decode(s);
for (i = 0; i < s.length; i++) { for (i = 0; i < s.length; i++) {
b = s[i]; b = s[i];
if (Buffer.isBuffer(b))
if (typeof b !== 'number') continue;
if (constants.opcodes[b] == null)
return false; return false;
if (constants.opcodesByVal[b] == null) {
if (b >= 0x01 && b <= 0x4b)
continue;
return false;
}
} }
return true; return true;
@ -2026,7 +2026,7 @@ script.isScripthashInput = function isScripthashInput(s, redeem) {
if (script.isKeyEncoding(raw)) if (script.isKeyEncoding(raw))
return false; return false;
if (!script.isEncoded(raw)) if (!script.isScript(raw))
return false; return false;
return true; return true;