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

whoops..

Browse source
This commit is contained in:
Derek May 2018-03-16 15:59:39 -07:00
parent 8b32ca430f
commit 7bcec51f8b
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
consensus/ethash/consensus.go
View file

@ -335,14 +335,6 @@ var (
) )
// EGEM Era Difficulty Algo // EGEM Era Difficulty Algo
<<<<<<< HEAD
// Per block calculation.
//
// 50% Adjustment from 0 - 5000
// 20% Adjustment from 5001 - 10,000,000
// 15% Adjustment from 10,000,001 - 20,000,000
// 10% Adjusment from 20,000,001 +
=======
// //
// Launch 0 - 5000 50% Difficulty* // Launch 0 - 5000 50% Difficulty*
// Requiem Era0 5001 - 10,000,000 20% Difficulty** // Requiem Era0 5001 - 10,000,000 20% Difficulty**
@ -351,7 +343,6 @@ var (
// //
// * +/- adjustment per block // * +/- adjustment per block
// ** Dev fee is enabled at this Era start. // ** 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 {