Merge #8324: [Wallet] keep HD seed during salvagewallet

laanwj · laanwj · commit bc94b8748782 · 2016-07-14T11:37:48.000+02:00
b993671 [Wallet] keep HD seed during salvagewallet (Jonas Schnelli)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3291,7 +3291,7 @@ bool CWallet::InitLoadWallet()
     if (fFirstRun)
     {
         // Create new keyUser and set as default key
-        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) {
+        if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {
             // generate a new master key
             CKey key;
             key.MakeNewKey(true);
diff --git a/src/wallet/walletdb.cpp b/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)
             {

Original file line number	Diff line number	Diff line change
`@@ -3291,7 +3291,7 @@ bool CWallet::InitLoadWallet()`
`3291`	`3291`	`if (fFirstRun)`
`3292`	`3292`	`{`
`3293`	`3293`	`// Create new keyUser and set as default key`
`3294`		`- if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) {`
	`3294`	`+ if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {`
`3295`	`3295`	`// generate a new master key`
`3296`	`3296`	`CKey key;`
`3297`	`3297`	`key.MakeNewKey(true);`
Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe`
`977`	`977`	`fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue,`
`978`	`978`	`wss, strType, strErr);`
`979`	`979`	`}`
`980`		`- if (!IsKeyType(strType))`
	`980`	`+ if (!IsKeyType(strType) && strType != "hdchain")`
`981`	`981`	`continue;`
`982`	`982`	`if (!fReadOK)`
`983`	`983`	`{`