Merge pull request #5615 from nuttycom/feature/wallet_orchard-merge_master
Merge master back to feature/wallet_orchard
This commit is contained in:
commit
68d6c3ddc3
|
@ -5865,6 +5865,8 @@ bool CWallet::InitLoadWallet(const CChainParams& params, bool clearWitnessCaches
|
|||
{
|
||||
// Create new keyUser and set as default key
|
||||
if (!walletInstance->IsCrypted()) {
|
||||
LOCK(walletInstance->cs_wallet);
|
||||
|
||||
CPubKey newDefaultKey = walletInstance->GenerateNewKey(true);
|
||||
walletInstance->SetDefaultKey(newDefaultKey);
|
||||
if (!walletInstance->SetAddressBook(walletInstance->vchDefaultKey.GetID(), "", "receive"))
|
||||
|
|
Loading…
Reference in New Issue