From c8a9a4e76d00483280a51bb6c0f9517d6c531589 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 29 May 2015 14:27:15 -0500 Subject: Differentiate between 0 and unspecified gas/gasprice --- rpc/api.go | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'rpc/api.go') diff --git a/rpc/api.go b/rpc/api.go index 6b37acb03..33789a55f 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 { + gas = "" + } else { + gas = 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 { + gas = "" + } else { + gas = args.GasPrice.String() + } + + return api.xethAtStateNum(args.BlockNumber).Call(args.From, args.To, args.Value.String(), gas, gasprice, args.Data) } -- cgit v1.2.3 From 1c364b6beb433d4fd8ffda0daead5752fe05f544 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 8 Jun 2015 20:10:36 -0400 Subject: gas -> gasprice --- rpc/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/api.go') diff --git a/rpc/api.go b/rpc/api.go index 33789a55f..da3219933 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -626,9 +626,9 @@ func (api *EthereumApi) doCall(params json.RawMessage) (string, string, error) { var gasprice string if args.GasPrice == nil { - gas = "" + gasprice = "" } else { - gas = args.GasPrice.String() + gasprice = args.GasPrice.String() } return api.xethAtStateNum(args.BlockNumber).Call(args.From, args.To, args.Value.String(), gas, gasprice, args.Data) -- cgit v1.2.3 From 1a967986428315b5551500f7db9c55c637fe6105 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 8 Jun 2015 20:10:36 -0400 Subject: gas -> gasprice --- rpc/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/api.go') diff --git a/rpc/api.go b/rpc/api.go index da3219933..e35395734 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -191,9 +191,9 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err var gasprice string if args.GasPrice == nil { - gas = "" + gasprice = "" } else { - gas = args.GasPrice.String() + gasprice = args.GasPrice.String() } v, err := api.xeth().Transact(args.From, args.To, nonce, args.Value.String(), gas, gasprice, args.Data) -- cgit v1.2.3