diff options
author | Bas van Kervel <basvankervel@ziggo.nl> | 2015-06-08 19:21:24 +0800 |
---|---|---|
committer | Bas van Kervel <basvankervel@gmail.com> | 2015-06-11 20:17:28 +0800 |
commit | 594a34a88d8e66e82f5333b66f83561f0c0c5bd4 (patch) | |
tree | 8f594fa232f8645c0aabe65c4fd833126fadc338 /rpc/jeth.go | |
parent | 1b59f890955c3658516daa958d0e4732004a78b7 (diff) | |
download | dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.tar dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.tar.gz dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.tar.bz2 dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.tar.lz dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.tar.xz dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.tar.zst dexon-594a34a88d8e66e82f5333b66f83561f0c0c5bd4.zip |
changed send methods for backwards compatability in geth console
Diffstat (limited to 'rpc/jeth.go')
-rw-r--r-- | rpc/jeth.go | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/rpc/jeth.go b/rpc/jeth.go index d1b36906f..69df4500e 100644 --- a/rpc/jeth.go +++ b/rpc/jeth.go @@ -44,6 +44,60 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) { return self.err(call, -32700, err.Error(), nil) } + jsonreq, err := json.Marshal(reqif) + var reqs []RpcRequest + batch := true + err = json.Unmarshal(jsonreq, &reqs) + if err != nil { + 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 { + fmt.Println("Error response:", err) + 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); + } + `) + } + + return +} + +func (self *Jeth) SendIpc(call otto.FunctionCall) (response otto.Value) { + reqif, err := call.Argument(0).Export() + if err != nil { + return self.err(call, -32700, err.Error(), nil) + } + client, err := comms.NewIpcClient(comms.IpcConfig{self.ipcpath}, codec.JSON) if err != nil { fmt.Println("Unable to connect to geth.") |