roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

jsre, rpc/api: pull in new web3 and use hex numbers

Browse Source
This commit is contained in:
Péter Szilágyi 2015-09-11 18:41:42 +03:00
parent 99b62f36b6
commit d4d3fc6a70
3 changed files with 612 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

789
jsre/ethereum_js.go
View File

File diff suppressed because it is too large Load Diff

6
rpc/api/eth.go
View File

@ -173,9 +173,9 @@ func (self *ethApi) IsSyncing(req *shared.Request) (interface{}, error) {
if current < height { if current < height {
return map[string]interface{}{ return map[string]interface{}{
"startingBlock": origin, "startingBlock": newHexNum(big.NewInt(int64(origin)).Bytes()),
"currentBlock": current, "currentBlock": newHexNum(big.NewInt(int64(current)).Bytes()),
"highestBlock": height, "highestBlock": newHexNum(big.NewInt(int64(height)).Bytes()),
}, nil }, nil
} }
return false, nil return false, nil

4
rpc/api/eth_js.go
View File

@ -42,10 +42,6 @@ web3._extend({
new web3._extend.Property({ new web3._extend.Property({
name: 'pendingTransactions', name: 'pendingTransactions',
getter: 'eth_pendingTransactions' getter: 'eth_pendingTransactions'
}),
new web3._extend.Property({
name: 'syncing',
getter: 'eth_syncing'
}) })
] ]
}); });