From 20d4a2777885e644210333e1a9bbcff61c0ed1ab Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 7 Dec 2019 18:53:03 +0300
Subject: [PATCH] [v0.14.0.x] Make sure mempool txes are properly processed by
 CChainLocksHandler despite node restarts (#3230)

---
 src/llmq/quorums_chainlocks.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/llmq/quorums_chainlocks.cpp b/src/llmq/quorums_chainlocks.cpp
index cdb5d99ac1..bd4a83ee42 100644
--- a/src/llmq/quorums_chainlocks.cpp
+++ b/src/llmq/quorums_chainlocks.cpp
@@ -347,15 +347,23 @@ void CChainLocksHandler::TrySignChainTip()
 
 void CChainLocksHandler::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock)
 {
-    if (!masternodeSync.IsBlockchainSynced()) {
-        return;
-    }
-
     bool handleTx = true;
     if (tx.IsCoinBase() || tx.vin.empty()) {
         handleTx = false;
     }
 
+    if (!masternodeSync.IsBlockchainSynced()) {
+        if (handleTx && posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK) {
+            auto info = mempool.info(tx.GetHash());
+            if (!info.tx) {
+                return;
+            }
+            LOCK(cs);
+            txFirstSeenTime.emplace(tx.GetHash(), info.nTime);
+        }
+        return;
+    }
+
     LOCK(cs);
 
     if (handleTx) {