diff options
| author | Sjors Provoost <sjors@sprovoost.nl> | 2019-04-27 19:44:38 +0200 |
|---|---|---|
| committer | Sjors Provoost <sjors@sprovoost.nl> | 2019-07-27 19:24:56 +0200 |
| commit | 4fcb698bc2bb74171cd3a14b94f9882d8e19e9fb (patch) | |
| tree | 1a9ca9d6cf1c98cde3b3b16908a6c93096d74666 /src/rpc/rawtransaction_util.cpp | |
| parent | febf3a856bcfb8fef2cb4ddcb8d1e0cab8a22580 (diff) | |
| download | bitcoin-4fcb698bc2bb74171cd3a14b94f9882d8e19e9fb.tar.xz | |
[rpc] walletcreatefundedpsbt: use wallet default RBF
Diffstat (limited to 'src/rpc/rawtransaction_util.cpp')
| -rw-r--r-- | src/rpc/rawtransaction_util.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp index 1c96d01232..55425cca35 100644 --- a/src/rpc/rawtransaction_util.cpp +++ b/src/rpc/rawtransaction_util.cpp @@ -19,7 +19,7 @@ #include <util/rbf.h> #include <util/strencodings.h> -CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, const UniValue& rbf) +CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, bool rbf) { if (inputs_in.isNull() || outputs_in.isNull()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, arguments 1 and 2 must be non-null"); @@ -37,8 +37,6 @@ CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniVal rawTx.nLockTime = nLockTime; } - bool rbfOptIn = rbf.isTrue(); - for (unsigned int idx = 0; idx < inputs.size(); idx++) { const UniValue& input = inputs[idx]; const UniValue& o = input.get_obj(); @@ -53,7 +51,7 @@ CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniVal throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout must be positive"); uint32_t nSequence; - if (rbfOptIn) { + if (rbf) { nSequence = MAX_BIP125_RBF_SEQUENCE; /* CTxIn::SEQUENCE_FINAL - 2 */ } else if (rawTx.nLockTime) { nSequence = CTxIn::SEQUENCE_FINAL - 1; @@ -125,7 +123,7 @@ CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniVal } } - if (!rbf.isNull() && rawTx.vin.size() > 0 && rbfOptIn != SignalsOptInRBF(CTransaction(rawTx))) { + if (rbf && rawTx.vin.size() > 0 && !SignalsOptInRBF(CTransaction(rawTx))) { throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter combination: Sequence number(s) contradict replaceable option"); } |