fix: do not reset seed / mnemonic for descriptor wallets in case of encryption

Author: knst

src/wallet/wallet.cpp

@@ -724,7 +724,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 
         // If we are using descriptors, make new descriptors with a new seed
         if (IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS) && !IsWalletFlagSet(WALLET_FLAG_BLANK_WALLET)) {
-            SetupDescriptorScriptPubKeyMans("", "");
+            // Do nothing for descriptor wallets (keep old seed / mnemonic)
         } else if (auto spk_man = GetLegacyScriptPubKeyMan()) {
             // if we are not using HD, generate new keypool
             if (spk_man->IsHDEnabled()) {

test/functional/wallet_descriptor.py

@@ -91,7 +91,7 @@ def run_test(self):
         send_wrpc.walletpassphrase('pass', 10)
         addr = send_wrpc.getnewaddress()
         info2 = send_wrpc.getaddressinfo(addr)
-        assert info1['hdmasterfingerprint'] != info2['hdmasterfingerprint']
+        assert info1['hdmasterfingerprint'] == info2['hdmasterfingerprint']
         send_wrpc.walletlock()
         assert 'hdmasterfingerprint' in send_wrpc.getaddressinfo(send_wrpc.getnewaddress())
         info3 = send_wrpc.getaddressinfo(addr)

test/functional/wallet_mnemonicbits.py

@@ -46,16 +46,14 @@ def run_test(self):
                 mnemonic_count += 1
                 if desc['mnemonic'] == mnemonic_pre:
                     found_in_encrypted += 1
-                    assert not desc['active']
-                else:
                     assert desc['active']
             # there should 5 descriptors in total
             # one of them imported private key for coinbase without mnemonic
             # encryption of descriptor wallet creates new private keys,
             # it should be 2 active and 2 inactive mnemonics
             assert_equal(found_in_encrypted, 2)
-            assert_equal(mnemonic_count, 4)
-            assert_equal(len(descriptors), 5)
+            assert_equal(mnemonic_count, 2)
+            assert_equal(len(descriptors), 3)
         else:
             assert_equal(len(self.nodes[0].dumphdinfo()["mnemonic"].split()), 12)  # 12 words by default
             # legacy HD wallets could have only one chain