diff options
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api.go | 8 | ||||
| -rw-r--r-- | rpc/args.go | 10 | ||||
| -rw-r--r-- | rpc/jeth.go | 69 |
3 files changed, 64 insertions, 23 deletions
diff --git a/rpc/api.go b/rpc/api.go index 6d3a20bfa..b79a1306e 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -173,7 +173,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return fmt.Errorf("Transaction not confirmed") } - v, err := api.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) + // nonce may be nil ("guess" mode) + var nonce string + if args.Nonce != nil { + nonce = args.Nonce.String() + } + + v, err := api.xeth().Transact(args.From, args.To, nonce, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) if err != nil { return err } diff --git a/rpc/args.go b/rpc/args.go index 4bd48e6d6..e61f28c4f 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -157,6 +157,7 @@ func (args *GetBlockByNumberArgs) UnmarshalJSON(b []byte) (err error) { type NewTxArgs struct { From string To string + Nonce *big.Int Value *big.Int Gas *big.Int GasPrice *big.Int @@ -170,6 +171,7 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) { var ext struct { From string To string + Nonce interface{} Value interface{} Gas interface{} GasPrice interface{} @@ -200,6 +202,14 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) { args.Data = ext.Data var num *big.Int + if ext.Nonce != nil { + num, err = numString(ext.Nonce) + if err != nil { + return err + } + } + args.Nonce = num + if ext.Value == nil { num = big.NewInt(0) } else { diff --git a/rpc/jeth.go b/rpc/jeth.go index e83212bb5..4739316b2 100644 --- a/rpc/jeth.go +++ b/rpc/jeth.go @@ -2,8 +2,7 @@ package rpc import ( "encoding/json" - "fmt" - // "fmt" + "github.com/ethereum/go-ethereum/jsre" "github.com/robertkrimen/otto" ) @@ -18,12 +17,12 @@ func NewJeth(ethApi *EthereumApi, toVal func(interface{}) otto.Value, re *jsre.J return &Jeth{ethApi, toVal, re} } -func (self *Jeth) err(code int, msg string, id interface{}) (response otto.Value) { +func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) { rpcerr := &RpcErrorObject{code, msg} - self.re.Set("ret_jsonrpc", jsonrpcver) - self.re.Set("ret_id", id) - self.re.Set("ret_error", rpcerr) - response, _ = self.re.Run(` + call.Otto.Set("ret_jsonrpc", jsonrpcver) + call.Otto.Set("ret_id", id) + call.Otto.Set("ret_error", rpcerr) + response, _ = call.Otto.Run(` ret_response = { jsonrpc: ret_jsonrpc, id: ret_id, error: ret_error }; `) return @@ -32,27 +31,53 @@ func (self *Jeth) err(code int, msg string, id interface{}) (response otto.Value func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) { reqif, err := call.Argument(0).Export() if err != nil { - return self.err(-32700, err.Error(), nil) + return self.err(call, -32700, err.Error(), nil) } jsonreq, err := json.Marshal(reqif) - var req RpcRequest - err = json.Unmarshal(jsonreq, &req) - - var respif interface{} - err = self.ethApi.GetRequestReply(&req, &respif) + var reqs []RpcRequest + batch := true + err = json.Unmarshal(jsonreq, &reqs) if err != nil { - fmt.Printf("error: %s\n", err) - return self.err(-32603, err.Error(), req.Id) + reqs = make([]RpcRequest, 1) + err = json.Unmarshal(jsonreq, &reqs[0]) + batch = false + } + + call.Otto.Set("response_len", len(reqs)) + call.Otto.Run("var ret_response = new Array(response_len);") + + for i, req := range reqs { + var respif interface{} + err = self.ethApi.GetRequestReply(&req, &respif) + if err != nil { + return self.err(call, -32603, err.Error(), req.Id) + } + call.Otto.Set("ret_jsonrpc", jsonrpcver) + call.Otto.Set("ret_id", req.Id) + + res, _ := json.Marshal(respif) + + call.Otto.Set("ret_result", string(res)) + call.Otto.Set("response_idx", i) + response, err = call.Otto.Run(` + ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, result: JSON.parse(ret_result) }; + `) + } + + if !batch { + call.Otto.Run("ret_response = ret_response[0];") + } + + if call.Argument(1).IsObject() { + call.Otto.Set("callback", call.Argument(1)) + call.Otto.Run(` + if (Object.prototype.toString.call(callback) == '[object Function]') { + callback(null, ret_response); + } + `) } - self.re.Set("ret_jsonrpc", jsonrpcver) - self.re.Set("ret_id", req.Id) - res, _ := json.Marshal(respif) - self.re.Set("ret_result", string(res)) - response, err = self.re.Run(` - ret_response = { jsonrpc: ret_jsonrpc, id: ret_id, result: JSON.parse(ret_result) }; - `) return } |