[0.21.1]: rc1 Backports #20901

MarcoFalke commented at 11:24 AM on January 11, 2021: member

Current backports for 0.21.1.

One conflict was in the test case.

net: allow CSubNet of non-IP networks

Allow creation of valid `CSubNet` objects of non-IP networks and only
match the single address they were created from (like /32 for IPv4 or
/128 for IPv6).

This fixes a deficiency in `CConnman::DisconnectNode(const CNetAddr& addr)`
and in `BanMan` which assume that creating a subnet from any address
using the `CSubNet(CNetAddr)` constructor would later match that address
only. Before this change a non-IP subnet would be invalid and would not
match any address.

Github-Pull: #20852
Rebased-From: 94d335da7f8232bc653c9b08b0a33b517b4c98ad

c33fbab25c

test: add test for banning of non-IP addresses

Co-authored-by: Jon Atack <jon@atack.com>

Github-Pull: #20852
Rebased-From: 39b43298d9c54f9c18bef36f3d5934f57aefd088

bdce029191

MarcoFalke added this to the milestone 0.21.1 on Jan 11, 2021

fanquake added the label Backport on Jan 11, 2021

MarcoFalke commented at 11:36 AM on January 11, 2021: member

Some gui changes that might be good to include: https://github.com/bitcoin-core/gui/milestone/3

MarcoFalke added the label Needs release note on Jan 11, 2021

Bugfix: GUI: Restore SendConfirmationDialog button default to "Yes"

The SendConfirmationDialog is used for bumping the fee, where "Send" doesn't really make sense

Github-Pull: #bitcoin-core/gui#148
Rebased-From: 8775691383ff394b998232ac8e63fac3a214d18b

7bf3ed495b

qt: Use layout manager for Create Wallet dialog

Github-Pull: bitcoin-core/gui#171
Rebased-From: d4feb6812a2707ef85d75dda4372086ec62eb922

0dba346a56

qt: Add TransactionOverviewWidget class

Github-Pull: bitcoin-core/gui#176
Rebased-From: d43992140679fb9a5ebc7850923679033f9837f3

b7086e69ff

qt: Fix TxViewDelegate layout

This change (1) prevents overlapping date and amount strings,
and (2) guaranties that "eye" sign at the end of the watch-only
address/label is always visible.

Github-Pull: bitcoin-core/gui#176
Rebased-From: f0d04795e23606399414d074d78efe5aa0da7259

7bc4498234

qt: Stop the effect of hidden widgets on the size of QStackedWidget

Layouts of the hidden widgets, those are children of QStackedWidget,
could prevent to adjust the size of the parent widget in the
WalletFrame widget.

Github-Pull: bitcoin-core/gui#176
Rebased-From: af58f5b12cea91467692dd4ae71d8cc916a608ed

bdc64c9030

Fix MSVC build after gui#176

Github-Pull: #20983
Rebased-From: c5354e4641d8a92807e4183894d4bb32241e4b5b

a98f211940

raise helpMessageDialog

Github-Pull: bitcoin-core/gui#167
Rebased-From: 77114462f2328914b7a918f40776e522a0898e56

e2ebc8567a

qt: Use "fusion" style on macOS Big Sur with old Qt

The "macintosh" style is broken on macOS Big Sur at least for Qt 5.9.8.

Github-Pull: #bitcoin-core/gui#177
Rebased-From: 4e1154dfd128cbada65e9ea08ee274cdeafc4c53

6dc58e9945

laanwj commented at 12:35 PM on February 3, 2021: member

Commit list ACK 6dc58e99457fe4609fa3c401e89f98c92dbd9878

fix the unreachable code at feature_taproot

Github-Pull: #21081
Rebased-From: 5e0cd25e29541e6c19559fb5c2555e008ed896fa

4607019798

net: Avoid UBSan warning in ProcessMessage(...)

Github-Pull: #21043
Rebased-From: f5f2f9716885e7548809e77f46b493c896a019bf

95218ee95c

util: Disallow negative mocktime

Signed-off-by: practicalswift <practicalswift@users.noreply.github.com>

Github-Pull: #21043
Rebased-From: 3ddbf22ed179a2db733af4b521bec5d2b13ebf4b

08dada8456

gruve-p commented at 4:33 PM on February 12, 2021: contributor

ACK https://github.com/bitcoin/bitcoin/pull/20901/commits/08dada84565ea5f49127123e356c82a150626f3c

Disallow sendtoaddress and sendmany when private keys disabled

Github-Pull: #21201
Rebased-From: 0997019e7681efb00847a7246c15ac8f235128d8

d6b5eb5fcc

test: disallow sendtoaddress/sendmany when private keys disabled

Github-Pull: #21201
Rebased-From: 6bfbc97d716faad38c87603ac6049d222236d623

4ef1e4bd40

tests: Test that a fully signed tx given to signrawtx is unchanged

Tests that a fully signed transaction given to
signrawtransactionwithwallet is both unchanged and marked as complete.
This tests for a regression in 0.20 where the transaction would not be
marked as complete.

