diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-08-17 21:46:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 21:46:57 +0800 |
| commit | 99e1a5e0fb6f238319042dd2c4c8468dc786a4b7 (patch) | |
| tree | 62c60b610eb83249317e769f8eb05f6d59dc9169 | |
| parent | 2695fa2213fe5010a80970bca1078834662d5972 (diff) | |
| parent | 22cd3f70a68da31b1054fcfca74d187133df29b8 (diff) | |
| download | go-tangerine-99e1a5e0fb6f238319042dd2c4c8468dc786a4b7.tar.gz go-tangerine-99e1a5e0fb6f238319042dd2c4c8468dc786a4b7.tar.zst go-tangerine-99e1a5e0fb6f238319042dd2c4c8468dc786a4b7.zip | |
Merge pull request #17426 from karalabe/miner-fees-log-fix
miner: update mining log with correct fee calculation
| -rw-r--r-- | miner/worker.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miner/worker.go b/miner/worker.go index e7e279645..2f76f2a92 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -782,8 +782,8 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st w.unconfirmed.Shift(block.NumberU64() - 1) feesWei := new(big.Int) - for _, tx := range block.Transactions() { - feesWei.Add(feesWei, new(big.Int).Mul(new(big.Int).SetUint64(tx.Gas()), tx.GasPrice())) + for i, tx := range block.Transactions() { + feesWei.Add(feesWei, new(big.Int).Mul(new(big.Int).SetUint64(receipts[i].GasUsed), tx.GasPrice())) } feesEth := new(big.Float).Quo(new(big.Float).SetInt(feesWei), new(big.Float).SetInt(big.NewInt(params.Ether))) |