suggestions

UdjinM6 · UdjinM6 · commit cda12bddb685 · 2024-02-01T15:26:35.000+03:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -298,7 +298,7 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, interfaces::Coin
         return nullptr;
     }
     if (gArgs.GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) {
-        LogPrintf("set HD by default\n");
+        wallet->WalletLogPrintf("Set HD by default\n");
         wallet->SetMinVersion(FEATURE_HD);
     }
 
@@ -310,13 +310,6 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, interfaces::Coin
             return nullptr;
         }
         if (!create_blank) {
-            // Unlock the wallet
-            if (!wallet->Unlock(passphrase)) {
-                error = Untranslated("Error: Wallet was encrypted but could not be unlocked");
-                status = DatabaseStatus::FAILED_ENCRYPT;
-                return nullptr;
-            }
-
             {
                 // TODO: drop this condition after removing option to create non-HD wallets
                 // related backport bitcoin#11250
@@ -329,6 +322,13 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, interfaces::Coin
                 }
             }
 
+            // Unlock the wallet
+            if (!wallet->Unlock(passphrase)) {
+                error = Untranslated("Error: Wallet was encrypted but could not be unlocked");
+                status = DatabaseStatus::FAILED_ENCRYPT;
+                return nullptr;
+            }
+
             // backup the wallet we just encrypted
             if (!wallet->AutoBackupWallet("", error, warnings) && !error.original.empty()) {
                 status = DatabaseStatus::FAILED_ENCRYPT;

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, interfaces::Coin`
`298`	`298`	`return nullptr;`
`299`	`299`	`}`
`300`	`300`	`if (gArgs.GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) {`
`301`		`- LogPrintf("set HD by default\n");`
	`301`	`+ wallet->WalletLogPrintf("Set HD by default\n");`
`302`	`302`	`wallet->SetMinVersion(FEATURE_HD);`
`303`	`303`	`}`
`304`	`304`
`@@ -310,13 +310,6 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, interfaces::Coin`
`310`	`310`	`return nullptr;`
`311`	`311`	`}`
`312`	`312`	`if (!create_blank) {`
`313`		`- // Unlock the wallet`
`314`		`- if (!wallet->Unlock(passphrase)) {`
`315`		`- error = Untranslated("Error: Wallet was encrypted but could not be unlocked");`
`316`		`- status = DatabaseStatus::FAILED_ENCRYPT;`
`317`		`- return nullptr;`
`318`		`- }`
`319`		`-`
`320`	`313`	`{`
`321`	`314`	`// TODO: drop this condition after removing option to create non-HD wallets`
`322`	`315`	`// related backport bitcoin#11250`
`@@ -329,6 +322,13 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, interfaces::Coin`
`329`	`322`	`}`
`330`	`323`	`}`
`331`	`324`
	`325`	`+ // Unlock the wallet`
	`326`	`+ if (!wallet->Unlock(passphrase)) {`
	`327`	`+ error = Untranslated("Error: Wallet was encrypted but could not be unlocked");`
	`328`	`+ status = DatabaseStatus::FAILED_ENCRYPT;`
	`329`	`+ return nullptr;`
	`330`	`+ }`
	`331`	`+`
`332`	`332`	`// backup the wallet we just encrypted`
`333`	`333`	`if (!wallet->AutoBackupWallet("", error, warnings) && !error.original.empty()) {`
`334`	`334`	`status = DatabaseStatus::FAILED_ENCRYPT;`