[Wallet] Fix bug with coinstake inputs wrongly marked as spent

random-zebra · random-zebra · commit a0285e45285d · 2019-10-16T23:51:50.000+02:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -472,8 +472,11 @@ bool CWallet::IsSpent(const uint256& hash, unsigned int n) const
         const uint256& wtxid = it->second;
         std::map<uint256, CWalletTx>::const_iterator mit = mapWallet.find(wtxid);
         if (mit != mapWallet.end()) {
-            int depth = mit->second.GetDepthInMainChain();
-            if (depth > 0  || (depth == 0 && !mit->second.isAbandoned()))
+            bool fConflicted;
+            const int nDepth = mit->second.GetDepthAndMempool(fConflicted);
+            // not in mempool txes can spend coins only if not coinstakes
+            const bool fConflictedCoinstake = fConflicted && mit->second.IsCoinStake();
+            if (nDepth > 0  || (nDepth == 0 && !mit->second.isAbandoned() && !fConflictedCoinstake) )
                 return true; // Spent
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -472,8 +472,11 @@ bool CWallet::IsSpent(const uint256& hash, unsigned int n) const`
`472`	`472`	`const uint256& wtxid = it->second;`
`473`	`473`	`std::map<uint256, CWalletTx>::const_iterator mit = mapWallet.find(wtxid);`
`474`	`474`	`if (mit != mapWallet.end()) {`
`475`		`- int depth = mit->second.GetDepthInMainChain();`
`476`		`- if (depth > 0 \|\| (depth == 0 && !mit->second.isAbandoned()))`
	`475`	`+ bool fConflicted;`
	`476`	`+ const int nDepth = mit->second.GetDepthAndMempool(fConflicted);`
	`477`	`+ // not in mempool txes can spend coins only if not coinstakes`
	`478`	`+ const bool fConflictedCoinstake = fConflicted && mit->second.IsCoinStake();`
	`479`	`+ if (nDepth > 0 \|\| (nDepth == 0 && !mit->second.isAbandoned() && !fConflictedCoinstake) )`
`477`	`480`	`return true; // Spent`
`478`	`481`	`}`
`479`	`482`	`}`