From 5d6d40f329410f20d9ceb92d31985a883d94cb24 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Wed, 8 Jul 2015 13:21:06 +0200 Subject: Use uint64 on ts in chain_manager, block_processor --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index 79514b231..085721751 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -427,7 +427,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, -- cgit v1.2.3 From 819ecd450860827ad1e5840104722f3f51858b5a Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Wed, 8 Jul 2015 15:18:52 +0200 Subject: miner, xeth: fire log event during mining. Fix return raw tx --- miner/worker.go | 1 + 1 file changed, 1 insertion(+) (limited to 'miner') diff --git a/miner/worker.go b/miner/worker.go index 79514b231..1dfc4c77e 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()) -- cgit v1.2.3