forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'expEGEMdiff' of https://github.com/TeamEGEM/go-egem into expEGEMdiff

Browse source
This commit is contained in:
Derek May 2018-03-16 15:58:01 -07:00
commit 8b32ca430f
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
consensus/ethash/consensus.go
View file

@ -335,12 +335,23 @@ var (
) )
// EGEM Era Difficulty Algo // EGEM Era Difficulty Algo
<<<<<<< HEAD
// Per block calculation. // Per block calculation.
// //
// 50% Adjustment from 0 - 5000 // 50% Adjustment from 0 - 5000
// 20% Adjustment from 5001 - 10,000,000 // 20% Adjustment from 5001 - 10,000,000
// 15% Adjustment from 10,000,001 - 20,000,000 // 15% Adjustment from 10,000,001 - 20,000,000
// 10% Adjusment from 20,000,001 + // 10% Adjusment from 20,000,001 +
=======
//
// Launch 0 - 5000 50% Difficulty*
// Requiem Era0 5001 - 10,000,000 20% Difficulty**
// Solstice Era1 10,000,001 - 20,000,000 15% Difficulty*
// Oblivion Era2 20,000,001 + 10% Difficulty*
//
// * +/- adjustment per block
// ** Dev fee is enabled at this Era start.
>>>>>>> 53d2032cfb9a759f32e685a92343aaac7cef2b08
// //
func calcDifficultyEGEM(time uint64, parent *types.Header) *big.Int { func calcDifficultyEGEM(time uint64, parent *types.Header) *big.Int {
@ -520,7 +531,7 @@ func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header
//dev rewards //dev rewards
state.AddBalance(devFund, d1Reward) //ridz state.AddBalance(devFund, d1Reward) //ridz
//Era0 Reward of block and dev reward 8/1. 20% Difficulty adjustment per block //Era0 Reward of block and dev reward 8/1 EGEM. 20% Difficulty adjustment per block
} else if (header.Number.Cmp(egemRewardSwitchBlockEra0) == 1) { } else if (header.Number.Cmp(egemRewardSwitchBlockEra0) == 1) {
reward := new(big.Int).Set(block0Reward) reward := new(big.Int).Set(block0Reward)
r := new(big.Int) r := new(big.Int)
@ -538,7 +549,7 @@ func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header
//dev rewards //dev rewards
state.AddBalance(devFund, d0Reward) //ridz state.AddBalance(devFund, d0Reward) //ridz
// Fair Launch upto block 5000 with a 50% Difficulty adjustment per block. // Launch upto block 5000 with a 50% Difficulty adjustment per block, 8 EGEM reward.
} else { } else {
reward := new(big.Int).Set(block0Reward) reward := new(big.Int).Set(block0Reward)
r := new(big.Int) r := new(big.Int)