aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-25 00:49:14 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-25 00:49:14 +0800
commit5a43173e5599b0f2eceb057b636bc45c4d51919b (patch)
tree26620932973318550d5b50ef0103adf86f912280 /rpc
parent91a8c08f037c1ec737d15ce00c6720015347e0d6 (diff)
parent1e919a5e977f81b746568e50604b63d1dd393a6b (diff)
downloaddexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.tar
dexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.tar.gz
dexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.tar.bz2
dexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.tar.lz
dexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.tar.xz
dexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.tar.zst
dexon-5a43173e5599b0f2eceb057b636bc45c4d51919b.zip
Merge pull request #373 from tgerring/issue370
Convert gas values to integers
Diffstat (limited to 'rpc')
-rw-r--r--rpc/packages.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/rpc/packages.go b/rpc/packages.go
index 97227a64d..0f00441d2 100644
--- a/rpc/packages.go
+++ b/rpc/packages.go
@@ -25,9 +25,9 @@ import (
"github.com/ethereum/go-ethereum/xeth"
)
-const (
- defaultGasPrice = "10000000000000"
- defaultGas = "10000"
+var (
+ defaultGasPrice = big.NewInt(10000000000000)
+ defaultGas = big.NewInt(10000)
)
type EthereumApi struct {
@@ -185,11 +185,11 @@ func (p *EthereumApi) GetBlock(args *GetBlockArgs, reply *interface{}) error {
func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
if len(args.Gas) == 0 {
- args.Gas = defaultGas
+ args.Gas = defaultGas.String()
}
if len(args.GasPrice) == 0 {
- args.GasPrice = defaultGasPrice
+ args.GasPrice = defaultGasPrice.String()
}
// TODO if no_private_key then
@@ -516,7 +516,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
}
return p.AllLogs(args, reply)
case "eth_gasPrice":
- *reply = defaultGasPrice
+ *reply = toHex(defaultGasPrice.Bytes())
return nil
case "eth_register":
args, err := req.ToRegisterArgs()