mirror of https://github.com/status-im/op-geth.git
Merge pull request #373 from tgerring/issue370
Convert gas values to integers
This commit is contained in:
commit
5a43173e55
|
@ -25,9 +25,9 @@ import (
|
||||||
"github.com/ethereum/go-ethereum/xeth"
|
"github.com/ethereum/go-ethereum/xeth"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
var (
|
||||||
defaultGasPrice = "10000000000000"
|
defaultGasPrice = big.NewInt(10000000000000)
|
||||||
defaultGas = "10000"
|
defaultGas = big.NewInt(10000)
|
||||||
)
|
)
|
||||||
|
|
||||||
type EthereumApi struct {
|
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 {
|
func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) error {
|
||||||
if len(args.Gas) == 0 {
|
if len(args.Gas) == 0 {
|
||||||
args.Gas = defaultGas
|
args.Gas = defaultGas.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(args.GasPrice) == 0 {
|
if len(args.GasPrice) == 0 {
|
||||||
args.GasPrice = defaultGasPrice
|
args.GasPrice = defaultGasPrice.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO if no_private_key then
|
// TODO if no_private_key then
|
||||||
|
@ -516,7 +516,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
|
||||||
}
|
}
|
||||||
return p.AllLogs(args, reply)
|
return p.AllLogs(args, reply)
|
||||||
case "eth_gasPrice":
|
case "eth_gasPrice":
|
||||||
*reply = defaultGasPrice
|
*reply = toHex(defaultGasPrice.Bytes())
|
||||||
return nil
|
return nil
|
||||||
case "eth_register":
|
case "eth_register":
|
||||||
args, err := req.ToRegisterArgs()
|
args, err := req.ToRegisterArgs()
|
||||||
|
|
Loading…
Reference in New Issue