mirror of
https://gitlab.com/pulsechaincom/erigon-pulse.git
synced 2024-12-23 12:07:17 +00:00
changed send methods for backwards compatability in geth console
This commit is contained in:
parent
a1a475fb92
commit
862117e4bd
@ -111,6 +111,7 @@ func (js *jsre) apiBindings(ipcpath string, f xeth.Frontend) {
|
|||||||
js.re.Set("jeth", struct{}{})
|
js.re.Set("jeth", struct{}{})
|
||||||
t, _ := js.re.Get("jeth")
|
t, _ := js.re.Get("jeth")
|
||||||
jethObj := t.Object()
|
jethObj := t.Object()
|
||||||
|
|
||||||
jethObj.Set("send", jeth.Send)
|
jethObj.Set("send", jeth.Send)
|
||||||
jethObj.Set("sendAsync", jeth.Send)
|
jethObj.Set("sendAsync", jeth.Send)
|
||||||
|
|
||||||
|
@ -307,8 +307,8 @@ func console(ctx *cli.Context) {
|
|||||||
repl := newJSRE(
|
repl := newJSRE(
|
||||||
ethereum,
|
ethereum,
|
||||||
ctx.String(utils.JSpathFlag.Name),
|
ctx.String(utils.JSpathFlag.Name),
|
||||||
ctx.GlobalString(utils.IPCPathFlag.Name),
|
|
||||||
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
||||||
|
ctx.GlobalString(utils.IPCPathFlag.Name),
|
||||||
true,
|
true,
|
||||||
nil,
|
nil,
|
||||||
)
|
)
|
||||||
@ -329,8 +329,8 @@ func execJSFiles(ctx *cli.Context) {
|
|||||||
repl := newJSRE(
|
repl := newJSRE(
|
||||||
ethereum,
|
ethereum,
|
||||||
ctx.String(utils.JSpathFlag.Name),
|
ctx.String(utils.JSpathFlag.Name),
|
||||||
ctx.GlobalString(utils.IPCPathFlag.Name),
|
|
||||||
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
||||||
|
ctx.GlobalString(utils.IPCPathFlag.Name),
|
||||||
false,
|
false,
|
||||||
nil,
|
nil,
|
||||||
)
|
)
|
||||||
|
54
rpc/jeth.go
54
rpc/jeth.go
@ -39,6 +39,60 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
|
|||||||
return self.err(call, -32700, err.Error(), nil)
|
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)
|
client, err := comms.NewIpcClient(comms.IpcConfig{self.ipcpath}, codec.JSON)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Unable to connect to geth.")
|
fmt.Println("Unable to connect to geth.")
|
||||||
|
Loading…
Reference in New Issue
Block a user