File tree Expand file tree Collapse file tree 1 file changed +6
-0
lines changed Expand file tree Collapse file tree 1 file changed +6
-0
lines changed Original file line number Diff line number Diff line change @@ -2795,9 +2795,15 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
2795
2795
coinControl.signalRbf = options[" replaceable" ].get_bool ();
2796
2796
}
2797
2797
if (options.exists (" conf_target" )) {
2798
+ if (options.exists (" feeRate" )) {
2799
+ throw JSONRPCError (RPC_INVALID_PARAMETER, " Cannot specify both conf_target and feeRate" );
2800
+ }
2798
2801
coinControl.m_confirm_target = ParseConfirmTarget (options[" conf_target" ]);
2799
2802
}
2800
2803
if (options.exists (" estimate_mode" )) {
2804
+ if (options.exists (" feeRate" )) {
2805
+ throw JSONRPCError (RPC_INVALID_PARAMETER, " Cannot specify both estimate_mode and feeRate" );
2806
+ }
2801
2807
if (!FeeModeFromString (options[" estimate_mode" ].get_str (), coinControl.m_fee_mode )) {
2802
2808
throw JSONRPCError (RPC_INVALID_PARAMETER, " Invalid estimate_mode parameter" );
2803
2809
}
You can’t perform that action at this time.
0 commit comments