diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-04 19:24:21 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-04-04 19:24:21 +0800 |
| commit | 47298264663a563b34ebb8a1faf9fb8326fdef01 (patch) | |
| tree | a8d42be85553fbb057cc47356d85cfea24d6832b /rpc | |
| parent | 3e042317adc99438d6ffde0cbde4f0b40ad579c1 (diff) | |
| parent | bc5528b165e48e223c9c38dc1355511014c97e34 (diff) | |
| download | go-tangerine-47298264663a563b34ebb8a1faf9fb8326fdef01.tar.gz go-tangerine-47298264663a563b34ebb8a1faf9fb8326fdef01.tar.zst go-tangerine-47298264663a563b34ebb8a1faf9fb8326fdef01.zip | |
Merge branch 'develop' into rpcfabian
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api.go | 2 | ||||
| -rw-r--r-- | rpc/jeth.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/rpc/api.go b/rpc/api.go index 573f689a2..30ba1ddc1 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -68,7 +68,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err case "eth_mining": *reply = api.xeth().IsMining() case "eth_gasPrice": - v := api.xeth().DefaultGas() + v := xeth.DefaultGas() *reply = common.ToHex(v.Bytes()) case "eth_accounts": *reply = api.xeth().Accounts() diff --git a/rpc/jeth.go b/rpc/jeth.go index 9d33f45e1..e83212bb5 100644 --- a/rpc/jeth.go +++ b/rpc/jeth.go @@ -2,6 +2,7 @@ package rpc import ( "encoding/json" + "fmt" // "fmt" "github.com/ethereum/go-ethereum/jsre" "github.com/robertkrimen/otto" @@ -42,6 +43,7 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) { var respif interface{} err = self.ethApi.GetRequestReply(&req, &respif) if err != nil { + fmt.Printf("error: %s\n", err) return self.err(-32603, err.Error(), req.Id) } self.re.Set("ret_jsonrpc", jsonrpcver) |