wallet: populate change label tweak after desc generation

Author: Eunovo

src/wallet/scriptpubkeyman.cpp

@@ -1643,9 +1643,14 @@ bool DescriptorScriptPubKeyMan::CanUpdateToWalletDescriptor(const WalletDescript
 
 SilentPaymentDescriptorScriptPubKeyMan::SilentPaymentDescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor)
     :   DescriptorScriptPubKeyMan(storage, descriptor, 0)
+{
+    PopulateLabelTweaks();
+}
+
+void SilentPaymentDescriptorScriptPubKeyMan::PopulateLabelTweaks()
 {
     LOCK(cs_desc_man);
-    if (descriptor.descriptor->GetOutputType() != OutputType::SILENT_PAYMENTS) {
+    if (m_wallet_descriptor.descriptor->GetOutputType() != OutputType::SILENT_PAYMENTS) {
         throw std::runtime_error(std::string(__func__) + ": descriptor is not a Silent Payment Descriptor");
     }
     const auto provider{GetSPProvider()};
@@ -1659,6 +1664,13 @@ SilentPaymentDescriptorScriptPubKeyMan::SilentPaymentDescriptorScriptPubKeyMan(W
     }
 }
 
+bool SilentPaymentDescriptorScriptPubKeyMan::SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal)
+{
+    if (!DescriptorScriptPubKeyMan::SetupDescriptorGeneration(batch, master_key, addr_type, internal)) return false;
+    PopulateLabelTweaks();
+    return true;
+}
+
 util::Result<CTxDestination> SilentPaymentDescriptorScriptPubKeyMan::GetNewDestination(const OutputType type)
 {
     LOCK(cs_desc_man);

src/wallet/scriptpubkeyman.h

@@ -359,7 +359,7 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     bool IsHDEnabled() const override;
 
     //! Setup descriptors based on the given CExtkey
-    bool SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal);
+    virtual bool SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal);
 
     bool HavePrivateKeys() const override;
     bool HasPrivKey(const CKeyID& keyid) const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
@@ -421,6 +421,7 @@ class SilentPaymentDescriptorScriptPubKeyMan : public DescriptorScriptPubKeyMan
     TweakMap m_map_spk_tweaks GUARDED_BY(cs_desc_man);
     LabelTweakMap m_map_label_tweaks GUARDED_BY(cs_desc_man);
 
+    void PopulateLabelTweaks();
     FlatSigningProvider GetSPProvider() const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
     std::unique_ptr<FlatSigningProvider> GetSigningProvider(const CScript& script, bool include_private = false) const override;
 
@@ -434,6 +435,8 @@ class SilentPaymentDescriptorScriptPubKeyMan : public DescriptorScriptPubKeyMan
         :   DescriptorScriptPubKeyMan(storage, 0)
         {}
 
+    bool SetupDescriptorGeneration(WalletBatch& batch, const CExtKey& master_key, OutputType addr_type, bool internal) override;
+
     util::Result<CTxDestination> GetNewDestination(const OutputType type) override;
     util::Result<CTxDestination> GetNewLabeledDestination(uint64_t& index);
     V0SilentPaymentDestination GetLabeledDestination(uint64_t index) EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);