Auto merge of #3561 - bitcartel:3560_update_sapling_note_data, r=bitcartel

Closes #3560. Update Sapling note data correctly when importing a key.
2018-10-04 15:37:34 -07:00
parent 4ba35551d4 f0dcfceb81
commit 967bbbc486
2 changed files with 9 additions and 1 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2379,7 +2379,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
                }
            }
            // Increment note witness caches
-            IncrementNoteWitnesses(pindex, &block, sproutTree, saplingTree);
+            ChainTip(pindex, &block, sproutTree, saplingTree, true);

            pindex = chainActive.Next(pindex);
            if (GetTime() >= nNow + 60) {