diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-27 03:21:41 +0800 |
| commit | 76f6d75ef867e754264834fc7171d1a12f24c5bb (patch) | |
| tree | a9531d9e14c15abd72625a98a21a9b988dc32319 /miner/worker.go | |
| parent | b2a225a52e45315f3ec90e11707fefa6059d13f5 (diff) | |
| parent | fa7deb10f636d89f668249b78792f8cc48146ee8 (diff) | |
| download | go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.gz go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.bz2 go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.lz go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.xz go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.tar.zst go-tangerine-76f6d75ef867e754264834fc7171d1a12f24c5bb.zip | |
Merge branch 'master' into hotfix/0.8.5-2
Diffstat (limited to 'miner/worker.go')
| -rw-r--r-- | miner/worker.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miner/worker.go b/miner/worker.go index 1f3a52ab5..4f0909302 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -197,7 +197,7 @@ gasLimit: } self.eth.TxPool().RemoveSet(remove) - self.current.coinbase.AddAmount(core.BlockReward) + self.current.coinbase.AddBalance(core.BlockReward) self.current.state.Update(ethutil.Big0) self.push() @@ -225,7 +225,7 @@ func (self *worker) commitUncle(uncle *types.Header) error { } uncleAccount := self.current.state.GetAccount(uncle.Coinbase) - uncleAccount.AddAmount(uncleReward) + uncleAccount.AddBalance(uncleReward) self.current.coinbase.AddBalance(uncleReward) |