diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2021-06-09 22:54:54 +1200 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2021-06-09 23:12:40 +1200 |
| commit | 93e38d5c06d9b32326585121b46bb59041d7cfed (patch) | |
| tree | 21a13125e559bc00c1eb84304b62ee3c1fa201da | |
| parent | 69577a27abef4993a5af51418626b151c8c082c0 (diff) | |
| parent | e60cd26ad46559770ad84d2959c9a1742ae8b7a6 (diff) | |
Merge bitcoin/bitcoin#22173: wallet: Do not load external signers wallets when unsupported
e60cd26ad46559770ad84d2959c9a1742ae8b7a6 Do not load external signers wallets when unsupported (Andrew Chow)
Pull request description:
When external signer support is not compiled, do not load external signer wallets.
Alternative to #22168.
ACKs for top commit:
promag:
Tested ACK e60cd26ad46559770ad84d2959c9a1742ae8b7a6.
meshcollider:
Code review ACK e60cd26ad46559770ad84d2959c9a1742ae8b7a6
Tree-SHA512: aed2d0038f448c2f89c6b48f412b106e63c9ed20e748e69aae21fb58c33fc7e4fa73375a52372c73788669eb2b968a8da6b022c65658fa4484f5bbcf205b1b15
| -rw-r--r-- | src/wallet/walletdb.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index c06b319b0b..24d5351945 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -712,6 +712,13 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet) } } +#ifndef ENABLE_EXTERNAL_SIGNER + if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) { + pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n"); + return DBErrors::TOO_NEW; + } +#endif + // Get cursor if (!m_batch->StartCursor()) { |