RPC/rawtransaction: createrawtransaction: Check opt_into_rbf when provided with either value

luke-jr · luke-jr · commit c781a0400e4f · 2017-02-18T00:30:37.000Z
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -192,6 +192,7 @@ libbitcoin_server_a_SOURCES = \
   noui.cpp \
   policy/fees.cpp \
   policy/policy.cpp \
+  policy/rbf.cpp \
   pow.cpp \
   rest.cpp \
   rpc/blockchain.cpp \
@@ -233,7 +234,6 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
   wallet/walletdb.cpp \
-  policy/rbf.cpp \
   $(BITCOIN_CORE_H)
 
 # crypto primitives library
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -379,7 +379,7 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
             "      ,...\n"
             "    }\n"
             "3. locktime                  (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"
-            "4. optintorbf                (boolean, optional, default=false) Allow this transaction to be replaced by a transaction with higher fees\n"
+            "4. optintorbf                (boolean, optional, default=false) Allow this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible.\n"
             "\nResult:\n"
             "\"transaction\"              (string) hex string of the transaction\n"
 
@@ -436,8 +436,6 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
             int64_t seqNr64 = sequenceObj.get_int64();
             if (seqNr64 < 0 || seqNr64 > std::numeric_limits<uint32_t>::max()) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, sequence number is out of range");
-            } else if (seqNr64 <= MAX_BIP125_RBF_SEQUENCE && request.params.size() > 3 && request.params[3].isFalse()) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter combination: Sequence number contradicts optintorbf option");
             } else {
                 nSequence = (uint32_t)seqNr64;
             }
@@ -474,6 +472,10 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
         }
     }
 
+    if (request.params.size() > 3 && rbfOptIn != SignalsOptInRBF(rawTx)) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter combination: Sequence number(s) contradict optintorbf option");
+    }
+
     return EncodeHexTx(rawTx);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ UniValue createrawtransaction(const JSONRPCRequest& request)`
`379`	`379`	`" ,...\n"`
`380`	`380`	`" }\n"`
`381`	`381`	`"3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n"`
`382`		`- "4. optintorbf (boolean, optional, default=false) Allow this transaction to be replaced by a transaction with higher fees\n"`
	`382`	`+ "4. optintorbf (boolean, optional, default=false) Allow this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible.\n"`
`383`	`383`	`"\nResult:\n"`
`384`	`384`	`"\"transaction\" (string) hex string of the transaction\n"`
`385`	`385`
`@@ -436,8 +436,6 @@ UniValue createrawtransaction(const JSONRPCRequest& request)`
`436`	`436`	`int64_t seqNr64 = sequenceObj.get_int64();`
`437`	`437`	`if (seqNr64 < 0 \|\| seqNr64 > std::numeric_limits<uint32_t>::max()) {`
`438`	`438`	`throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, sequence number is out of range");`
`439`		`- } else if (seqNr64 <= MAX_BIP125_RBF_SEQUENCE && request.params.size() > 3 && request.params[3].isFalse()) {`
`440`		`- throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter combination: Sequence number contradicts optintorbf option");`
`441`	`439`	`} else {`
`442`	`440`	`nSequence = (uint32_t)seqNr64;`
`443`	`441`	`}`
`@@ -474,6 +472,10 @@ UniValue createrawtransaction(const JSONRPCRequest& request)`
`474`	`472`	`}`
`475`	`473`	`}`
`476`	`474`
	`475`	`+ if (request.params.size() > 3 && rbfOptIn != SignalsOptInRBF(rawTx)) {`
	`476`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter combination: Sequence number(s) contradict optintorbf option");`
	`477`	`+ }`
	`478`	`+`
`477`	`479`	`return EncodeHexTx(rawTx);`
`478`	`480`	`}`
`479`	`481`