fixed toBigNumber
This commit is contained in:
parent
e5cc5014e6
commit
1f6c195934
|
@ -777,7 +777,7 @@ var filterEvents = function (json) {
|
||||||
* @return {String}
|
* @return {String}
|
||||||
*/
|
*/
|
||||||
var toDecimal = function (value) {
|
var toDecimal = function (value) {
|
||||||
return toBigNumber(value).toString(10);
|
return toBigNumber(value).toNumber();
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -881,12 +881,12 @@ var toWei = function(number, unit) {
|
||||||
*/
|
*/
|
||||||
var toBigNumber = function(number) {
|
var toBigNumber = function(number) {
|
||||||
number = number || 0;
|
number = number || 0;
|
||||||
if (isBigNumber(number)) {
|
if (isBigNumber(number))
|
||||||
return number;
|
return number;
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: check if we need to check for hex here
|
return (isString(number) && number.indexOf('0x') === 0)
|
||||||
return new BigNumber(number.toString(10), 10);
|
? new BigNumber(number.replace('0x',''), 16)
|
||||||
|
: new BigNumber(number.toString(10), 10);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2263,7 +2263,7 @@ module.exports = {
|
||||||
* @date 2015
|
* @date 2015
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// var formatters = require('./formatters');
|
var utils = require('../utils/utils');
|
||||||
|
|
||||||
/// @returns an array of objects describing web3.eth api methods
|
/// @returns an array of objects describing web3.eth api methods
|
||||||
var methods = [
|
var methods = [
|
||||||
|
@ -2273,7 +2273,7 @@ var methods = [
|
||||||
/// @returns an array of objects describing web3.eth api properties
|
/// @returns an array of objects describing web3.eth api properties
|
||||||
var properties = [
|
var properties = [
|
||||||
{ name: 'listening', getter: 'net_listening'},
|
{ name: 'listening', getter: 'net_listening'},
|
||||||
{ name: 'peerCount', getter: 'net_peerCount'},
|
{ name: 'peerCount', getter: 'net_peerCount', outputFormatter: utils.toDecimal },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -2283,7 +2283,7 @@ module.exports = {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
},{}],16:[function(require,module,exports){
|
},{"../utils/utils":5}],16:[function(require,module,exports){
|
||||||
/*
|
/*
|
||||||
This file is part of ethereum.js.
|
This file is part of ethereum.js.
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -172,7 +172,7 @@ var filterEvents = function (json) {
|
||||||
* @return {String}
|
* @return {String}
|
||||||
*/
|
*/
|
||||||
var toDecimal = function (value) {
|
var toDecimal = function (value) {
|
||||||
return toBigNumber(value).toString(10);
|
return toBigNumber(value).toNumber();
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -276,12 +276,12 @@ var toWei = function(number, unit) {
|
||||||
*/
|
*/
|
||||||
var toBigNumber = function(number) {
|
var toBigNumber = function(number) {
|
||||||
number = number || 0;
|
number = number || 0;
|
||||||
if (isBigNumber(number)) {
|
if (isBigNumber(number))
|
||||||
return number;
|
return number;
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: check if we need to check for hex here
|
return (isString(number) && number.indexOf('0x') === 0)
|
||||||
return new BigNumber(number.toString(10), 10);
|
? new BigNumber(number.replace('0x',''), 16)
|
||||||
|
: new BigNumber(number.toString(10), 10);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* @date 2015
|
* @date 2015
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// var formatters = require('./formatters');
|
var utils = require('../utils/utils');
|
||||||
|
|
||||||
/// @returns an array of objects describing web3.eth api methods
|
/// @returns an array of objects describing web3.eth api methods
|
||||||
var methods = [
|
var methods = [
|
||||||
|
@ -30,7 +30,7 @@ var methods = [
|
||||||
/// @returns an array of objects describing web3.eth api properties
|
/// @returns an array of objects describing web3.eth api properties
|
||||||
var properties = [
|
var properties = [
|
||||||
{ name: 'listening', getter: 'net_listening'},
|
{ name: 'listening', getter: 'net_listening'},
|
||||||
{ name: 'peerCount', getter: 'net_peerCount'},
|
{ name: 'peerCount', getter: 'net_peerCount', outputFormatter: utils.toDecimal },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue