[0.20] Backports

fanquake commented at 2:27 pm on June 9, 2020: member

Currently backports the following to the 0.20 branch:

#18700 - Fix locking on WSL using flock instead of fcntl
#18982 - wallet: Minimal fix to restore conflicted transaction notifications
#19059 - gui: update Qt base translations for macOS release
#19152 - build: improve build OS configure output
#19194 - util: Don’t reference errno when pthread fails.
#19215 - psbt: Include and allow both non_witness_utxo and witness_utxo for segwit inputs
#19219 - Replace automatic bans with discouragement filter
#19300 - wallet: Handle concurrent wallet loading

util: Don't reference errno when pthread fails.

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: #19194
Rebased-From: cb38b069b0f41b1a26264784b1c1303c8ac6ab08

0596a6eeb5

build: improved output of configure for build OS

Github-Pull: #19152
Rebased-From: 0fef60c63d6d2f4df8e698936221e2330ef3a244

c219d21634

gui: update Qt base translations for macOS release

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: #19059
Rebased-From: 69bfcac27a83440092bc6e61904ded910ed4baf4

5c7151a604

Fix WSL file locking by using flock instead of fcntl

Co-authored-by: sipa <pieter@wuille.net>

Github-Pull: #18700
Rebased-From: e8fa0a3d2025509fcddc59fc618e91371542cf87

febebc4ea6

wallet: Minimal fix to restore conflicted transaction notifications

This fix is a based on the fix by Antoine Riard <ariard@student.42.fr> in
https://github.com/bitcoin/bitcoin/pull/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:
a31be09bfd77eed497a8e251d31358e16e2f2eb1 and
7e89994133725125dddbfa8d45484e3b9ed51c6e from
https://github.com/bitcoin/bitcoin/pull/16624, causing issue
https://github.com/bitcoin/bitcoin/issues/18325.

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

Fixes #18325

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

Github-Pull: #18982
Rebased-From: b604c5c8b5892842f13dee89ae31812a28ab25d1

654420d6df

trivial: Suggested cleanups to surrounding code

https://github.com/bitcoin/bitcoin/pull/18982#pullrequestreview-416974841

Github-Pull: #18982
Rebased-From: 7eaf86d3bfc83f2beb3ef449707d5156853126fb

27786d072d

fanquake added the label Backport on Jun 9, 2020

fanquake added this to the milestone 0.20.1 on Jun 9, 2020

promag commented at 4:21 pm on June 29, 2020: member

#19300 was merged.

rpc: show both UTXOs in decodepsbt

Github-Pull: #19215
Rebased-From: 72f6bec1da198764d4648a10a61c485e7ab65e9e

68e0e6f852

psbt: Allow both non_witness_utxo and witness_utxo

Github-Pull: #19215
Rebased-From: 5279d8bc07d601fe6a67ad665fbc7591fe73c7de

ed5ec30804

psbt: always put a non_witness_utxo and don't remove it

Offline signers will always need a non_witness_utxo so make sure it is
there.

Github-Pull: #19215
Rebased-From: 46004790588c24174a0bec49b540d158ce163ffd

3228b59b17

tests: Check that segwit inputs in psbt have both UTXO types

Github-Pull: #19215
Rebased-From: 84d295e51341a126a6c3cbeea7a8caa04c7b5bc3

cf0b5a933d

wallet: Handle concurrent wallet loading

Github-Pull: #19300
Rebased-From: b9971ae5853c1d62e09d976a8705f4f731290d85

c9b49d2856

qa: Test concurrent wallet loading

Github-Pull: #19300
Rebased-From: 9b009fae6e2eb0ab2ee7ce7882c3556a9ac363a7

eb6b82a558

test: remove Cirrus CI FreeBSD job

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
```

e7f06f9b0e

fanquake commented at 2:16 am on July 3, 2020: member

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).

Replace automatic bans with discouragement filter

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: #19219
Rebased-From: b691f2df5f7d443c0c9ee056ab94aa0fc19566d5

0477348057

Clean up separated ban/discourage interface

Github-Pull: #19219
Rebased-From: 2ad58381fffb33d611abf900b73d9e6b5a4e35f8

2b79ac7406

fanquake commented at 6:59 am on July 8, 2020: member

#19219 has been added. The second commit (https://github.com/bitcoin/bitcoin/pull/19224/commits/2b79ac740622218a52e2cf3ae1755dd3a8d4847a) 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 commented at 3:53 pm on July 8, 2020: member

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

MarcoFalke commented at 3:54 pm on July 8, 2020: member

See #19440 for the appveyor fix

laanwj commented at 3:57 pm on July 8, 2020: member

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

fanquake added this to the "Blockers" column in a project

amitiuttarwar commented at 9:37 pm on July 9, 2020: contributor

ACK 04773480575ac79f238ac5764247dddd0cae5051 2b79ac740622218a52e2cf3ae1755dd3a8d4847a by comparing to original changes, double checking the diff

sipa commented at 3:30 am on July 10, 2020: member

utACK 2b79ac740622218a52e2cf3ae1755dd3a8d4847a

I’ve verified 04773480575ac79f238ac5764247dddd0cae5051 by rebasing myself. I’ve done cursory code re-review of the other commits.

fanquake merged this on Jul 10, 2020

fanquake closed this on Jul 10, 2020

fanquake removed this from the "Blockers" column in a project

fanquake deleted the branch on Jul 10, 2020

sdaftuar referenced this in commit 74b0402dc5 on Aug 7, 2020

fanquake referenced this in commit f8f7d91b80 on Aug 11, 2020

DrahtBot locked this on Feb 15, 2022

[0.20] Backports #19224