Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jun 9, 2020

Currently backports the following to the 0.20 branch:

miztake and others added 6 commits June 9, 2020 21:06
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
These haven't been updated since their addition, so this updates the list that
controls which qt base translations are bundled with the macOS binary, to all the
languages that are available with qt 5.9.8.

This could probably be improved in some way, however qt updates are infrequent,
and I didn't want to spend any more time looking at this. Also given that no-one
seems to have noticed and/or reported this it wouldn't seem high-priority.

Could be backported to 0.20.1.

Github-Pull: bitcoin#19059
Rebased-From: 69bfcac
Co-authored-by: sipa <pieter@wuille.net>

Github-Pull: bitcoin#18700
Rebased-From: e8fa0a3
This fix is a based on the fix by Antoine Riard <ariard@student.42.fr> in
bitcoin#18600.

Unlike that PR, which implements some new behavior, this just restores previous
wallet notification and status behavior for transactions removed from the
mempool because they conflict with transactions in a block. The behavior was
accidentally changed in two `CWallet::BlockConnected` updates:
a31be09 and
7e89994 from
bitcoin#16624, causing issue
bitcoin#18325.

The change here could be improved and replaced with a more comprehensive
cleanup, so it includes a detailed comment explaining future considerations.

Fixes bitcoin#18325

Co-authored-by: Antoine Riard <ariard@student.42.fr>

Github-Pull: bitcoin#18982
Rebased-From: b604c5c
@fanquake fanquake added this to the 0.20.1 milestone Jun 9, 2020
@promag
Copy link
Contributor

promag commented Jun 29, 2020

#19300 was merged.

achow101 added 4 commits July 3, 2020 09:15
Offline signers will always need a non_witness_utxo so make sure it is
there.

Github-Pull: bitcoin#19215
Rebased-From: 4600479
promag and others added 3 commits July 3, 2020 09:51
This has been removed from the master branch, and always seems to fail
at the installing packages phase. i.e:
```bash
pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
Updating FreeBSD repository catalogue...
Fetching meta.txz: . done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
repository FreeBSD has no meta file, using default settings
Fetching packagesite.txz: .......... done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0
Unable to open created repository FreeBSD
Unable to update repository FreeBSD
Error updating repositories!

Exit status: 3
```
@fanquake
Copy link
Member Author

fanquake commented Jul 3, 2020

I've added #19215 and #19300 cc @achow101 & @promag if you want to check those. I've also added a commit to remove the FreeBSD job from the Cirrus config, as that seemed to be continually failing in the "installing packages" phase (it has also been removed from master).

sipa added 2 commits July 8, 2020 09:09
This patch improves performance and resource usage around IP
addresses that are banned for misbehavior. They're already not
actually banned, as connections from them are still allowed,
but they are preferred for eviction if the inbound connection
slots are full.

Stop treating these like manually banned IP ranges, and instead
just keep them in a rolling Bloom filter of misbehaving nodes,
which isn't persisted to disk or exposed through the ban
framework. The effect remains the same: preferred for eviction,
avoided for outgoing connections, and not relayed to other peers.

Also change the name of this mechanism to better reflect reality;
they're not banned, just discouraged.

Contains release notes and several interface improvements by
John Newbery.

Github-Pull: bitcoin#19219
Rebased-From: b691f2d
@fanquake
Copy link
Member Author

fanquake commented Jul 8, 2020

#19219 has been added. The second commit (2b79ac7) isn't a necessity, so might end up being dropped.

The test failure is in AppVeyor; looks like a Boost include issue. Maybe a cache needs clearing / packages need re-installing.

@laanwj
Copy link
Member

laanwj commented Jul 8, 2020

ACK 2b79ac7
Reviewed the code changes and metadata and checked here and there whether they match the original changes.

@maflcko
Copy link
Member

maflcko commented Jul 8, 2020

See #19440 for the appveyor fix

@laanwj
Copy link
Member

laanwj commented Jul 8, 2020

Thanks, so we might want to backport #19444 as well, if we care about AppVeyor passing on the branch (I guess so).

@amitiuttarwar
Copy link
Contributor

ACK 0477348 2b79ac7 by comparing to original changes, double checking the diff

@sipa
Copy link
Member

sipa commented Jul 10, 2020

utACK 2b79ac7

I've verified 0477348 by rebasing myself. I've done cursory code re-review of the other commits.

@fanquake fanquake merged commit 01c5637 into bitcoin:0.20 Jul 10, 2020
@fanquake fanquake deleted the 0_20_1_backports branch July 10, 2020 04:47
sdaftuar pushed a commit to sdaftuar/bitcoin that referenced this pull request Aug 7, 2020
This has been removed from the master branch, and always seems to fail
at the installing packages phase. i.e:
```bash
pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
Updating FreeBSD repository catalogue...
Fetching meta.txz: . done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
repository FreeBSD has no meta file, using default settings
Fetching packagesite.txz: .......... done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0
Unable to open created repository FreeBSD
Unable to update repository FreeBSD
Error updating repositories!

Exit status: 3
```

Github-Pull: bitcoin#19224
Rebased-From: e7f06f9
fanquake added a commit to fanquake/bitcoin that referenced this pull request Aug 11, 2020
This has been removed from the master branch, and always seems to fail
at the installing packages phase. i.e:
```bash
pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
Updating FreeBSD repository catalogue...
Fetching meta.txz: . done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
repository FreeBSD has no meta file, using default settings
Fetching packagesite.txz: .......... done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0
Unable to open created repository FreeBSD
Unable to update repository FreeBSD
Error updating repositories!

Exit status: 3
```

Github-Pull: bitcoin#19224
Rebased-From: e7f06f9
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants