highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-07 21:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpc: fix inappropriate warning for address type p2sh-segwit in createmultisig and addmultisigaddress

Browse Source 
Github-Pull: #25220
Rebased-From: eaf6f630c0
This commit is contained in:
brunoerg
2022-05-25 15:16:22 -03:00
committed by fanquake
parent c3936cc53d
commit 7658055c4e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/misc.cpp
View File

@@ -169,11 +169,11 @@ static RPCHelpMan createmultisig()
result.pushKV("descriptor", descriptor->ToString()); result.pushKV("descriptor", descriptor->ToString());
UniValue warnings(UniValue::VARR); 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 // 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."); 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; return result;
}, },

4
src/wallet/rpc/addresses.cpp
View File

@@ -302,11 +302,11 @@ RPCHelpMan addmultisigaddress()
result.pushKV("descriptor", descriptor->ToString()); result.pushKV("descriptor", descriptor->ToString());
UniValue warnings(UniValue::VARR); UniValue warnings(UniValue::VARR);
if (!request.params[3].isNull() && OutputTypeFromDestination(dest) != output_type) { if (descriptor->GetOutputType() != output_type) {
// Only warns if the user has explicitly chosen an address type we cannot generate // 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."); 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; return result;
}, },