[Wallet] Fix an error in tx depth computation

Warrows · Warrows · commit 35723542f976 · 2019-10-09T17:44:31.000+02:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3833,30 +3833,28 @@ int CMerkleTx::SetMerkleBranch(const CBlock& block)
     return chainActive.Height() - pindex->nHeight + 1;
 }
 
-int CMerkleTx::GetDepthInMainChainINTERNAL(const CBlockIndex*& pindexRet) const
+int CMerkleTx::GetDepthInMainChain(const CBlockIndex*& pindexRet, bool enableIX) const
 {
     if (hashUnset())
         return 0;
     AssertLockHeld(cs_main);
+    int nResult;
 
     // Find the block it claims to be in
     BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
-    if (mi == mapBlockIndex.end())
-        return 0;
-    CBlockIndex* pindex = (*mi).second;
-    if (!pindex || !chainActive.Contains(pindex))
-        return 0;
-
-    pindexRet = pindex;
-    return ((nIndex == -1) ? (-1) : 1) * (chainActive.Height() - pindex->nHeight + 1);
-}
-
-int CMerkleTx::GetDepthInMainChain(const CBlockIndex*& pindexRet, bool enableIX) const
-{
-    AssertLockHeld(cs_main);
-    int nResult = GetDepthInMainChainINTERNAL(pindexRet);
-    if (nResult == 0 && !mempool.exists(GetHash()))
-        return -1; // Not in chain, not in mempool
+    if (mi == mapBlockIndex.end()) {
+        nResult = 0;
+    }
+    else {
+        CBlockIndex* pindex = (*mi).second;
+        if (!pindex || !chainActive.Contains(pindex)) {
+            nResult = 0;
+        }
+        else {
+            pindexRet = pindex;
+            nResult = ((nIndex == -1) ? (-1) : 1) * (chainActive.Height() - pindex->nHeight + 1);
+        }
+    }
 
     if (enableIX) {
         if (nResult < 6) {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -619,7 +619,6 @@ struct COutputEntry {
 class CMerkleTx : public CTransaction
 {
 private:
-    int GetDepthInMainChainINTERNAL(const CBlockIndex*& pindexRet) const;
     /** Constant used in hashBlock to indicate tx has been abandoned */
     static const uint256 ABANDON_HASH;
 
@@ -679,7 +678,7 @@ class CMerkleTx : public CTransaction
     bool IsInMainChain() const
     {
         const CBlockIndex* pindexRet;
-        return GetDepthInMainChainINTERNAL(pindexRet) > 0;
+        return GetDepthInMainChain(pindexRet, false) > 0;
     }
     int GetBlocksToMaturity() const;
     bool AcceptToMemoryPool(bool fLimitFree = true, bool fRejectInsaneFee = true, bool ignoreFees = false);

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,6 @@ struct COutputEntry {`
`619`	`619`	`class CMerkleTx : public CTransaction`
`620`	`620`	`{`
`621`	`621`	`private:`
`622`		`- int GetDepthInMainChainINTERNAL(const CBlockIndex*& pindexRet) const;`
`623`	`622`	`/** Constant used in hashBlock to indicate tx has been abandoned */`
`624`	`623`	`static const uint256 ABANDON_HASH;`
`625`	`624`
`@@ -679,7 +678,7 @@ class CMerkleTx : public CTransaction`
`679`	`678`	`bool IsInMainChain() const`
`680`	`679`	`{`
`681`	`680`	`const CBlockIndex* pindexRet;`
`682`		`- return GetDepthInMainChainINTERNAL(pindexRet) > 0;`
	`681`	`+ return GetDepthInMainChain(pindexRet, false) > 0;`
`683`	`682`	`}`
`684`	`683`	`int GetBlocksToMaturity() const;`
`685`	`684`	`bool AcceptToMemoryPool(bool fLimitFree = true, bool fRejectInsaneFee = true, bool ignoreFees = false);`