diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-21 17:24:50 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-21 17:26:30 +0100 |
| commit | 6be52d6f7e0d00dacd8bf3bb41b99990458b1226 (patch) | |
| tree | db0f38abb403e2e3f1d4341720384fd5e359afaf /src | |
| parent | 1522079d54cc799a707c9c9540765dc7258df5cf (diff) | |
| parent | 85f0ca95f3b57d9714a753882ea22fcd6a4139fb (diff) | |
| download | bitcoin-6be52d6f7e0d00dacd8bf3bb41b99990458b1226.tar.xz | |
Merge #15213: doc: Remove errant paste from walletcreatefundedpsbt for nLocktime replaceable
85f0ca95f3b57d9714a753882ea22fcd6a4139fb Remove errant past from walletcreatefundedpsbt for nLocktime replaceability (Gregory Sanders)
Pull request description:
nLockTime has no bearing on bip125
Tree-SHA512: cb123242ee7e1eeff10dbfcab8e57f9aa88590e2da6794343a90a18472a97f23ce7c6bbc55b88163e007fe38c5d8ee5b749cc4ce2bf145f560e084d61b568159
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 13fe5c3ab0..cb08112761 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -4042,8 +4042,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request) }, }, }, - {"locktime", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0", "Raw locktime. Non-0 value also locktime-activates inputs\n" - " Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible."}, + {"locktime", RPCArg::Type::NUM, /* opt */ true, /* default_val */ "0", "Raw locktime. Non-0 value also locktime-activates inputs"}, {"options", RPCArg::Type::OBJ, /* opt */ true, /* default_val */ "null", "", { {"changeAddress", RPCArg::Type::STR_HEX, /* opt */ true, /* default_val */ "pool address", "The bitcoin address to receive the change"}, |