ScanforWalletTransactions should mark input txns as dirty

instagibbs · instagibbs · commit 3c292cc190b1 · 2018-06-14T09:57:34.000-04:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1214,10 +1214,10 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
     }
 }
 
-void CWallet::SyncTransaction(const CTransactionRef& ptx, const CBlockIndex *pindex, int posInBlock) {
+void CWallet::SyncTransaction(const CTransactionRef& ptx, const CBlockIndex *pindex, int posInBlock, bool update_tx) {
     const CTransaction& tx = *ptx;
 
-    if (!AddToWalletIfInvolvingMe(ptx, pindex, posInBlock, true))
+    if (!AddToWalletIfInvolvingMe(ptx, pindex, posInBlock, update_tx))
         return; // Not one of ours
 
     // If a transaction changes 'conflicted' state, that changes the balance
@@ -1784,7 +1784,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
                     break;
                 }
                 for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {
-                    AddToWalletIfInvolvingMe(block.vtx[posInBlock], pindex, posInBlock, fUpdate);
+                    SyncTransaction(block.vtx[posInBlock], pindex, posInBlock, fUpdate);
                 }
             } else {
                 ret = pindex;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -708,9 +708,9 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
 
     void SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator>);
 
-    /* Used by TransactionAddedToMemorypool/BlockConnected/Disconnected.
+    /* Used by TransactionAddedToMemorypool/BlockConnected/Disconnected/ScanForWalletTransactions.
      * Should be called with pindexBlock and posInBlock if this is for a transaction that is included in a block. */
-    void SyncTransaction(const CTransactionRef& tx, const CBlockIndex *pindex = nullptr, int posInBlock = 0) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+    void SyncTransaction(const CTransactionRef& tx, const CBlockIndex *pindex = nullptr, int posInBlock = 0, bool update_tx = true) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     /* the HD chain data model (external chain counters) */
     CHDChain hdChain;

Original file line number	Diff line number	Diff line change
`@@ -1214,10 +1214,10 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)`
`1214`	`1214`	`}`
`1215`	`1215`	`}`
`1216`	`1216`
`1217`		`-void CWallet::SyncTransaction(const CTransactionRef& ptx, const CBlockIndex *pindex, int posInBlock) {`
	`1217`	`+void CWallet::SyncTransaction(const CTransactionRef& ptx, const CBlockIndex *pindex, int posInBlock, bool update_tx) {`
`1218`	`1218`	`const CTransaction& tx = *ptx;`
`1219`	`1219`
`1220`		`- if (!AddToWalletIfInvolvingMe(ptx, pindex, posInBlock, true))`
	`1220`	`+ if (!AddToWalletIfInvolvingMe(ptx, pindex, posInBlock, update_tx))`
`1221`	`1221`	`return; // Not one of ours`
`1222`	`1222`
`1223`	`1223`	`// If a transaction changes 'conflicted' state, that changes the balance`
`@@ -1784,7 +1784,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1784`	`1784`	`break;`
`1785`	`1785`	`}`
`1786`	`1786`	`for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {`
`1787`		`- AddToWalletIfInvolvingMe(block.vtx[posInBlock], pindex, posInBlock, fUpdate);`
	`1787`	`+ SyncTransaction(block.vtx[posInBlock], pindex, posInBlock, fUpdate);`
`1788`	`1788`	`}`
`1789`	`1789`	`} else {`
`1790`	`1790`	`ret = pindex;`