Merge pull request #202 from junderw/fixScriptNum

Fix script num
This commit is contained in:
OutCast3k 2019-12-24 21:49:03 +00:00 committed by GitHub
commit b5ebaafed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -156,7 +156,11 @@
} }
var s = coinjs.script(); var s = coinjs.script();
s.writeBytes(coinjs.numToByteArray(checklocktimeverify)); if (checklocktimeverify <= 16 && checklocktimeverify >= 1) {
s.writeOp(0x50 + checklocktimeverify);//OP_1 to OP_16 for minimal encoding
} else {
s.writeBytes(coinjs.numToScriptNumBytes(checklocktimeverify));
}
s.writeOp(177);//OP_CHECKLOCKTIMEVERIFY s.writeOp(177);//OP_CHECKLOCKTIMEVERIFY
s.writeOp(117);//OP_DROP s.writeOp(117);//OP_DROP
s.writeBytes(Crypto.util.hexToBytes(pubkey)); s.writeBytes(Crypto.util.hexToBytes(pubkey));
@ -1924,12 +1928,31 @@
} }
} }
coinjs.numToByteArray = function(num) { function scriptNumSize(i) {
if (num <= 256) { return i > 0x7fffffff ? 5
return [num]; : i > 0x7fffff ? 4
} else { : i > 0x7fff ? 3
return [num % 256].concat(coinjs.numToByteArray(Math.floor(num / 256))); : i > 0x7f ? 2
: i > 0x00 ? 1
: 0;
}
coinjs.numToScriptNumBytes = function(_number) {
var value = Math.abs(_number);
var size = scriptNumSize(value);
var result = [];
for (var i = 0; i < size; ++i) {
result.push(0);
} }
var negative = _number < 0;
for (i = 0; i < size; ++i) {
result[i] = value & 0xff;
value = Math.floor(value / 256);
}
if (negative) {
result[size - 1] |= 0x80;
}
return result;
} }
coinjs.numToVarInt = function(num) { coinjs.numToVarInt = function(num) {