merge-script 20ad7c9eab Merge bitcoin/bitcoin#35955: wallet: remove orphaned GetAffectedKeys and LegacyScriptPubKeyMan declarations ...

02de12b1e6 wallet: remove remaining LegacyScriptPubKeyMan references (Laxman Acharya)
d194be69d6 wallet: remove orphaned GetAffectedKeys declaration (Laxman Acharya)

Pull request description:

  Follow-up to #28710, which removed `GetAffectedKeys()` and `LegacyScriptPubKeyMan` but left their declarations behind.

  Remove both orphaned declarations, rename `SetupLegacyScriptPubKeyMan()` to `SetupLegacyDataSPKM()`, and update related comments and logging to reflect the minimal `LegacyDataSPKM` retained for legacy wallet loading and migration.

  ## Testing

  ```bash
  cmake --build build --target bitcoin_wallet -j 8
  cmake --build build --target test_bitcoin -j 8
  build/bin/test_bitcoin --run_test=scriptpubkeyman_tests,walletdb_tests,wallet_tests --catch_system_errors=no --log_level=error
  ```

ACKs for top commit:
  achow101:
    ACK 02de12b1e6
  polespinasa:
    ACK 02de12b1e6

Tree-SHA512: 0d340291c969f013fd6ec55158f6797d4a1478ff7a819c2d250d1b3f345131db99a8b7b4b3ff0da1fa0e06182701abed31dcd317f8ef12c81837c1aed57b21a5

2026-08-18 09:45:34 +01:00

..

rpc

Merge bitcoin/bitcoin#35955: wallet: remove orphaned GetAffectedKeys and LegacyScriptPubKeyMan declarations

2026-08-18 09:45:34 +01:00

test

Merge bitcoin/bitcoin#32784: wallet: derivehdkey RPC to get xpub at arbitrary path

2026-08-14 18:11:26 -07:00

CMakeLists.txt

…

coincontrol.cpp

…

coincontrol.h

refactor: Use C++14 digit separator for large int literals

2026-08-05 08:35:41 +02:00

coinselection.cpp

…

coinselection.h

refactor: Use C++14 digit separator for large int literals

2026-08-05 08:35:41 +02:00

context.cpp

…

context.h

…

crypter.cpp

…

crypter.h

scripted-diff: Use inline constexpr over (static) const

2026-08-05 08:34:13 +02:00

db.cpp

…

db.h

…

dump.cpp

…

dump.h

…

export.cpp

wallet: Store all witness variants of a transaction

2026-07-16 10:56:37 -07:00

export.h

…

external_signer_scriptpubkeyman.cpp

…

external_signer_scriptpubkeyman.h

…

feebumper.cpp

wallet: Make CWalletTx::tx private and use CWalletTx::GetTx to access

2026-07-16 10:56:17 -07:00

feebumper.h

…

fees.cpp

…

fees.h

…

init.cpp

…

interfaces.cpp

Merge bitcoin/bitcoin#35501: wallet: store all witness variants of a transaction

2026-08-04 23:04:06 +02:00

load.cpp

…

load.h

…

migrate.cpp

Merge bitcoin/bitcoin#34959: wallet: Enforce BDB btree levels and overflow item sizes

2026-07-04 12:17:42 +02:00

migrate.h

…

receive.cpp

wallet: Make CWalletTx::tx private and use CWalletTx::GetTx to access

2026-07-16 10:56:17 -07:00

receive.h

…

scriptpubkeyman.cpp

Merge bitcoin/bitcoin#35606: script: qa: Improve Key::Fingerprint type safety

2026-07-29 09:55:39 +02:00

scriptpubkeyman.h

wallet: remove remaining LegacyScriptPubKeyMan references

2026-08-14 23:44:16 +05:45

spend.cpp

Merge bitcoin/bitcoin#35501: wallet: store all witness variants of a transaction

2026-08-04 23:04:06 +02:00

spend.h

…

sqlite.cpp

wallet: use in-memory SQLite for temporary wallet in exportwatchonlywallet

2026-07-08 19:03:58 -03:00

sqlite.h

wallet: use in-memory SQLite for temporary wallet in exportwatchonlywallet

2026-07-08 19:03:58 -03:00

transaction.cpp

wallet: post-#35501 cleanup in CWalletTx

2026-08-10 23:03:32 -03:00

transaction.h

wallet: post-#35501 cleanup in CWalletTx

2026-08-10 23:03:32 -03:00

types.h

wallet: Introduce WalletError with machine-readable error code

2026-07-10 01:26:00 -07:00

wallet.cpp

Merge bitcoin/bitcoin#35955: wallet: remove orphaned GetAffectedKeys and LegacyScriptPubKeyMan declarations

2026-08-18 09:45:34 +01:00

wallet.h

Merge bitcoin/bitcoin#35955: wallet: remove orphaned GetAffectedKeys and LegacyScriptPubKeyMan declarations

2026-08-18 09:45:34 +01:00

walletdb.cpp

wallet: remove remaining LegacyScriptPubKeyMan references

2026-08-14 23:44:16 +05:45

walletdb.h

wallet: remove remaining LegacyScriptPubKeyMan references

2026-08-14 23:44:16 +05:45

wallettool.cpp

…

wallettool.h

…

walletutil.cpp

…

walletutil.h

…