Increase solution threshold (#817) (#818)

* Increase ADDITION_SOLUTION_THRESHOLD_DEFAULT to 75700

* Switch Sol Threshold based on tick

Author: fnordspace

src/public_settings.h

@@ -70,7 +70,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
 
 #define VERSION_A 1
 #define VERSION_B 285
-#define VERSION_C 0
+#define VERSION_C 1
 
 // Epoch and initial tick for node startup
 #define EPOCH 207
@@ -106,7 +106,12 @@ static constexpr unsigned long long ADDITION_NUMBER_OF_TICKS = 1000;
 static constexpr unsigned long long ADDITION_NUMBER_OF_NEIGHBORS = 728;    // 2M. Must be divided by 2
 static constexpr unsigned long long ADDITION_NUMBER_OF_MUTATIONS = 500;
 static constexpr unsigned long long ADDITION_POPULATION_THRESHOLD = ADDITION_NUMBER_OF_INPUT_NEURONS + ADDITION_NUMBER_OF_OUTPUT_NEURONS + ADDITION_NUMBER_OF_MUTATIONS; // P
-static constexpr unsigned int ADDITION_SOLUTION_THRESHOLD_DEFAULT = 75200;
+static constexpr unsigned int ADDITION_SOLUTION_THRESHOLD_DEFAULT = 75700;
+// Mid-epoch threshold increase: ticks before activation use old threshold (75200),
+// ticks >= activation use ADDITION_SOLUTION_THRESHOLD_DEFAULT (75700).
+// Activation tick is inside XMR marathon where no solutions are submitted.
+static constexpr unsigned int ADDITION_SOLUTION_THRESHOLD_PRE_ACTIVATION = 75200;
+static constexpr unsigned int ADDITION_SOLUTION_THRESHOLD_ACTIVATION_TICK = 48196000;
 
 // Multipler of score
 static constexpr unsigned int HYPERIDENTITY_SOLUTION_MULTIPLER = 1;

src/qubic.cpp

@@ -700,9 +700,14 @@ static void processBroadcastMessage(const unsigned long long processorNumber, Re
                                         {
                                             unsigned int solutionScore = (*score)(processorNumber, request->destinationPublicKey, solution_miningSeed, solution_nonce);
                                             score_engine::AlgoType selectedAlgo = score_engine::getAlgoType(solution_nonce.m256i_u8);
-                                            const int threshold = (system.epoch < MAX_NUMBER_EPOCH) ? 
-                                                solutionThreshold[system.epoch][selectedAlgo] 
+                                            int threshold = (system.epoch < MAX_NUMBER_EPOCH) ?
+                                                solutionThreshold[system.epoch][selectedAlgo]
                                                 : score_engine::DEFAUL_SOLUTION_THRESHOLD[selectedAlgo];
+                                            if (selectedAlgo == score_engine::AlgoType::Addition
+                                                && system.tick < ADDITION_SOLUTION_THRESHOLD_ACTIVATION_TICK)
+                                            {
+                                                threshold = ADDITION_SOLUTION_THRESHOLD_PRE_ACTIVATION;
+                                            }
                                             if (system.numberOfSolutions < MAX_NUMBER_OF_SOLUTIONS
                                                 && score->isValidScore(solutionScore, selectedAlgo)
                                                 && score->isGoodScore(solutionScore, threshold, selectedAlgo))
@@ -1413,6 +1418,10 @@ static void processRequestSystemInfo(Peer* peer, RequestResponseHeader* header)
     respondedSystemInfo.randomMiningSeed = score->currentRandomSeed;
     respondedSystemInfo.solutionThreshold = (system.epoch < MAX_NUMBER_EPOCH) ? solutionThreshold[system.epoch][score_engine::AlgoType::HyperIdentity] : HYPERIDENTITY_SOLUTION_THRESHOLD_DEFAULT;
     respondedSystemInfo.solutionAdditionalThreshold = (system.epoch < MAX_NUMBER_EPOCH) ? solutionThreshold[system.epoch][score_engine::AlgoType::Addition] : ADDITION_SOLUTION_THRESHOLD_DEFAULT;
+    if (system.tick < ADDITION_SOLUTION_THRESHOLD_ACTIVATION_TICK)
+    {
+        respondedSystemInfo.solutionAdditionalThreshold = ADDITION_SOLUTION_THRESHOLD_PRE_ACTIVATION;
+    }
 
     respondedSystemInfo.totalSpectrumAmount = spectrumInfo.totalAmount;
     respondedSystemInfo.currentEntityBalanceDustThreshold = (dustThresholdBurnAll > dustThresholdBurnHalf) ? dustThresholdBurnAll : dustThresholdBurnHalf;
@@ -2761,9 +2770,14 @@ static void processTickTransactionSolution(const MiningSolutionTransaction* tran
         {
             resourceTestingDigest ^= solutionScore;
             KangarooTwelve(&resourceTestingDigest, sizeof(resourceTestingDigest), &resourceTestingDigest, sizeof(resourceTestingDigest));
-            const int threshold = (system.epoch < MAX_NUMBER_EPOCH) ?
+            int threshold = (system.epoch < MAX_NUMBER_EPOCH) ?
                 solutionThreshold[system.epoch][selectedAlgo]
                 : score_engine::DEFAUL_SOLUTION_THRESHOLD[selectedAlgo];
+            if (selectedAlgo == score_engine::AlgoType::Addition
+                && system.tick < ADDITION_SOLUTION_THRESHOLD_ACTIVATION_TICK)
+            {
+                threshold = ADDITION_SOLUTION_THRESHOLD_PRE_ACTIVATION;
+            }
             if (score->isGoodScore(solutionScore, threshold, selectedAlgo))
             {
                 // Solution deposit return