diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-17 08:52:50 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-07-17 08:52:53 +0200 |
| commit | 55b76ac1c0a4da9fe7fa1f2ec6ef558fc8f195ae (patch) | |
| tree | b5447fa1e5bce233588028cfbba4cf37ea868e88 /src | |
| parent | 826fae6a0fe184518af625ebb6d1ef9e64631385 (diff) | |
| parent | 743a84a5f6f660e113574de349553144e0b490ff (diff) | |
| download | bitcoin-55b76ac1c0a4da9fe7fa1f2ec6ef558fc8f195ae.tar.xz | |
Merge bitcoin/bitcoin#25615: rpc: add missing description in gettxout help text
743a84a5f6f660e113574de349553144e0b490ff 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/blockchain.cpp | 6 | ||||
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index b80cdce3f0..52d5eaaa50 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -617,7 +617,7 @@ const RPCResult getblock_vin{ {RPCResult::Type::OBJ, "scriptPubKey", "", { {RPCResult::Type::STR, "asm", "The asm"}, - {RPCResult::Type::STR, "hex", "The hex"}, + {RPCResult::Type::STR_HEX, "hex", "The hex"}, {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"}, {RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"}, }}, @@ -1014,9 +1014,9 @@ static RPCHelpMan gettxout() {RPCResult::Type::NUM, "confirmations", "The number of confirmations"}, {RPCResult::Type::STR_AMOUNT, "value", "The transaction value in " + CURRENCY_UNIT}, {RPCResult::Type::OBJ, "scriptPubKey", "", { - {RPCResult::Type::STR, "asm", ""}, + {RPCResult::Type::STR, "asm", "The asm"}, {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"}, - {RPCResult::Type::STR_HEX, "hex", ""}, + {RPCResult::Type::STR_HEX, "hex", "The hex"}, {RPCResult::Type::STR, "type", "The type, eg pubkeyhash"}, {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"}, }}, diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 5ca921ae2f..43e0e6bc2d 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -730,7 +730,7 @@ const RPCResult decodepsbt_inputs{ {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "", { {RPCResult::Type::STR, "asm", "The asm"}, - {RPCResult::Type::STR, "hex", "The hex"}, + {RPCResult::Type::STR_HEX, "hex", "The hex"}, }}, {RPCResult::Type::ARR, "final_scriptwitness", /*optional=*/true, "", { |