diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-01-03 22:53:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 22:53:06 +0800 |
| commit | 762f3a48a00da02fe58063cb6ce8dc2d08821f15 (patch) | |
| tree | 783421f8ece4306f69cb17e515ee07c1ab4fe0eb /miner | |
| parent | b47285f1cf0cb475f29322ceb9fac4d7e1cfb11f (diff) | |
| parent | 6f69cdd109b1dd692b8dfb15e7c53d2051fbc946 (diff) | |
| download | dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.tar dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.tar.gz dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.tar.bz2 dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.tar.lz dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.tar.xz dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.tar.zst dexon-762f3a48a00da02fe58063cb6ce8dc2d08821f15.zip | |
Merge pull request #15466 from karalabe/uint64-gas-limit
all: switch gas limits from big.Int to uint64
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/miner/worker.go b/miner/worker.go index c1f848e32..638f759bf 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -413,7 +413,6 @@ func (self *worker) commitNewWork() { ParentHash: parent.Hash(), Number: num.Add(num, common.Big1), GasLimit: core.CalcGasLimit(parent), - GasUsed: new(big.Int), Extra: self.extra, Time: big.NewInt(tstamp), } @@ -588,7 +587,7 @@ func (env *Work) commitTransactions(mux *event.TypeMux, txs *types.TransactionsB func (env *Work) commitTransaction(tx *types.Transaction, bc *core.BlockChain, coinbase common.Address, gp *core.GasPool) (error, []*types.Log) { snap := env.state.Snapshot() - receipt, _, err := core.ApplyTransaction(env.config, bc, &coinbase, gp, env.state, env.header, tx, env.header.GasUsed, vm.Config{}) + receipt, _, err := core.ApplyTransaction(env.config, bc, &coinbase, gp, env.state, env.header, tx, &env.header.GasUsed, vm.Config{}) if err != nil { env.state.RevertToSnapshot(snap) return err, nil |