Difficulty adjustment refork

Adjustment of hardcoded initial post-fork difficulty to keep the chain moving

Author: DrCryptoToad

ReleaseNotes.txt

@@ -1,11 +1,19 @@
+Release notes 5.0.2-beta
+- Adjustment of hardcoded initial post-fork difficulty to keep the chain moving
+
+Release notes 5.0.1-beta
+- Small (but important) hard fork tweak to ensure smooth fork
+
 Release notes 5.0.0-beta
 
 - Proof-of-work change to CryptoNightV1 (variant 1 also known as "monero7") to remain ASIC resistant
-- Difficulty adjustment algorithm has been updated to Zawy's LWMA to resist hash and timestamp attacks
+- Difficulty adjustment algorithm has been updated to Zawy's LWMA-2 to resist hash and timestamp attacks
 - Seed nodes updated to be operational (no more unresponsive seeds from old dev)
 - Block target reduced to 2 minutes
 - Difficulty is hardcoded to "reset" back to GPU levels for blocks immediately following the fork so that the network continues to work as intended and does not stall
+- GUI embedded pool miner now works
 - Latest checkpoints and small Payment Gate bug fix
+- Arch Linux compile fixes
 
 Release notes 4.0.3-beta
 

src/CryptoNoteConfig.h

@@ -71,7 +71,7 @@ const size_t   FUSION_TX_MIN_IN_OUT_COUNT_RATIO              = 4;
 const uint32_t UPGRADE_HEIGHT_V2                             = 136212;
 const uint32_t UPGRADE_HEIGHT_V3                             = 317950;
 const uint32_t UPGRADE_HEIGHT_V4                             = 338000;
-const uint32_t UPGRADE_HEIGHT_V5                             = 668946;  //June 25 12AM UTC
+const uint32_t UPGRADE_HEIGHT_V5                             = 669369;  //June 27 refork
 const unsigned UPGRADE_VOTING_THRESHOLD                      = 90;               // percent
 const size_t   UPGRADE_VOTING_WINDOW                         = EXPECTED_NUMBER_OF_BLOCKS_PER_DAY;  // blocks
 const size_t   UPGRADE_WINDOW                                = EXPECTED_NUMBER_OF_BLOCKS_PER_DAY;  // blocks
@@ -183,7 +183,7 @@ const std::initializer_list<CheckpointData> CHECKPOINTS = {
 
 const std::map<const uint32_t, const uint8_t> Version = {
 	// {BlockIndex , Version}
-	{ 668946, 1 }
+	{ 669369, 1 }
 };
 
 } // CryptoNote

src/CryptoNoteCore/Currency.cpp

@@ -529,7 +529,7 @@ difficulty_type Currency::nextDifficulty(std::vector<uint64_t> timestamps,
 
 	// Hardcode difficulty for 61 blocks after fork height: 
 	if (height >= parameters::UPGRADE_HEIGHT_V5 && height <= parameters::UPGRADE_HEIGHT_V5 + N) {
-		return 1000000000;
+		return 1000000;
 	}
 
 	// TS and CD vectors must be size N+1 after startup, and element N is most recent block.

src/version.h.in

@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "@VERSION@"
-#define PROJECT_VERSION "5.0.1-beta"
-#define PROJECT_VERSION_BUILD_NO "1803"
+#define PROJECT_VERSION "5.0.2-beta"
+#define PROJECT_VERSION_BUILD_NO "1804"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"