Merge bitcoin/bitcoin#28710: Remove the legacy wallet and BDB dependency

de054df6dc contrib: Remove legacy wallet RPCs from bash completions (Ava Chow)
5dff04a1bb legacy spkm: Make IsMine() and CanProvide() private and migration only (Ava Chow)
c0f3f3264f wallet: Remove unused db functions (Ava Chow)
83af1a3cca wallet: Delete LegacySPKM (Ava Chow)
8ede6dea0c wallet, rpc: Remove legacy wallet only RPCs (Ava Chow)
4de3cec28d test: rpcs disabled for descriptor wallets will be removed (Ava Chow)
84f671b01d test: Run multisig script limit test (Ava Chow)
810476f31e test: Remove unused options and variables, correct comments (Ava Chow)
04a7a7a28c build, wallet, doc: Remove BDB (Ava Chow)

Pull request description:

  The final step of #20160.

  A bare minimum of legacy wallet code is kept in order to perform wallet migration. Migration of legacy wallets uses the independent BDB parser and a minimal `LegacyDataSPKM` that allows the legacy data to be loaded so that the migration can be completed.

  BDB has been removed as a dependency and documentation have been updated to reflect that.

ACKs for top commit:
  Sjors:
    re-ACK de054df6dc
  maflcko:
    re-ACK de054df6dc 🔗
  w0xlt:
    reACK https://github.com/bitcoin/bitcoin/pull/28710/commits/de054df6dc32cbd8b127c6761d9c65d95025e08f
  rkrux:
    Concept ACK de054df6dc

Tree-SHA512: 16a6c265bc1ada5e7a5ef9b95f0ff65015672ca46d9a43b7e10d60e9e085052e9bbfe01ac3e494cc606afb652a1b476b10e434d13e9877b67d2cb0196a9bd190

src/wallet/test/fuzz/wallet_bdb_parser.cpp

@@ -2,7 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <bitcoin-build-config.h> // IWYU pragma: keep
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
@@ -10,7 +9,6 @@
 #include <util/fs.h>
 #include <util/time.h>
 #include <util/translation.h>
-#include <wallet/bdb.h>
 #include <wallet/db.h>
 #include <wallet/dump.h>
 #include <wallet/migrate.h>
@@ -18,13 +16,6 @@
 #include <fstream>
 #include <iostream>
 
-// There is an inconsistency in BDB on Windows.
-// See: https://github.com/bitcoin/bitcoin/pull/26606#issuecomment-2322763212
-#undef USE_BDB_NON_MSVC
-#if defined(USE_BDB) && !defined(_MSC_VER)
-#define USE_BDB_NON_MSVC
-#endif
-
 using wallet::DatabaseOptions;
 using wallet::DatabaseStatus;
 
@@ -57,17 +48,10 @@ FUZZ_TARGET(wallet_bdb_parser, .init = initialize_wallet_bdb_parser)
     }
     g_setup->m_args.ForceSetArg("-dumpfile", fs::PathToString(bdb_ro_dumpfile));
 
-#ifdef USE_BDB_NON_MSVC
-    bool bdb_ro_err = false;
-    bool bdb_ro_strict_err = false;
-#endif
     auto db{MakeBerkeleyRODatabase(wallet_path, options, status, error)};
     if (db) {
         assert(DumpWallet(g_setup->m_args, *db, error));
     } else {
-#ifdef USE_BDB_NON_MSVC
-        bdb_ro_err = true;
-#endif
         if (error.original.starts_with("AutoFile::ignore: end of file") ||
             error.original.starts_with("AutoFile::read: end of file") ||
             error.original.starts_with("AutoFile::seek: ") ||
@@ -97,47 +81,8 @@ FUZZ_TARGET(wallet_bdb_parser, .init = initialize_wallet_bdb_parser)
                    error.original == "Subdatabase has an unexpected name" ||
                    error.original == "Unsupported BDB data file version number" ||
                    error.original == "BDB builtin encryption is not supported") {
-#ifdef USE_BDB_NON_MSVC
-            bdb_ro_strict_err = true;
-#endif
         } else {
             throw std::runtime_error(error.original);
         }
     }
