Merge bitcoin#27759: Fix #includes in src/wallet

1f97572 Fix `#include`s in `src/wallet` (Hennadii Stepanov)

Pull request description:

  This PR is a minimum required changes to fix bitcoin#27571 (comment).

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 1f97572

Tree-SHA512: de885210076d23f3394c42ca50e6ae2470c0ae6523399a2fa3ebb7c06383bdacef9c26166fa19747200396bed796c8772165e24416eb30ed8edd024e3394b2fe

Dash adaptations:
- src/wallet/scriptpubkeyman.h: adds <logging.h> next to Dash's <outputtype.h>, which upstream had already removed
- src/wallet/scriptpubkeyman.h: the moved MigrationData keeps Dash's mnemonic, passphrase and chain-counter fields
- src/wallet/wallet.cpp: adds <wallet/scriptpubkeyman.h> among Dash's includes; upstream's <wallet/fees.h> context line is not brought in
- src/wallet/walletutil.h: drops the forward declarations and MigrationData as upstream does; Dash's WalletDescriptor is unchanged

Not applicable to Dash (intentionally omitted):
- ci/test/06_script_b.sh: only drops a walletutil exclusion from upstream's tidy filter; Dash removed this script and ci/dash/lint-tidy.sh has no such filter

Author: DCG-Claude

src/wallet/scriptpubkeyman.h

@@ -5,6 +5,7 @@
 #ifndef BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
 #define BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
 
+#include <logging.h>
 #include <outputtype.h>
 #include <psbt.h>
 #include <script/descriptor.h>
@@ -27,6 +28,8 @@
 #include <optional>
 
 namespace wallet {
+struct MigrationData;
+
 // Wallet storage things that ScriptPubKeyMans need in order to be able to store things to the wallet database.
 // It provides access to things that are part of the entire wallet and not specific to a ScriptPubKeyMan such as
 // wallet flags, wallet version, encryption keys, encryption status, and the database itself. This allows a
@@ -685,6 +688,29 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 
     void UpgradeDescriptorCache();
 };
+
+/** struct containing information needed for migrating legacy wallets to descriptor wallets */
+struct MigrationData
+{
+    CExtKey master_key;
+    SecureString mnemonic;
+    SecureString mnemonic_passphrase;
+    // Highest BIP44 index the legacy wallet ever derived per chain (external/0,
+    // internal/1). The active pkh() descriptors created during migration must
+    // start handing out the next address from this index, otherwise post-
+    // migration getnewaddress would re-derive addresses the legacy wallet had
+    // already given out. Carried via MigrationData purely to advance the active
+    // descriptors' next_index — the inactive combo descriptors built in
+    // MigrateToDescriptor already cover the history themselves.
+    uint32_t external_chain_counter{0};
+    uint32_t internal_chain_counter{0};
+    std::vector<std::pair<std::string, int64_t>> watch_descs;
+    std::vector<std::pair<std::string, int64_t>> solvable_descs;
+    std::vector<std::unique_ptr<DescriptorScriptPubKeyMan>> desc_spkms;
+    std::shared_ptr<CWallet> watchonly_wallet{nullptr};
+    std::shared_ptr<CWallet> solvable_wallet{nullptr};
+};
+
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_SCRIPTPUBKEYMAN_H

src/wallet/wallet.cpp

@@ -46,6 +46,7 @@
 #include <wallet/context.h>
 #include <wallet/external_signer_scriptpubkeyman.h>
 #include <wallet/platformkeys.h>
+#include <wallet/scriptpubkeyman.h>
 #include <warnings.h>
 
 #include <coinjoin/options.h>

src/wallet/walletutil.h

@@ -101,31 +101,6 @@ class WalletDescriptor
     WalletDescriptor() {}
     WalletDescriptor(std::shared_ptr<Descriptor> descriptor, uint64_t creation_time, int32_t range_start, int32_t range_end, int32_t next_index) : descriptor(descriptor), id(DescriptorID(*descriptor)), creation_time(creation_time), range_start(range_start), range_end(range_end), next_index(next_index) { }
 };
-
-class CWallet;
-class DescriptorScriptPubKeyMan;
-
-/** struct containing information needed for migrating legacy wallets to descriptor wallets */
-struct MigrationData
-{
-    CExtKey master_key;
-    SecureString mnemonic;
-    SecureString mnemonic_passphrase;
-    // Highest BIP44 index the legacy wallet ever derived per chain (external/0,
-    // internal/1). The active pkh() descriptors created during migration must
-    // start handing out the next address from this index, otherwise post-
-    // migration getnewaddress would re-derive addresses the legacy wallet had
-    // already given out. Carried via MigrationData purely to advance the active
-    // descriptors' next_index — the inactive combo descriptors built in
-    // MigrateToDescriptor already cover the history themselves.
-    uint32_t external_chain_counter{0};
-    uint32_t internal_chain_counter{0};
-    std::vector<std::pair<std::string, int64_t>> watch_descs;
-    std::vector<std::pair<std::string, int64_t>> solvable_descs;
-    std::vector<std::unique_ptr<DescriptorScriptPubKeyMan>> desc_spkms;
-    std::shared_ptr<CWallet> watchonly_wallet{nullptr};
-    std::shared_ptr<CWallet> solvable_wallet{nullptr};
-};
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_WALLETUTIL_H