Final backports for 0.21.2rc1 #22022

MarcoFalke commented at 8:01 AM on May 22, 2021: member

No description provided.

p2p, bugfix: use NetPermissions::HasFlag() in CConnman::Bind()

PF_NOBAN is a multi-flag that includes PF_DOWNLOAD, so the conditional
in CConnman::Bind() using a bitwise AND will return the same result
for both the "noban" status and the "download" status.

Example:

`PF_DOWNLOAD` is `0b1000000`
`PF_NOBAN`    is `0b1010000`

This makes a check like `flags & PF_NOBAN` return `true` even if `flags`
is equal to `PF_DOWNLOAD`.

If `-whitebind=download@1.1.1.1:8765` is specified, then `1.1.1.1:8765`
should be added to the list of local addresses. We only want to avoid
adding to local addresses (that are advertised) a whitebind that has a
`noban@` flag.

As a result of a mis-check in `CConnman::Bind()` we would not have added
`1.1.1.1:8765` to the local addresses in the example above.

Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

Github-Pull: bitcoin/bitcoin#21644
Rebased-From: dde69f20a01acca64ac21cb13993c6e4f8709f23

f2a88986a1

Remove user input from URI error message

+ Detailed error messages for invalid address
+ Used `IsValidDestination` instead of `IsValidDestinationString`
+ Referred to https://github.com/bitcoin/bitcoin/pull/20832 for solution

Github-Pull: bitcoin-core/gui#280
Rebased-From: 3bad0b3fada9ab7c5b03d31dc33d72654c1ba2be

46320ba72f

Update Windows code signing certificate

Github-Pull: bitcoin/bitcoin#22017
Rebased-From: 167fb1fc72e309587a8ef1d7844cb51a5483f54f

09620b89f5

MarcoFalke force-pushed on May 22, 2021

DrahtBot added the label Backport on May 22, 2021

hebasto commented at 9:07 PM on May 22, 2021: member

Why only one commit is backported from #21644?

MarcoFalke commented at 6:27 AM on May 24, 2021: member

The other commits are unrelated test improvements. I am happy to ACK a pull that backports test improvements, but I probably won't backport it myself.

hebasto commented at 6:48 AM on May 24, 2021: member

Not sure if https://github.com/bitcoin-core/gui/pull/280 is backported correctly: diffs on 0.21 branch and on master are different.

MarcoFalke commented at 8:54 AM on May 24, 2021: member

qt/paymentserver.cpp: In member function ‘void PaymentServer::handleURIOrFile(const QString&)’:

qt/paymentserver.cpp:237:105: error: too many arguments to function ‘CTxDestination DecodeDestination(const string&)’

                 const CTxDestination dest = DecodeDestination(recipient.address.toStdString(), error_msg);

                                                                                                         ^

In file included from qt/paymentserver.cpp:17:0:

./key_io.h:25:16: note: declared here

 CTxDestination DecodeDestination(const std::string& str);

                ^

hebasto commented at 8:57 AM on May 24, 2021: member

qt/paymentserver.cpp: In member function ‘void PaymentServer::handleURIOrFile(const QString&)’:

qt/paymentserver.cpp:237:105: error: too many arguments to function ‘CTxDestination DecodeDestination(const string&)’

                 const CTxDestination dest = DecodeDestination(recipient.address.toStdString(), error_msg);

                                                                                                         ^

In file included from qt/paymentserver.cpp:17:0:

./key_io.h:25:16: note: declared here

 CTxDestination DecodeDestination(const std::string& str);

                ^

Ah, right!

hebasto approved

hebasto commented at 8:58 AM on May 24, 2021: member

ACK 09620b89f5f78434080196162c75e3e65cc8d47f, tested https://github.com/bitcoin-core/gui/pull/280 behavior.

achow101 commented at 8:51 PM on May 27, 2021: member

ACK 09620b89f5f78434080196162c75e3e65cc8d47f Diffs match.

fanquake approved

fanquake commented at 7:31 AM on May 31, 2021: member

ACK 09620b89f5f78434080196162c75e3e65cc8d47f

fanquake merged this on May 31, 2021

fanquake closed this on May 31, 2021

MarcoFalke deleted the branch on May 31, 2021

ComputerCraftr referenced this in commit 4ea1145a06 on Jun 9, 2021

tcharding referenced this in commit 433ac6fcef on Jul 22, 2022

tcharding referenced this in commit 60a2417a8f on Aug 3, 2022

DrahtBot locked this on Aug 18, 2022