status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-23 19:48:13 +00:00
Code Issues Projects Releases Wiki Activity

toFromWei fix

Browse Source
This commit is contained in:
Fabian Vogelsteller 2015-02-24 18:08:17 +01:00
parent ee65b2ca5c
commit 1fa7fa6958
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/ethereum.js vendored
View File

@ -1718,7 +1718,7 @@ var fromWei = function(number, unit) {
if(!(number instanceof BigNumber)) {
isBigNumber = false;
number = new BigNumber(number.toString()); // toString to prevent errors, the user have to handle giving correct bignums themselves
number = new BigNumber(number.toString(10), 10); // toString to prevent errors, the user have to handle giving correct bignums themselves
}
@ -1782,7 +1782,7 @@ Possible units are:
- tether
@method toWei
@param {Number|String} number can be a number, number string or a HEX of a decimal
@param {Number|String|BigNumber} number can be a number, number string or a HEX of a decimal
@param {String} unit the unit to convert to
@return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
*/
@ -1792,12 +1792,15 @@ var toWei = function(number, unit) {
if(!number)
return number;
if(typeof number === 'string' && number.indexOf('0x') === 0)
number = toDecimal(number);
if(typeof number === 'string' && number.indexOf('0x') === 0) {
isBigNumber = false;
number = new BigNumber(number, 16);
}
if(!(number instanceof BigNumber)) {
isBigNumber = false;
number = new BigNumber(number.toString());// toString to prevent errors, the user have to handle giving correct bignums themselves
number = new BigNumber(number.toString(10), 10);// toString to prevent errors, the user have to handle giving correct bignums themselves
}

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

13
lib/utils.js
View File

@ -180,7 +180,7 @@ var fromWei = function(number, unit) {
if(!(number instanceof BigNumber)) {
isBigNumber = false;
number = new BigNumber(number.toString()); // toString to prevent errors, the user have to handle giving correct bignums themselves
number = new BigNumber(number.toString(10), 10); // toString to prevent errors, the user have to handle giving correct bignums themselves
}
@ -244,7 +244,7 @@ Possible units are:
- tether
@method toWei
@param {Number|String} number can be a number, number string or a HEX of a decimal
@param {Number|String|BigNumber} number can be a number, number string or a HEX of a decimal
@param {String} unit the unit to convert to
@return {String|Object} When given a BigNumber object it returns one as well, otherwise a number
*/
@ -254,12 +254,15 @@ var toWei = function(number, unit) {
if(!number)
return number;
if(typeof number === 'string' && number.indexOf('0x') === 0)
number = toDecimal(number);
if(typeof number === 'string' && number.indexOf('0x') === 0) {
isBigNumber = false;
number = new BigNumber(number, 16);
}
if(!(number instanceof BigNumber)) {
isBigNumber = false;
number = new BigNumber(number.toString());// toString to prevent errors, the user have to handle giving correct bignums themselves
number = new BigNumber(number.toString(10), 10);// toString to prevent errors, the user have to handle giving correct bignums themselves
}