diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-10 00:06:39 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-10 00:06:39 +0800 |
| commit | 98f4c936f25de27dbc90f36f2c1ffd1f23b114e9 (patch) | |
| tree | 07f8b038c7421e1a9af0fd54e7b78e0002c4591e /miner/worker.go | |
| parent | 423c2f499c2350ae54d02a3151686ebd39fc8c94 (diff) | |
| parent | 344277d026001d8e114ebfad92f1c385dcd3d3da (diff) | |
| download | dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.tar dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.tar.gz dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.tar.bz2 dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.tar.lz dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.tar.xz dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.tar.zst dexon-98f4c936f25de27dbc90f36f2c1ffd1f23b114e9.zip | |
Merge branch 'release/0.9.38'
Diffstat (limited to 'miner/worker.go')
| -rw-r--r-- | miner/worker.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index 79514b231..9f804bf30 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -298,6 +298,7 @@ func (self *worker) wait() { self.mux.Post(core.ChainEvent{block, block.Hash(), logs}) if stat == core.CanonStatTy { self.mux.Post(core.ChainHeadEvent{block}) + self.mux.Post(logs) } }(block, self.current.state.Logs()) @@ -427,7 +428,7 @@ func (self *worker) commitNewWork() { header := &types.Header{ ParentHash: parent.Hash(), Number: num.Add(num, common.Big1), - Difficulty: core.CalcDifficulty(int64(tstamp), int64(parent.Time()), parent.Difficulty()), + Difficulty: core.CalcDifficulty(uint64(tstamp), parent.Time(), parent.Difficulty()), GasLimit: core.CalcGasLimit(parent), GasUsed: new(big.Int), Coinbase: self.coinbase, |