Skip to content

Commit 55b76ac

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25615: rpc: add missing description in gettxout help text
743a84a fix gettxout help text (Marnix) Pull request description: replaces #25578 Add help text to asm & hex (like everywhere else). I've also changed two `RPCResult::Type::STR` to `RPCResult::Type::STR_HEX` Top commit has no ACKs. Tree-SHA512: 4109d6abddf71b24899f3252545248bb0c7cc366eb994d30927eb300d0b939a14b8140bac4a4c2bd45098a406666dbe1feb10da8dec923777bb8ed26784dfd54
2 parents 826fae6 + 743a84a commit 55b76ac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/rpc/blockchain.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ const RPCResult getblock_vin{
617617
{RPCResult::Type::OBJ, "scriptPubKey", "",
618618
{
619619
{RPCResult::Type::STR, "asm", "The asm"},
620-
{RPCResult::Type::STR, "hex", "The hex"},
620+
{RPCResult::Type::STR_HEX, "hex", "The hex"},
621621
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
622622
{RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"},
623623
}},
@@ -1014,9 +1014,9 @@ static RPCHelpMan gettxout()
10141014
{RPCResult::Type::NUM, "confirmations", "The number of confirmations"},
10151015
{RPCResult::Type::STR_AMOUNT, "value", "The transaction value in " + CURRENCY_UNIT},
10161016
{RPCResult::Type::OBJ, "scriptPubKey", "", {
1017-
{RPCResult::Type::STR, "asm", ""},
1017+
{RPCResult::Type::STR, "asm", "The asm"},
10181018
{RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
1019-
{RPCResult::Type::STR_HEX, "hex", ""},
1019+
{RPCResult::Type::STR_HEX, "hex", "The hex"},
10201020
{RPCResult::Type::STR, "type", "The type, eg pubkeyhash"},
10211021
{RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
10221022
}},

src/rpc/rawtransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ const RPCResult decodepsbt_inputs{
730730
{RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
731731
{
732732
{RPCResult::Type::STR, "asm", "The asm"},
733-
{RPCResult::Type::STR, "hex", "The hex"},
733+
{RPCResult::Type::STR_HEX, "hex", "The hex"},
734734
}},
735735
{RPCResult::Type::ARR, "final_scriptwitness", /*optional=*/true, "",
736736
{

0 commit comments

Comments
 (0)