GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3c4e4ada12 into merged_master (Elements PR ElementsProject/elements#1066)

Browse source
This commit is contained in:
Glenn Willen 2022-04-20 20:26:58 -07:00
commit ef37d6a609
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/wallet/rpcwallet.cpp
View file

@ -5780,7 +5780,7 @@ static RPCHelpMan sendtomainchain_pak()
FlatSigningProvider provider;
std::string error;
const auto descriptor = Parse(pwallet->offline_desc, provider, error);
auto descriptor = Parse(pwallet->offline_desc, provider, error);
LegacyScriptPubKeyMan* spk_man = pwallet->GetLegacyScriptPubKeyMan();
if (!spk_man) {
@ -5793,6 +5793,11 @@ static RPCHelpMan sendtomainchain_pak()
if (!pwallet->SetOfflineDescriptor(offline_desc)) {
throw JSONRPCError(RPC_WALLET_ERROR, "Couldn't set wallet descriptor for peg-outs.");
}
descriptor = Parse(pwallet->offline_desc, provider, error);
if (!descriptor) {
throw JSONRPCError(RPC_WALLET_ERROR, "descriptor still null. This is a bug in elementsd.");
}
}
std::string desc_str = pwallet->offline_desc;