-
Notifications
You must be signed in to change notification settings - Fork 38.8k
Prevent user from specifying conflicting parameters to fundrawtx #10799
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Prevent user from specifying conflicting parameters to fundrawtx #10799
Conversation
promag
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concept ACK.
src/wallet/rpcwallet.cpp
Outdated
| } | ||
| if (options.exists("conf_target")) { | ||
| coinControl.nConfirmTarget = options["conf_target"].get_int(); | ||
| if (coinControl.m_feerate) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Either use coinControl.fOverrideFeeRate or, better, options.exists("feeRate")? Same below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just because if you change order (handle feeRate option below) it still works.
Nit, s/fundrawtx/fundrawtransaction.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 |
gmaxwell
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
…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
…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
estimate_mode/conf_target both are overridden by feeRate, so should
not be specified together with feeRate.
Based on #10706