diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-20 18:31:36 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-20 18:31:36 +0800 |
| commit | 796952a49ac12caa3949587e22a7a03c30a8910c (patch) | |
| tree | 59930f3d627940e1b73030ee2c5685104a04ee34 /xeth/xeth.go | |
| parent | 10ed107ba2001d1aabba3d319ba88c5ce6e8fdc0 (diff) | |
| parent | de8d5aaa92ff843e6960eb9b7bd7ec1c1ebc6608 (diff) | |
| download | go-tangerine-796952a49ac12caa3949587e22a7a03c30a8910c.tar.gz go-tangerine-796952a49ac12caa3949587e22a7a03c30a8910c.tar.zst go-tangerine-796952a49ac12caa3949587e22a7a03c30a8910c.zip | |
Merge pull request #1758 from fjl/coinbase
core, core/state: move gas tracking out of core/state
Diffstat (limited to 'xeth/xeth.go')
| -rw-r--r-- | xeth/xeth.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index baa8314ad..1cb072f0d 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -850,7 +850,6 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st } from.SetBalance(common.MaxBig) - from.SetGasLimit(common.MaxBig) msg := callmsg{ from: from, @@ -874,8 +873,8 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st header := self.CurrentBlock().Header() vmenv := core.NewEnv(statedb, self.backend.BlockChain(), msg, header) - - res, gas, err := core.ApplyMessage(vmenv, msg, from) + gp := new(core.GasPool).AddGas(common.MaxBig) + res, gas, err := core.ApplyMessage(vmenv, msg, gp) return common.ToHex(res), gas.String(), err } |