aboutsummaryrefslogtreecommitdiffstats
path: root/consensus/ethash/consensus.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-11-24 16:56:33 +0800
committerGitHub <noreply@github.com>2017-11-24 16:56:33 +0800
commitf9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e (patch)
treefa8b344aedb3d56c2cd904173053a5273ec87a67 /consensus/ethash/consensus.go
parent35801f938e21430f8fb0f2e1c3de5db7dbd21666 (diff)
parenta3a2c6b0d9f963c9377612cae1ed6ded6f216c2d (diff)
downloadgo-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.tar
go-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.tar.gz
go-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.tar.bz2
go-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.tar.lz
go-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.tar.xz
go-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.tar.zst
go-tangerine-f9569f3cd8a05dff5be5da83a5d8c70c1b23dd3e.zip
Merge pull request #15390 from karalabe/puppeth-devcon3
cmd/puppeth: new version as presented at devcon3
Diffstat (limited to 'consensus/ethash/consensus.go')
-rw-r--r--consensus/ethash/consensus.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index 6a19d449f..e330b7ce5 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -36,8 +36,8 @@ import (
// Ethash proof-of-work protocol constants.
var (
- frontierBlockReward *big.Int = big.NewInt(5e+18) // Block reward in wei for successfully mining a block
- byzantiumBlockReward *big.Int = big.NewInt(3e+18) // Block reward in wei for successfully mining a block upward from Byzantium
+ FrontierBlockReward *big.Int = big.NewInt(5e+18) // Block reward in wei for successfully mining a block
+ ByzantiumBlockReward *big.Int = big.NewInt(3e+18) // Block reward in wei for successfully mining a block upward from Byzantium
maxUncles = 2 // Maximum number of uncles allowed in a single block
)
@@ -529,9 +529,9 @@ var (
// TODO (karalabe): Move the chain maker into this package and make this private!
func AccumulateRewards(config *params.ChainConfig, state *state.StateDB, header *types.Header, uncles []*types.Header) {
// Select the correct block reward based on chain progression
- blockReward := frontierBlockReward
+ blockReward := FrontierBlockReward
if config.IsByzantium(header.Number) {
- blockReward = byzantiumBlockReward
+ blockReward = ByzantiumBlockReward
}
// Accumulate the rewards for the miner and any included uncles
reward := new(big.Int).Set(blockReward)