Merge bitcoin/bitcoin#22173: wallet: Do not load external signers wallets when unsupported

meshcollider · meshcollider · commit 93e38d5c06d9 · 2021-06-09T23:12:40.000+12:00
e60cd26 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 e60cd26. meshcollider: Code review ACK e60cd26 Tree-SHA512: aed2d0038f448c2f89c6b48f412b106e63c9ed20e748e69aae21fb58c33fc7e4fa73375a52372c73788669eb2b968a8da6b022c65658fa4484f5bbcf205b1b15
diff --git 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())
         {

Original file line number	Diff line number	Diff line change
`@@ -712,6 +712,13 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)`
`712`	`712`	`}`
`713`	`713`	`}`
`714`	`714`
	`715`	`+#ifndef ENABLE_EXTERNAL_SIGNER`
	`716`	`+ if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {`
	`717`	`+ pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n");`
	`718`	`+ return DBErrors::TOO_NEW;`
	`719`	`+ }`
	`720`	`+#endif`
	`721`	`+`
`715`	`722`	`// Get cursor`
`716`	`723`	`if (!m_batch->StartCursor())`
`717`	`724`	`{`