Skip to content

Commit 79c345a

Browse files
author
MarcoFalke
committed
Merge #15669: rpc: Fix help text for signtransactionwithXXX
afc06fc rpc: Fix help text for signtransactionwithXXX (Torkel Rogstad) Pull request description: This PR fixes the help text for the `signrawtransactionwithwallet` and `signrawtransactionwithkey` RPC calls. They both marked the `amount` field in the UTXO dependencies as required. This field is omitted in the [`rpc_rawtransaction.py` test](https://github.com/bitcoin/bitcoin/blob/8a8b03ecd2218dcdbcbf3127f2fa94f0f0da4698/test/functional/rpc_rawtransaction.py#L155) and [`successful_signing_test`](https://github.com/bitcoin/bitcoin/blob/8a8b03ecd2218dcdbcbf3127f2fa94f0f0da4698/test/functional/rpc_signrawtransaction.py#L42) in `rpc_signrawtransaction.py`. ACKs for commit afc06f: promag: utACK afc06fc. MarcoFalke: utACK afc06fc Tree-SHA512: 7847844ca38d8033fef2f5255700d21487d78a63ecee8b80362fa28fadfafc80ba29a89f38d7ebb3a1be4c7d47ff6c338f67afec9ee22bf065fb352bb3d03d3a
2 parents 00ca24b + afc06fc commit 79c345a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/rpc/rawtransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)
990990
{"scriptPubKey", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "script key"},
991991
{"redeemScript", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "(required for P2SH) redeem script"},
992992
{"witnessScript", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "(required for P2WSH or P2SH-P2WSH) witness script"},
993-
{"amount", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The amount spent"},
993+
{"amount", RPCArg::Type::AMOUNT, RPCArg::Optional::OMITTED, "(required for Segwit inputs) the amount spent"},
994994
},
995995
},
996996
},

src/wallet/rpcwallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3150,7 +3150,7 @@ UniValue signrawtransactionwithwallet(const JSONRPCRequest& request)
31503150
{"scriptPubKey", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "script key"},
31513151
{"redeemScript", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "(required for P2SH) redeem script"},
31523152
{"witnessScript", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "(required for P2WSH or P2SH-P2WSH) witness script"},
3153-
{"amount", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The amount spent"},
3153+
{"amount", RPCArg::Type::AMOUNT, RPCArg::Optional::OMITTED, "(required for Segwit inputs) the amount spent"},
31543154
},
31553155
},
31563156
},

0 commit comments

Comments
 (0)