mirror of https://github.com/status-im/op-geth.git
Lowered default gas price and increased default gas limit
This commit is contained in:
parent
2da7af4ba0
commit
c01d4c2f4c
|
@ -199,6 +199,8 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) {
|
|||
dataGas.Mul(dataGas, vm.GasCreateByte)
|
||||
if err := self.UseGas(dataGas); err == nil {
|
||||
ref.SetCode(ret)
|
||||
} else {
|
||||
statelogger.Infoln("Insufficient gas for creating code. Require", dataGas, "and have", self.gas)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -21,8 +21,8 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
defaultGasPrice = big.NewInt(10000000000000)
|
||||
defaultGas = big.NewInt(50000)
|
||||
defaultGasPrice = big.NewInt(150000000000)
|
||||
defaultGas = big.NewInt(500000)
|
||||
filterTickerTime = 15 * time.Second
|
||||
)
|
||||
|
||||
|
@ -252,7 +252,6 @@ func (p *EthereumApi) Transact(args *NewTxArgs, reply *interface{}) (err error)
|
|||
*/
|
||||
// TODO: align default values to have the same type, e.g. not depend on
|
||||
// ethutil.Value conversions later on
|
||||
fmt.Println("gas", args.Gas)
|
||||
if args.Gas.Cmp(big.NewInt(0)) == 0 {
|
||||
args.Gas = defaultGas
|
||||
}
|
||||
|
|
20
xeth/xeth.go
20
xeth/xeth.go
|
@ -293,14 +293,12 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
|
|||
return toHex(tx.Hash()), nil
|
||||
}
|
||||
|
||||
func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
|
||||
if len(gasStr) == 0 {
|
||||
gasStr = "100000"
|
||||
}
|
||||
if len(gasPriceStr) == 0 {
|
||||
gasPriceStr = "1"
|
||||
}
|
||||
var (
|
||||
defaultGasPrice = big.NewInt(10000000000000)
|
||||
defaultGas = big.NewInt(90000)
|
||||
)
|
||||
|
||||
func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) {
|
||||
statedb := self.State().State() //self.chainManager.TransState()
|
||||
msg := callmsg{
|
||||
from: statedb.GetOrNewStateObject(fromHex(fromStr)),
|
||||
|
@ -310,6 +308,14 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st
|
|||
value: ethutil.Big(valueStr),
|
||||
data: fromHex(dataStr),
|
||||
}
|
||||
if msg.gas.Cmp(big.NewInt(0)) == 0 {
|
||||
msg.gas = defaultGas
|
||||
}
|
||||
|
||||
if msg.gasPrice.Cmp(big.NewInt(0)) == 0 {
|
||||
msg.gasPrice = defaultGasPrice
|
||||
}
|
||||
|
||||
block := self.chainManager.CurrentBlock()
|
||||
vmenv := core.NewEnv(statedb, self.chainManager, msg, block)
|
||||
|
||||
|
|
Loading…
Reference in New Issue