define num ticks for pending txs pool as 10 mins, add next power of 2 function to calc Collection capacity

Author: Franziska-Mueller

src/contracts/math_lib.h

@@ -49,4 +49,21 @@ inline static unsigned char divUp(unsigned char a, unsigned char b)
     return b ? ((a + b - 1) / b) : 0;
 }
 
+inline constexpr unsigned long long findNextPowerOf2(unsigned long long num)
+{
+    if (num == 0)
+        return 1;
+
+    num--;
+    num |= num >> 1;
+    num |= num >> 2;
+    num |= num >> 4;
+    num |= num >> 8;
+    num |= num >> 16;
+    num |= num >> 32;
+    num++;
+
+    return num;
+}
+
 }

src/public_settings.h

@@ -32,7 +32,7 @@
 #define TRANSACTION_SPARSENESS 1
 
 // Number of ticks that are stored in the pending txs pool. This also defines how many ticks in advance a tx can be registered.
-#define PENDING_TXS_POOL_NUM_TICKS 8192ULL // must be 2^N
+#define PENDING_TXS_POOL_NUM_TICKS (1000 * 60 * 10ULL / TICK_DURATION_FOR_ALLOCATION_MS) // 10 minutes
 
 // Below are 2 variables that are used for auto-F5 feature:
 #define AUTO_FORCE_NEXT_TICK_THRESHOLD 0ULL // Multiplier of TARGET_TICK_DURATION for the system to detect "F5 case" | set to 0 to disable

src/ticking/pending_txs_pool.h

@@ -11,6 +11,7 @@
 #include "mining/mining.h"
 
 #include "contracts/qpi.h"
+#include "contracts/math_lib.h"
 #include "contract_core/qpi_collection_impl.h"
 
 #include "public_settings.h"
@@ -29,6 +30,9 @@ class PendingTxsPool
     static constexpr unsigned long long tickTransactionOffsetsSize = maxNumTxs * sizeof(unsigned long long);
     static constexpr unsigned long long txsDigestsSize = maxNumTxs * sizeof(m256i);
 
+    // `maxNumTxs` priorities have to be saved at a time. Collection capacity has to be 2^N so find the next bigger power of 2.
+    static constexpr unsigned long long txsPrioritiesCapacity = math_lib::findNextPowerOf2(maxNumTxs);
+
     // The pool stores the tick range [firstStoredTick, firstStoredTick + PENDING_TXS_POOL_NUM_TICKS[
     inline static unsigned int firstStoredTick = 0;
 
@@ -58,7 +62,7 @@ class PendingTxsPool
     inline static volatile char txsPrioritiesLock = 0;
 
     // Priority queues for transactions in each saved tick.
-    inline static Collection<unsigned int, NUMBER_OF_TRANSACTIONS_PER_TICK * PENDING_TXS_POOL_NUM_TICKS>* txsPriorities;
+    inline static Collection<unsigned int, txsPrioritiesCapacity>* txsPriorities;
 
     static void cleanupTxsPriorities(unsigned int tickIndex)
     {
@@ -138,7 +142,7 @@ class PendingTxsPool
     {
         if (!allocPoolWithErrorLog(L"PendingTxsPool::tickTransactionsPtr ", tickTransactionsSize, (void**)&tickTransactionsBuffer, __LINE__)
             || !allocPoolWithErrorLog(L"PendingTxsPool::txsDigestsPtr ", txsDigestsSize, (void**)&txsDigestsBuffer, __LINE__)
-            || !allocPoolWithErrorLog(L"PendingTxsPool::txsPriorities", sizeof(Collection<unsigned int, NUMBER_OF_TRANSACTIONS_PER_TICK * PENDING_TXS_POOL_NUM_TICKS>), (void**)&txsPriorities, __LINE__))
+            || !allocPoolWithErrorLog(L"PendingTxsPool::txsPriorities", sizeof(Collection<unsigned int, txsPrioritiesCapacity>), (void**)&txsPriorities, __LINE__))
         {
             return false;
         }