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: added #include <logging.h> next to Dash's existing #include <outputtype.h> (upstream had removed outputtype.h before this PR; Dash still includes it), kept alphabetical
- src/wallet/scriptpubkeyman.h: the MigrationData struct moved here from walletutil.h is Dash's version, keeping the Dash-only fields mnemonic, mnemonic_passphrase, external_chain_counter, internal_chain_counter and their comment; upstream's copy lacks them
- src/wallet/wallet.cpp: added #include <wallet/scriptpubkeyman.h> after Dash's <wallet/platformkeys.h>; did not bring in upstream's context line <wallet/fees.h>, which Dash's wallet.cpp does not include; all Dash includes (warnings.h, coinjoin/options.h, evo/providertx.h, governance/vote.h) kept
- src/wallet/walletutil.h: removed the forward declarations and the Dash MigrationData struct as upstream does; kept Dash's own WalletDescriptor (id(DescriptorID(*descriptor)) and its existing formatting) unchanged
- ci/test/06_script_b.sh: Dash had deleted this file and upstream modified it; resolved by keeping it deleted (git rm), see omitted_hunks

Not applicable to Dash (intentionally omitted):
- ci/test/06_script_b.sh: The hunk only removes the temporary 'src/wallet/walletutil' exclusion from upstream's jq filter on compile_commands.json. Dash removed this script; its counterpart ci/dash/lint-tidy.sh has no jq filter and no walletutil exclusion (and its IWYU file list has no src/wallet files), so there is nothing to remove there.

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
@@ -684,6 +687,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

@@ -45,6 +45,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