[0.16] Backports #12967

pull fanquake wants to merge 9 commits into bitcoin:0.16 from fanquake:backport-12626 changing 14 files +132 −28
  1. fanquake commented at 10:27 AM on April 12, 2018: member

    Backports:

    • #12626 Limit the number of IPs addrman learns from each DNS seeder
    • #12650 gui: Fix issue: "default port not shown correctly in settings dialog"
    • #12756 [config] Remove blockmaxsize option
    • #12985 Windows: Avoid launching as admin when NSIS installer ends.
    • #12946 depends: Fix Qt build with XCode 9.3
    • #12998 Default to defining endian-conversion DECLs in compat w/o config
    • #12999 qt: Show the Window when double clicking the taskbar icon
    • #13064 List support for BIP173 in bips.md

    to the 0.16 branch.

  2. fanquake added the label Backport on Apr 12, 2018
  3. fanquake renamed this:
    backport: #12626, #12650, #12487
    [0.16] backport: #12626, #12650, #12487
    on Apr 12, 2018
  4. fanquake added this to the milestone 0.16.1 on Apr 12, 2018
  5. in src/init.cpp:493 in 882f520642 outdated 
     488 | @@ -489,6 +489,8 @@ std::string HelpMessage(HelpMessageMode mode)
 489 |      strUsage += HelpMessageOpt("-whitelistforcerelay", strprintf(_("Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)"), DEFAULT_WHITELISTFORCERELAY));
 490 |  
 491 |      strUsage += HelpMessageGroup(_("Block creation options:"));
 492 | +    if (showDebug)
 493 | +        strUsage += HelpMessageOpt("-blockmaxsize=<n>", "Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight");
 494 |      strUsage += HelpMessageOpt("-blockmaxweight=<n>", strprintf(_("Set maximum BIP141 block weight (default: %d)"), DEFAULT_BLOCK_MAX_WEIGHT));
 495 |      strUsage += HelpMessageOpt("-blockmaxsize=<n>", _("Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight"));
    MarcoFalke commented at 1:02 PM on April 12, 2018:

    This setting is now in here twice.

    Also, I think it would make more sense to backport #12756 instead, since it was already "removed" earlier (due to being ignored because of a typo).

  6. MarcoFalke commented at 1:02 PM on April 12, 2018: member

    ACK the gui changes. Also thanks for doing the backports!

  7. fanquake force-pushed on Apr 16, 2018
  8. fanquake renamed this:
    [0.16] backport: #12626, #12650, #12487
    [0.16] backport: #12626, #12650, #12756
    on Apr 16, 2018
  9. sdaftuar commented at 3:22 PM on April 16, 2018: member

    Neither of these are clean cherry-picks, unfortunately, but I thought I'd suggest backporting #12904 and #12902, both of which cause spurious test failures for me (I run the tests on the 0.16 branch regularly).

  10. fanquake renamed this:
    [0.16] backport: #12626, #12650, #12756
    [0.16] Backports
    on Apr 18, 2018
  11. Michagogo commented at 10:27 AM on April 18, 2018: contributor

    Regarding the NSIS bit, this may not be a good idea: https://mdb-blog.blogspot.com/2013/01/nsis-lunch-program-as-user-from-uac.html?showComment=1388694317801#c939517856791332836

  12. fanquake force-pushed on Apr 18, 2018
  13. fanquake commented at 10:36 AM on April 18, 2018: member 
    Test changes are happening in [#13049](/github-metadata-backup-bitcoin-bitcoin/13049/).
  14. MarcoFalke cross-referenced this on Apr 20, 2018 from issue [0.16] qa: Backports by MarcoFalke
  15. fanquake force-pushed on Apr 24, 2018
  16. MarcoFalke referenced this in commit 9ea62a3dc4 on Apr 24, 2018
  17. fanquake cross-referenced this on Apr 24, 2018 from issue Default to defining endian-conversion DECLs in compat w/o config by TheBlueMatt
  18. Limit the number of IPs we use from each DNS seeder
    A risk exists where a malicious DNS seeder eclipses a node by returning an enormous number of IP addresses. In this commit we mitigate this risk by limiting the number of IP addresses addrman learns to 256 per DNS seeder.

GitHub-Pull: #12626
Rebased-From: 46e7f80
    f60e84dba4
  19. Fix illegal default `addProxy` and `addrSeparateProxyTor` settings.
    GitHub-Pull: #12650
Rebased-From: 40c5886
    f118a7a35b
  20. [config] Remove blockmaxsize option
    The blockmaxsize option was marked as deprecated in V0.15.1, and code
was added to convert provided blockmaxsize into blockmaxweight. However,
this code was incorrectly implemented, and blockmaxsize was silently
ignored.

No users have complained about blockmaxsize being ignored, so just
remove it in V0.17.

GitHub-Pull: #12756
Rebased-From: 4757c04
    e802c22947
  21. Avoid launching as admin when NSIS installer ends.
    The Bitcoin Core NSIS script runs with elevated privileges.  Unfortunately, this means that it launches Bitcoin Core itself with elevated privileges when the user chooses to launch Bitcoin Core at the end of the installation procedure.  This commit works around the issue by having explorer.exe launch Bitcoin Core.  Seems to be a similar approach to what http://nsis.sourceforge.net/ShellExecAsUser_plug-in does, but without a plugin.

h/t to "UK" at https://mdb-blog.blogspot.se/2013/01/nsis-lunch-program-as-user-from-uac.html?showComment=1410158039989#c2463780017054126736 for the sample code.

Fixes #7990.

GitHub-Pull: #12985
Rebased-From: 7d8a8cc
    0684cf9b58
  22. depends: Fix Qt build with XCode 9.3
    GitHub-Pull: #12946
Rebased-From: 5b4fc3e
    e055bc0fdf
  23. qt:Show the entire Window when double clicking on taskbar
    GitHub-Pull: #12999
Rebased-From: 67bf2aa
    1720eb3018
  24. Default to defining endian-conversion DECLs in compat w/o config
    While this isn't a supported build configuration, some build
systems need to build without going through our autotools steps,
so defaulting to something sane may make it easier to build.

Specifically, this fixes the inability to build
rust-bitcoinconsensus on some non-x86 platforms. It needs to build
without our autotools/configure steps to ensure correct compile
args are passed from the rust build system to gcc. Converting the
args from the rust build system to gcc would be a lot of
unmaintainable work.

GitHub-Pull: #12998
Rebased-From: 150b2f0
    7847b92605
  25. fanquake force-pushed on Apr 26, 2018
  26. fanquake commented at 3:45 PM on April 26, 2018: member

    I've added #12998 as suggested by @TheBlueMatt here.

  27. laanwj commented at 3:58 PM on April 26, 2018: member

    Regarding the NSIS bit, this may not be a good idea: https://mdb-blog.blogspot.com/2013/01/nsis-lunch-program-as-user-from-uac.html?showComment=1388694317801#c939517856791332836

    Well it's much better than launching as admin, even if it is a solution that only works for current windows. In the longer run might be better to remove that option completely (but that should happen on master, not on the backport here).

  28. MarcoFalke commented at 4:06 PM on April 26, 2018: member

    Agree with @laanwj. Will review the diffs before todays meeting

  29. laanwj commented at 4:57 PM on April 26, 2018: member

    utACK 7847b926057b46a5c01e1033f64f6f61dbf3d88f

  30. MarcoFalke commented at 9:32 PM on April 26, 2018: member

    utACK 7847b92605 (Did cherry-picks of all commits that were mentioned in "Rebased-From:" and compared for each that the code diff was zero. Didn't look at the commit messages)

  31. MarcoFalke commented at 9:37 PM on April 26, 2018: member

    @fanquake Could you please manually remove the blockmaxsize option in init.cpp, since git's cherry-pick couldn't do that due to a merge conflict?

  32. MarcoFalke commented at 7:07 PM on April 30, 2018: member

    @fanquake Are you still working on this?

    You can find it with git checkout 7847b926057b46a5c01e1033f64f6f61dbf3d88f && git grep blockmaxsize src

    Just adding a commit on top of this branch is fine (does not invalidate review)

  33. fanquake commented at 11:09 PM on April 30, 2018: member

    @MarcoFalke Yes, will cleanup today

    On Tue, 1 May 2018 at 03:07, MarcoFalke notifications@github.com wrote:

    @fanquake https://github.com/fanquake Are you still working on this?

    — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/bitcoin/bitcoin/pull/12967#issuecomment-385497970, or mute the thread https://github.com/notifications/unsubscribe-auth/AA0t8mxV2mw9fVgUrUzTRac5a8WLiaZ2ks5tt2EDgaJpZM4TRh_g .

  34. Remove blockmaxsize option from init.cpp 9645aa6262
  35. MarcoFalke commented at 1:03 PM on May 1, 2018: member

    Thanks. re-ACK 9645aa626230449539423815db6e59ac3cfb57e6

  36. List support for BIP173 in bips.md 8fca086d69
  37. ken2812221 commented at 3:02 AM on May 16, 2018: contributor

    utACK 8fca086

  38. laanwj merged this on May 16, 2018
  39. laanwj closed this on May 16, 2018
  40. laanwj referenced this in commit feba12fe85 on May 16, 2018
  41. fanquake cross-referenced this on May 16, 2018 from issue Limit the number of IPs addrman learns from each DNS seeder by EthanHeilman
  42. fanquake cross-referenced this on May 16, 2018 from issue gui: Fix issue: "default port not shown correctly in settings dialog" by l2a5b1
  43. fanquake cross-referenced this on May 16, 2018 from issue [config] Remove blockmaxsize option by jnewbery
  44. Bushstar cross-referenced this on Jun 16, 2018 from issue v0.16.1 by Bushstar
  45. fanquake deleted the branch on Jan 22, 2020
  46. bitcoin locked this on Feb 15, 2022
Contributors
fanquakeMarcoFalkesdaftuarMichagogolaanwjken2812221
Labels
Backport

Milestone
0.16.1

Linked (view graph)
#12487 init: Remove translation for `-blockmaxsize` option help#12626 Limit the number of IPs addrman learns from each DNS seeder#12650 gui: Fix issue: "default port not shown correctly in settings dialog"#12756 [config] Remove blockmaxsize option#12902 [qa] Handle potential cookie race when starting node#12904 [qa] Ensure bitcoind processes are cleaned up when tests end#12946 depends: Fix Qt build with XCode 9.3#12985 Windows: Avoid launching as admin when NSIS installer ends.#12998 Default to defining endian-conversion DECLs in compat w/o config#12999 qt: Show the Window when double clicking the taskbar icon#13049 [0.16] qa: Backports#13064 List support for BIP173 in bips.md
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-05-20 06:55 UTC