Default gas

This commit is contained in:
obscuren 2015-04-02 14:00:49 +02:00
parent 55b1c1546b
commit 1e28b424e7
3 changed files with 7 additions and 5 deletions

View File

@ -67,7 +67,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
case "eth_mining":
*reply = api.xeth().IsMining()
case "eth_gasPrice":
v := api.xeth().DefaultGas()
v := xeth.DefaultGas()
*reply = common.ToHex(v.Bytes())
case "eth_accounts":
*reply = api.xeth().Accounts()

View File

@ -2,6 +2,7 @@ package rpc
import (
"encoding/json"
"fmt"
// "fmt"
"github.com/ethereum/go-ethereum/jsre"
"github.com/robertkrimen/otto"
@ -42,6 +43,7 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
var respif interface{}
err = self.ethApi.GetRequestReply(&req, &respif)
if err != nil {
fmt.Printf("error: %s\n", err)
return self.err(-32603, err.Error(), req.Id)
}
self.re.Set("ret_jsonrpc", jsonrpcver)

View File

@ -566,11 +566,11 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st
}
if msg.gas.Cmp(big.NewInt(0)) == 0 {
msg.gas = self.DefaultGas()
msg.gas = DefaultGas()
}
if msg.gasPrice.Cmp(big.NewInt(0)) == 0 {
msg.gasPrice = self.DefaultGasPrice()
msg.gasPrice = DefaultGasPrice()
}
block := self.CurrentBlock()
@ -616,11 +616,11 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
// TODO: align default values to have the same type, e.g. not depend on
// common.Value conversions later on
if gas.Cmp(big.NewInt(0)) == 0 {
gas = self.DefaultGas()
gas = DefaultGas()
}
if price.Cmp(big.NewInt(0)) == 0 {
price = self.DefaultGasPrice()
price = DefaultGasPrice()
}
data = common.FromHex(codeStr)