Github-Pull: #20562
Rebased-From: 773c42b265fb2212b5cb8785b7226a206d063543

36ecf5eb87

GUI: Write PSBTs to file with binary mode

Github-Pull: #bitcoin-core/gui#188
Rebased-From: cc3971c9ff538a924c1a76ca1352bcaeb24f579f

3a12672419

jonatack commented at 9:06 PM on March 11, 2021: member

If docs fixes are backportable, maybe #21384.

Update vcpkg checkout commit.

Previously vcpkg was relying on https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-0.29.2-1-any.pkg.tar.xz which is no longer available. The vcpkg source has been updated to use http://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-0.29.2-2-any.pkg.tar.zst. This PR updates the commit ID used to checkout vcpkg for the updated URL.

Github-Pull: #21446
Rebased-From: b9e3f3530611d5fbb799a401b839ee23e3eba835

b35711efde

doc: add signet to share/examples/bitcoin.conf

Github-Pull: #21384
Rebased-From: 21b6a233734da1601846a16a741b108522901782

58975d5c0a

doc: add signet to doc/bitcoin-conf.md

Github-Pull: #21384
Rebased-From: 4a285107c11edde2cfc8adfa831c5448c93798d3

6746cd078b

fuzz: Update FuzzedDataProvider.h from upstream (LLVM)

Upstream revision: https://github.com/llvm/llvm-project/blob/6d0488f75bb2f37bcfe93fc8f59f6e78c9a0c939/compiler-rt/include/fuzzer/FuzzedDataProvider.h

Changes:
* [compiler-rt] FuzzedDataProvider: add ConsumeData and method.
* [compiler-rt] Fix a typo in a comment in FuzzedDataProvider.h.
* [compiler-rt] Add ConsumeRandomLengthString() version without arguments.
* [compiler-rt] Refactor FuzzedDataProvider for better readability.
* [compiler-rt] FuzzedDataProvider: make linter happy.
* [compiler-rt] Mark FDP non-template methods inline to avoid ODR violations.

Github-Pull: #20740
Rebased-From: e3d2ba7c70b13a2165020e45abf02373a1e953f7

a48c9d3161

fuzz: Bump FuzzedDataProvider.h

Latest version from https://raw.githubusercontent.com/llvm/llvm-project/70de7e0d9a95b7fcd7c105b06bd90fdf4e01f563/compiler-rt/include/fuzzer/FuzzedDataProvider.h

Github-Pull: #20812
Rebased-From: fafce49336e18033b26948886bbd7342c779b246

14e3f2a1c9

fuzz: Bump FuzzedDataProvider.h

Latest version from https://github.com/llvm/llvm-project/blob/0cccccf0d2cbd707503263785f9a0407d3e2bd5e/compiler-rt/include/fuzzer/FuzzedDataProvider.h

Github-Pull: #21397
Rebased-From: fa7dc7ae9595ea49a2b31a3baef9af674d8def60

8426e3a8a1

doc: Remove outdated comment

The removed commit is wrong since v0.21.0.

Github-Pull: #21342
Rebased-From: f1f63ac3f833e14badac6edf88ed09d0161e18f7

5a2d98c640

MarcoFalke commented at 8:47 AM on March 21, 2021: member

Fixed fuzz build failure and appveyor ci bug. This is now ready for review/merge.

Should be relatively easy to review, because most commits are clean cherry-picks beside one or two trivial conflicts.

<!-- 16209b1b19 fa4e088cbac035b8029a10b492849540150d0622 bec7f2caf76901a33dcdd2c3bf976f3954131666 0b294c0ba84f2993db71f4b8c3cb23ba3c45a66b

MarcoFalke removed the label Needs release note on Mar 21, 2021

MarcoFalke removed the label Backport on Mar 21, 2021

DrahtBot added the label Backport on Mar 21, 2021

ajtowns commented at 2:25 AM on March 22, 2021: member

ACK 5a2d98c640cf308d3c7e85ba51fbb7e84f99322a -- checked 'rebased-from' patches are in master, and rebased patches are clean rebases (except for the first one which changes ""s to std::string("") to avoid c++17 dependency). commits seem fine, but haven't reviewed in detail.

fanquake approved

fanquake commented at 3:53 AM on March 24, 2021: member

ACK 5a2d98c640cf308d3c7e85ba51fbb7e84f99322a - branched off 0.21 and redid the backports. Minor conflict in c33fbab25c82b6a18773b80e8b355c987066ae5a. The diff between my branch and #20901 was just in release notes, _CLIENT_VERSION_RC (#20901 branched before 95ea54ba089610019a74c1176a2c7c0dba144b1c) and #21490 which has already been merged into 0.21.

fanquake merged this on Mar 24, 2021

fanquake closed this on Mar 24, 2021

MarcoFalke deleted the branch on Mar 24, 2021

DrahtBot locked this on Aug 16, 2022