aboutsummaryrefslogtreecommitdiffstats
path: root/dist/ethereum.js
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-01-27 22:20:22 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-01-27 22:20:22 +0800
commit09f633596da91818201781cc009e1e1ab6f8d059 (patch)
treeffbbd41d94f8fca0d2139cf745141073549f0921 /dist/ethereum.js
parent42a25f2f26f14a0b0ecfca31b5000f7a1d50240a (diff)
downloaddexon-09f633596da91818201781cc009e1e1ab6f8d059.tar
dexon-09f633596da91818201781cc009e1e1ab6f8d059.tar.gz
dexon-09f633596da91818201781cc009e1e1ab6f8d059.tar.bz2
dexon-09f633596da91818201781cc009e1e1ab6f8d059.tar.lz
dexon-09f633596da91818201781cc009e1e1ab6f8d059.tar.xz
dexon-09f633596da91818201781cc009e1e1ab6f8d059.tar.zst
dexon-09f633596da91818201781cc009e1e1ab6f8d059.zip
fixed #23
Diffstat (limited to 'dist/ethereum.js')
-rw-r--r--dist/ethereum.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/dist/ethereum.js b/dist/ethereum.js
index 2371eaa90..495ca1b7a 100644
--- a/dist/ethereum.js
+++ b/dist/ethereum.js
@@ -212,6 +212,7 @@ var signedIsNegative = function (value) {
/// Formats input right-aligned input bytes to int
/// @returns right-aligned input bytes formatted to int
var formatOutputInt = function (value) {
+ value = value || "0";
// check if it's negative number
// it it is, return two's complement
if (signedIsNegative(value)) {
@@ -223,6 +224,7 @@ var formatOutputInt = function (value) {
/// Formats big right-aligned input bytes to uint
/// @returns right-aligned input bytes formatted to uint
var formatOutputUInt = function (value) {
+ value = value || "0";
return new BigNumber(value, 16);
};
@@ -1078,7 +1080,9 @@ var web3 = {
/// @returns decimal representaton of hex value prefixed by 0x
toDecimal: function (val) {
- return (new BigNumber(val.substring(2), 16).toString(10));
+ // remove 0x and place 0, if it's required
+ val = val.length > 2 ? val.substring(2) : "0";
+ return (new BigNumber(val, 16).toString(10));
},
/// @returns hex representation (prefixed by 0x) of decimal value