Merged
Conversation
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: bitcoin#20852 Rebased-From: 94d335d
Co-authored-by: Jon Atack <[email protected]> Github-Pull: bitcoin#20852 Rebased-From: 39b4329
Member
Author
|
Some gui changes that might be good to include: https://github.com/bitcoin-core/gui/milestone/3 |
The SendConfirmationDialog is used for bumping the fee, where "Send" doesn't really make sense Github-Pull: #bitcoin-core/gui#148 Rebased-From: 8775691
Github-Pull: bitcoin-core/gui#171 Rebased-From: d4feb68
Github-Pull: bitcoin-core/gui#176 Rebased-From: d439921
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: f0d0479
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: af58f5b
Github-Pull: bitcoin#20983 Rebased-From: c5354e4
Github-Pull: bitcoin-core/gui#167 Rebased-From: 7711446
The "macintosh" style is broken on macOS Big Sur at least for Qt 5.9.8. Github-Pull: #bitcoin-core/gui#177 Rebased-From: 4e1154d
Member
|
Commit list ACK 6dc58e9 |
Github-Pull: bitcoin#21081 Rebased-From: 5e0cd25
Github-Pull: bitcoin#21043 Rebased-From: f5f2f97
Signed-off-by: practicalswift <[email protected]> Github-Pull: bitcoin#21043 Rebased-From: 3ddbf22
Contributor
|
ACK 08dada8 |
Github-Pull: bitcoin#21201 Rebased-From: 0997019
Github-Pull: bitcoin#21201 Rebased-From: 6bfbc97
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: bitcoin#20562 Rebased-From: 773c42b
Github-Pull: #bitcoin-core/gui#188 Rebased-From: cc3971c
Member
|
If docs fixes are backportable, maybe #21384. |
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: bitcoin#21446 Rebased-From: b9e3f35
Github-Pull: bitcoin#21384 Rebased-From: 21b6a23
Github-Pull: bitcoin#21384 Rebased-From: 4a28510
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: bitcoin#20740 Rebased-From: e3d2ba7
Latest version from https://raw.githubusercontent.com/llvm/llvm-project/70de7e0d9a95b7fcd7c105b06bd90fdf4e01f563/compiler-rt/include/fuzzer/FuzzedDataProvider.h Github-Pull: bitcoin#20812 Rebased-From: fafce49
Latest version from https://github.com/llvm/llvm-project/blob/0cccccf0d2cbd707503263785f9a0407d3e2bd5e/compiler-rt/include/fuzzer/FuzzedDataProvider.h Github-Pull: bitcoin#21397 Rebased-From: fa7dc7a
The removed commit is wrong since v0.21.0. Github-Pull: bitcoin#21342 Rebased-From: f1f63ac
Member
Author
|
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. |
Contributor
|
ACK 5a2d98c -- checked 'rebased-from' patches are in master, and rebased patches are clean rebases (except for the first one which changes |
fanquake
approved these changes
Mar 24, 2021
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
15 participants
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.
Current backports for 0.21.1.
One conflict was in the test case.