|
|
|
@ -780,8 +780,16 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st |
|
|
|
|
select { |
|
|
|
|
case w.taskCh <- &task{receipts: receipts, state: s, block: block, createdAt: time.Now()}: |
|
|
|
|
w.unconfirmed.Shift(block.NumberU64() - 1) |
|
|
|
|
log.Info("Commit new mining work", "number", block.Number(), "txs", w.current.tcount, "uncles", len(uncles), |
|
|
|
|
"elapsed", common.PrettyDuration(time.Since(start))) |
|
|
|
|
|
|
|
|
|
feesWei := new(big.Int) |
|
|
|
|
for _, tx := range block.Transactions() { |
|
|
|
|
feesWei.Add(feesWei, new(big.Int).Mul(new(big.Int).SetUint64(tx.Gas()), tx.GasPrice())) |
|
|
|
|
} |
|
|
|
|
feesEth := new(big.Float).Quo(new(big.Float).SetInt(feesWei), new(big.Float).SetInt(big.NewInt(params.Ether))) |
|
|
|
|
|
|
|
|
|
log.Info("Commit new mining work", "number", block.Number(), "uncles", len(uncles), "txs", w.current.tcount, |
|
|
|
|
"gas", block.GasUsed(), "fees", feesEth, "elapsed", common.PrettyDuration(time.Since(start))) |
|
|
|
|
|
|
|
|
|
case <-w.exitCh: |
|
|
|
|
log.Info("Worker has exited") |
|
|
|
|
} |
|
|
|
|