Skip to content

Commit 6be52d6

Browse files
committed
Merge #15213: doc: Remove errant paste from walletcreatefundedpsbt for nLocktime replaceable
85f0ca9 Remove errant past from walletcreatefundedpsbt for nLocktime replaceability (Gregory Sanders) Pull request description: nLockTime has no bearing on bip125 Tree-SHA512: cb123242ee7e1eeff10dbfcab8e57f9aa88590e2da6794343a90a18472a97f23ce7c6bbc55b88163e007fe38c5d8ee5b749cc4ce2bf145f560e084d61b568159
2 parents 1522079 + 85f0ca9 commit 6be52d6

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/wallet/rpcwallet.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4042,8 +4042,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
40424042
},
40434043
},
40444044
},
4045-
{"locktime", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0", "Raw locktime. Non-0 value also locktime-activates inputs\n"
4046-
" Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible."},
4045+
{"locktime", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0", "Raw locktime. Non-0 value also locktime-activates inputs"},
40474046
{"options", RPCArg::Type::OBJ, /* opt */ true, /* default_val */ "null", "",
40484047
{
40494048
{"changeAddress", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "pool address", "The bitcoin address to receive the change"},

0 commit comments

Comments
 (0)