-
-#ifdef USE_BDB_NON_MSVC
-    // Try opening with BDB
-    fs::path bdb_dumpfile{g_setup->m_args.GetDataDirNet() / "fuzzed_dumpfile_bdb.dump"};
-    if (fs::exists(bdb_dumpfile)) { // Writing into an existing dump file will throw an exception
-        remove(bdb_dumpfile);
-    }
-    g_setup->m_args.ForceSetArg("-dumpfile", fs::PathToString(bdb_dumpfile));
-
-    try {
-        auto db{MakeBerkeleyDatabase(wallet_path, options, status, error)};
-        if (bdb_ro_err && !db) {
-            return;
-        }
-        assert(db);
-        if (bdb_ro_strict_err) {
-            // BerkeleyRO will be stricter than BDB. Ignore when those specific errors are hit.
-            return;
-        }
-        assert(!bdb_ro_err);
-        assert(DumpWallet(g_setup->m_args, *db, error));
-    } catch (const std::runtime_error& e) {
-        if (bdb_ro_err) return;
-        throw e;
-    }
-
-    // Make sure the dumpfiles match
-    if (fs::exists(bdb_ro_dumpfile) && fs::exists(bdb_dumpfile)) {
-        std::ifstream bdb_ro_dump(bdb_ro_dumpfile, std::ios_base::binary | std::ios_base::in);
-        std::ifstream bdb_dump(bdb_dumpfile, std::ios_base::binary | std::ios_base::in);
-        assert(std::equal(
-            std::istreambuf_iterator<char>(bdb_ro_dump.rdbuf()),
-            std::istreambuf_iterator<char>(),
-            std::istreambuf_iterator<char>(bdb_dump.rdbuf())));
-    }
-#endif
 }

src/wallet/test/ismine_tests.cpp

@@ -36,25 +36,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
     CScript scriptPubKey;
     isminetype result;
 
-    // P2PK compressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForRawPubKey(pubkeys[0]);
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2PK compressed - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -67,25 +48,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2PK uncompressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForRawPubKey(uncompressedPubkey);
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2PK uncompressed - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -98,25 +60,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2PKH compressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForDestination(PKHash(pubkeys[0]));
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2PKH compressed - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -129,25 +72,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2PKH uncompressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        scriptPubKey = GetScriptForDestination(PKHash(uncompressedPubkey));
-
-        // Keystore does not have key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2PKH uncompressed - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -160,33 +84,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2SH - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript redeemScript = GetScriptForDestination(PKHash(pubkeys[0]));
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
-
-        // Keystore does not have redeemScript or key
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has redeemScript but no key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has redeemScript and key
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2SH - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -200,25 +97,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // (P2PKH inside) P2SH inside P2SH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript redeemscript_inner = GetScriptForDestination(PKHash(pubkeys[0]));
-        CScript redeemscript = GetScriptForDestination(ScriptHash(redeemscript_inner));
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemscript_inner));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // (P2PKH inside) P2SH inside P2SH (invalid) - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -228,25 +106,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(spk_manager, nullptr);
     }
 
-    // (P2PKH inside) P2SH inside P2WSH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript redeemscript = GetScriptForDestination(PKHash(pubkeys[0]));
-        CScript witnessscript = GetScriptForDestination(ScriptHash(redeemscript));
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // (P2PKH inside) P2SH inside P2WSH (invalid) - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -256,23 +115,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(spk_manager, nullptr);
     }
 
-    // P2WPKH inside P2WSH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript witnessscript = GetScriptForDestination(WitnessV0KeyHash(pubkeys[0]));
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // P2WPKH inside P2WSH (invalid) - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -282,25 +124,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(spk_manager, nullptr);
     }
 
