RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle negative outputs. serialize int64 correctly.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-04-19 07:36:05 -07:00
parent 716d94ec9b
commit 1e7e9a2aa7
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/bcoin/utils.js
View File

@ -600,6 +600,7 @@ utils.assert = assert;
utils.btc = utils.btc =
utils.toBTC = function toBTC(satoshi, strict) { utils.toBTC = function toBTC(satoshi, strict) {
var m = new bn(10000000).mul(new bn(10)); var m = new bn(10000000).mul(new bn(10));
var neg = false;
var lo; var lo;
if (utils.isBTC(satoshi)) if (utils.isBTC(satoshi))
@ -613,6 +614,11 @@ utils.toBTC = function toBTC(satoshi, strict) {
if (!satoshi) if (!satoshi)
throw new Error('Could not calculate BTC'); throw new Error('Could not calculate BTC');
if (satoshi.isNeg()) {
satoshi = satoshi.neg();
neg = true;
}
lo = satoshi.mod(m); lo = satoshi.mod(m);
if (lo.cmpn(0) !== 0) { if (lo.cmpn(0) !== 0) {
@ -628,7 +634,7 @@ utils.toBTC = function toBTC(satoshi, strict) {
if (lo === '.') if (lo === '.')
lo += '0'; lo += '0';
return satoshi.div(m).toString(10) + lo; return (neg ? '-' : '') + satoshi.div(m).toString(10) + lo;
}; };
/** /**
@ -689,7 +695,7 @@ utils.isInt = function isInt(val) {
*/ */
utils.isFloat = function isFloat(val) { utils.isFloat = function isFloat(val) {
return typeof val === 'string' && /^\d+\.\d+$/.test(val); return typeof val === 'string' && /^-?\d+\.\d+$/.test(val);
}; };
/** /**
@ -1980,7 +1986,7 @@ utils.write64 = function write64(dst, num, off) {
if (num.cmpn(0) === 0) if (num.cmpn(0) === 0)
num = new bn(0); num = new bn(0);
else else
num = num.neg().notn(64).subn(1); num = num.neg().notn(64).addn(1);
} }
if (num.bitLength() > 64) if (num.bitLength() > 64)
@ -2016,7 +2022,7 @@ utils.write64BE = function write64BE(dst, num, off) {
if (num.cmpn(0) === 0) if (num.cmpn(0) === 0)
num = new bn(0); num = new bn(0);
else else
num = num.neg().notn(64).subn(1); num = num.neg().notn(64).addn(1);
} }
if (num.bitLength() > 64) if (num.bitLength() > 64)

8
test/tx-test.js
View File

@ -210,6 +210,14 @@ describe('TX', function() {
}); });
return; return;
} }
if (comments === 'Negative output') {
it('should handle invalid tx (negative)' + suffix + ': ' + comments, function () {
clearCache(tx, nocache);
assert.ok(tx.verify(null, true, flags));
assert.ok(!tx.isSane());
});
return;
}
if (comments.indexOf('Coinbase') === 0) { if (comments.indexOf('Coinbase') === 0) {
it('should handle invalid coinbase' + suffix + ': ' + comments, function () { it('should handle invalid coinbase' + suffix + ': ' + comments, function () {
clearCache(tx, nocache); clearCache(tx, nocache);