foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-10 10:52:31 -05:00
Code Issues Activity

wallet: Add external-signer-support specific error message

Browse source
This commit is contained in:
Hennadii Stepanov 2022-02-20 21:02:47 +02:00
parent 5f44c5c428
commit 7f3a6a9495
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet.cpp
View file

@ -2692,6 +2692,10 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
error = strprintf(_("Error loading %s: Wallet requires newer version of %s"), walletFile, PACKAGE_NAME); error = strprintf(_("Error loading %s: Wallet requires newer version of %s"), walletFile, PACKAGE_NAME);
return nullptr; return nullptr;
} }
else if (nLoadWalletRet == DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED) {
error = strprintf(_("Error loading %s: External signer wallet being loaded without external signer support compiled"), walletFile);
return nullptr;
}
else if (nLoadWalletRet == DBErrors::NEED_REWRITE) else if (nLoadWalletRet == DBErrors::NEED_REWRITE)
{ {
error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME); error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);

2
src/wallet/walletdb.cpp
View file

@ -788,7 +788,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
#ifndef ENABLE_EXTERNAL_SIGNER #ifndef ENABLE_EXTERNAL_SIGNER
if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) { if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n"); pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n");
return DBErrors::TOO_NEW; return DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED;
} }
#endif #endif

1
src/wallet/walletdb.h
View file

@ -48,6 +48,7 @@ enum class DBErrors
CORRUPT, CORRUPT,
NONCRITICAL_ERROR, NONCRITICAL_ERROR,
TOO_NEW, TOO_NEW,
EXTERNAL_SIGNER_SUPPORT_REQUIRED,
LOAD_FAIL, LOAD_FAIL,
NEED_REWRITE, NEED_REWRITE,
NEED_RESCAN NEED_RESCAN