Skip to content

Commit 2d298f7

Browse files
authored
Merge pull request ElementsProject#1294 from psgreco/master-liquid-wallet-descr
Remove constrains on liquidv1 pegout bitcoin descriptor
2 parents 1b65d4d + d66c283 commit 2d298f7

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/wallet/rpc/elements.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -361,18 +361,11 @@ RPCHelpMan initpegoutwallet()
361361
}
362362

363363
// Three acceptable descriptors:
364-
bool is_liquid = Params().NetworkIDString() == "liquidv1";
365364
if (bitcoin_desc.substr(0, 8) == "sh(wpkh("
366365
&& bitcoin_desc.substr(bitcoin_desc.size()-2, 2) == "))") {
367-
if(is_liquid) {
368-
throw JSONRPCError(RPC_INVALID_PARAMETER, "bitcoin_descriptor is not supported by Liquid; try pkh(<xpub>) or <xpub>.");
369-
}
370366
xpub_str = bitcoin_desc.substr(8, bitcoin_desc.size()-2);
371367
} else if (bitcoin_desc.substr(0, 5) == "wpkh("
372368
&& bitcoin_desc.substr(bitcoin_desc.size()-1, 1) == ")") {
373-
if(is_liquid) {
374-
throw JSONRPCError(RPC_INVALID_PARAMETER, "bitcoin_descriptor is not supported by Liquid; try pkh(<xpub>) or <xpub>.");
375-
}
376369
xpub_str = bitcoin_desc.substr(5, bitcoin_desc.size()-1);
377370
} else if (bitcoin_desc.substr(0, 4) == "pkh("
378371
&& bitcoin_desc.substr(bitcoin_desc.size()-1, 1) == ")") {

0 commit comments

Comments
 (0)