[Wallet] keep HD seed during salvagewallet

b993671921

src/init.cpp

@@ -1540,7 +1540,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             RandAddSeedPerfmon();
 
             // Create new keyUser and set as default key
-            if (GetBoolArg("-usehd", true)) {
+            if (GetBoolArg("-usehd", true) && pwalletMain->hdChain.masterKeyID.IsNull() ) {
             // generate a new master key
             CKey key;
             key.MakeNewKey(true);

src/wallet/walletdb.cpp

@@ -977,7 +977,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
                 fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue,
                                         wss, strType, strErr);
             }
-            if (!IsKeyType(strType))
+            if (!IsKeyType(strType) && strType != "hdchain")
                 continue;
             if (!fReadOK)
             {