Merge 93e38d5c06 into merged_master (Bitcoin PR bitcoin/bitcoin#22173)

This commit is contained in:
Andrew Poelstra 2021-07-23 21:58:13 +00:00
commit 0fe87c64ad

View file

@ -789,6 +789,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())
{