Merge pull request #140 from qubic/develop (Release/v1.212.1)

Release/v1.212.1 to main

src/public_settings.h

@@ -40,7 +40,7 @@
 // If this flag is 1, it indicates that the whole network (all 676 IDs) will start from scratch and agree that the very first tick time will be set at (2022-04-13 Wed 12:00:00.000UTC).
 // If this flag is 0, the node will try to fetch data of the initial tick of the epoch from other nodes, because the tick's timestamp may differ from (2022-04-13 Wed 12:00:00.000UTC).
 // If you restart your node after seamless epoch transition, make sure EPOCH and TICK are set correctly for the currently running epoch.
-#define START_NETWORK_FROM_SCRATCH 1
+#define START_NETWORK_FROM_SCRATCH 0
 
 // Addons: If you don't know it, leave it 0.
 #define ADDON_TX_STATUS_REQUEST 0
@@ -50,11 +50,11 @@
 
 #define VERSION_A 1
 #define VERSION_B 212
-#define VERSION_C 0
+#define VERSION_C 1
 
 // Epoch and initial tick for node startup
-#define EPOCH 119
-#define TICK 15030000
+#define EPOCH 120
+#define TICK 15130713
 
 #define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
 

src/qubic.cpp

@@ -60,7 +60,7 @@
 #define SPECTRUM_CAPACITY (1ULL << SPECTRUM_DEPTH) // Must be 2^N
 #define SYSTEM_DATA_SAVING_PERIOD 300000ULL
 #define TICK_TRANSACTIONS_PUBLICATION_OFFSET 2 // Must be only 2
-#define TICK_VOTE_COUNTER_PUBLICATION_OFFSET 3 // Must be at least 3+: 1+ for tx propagration + 1 for tickData propagration + 1 for vote propagration
+#define TICK_VOTE_COUNTER_PUBLICATION_OFFSET 4 // Must be at least 3+: 1+ for tx propagration + 1 for tickData propagration + 1 for vote propagration
 #define MIN_MINING_SOLUTIONS_PUBLICATION_OFFSET 3 // Must be 3+
 #define TIME_ACCURACY 5000
 
@@ -428,6 +428,7 @@ static bool decreaseEnergy(const int index, long long amount)
     return false;
 }
 
+// NOTE: this function doesn't work well on a few CPUs, some bits will be flipped after calling this. It's probably microcode bug.
 static void enableAVX()
 {
     __writecr4(__readcr4() | 0x40000);
@@ -4133,6 +4134,7 @@ static void tickProcessor(void*)
                                 for (unsigned int i = 0; i < numberOfOwnComputorIndices; i++)
                                 {
                                     broadcastTick.tick.computorIndex = ownComputorIndices[i] ^ BroadcastTick::type;
+                                    broadcastTick.tick.epoch = system.epoch;
                                     m256i saltedData[2];
                                     saltedData[0] = computorPublicKeys[ownComputorIndicesMapping[i]];
                                     saltedData[1].m256i_u64[0] = resourceTestingDigest;