diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-29 22:22:55 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-29 22:22:55 +0800 |
| commit | 94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123 (patch) | |
| tree | df0b2e41f5dc9e50b99fa45d597199fd71201678 /lib/web3.js | |
| parent | e1c0862658ca80d2a4a85bd15eab38b0482fee1b (diff) | |
| parent | 8613382869503c6123c3f47772bfdb192f6d3c76 (diff) | |
| download | dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.gz dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.bz2 dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.lz dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.xz dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.zst dexon-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.zip | |
Merge branch 'cpp' into cpp2
Conflicts:
example/balance.html
Diffstat (limited to 'lib/web3.js')
| -rw-r--r-- | lib/web3.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/web3.js b/lib/web3.js index 7cf624c9c..7b8bbd28a 100644 --- a/lib/web3.js +++ b/lib/web3.js @@ -98,7 +98,6 @@ var ethProperties = function () { { name: 'listening', getter: 'eth_listening', setter: 'eth_setListening' }, { name: 'mining', getter: 'eth_mining', setter: 'eth_setMining' }, { name: 'gasPrice', getter: 'eth_gasPrice' }, - { name: 'account', getter: 'eth_account' }, { name: 'accounts', getter: 'eth_accounts' }, { name: 'peerCount', getter: 'eth_peerCount' }, { name: 'defaultBlock', getter: 'eth_defaultBlock', setter: 'eth_setDefaultBlock' }, @@ -233,7 +232,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 |