cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Merge pull request #616 from bas-vk/develop

Browse Source 
Frontier/513
This commit is contained in:
Jeffrey Wilcke 2015-04-01 13:25:15 +02:00
commit 936ddf2ad1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xeth/xeth.go
View File

@ -129,8 +129,8 @@ func cTopics(t [][]string) [][]common.Hash {
return topics
}
func (self *XEth) DefaultGas() *big.Int { return defaultGas }
func (self *XEth) DefaultGasPrice() *big.Int { return defaultGasPrice }
func (self *XEth) DefaultGas() *big.Int { return new(big.Int).Set(defaultGas) }
func (self *XEth) DefaultGasPrice() *big.Int { return new(big.Int).Set(defaultGasPrice) }
func (self *XEth) RemoteMining() *miner.RemoteAgent { return self.agent }
@ -565,12 +565,13 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st
value: common.Big(valueStr),
data: common.FromHex(dataStr),
}
if msg.gas.Cmp(big.NewInt(0)) == 0 {
msg.gas = defaultGas
msg.gas = self.DefaultGas()
}
if msg.gasPrice.Cmp(big.NewInt(0)) == 0 {
msg.gasPrice = defaultGasPrice
msg.gasPrice = self.DefaultGasPrice()
}
block := self.CurrentBlock()
@ -616,11 +617,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 = defaultGas
gas = self.DefaultGas()
}
if price.Cmp(big.NewInt(0)) == 0 {
price = defaultGasPrice
price = self.DefaultGasPrice()
}
data = common.FromHex(codeStr)