-    // (P2PKH inside) P2WSH inside P2WSH (invalid) - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript witnessscript_inner = GetScriptForDestination(PKHash(pubkeys[0]));
-        CScript witnessscript = GetScriptForDestination(WitnessV0ScriptHash(witnessscript_inner));
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessscript));
-
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript_inner));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessscript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // (P2PKH inside) P2WSH inside P2WSH (invalid) - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -310,22 +133,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(spk_manager, nullptr);
     }
 
-    // P2WPKH compressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey = GetScriptForDestination(WitnessV0KeyHash(pubkeys[0]));
-
-        // Keystore implicitly has key and P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2WPKH compressed - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -338,27 +145,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2WPKH uncompressed - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-
-        scriptPubKey = GetScriptForDestination(WitnessV0KeyHash(uncompressedPubkey));
-
-        // Keystore has key, but no P2SH redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has key and P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // P2WPKH uncompressed (invalid) - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -368,41 +154,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(spk_manager, nullptr);
     }
 
-    // scriptPubKey multisig - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        scriptPubKey = GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
-
-        // Keystore does not have any keys
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has 1/2 keys
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has 2/2 keys
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has 2/2 keys and the script
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // scriptPubKey multisig - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -415,29 +166,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2SH multisig - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        CScript redeemScript = GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
-
-        // Keystore has no redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2SH multisig - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -452,35 +180,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2WSH multisig with compressed keys - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        CScript witnessScript = GetScriptForMultisig(2, {pubkeys[0], pubkeys[1]});
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessScript));
-
-        // Keystore has keys, but no witnessScript or P2SH redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys and witnessScript, but no P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys, witnessScript, P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2WSH multisig with compressed keys - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -495,35 +194,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
 
-    // P2WSH multisig with uncompressed key - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(uncompressedKey));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-
-        CScript witnessScript = GetScriptForMultisig(2, {uncompressedPubkey, pubkeys[1]});
-        scriptPubKey = GetScriptForDestination(WitnessV0ScriptHash(witnessScript));
-
-        // Keystore has keys, but no witnessScript or P2SH redeemScript
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys and witnessScript, but no P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys, witnessScript, P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(scriptPubKey));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
     // P2WSH multisig with uncompressed key (invalid) - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -534,36 +204,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         BOOST_CHECK_EQUAL(spk_manager, nullptr);
     }
 
-    // P2WSH multisig wrapped in P2SH - Legacy
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-
-        CScript witnessScript = GetScriptForMultisig(2, {pubkeys[0], pubkeys[1]});
-        CScript redeemScript = GetScriptForDestination(WitnessV0ScriptHash(witnessScript));
-        scriptPubKey = GetScriptForDestination(ScriptHash(redeemScript));
-
-        // Keystore has no witnessScript, P2SH redeemScript, or keys
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has witnessScript and P2SH redeemScript, but no keys
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(redeemScript));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddCScript(witnessScript));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-
-        // Keystore has keys, witnessScript, P2SH redeemScript
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[1]));
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 1);
-    }
-
     // P2WSH multisig wrapped in P2SH - Descriptor
     {
         CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
@@ -640,66 +280,6 @@ BOOST_AUTO_TEST_CASE(ismine_standard)
         result = spk_manager->IsMine(scriptPubKey);
         BOOST_CHECK_EQUAL(result, ISMINE_SPENDABLE);
     }
