Auto-rescan wallets on reorg if note witnesses get out of sync

src/main.cpp

@@ -4048,7 +4048,10 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
         CheckForkWarningConditionsOnNewFork(vpindexToConnect.back());
     else
         CheckForkWarningConditions();
-    
+
+    // if we need to, rescan wallets
+    RescanWallets();
+
     return true;
 }