refactor: rename FirstKeyTimeChanged to MaybeUpdateBirthTime

furszy · fanquake · commit 074296dd60ef · 2024-01-04T16:21:37.000Z
In the following-up commit, the wallet birth time will also be modified by the transactions scanning process. When a tx older than all descriptor's timestamp is detected. Github-Pull: #28920 Rebased-From: b4306e3
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1763,11 +1763,11 @@ bool CWallet::ImportScriptPubKeys(const std::string& label, const std::set<CScri
     return true;
 }
 
-void CWallet::FirstKeyTimeChanged(const ScriptPubKeyMan* spkm, int64_t new_birth_time)
+void CWallet::MaybeUpdateBirthTime(int64_t time)
 {
     int64_t birthtime = m_birth_time.load();
-    if (new_birth_time < birthtime) {
-        m_birth_time = new_birth_time;
+    if (time < birthtime) {
+        m_birth_time = time;
     }
 }
 
@@ -3494,10 +3494,12 @@ LegacyScriptPubKeyMan* CWallet::GetOrCreateLegacyScriptPubKeyMan()
 
 void CWallet::AddScriptPubKeyMan(const uint256& id, std::unique_ptr<ScriptPubKeyMan> spkm_man)
 {
+    // Add spkm_man to m_spk_managers before calling any method
+    // that might access it.
     const auto& spkm = m_spk_managers[id] = std::move(spkm_man);
 
     // Update birth time if needed
-    FirstKeyTimeChanged(spkm.get(), spkm->GetTimeFirstKey());
+    MaybeUpdateBirthTime(spkm->GetTimeFirstKey());
 }
 
 void CWallet::SetupLegacyScriptPubKeyMan()
@@ -3530,7 +3532,7 @@ void CWallet::ConnectScriptPubKeyManNotifiers()
     for (const auto& spk_man : GetActiveScriptPubKeyMans()) {
         spk_man->NotifyWatchonlyChanged.connect(NotifyWatchonlyChanged);
         spk_man->NotifyCanGetAddressesChanged.connect(NotifyCanGetAddressesChanged);
-        spk_man->NotifyFirstKeyTimeChanged.connect(std::bind(&CWallet::FirstKeyTimeChanged, this, std::placeholders::_1, std::placeholders::_2));
+        spk_man->NotifyFirstKeyTimeChanged.connect(std::bind(&CWallet::MaybeUpdateBirthTime, this, std::placeholders::_2));
     }
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -678,8 +678,8 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     bool ImportPubKeys(const std::vector<CKeyID>& ordered_pubkeys, const std::map<CKeyID, CPubKey>& pubkey_map, const std::map<CKeyID, std::pair<CPubKey, KeyOriginInfo>>& key_origins, const bool add_keypool, const bool internal, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool ImportScriptPubKeys(const std::string& label, const std::set<CScript>& script_pub_keys, const bool have_solving_data, const bool apply_label, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
-    /** Updates wallet birth time if 'new_birth_time' is below it */
-    void FirstKeyTimeChanged(const ScriptPubKeyMan* spkm, int64_t new_birth_time);
+    /** Updates wallet birth time if 'time' is below it */
+    void MaybeUpdateBirthTime(int64_t time);
 
     CFeeRate m_pay_tx_fee{DEFAULT_PAY_TX_FEE};
     unsigned int m_confirm_target{DEFAULT_TX_CONFIRM_TARGET};

Original file line number	Diff line number	Diff line change
`@@ -1763,11 +1763,11 @@ bool CWallet::ImportScriptPubKeys(const std::string& label, const std::set<CScri`
`1763`	`1763`	`return true;`
`1764`	`1764`	`}`
`1765`	`1765`
`1766`		`-void CWallet::FirstKeyTimeChanged(const ScriptPubKeyMan* spkm, int64_t new_birth_time)`
	`1766`	`+void CWallet::MaybeUpdateBirthTime(int64_t time)`
`1767`	`1767`	`{`
`1768`	`1768`	`int64_t birthtime = m_birth_time.load();`
`1769`		`- if (new_birth_time < birthtime) {`
`1770`		`- m_birth_time = new_birth_time;`
	`1769`	`+ if (time < birthtime) {`
	`1770`	`+ m_birth_time = time;`
`1771`	`1771`	`}`
`1772`	`1772`	`}`
`1773`	`1773`
`@@ -3494,10 +3494,12 @@ LegacyScriptPubKeyMan* CWallet::GetOrCreateLegacyScriptPubKeyMan()`
`3494`	`3494`
`3495`	`3495`	`void CWallet::AddScriptPubKeyMan(const uint256& id, std::unique_ptr<ScriptPubKeyMan> spkm_man)`
`3496`	`3496`	`{`
	`3497`	`+ // Add spkm_man to m_spk_managers before calling any method`
	`3498`	`+ // that might access it.`
`3497`	`3499`	`const auto& spkm = m_spk_managers[id] = std::move(spkm_man);`
`3498`	`3500`
`3499`	`3501`	`// Update birth time if needed`
`3500`		`- FirstKeyTimeChanged(spkm.get(), spkm->GetTimeFirstKey());`
	`3502`	`+ MaybeUpdateBirthTime(spkm->GetTimeFirstKey());`
`3501`	`3503`	`}`
`3502`	`3504`
`3503`	`3505`	`void CWallet::SetupLegacyScriptPubKeyMan()`
`@@ -3530,7 +3532,7 @@ void CWallet::ConnectScriptPubKeyManNotifiers()`
`3530`	`3532`	`for (const auto& spk_man : GetActiveScriptPubKeyMans()) {`
`3531`	`3533`	`spk_man->NotifyWatchonlyChanged.connect(NotifyWatchonlyChanged);`
`3532`	`3534`	`spk_man->NotifyCanGetAddressesChanged.connect(NotifyCanGetAddressesChanged);`
`3533`		`- spk_man->NotifyFirstKeyTimeChanged.connect(std::bind(&CWallet::FirstKeyTimeChanged, this, std::placeholders::_1, std::placeholders::_2));`
	`3535`	`+ spk_man->NotifyFirstKeyTimeChanged.connect(std::bind(&CWallet::MaybeUpdateBirthTime, this, std::placeholders::_2));`
`3534`	`3536`	`}`
`3535`	`3537`	`}`
`3536`	`3538`