Merge pull request #264 from qubic/develop (Release v1.231.0)

Release v1.231.0

src/contracts/Qearn.h

@@ -269,7 +269,8 @@ struct QEARN : public ContractBase
         output.totalLockedAmount = 0;
         output.averageAPY = 0;
         locals.cnt = 0;
-        for(locals._t = qpi.epoch(); locals._t >= qpi.epoch() - 52U; locals._t--)
+
+        for(locals._t = qpi.epoch() - 1U; locals._t >= qpi.epoch() - 52U; locals._t--)
         {
             if(locals._t < QEARN_INITIAL_EPOCH)
             {
@@ -770,14 +771,13 @@ struct QEARN : public ContractBase
         /*
             the initial total locked amount should exclude the amount that locked on initial epoch but it didn't exclude that amount before. 
             so now it is updated.
-            I recorded the initial total locked amount of epoch 138 with 6924939374040.
-            once the epoch 139 is finished, I will also update the initial total locked amount of epoch 139.
-            this line will be deleted at epoch 140 or 141 at least.
+            I recorded the initial total locked amount of epoch 139 with 1834842583179.
+            This updates should be deployed on mainnet to chnage the initial infos of epoch 139. it will be deleted an epoch after deployment on mainnet.
         */
-        locals.INITIALIZE_ROUNDINFO._epochBonusAmount = state._initialRoundInfo.get(138)._epochBonusAmount;
-        locals.INITIALIZE_ROUNDINFO._totalLockedAmount = 6924939374040;
+        locals.INITIALIZE_ROUNDINFO._epochBonusAmount = state._initialRoundInfo.get(139)._epochBonusAmount;
+        locals.INITIALIZE_ROUNDINFO._totalLockedAmount = 1834842583179;
 
-        state._initialRoundInfo.set(138, locals.INITIALIZE_ROUNDINFO);
+        state._initialRoundInfo.set(139, locals.INITIALIZE_ROUNDINFO);
 	_
 
     struct END_EPOCH_locals 

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 0
+#define START_NETWORK_FROM_SCRATCH 1
 
 // Addons: If you don't know it, leave it 0.
 #define ADDON_TX_STATUS_REQUEST 0
@@ -49,12 +49,12 @@
 // Config options that should NOT be changed by operators
 
 #define VERSION_A 1
-#define VERSION_B 230
-#define VERSION_C 2
+#define VERSION_B 231
+#define VERSION_C 0
 
 // Epoch and initial tick for node startup
-#define EPOCH 142
-#define TICK 18168941
+#define EPOCH 143
+#define TICK 18330000
 
 #define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
 
@@ -69,9 +69,9 @@ static unsigned short CONTRACT_FILE_NAME[] = L"contract????.???";
 #define NUMBER_OF_HIDDEN_NEURONS 3000
 #define NUMBER_OF_NEIGHBOR_NEURONS 3000
 #define MAX_DURATION 9000000
-#define NUMBER_OF_OPTIMIZATION_STEPS 30
+#define NUMBER_OF_OPTIMIZATION_STEPS 60
 #define NEURON_VALUE_LIMIT 1LL
-#define SOLUTION_THRESHOLD_DEFAULT 135
+#define SOLUTION_THRESHOLD_DEFAULT 136
 
 #define SOLUTION_SECURITY_DEPOSIT 1000000