Skip to content

Commit e5bf514

Browse files
MarcoFalkeknst
authored andcommitted
Merge bitcoin#24339: rpc: Improve RPC help by explicitly mentioning output types
BACKPORT NOTE: has been done previously; applied missing changes in src/rpc/blockchain.cpp c821ab8 Use `GetAllOutputTypes` in `getblock` RPC function (Kiminuo) d970a85 Move `GetAllOutputTypes` function from `rpc/rawtransaction.cpp` to `rpc/util.{h|cpp}` (Kiminuo) Pull request description: This PR attempts to replicate https://github.com/bitcoin/bitcoin/blob/0ccf9b2e5594581deef2f60174c3651a57f93b64/src/rpc/rawtransaction.cpp#L547 to one other place (at the moment) so that users have better idea what RPC methods can actually return. I created this PR as a follow-up to the idea mentioned here bitcoin#23320 (comment) (resolved). ACKs for top commit: kristapsk: re-ACK c821ab8 Tree-SHA512: 5ff66a41ad7c43ec769f4a99933d2d070feea7c617286d94b6f9bfa1a2547a42211915778210a89074ad4b14d99f34852cc6871efed5e6f1e2ffedd40d669386
1 parent 10074ba commit e5bf514

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/rpc/blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ const RPCResult getblock_vin{
948948
{RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
949949
{RPCResult::Type::STR_HEX, "hex", "The raw public key script bytes, hex-encoded"},
950950
{RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address (only if a well-defined address exists)"},
951-
{RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
951+
{RPCResult::Type::STR, "type", "The output type (e.g. " + GetAllOutputTypes() + ")"},
952952
}},
953953
}},
954954
}},

0 commit comments

Comments
 (0)