Merge pull request #190 from pastelnetwork/tickets-validations-improv

pastelnetwork · Aug 9, 2023 · 5c175a2 · 5c175a2
2 parents d20cf4e + 52f2ba5
commit 5c175a2
Show file tree

Hide file tree

Showing 18 changed files with 104 additions and 36 deletions.
diff --git a/src/mnode/mnode-sync.cpp b/src/mnode/mnode-sync.cpp
@@ -34,6 +34,7 @@ void CMasternodeSync::Reset()
     nTimeAssetSyncStarted = GetTime();
     nTimeLastBumped = GetTime();
     nTimeLastFailure = 0;
+    nTimeLastProcess = 0;
 }
 
 void CMasternodeSync::BumpAssetLastTime(const std::string &strMethodName, const std::string &strFuncName)
@@ -194,8 +195,7 @@ void CMasternodeSync::ProcessTick()
         return;
 
     // reset the sync process if the last call to this function was more than 60 minutes ago (client was in sleep mode)
-    static int64_t nTimeLastProcess = GetTime();
-    if (GetTime() - nTimeLastProcess > 60*60)
+    if (nTimeLastProcess + (60*60) < GetTime())
     {
         LogFnPrintf("WARNING: no actions for too long, restarting sync...");
         Reset();
@@ -217,6 +217,15 @@ void CMasternodeSync::ProcessTick()
         return;
     }
 
+    // reset sync status if it stuck in Initial state for too long - 15 minutes
+    if (syncState == MasternodeSyncState::Initial && IsBlockchainSynced() && nTimeAssetSyncStarted + (15*60) > GetTime())
+    {
+        LogFnPrintf("WARNING: stuck in Initial for too long, restarting sync...");
+        Reset();
+        SwitchToNextAsset();
+        return;
+    }
+
     if (IsSynced())
         return;
 

diff --git a/src/mnode/mnode-sync.h b/src/mnode/mnode-sync.h
@@ -51,6 +51,9 @@ class CMasternodeSync
     // ... or failed
     int64_t nTimeLastFailure;
 
+    int64_t nTimeLastProcess;
+
+
     void Fail();
     void ClearFulfilledRequests();
 
@@ -65,6 +68,7 @@ class CMasternodeSync
     }
 
     bool IsFailed() const noexcept { return syncState == MasternodeSyncState::Failed; }
+    bool IsInitial() const noexcept { return syncState == MasternodeSyncState::Initial; }
     bool IsBlockchainSynced() const noexcept { return syncState > MasternodeSyncState::Waiting; }
     bool IsMasternodeListSynced() const noexcept { return syncState > MasternodeSyncState::List; }
     bool IsWinnersListSynced() const noexcept { return syncState > MasternodeSyncState::Winners; }

diff --git a/src/mnode/ticket-processor.cpp b/src/mnode/ticket-processor.cpp
@@ -639,8 +639,14 @@ unique_ptr<CPastelTicket> CPastelTicketProcessor::GetTicket(const uint256 &txid)
         if (data.nTicketHeight == numeric_limits<uint32_t>::max())
         {
             // if ticket block height is still not defined - lookup it up in mapBlockIndex by hash
-            if (mapBlockIndex.count(data.hashBlock) != 0)
-                data.nTicketHeight = mapBlockIndex[data.hashBlock]->nHeight;
+            const auto mi = mapBlockIndex.find(data.hashBlock);
+            if (mi != mapBlockIndex.cend() && mi->second) {
+                const auto pindex = mi->second;
+                if (chainActive.Contains(pindex))
+                {
+                    data.nTicketHeight = pindex->nHeight;
+                }
+            }
         }
 
         // create Pastel ticket by id
@@ -1891,3 +1897,34 @@ shared_ptr<ITxMemPoolTracker> CPastelTicketProcessor::GetTxMemPoolTracker()
         TicketTxMemPoolTracker = make_shared<CTicketTxMemPoolTracker>();
     return TicketTxMemPoolTracker;
 }
