Prevent user from specifying conflicting parameters to fundrawtx #10799
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
promag
reviewed
Jul 12, 2017
src/wallet/rpcwallet.cpp
Outdated
| @@ -2798,9 +2795,15 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) | |||
| coinControl.signalRbf = options["replaceable"].get_bool(); | |||
| } | |||
| if (options.exists("conf_target")) { | |||
| coinControl.nConfirmTarget = options["conf_target"].get_int(); | |||
| if (coinControl.m_feerate) { | |||
There was a problem hiding this comment.
Either use coinControl.fOverrideFeeRate or, better, options.exists("feeRate")? Same below.
There was a problem hiding this comment.
Just because if you change order (handle feeRate option below) it still works.
Nit, s/fundrawtx/fundrawtransaction.
There was a problem hiding this comment.
Fixed. Left the commit message as-is to keep it short.
ab570f8 to
b77a803
Compare
|
utACK b77a803. |
|
utACK the final commit b77a80306e9fff1a63bb0ac04461407df5004d9f, but needs merging #10706 first. |
|
Needs rebase. |
b77a803 to
46efc73
Compare
|
Rebased on latest #10706. |
|
@TheBlueMatt please rebase (10706 is merged) |
estimate_mode/conf_target both are overridden by feeRate, so should not be specified together with feeRate.
46efc73 to
99c7fc3
Compare
|
Rebased (cleanly, with no changes). |
|
utACK 99c7fc3 |
laanwj
added a commit
that referenced
this pull request
Jul 25, 2017
…fundrawtx 99c7fc3 Prevent user from specifying conflicting parameters to fundrawtx (Matt Corallo) Pull request description: estimate_mode/conf_target both are overridden by feeRate, so should not be specified together with feeRate. Based on #10706 Tree-SHA512: 8ccd08575fd1f2a0d45112538ffbbc73983ee172963230b0cc7ac41d13c6f3c740917f82b212c41ded3a64d873452e7f2c7af49f3b47cab897f8e85117f21333
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Sep 4, 2019
…ers to fundrawtx 99c7fc3 Prevent user from specifying conflicting parameters to fundrawtx (Matt Corallo) Pull request description: estimate_mode/conf_target both are overridden by feeRate, so should not be specified together with feeRate. Based on bitcoin#10706 Tree-SHA512: 8ccd08575fd1f2a0d45112538ffbbc73983ee172963230b0cc7ac41d13c6f3c740917f82b212c41ded3a64d873452e7f2c7af49f3b47cab897f8e85117f21333
barrystyle
pushed a commit
to PACGlobalOfficial/PAC
that referenced
this pull request
Jan 22, 2020
…ers to fundrawtx 99c7fc3 Prevent user from specifying conflicting parameters to fundrawtx (Matt Corallo) Pull request description: estimate_mode/conf_target both are overridden by feeRate, so should not be specified together with feeRate. Based on bitcoin#10706 Tree-SHA512: 8ccd08575fd1f2a0d45112538ffbbc73983ee172963230b0cc7ac41d13c6f3c740917f82b212c41ded3a64d873452e7f2c7af49f3b47cab897f8e85117f21333
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
estimate_mode/conf_target both are overridden by feeRate, so should
not be specified together with feeRate.
Based on #10706