mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-10 20:03:34 -03:00
remove deprecated mentions of signrawtransaction from fundraw help
This commit is contained in:
parent
ebc6542d98
commit
851380ce17
5 changed files with 7 additions and 7 deletions
|
@ -50,7 +50,7 @@ _bitcoin_cli() {
|
||||||
COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
|
COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
signrawtransaction)
|
signrawtransactionwithkey|signrawtransactionwithwallet)
|
||||||
COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
|
COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -62,7 +62,7 @@ static void SetupBitcoinTxArgs()
|
||||||
"This command requires JSON registers:"
|
"This command requires JSON registers:"
|
||||||
"prevtxs=JSON object, "
|
"prevtxs=JSON object, "
|
||||||
"privatekeys=JSON object. "
|
"privatekeys=JSON object. "
|
||||||
"See signrawtransaction docs for format of sighash flags, JSON objects.", false, OptionsCategory::COMMANDS);
|
"See signrawtransactionwithkey docs for format of sighash flags, JSON objects.", false, OptionsCategory::COMMANDS);
|
||||||
|
|
||||||
gArgs.AddArg("load=NAME:FILENAME", "Load JSON file FILENAME into register NAME", false, OptionsCategory::REGISTER_COMMANDS);
|
gArgs.AddArg("load=NAME:FILENAME", "Load JSON file FILENAME into register NAME", false, OptionsCategory::REGISTER_COMMANDS);
|
||||||
gArgs.AddArg("set=NAME:JSON-STRING", "Set register NAME to given JSON-STRING", false, OptionsCategory::REGISTER_COMMANDS);
|
gArgs.AddArg("set=NAME:JSON-STRING", "Set register NAME to given JSON-STRING", false, OptionsCategory::REGISTER_COMMANDS);
|
||||||
|
|
|
@ -89,8 +89,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
|
||||||
{ "createrawtransaction", 2, "locktime" },
|
{ "createrawtransaction", 2, "locktime" },
|
||||||
{ "createrawtransaction", 3, "replaceable" },
|
{ "createrawtransaction", 3, "replaceable" },
|
||||||
{ "decoderawtransaction", 1, "iswitness" },
|
{ "decoderawtransaction", 1, "iswitness" },
|
||||||
{ "signrawtransaction", 1, "prevtxs" },
|
|
||||||
{ "signrawtransaction", 2, "privkeys" },
|
|
||||||
{ "signrawtransactionwithkey", 1, "privkeys" },
|
{ "signrawtransactionwithkey", 1, "privkeys" },
|
||||||
{ "signrawtransactionwithkey", 2, "prevtxs" },
|
{ "signrawtransactionwithkey", 2, "prevtxs" },
|
||||||
{ "signrawtransactionwithwallet", 1, "prevtxs" },
|
{ "signrawtransactionwithwallet", 1, "prevtxs" },
|
||||||
|
|
|
@ -746,7 +746,8 @@ private:
|
||||||
* This allows transaction replacement to work as expected, as you want to
|
* This allows transaction replacement to work as expected, as you want to
|
||||||
* have all inputs "available" to check signatures, and any cycles in the
|
* have all inputs "available" to check signatures, and any cycles in the
|
||||||
* dependency graph are checked directly in AcceptToMemoryPool.
|
* dependency graph are checked directly in AcceptToMemoryPool.
|
||||||
* It also allows you to sign a double-spend directly in signrawtransaction,
|
* It also allows you to sign a double-spend directly in
|
||||||
|
* signrawtransactionwithkey and signrawtransactionwithwallet,
|
||||||
* as long as the conflicting transaction is not yet confirmed.
|
* as long as the conflicting transaction is not yet confirmed.
|
||||||
*/
|
*/
|
||||||
class CCoinsViewMemPool : public CCoinsViewBacked
|
class CCoinsViewMemPool : public CCoinsViewBacked
|
||||||
|
|
|
@ -3028,7 +3028,8 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
|
||||||
"This will not modify existing inputs, and will add at most one change output to the outputs.\n"
|
"This will not modify existing inputs, and will add at most one change output to the outputs.\n"
|
||||||
"No existing outputs will be modified unless \"subtractFeeFromOutputs\" is specified.\n"
|
"No existing outputs will be modified unless \"subtractFeeFromOutputs\" is specified.\n"
|
||||||
"Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n"
|
"Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n"
|
||||||
"The inputs added will not be signed, use signrawtransaction for that.\n"
|
"The inputs added will not be signed, use signrawtransactionwithkey\n"
|
||||||
|
" or signrawtransactionwithwallet for that.\n"
|
||||||
"Note that all existing inputs must have their previous output transaction be in the wallet.\n"
|
"Note that all existing inputs must have their previous output transaction be in the wallet.\n"
|
||||||
"Note that all inputs selected must be of standard form and P2SH scripts must be\n"
|
"Note that all inputs selected must be of standard form and P2SH scripts must be\n"
|
||||||
"in the wallet using importaddress or addmultisigaddress (to calculate fees).\n"
|
"in the wallet using importaddress or addmultisigaddress (to calculate fees).\n"
|
||||||
|
@ -3077,7 +3078,7 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
|
||||||
"\nAdd sufficient unsigned inputs to meet the output value\n"
|
"\nAdd sufficient unsigned inputs to meet the output value\n"
|
||||||
+ HelpExampleCli("fundrawtransaction", "\"rawtransactionhex\"") +
|
+ HelpExampleCli("fundrawtransaction", "\"rawtransactionhex\"") +
|
||||||
"\nSign the transaction\n"
|
"\nSign the transaction\n"
|
||||||
+ HelpExampleCli("signrawtransaction", "\"fundedtransactionhex\"") +
|
+ HelpExampleCli("signrawtransactionwithwallet", "\"fundedtransactionhex\"") +
|
||||||
"\nSend the transaction\n"
|
"\nSend the transaction\n"
|
||||||
+ HelpExampleCli("sendrawtransaction", "\"signedtransactionhex\"")
|
+ HelpExampleCli("sendrawtransaction", "\"signedtransactionhex\"")
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue