diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-12 03:55:45 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-12 03:55:45 +0800 |
| commit | 9ee6295c752a518603de01e4feaec787c61a5dcf (patch) | |
| tree | e25b46e294bf0cfc556a6a3438977c53f9052d95 /ethminer | |
| parent | 1bf6f8b4a6936d8ad14b345b2cfa4dc9d1f8a360 (diff) | |
| download | go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.tar go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.tar.gz go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.tar.bz2 go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.tar.lz go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.tar.xz go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.tar.zst go-tangerine-9ee6295c752a518603de01e4feaec787c61a5dcf.zip | |
Minor changes
Diffstat (limited to 'ethminer')
| -rw-r--r-- | ethminer/miner.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go index 19ff5dd9e..d05405391 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -137,7 +137,7 @@ func (self *Miner) mineNewBlock() { // Sort the transactions by nonce in case of odd network propagation sort.Sort(ethchain.TxByNonce{self.txs}) // Accumulate all valid transaction and apply them to the new state - receipts, txs := stateManager.ApplyTransactions(self.block.State(), self.block, self.txs) + receipts, txs := stateManager.ApplyTransactions(self.block.Coinbase, self.block.State(), self.block, self.txs) self.txs = txs // Set the transactions to the block so the new SHA3 can be calculated self.block.SetReceipts(receipts, txs) @@ -155,6 +155,7 @@ func (self *Miner) mineNewBlock() { } else { self.ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{self.block.Value().Val}) ethutil.Config.Log.Infof("[MINER] 🔨 Mined block %x\n", self.block.Hash()) + ethutil.Config.Log.Infoln(self.block) // Gather the new batch of transactions currently in the tx pool self.txs = self.ethereum.TxPool().CurrentTransactions() } |