diff options
| author | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
| commit | bac9a94ddf20dc530966cbf6cd384aaf94aedc77 (patch) | |
| tree | 0ced967e60315698cc5056a984d7678c417bc1ce /rpc/api.go | |
| parent | 0e703d92ac9df61e2ededa8c895c70ded101a607 (diff) | |
| parent | 14994fa21bf6f05554ff370d41005d06b68d20a5 (diff) | |
| download | dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.gz dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.bz2 dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.lz dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.xz dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.zst dexon-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.zip | |
Merge branch 'release/0.9.28'
Diffstat (limited to 'rpc/api.go')
| -rw-r--r-- | rpc/api.go | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/rpc/api.go b/rpc/api.go index 6b37acb03..e35395734 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -182,7 +182,21 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err 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) + var gas string + if args.Gas == nil { + gas = "" + } else { + gas = args.Gas.String() + } + + var gasprice string + if args.GasPrice == nil { + gasprice = "" + } else { + gasprice = args.GasPrice.String() + } + + v, err := api.xeth().Transact(args.From, args.To, nonce, args.Value.String(), gas, gasprice, args.Data) if err != nil { return err } @@ -603,5 +617,19 @@ func (api *EthereumApi) doCall(params json.RawMessage) (string, string, error) { return "", "", err } - return api.xethAtStateNum(args.BlockNumber).Call(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) + var gas string + if args.Gas == nil { + gas = "" + } else { + gas = args.Gas.String() + } + + var gasprice string + if args.GasPrice == nil { + gasprice = "" + } else { + gasprice = args.GasPrice.String() + } + + return api.xethAtStateNum(args.BlockNumber).Call(args.From, args.To, args.Value.String(), gas, gasprice, args.Data) } |