Skip ticks due to unsolvable votes (#831)

* Skip 3 ticks to resolve unresolvable ticks

* Ignore votes for skip ticks

* Bump version

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 286
-#define VERSION_C 0
+#define VERSION_C 1
 
 // Epoch and initial tick for node startup
 #define EPOCH 208

src/qubic.cpp

@@ -863,9 +863,28 @@ static void processBroadcastTick(Peer* peer, RequestResponseHeader* header)
             }
             else
             {
-                // Copy the sent tick to the tick storage
-                copyMem(tsTick, &request->tick, sizeof(Tick));
-                peer->lastActiveTick = max(peer->lastActiveTick, peer->getDejavuTick(header->dejavu()));
+                // HACK: force empty ticks 49124963-49124965 — remove after passing these ticks
+                bool isOk = true;
+                if (request->tick.tick == 49124963 || request->tick.tick == 49124964)
+                {
+                    if (!(isZero(request->tick.transactionDigest) && isZero(request->tick.expectedNextTickTransactionDigest)))
+                    {
+                        isOk = false;
+                    }
+                }
+                if (request->tick.tick == 49124965)
+                {
+                    if (!isZero(request->tick.transactionDigest))
+                    {
+                        isOk = false;
+                    }
+                }
+                if (isOk)
+                {
+                    // Copy the sent tick to the tick storage
+                    copyMem(tsTick, &request->tick, sizeof(Tick));
+                    peer->lastActiveTick = max(peer->lastActiveTick, peer->getDejavuTick(header->dejavu()));
+                }
             }
 
             ts.ticks.releaseLock(request->tick.computorIndex);
@@ -5476,6 +5495,13 @@ static void tickProcessor(void*)
                 findNextTickDataDigestFromCurrentTickVotes();
             }
 
+            // HACK: force empty ticks 49124963-49124965 — remove after passing these ticks
+            if (system.tick >= 49124962 && system.tick <= 49124964)
+            {
+                targetNextTickDataDigest = m256i::zero();
+                targetNextTickDataDigestIsKnown = true;
+            }
+
             ts.tickData.acquireLock();
             copyMem(&nextTickData, &ts.tickData[nextTickIndex], sizeof(TickData));
             ts.tickData.releaseLock();