fixup: for collateral age change

Author: domob1812

divi/src/masternode.cpp

@@ -122,6 +122,7 @@ CMasternode::CMasternode()
     activeState = MASTERNODE_ENABLED;
     sigTime = GetAdjustedTime();
     lastPing = CMasternodePing();
+    collateralBlock.SetNull();
     allowFreeTx = true;
     nActiveState = MASTERNODE_ENABLED;
     protocolVersion = PROTOCOL_VERSION;
@@ -142,7 +143,7 @@ CMasternode::CMasternode(const CMasternode& other)
     activeState = other.activeState;
     sigTime = other.sigTime;
     lastPing = other.lastPing;
-    collateralHeight = other.collateralHeight;
+    collateralBlock = other.collateralBlock;
     allowFreeTx = other.allowFreeTx;
     nActiveState = MASTERNODE_ENABLED;
     protocolVersion = other.protocolVersion;
@@ -163,7 +164,7 @@ CMasternode::CMasternode(const CMasternodeBroadcast& mnb)
     activeState = MASTERNODE_ENABLED;
     sigTime = mnb.sigTime;
     lastPing = mnb.lastPing;
-    collateralHeight = mnb.collateralHeight;
+    collateralBlock = mnb.collateralBlock;
     allowFreeTx = true;
     nActiveState = MASTERNODE_ENABLED;
     protocolVersion = mnb.protocolVersion;
@@ -188,7 +189,7 @@ void CMasternode::swap(CMasternode& first, CMasternode& second) // nothrow
     swap(first.activeState, second.activeState);
     swap(first.sigTime, second.sigTime);
     swap(first.lastPing, second.lastPing);
-    swap(first.collateralHeight, second.collateralHeight);
+    swap(first.collateralBlock, second.collateralBlock);
     swap(first.allowFreeTx, second.allowFreeTx);
     swap(first.protocolVersion, second.protocolVersion);
     swap(first.nScanningErrorCount, second.nScanningErrorCount);
@@ -239,21 +240,18 @@ bool CMasternode::IsEnabled() const
 
 int CMasternode::GetMasternodeInputAge() const
 {
-    if (collateralHeight == 0)
+    LOCK(cs_main);
+
+    const auto* pindex = GetCollateralBlock();
+    if (pindex == nullptr)
         return 0;
 
-    unsigned tipHeight;
-    {
-        LOCK(cs_main);
-        if (chainActive.Tip() == nullptr)
-            return 0;
-        tipHeight = chainActive.Tip()->nHeight;
-    }
+    assert(chainActive.Contains(pindex));
 
-    if (tipHeight < collateralHeight)
-        return 0;
+    const unsigned tipHeight = chainActive.Height();
+    assert(tipHeight >= pindex->nHeight);
 
-    return tipHeight - collateralHeight + 1;
+    return tipHeight - pindex->nHeight + 1;
 }
 
 std::string CMasternode::Status() const
@@ -745,9 +743,8 @@ CMasternodePing createDelayedMasternodePing(const CMasternodeBroadcast& mnb)
     CMasternodePing ping;
     const int64_t offsetTimeBy45BlocksInSeconds = 60 * 45;
     ping.vin = mnb.vin;
-    const auto* confBlock = mnb.GetCollateralConfirmationBlock();
     const int tipHeight = chainActive.Height();
-    const int depthOfTx = (confBlock == nullptr ? 0 : tipHeight - confBlock->nHeight);
+    const int depthOfTx = mnb.GetMasternodeInputAge();
     const int offset = std::min( std::max(0, depthOfTx), 12 );
     const auto* block = chainActive[tipHeight - offset];
     ping.blockHash = block->GetBlockHash();
@@ -872,30 +869,36 @@ bool CMasternodeBroadcast::CheckAndUpdate(int& nDos)
     return true;
 }
 
