Possible hotfix for Mempool problem

qwertycoin-org · Mar 28, 2021 · ed9f1e2 · ed9f1e2
1 parent d43147f
commit ed9f1e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/CryptoNoteCore/TransactionPool.cpp b/lib/CryptoNoteCore/TransactionPool.cpp
@@ -486,6 +486,7 @@ bool tx_memory_pool::fill_block_template(
 
     total_size = 0;
     fee = 0;
+    uint8_t maxTxCount = 125;
 
     size_t max_total_size = (125 * median_size) / 100;
     max_total_size = std::min(max_total_size, maxCumulativeSize) - m_currency.minerTxBlobReservedSize();
@@ -495,6 +496,10 @@ bool tx_memory_pool::fill_block_template(
     for (auto it = m_fee_index.rbegin(); it != m_fee_index.rend() && it->fee == 0; ++it) {
         const auto &txd = *it;
 
+        if (blockTemplate.getTransactions().size() > maxTxCount) {
+            break;
+        }
+
         if (m_ttlIndex.count(txd.id) > 0) {
             continue;
         }
@@ -514,6 +519,10 @@ bool tx_memory_pool::fill_block_template(
     for (auto i = m_fee_index.begin(); i != m_fee_index.end(); ++i) {
         const auto &txd = *i;
 
+        if (blockTemplate.getTransactions().size() > maxTxCount) {
+            break;
+        }
+
         if (m_ttlIndex.count(txd.id) > 0) {
             continue;
         }

diff --git a/lib/Global/version.h.in b/lib/Global/version.h.in
@@ -6,8 +6,8 @@
 #define PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@"
 #define APP_VER_MAJOR 6
 #define APP_VER_MINOR 0
-#define APP_VER_REV 4
-#define APP_VER_BUILD 6075
+#define APP_VER_REV 5
+#define APP_VER_BUILD 6080
 
 #define BUILD_COMMIT_ID "@PROJECT_GIT_COMMIT_ID@"
 #define PROJECT_VERSION STR(APP_VER_MAJOR) "." STR(APP_VER_MINOR) "." STR(APP_VER_REV)