Skip to content

Commit

Permalink
make the diff adjustments better
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisfranko authored and franko-org committed Sep 24, 2015
1 parent 5745c9a commit 8997f08
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 8 additions & 1 deletion core/chain_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,14 @@ var (
// given the parent block's time and difficulty.
func CalcDifficulty(time, parentTime uint64, parentNumber, parentDiff *big.Int) *big.Int {
diff := new(big.Int)
adjust := new(big.Int).Div(parentDiff, params.DifficultyBoundDivisor)
adjust := new(big.Int)

if parentNumber.Cmp(params.HardFork1) < 0 {
adjust = new(big.Int).Div(parentDiff, params.DifficultyBoundDivisor)
} else {
adjust = new(big.Int).Div(parentDiff, params.DifficultyBoundDivisor2)
}

bigTime := new(big.Int)
bigParentTime := new(big.Int)

Expand Down
2 changes: 2 additions & 0 deletions params/protocol_params.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ var (
TxGas = big.NewInt(21000) // Per transaction. NOTE: Not payable on data of calls between transactions.
TxDataZeroGas = big.NewInt(4) // Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions.
DifficultyBoundDivisor = big.NewInt(2048) // The bound divisor of the difficulty, used in the update calculations.
DifficultyBoundDivisor2 = big.NewInt(512) // Difficulty should adjust faster.
HardFork1 = big.NewInt(23000) // fork at this block number
QuadCoeffDiv = big.NewInt(512) // Divisor for the quadratic particle of the memory cost equation.
GenesisDifficulty = big.NewInt(131072) // Difficulty of the Genesis block.
DurationLimit = big.NewInt(60) // The decision boundary on the blocktime duration used to determine whether difficulty should go up or not.
Expand Down

0 comments on commit 8997f08

Please sign in to comment.