From 32bed50ba107ff69ff489e4df6f935fd404a5caa Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 12 Jan 2015 23:25:29 -0600 Subject: begin conversion to rpc over http Per specification at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC --- rpc/json.go | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'rpc/json.go') diff --git a/rpc/json.go b/rpc/json.go index e467f9a34..85b198d12 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -3,6 +3,7 @@ package rpc import ( "encoding/json" "io" + "net/http" ) type jsonWrapper struct{} @@ -11,10 +12,76 @@ func (self jsonWrapper) Send(writer io.Writer, v interface{}) (n int, err error) var payload []byte payload, err = json.Marshal(v) if err != nil { + jsonlogger.Fatalln("Error marshalling JSON", err) return 0, err } + jsonlogger.Infof("Sending payload: %s", payload) return writer.Write(payload) } +func (self jsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) { + var reqParsed RpcRequest + + // Convert JSON to native types + d := json.NewDecoder(req.Body) + // d.UseNumber() + defer req.Body.Close() + err := d.Decode(&reqParsed) + + if err != nil { + jsonlogger.Errorln("Error decoding JSON: ", err) + return reqParsed, err + } + jsonlogger.DebugDetailf("Parsed request: %s", reqParsed) + + return reqParsed, nil +} + +func (self jsonWrapper) GetRequestReply(xeth *EthereumApi, req *RpcRequest, reply *interface{}) error { + // call function for request method + jsonlogger.DebugDetailf("%T %s", req.Params, req.Params) + switch req.Method { + case "eth_coinbase": + return xeth.GetCoinbase(reply) + case "eth_listening": + return xeth.GetIsListening(reply) + case "eth_mining": + return xeth.GetIsMining(reply) + case "eth_peerCount": + return xeth.GetPeerCount(reply) + case "eth_countAt": + args, err := req.ToGetTxCountArgs() + if err != nil { + return err + } + return xeth.GetTxCountAt(args, reply) + // case "eth_codeAt": + // return nil + case "eth_balanceAt": + args, err := req.ToGetBalanceArgs() + if err != nil { + return err + } + return xeth.GetBalanceAt(args, reply) + case "eth_stateAt": + args, err := req.ToGetStorageArgs() + if err != nil { + return err + } + return xeth.GetStorageAt(args, reply) + case "eth_blockByNumber", "eth_blockByHash": + args, err := req.ToGetBlockArgs() + if err != nil { + return err + } + return xeth.GetBlock(args, reply) + default: + return NewErrorResponse(ErrorNotImplemented) + } + + jsonlogger.DebugDetailf("Reply: %T %s", reply, reply) + return nil +} + var JSON jsonWrapper -- cgit v1.2.3 From b178414a475aa48764622487223237a7d28edd46 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 13 Jan 2015 09:13:43 -0600 Subject: Added license headers --- rpc/json.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'rpc/json.go') diff --git a/rpc/json.go b/rpc/json.go index 85b198d12..8c2a672e3 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -1,3 +1,19 @@ +/* + This file is part of go-ethereum + + go-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + go-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with go-ethereum. If not, see . +*/ package rpc import ( -- cgit v1.2.3 From 961e4da7d885a6d5d00fc7c3ab2e11c80c9eeecc Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 13 Jan 2015 09:27:36 -0600 Subject: Add support for CodeAt --- rpc/json.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'rpc/json.go') diff --git a/rpc/json.go b/rpc/json.go index 8c2a672e3..2e6ef2c2b 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -72,8 +72,12 @@ func (self jsonWrapper) GetRequestReply(xeth *EthereumApi, req *RpcRequest, repl return err } return xeth.GetTxCountAt(args, reply) - // case "eth_codeAt": - // return nil + case "eth_codeAt": + args, err := req.ToGetCodeAtArgs() + if err != nil { + return err + } + return xeth.GetCodeAt(args, reply) case "eth_balanceAt": args, err := req.ToGetBalanceArgs() if err != nil { -- cgit v1.2.3 From a81d835e4d27f600fac31f74d938d0b6502c3072 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 13 Jan 2015 09:37:08 -0600 Subject: cleanup --- rpc/json.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpc/json.go') diff --git a/rpc/json.go b/rpc/json.go index 2e6ef2c2b..dc37a7cb7 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -55,7 +55,7 @@ func (self jsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) } func (self jsonWrapper) GetRequestReply(xeth *EthereumApi, req *RpcRequest, reply *interface{}) error { - // call function for request method + // Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC jsonlogger.DebugDetailf("%T %s", req.Params, req.Params) switch req.Method { case "eth_coinbase": -- cgit v1.2.3 From 215780ab562b940bfc653c16bf84f812ef062821 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 20 Jan 2015 13:58:51 -0600 Subject: Move GetRequestReply to EthereumApi Off of jsonWrapper --- rpc/json.go | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) (limited to 'rpc/json.go') diff --git a/rpc/json.go b/rpc/json.go index dc37a7cb7..5446cb3c1 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -54,54 +54,4 @@ func (self jsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) return reqParsed, nil } -func (self jsonWrapper) GetRequestReply(xeth *EthereumApi, req *RpcRequest, reply *interface{}) error { - // Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC - jsonlogger.DebugDetailf("%T %s", req.Params, req.Params) - switch req.Method { - case "eth_coinbase": - return xeth.GetCoinbase(reply) - case "eth_listening": - return xeth.GetIsListening(reply) - case "eth_mining": - return xeth.GetIsMining(reply) - case "eth_peerCount": - return xeth.GetPeerCount(reply) - case "eth_countAt": - args, err := req.ToGetTxCountArgs() - if err != nil { - return err - } - return xeth.GetTxCountAt(args, reply) - case "eth_codeAt": - args, err := req.ToGetCodeAtArgs() - if err != nil { - return err - } - return xeth.GetCodeAt(args, reply) - case "eth_balanceAt": - args, err := req.ToGetBalanceArgs() - if err != nil { - return err - } - return xeth.GetBalanceAt(args, reply) - case "eth_stateAt": - args, err := req.ToGetStorageArgs() - if err != nil { - return err - } - return xeth.GetStorageAt(args, reply) - case "eth_blockByNumber", "eth_blockByHash": - args, err := req.ToGetBlockArgs() - if err != nil { - return err - } - return xeth.GetBlock(args, reply) - default: - return NewErrorResponse(ErrorNotImplemented) - } - - jsonlogger.DebugDetailf("Reply: %T %s", reply, reply) - return nil -} - var JSON jsonWrapper -- cgit v1.2.3