Mining-related fixups for 0.13.0 #8295

1. 
   sdaftuar commented at 4:22 pm on June 30, 2016: member

   My suggestion for how to address the first three items mentioned in #8294:

   • Add size-accounting to addPackageTxs(), and use that instead of addScoreTxs() even when -blockmaxsize is in use.
   • Bugfix: prevent addPackageTxs() from selecting witness transactions before segwit activation, even if mempool policy allows witness transactions in.
   • Remove addScoreTxs(), which is no longer used anywhere.
   • Remove -blockminsize command line option, which has no effect on the mining behavior anymore.

   I can drop the last two commits if we decide to go a different direction.

2. CreateNewBlock: add support for size-accounting to addPackageTxs

   Includes a change to not continue to use size-accounting in addScoreTxs
   or addPackageTxs just because addPriorityTxs() is used.

   f15c2cde45
3. Exclude witness transactions in addPackageTxs() pre-segwit activation 6dd4bc289c
4. Remove addScoreTxs() d2e46e1b5c
5. Remove -blockminsize option 27362dda4d
6. MarcoFalke added the label Mining on Jun 30, 2016
7. sdaftuar force-pushed on Jul 5, 2016
8. 
   sdaftuar commented at 7:57 pm on July 5, 2016: member

   I added a warning if -blockminsize is given on the command line, as we discussed on IRC last week, so this PR is now ready for review. @laanwj I left the string for the warning untranslated because we’re past the string freeze for translations for 0.13.0, but I wasn’t sure if that was the right thing to do? Not sure what your preference is for how we display the warning.
9. sdaftuar force-pushed on Jul 5, 2016
10. Add warning if -blockminsize is used. c1d61fbd08
11. jonasschnelli added this to the milestone 0.13.0 on Jul 7, 2016
12. 
    sipa commented at 6:04 pm on July 11, 2016: member

    ACK c1d61fbd080bcc29589b8d467df98efb7e89d231, that was easier than I had anticipated (I thought we’d need to add size-based accounting to the mempool, but only a per-package check is needed).

    Also nice to see AddScoreTx disappear. This also means that the existing mining tests now all test the only remaining algorithm.

13. in src/init.cpp: in c1d61fbd08

    452@@ -453,7 +453,6 @@ std::string HelpMessage(HelpMessageMode mode)
    453 
    454     strUsage += HelpMessageGroup(_("Block creation options:"));
    455     strUsage += HelpMessageOpt("-blockmaxcost=<n>", strprintf(_("Set maximum block cost (default: %d)"), DEFAULT_BLOCK_MAX_COST));
    

    ---

    ---

    

    MarcoFalke commented at 1:21 pm on July 16, 2016:

    Is this done in this pull?

    ACTION: rename blockmaxcost to blockmaxweight (wumpus, 19:25:14) http://www.erisian.com.au/meetbot/bitcoin-core-dev/2016/bitcoin-core-dev.2016-07-14-19.00.html

    ---

    

    laanwj commented at 6:11 am on July 18, 2016:

    See #8354
14. laanwj merged this on Jul 18, 2016
15. laanwj closed this on Jul 18, 2016

    ---

16. laanwj referenced this in commit f5660d381a on Jul 18, 2016
17. codablock referenced this in commit 98df5aed6f on Sep 19, 2017
18. codablock referenced this in commit 0483f5f781 on Sep 19, 2017
19. codablock referenced this in commit 22c3a8fe20 on Dec 27, 2017
20. codablock referenced this in commit d537623bd8 on Dec 27, 2017
21. codablock referenced this in commit f9f3b8d938 on Dec 28, 2017
22. codablock referenced this in commit 6a993236be on Dec 28, 2017
23. andvgal referenced this in commit 5540b70154 on Jan 6, 2019
24. andvgal referenced this in commit 2a023175f8 on Jan 6, 2019
25. furszy referenced this in commit b554c29785 on Jul 14, 2021
26. DrahtBot locked this on Sep 8, 2021

Contributors
sdaftuar sipa MarcoFalke laanwj

Labels
Mining

Milestone
0.13.0