tornadocontrib/bsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lowered default gas price and increased default gas limit

Browse Source
This commit is contained in:
obscuren 2015-03-11 17:36:35 +01:00
parent 2da7af4ba0
commit c01d4c2f4c
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/state_transition.go
View File

@ -199,6 +199,8 @@ func (self *StateTransition) TransitionState() (ret []byte, err error) {
dataGas.Mul(dataGas, vm.GasCreateByte) dataGas.Mul(dataGas, vm.GasCreateByte)
if err := self.UseGas(dataGas); err == nil { if err := self.UseGas(dataGas); err == nil {
ref.SetCode(ret) ref.SetCode(ret)
} else {
statelogger.Infoln("Insufficient gas for creating code. Require", dataGas, "and have", self.gas)
} }
} }
} else { } else {

5
rpc/api.go
View File

@ -21,8 +21,8 @@ import (
) )
var ( var (
defaultGasPrice = big.NewInt(10000000000000) defaultGasPrice = big.NewInt(150000000000)
defaultGas = big.NewInt(50000) defaultGas = big.NewInt(500000)
filterTickerTime = 15 * time.Second 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 // TODO: align default values to have the same type, e.g. not depend on
// ethutil.Value conversions later on // ethutil.Value conversions later on
fmt.Println("gas", args.Gas)
if args.Gas.Cmp(big.NewInt(0)) == 0 { if args.Gas.Cmp(big.NewInt(0)) == 0 {
args.Gas = defaultGas args.Gas = defaultGas
} }

20
xeth/xeth.go
View File

@ -293,14 +293,12 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
return toHex(tx.Hash()), nil return toHex(tx.Hash()), nil
} }
func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) { var (
if len(gasStr) == 0 { defaultGasPrice = big.NewInt(10000000000000)
gasStr = "100000" defaultGas = big.NewInt(90000)
} )
if len(gasPriceStr) == 0 {
gasPriceStr = "1"
}
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{
from: statedb.GetOrNewStateObject(fromHex(fromStr)), from: statedb.GetOrNewStateObject(fromHex(fromStr)),
@ -310,6 +308,14 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st
value: ethutil.Big(valueStr), value: ethutil.Big(valueStr),
data: fromHex(dataStr), 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() block := self.chainManager.CurrentBlock()
vmenv := core.NewEnv(statedb, self.chainManager, msg, block) vmenv := core.NewEnv(statedb, self.chainManager, msg, block)