GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 335b34c30c into merged_master (Bitcoin PR #16725)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:23 +00:00
commit 3d7ed201af
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core_write.cpp
View file

@ -172,7 +172,7 @@ void ScriptToUniv(const CScript& script, UniValue& out, bool include_address)
out.pushKV("type", GetTxnOutputType(type));
CTxDestination address;
if (include_address && ExtractDestination(script, address)) {
if (include_address && ExtractDestination(script, address) && type != TX_PUBKEY) {
out.pushKV("address", EncodeDestination(address));
}
}
@ -189,7 +189,7 @@ static void SidechainScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& o
if (fIncludeHex)
out.pushKV(prefix + "hex", HexStr(scriptPubKey.begin(), scriptPubKey.end()));
if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired)) {
if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired) || type == TX_PUBKEY) {
out.pushKV(prefix + "type", GetTxnOutputType(type));
return;
}