wallet: Construct ExternalSignerSPKM with the new descriptor

Instead of constructing then setting the descriptor with
SetupDescriptor, just pass in that descriptor to the constructor.

Author: achow101

src/wallet/external_signer_scriptpubkeyman.cpp

@@ -16,7 +16,8 @@
 #include <vector>
 
 namespace wallet {
-bool ExternalSignerScriptPubKeyMan::SetupDescriptor(std::unique_ptr<Descriptor> desc)
+ExternalSignerScriptPubKeyMan::ExternalSignerScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size, std::unique_ptr<Descriptor> desc)
+  :   DescriptorScriptPubKeyMan(storage, keypool_size)
 {
     LOCK(cs_desc_man);
     assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
@@ -38,7 +39,6 @@ bool ExternalSignerScriptPubKeyMan::SetupDescriptor(std::unique_ptr<Descriptor>
     TopUp();
 
     m_storage.UnsetBlankWalletFlag(batch);
-    return true;
 }
 
 ExternalSigner ExternalSignerScriptPubKeyMan::GetExternalSigner() {

src/wallet/external_signer_scriptpubkeyman.h

@@ -12,18 +12,13 @@
 namespace wallet {
 class ExternalSignerScriptPubKeyMan : public DescriptorScriptPubKeyMan
 {
-  public:
-  ExternalSignerScriptPubKeyMan(WalletStorage& storage, const uint256& id, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys)
+public:
+    //! Create an ExternalSPKM from existing wallet data
+    ExternalSignerScriptPubKeyMan(WalletStorage& storage, const uint256& id, WalletDescriptor& descriptor, int64_t keypool_size, const KeyMap& keys, const CryptedKeyMap& ckeys)
       :   DescriptorScriptPubKeyMan(storage, id, descriptor, keypool_size, keys, ckeys)
       {}
-  ExternalSignerScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size)
-      :   DescriptorScriptPubKeyMan(storage, keypool_size)
-      {}
-
-  /** Provide a descriptor at setup time
-  * Returns false if already setup or setup fails, true if setup is successful
-  */
-  bool SetupDescriptor(std::unique_ptr<Descriptor>desc);
+    //! Create a new ExternalSPKM from just a descriptor
+    ExternalSignerScriptPubKeyMan(WalletStorage& storage, int64_t keypool_size, std::unique_ptr<Descriptor> desc);
 
   static ExternalSigner GetExternalSigner();
 

src/wallet/scriptpubkeyman.h

@@ -621,11 +621,6 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     //! Setup descriptors based on the given CExtkey
     bool SetupDescriptorGeneration(const CExtKey& master_key, OutputType addr_type, bool internal);
 
-    /** Provide a descriptor at setup time
-    * Returns false if already setup or setup fails, true if setup is successful
-    */
-    bool SetupDescriptor(std::unique_ptr<Descriptor>desc);
-
     bool HavePrivateKeys() const override;
 
     std::optional<int64_t> GetOldestKeyPoolTime() const override;

src/wallet/wallet.cpp

@@ -3616,8 +3616,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
                     continue;
                 }
                 OutputType t =  *desc->GetOutputType();
-                auto spk_manager = std::unique_ptr<ExternalSignerScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, m_keypool_size));
-                spk_manager->SetupDescriptor(std::move(desc));
+                auto spk_manager = std::unique_ptr<ExternalSignerScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, m_keypool_size, std::move(desc)));
                 uint256 id = spk_manager->GetID();
                 AddScriptPubKeyMan(id, std::move(spk_manager));
                 AddActiveScriptPubKeyMan(id, t, internal);