Add mempool ability to remove invalid transactions for getblocktempla…

…te, fix unit test
RavenProject · Feb 5, 2020 · 3499cad · 3499cad
2 parents 5ea4799 + 586e706
commit 3499cad
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 43 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
diff --git a/src/init.cpp b/src/init.cpp
@@ -453,6 +453,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-par=<n>", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"),
         -GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS));
     strUsage += HelpMessageOpt("-autofixmempool", strprintf(_("When set, if the CreateNewBlock fails because of a transaction. The mempool will be cleared. (default: %d)"), false));
+    strUsage += HelpMessageOpt("-bypassdownload", strprintf(_("When set, if the chain is in initialblockdownload the getblocktemplate rpc call will still return block data (default: %d)"), false));
 #ifndef WIN32
     strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), RAVEN_PID_FILENAME));
 #endif

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -198,11 +198,22 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
                 {
                     TRY_LOCK(mempool.cs, fLockMempool);
                     if (fLockMempool) {
-                        LogPrintf("%s failed because of a transaction %s. Clearing the mempool.", __func__,
+                        LogPrintf("%s failed because of a transaction %s. -autofixmempool is set to true. Clearing the mempool\n", __func__,
                                   state.GetFailedTransaction().GetHex());
                         mempool.clear();
                     }
                 }
+            } else {
+                {
+                    TRY_LOCK(mempool.cs, fLockMempool);
+                    if (fLockMempool) {
+                        auto mempoolTx = mempool.get(state.GetFailedTransaction());
+                        if (mempoolTx) {
+                            LogPrintf("%s : Failed because of a transaction %s. Trying to remove the transaction from the mempool\n", __func__, state.GetFailedTransaction().GetHex());
+                            mempool.removeRecursive(*mempoolTx, MemPoolRemovalReason::CONFLICT);
+                        }
+                    }
+                }
             }
         }
         throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state)));

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -451,7 +451,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     if (g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0)
         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Raven is not connected!");
 
-    if (IsInitialBlockDownload())
+    if (IsInitialBlockDownload() && !gArgs.GetBoolArg("-bypassdownload", false))
         throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Raven is downloading blocks...");
 
     static unsigned int nTransactionsUpdatedLast;

diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -703,6 +703,26 @@ void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason)
         }
         mapHashGlobalUnFreezingAssetTransactions.erase(hash);
     }
+
+    if (mapHashToAddressAddedTag.count(hash)) {
+        for (auto item : mapHashToAddressAddedTag.at(hash)) {
+            if (mapAddressAddedTag.count(item)) {
+                mapAddressAddedTag.at(item).erase(hash);
+                if (mapAddressAddedTag.at(item).size() == 0)
+                    mapAddressAddedTag.erase(item);
+            }
+        }
+    }
+
+    if (mapHashToAddressRemoveTag.count(hash)) {
+        for (auto item : mapHashToAddressRemoveTag.at(hash)) {
+            if (mapAddressRemoveTag.count(item)) {
+                mapAddressRemoveTag.at(item).erase(hash);
+                if (mapAddressRemoveTag.at(item).size() == 0)
+                    mapAddressRemoveTag.erase(item);
+            }
+        }
+    }
     /** RVN END */
 }
 
@@ -1018,6 +1038,11 @@ void CTxMemPool::_clear()
     mapAssetVerifierChanged.clear();
     mapHashVerifierChanged.clear();
 
+    mapHashToAddressAddedTag.clear();
+    mapAddressAddedTag.clear();
+    mapHashToAddressRemoveTag.clear();
+    mapAddressRemoveTag.clear();
+
     mapGlobalFreezingAssetTransactions.clear();
     mapHashGlobalFreezingAssetTransactions.clear();
 

diff --git a/src/txmempool.h b/src/txmempool.h
@@ -492,6 +492,14 @@ class CTxMemPool
     std::map<std::string, std::set<uint256>> mapGlobalFreezingAssetTransactions;
     std::map<uint256, std::set<std::string>> mapHashGlobalFreezingAssetTransactions;
 
+    // Helper map for when a qualfier is added to an address
+    std::map<std::pair<std::string, std::string>, std::set<uint256> > mapAddressAddedTag;
+    std::map<uint256, std::set<std::pair<std::string, std::string>>> mapHashToAddressAddedTag;
+
+    // Helper map for when a qualfier is added to an address
+    std::map<std::pair<std::string, std::string>, std::set<uint256> > mapAddressRemoveTag;
+    std::map<uint256, std::set<std::pair<std::string, std::string>>> mapHashToAddressRemoveTag;
+
     std::map<std::string, std::set<uint256>> mapGlobalUnFreezingAssetTransactions;
     std::map<uint256, std::set<std::string>> mapHashGlobalUnFreezingAssetTransactions;
 

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1008,6 +1008,32 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
                             }
                         }
                     }
+                } else if (out.scriptPubKey.IsNullAssetTxDataScript()) {
+                    // We need to track all tags that are being adding to address, that live in the mempool
+                    // This will allow us to keep the mempool clean, and only allow one tag per address at a time into the mempool
+                    CNullAssetTxData addressNullData;
+                    std::string address;
+                    if (AssetNullDataFromScript(out.scriptPubKey, addressNullData, address)) {
+                        if (IsAssetNameAQualifier(addressNullData.asset_name)) {
+                            if (addressNullData.flag == (int) QualifierType::ADD_QUALIFIER) {
+                                if (pool.mapAddressAddedTag.count(std::make_pair(address, addressNullData.asset_name))) {
+                                    return state.DoS(0, false, REJECT_INVALID,
+                                                     "bad-txns-adding-tag-already-in-mempool");
+                                }
+                                // Adding a qualifier to an address
+                                pool.mapAddressAddedTag[std::make_pair(address, addressNullData.asset_name)].insert(tx.GetHash());
+                                pool.mapHashToAddressAddedTag[tx.GetHash()].insert(std::make_pair(address, addressNullData.asset_name));
+                            } else {
+                                    if (pool.mapAddressRemoveTag.count(std::make_pair(address, addressNullData.asset_name))) {
+                                        return state.DoS(0, false, REJECT_INVALID,
+                                                         "bad-txns-remove-tag-already-in-mempool");
+                                    }
+
+                                pool.mapAddressRemoveTag[std::make_pair(address, addressNullData.asset_name)].insert(tx.GetHash());
+                                pool.mapHashToAddressRemoveTag[tx.GetHash()].insert(std::make_pair(address, addressNullData.asset_name));
+                            }
+                        }
+                    }
                 }
             }
         }

diff --git a/test/functional/feature_uacomment.py b/test/functional/feature_uacomment.py
@@ -25,7 +25,7 @@ def run_test(self):
 
         self.log.info("test -uacomment max length")
         self.stop_node(0)
-        expected = "Total length of network version string (288) exceeds maximum length (256). Reduce the number or size of uacomments."
+        expected = "Total length of network version string (286) exceeds maximum length (256). Reduce the number or size of uacomments."
         self.assert_start_raises_init_error(0, ["-uacomment=" + 'a' * 256], expected)
 
         self.log.info("test -uacomment unsafe characters")