roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Move gas defaults to XEth

Browse Source
This commit is contained in:
Taylor Gerring 2015-03-20 00:23:48 -04:00
parent 3cea7d87c1
commit 754160afea
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpc/api.go
View File

@ -2,7 +2,6 @@ package rpc
import ( import (
"encoding/json" "encoding/json"
"fmt"
"math/big" "math/big"
"path" "path"
"strings" "strings"
@ -15,11 +14,6 @@ import (
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
) )
var (
defaultGasPrice = big.NewInt(150000000000)
defaultGas = big.NewInt(500000)
)
type EthereumApi struct { type EthereumApi struct {
eth *xeth.XEth eth *xeth.XEth
xethMu sync.RWMutex xethMu sync.RWMutex
@ -109,16 +103,15 @@ func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) (err error)
// TODO: align default values to have the same type, e.g. not depend on // TODO: align default values to have the same type, e.g. not depend on
// common.Value conversions later on // common.Value conversions later on
if args.Gas.Cmp(big.NewInt(0)) == 0 { if args.Gas.Cmp(big.NewInt(0)) == 0 {
args.Gas = defaultGas args.Gas = p.xeth().DefaultGas()
} }
if args.GasPrice.Cmp(big.NewInt(0)) == 0 { if args.GasPrice.Cmp(big.NewInt(0)) == 0 {
args.GasPrice = defaultGasPrice args.GasPrice = p.xeth().DefaultGasPrice()
} }
*reply, err = p.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) *reply, err = p.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data)
if err != nil { if err != nil {
fmt.Println("err:", err)
return err return err
} }
@ -199,7 +192,7 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
case "eth_mining": case "eth_mining":
*reply = p.xeth().IsMining() *reply = p.xeth().IsMining()
case "eth_gasPrice": case "eth_gasPrice":
*reply = common.ToHex(defaultGasPrice.Bytes()) *reply = common.ToHex(p.xeth().DefaultGas().Bytes())
case "eth_accounts": case "eth_accounts":
*reply = p.xeth().Accounts() *reply = p.xeth().Accounts()
case "eth_blockNumber": case "eth_blockNumber":

10
xeth/xeth.go
View File

@ -25,6 +25,8 @@ import (
var ( var (
pipelogger = logger.NewLogger("XETH") pipelogger = logger.NewLogger("XETH")
filterTickerTime = 5 * time.Minute filterTickerTime = 5 * time.Minute
defaultGasPrice = big.NewInt(10000000000000) //150000000000
defaultGas = big.NewInt(90000) //500000
) )
// to resolve the import cycle // to resolve the import cycle
@ -154,6 +156,9 @@ func (self *XEth) stop() {
close(self.quit) close(self.quit)
} }
func (self *XEth) DefaultGas() *big.Int { return defaultGas }
func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice }
func (self *XEth) AtStateNum(num int64) *XEth { func (self *XEth) AtStateNum(num int64) *XEth {
chain := self.Backend().ChainManager() chain := self.Backend().ChainManager()
var block *types.Block var block *types.Block
@ -486,11 +491,6 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
return common.ToHex(tx.Hash()), nil return common.ToHex(tx.Hash()), nil
} }
var (
defaultGasPrice = big.NewInt(10000000000000)
defaultGas = big.NewInt(90000)
)
func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) { func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
statedb := self.State().State() //self.chainManager.TransState() statedb := self.State().State() //self.chainManager.TransState()
msg := callmsg{ msg := callmsg{