-
-    // OP_RETURN
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_RETURN << ToByteVector(pubkeys[0]);
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
-    // witness unspendable
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_0 << "aabb"_hex;
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
-    // witness unknown
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_16 << "aabb"_hex;
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
-
-    // Nonstandard
-    {
-        CWallet keystore(chain.get(), "", CreateMockableWalletDatabase());
-        keystore.SetupLegacyScriptPubKeyMan();
-        LOCK(keystore.GetLegacyScriptPubKeyMan()->cs_KeyStore);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->AddKey(keys[0]));
-
-        scriptPubKey.clear();
-        scriptPubKey << OP_9 << OP_ADD << OP_11 << OP_EQUAL;
-
-        result = keystore.GetLegacyScriptPubKeyMan()->IsMine(scriptPubKey);
-        BOOST_CHECK_EQUAL(result, ISMINE_NO);
-        BOOST_CHECK(keystore.GetLegacyScriptPubKeyMan()->GetScriptPubKeys().count(scriptPubKey) == 0);
-    }
 }
 
 BOOST_AUTO_TEST_SUITE_END()

src/wallet/test/scriptpubkeyman_tests.cpp

@@ -15,32 +15,6 @@
 namespace wallet {
 BOOST_FIXTURE_TEST_SUITE(scriptpubkeyman_tests, BasicTestingSetup)
 
-// Test LegacyScriptPubKeyMan::CanProvide behavior, making sure it returns true
-// for recognized scripts even when keys may not be available for signing.
-BOOST_AUTO_TEST_CASE(CanProvide)
-{
-    // Set up wallet and keyman variables.
-    CWallet wallet(m_node.chain.get(), "", CreateMockableWalletDatabase());
-    LegacyScriptPubKeyMan& keyman = *wallet.GetOrCreateLegacyScriptPubKeyMan();
-
-    // Make a 1 of 2 multisig script
-    std::vector<CKey> keys(2);
-    std::vector<CPubKey> pubkeys;
-    for (CKey& key : keys) {
-        key.MakeNewKey(true);
-        pubkeys.emplace_back(key.GetPubKey());
-    }
-    CScript multisig_script = GetScriptForMultisig(1, pubkeys);
-    CScript p2sh_script = GetScriptForDestination(ScriptHash(multisig_script));
-    SignatureData data;
-
-    // Verify the p2sh(multisig) script is not recognized until the multisig
-    // script is added to the keystore to make it solvable
-    BOOST_CHECK(!keyman.CanProvide(p2sh_script, data));
-    keyman.AddCScript(multisig_script);
-    BOOST_CHECK(keyman.CanProvide(p2sh_script, data));
-}
-
 BOOST_AUTO_TEST_CASE(DescriptorScriptPubKeyManTests)
 {
     std::unique_ptr<interfaces::Chain>& chain = m_node.chain;

src/wallet/test/util.h

@@ -76,7 +76,6 @@ public:
     explicit MockableBatch(MockableData& records, bool pass) : m_records(records), m_pass(pass) {}
     ~MockableBatch() = default;
 
-    void Flush() override {}
     void Close() override {}
 
     std::unique_ptr<DatabaseCursor> GetNewCursor() override
@@ -104,20 +103,14 @@ public:
     ~MockableDatabase() = default;
 
     void Open() override {}
-    void AddRef() override {}
-    void RemoveRef() override {}
 
     bool Rewrite(const char* pszSkip=nullptr) override { return m_pass; }
     bool Backup(const std::string& strDest) const override { return m_pass; }
-    void Flush() override {}
     void Close() override {}
-    bool PeriodicFlush() override { return m_pass; }
-    void IncrementUpdateCounter() override {}
-    void ReloadDbEnv() override {}
 
     std::string Filename() override { return "mockable"; }
     std::string Format() override { return "mock"; }
-    std::unique_ptr<DatabaseBatch> MakeBatch(bool flush_on_close = true) override { return std::make_unique<MockableBatch>(m_records, m_pass); }
+    std::unique_ptr<DatabaseBatch> MakeBatch() override { return std::make_unique<MockableBatch>(m_records, m_pass); }
 };
 
 std::unique_ptr<WalletDatabase> CreateMockableWalletDatabase(MockableData records = {});

src/wallet/test/wallet_tests.cpp

@@ -35,9 +35,6 @@
 using node::MAX_BLOCKFILE_SIZE;
 
 namespace wallet {
-RPCHelpMan importmulti();
-RPCHelpMan dumpwallet();
-RPCHelpMan importwallet();
 
 // Ensure that fee levels defined in the wallet are at least as high
 // as the default levels for node policy.

src/wallet/test/walletdb_tests.cpp

@@ -29,34 +29,5 @@ BOOST_AUTO_TEST_CASE(walletdb_readkeyvalue)
     BOOST_CHECK_THROW(ssValue >> dummy, std::ios_base::failure);
 }
 
-BOOST_AUTO_TEST_CASE(walletdb_read_write_deadlock)
-{
-    // Exercises a db read write operation that shouldn't deadlock.
-    for (const DatabaseFormat& db_format : DATABASE_FORMATS) {
-        // Context setup
-        DatabaseOptions options;
-        options.require_format = db_format;
-        DatabaseStatus status;
-        bilingual_str error_string;
-        std::unique_ptr<WalletDatabase> db = MakeDatabase(m_path_root / strprintf("wallet_%d_.dat", db_format).c_str(), options, status, error_string);
-        BOOST_CHECK_EQUAL(status, DatabaseStatus::SUCCESS);
-
-        std::shared_ptr<CWallet> wallet(new CWallet(m_node.chain.get(), "", std::move(db)));
-        wallet->m_keypool_size = 4;
-
-        // Create legacy spkm
-        LOCK(wallet->cs_wallet);
-        auto legacy_spkm = wallet->GetOrCreateLegacyScriptPubKeyMan();
-        BOOST_CHECK(!HasLegacyRecords(*wallet));
-        BOOST_CHECK(legacy_spkm->SetupGeneration(true));
-        BOOST_CHECK(HasLegacyRecords(*wallet));
-        wallet->Flush();
-
-        // Now delete all records, which performs a read write operation.
-        BOOST_CHECK(wallet->GetLegacyScriptPubKeyMan()->DeleteRecords());
-        BOOST_CHECK(!HasLegacyRecords(*wallet));
-    }
-}
-
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace wallet

src/wallet/test/walletload_tests.cpp

@@ -43,7 +43,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_load_descriptors, TestingSetup)
     std::unique_ptr<WalletDatabase> database = CreateMockableWalletDatabase();
     {
         // Write unknown active descriptor
-        WalletBatch batch(*database, false);
+        WalletBatch batch(*database);
         std::string unknown_desc = "trx(tpubD6NzVbkrYhZ4Y4S7m6Y5s9GD8FqEMBy56AGphZXuagajudVZEnYyBahZMgHNCTJc2at82YX6s8JiL1Lohu5A3v1Ur76qguNH4QVQ7qYrBQx/86'/1'/0'/0/*)#8pn8tzdt";
         WalletDescriptor wallet_descriptor(std::make_shared<DummyDescriptor>(unknown_desc), 0, 0, 0, 0);
         BOOST_CHECK(batch.WriteDescriptor(uint256(), wallet_descriptor));
@@ -70,7 +70,7 @@ BOOST_FIXTURE_TEST_CASE(wallet_load_descriptors, TestingSetup)
 
     {
         // Write valid descriptor with invalid ID
-        WalletBatch batch(*database, false);
+        WalletBatch batch(*database);
         std::string desc = "wpkh([d34db33f/84h/0h/0h]xpub6DJ2dNUysrn5Vt36jH2KLBT2i1auw1tTSSomg8PhqNiUtx8QX2SvC9nrHu81fT41fvDUnhMjEzQgXnQjKEu3oaqMSzhSrHMxyyoEAmUHQbY/0/*)#cjjspncu";
         WalletDescriptor wallet_descriptor(std::make_shared<DummyDescriptor>(desc), 0, 0, 0, 0);
         BOOST_CHECK(batch.WriteDescriptor(uint256::ONE, wallet_descriptor));