Native Descriptor Wallets using DescriptorScriptPubKeyMan #16528

  82 | @@ -83,6 +83,7 @@ static UniValue createmultisig(const JSONRPCRequest& request)
  83 |              "{\n"
  84 |              "  \"address\":\"multisigaddress\",  (string) The value of the new multisig address.\n"
  85 |              "  \"redeemScript\":\"script\"       (string) The string value of the hex-encoded redemption script.\n"
  86 | +            "  \"descriptor\":\"descriptor\"     (string) The descriptor for the P2SH address for this multisig\n"

---

1485 | @@ -1486,11 +1486,6 @@ bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal)
1486 |      return false;
1487 |  }
1488 |  
1489 | -bool DescriptorScriptPubKeyMan::Upgrade(int prev_version, std::string& error)

---

 478 | +
 479 | +    bool CheckDecryptionKey(const CKeyingMaterial& master_key, bool accept_no_keys = false) override;
 480 | +    bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override;
 481 | +
 482 | +    bool GetReservedDestination(const OutputType type, bool internal, CTxDestination& address, int64_t& index, CKeyPool& keypool) override;
 483 | +    void KeepDestination(int64_t index) override;

---

 467 | @@ -467,4 +468,49 @@ class LegacySigningProvider : public SigningProvider
 468 |      bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const override { return m_spk_man.GetKeyOrigin(keyid, info); }
 469 |  };
 470 |  
 471 | +class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 472 | +{
 473 | +public:
 474 | +    using ScriptPubKeyMan::ScriptPubKeyMan;

---

  59 | @@ -60,8 +60,10 @@ extern const std::string CRYPTED_KEY;
  60 |  extern const std::string CSCRIPT;
  61 |  extern const std::string DEFAULTKEY;
  62 |  extern const std::string DESTDATA;
  63 | +extern const std::string EXTERNALSPK;

---

 469 | @@ -470,8 +470,17 @@ class LegacySigningProvider : public SigningProvider
 470 |  
 471 |  class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 472 |  {
 473 | +private:
 474 | +    WalletDescriptor descriptor GUARDED_BY(cs_desc_man);
 475 | +
 476 | +    using ScriptPubKeyMap = std::map<CScript, uint32_t>; // Map of scripts to descriptor range index

---

 490 | +
 491 | +    bool SetupGeneration(bool force = false) override;
 492 | +
 493 | +    bool HavePrivateKeys() const override;
 494 | +
 495 | +    void RewriteDB() override;

---

1999 | +        SignPSBTInput(HidingSigningProvider(keys.get(), !sign, !bip32derivs), psbtx, i, sighash_type);
2000 | +    }
2001 | +
2002 | +    // Fill in the bip32 keypaths and redeemscripts for the outputs so that hardware wallets can identify change
2003 | +    for (unsigned int i = 0; i < psbtx.tx->vout.size(); ++i) {
2004 | +        std::unique_ptr<FlatSigningProvider> keys = GetSigningProvider(psbtx.tx->vout.at(i).scriptPubKey, true);

---

4491 | +    WalletLogPrintf("Update existing descriptor: %s\n", desc.descriptor->ToString());
4492 | +    LOCK2(cs_wallet, spk_manager->cs_desc_man);
4493 | +
4494 | +    // Clear the cache if necessary
4495 | +    if (desc.range_start < spk_manager->GetWalletDescriptor().range_start) {
4496 | +        spk_manager->ClearDescriptorCache();

---

1685 | +        // Add all of the scriptPubKeys to the scriptPubKey set
1686 | +        for (const CScript& script : scripts_temp) {
1687 | +            m_map_script_pub_keys[script] = i;
1688 | +        }
1689 | +        // Write the cache
1690 | +        std::map<KeyOriginInfo, CExtPubKey> newly_cached = descriptor.cache.GetNotCached(cache.GetCachedExtPubKeys());

---

   5 | @@ -6,6 +6,7 @@
   6 |  #define BITCOIN_WALLET_WALLETUTIL_H
   7 |  
   8 |  #include <fs.h>
   9 | +#include <script/descriptor.h>

---

3867 | @@ -3868,8 +3868,10 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
3868 |  
3869 |          walletInstance->SetWalletFlags(wallet_creation_flags, false);
3870 |  
3871 | -        // Always create LegacyScriptPubKeyMan for now
3872 | -        walletInstance->SetupLegacyScriptPubKeyMan();
3873 | +        // Only create LegacyScriptPubKeyMan when not descriptor wallet
3874 | +        if (!(wallet_creation_flags & WALLET_FLAG_DESCRIPTORS)) {

---

 523 | @@ -495,6 +524,14 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 524 |          result = DBErrors::CORRUPT;
 525 |      }
 526 |  
 527 | +    // Set the active ScriptPubKeyMans
 528 | +    for (auto spk_man_pair : wss.m_external_spk_managers) {
 529 | +        pwallet->SetActiveScriptPubKeyMan(spk_man_pair.second, spk_man_pair.first, false, true);

---

 523 | @@ -495,6 +524,14 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 524 |          result = DBErrors::CORRUPT;
 525 |      }
 526 |  
 527 | +    // Set the active ScriptPubKeyMans
 528 | +    for (auto spk_man_pair : wss.m_external_spk_managers) {
 529 | +        pwallet->SetActiveScriptPubKeyMan(spk_man_pair.second, spk_man_pair.first, false, true);
 530 | +    }
 531 | +    for (auto spk_man_pair : wss.m_internal_spk_managers) {
 532 | +        pwallet->SetActiveScriptPubKeyMan(spk_man_pair.second, spk_man_pair.first, true, true);

---

1609 | +        break;
1610 | +    }
1611 | +    default: assert(false);
1612 | +    }
1613 | +
1614 | +    // Mainnet derives at 0',testnet and regtest derive at 1'

---

1589 | +
1590 | +    int64_t creation_time = GetTime();
1591 | +
1592 | +    std::string xpub = EncodeExtPubKey(master_key.Neuter());
1593 | +
1594 | +    // Add the seed to the wallet

---

1627 | +    std::string error;
1628 | +    std::unique_ptr<Descriptor> desc = Parse(desc_str, keys, error, false);
1629 | +    WalletDescriptor w_desc(std::move(desc), creation_time, 0, 0, 0);
1630 | +    descriptor = w_desc;
1631 | +
1632 | +    // Store the master private key, derived intermediate key, and descriptor

---

1678 | +        FlatSigningProvider out_keys;
1679 | +        std::vector<CScript> scripts_temp;
1680 | +        DescriptorCache cache;
1681 | +        if (!descriptor.descriptor->Expand(i, provider, scripts_temp, out_keys, &cache)) {
1682 | +            // Maybe we have a cached xpub and we can expand from cache
1683 | +            if (!descriptor.descriptor->ExpandFromCache(i, descriptor.cache, scripts_temp, out_keys)) return false;

---

1500 | +void LegacyScriptPubKeyMan::SetType(OutputType type, bool internal) {}
1501 | +
1502 | +bool DescriptorScriptPubKeyMan::GetNewDestination(const OutputType type, CTxDestination& dest, std::string& error)
1503 | +{
1504 | +    if (!CanGetAddresses(internal)) {
1505 | +        error = "No private keys available";

---

 492 | +    using ScriptPubKeyMap = std::map<CScript, int32_t>; // Map of scripts to descriptor range index
 493 | +    using CryptedKeyMap = std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char>>>;
 494 | +    using KeyMap = std::map<CKeyID, CKey>;
 495 | +
 496 | +    ScriptPubKeyMap m_map_script_pub_keys GUARDED_BY(cs_desc_man);
 497 | +    int32_t m_max_desc_index = -1;

---

1514 | +        TopUp();
1515 | +
1516 | +        // Get the scriptPubKey from the descriptor
1517 | +        FlatSigningProvider out_keys;
1518 | +        std::vector<CScript> scripts_temp;
1519 | +        if (descriptor.range_end <= m_max_desc_index && !TopUp(1)) {

---

 531 | +    bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override;
 532 | +
 533 | +    bool GetReservedDestination(const OutputType type, bool internal, CTxDestination& address, int64_t& index, CKeyPool& keypool) override;
 534 | +    void ReturnDestination(int64_t index, bool internal, const CTxDestination& addr) override;
 535 | +
 536 | +    bool TopUp(unsigned int size = 0) override;

---

 483 | @@ -484,8 +484,17 @@ class LegacySigningProvider : public SigningProvider
 484 |  
 485 |  class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 486 |  {
 487 | +private:
 488 | +    WalletDescriptor descriptor GUARDED_BY(cs_desc_man);

---

 181 | @@ -179,6 +182,15 @@ bool WalletBatch::WriteMinVersion(int nVersion)
 182 |      return WriteIC(DBKeys::MINVERSION, nVersion);
 183 |  }
 184 |  
 185 | +bool WalletBatch::WriteActiveScriptPubKeyMan(uint8_t type, const uint256& id, bool internal)

---

 200 | @@ -189,6 +201,8 @@ class CWalletScanState {
 201 |      bool fIsEncrypted{false};
 202 |      bool fAnyUnordered{false};
 203 |      std::vector<uint256> vWalletUpgrade;
 204 | +    std::map<OutputType, uint256> m_external_spk_managers;
 205 | +    std::map<OutputType, uint256> m_internal_spk_managers;

---

 200 | @@ -189,6 +201,8 @@ class CWalletScanState {
 201 |      bool fIsEncrypted{false};
 202 |      bool fAnyUnordered{false};
 203 |      std::vector<uint256> vWalletUpgrade;
 204 | +    std::map<OutputType, uint256> m_external_spk_managers;

---

 422 | +            uint256 id;
 423 | +            ssValue >> id;
 424 | +
 425 | +            bool internal = strType == DBKeys::INTERNALSPK;
 426 | +            auto& spk_mans = internal ? wss.m_internal_spk_managers : wss.m_external_spk_managers;
 427 | +            spk_mans[static_cast<OutputType>(type)] = id;

---

  59 | @@ -60,8 +60,10 @@ extern const std::string CRYPTED_KEY;
  60 |  extern const std::string CSCRIPT;
  61 |  extern const std::string DEFAULTKEY;
  62 |  extern const std::string DESTDATA;
  63 | +extern const std::string EXTERNALSPK;
  64 |  extern const std::string FLAGS;
  65 |  extern const std::string HDCHAIN;
  66 | +extern const std::string INTERNALSPK;

---

1505 | @@ -1506,6 +1506,10 @@ bool DescriptorScriptPubKeyMan::GetNewDestination(const OutputType type, CTxDest
1506 |  
1507 |  isminetype DescriptorScriptPubKeyMan::IsMine(const CScript& script) const
1508 |  {
1509 | +    LOCK(cs_desc_man);
1510 | +    if (m_map_script_pub_keys.count(script) > 0) {

---

1538 | @@ -1539,6 +1539,17 @@ bool DescriptorScriptPubKeyMan::TopUp(unsigned int size)
1539 |  
1540 |  void DescriptorScriptPubKeyMan::MarkUnusedAddresses(const CScript& script)
1541 |  {
1542 | +    LOCK(cs_desc_man);
1543 | +    if (IsMine(script)) {

---

1639 | +    descriptor.cache = cache;
1640 | +    for (int32_t i = descriptor.range_start; i < descriptor.range_end; ++i) {
1641 | +        FlatSigningProvider out_keys;
1642 | +        std::vector<CScript> scripts_temp;
1643 | +        descriptor.descriptor->ExpandFromCache(i, descriptor.cache, scripts_temp, out_keys);
1644 | +        // Add all of the scriptPubKeys to the scriptPubKey set

---

 559 | @@ -532,6 +560,12 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 560 |          pwallet->SetActiveScriptPubKeyMan(spk_man_pair.second, spk_man_pair.first, /* internal */ true, /* memonly */ true);
 561 |      }
 562 |  
 563 | +    // Set the descriptor caches
 564 | +    for (auto desc_cache_pair : wss.m_descriptor_caches) {
 565 | +        auto spk_man = pwallet->GetScriptPubKeyMan(desc_cache_pair.first);

---

 431 | @@ -430,7 +432,33 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
 432 |              ssKey >> id;
 433 |              WalletDescriptor desc;
 434 |              ssValue >> desc;
 435 | +            wss.m_descriptor_caches[id] = DescriptorCache();

---

1559 | @@ -1560,12 +1560,14 @@ bool DescriptorScriptPubKeyMan::IsHDEnabled() const
1560 |  
1561 |  bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const
1562 |  {
1563 | -    return false;
1564 | +    LOCK(cs_desc_man);
1565 | +    return HavePrivateKeys() || descriptor.next_index < descriptor.range_end;

---

1552 |  bool DescriptorScriptPubKeyMan::TopUp(unsigned int size)
1553 |  {
1554 | -    return false;
1555 | +    LOCK(cs_desc_man);
1556 | +    unsigned int target_size;
1557 | +    if (size > 0)

---

1555 | +    LOCK(cs_desc_man);
1556 | +    unsigned int target_size;
1557 | +    if (size > 0)
1558 | +        target_size = size;
1559 | +    else
1560 | +        target_size = std::max(gArgs.GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t) 0);

---

1559 | +    else
1560 | +        target_size = std::max(gArgs.GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t) 0);
1561 | +    target_size = std::max((int32_t)target_size, 1);
1562 | +
1563 | +    // Calculate the new range_end
1564 | +    int32_t new_range_end = std::max(descriptor.next_index + (int32_t)target_size, descriptor.range_end);

---

1576 | +    WalletBatch batch(m_storage.GetDatabase());
1577 | +    uint256 id = GetID();
1578 | +    for (int32_t i = m_max_cached_index + 1; i < new_range_end; ++i) {
1579 | +        FlatSigningProvider out_keys;
1580 | +        std::vector<CScript> scripts_temp;
1581 | +        DescriptorCache cache;

---

 492 | +    using KeyMap = std::map<CKeyID, CKey>;
 493 | +
 494 | +    ScriptPubKeyMap m_map_script_pub_keys GUARDED_BY(cs_desc_man);
 495 | +    int32_t m_max_cached_index = -1;
 496 | +
 497 | +    OutputType address_type;

---

 493 | +
 494 | +    ScriptPubKeyMap m_map_script_pub_keys GUARDED_BY(cs_desc_man);
 495 | +    int32_t m_max_cached_index = -1;
 496 | +
 497 | +    OutputType address_type;
 498 | +    bool internal;

---

1527 | +            // We can't generate anymore keys
1528 | +            error = "Error: Keypool ran out, please call keypoolrefill first";
1529 | +            return false;
1530 | +        }
1531 | +
1532 | +        if (m_wallet_descriptor.descriptor->IsSingleType()) {

---

1507 | +        error = "No addresses available";
1508 | +        return false;
1509 | +    }
1510 | +    {
1511 | +        LOCK(cs_desc_man);
1512 | +        if (m_wallet_descriptor.descriptor->IsSingleType() && type != address_type) {

---

  91 | +class WalletDescriptor
  92 | +{
  93 | +public:
  94 | +    std::shared_ptr<Descriptor> descriptor;
  95 | +    uint64_t creation_time;
  96 | +    int32_t range_start; // First item in range; start of range, inclusive, i.e. [range_start, range_end)

---

  92 | +{
  93 | +public:
  94 | +    std::shared_ptr<Descriptor> descriptor;
  95 | +    uint64_t creation_time;
  96 | +    int32_t range_start; // First item in range; start of range, inclusive, i.e. [range_start, range_end)
  97 | +    int32_t range_end; // Item after the last; end of range, exclusive, i.e. [range_start, range_end)

---

1516 | +        TopUp();
1517 | +
1518 | +        // Get the scriptPubKey from the descriptor
1519 | +        FlatSigningProvider out_keys;
1520 | +        std::vector<CScript> scripts_temp;
1521 | +        if (m_wallet_descriptor.range_end <= m_max_cached_index && !TopUp(1)) {

---

1945 | @@ -1946,9 +1946,60 @@ SigningResult DescriptorScriptPubKeyMan::SignMessage(const std::string& message,
1946 |      return SigningResult::OK;
1947 |  }
1948 |  
1949 | -TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psbt, int sighash_type, bool sign, bool bip32derivs) const
1950 | +TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psbtx, int sighash_type, bool sign, bool bip32derivs) const

---

1219 | @@ -1220,6 +1220,9 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
1220 |  
1221 |      //! Sets the active ScriptPubKeyMan for the specified type and internal
1222 |      void SetActiveScriptPubKeyMan(uint256 id, OutputType type, bool internal, bool memonly = false);
1223 | +
1224 | +    //! Create new DescriptoScriptPubKeyMans and add them to the wallet

---

1225 | @@ -1226,6 +1226,12 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
1226 |  
1227 |      //! Create new DescriptorScriptPubKeyMans and add them to the wallet
1228 |      void SetupDescriptorScriptPubKeyMans();
1229 | +
1230 | +    //! Check if the wallet already has a descriptor
1231 | +    DescriptorScriptPubKeyMan* HasWalletDescriptor(const WalletDescriptor& desc) const;

---

4447 | @@ -4447,3 +4448,91 @@ bool CWallet::IsLegacy() const
4448 |      auto spk_man = dynamic_cast<LegacyScriptPubKeyMan*>(m_internal_spk_managers.at(OutputType::LEGACY));
4449 |      return spk_man != nullptr;
4450 |  }
4451 | +
4452 | +DescriptorScriptPubKeyMan* CWallet::HasWalletDescriptor(const WalletDescriptor& desc) const
4453 | +{
4454 | +    if (!IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {

---

4472 | +        WalletLogPrintf("Cannot add WalletDescriptor to a non-descriptor wallet\n");
4473 | +        return nullptr;
4474 | +    }
4475 | +
4476 | +    LOCK(cs_wallet);
4477 | +    auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc));

---

4487 | +        }
4488 | +
4489 | +        // Remove from maps of spkMans
4490 | +        for (bool internal : {false, true}) {
4491 | +            for (OutputType t : OUTPUT_TYPES) {
4492 | +                auto active_spk_man = GetScriptPubKeyMan(t, internal);

---

4486 | +        {
4487 | +            LOCK(old_spk_man->cs_desc_man);
4488 | +            spk_manager->SetCache(old_spk_man->GetWalletDescriptor().cache);
4489 | +        }
4490 | +
4491 | +        // Remove from maps of spkMans

---

1506 | +                    throw JSONRPCError(RPC_INVALID_PARAMETER, "next_index is out of range");
1507 | +                }
1508 | +            }
1509 | +        }
1510 | +
1511 | +        // Active descriptor must be ranged

---

1513 | +            throw JSONRPCError(RPC_INVALID_PARAMETER, "Active descriptor must be ranged");
1514 | +        }
1515 | +
1516 | +        // Ranged descriptors should not have a label
1517 | +        if (data.exists("range") && data.exists("label")) {
1518 | +            throw JSONRPCError(RPC_INVALID_PARAMETER, "Ranged descriptors should not have a label");

---

1518 | +            throw JSONRPCError(RPC_INVALID_PARAMETER, "Ranged descriptors should not have a label");
1519 | +        }
1520 | +
1521 | +        // Internal addresses should not have a label either
1522 | +        if (internal && data.exists("label")) {
1523 | +            throw JSONRPCError(RPC_INVALID_PARAMETER, "Internal addresses should not have a label");

---

1523 | +            throw JSONRPCError(RPC_INVALID_PARAMETER, "Internal addresses should not have a label");
1524 | +        }
1525 | +
1526 | +        // Combo descriptor check
1527 | +        if (active && !parsed_desc->IsSingleType()) {
1528 | +            throw JSONRPCError(RPC_WALLET_ERROR, "Combo descriptors cannot be set to active");

---

1543 | +            }
1544 | +        }
1545 | +
1546 | +        // If private keys are enabled, abort if private keys are not provided
1547 | +        if (!pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) && !have_privkeys) {
1548 | +            throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import descriptor without private keys to a wallet with private keys enabled");

---

 204 | +                              'range' : [0, 2],
 205 | +                              'timestamp': 'now'
 206 | +                             },
 207 | +                             success=True)
 208 | +
 209 | +        for i in range(0, 4):

---

 205 | +                              'timestamp': 'now'
 206 | +                             },
 207 | +                             success=True)
 208 | +
 209 | +        for i in range(0, 4):
 210 | +            addr = w1.getnewaddress('', 'bech32')

---

 243 | +                            "timestamp": "now"},
 244 | +                            success=True,
 245 | +                            wallet=wmulti_priv)
 246 | +        self.test_importdesc({"desc":"wsh(multi(2,tprv8ZgxMBicQKsPevADjDCWsa6DfhkVXicu8NQUzfibwX2MexVwW4tCec5mXdCW8kJwkzBRRmAay1KZya4WsehVvjTGVW6JLqiqd8DdZ4xSg52/84h/1h/0h/*,tprv8ZgxMBicQKsPdSNWUhDiwTScDr6JfkZuLshTRwzvZGnMSnGikV6jxpmdDkC3YRc4T3GD6Nvg9uv6hQg73RVv1EiTXDZwxVbsLugVHU8B1aq/84h/1h/0h/*,tprv8ZgxMBicQKsPeonDt8Ka2mrQmHa61hQ5FQCsvWBTpSNzBFgM58cV2EuXNAHF14VawVpznnme3SuTbA62sGriwWyKifJmXntfNeK7zeqMCj1/84h/1h/0h/*))#q3sztvx5",
 247 | +                            "active": True,
 248 | +                            "internal" : True,

---

 273 | +                            "timestamp": "now"},
 274 | +                            success=True,
 275 | +                            wallet=wmulti_pub)
 276 | +        self.test_importdesc({"desc":"wsh(multi(2,[7b2d0242/84h/1h/0h]tpubDCXqdwWZcszwqYJSnZp8eARkxGJfHAk23KDxbztV4BbschfaTfYLTcSkSJ3TN64dRqwa1rnFUScsYormKkGqNbbPwkorQimVevXjxzUV9Gf/*,[59b09cd6/84h/1h/0h]tpubDCYfZY2ceyHzYzMMVPt9MNeiqtQ2T7Uyp9QSFwYXh8Vi9iJFYXcuphJaGXfF3jUQJi5Y3GMNXvM11gaL4txzZgNGK22BFAwMXynnzv4z2Jh/*,[e81a0532/84h/1h/0h]tpubDC6UGqnsQStngYuGD4MKsMy7eD1Yg9NTJfPdvjdG2JE5oZ7EsSL3WHg4Gsw2pR5K39ZwJ46M1wZayhedVdQtMGaUhq5S23PH6fnENK3V1sb/*))#c08a2rzv",
 277 | +                            "active": True,
 278 | +                            "internal" : True,

---

  63 | +        w1 = self.nodes[1].get_wallet_rpc('w1')
  64 | +        assert_equal(w1.getwalletinfo()['keypoolsize'], 0)
  65 | +
  66 | +        self.nodes[1].createwallet(wallet_name="wpriv", disable_private_keys=False, blank=True, descriptors=True)
  67 | +        wpriv = self.nodes[1].get_wallet_rpc("wpriv")
  68 | +        assert_equal(wpriv.getwalletinfo()['keypoolsize'], 0)

---

 122 | +                              error_message="Active descriptor must be ranged")
 123 | +
 124 | +        self.log.info("Should import a (non-active) p2sh-p2wpkh descriptor")
 125 | +        self.test_importdesc({"desc": descsum_create("sh(wpkh(" + key.pubkey + "))"),
 126 | +                               "timestamp": "now",
 127 | +                               "active": False,

---

  30 | +        self.log.info("Checking wallet info")
  31 | +        wallet_info = self.nodes[0].getwalletinfo()
  32 | +        assert_equal(wallet_info['keypoolsize'], 300)
  33 | +        assert_equal(wallet_info['keypoolsize_hd_internal'], 300)
  34 | +
  35 | +        # Check that getnewaddress works

---

 131 | +        test_address(w1,
 132 | +                     key.p2sh_p2wpkh_addr,
 133 | +                     ismine=True,
 134 | +                     solvable=True)
 135 | +
 136 | +        # # Test importing of a multisig descriptor

---

1566 | +        }
1567 | +
1568 | +        // Set descriptor as active if necessary
1569 | +        if (active) {
1570 | +            if (!w_desc.descriptor->GetOutputType()) {
1571 | +                warnings.push_back("Unknown output type, cannot set descriptor to active.");

---

1603 | +                    {"requests", RPCArg::Type::ARR, RPCArg::Optional::NO, "Data to be imported",
1604 | +                        {
1605 | +                            {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
1606 | +                                {
1607 | +                                    {"desc", RPCArg::Type::STR, RPCArg::Optional::NO, "Descriptor to import."},
1608 | +                                    {"active", RPCArg::Type::BOOL, /* default */ "true", "Set this descriptor to be the active descriptor for the corresponding output type/externality"},

---

   0 | @@ -0,0 +1,293 @@
   1 | +#!/usr/bin/env python3
   2 | +# Copyright (c) 2019 The Bitcoin Core developers
   3 | +# Distributed under the MIT software license, see the accompanying
   4 | +# file COPYING or http://www.opensource.org/licenses/mit-license.php.
   5 | +"""Test the importdescriptors RPC.
   6 | +

---

 105 | +        if (ser_action.ForRead()) {
 106 | +            std::string desc;
 107 | +            std::string error;
 108 | +            READWRITE(desc);
 109 | +            FlatSigningProvider keys;
 110 | +            descriptor = Parse(desc, keys, error, true);

---

 107 | +            std::string error;
 108 | +            READWRITE(desc);
 109 | +            FlatSigningProvider keys;
 110 | +            descriptor = Parse(desc, keys, error, true);
 111 | +        } else {
 112 | +            READWRITE(descriptor->ToString());

---

1213 | @@ -1214,6 +1214,12 @@ class CWallet final : public WalletStorage, private interfaces::Chain::Notificat
1214 |  
1215 |      //! Connect the signals from ScriptPubKeyMans to the signals in CWallet
1216 |      void ConnectScriptPubKeyManNotifiers();
1217 | +
1218 | +    //! Instantiate a descriptor ScriptPubKeyMan from the WalletDescriptor and load it
1219 | +    void LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc);
1220 | +
1221 | +    //! Sets the active ScriptPubKeyMan for the specified type and internal

---

1538 | @@ -1539,6 +1539,17 @@ bool DescriptorScriptPubKeyMan::TopUp(unsigned int size)
1539 |  
1540 |  void DescriptorScriptPubKeyMan::MarkUnusedAddresses(const CScript& script)
1541 |  {
1542 | +    LOCK(cs_desc_man);
1543 | +    if (IsMine(script)) {
1544 | +        int32_t index = m_map_script_pub_keys[script];
1545 | +        if (index >= m_wallet_descriptor.next_index) {
1546 | +            WalletLogPrintf("%s: Detected a used keypool item, mark all keypool items up to this item as used\n", __func__);

---

1553 | @@ -1554,7 +1554,8 @@ void DescriptorScriptPubKeyMan::MarkUnusedAddresses(const CScript& script)
1554 |  
1555 |  bool DescriptorScriptPubKeyMan::IsHDEnabled() const
1556 |  {
1557 | -    return false;
1558 | +    LOCK(cs_desc_man);
1559 | +    return m_wallet_descriptor.descriptor->IsRange();

---

1626 | @@ -1627,4 +1627,8 @@ uint256 DescriptorScriptPubKeyMan::GetID() const
1627 |      return id;
1628 |  }
1629 |  
1630 | -void DescriptorScriptPubKeyMan::SetType(OutputType type, bool internal) {}
1631 | +void DescriptorScriptPubKeyMan::SetType(OutputType type, bool internal)

---

1638 | +    LOCK(cs_desc_man);
1639 | +    m_wallet_descriptor.cache = cache;
1640 | +    for (int32_t i = m_wallet_descriptor.range_start; i < m_wallet_descriptor.range_end; ++i) {
1641 | +        FlatSigningProvider out_keys;
1642 | +        std::vector<CScript> scripts_temp;
1643 | +        m_wallet_descriptor.descriptor->ExpandFromCache(i, m_wallet_descriptor.cache, scripts_temp, out_keys);

---

1641 | +        FlatSigningProvider out_keys;
1642 | +        std::vector<CScript> scripts_temp;
1643 | +        m_wallet_descriptor.descriptor->ExpandFromCache(i, m_wallet_descriptor.cache, scripts_temp, out_keys);
1644 | +        // Add all of the scriptPubKeys to the scriptPubKey set
1645 | +        for (const CScript& script : scripts_temp) {
1646 | +            m_map_script_pub_keys[script] = i;

---

 447 | +            uint32_t der_index;
 448 | +            ssKey >> desc_id;
 449 | +            ssKey >> key_exp_index;
 450 | +
 451 | +            // if the der_index exists, it's a derived xpub
 452 | +            try

---

 568 | @@ -536,6 +569,13 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 569 |          pwallet->SetActiveScriptPubKeyMan(spk_man_pair.second, spk_man_pair.first, /* internal */ true, /* memonly */ true);
 570 |      }
 571 |  
 572 | +    // Set the descriptor caches
 573 | +    for (auto desc_cache_pair : wss.m_descriptor_caches) {
 574 | +        auto spk_man = pwallet->GetScriptPubKeyMan(desc_cache_pair.first);
 575 | +        assert(spk_man);
 576 | +        ((DescriptorScriptPubKeyMan*)spk_man)->SetCache(desc_cache_pair.second);

---

1847 | +}
1848 | +
1849 | +bool DescriptorScriptPubKeyMan::CanGetAddresses(bool internal) const
1850 | +{
1851 | +    // We can only give out addresses from descriptors that are single type (not combo), ranged,
1852 | +    // and either has cached keys or can generate more keys (ignoring encryption)

---

1559 | +            return false;
1560 | +
1561 | +        bool keyPass = m_map_crypted_keys.empty(); // Always pass when there are no encrypted keys
1562 | +        bool keyFail = false;
1563 | +        CryptedKeyMap::const_iterator mi = m_map_crypted_keys.begin();
1564 | +        for (; mi != m_map_crypted_keys.end(); ++mi)

---

1615 | @@ -1616,6 +1616,13 @@ bool DescriptorScriptPubKeyMan::GetReservedDestination(const OutputType type, bo
1616 |  
1617 |  void DescriptorScriptPubKeyMan::ReturnDestination(int64_t index, bool internal, const CTxDestination& addr)
1618 |  {
1619 | +    LOCK(cs_desc_man);
1620 | +    // Only return when the index was the most recent

---

1877 | @@ -1878,9 +1878,34 @@ int64_t DescriptorScriptPubKeyMan::GetTimeFirstKey() const
1878 |      return m_wallet_descriptor.creation_time;
1879 |  }
1880 |  
1881 | +std::unique_ptr<FlatSigningProvider> DescriptorScriptPubKeyMan::GetSigningProvider(const CScript& script, bool include_private) const

---

1895 | +    if (!m_wallet_descriptor.descriptor->ExpandFromCache(index, m_wallet_descriptor.cache, scripts_temp, *out_keys)) return nullptr;
1896 | +
1897 | +    if (include_private) {
1898 | +        FlatSigningProvider master_provider;
1899 | +        master_provider.keys = GetKeys();
1900 | +        m_wallet_descriptor.descriptor->ExpandPrivate(index, master_provider, *out_keys);

---

  59 | @@ -60,3 +60,8 @@ bool CreateWalletDialog::isMakeBlankWalletChecked() const
  60 |  {
  61 |      return ui->blank_wallet_checkbox->isChecked();
  62 |  }
  63 | +
  64 | +bool CreateWalletDialog::isDescriptorWalletChecked() const

---

 251 | @@ -252,13 +252,13 @@ class WalletBatch
 252 |      bool WriteDescriptorDerivedCache(const uint256& desc_id, uint32_t key_exp_index, uint32_t der_index, const CExtPubKey& xpub);
 253 |      bool WriteDescriptorParentCache(const uint256& desc_id, uint32_t key_exp_index, const CExtPubKey& xpub);
 254 |  
 255 | +    bool WriteActiveScriptPubKeyMan(uint8_t type, const uint256& id, bool internal);

---

 584 | @@ -585,8 +585,11 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 585 |          Lock();
 586 |          Unlock(strWalletPassphrase);
 587 |  
 588 | -        // if we are using HD, replace the HD seed with a new one
 589 | -        if (auto spk_man = GetLegacyScriptPubKeyMan()) {
 590 | +        // If we are using descriptors, make new descriptors

---

  10 | +
  11 | +- `get_key()` is called to generate keys on node0 and return the privkeys,
  12 | +  pubkeys and all variants of scriptPubKey and address.
  13 | +- `test_importdesc()` is called to send an importdescriptors call to node1, test
  14 | +  success, and (if unsuccessful) test the error code and error message returned.
  15 | +- `test_address()` is called to call getaddressinfo for an address on node1

---