rpc/api: fixed default gas-(price) issue.

2 files changed, 10 insertions, 7 deletions

diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index a0b9dad86..d329dbf10 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -259,7 +259,14 @@ func (self *ethApi) SendTransaction(req *shared.Request) (interface{}, error) {
 		nonce = args.Nonce.String()
 	}
 
-	v, err := self.xeth.Transact(args.From, args.To, nonce, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
+	var gas, price string
+	if args.Gas != nil {
+		gas = args.Gas.String()
+	}
+	if args.GasPrice != nil {
+		price = args.GasPrice.String()
+	}
+	v, err := self.xeth.Transact(args.From, args.To, nonce, args.Value.String(), gas, price, args.Data)
 	if err != nil {
 		return nil, err
 	}
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index ad9a35fa2..1c86bee51 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -333,9 +333,7 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
 	args.Value = num
 
 	num = nil
-	if ext.Gas == nil {
-		num = big.NewInt(0)
-	} else {
+	if ext.Gas != nil {
 		if num, err = numString(ext.Gas); err != nil {
 			return err
 		}
@@ -343,9 +341,7 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
 	args.Gas = num
 
 	num = nil
-	if ext.GasPrice == nil {
-		num = big.NewInt(0)
-	} else {
+	if ext.GasPrice != nil {
 		if num, err = numString(ext.GasPrice); err != nil {
 			return err
 		}