diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-09 22:06:51 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-09 22:06:51 +0800 |
| commit | 335dc9e6874160bb1c1059d676e8842523a732e0 (patch) | |
| tree | 9bea2807df997da3d3b4d0fe31dbb75db2a36866 /ethminer | |
| parent | 35a82f8f4a69019d72ff3379e0f61bf2be475e42 (diff) | |
| parent | 6d28bf534f0fabb5740ef035b829e5edc4dc3131 (diff) | |
| download | dexon-335dc9e6874160bb1c1059d676e8842523a732e0.tar dexon-335dc9e6874160bb1c1059d676e8842523a732e0.tar.gz dexon-335dc9e6874160bb1c1059d676e8842523a732e0.tar.bz2 dexon-335dc9e6874160bb1c1059d676e8842523a732e0.tar.lz dexon-335dc9e6874160bb1c1059d676e8842523a732e0.tar.xz dexon-335dc9e6874160bb1c1059d676e8842523a732e0.tar.zst dexon-335dc9e6874160bb1c1059d676e8842523a732e0.zip | |
Merge branch 'develop' into feature/mnemonic
Diffstat (limited to 'ethminer')
| -rw-r--r-- | ethminer/miner.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go index 60af3ab31..d84977342 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -105,6 +105,7 @@ func (miner *Miner) listener() { if found == false { log.Println("[MINER] We did not know about this transaction, adding") miner.txs = append(miner.txs, tx) + miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs) miner.block.SetTransactions(miner.txs) } else { log.Println("[MINER] We already had this transaction, ignoring") |