[0.16] Backports #12967
Merged
[0.16] Backports #12967
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fanquake
changed the title
maflcko
reviewed
Apr 12, 2018
src/init.cpp
Outdated
Member
There was a problem hiding this comment.
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).
Member
|
ACK the gui changes. Also thanks for doing the backports! |
fanquake
force-pushed
the
backport-12626
branch
from
882f520 to
298b925
Compare
fanquake
changed the title
Member
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 |
fanquake
force-pushed
the
backport-12626
branch
from
6ae23f9 to
75f593c
Compare
Member
Author
|
Merged
fanquake
force-pushed
the
backport-12626
branch
from
75f593c to
7458d51
Compare
maflcko
pushed a commit
that referenced
this pull request
Apr 24, 2018
41c29f6 qa: Fix python TypeError in script.py (MarcoFalke) 7460945 [qa] Delete cookie file before starting node (Suhas Daftuar) 0a76ed2 qa: Cache only chain and wallet for regtest datadir (MarcoFalke) 6c26df0 [qa] Ensure bitcoind processes are cleaned up when tests end (Suhas Daftuar) df38b13 [tests] Test starting bitcoind with -h and -version (John Newbery) 4bdb0ce [tests] Fix intermittent rpc_net.py failure. (John Newbery) 0e98f96 test: Use wait_until in tests where time was used for polling (Ben Woosley) 1286f3e test: Use wait_until to ensure ping goes out (Ben Woosley) cfebd40 [test] Round target fee to 8 decimals in assert_fee_amount (Karl-Johan Alm) Pull request description: Similar to #12967 this contains all relevant bugfixes and improvements to the functional test suite. I didn't include fixes to make the tests run on Windows, since that is still an ongoing effort and doesn't seem worth to backport. As all of these are clean cherry-picks, I suggest reviewers redo the cherry-picks to get the same branch and then run the extended test suite. Tree-SHA512: 70e1bc28d5572f93796f1ac4d97d77e8146869c15dcc1e3b65a730fa2641283050f769cefd9791d800c758e0a92f11fd55ed0797ccec87b897c7e701d0187f34
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: bitcoin#12626 Rebased-From: 46e7f80
GitHub-Pull: bitcoin#12650 Rebased-From: 40c5886
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: bitcoin#12756 Rebased-From: 4757c04
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 bitcoin#7990. GitHub-Pull: bitcoin#12985 Rebased-From: 7d8a8cc
GitHub-Pull: bitcoin#12946 Rebased-From: 5b4fc3e
GitHub-Pull: bitcoin#12999 Rebased-From: 67bf2aa
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: bitcoin#12998 Rebased-From: 150b2f0
fanquake
force-pushed
the
backport-12626
branch
from
5c94738 to
7847b92
Compare
Member
Author
|
I've added #12998 as suggested by @TheBlueMatt here. |
Member
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). |
Member
|
Agree with @laanwj. Will review the diffs before todays meeting |
Member
|
utACK 7847b92 |
Member
|
utACK 7847b92 (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) |
Member
|
@fanquake Could you please manually remove the |
Member
|
@fanquake Are you still working on this? You can find it with Just adding a commit on top of this branch is fine (does not invalidate review) |
Member
Author
|
@MarcoFalke Yes, will cleanup today
…On Tue, 1 May 2018 at 03:07, MarcoFalke ***@***.***> 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
<#12967 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AA0t8mxV2mw9fVgUrUzTRac5a8WLiaZ2ks5tt2EDgaJpZM4TRh_g>
.
|
Member
|
Thanks. re-ACK 9645aa6 |
Contributor
|
utACK 8fca086 |
laanwj
added a commit
that referenced
this pull request
May 16, 2018
8fca086 List support for BIP173 in bips.md (Pieter Wuille) 9645aa6 Remove blockmaxsize option from init.cpp (fanquake) 7847b92 Default to defining endian-conversion DECLs in compat w/o config (Matt Corallo) 1720eb3 qt:Show the entire Window when double clicking on taskbar (Chun Kuan Lee) e055bc0 depends: Fix Qt build with XCode 9.3 (fanquake) 0684cf9 Avoid launching as admin when NSIS installer ends. (JeremyRand) e802c22 [config] Remove blockmaxsize option (John Newbery) f118a7a Fix illegal default `addProxy` and `addrSeparateProxyTor` settings. (251) f60e84d Limit the number of IPs we use from each DNS seeder (e0) Pull request description: 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. Tree-SHA512: 3e6b47c54b2cd2bdd81fbc6176cb31e46423f6e05988984d3a09b3535e3cee101ffb071cf753a4beff3c9f0521eb5de4b7c0424a3e97da801d56b4015847ac0f
This was referenced May 16, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
12 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports:
to the 0.16 branch.