+
+bool CPastelTicketProcessor::FindTicketTransaction(const std::string& existing_ticket_txid, uint32_t existing_ticket_block_height,
+                                                   const std::string& new_ticket_txid, uint32_t new_ticket_block_height,
+                                                   bool bPreReg, std::string &message) {
+    bool bFound= true;
+    const uint256 txid = uint256S(existing_ticket_txid);
+    const auto pTicket = CPastelTicketProcessor::GetTicket(txid);
+    if (pTicket) {
+        if (pTicket->GetBlock() == numeric_limits<uint32_t>::max()) {
+            CTransaction tx;
+            if (mempool.lookup(txid, tx)) {
+                message = strprintf("%sfound in mempool. ", message);
+            } else {
+                bFound = false;
+                message = strprintf("%sfound in stale block. ", message);
+            }
+        } else {
+            message = strprintf("%salready exists in blockchain. ", message);
+        }
+    } else {
+        bFound = false;
+        message = strprintf("%sfound in Ticket DB, but not in blockchain. ", message);
+    }
+    message = strprintf("%s [%sfound ticket block=%u, txid=%s]", message,
+                        bPreReg ? "" : strprintf("this ticket block=%u txid=%s; ", new_ticket_block_height, new_ticket_txid),
+                        existing_ticket_block_height, existing_ticket_txid);
+    if (!bFound) {
+        LogFnPrintf("WARNING: %s", message);
+    }
+    return bFound;
+}
diff --git a/src/mnode/ticket-processor.h b/src/mnode/ticket-processor.h
@@ -170,6 +170,10 @@ class CPastelTicketProcessor
     // search for NFT registration tickets, calls functor for each matching ticket
     void SearchForNFTs(const search_thumbids_t &p, std::function<size_t(const CPastelTicket *, const nlohmann::json &)> &fnMatchFound) const;
 
+    static bool FindTicketTransaction(const std::string& existing_ticket_txid, uint32_t existing_ticket_block_height,
+                                      const std::string& new_ticket_txid, uint32_t new_ticket_block_height,
+                                      bool bPreReg, std::string &message);
+
 #ifdef ENABLE_WALLET
     static bool CreateP2FMSTransaction(const std::string& input_string, CMutableTransaction& tx_out, 
         const CAmount nPricePSL, const opt_string_t& sFundingAddress, std::string& error_ret);

diff --git a/src/mnode/tickets/accept.cpp b/src/mnode/tickets/accept.cpp
@@ -180,7 +180,7 @@ string CAcceptTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/action-act.cpp b/src/mnode/tickets/action-act.cpp
@@ -14,6 +14,8 @@
 #include <mnode/tickets/ticket-utils.h>
 #ifdef ENABLE_WALLET
 #include <wallet/wallet.h>
+#include "tinyformat.h"
+
 #endif // ENABLE_WALLET
 
 using json = nlohmann::json;
@@ -47,7 +49,7 @@ string CActionActivateTicket::ToJSON(const bool bDecodeProperties) const noexcep
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock)},
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {
@@ -129,12 +131,14 @@ ticket_validation_t CActionActivateTicket::IsValid(const TxOrigin txOrigin, cons
                 !existingTicket.IsBlock(m_nBlock) ||
                 !existingTicket.IsTxId(m_txid))
             {
-                tv.errorMsg = strprintf(
-                    "The Activation ticket for the Registration ticket with txid [%s] already exists [%sfound ticket block=%u, txid=%s]",
-                    m_regTicketTxId, 
-                    bPreReg ? "" : strprintf("this ticket block=%u txid=%s; ", m_nBlock, m_txid),
-                    existingTicket.m_nBlock, existingTicket.m_txid);
-                break;
+                std::string message = strprintf( "The Activation ticket for the Registration ticket with txid [%s] ", m_regTicketTxId);
+                bool bFound = CPastelTicketProcessor::FindTicketTransaction(existingTicket.m_txid, existingTicket.m_nBlock,
+                                                                            m_txid, m_nBlock,
+                                                                            bPreReg, message);
+                if (bFound) {
+                    tv.errorMsg = message;
+                    break;
+                }
             }
         }
 

diff --git a/src/mnode/tickets/action-reg.cpp b/src/mnode/tickets/action-reg.cpp
@@ -318,7 +318,7 @@ string CActionRegTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock},
+        { "height", static_cast<int32_t>(m_nBlock)},
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/collection-act.cpp b/src/mnode/tickets/collection-act.cpp
@@ -100,12 +100,14 @@ ticket_validation_t CollectionActivateTicket::IsValid(const TxOrigin txOrigin, c
                 !existingTicket.IsBlock(m_nBlock) ||
                 !existingTicket.IsTxId(m_txid))
             {
-                tv.errorMsg = strprintf(
-                    "The Activation ticket for the Collection Registration ticket with txid [%s] already exists [%sfound ticket block=%u, txid=%s]",
-                    m_regTicketTxId,
-                    bPreReg ? "" : strprintf("this ticket block=%u txid=%s; ", m_nBlock, m_txid),
-                    existingTicket.m_nBlock, existingTicket.m_txid);
-                break;
+                std::string message = strprintf( "The Activation ticket for the Collection Registration ticket with txid [%s] ", m_regTicketTxId);
+                bool bFound = CPastelTicketProcessor::FindTicketTransaction(existingTicket.m_txid, existingTicket.m_nBlock,
+                                                                            m_txid, m_nBlock,
+                                                                            bPreReg, message);
+                if (bFound) {
+                    tv.errorMsg = message;
+                    break;
+                }
             }
         }
 
