wallet: LearnRelatedScripts only if KeepDestination

promag · promag · commit 3958295bc8a3 · 2019-11-04T16:14:38.000Z
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3256,16 +3256,17 @@ bool ReserveDestination::GetReservedDestination(CTxDestination& dest, bool inter
         fInternal = keypool.fInternal;
     }
     assert(vchPubKey.IsValid());
-    m_spk_man->LearnRelatedScripts(vchPubKey, type);
     address = GetDestinationForKey(vchPubKey, type);
     dest = address;
     return true;
 }
 
 void ReserveDestination::KeepDestination()
 {
-    if (nIndex != -1)
+    if (nIndex != -1) {
         m_spk_man->KeepDestination(nIndex);
+        m_spk_man->LearnRelatedScripts(vchPubKey, type);
+    }
     nIndex = -1;
     vchPubKey = CPubKey();
     address = CNoDestination();

Original file line number	Diff line number	Diff line change
`@@ -3256,16 +3256,17 @@ bool ReserveDestination::GetReservedDestination(CTxDestination& dest, bool inter`
`3256`	`3256`	`fInternal = keypool.fInternal;`
`3257`	`3257`	`}`
`3258`	`3258`	`assert(vchPubKey.IsValid());`
`3259`		`- m_spk_man->LearnRelatedScripts(vchPubKey, type);`
`3260`	`3259`	`address = GetDestinationForKey(vchPubKey, type);`
`3261`	`3260`	`dest = address;`
`3262`	`3261`	`return true;`
`3263`	`3262`	`}`
`3264`	`3263`
`3265`	`3264`	`void ReserveDestination::KeepDestination()`
`3266`	`3265`	`{`
`3267`		`- if (nIndex != -1)`
	`3266`	`+ if (nIndex != -1) {`
`3268`	`3267`	`m_spk_man->KeepDestination(nIndex);`
	`3268`	`+ m_spk_man->LearnRelatedScripts(vchPubKey, type);`
	`3269`	`+ }`
`3269`	`3270`	`nIndex = -1;`
`3270`	`3271`	`vchPubKey = CPubKey();`
`3271`	`3272`	`address = CNoDestination();`