Merge pull request #799 from pocketnetteam:fix/miner_fee_bug

Fix/miner_fee_bug
pocketnetteam · Jan 6, 2025 · 235d6f8 · 235d6f8
2 parents 76b20a0 + d1780ec
commit 235d6f8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 set(_CLIENT_VERSION_MAJOR 0)
 set(_CLIENT_VERSION_MINOR 22)
-set(_CLIENT_VERSION_REVISION 10)
+set(_CLIENT_VERSION_REVISION 11)
 set(_CLIENT_VERSION_BUILD 0)
 set(_CLIENT_VERSION_IS_RELEASE false)
 set(_COPYRIGHT_YEAR 2025)

diff --git a/build_msvc/pocketcoin_config.h b/build_msvc/pocketcoin_config.h
@@ -14,7 +14,7 @@
 #define CLIENT_VERSION_MINOR 22
 
 /* Build revision */
-#define CLIENT_VERSION_REVISION 10
+#define CLIENT_VERSION_REVISION 11
 
 /* Version Build */
 #define CLIENT_VERSION_BUILD 0
@@ -346,7 +346,7 @@
 #define PACKAGE_NAME "Pocketnet Core"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Pocketnet Core 0.22.10"
+#define PACKAGE_STRING "Pocketnet Core 0.22.11"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pocketcoin"
@@ -355,7 +355,7 @@
 #define PACKAGE_URL "https://github.com/pocketnetteam"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.22.10"
+#define PACKAGE_VERSION "0.22.11"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 22)
-define(_CLIENT_VERSION_REVISION, 10)
+define(_CLIENT_VERSION_REVISION, 11)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -473,8 +473,15 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
 
         if (packageFees < minFee)
         {
-            // Everything else we might consider has a lower fee rate
-            return;
+            LogPrintf("tx - %s, fee - %s, minFee - %s\n", iter->GetTx().GetHash().GetHex(), packageFees, minFee);
+
+            if (fUsingModified)
+            {
+                mapModifiedTx.get<ancestor_score>().erase(modit);
+                failedTx.insert(iter);
+            }
+
+            continue;
         }
 
         CTransactionRef tx = iter->GetSharedTx();
@@ -570,6 +577,10 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
 
         // Update transactions that depend on each of these
         nDescendantsUpdated += UpdatePackagesForAdded(ancestors, mapModifiedTx);
+
+        // Set maximum number of transactions in block
+        if (nPackagesSelected > 1500)
+            break;
     }
 }