/bitcoin

Prevent user from specifying conflicting parameters to fundrawtx #10799

Merged
merged 1 commit into from Jul 25, 2017
+6 −0

Conversation

Reviewers

@promag promag

@gmaxwell gmaxwell

Assignees
No one assigned
Labels
RPC/REST/ZMQ
Projects
None yet
Milestone
  0.15.0
7 participants
@TheBlueMatt @promag @sipa @gmaxwell @morcos @fanquake @laanwj
@TheBlueMatt
Contributor

TheBlueMatt commented Jul 12, 2017

estimate_mode/conf_target both are overridden by feeRate, so should
not be specified together with feeRate.

Based on #10706

fanquake added the RPC/REST/ZMQ label Jul 12, 2017

src/wallet/rpcwallet.cpp
@@ -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) {
@promag

promag Jul 12, 2017

Contributor

Either use coinControl.fOverrideFeeRate or, better, options.exists("feeRate")? Same below.

@TheBlueMatt

TheBlueMatt Jul 12, 2017

Contributor

Why?

@promag

promag Jul 12, 2017

Contributor

Just because if you change order (handle feeRate option below) it still works.

Nit, s/fundrawtx/fundrawtransaction.

@TheBlueMatt

TheBlueMatt Jul 14, 2017

Contributor

Fixed. Left the commit message as-is to keep it short.

@promag
Contributor

promag commented Jul 14, 2017

utACK b77a803.
@sipa
Owner

sipa commented Jul 15, 2017

utACK the final commit b77a803, but needs merging #10706 first.
@sipa
Owner

sipa commented Jul 16, 2017

Needs rebase.
@TheBlueMatt
Contributor

TheBlueMatt commented Jul 16, 2017

Rebased on latest #10706.
@gmaxwell
Member

gmaxwell commented Jul 17, 2017

@TheBlueMatt please rebase (10706 is merged)
@TheBlueMatt TheBlueMatt Prevent user from specifying conflicting parameters to fundrawtx 
estimate_mode/conf_target both are overridden by feeRate, so should
not be specified together with feeRate.
99c7fc3
@TheBlueMatt
Contributor

TheBlueMatt commented Jul 17, 2017

Rebased (cleanly, with no changes).
@morcos
Contributor

morcos commented Jul 17, 2017

utACK 99c7fc3
@gmaxwell

gmaxwell approved these changes Jul 25, 2017
View changes

utACK

laanwj added this to the 0.15.0 milestone Jul 25, 2017

@laanwj laanwj merged commit 99c7fc3 into bitcoin:master Jul 25, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@laanwj laanwj added a commit that referenced this pull request Jul 25, 2017

@laanwj laanwj Merge #10799: Prevent user from specifying conflicting parameters 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 #10706

Tree-SHA512: 8ccd08575fd1f2a0d45112538ffbbc73983ee172963230b0cc7ac41d13c6f3c740917f82b212c41ded3a64d873452e7f2c7af49f3b47cab897f8e85117f21333
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 1E4AED62986CD25D Learn about signing commits
8537187
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment