diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2022-08-05 02:53:34 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2022-08-05 02:54:15 +0000 |
commit | 0cb6d2aec63aec76a517b8da621a3c53ab432632 (patch) | |
tree | 86e1ad71bd3a49395967ddf6ae9de27b69aab8da /src/wallet/wallet.cpp | |
parent | 30308cc380a8176a5ec0e0bd2beed8b9c482ccf7 (diff) | |
download | bitcoin-0cb6d2aec63aec76a517b8da621a3c53ab432632.tar.xz |
Bugfix: Wallet: Document expectations for AddWalletFlags (now InitWalletFlags) correctly
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r-- | src/wallet/wallet.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 6cf9f9ce74..ed8aff54cb 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1479,16 +1479,20 @@ bool CWallet::LoadWalletFlags(uint64_t flags) return true; } -bool CWallet::AddWalletFlags(uint64_t flags) +void CWallet::InitWalletFlags(uint64_t flags) { LOCK(cs_wallet); + // We should never be writing unknown non-tolerable wallet flags assert(((flags & KNOWN_WALLET_FLAGS) >> 32) == (flags >> 32)); + // This should only be used once, when creating a new wallet - so current flags are expected to be blank + assert(m_wallet_flags == 0); + if (!WalletBatch(GetDatabase()).WriteWalletFlags(flags)) { throw std::runtime_error(std::string(__func__) + ": writing wallet flags failed"); } - return LoadWalletFlags(flags); + if (!LoadWalletFlags(flags)) assert(false); } // Helper for producing a max-sized low-S low-R signature (eg 71 bytes) @@ -2721,7 +2725,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri // ensure this wallet.dat can only be opened by clients supporting HD with chain split and expects no default key walletInstance->SetMinVersion(FEATURE_LATEST); - walletInstance->AddWalletFlags(wallet_creation_flags); + walletInstance->InitWalletFlags(wallet_creation_flags); // Only create LegacyScriptPubKeyMan when not descriptor wallet if (!walletInstance->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) { |