Merge branch 'master' of github.com:vbuterin/bitcoinjs-lib
This commit is contained in:
commit
0ef704574d
1 changed files with 15 additions and 9 deletions
12
src/util.js
12
src/util.js
|
@ -67,7 +67,7 @@ module.exports = {
|
||||||
/**
|
/**
|
||||||
* Format a Bitcoin value as a string.
|
* Format a Bitcoin value as a string.
|
||||||
*
|
*
|
||||||
* Takes a BigInteger or byte-array and returns that amount of Bitcoins in a
|
* Takes a Number, BigInteger or byte-array and returns that amount of Bitcoins in a
|
||||||
* nice standard formatting.
|
* nice standard formatting.
|
||||||
*
|
*
|
||||||
* Examples:
|
* Examples:
|
||||||
|
@ -76,14 +76,20 @@ module.exports = {
|
||||||
* 900.99998888
|
* 900.99998888
|
||||||
* 34.00
|
* 34.00
|
||||||
*/
|
*/
|
||||||
formatValue: function (valueBuffer) {
|
formatValue: function (value) {
|
||||||
var value = this.valueToBigInt(valueBuffer).toString();
|
if (typeof value == 'number') {
|
||||||
|
value = value/100000000;
|
||||||
|
// at least two decimal places
|
||||||
|
return Math.floor(value*10)==value*10 ? value.toFixed(2) : ''+value;
|
||||||
|
} else {
|
||||||
|
value = module.exports.valueToBigInt(value).toString();
|
||||||
var integerPart = value.length > 8 ? value.substr(0, value.length-8) : '0';
|
var integerPart = value.length > 8 ? value.substr(0, value.length-8) : '0';
|
||||||
var decimalPart = value.length > 8 ? value.substr(value.length-8) : value;
|
var decimalPart = value.length > 8 ? value.substr(value.length-8) : value;
|
||||||
while (decimalPart.length < 8) decimalPart = "0"+decimalPart;
|
while (decimalPart.length < 8) decimalPart = "0"+decimalPart;
|
||||||
decimalPart = decimalPart.replace(/0*$/, '');
|
decimalPart = decimalPart.replace(/0*$/, '');
|
||||||
while (decimalPart.length < 2) decimalPart += "0";
|
while (decimalPart.length < 2) decimalPart += "0";
|
||||||
return integerPart+"."+decimalPart;
|
return integerPart+"."+decimalPart;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue