Merge #19878: rawtransaction: fix argument in combinerawtransaction help message

MarcoFalke · MarcoFalke · commit df75e9f3ee4d · 2020-09-05T11:19:45.000+02:00
4294e70 rawtransaction: fix argument in combinerawtransaction help message (Matthew Zipkin) Pull request description: Minor correction in the help message provided for `rpc combinerawtransaction`. The input to the rpc is not an array of transaction hashes (txids) but an array of serialized transactions encoded in raw hex. ACKs for top commit: achow101: ACK 4294e70 darosior: ACK 4294e70 Tree-SHA512: 81fe7707632574030715a09e4fe1ad7c0e2630be7842f20c6656d908bbc9532fc14e71b6d36e3fc261a347a088491ef9f6f38d7c4173c4a0bbc746e1d625359d
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -627,7 +627,7 @@ static UniValue combinerawtransaction(const JSONRPCRequest& request)
                 {
                     {"txs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The hex strings of partially signed transactions",
                         {
-                            {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "A transaction hash"},
+                            {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "A hex-encoded raw transaction"},
                         },
                         },
                 },

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ static UniValue combinerawtransaction(const JSONRPCRequest& request)`
`627`	`627`	`{`
`628`	`628`	`{"txs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The hex strings of partially signed transactions",`
`629`	`629`	`{`
`630`		`- {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "A transaction hash"},`
	`630`	`+ {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "A hex-encoded raw transaction"},`
`631`	`631`	`},`
`632`	`632`	`},`
`633`	`633`	`},`