File tree Expand file tree Collapse file tree 2 files changed +0
-18
lines changed Expand file tree Collapse file tree 2 files changed +0
-18
lines changed Original file line number Diff line number Diff line change @@ -356,11 +356,6 @@ RPCHelpMan importdescriptors()
356
356
// the user could have gotten from another RPC command prior to now
357
357
wallet.BlockUntilSyncedToCurrentChain ();
358
358
359
- // Make sure wallet is a descriptor wallet
360
- if (!pwallet->IsWalletFlagSet (WALLET_FLAG_DESCRIPTORS)) {
361
- throw JSONRPCError (RPC_WALLET_ERROR, " importdescriptors is not available for non-descriptor wallets" );
362
- }
363
-
364
359
WalletRescanReserver reserver (*pwallet);
365
360
if (!reserver.reserve (/* with_passphrase=*/ true )) {
366
361
throw JSONRPCError (RPC_WALLET_ERROR, " Wallet is currently rescanning. Abort existing rescan or wait." );
@@ -493,10 +488,6 @@ RPCHelpMan listdescriptors()
493
488
const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest (request);
494
489
if (!wallet) return UniValue::VNULL;
495
490
496
- if (!wallet->IsWalletFlagSet (WALLET_FLAG_DESCRIPTORS)) {
497
- throw JSONRPCError (RPC_WALLET_ERROR, " listdescriptors is not available for non-descriptor wallets" );
498
- }
499
-
500
491
const bool priv = !request.params [0 ].isNull () && request.params [0 ].get_bool ();
501
492
if (priv) {
502
493
EnsureWalletIsUnlocked (*wallet);
Original file line number Diff line number Diff line change @@ -763,10 +763,6 @@ RPCHelpMan gethdkeys()
763
763
const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest (request);
764
764
if (!wallet) return UniValue::VNULL;
765
765
766
- if (!wallet->IsWalletFlagSet (WALLET_FLAG_DESCRIPTORS)) {
767
- throw JSONRPCError (RPC_WALLET_ERROR, " gethdkeys is not available for non-descriptor wallets" );
768
- }
769
-
770
766
LOCK (wallet->cs_wallet );
771
767
772
768
UniValue options{request.params [0 ].isNull () ? UniValue::VOBJ : request.params [0 ]};
@@ -865,11 +861,6 @@ static RPCHelpMan createwalletdescriptor()
865
861
std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest (request);
866
862
if (!pwallet) return UniValue::VNULL;
867
863
868
- // Make sure wallet is a descriptor wallet
869
- if (!pwallet->IsWalletFlagSet (WALLET_FLAG_DESCRIPTORS)) {
870
- throw JSONRPCError (RPC_WALLET_ERROR, " createwalletdescriptor is not available for non-descriptor wallets" );
871
- }
872
-
873
864
std::optional<OutputType> output_type = ParseOutputType (request.params [0 ].get_str ());
874
865
if (!output_type) {
875
866
throw JSONRPCError (RPC_INVALID_ADDRESS_OR_KEY, strprintf (" Unknown address type '%s'" , request.params [0 ].get_str ()));
You can’t perform that action at this time.
0 commit comments