[0.19] Backports #20150
Merged
[0.19] Backports #20150
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
This change partially reverts 248e22b. Github-Pull: bitcoin#19536 Rebased-From: 6457361
It does count the coinbase transaction. Refs bitcoin#19766 Github-Pull: bitcoin#19777 Rebased-From: 4148f55
This was referenced Oct 15, 2020
Pthread library does not set errno. Pthread library's errno is returned by return value. Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Github-Pull: bitcoin#19194 Rebased-From: cb38b06
Due to the use of boost::filesystem::canonical(), the minimum required version of Boost is actually 1.48.0. Use of canonical was introduced in bitcoin#14146. See also Boost filesystem 1.48.0 release notes: https://github.com/boostorg/filesystem/blob/6b5e38134a336b6ea777cd8a69b6ae929819db7e/doc/release_history.html#L508 Github-Pull: bitcoin#20142 Rebased-From: 3562c15
This fixes the appveyor CI job, see bitcoin#20066. Currently the job fails because some of the vcpkg dependencies need to install msys2 and the hardcoded mirror in the vcpkg config is down. Vcpkg commit 76a7e9248fb3c57350b559966dcaa2d52a5e4458 adds new mirrors to the hardcoded list. Github-Pull: bitcoin#20095 Rebased-From: c83155b
Github-Pull: bitcoin#20141 Rebased-From: d1292f2
71a9475 to
0b64310
Compare
added 2 commits
October 16, 2020 12:31
Github-Pull: bitcoin#19836 Rebased-From: cccc752
Github-Pull: bitcoin#19836 Rebased-From: 3333077
|
utACK 9c71499 Manually verified that the backport commits were the same as master. |
|
ACK 9c71499 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 the following to the 0.19 branch: