poanetwork
/
web3.js
mirror of https://github.com/poanetwork/web3.js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed toBigNumber

This commit is contained in:
Fabian Vogelsteller 2015-03-09 11:27:19 +01:00
parent e5cc5014e6
commit 1f6c195934
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/ethereum.js vendored
View File

@ -777,7 +777,7 @@ var filterEvents = function (json) {
* @return {String}
*/
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) {
number = number || 0;
if (isBigNumber(number)) {
if (isBigNumber(number))
return number;
}
// TODO: check if we need to check for hex here
return new BigNumber(number.toString(10), 10);
return (isString(number) && number.indexOf('0x') === 0)
? new BigNumber(number.replace('0x',''), 16)
: new BigNumber(number.toString(10), 10);
};
/**
@ -2263,7 +2263,7 @@ module.exports = {
* @date 2015
*/
// var formatters = require('./formatters');
var utils = require('../utils/utils');
/// @returns an array of objects describing web3.eth api methods
var methods = [
@ -2273,7 +2273,7 @@ var methods = [
/// @returns an array of objects describing web3.eth api properties
var properties = [
{ 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.

4
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
lib/utils/utils.js
View File

@ -172,7 +172,7 @@ var filterEvents = function (json) {
* @return {String}
*/
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) {
number = number || 0;
if (isBigNumber(number)) {
if (isBigNumber(number))
return number;
}
// TODO: check if we need to check for hex here
return new BigNumber(number.toString(10), 10);
return (isString(number) && number.indexOf('0x') === 0)
? new BigNumber(number.replace('0x',''), 16)
: new BigNumber(number.toString(10), 10);
};
/**

4
lib/web3/net.js
View File

@ -20,7 +20,7 @@
* @date 2015
*/
// var formatters = require('./formatters');
var utils = require('../utils/utils');
/// @returns an array of objects describing web3.eth api methods
var methods = [
@ -30,7 +30,7 @@ var methods = [
/// @returns an array of objects describing web3.eth api properties
var properties = [
{ name: 'listening', getter: 'net_listening'},
{ name: 'peerCount', getter: 'net_peerCount'},
{ name: 'peerCount', getter: 'net_peerCount', outputFormatter: utils.toDecimal },
];