@@ -223,7 +225,7 @@ string CollectionActivateTicket::ToJSON(const bool bDecodeProperties) const noex
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket", 
             {

diff --git a/src/mnode/tickets/collection-reg.cpp b/src/mnode/tickets/collection-reg.cpp
@@ -430,7 +430,7 @@ string CollectionRegTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/ethereum-address-change.cpp b/src/mnode/tickets/ethereum-address-change.cpp
@@ -20,10 +20,10 @@ using namespace std;
 // CChangeEthereumAddressTicket ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 string CChangeEthereumAddressTicket::ToJSON(const bool bDecodeProperties) const noexcept
 {
-    const json jsonObj = 
+    const json jsonObj =
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/nft-act.cpp b/src/mnode/tickets/nft-act.cpp
@@ -97,12 +97,14 @@ ticket_validation_t CNFTActivateTicket::IsValid(const TxOrigin txOrigin, const u
                 !existingTicket.IsBlock(m_nBlock) ||
                 !existingTicket.IsTxId(m_txid))
             {
-                tv.errorMsg = strprintf(
-                    "The Activation ticket for the Registration ticket with txid [%s] already exists [%sfound ticket block=%u, txid=%s]",
-                    m_regTicketTxId, 
-                    bPreReg ? "" : strprintf("this ticket block=%u txid=%s; ", m_nBlock, m_txid),
-                    existingTicket.m_nBlock, existingTicket.m_txid);
-                break;
+                std::string message = strprintf( "The Activation ticket for the Registration ticket with txid [%s] ", m_regTicketTxId);
+                bool bFound = CPastelTicketProcessor::FindTicketTransaction(existingTicket.m_txid, existingTicket.m_nBlock,
+                                                                            m_txid, m_nBlock,
+                                                                            bPreReg, message);
+                if (bFound) {
+                    tv.errorMsg = message;
+                    break;
+                }
             }
         }
 
@@ -262,7 +264,7 @@ string CNFTActivateTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/nft-reg.cpp b/src/mnode/tickets/nft-reg.cpp
@@ -380,7 +380,7 @@ string CNFTRegTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/nft-royalty.cpp b/src/mnode/tickets/nft-royalty.cpp
@@ -204,7 +204,7 @@ string CNFTRoyaltyTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket",
             {

diff --git a/src/mnode/tickets/offer.cpp b/src/mnode/tickets/offer.cpp
@@ -454,7 +454,7 @@ string COfferTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket", 
             {

diff --git a/src/mnode/tickets/pastelid-reg.cpp b/src/mnode/tickets/pastelid-reg.cpp
@@ -226,7 +226,7 @@ string CPastelIDRegTicket::ToJSON(const bool bDecodeProperties) const noexcept
     json jsonObj 
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket", 
             {

diff --git a/src/mnode/tickets/transfer.cpp b/src/mnode/tickets/transfer.cpp
@@ -489,7 +489,7 @@ string CTransferTicket::ToJSON(const bool bDecodeProperties) const noexcept
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket", 
             {

diff --git a/src/mnode/tickets/username-change.cpp b/src/mnode/tickets/username-change.cpp
@@ -66,7 +66,7 @@ string CChangeUsernameTicket::ToJSON(const bool bDecodeProperties) const noexcep
     const json jsonObj
     {
         { "txid", m_txid },
-        { "height", m_nBlock },
+        { "height", static_cast<int32_t>(m_nBlock) },
         { "tx_info", get_txinfo_json() },
         { "ticket", 
             {

diff --git a/src/sync.cpp b/src/sync.cpp
@@ -18,6 +18,8 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
 }
 #endif /* DEBUG_LOCKCONTENTION */
 
+#define ASSERT_ONLY_MAYBE_DEADLOCK 1
+
 #ifdef DEBUG_LOCKORDER
 //
 // Early deadlock detection.
@@ -113,7 +115,11 @@ static void potential_deadlock_detected(const pair<void*, void*>& mismatch, cons
         }
         LogPrintf(" %s\n", lockLocation.ToString());
     }
+#ifdef ASSERT_ONLY_MAYBE_DEADLOCK
     assert(onlyMaybeDeadlock);
+#else
+    cout << "POTENTIAL DEADLOCK DETECTED" << endl;
+#endif
 }
 
 static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)