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

Merge 06ea2783a2 into merged_master (Bitcoin PR bitcoin/bitcoin#25220)

Browse source
This commit is contained in:
James Dorfman 2024-09-09 17:22:47 +00:00
commit 95d6ba74ad
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/output_script.cpp
View file

@ -195,11 +195,11 @@ static RPCHelpMan createmultisig()
result.pushKV("descriptor", descriptor->ToString());
UniValue warnings(UniValue::VARR);
if (!request.params[2].isNull() && OutputTypeFromDestination(dest) != output_type) {
if (descriptor->GetOutputType() != output_type) {
// Only warns if the user has explicitly chosen an address type we cannot generate
warnings.push_back("Unable to make chosen address type, please ensure no uncompressed public keys are present.");
}
if (warnings.size()) result.pushKV("warnings", warnings);
if (!warnings.empty()) result.pushKV("warnings", warnings);
return result;
},