Fixes bug with minimum difficulty

Ashy5000 · Apr 7, 2024 · e0cdbc2 · e0cdbc2
1 parent f427347
commit e0cdbc2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/builds/node/node_linux-arm64 b/builds/node/node_linux-arm64
diff --git a/create_block.go b/create_block.go
@@ -45,9 +45,6 @@ func CreateBlock() (Block, error) {
 		TimeVerifierSignatures: []Signature{},
 		TimeVerifiers:          []dsa.PublicKey{},
 	}
-	if block.Difficulty < minimumBlockDifficulty {
-		block.Difficulty = minimumBlockDifficulty
-	}
 	if len(blockchain) > 0 {
 		block.PreviousBlockHash = HashBlock(blockchain[len(blockchain)-1])
 	} else {
@@ -79,9 +76,6 @@ func CreateBlock() (Block, error) {
 				block.PreviousBlockHash = [32]byte{}
 			}
 			block.Difficulty = GetDifficulty(previousBlock.MiningTime, previousBlock.Difficulty)
-			if block.Difficulty < minimumBlockDifficulty {
-				block.Difficulty = minimumBlockDifficulty
-			}
 			block.Nonce++
 			hashBytes = HashBlock(block)
 			hash = binary.BigEndian.Uint64(hashBytes[:])

diff --git a/difficulty.go b/difficulty.go
@@ -24,5 +24,9 @@ func GetDifficulty(lastTime time.Duration, lastDifficulty uint64) uint64 {
 	x := lastTime.Minutes() * float64(lastDifficulty)
 	adjustment := (1 / (1 + math.Pow(math.E, -(1/mdpm)*(x-mdpm)))) + 0.5
 	difficultyAfterAdjustment := float64(difficultyBeforeAdjustment) / adjustment
-	return uint64(difficultyAfterAdjustment)
+	difficultyUint64 := uint64(difficultyAfterAdjustment)
+	if difficultyUint64 > minimumBlockDifficulty {
+		return difficultyUint64
+	}
+	return minimumBlockDifficulty
 }