Prevent user from specifying conflicting parameters to fundrawtx #10799

1. 
   TheBlueMatt commented at 1:30 AM on July 12, 2017: member

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

   Based on #10706

2. fanquake added the label RPC/REST/ZMQ on Jul 12, 2017
3. in src/wallet/rpcwallet.cpp:2798 in ab570f848c outdated

   2794 | @@ -2798,9 +2795,15 @@ UniValue fundrawtransaction(const JSONRPCRequest& request)
   2795 |              coinControl.signalRbf = options["replaceable"].get_bool();
   2796 |          }
   2797 |          if (options.exists("conf_target")) {
   2798 | -            coinControl.nConfirmTarget = options["conf_target"].get_int();
   2799 | +            if (coinControl.m_feerate) {
   

   ---

   ---

   

   promag commented at 7:40 AM on July 12, 2017:

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

   ---

   

   TheBlueMatt commented at 3:29 PM on July 12, 2017:

   Why?

   ---

   

   promag commented at 10:44 PM on July 12, 2017:

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

   Nit, s/fundrawtx/fundrawtransaction.

   ---

   

   TheBlueMatt commented at 11:25 PM on July 14, 2017:

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

4. 
   promag commented at 7:41 AM on July 12, 2017: member

   Concept ACK.

5. TheBlueMatt force-pushed on Jul 14, 2017
6. 
   promag commented at 11:50 PM on July 14, 2017: member

   utACK b77a803.

7. 
   sipa commented at 8:11 PM on July 15, 2017: member

   utACK the final commit b77a80306e9fff1a63bb0ac04461407df5004d9f, but needs merging #10706 first.

8. 
   sipa commented at 7:32 PM on July 16, 2017: member

   Needs rebase.

9. TheBlueMatt force-pushed on Jul 16, 2017
10. 
    TheBlueMatt commented at 10:20 PM on July 16, 2017: member

    Rebased on latest #10706.

11. 
    gmaxwell commented at 3:58 PM on July 17, 2017: contributor

    @TheBlueMatt please rebase (10706 is merged)

12. 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.

    99c7fc39a5
13. TheBlueMatt force-pushed on Jul 17, 2017
14. 
    TheBlueMatt commented at 5:47 PM on July 17, 2017: member

    Rebased (cleanly, with no changes).

15. 
    morcos commented at 5:55 PM on July 17, 2017: member

    utACK 99c7fc3

16. gmaxwell approved
17. 
    gmaxwell commented at 6:21 PM on July 25, 2017: contributor

    utACK

18. laanwj added this to the milestone 0.15.0 on Jul 25, 2017
19. laanwj merged this on Jul 25, 2017
20. laanwj closed this on Jul 25, 2017

    ---

21. laanwj referenced this in commit 8537187d42 on Jul 25, 2017
22. PastaPastaPasta referenced this in commit 93754f8d85 on Sep 4, 2019
23. barrystyle referenced this in commit d7c88c0a92 on Jan 22, 2020
24. DrahtBot locked this on Sep 8, 2021

Contributors

TheBlueMattpromagsipagmaxwellmorcos

Milestone
0.15.0