From d4d3fc6a702d87bab7e04dcd5085a83205107c1c Mon Sep 17 00:00:00 2001 From: Péter Szilágyi Date: Fri, 11 Sep 2015 18:41:42 +0300 Subject: jsre, rpc/api: pull in new web3 and use hex numbers --- rpc/api/eth.go | 6 +++--- rpc/api/eth_js.go | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'rpc') diff --git a/rpc/api/eth.go b/rpc/api/eth.go index 9680536c6..30366a951 100644 --- a/rpc/api/eth.go +++ b/rpc/api/eth.go @@ -173,9 +173,9 @@ func (self *ethApi) IsSyncing(req *shared.Request) (interface{}, error) { if current < height { return map[string]interface{}{ - "startingBlock": origin, - "currentBlock": current, - "highestBlock": height, + "startingBlock": newHexNum(big.NewInt(int64(origin)).Bytes()), + "currentBlock": newHexNum(big.NewInt(int64(current)).Bytes()), + "highestBlock": newHexNum(big.NewInt(int64(height)).Bytes()), }, nil } return false, nil diff --git a/rpc/api/eth_js.go b/rpc/api/eth_js.go index 81bb341bf..393dac22f 100644 --- a/rpc/api/eth_js.go +++ b/rpc/api/eth_js.go @@ -42,10 +42,6 @@ web3._extend({ new web3._extend.Property({ name: 'pendingTransactions', getter: 'eth_pendingTransactions' - }), - new web3._extend.Property({ - name: 'syncing', - getter: 'eth_syncing' }) ] }); -- cgit