diff options
| author | Yondon Fu <yondon.fu@gmail.com> | 2017-12-19 06:17:41 +0800 |
|---|---|---|
| committer | Yondon Fu <yondon.fu@gmail.com> | 2017-12-19 06:17:41 +0800 |
| commit | 3857cdc267e3192697f561df0a0f827f65dfb6b5 (patch) | |
| tree | 401c52c4972a68229ea283a394a0b0a5f3cfdc8e /miner | |
| parent | a5330fe0c569b75cb8a524f60f7e8dc06498262b (diff) | |
| parent | fe070ab5c32702033489f1b9d1655ea1b894c29e (diff) | |
| download | dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.gz dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.bz2 dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.lz dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.xz dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.zst dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.zip | |
Merge branch 'master' into abi-offset-fixed-arrays
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/unconfirmed.go | 2 | ||||
| -rw-r--r-- | miner/worker.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index ee52d8512..7a4fc7cc5 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -42,7 +42,7 @@ type unconfirmedBlock struct { // unconfirmedBlocks implements a data structure to maintain locally mined blocks // have have not yet reached enough maturity to guarantee chain inclusion. It is // used by the miner to provide logs to the user when a previously mined block -// has a high enough guarantee to not be reorged out of te canonical chain. +// has a high enough guarantee to not be reorged out of the canonical chain. type unconfirmedBlocks struct { chain headerRetriever // Blockchain to verify canonical status through depth uint // Depth after which to discard previous blocks diff --git a/miner/worker.go b/miner/worker.go index bf24970f5..c1f848e32 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -269,6 +269,11 @@ func (self *worker) update() { self.current.commitTransactions(self.mux, txset, self.chain, self.coinbase) self.currentMu.Unlock() + } else { + // If we're mining, but nothing is being processed, wake on new transactions + if self.config.Clique != nil && self.config.Clique.Period == 0 { + self.commitNewWork() + } } // System stopped |