-const CBlockIndex* CMasternodeBroadcast::GetCollateralConfirmationBlock() const
+const CBlockIndex* CMasternode::GetCollateralBlock() const
 {
+    LOCK(cs_main);
+
+    if (!collateralBlock.IsNull()) {
+        const auto mi = mapBlockIndex.find(collateralBlock);
+        if (mi != mapBlockIndex.end() && chainActive.Contains(mi->second))
+            return mi->second;
+    }
+
     uint256 hashBlock;
     CTransaction tx;
-    if (!GetTransaction(vin.prevout.hash, tx, hashBlock, true))
+    if (!GetTransaction(vin.prevout.hash, tx, hashBlock, true)) {
+        collateralBlock.SetNull();
         return nullptr;
+    }
 
     const auto mi = mapBlockIndex.find(hashBlock);
-    if (mi == mapBlockIndex.end() || mi->second == nullptr)
+    if (mi == mapBlockIndex.end() || mi->second == nullptr) {
+        collateralBlock.SetNull();
         return nullptr;
-
-    const CBlockIndex* conf;
-    {
-        LOCK(cs_main);
-        if (!chainActive.Contains(mi->second))
-            return nullptr;
-        conf = chainActive[mi->second->nHeight + MASTERNODE_MIN_CONFIRMATIONS - 1];
     }
 
-    if (conf == nullptr)
+    if (!chainActive.Contains(mi->second)) {
+        collateralBlock.SetNull();
         return nullptr;
+    }
 
-    assert(conf->GetAncestor(mi->second->nHeight) == mi->second);
-    return conf;
+    collateralBlock = hashBlock;
+    return mi->second;
 }
 
 bool CMasternodeBroadcast::CheckInputs(int& nDoS) const
@@ -919,18 +922,29 @@ bool CMasternodeBroadcast::CheckInputs(int& nDoS) const
 
     LogPrint("masternode", "mnb - Accepted Masternode entry\n");
 
-    const auto* confBlock = GetCollateralConfirmationBlock();
-    if (confBlock == nullptr) {
+    const CBlockIndex* pindexConf;
+    {
+        LOCK(cs_main);
+        const auto* pindexCollateral = GetCollateralBlock();
+        if (pindexCollateral == nullptr)
+            pindexConf = nullptr;
+        else {
+            assert(chainActive.Contains(pindexCollateral));
+            pindexConf = chainActive[pindexCollateral->nHeight + MASTERNODE_MIN_CONFIRMATIONS - 1];
+            assert(pindexConf == nullptr || pindexConf->GetAncestor(pindexCollateral->nHeight) == pindexCollateral);
+        }
+    }
+
+    if (pindexConf == nullptr) {
         LogPrint("masternode","mnb - Input must have at least %d confirmations\n", MASTERNODE_MIN_CONFIRMATIONS);
         return false;
     }
-    collateralHeight = confBlock->nHeight - MASTERNODE_MIN_CONFIRMATIONS + 1;
 
     // verify that sig time is legit in past
     // should be at least not earlier than block when 1000 PIV tx got MASTERNODE_MIN_CONFIRMATIONS
-    if (confBlock->GetBlockTime() > sigTime) {
+    if (pindexConf->GetBlockTime() > sigTime) {
         LogPrint("masternode","mnb - Bad sigTime %d for Masternode %s (%i conf block is at %d)\n",
-                 sigTime, vin.prevout.hash.ToString(), MASTERNODE_MIN_CONFIRMATIONS, confBlock->GetBlockTime());
+                 sigTime, vin.prevout.hash.ToString(), MASTERNODE_MIN_CONFIRMATIONS, pindexConf->GetBlockTime());
         return false;
     }
 

divi/src/masternode.h

@@ -126,8 +126,16 @@ class CMasternode
     mutable CCriticalSection cs;
     int64_t lastTimeChecked;
 
-    mutable int cacheInputAge;
-    mutable int cacheInputAgeBlock;
+protected:
+
+    /** Cached block hash of where the collateral output of this
+     *  masternode got included.  */
+    mutable uint256 collateralBlock;
+
+    /** Looks up and returns the block index when the collateral got
+     *  included in the currently active chain.  If it is not yet confirmed
+     *  then this returns nullptr.  */
+    const CBlockIndex* GetCollateralBlock() const;
 
 public:
     enum state {
@@ -157,15 +165,10 @@ class CMasternode
     MasternodeTier nTier;
     CMasternodePing lastPing;
 
-    /** Height of the collateral UTXO.  This is set when checking
-     *  the collateral in CheckInputs for a broadcast.  */
-    mutable int collateralHeight = 0;
-
     CMasternode();
     CMasternode(const CMasternode& other);
     CMasternode(const CMasternodeBroadcast& mnb);
 
-
     void swap(CMasternode& first, CMasternode& second); // nothrow
 
     CMasternode& operator=(CMasternode from);
@@ -200,7 +203,7 @@ class CMasternode
         READWRITE(protocolVersion);
         READWRITE(activeState);
         READWRITE(lastPing);
-        READWRITE(collateralHeight);
+        READWRITE(collateralBlock);
         READWRITE(allowFreeTx);
         READWRITE(nScanningErrorCount);
         READWRITE(nLastScanningErrorBlockHeight);
@@ -262,14 +265,6 @@ class CMasternodeBroadcast : public CMasternode
         int protocolVersionIn);
     CMasternodeBroadcast(const CMasternode& mn);
 
-    /** Looks up and returns the block index when the collateral got its
-     *  minimum confirmation.  That block's time is part of the condition
-     *  for verifying the signature time.
-     *
-     *  If the collateral does not yet have sufficient confirmations (i.e.
-     *  that block does not exist), then the function returns nullptr.  */
-    const CBlockIndex* GetCollateralConfirmationBlock() const;
-
     bool CheckAndUpdate(int& nDoS);
     bool CheckInputs(int& nDos) const;
     bool Sign(CKey& keyCollateralAddress, bool updateTimeBeforeSigning = true);
@@ -294,8 +289,10 @@ class CMasternodeBroadcast : public CMasternode
         if (!ser_action.ForRead ())
             tier = static_cast<int> (nTier);
         READWRITE(tier);
-        if (ser_action.ForRead ())
+        if (ser_action.ForRead ()) {
             nTier = static_cast<MasternodeTier> (tier);
+            collateralBlock.SetNull();
+        }
     }
 
     uint256 GetHash() const