Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier

This commit is contained in:
Taylor Gerring
2015-03-20 06:45:44 +01:00
5 changed files with 4054 additions and 1256 deletions

View File

@ -486,7 +486,7 @@ func (p *EthereumApi) GetBlockUncleCountByNumber(blocknum int64) (int64, error)
func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error {
// Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC
rpclogger.Infof("%s %s", req.Method, req.Params)
rpclogger.Debugf("%s %s", req.Method, req.Params)
switch req.Method {
case "web3_sha3":
args := new(Sha3Args)