wallet: Set global hd key for migrated wallets

achow101 · Sep 7, 2023 · 39ba99e · 39ba99e
1 parent f3476d5
commit 39ba99e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4026,11 +4026,17 @@ bool CWallet::ApplyMigrationData(MigrationData& data, bilingual_str& error)
     m_internal_spk_managers.clear();
 
     // Setup new descriptors
-    SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
+    SetWalletFlag(WALLET_FLAG_DESCRIPTORS | WALLET_FLAG_GLOBAL_HD_KEY);
     if (!IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         // Use the existing master key if we have it
         if (data.master_key.key.IsValid()) {
             SetupDescriptorScriptPubKeyMans(data.master_key);
+
+            // Store the master key as our active hd key
+            if (!AddHDKey(data.master_key)) {
+                throw std::runtime_error(std::string(__func__) + ": Unable to add original seed's HD key");
+            }
+            SetActiveHDKey(data.master_key.Neuter());
         } else {
             // Setup with a new seed if we don't.
             SetupDescriptorScriptPubKeyMans();
@@ -4193,7 +4199,7 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
         options.require_create = true;
 
         // Make the wallets
-        options.create_flags = WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET | WALLET_FLAG_DESCRIPTORS;
+        options.create_flags = WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET | WALLET_FLAG_DESCRIPTORS | WALLET_FLAG_GLOBAL_HD_KEY;
         if (wallet.IsWalletFlagSet(WALLET_FLAG_AVOID_REUSE)) {
             options.create_flags |= WALLET_FLAG_AVOID_REUSE;
         }

diff --git a/test/functional/wallet_migration.py b/test/functional/wallet_migration.py
@@ -111,6 +111,10 @@ def test_basic(self):
         # So, should have a total of 11 descriptors on it.
         assert_equal(len(basic0.listdescriptors()["descriptors"]), 11)
 
+        # A global hd key should be added which matches the ones in the descriptors
+        xprv = basic0.getxpub(True)["xprv"]
+        assert all([xprv in desc["desc"] for desc in filter(lambda x: "range" in x, basic0.listdescriptors(True)["descriptors"])])
+
         # Compare addresses info
         addr_info = basic0.getaddressinfo(addr)
         change_addr_info = basic0.getaddressinfo(change)