Update minisketch subtree to latest upstream #26373
Closed
Conversation
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
a571ba20f9 Merge bitcoin-core/minisketch#68: Add missed `#include <string>` b9a7f7e2bc Merge bitcoin-core/minisketch#69: refactor: Drop unused `total` local variables 8a5af94edc Merge bitcoin-core/minisketch#70: build: Remove `-Qunused-arguments` workaround for clang + ccache c36f1f03a3 Merge bitcoin-core/minisketch#72: Fix MSVC implementation of `CountBits()` function 0078bedda6 Ignore `HAVE_CLZ` macro when building with MSVC 1c772918c4 Fix MSVC implementation of `CountBits()` function 98f87c55f4 build: Remove `-Qunused-arguments` workaround for clang + ccache 11a1e25c81 refactor: Drop unused `total` local variables ed6c8fcfd9 Add missed `#include <string>` git-subtree-dir: src/minisketch git-subtree-split: a571ba20f9dd1accab6a2309d066369878042ca6
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
16 tasks
|
GUIX hashes x86: arm64: |
|
Updated the PR description with Guix build hashes. |
|
I wonder if it might be better to just drop minisketch until there's something actually using it. We've built it as part of two major releases now, without any actual use... |
At this point, that seems like more hassle than just leaving it as-is. Having it in tree is convenient for PRs like #21515 (and it's children), and the overhead of having it in the tree, is basically 0. |
fanquake
approved these changes
Nov 1, 2022
fanquake
added a commit
to bitcoin-core/gui
that referenced
this pull request
Nov 1, 2022
…ream e9f1d8c Squashed 'src/minisketch/' changes from 47f0a2d26f..a571ba20f9 (Hennadii Stepanov) Pull request description: Contains: - bitcoin-core/minisketch#68 - bitcoin-core/minisketch#69 - bitcoin-core/minisketch#70 - bitcoin-core/minisketch#72 Fixes bitcoin/bitcoin#26262. Required for bitcoin/bitcoin#25797. Guix builds on `arm64`: ``` 28af3bdd17924bb5279934add1fe34f5664181a1c99f33793725adc35f90d778 guix-build-45a0f4e01448/output/aarch64-linux-gnu/SHA256SUMS.part c9cdcb107de5b683221b0e2a3796814548414cdba27be198516a2b401ada90c3 guix-build-45a0f4e01448/output/aarch64-linux-gnu/bitcoin-45a0f4e01448-aarch64-linux-gnu-debug.tar.gz ce1e916cc7574f555c04ed5fa9e9a47a1e4d2d9d1cb82a040269e8c32aca9194 guix-build-45a0f4e01448/output/aarch64-linux-gnu/bitcoin-45a0f4e01448-aarch64-linux-gnu.tar.gz 26404d3479108bcb8ede4ae7f3d37dbb64a335f0cd5bce7ee901d171a1ef2b0b guix-build-45a0f4e01448/output/arm-linux-gnueabihf/SHA256SUMS.part 0fe32aee5836baed86ad25cbddb43c5a9d2ecbbe5cc954f3a76670aa52ff3c6f guix-build-45a0f4e01448/output/arm-linux-gnueabihf/bitcoin-45a0f4e01448-arm-linux-gnueabihf-debug.tar.gz 41f312cbf26a0e51e6867e644beb3d085ebd4221dc83ea84a97b708e6d230b6d guix-build-45a0f4e01448/output/arm-linux-gnueabihf/bitcoin-45a0f4e01448-arm-linux-gnueabihf.tar.gz c05ba8235e05c171ecdbacba87dfc1db34d1971286b853c26e3de52a6b0ea1cc guix-build-45a0f4e01448/output/arm64-apple-darwin/SHA256SUMS.part 9d1dae2b73573d34950684269c41f2504761f2df19f24033513f6664b70b1aad guix-build-45a0f4e01448/output/arm64-apple-darwin/bitcoin-45a0f4e01448-arm64-apple-darwin-unsigned.dmg 1ff742346bd04b7edf27e096286f4863fcfec984b99caf265a64fe72b298b36a guix-build-45a0f4e01448/output/arm64-apple-darwin/bitcoin-45a0f4e01448-arm64-apple-darwin-unsigned.tar.gz 74a001f16ba382c22acb9979ee5d905af42f4ca3613fc6e8fa66fec994fb0850 guix-build-45a0f4e01448/output/arm64-apple-darwin/bitcoin-45a0f4e01448-arm64-apple-darwin.tar.gz ec2f70a0b8a128d3ca69307150714c400620199b506a411b0a4c0a506cc3ed66 guix-build-45a0f4e01448/output/dist-archive/bitcoin-45a0f4e01448.tar.gz 9a67ea74e1b5ef3d08b6a59217ecf8d193234c76f81157192fabe7a9b679af0c guix-build-45a0f4e01448/output/powerpc64-linux-gnu/SHA256SUMS.part 95b458427d73ed81f4a4f85be0dfe81a9a48dc254be65ef158de93d32f07a17a guix-build-45a0f4e01448/output/powerpc64-linux-gnu/bitcoin-45a0f4e01448-powerpc64-linux-gnu-debug.tar.gz 2b269c630f069cc42da5f361d13f5b684fbacb49641f44ed6687379a1e9281b0 guix-build-45a0f4e01448/output/powerpc64-linux-gnu/bitcoin-45a0f4e01448-powerpc64-linux-gnu.tar.gz 33d576b9be022108db6d76c41c1f72c865b5bb38439c6da1cbceac757a1be47f guix-build-45a0f4e01448/output/powerpc64le-linux-gnu/SHA256SUMS.part 053dc9cecc978601701459109eec82f3bcce4042d794c520fd4bd8cd4e17eff3 guix-build-45a0f4e01448/output/powerpc64le-linux-gnu/bitcoin-45a0f4e01448-powerpc64le-linux-gnu-debug.tar.gz 32946d589103c763c2fc67c0d8fa13a38b9194df76cd31755a761a7b9ad856a6 guix-build-45a0f4e01448/output/powerpc64le-linux-gnu/bitcoin-45a0f4e01448-powerpc64le-linux-gnu.tar.gz 7d1be372c84f9403333462e82d7800dfb1812b14c1ed228dacf605dff9aab75c guix-build-45a0f4e01448/output/riscv64-linux-gnu/SHA256SUMS.part 3338bcaf6b8ffd9c155c055a0a18d039e1173212e128561fdea493c263d6ecb9 guix-build-45a0f4e01448/output/riscv64-linux-gnu/bitcoin-45a0f4e01448-riscv64-linux-gnu-debug.tar.gz 7735eefa84630d16d8d37ea23c734578c6fb6540d4359b78d0d1508887e76042 guix-build-45a0f4e01448/output/riscv64-linux-gnu/bitcoin-45a0f4e01448-riscv64-linux-gnu.tar.gz c3a96d6758631b8e8b4f5bb8035e5442e1fc5b831c7a0ddedb26473b025b2503 guix-build-45a0f4e01448/output/x86_64-apple-darwin/SHA256SUMS.part b6c87738e6e561bfc4052464e93a6d03a87c51e8f27e4df8ae7458c9828e28cb guix-build-45a0f4e01448/output/x86_64-apple-darwin/bitcoin-45a0f4e01448-x86_64-apple-darwin-unsigned.dmg 0c16f9435c3d572970400ff4683705b297eda3dd37a682619371771da8efbb24 guix-build-45a0f4e01448/output/x86_64-apple-darwin/bitcoin-45a0f4e01448-x86_64-apple-darwin-unsigned.tar.gz 22e06590afe07b992f6f4e46d5568499403937606d16540b121f23e133270560 guix-build-45a0f4e01448/output/x86_64-apple-darwin/bitcoin-45a0f4e01448-x86_64-apple-darwin.tar.gz 56ddb44760f71fd1c1ea06c7174bf035b8b73c32569d69a1401d130551db43e5 guix-build-45a0f4e01448/output/x86_64-linux-gnu/SHA256SUMS.part 1c8a27fab5d9d0f3a5449f04ae8a7e693c5f144948f6d0c2dbf397e04ce9ebfa guix-build-45a0f4e01448/output/x86_64-linux-gnu/bitcoin-45a0f4e01448-x86_64-linux-gnu-debug.tar.gz 66aca3767407f6c2e77b8b93edc58e71c00bed518a75362e3c2f5009739c666c guix-build-45a0f4e01448/output/x86_64-linux-gnu/bitcoin-45a0f4e01448-x86_64-linux-gnu.tar.gz 7ac04c1d5f2dbb6c2c392add9c4e2c5c838c718910b920fe6691a5e9881065b9 guix-build-45a0f4e01448/output/x86_64-w64-mingw32/SHA256SUMS.part 2c51afbcf5645516d01d5f730e9883d9ed3cb90b9b9baf90792ecdb2b3eb21cf guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64-debug.zip 81738a0690e954d6850f210fa3933ca5de8800078734f8b0810b5e7fe3e63e5d guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64-setup-unsigned.exe ecade9ee23ad156e057d466afe79943f008de316973738efdf5ae33d2a527631 guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64-unsigned.tar.gz 3b17762d01825a3f7d5aecf34cf038938d9ee467e63ea3f34efd1dfa2af5e284 guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64.zip ``` ACKs for top commit: fanquake: ACK 45a0f4e Tree-SHA512: e48d79aa0e3563aeae981ddf1281420fff9b739af43e3d77f13cace158724ff01a7622762aadfd093dcd18822a2c1b76d1c548ae64faf727ba93044887b560fb
|
This was merged. |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Nov 1, 2022
e9f1d8c Squashed 'src/minisketch/' changes from 47f0a2d26f..a571ba20f9 (Hennadii Stepanov) Pull request description: Contains: - bitcoin-core/minisketch#68 - bitcoin-core/minisketch#69 - bitcoin-core/minisketch#70 - bitcoin-core/minisketch#72 Fixes bitcoin#26262. Required for bitcoin#25797. Guix builds on `arm64`: ``` 28af3bdd17924bb5279934add1fe34f5664181a1c99f33793725adc35f90d778 guix-build-45a0f4e01448/output/aarch64-linux-gnu/SHA256SUMS.part c9cdcb107de5b683221b0e2a3796814548414cdba27be198516a2b401ada90c3 guix-build-45a0f4e01448/output/aarch64-linux-gnu/bitcoin-45a0f4e01448-aarch64-linux-gnu-debug.tar.gz ce1e916cc7574f555c04ed5fa9e9a47a1e4d2d9d1cb82a040269e8c32aca9194 guix-build-45a0f4e01448/output/aarch64-linux-gnu/bitcoin-45a0f4e01448-aarch64-linux-gnu.tar.gz 26404d3479108bcb8ede4ae7f3d37dbb64a335f0cd5bce7ee901d171a1ef2b0b guix-build-45a0f4e01448/output/arm-linux-gnueabihf/SHA256SUMS.part 0fe32aee5836baed86ad25cbddb43c5a9d2ecbbe5cc954f3a76670aa52ff3c6f guix-build-45a0f4e01448/output/arm-linux-gnueabihf/bitcoin-45a0f4e01448-arm-linux-gnueabihf-debug.tar.gz 41f312cbf26a0e51e6867e644beb3d085ebd4221dc83ea84a97b708e6d230b6d guix-build-45a0f4e01448/output/arm-linux-gnueabihf/bitcoin-45a0f4e01448-arm-linux-gnueabihf.tar.gz c05ba8235e05c171ecdbacba87dfc1db34d1971286b853c26e3de52a6b0ea1cc guix-build-45a0f4e01448/output/arm64-apple-darwin/SHA256SUMS.part 9d1dae2b73573d34950684269c41f2504761f2df19f24033513f6664b70b1aad guix-build-45a0f4e01448/output/arm64-apple-darwin/bitcoin-45a0f4e01448-arm64-apple-darwin-unsigned.dmg 1ff742346bd04b7edf27e096286f4863fcfec984b99caf265a64fe72b298b36a guix-build-45a0f4e01448/output/arm64-apple-darwin/bitcoin-45a0f4e01448-arm64-apple-darwin-unsigned.tar.gz 74a001f16ba382c22acb9979ee5d905af42f4ca3613fc6e8fa66fec994fb0850 guix-build-45a0f4e01448/output/arm64-apple-darwin/bitcoin-45a0f4e01448-arm64-apple-darwin.tar.gz ec2f70a0b8a128d3ca69307150714c400620199b506a411b0a4c0a506cc3ed66 guix-build-45a0f4e01448/output/dist-archive/bitcoin-45a0f4e01448.tar.gz 9a67ea74e1b5ef3d08b6a59217ecf8d193234c76f81157192fabe7a9b679af0c guix-build-45a0f4e01448/output/powerpc64-linux-gnu/SHA256SUMS.part 95b458427d73ed81f4a4f85be0dfe81a9a48dc254be65ef158de93d32f07a17a guix-build-45a0f4e01448/output/powerpc64-linux-gnu/bitcoin-45a0f4e01448-powerpc64-linux-gnu-debug.tar.gz 2b269c630f069cc42da5f361d13f5b684fbacb49641f44ed6687379a1e9281b0 guix-build-45a0f4e01448/output/powerpc64-linux-gnu/bitcoin-45a0f4e01448-powerpc64-linux-gnu.tar.gz 33d576b9be022108db6d76c41c1f72c865b5bb38439c6da1cbceac757a1be47f guix-build-45a0f4e01448/output/powerpc64le-linux-gnu/SHA256SUMS.part 053dc9cecc978601701459109eec82f3bcce4042d794c520fd4bd8cd4e17eff3 guix-build-45a0f4e01448/output/powerpc64le-linux-gnu/bitcoin-45a0f4e01448-powerpc64le-linux-gnu-debug.tar.gz 32946d589103c763c2fc67c0d8fa13a38b9194df76cd31755a761a7b9ad856a6 guix-build-45a0f4e01448/output/powerpc64le-linux-gnu/bitcoin-45a0f4e01448-powerpc64le-linux-gnu.tar.gz 7d1be372c84f9403333462e82d7800dfb1812b14c1ed228dacf605dff9aab75c guix-build-45a0f4e01448/output/riscv64-linux-gnu/SHA256SUMS.part 3338bcaf6b8ffd9c155c055a0a18d039e1173212e128561fdea493c263d6ecb9 guix-build-45a0f4e01448/output/riscv64-linux-gnu/bitcoin-45a0f4e01448-riscv64-linux-gnu-debug.tar.gz 7735eefa84630d16d8d37ea23c734578c6fb6540d4359b78d0d1508887e76042 guix-build-45a0f4e01448/output/riscv64-linux-gnu/bitcoin-45a0f4e01448-riscv64-linux-gnu.tar.gz c3a96d6758631b8e8b4f5bb8035e5442e1fc5b831c7a0ddedb26473b025b2503 guix-build-45a0f4e01448/output/x86_64-apple-darwin/SHA256SUMS.part b6c87738e6e561bfc4052464e93a6d03a87c51e8f27e4df8ae7458c9828e28cb guix-build-45a0f4e01448/output/x86_64-apple-darwin/bitcoin-45a0f4e01448-x86_64-apple-darwin-unsigned.dmg 0c16f9435c3d572970400ff4683705b297eda3dd37a682619371771da8efbb24 guix-build-45a0f4e01448/output/x86_64-apple-darwin/bitcoin-45a0f4e01448-x86_64-apple-darwin-unsigned.tar.gz 22e06590afe07b992f6f4e46d5568499403937606d16540b121f23e133270560 guix-build-45a0f4e01448/output/x86_64-apple-darwin/bitcoin-45a0f4e01448-x86_64-apple-darwin.tar.gz 56ddb44760f71fd1c1ea06c7174bf035b8b73c32569d69a1401d130551db43e5 guix-build-45a0f4e01448/output/x86_64-linux-gnu/SHA256SUMS.part 1c8a27fab5d9d0f3a5449f04ae8a7e693c5f144948f6d0c2dbf397e04ce9ebfa guix-build-45a0f4e01448/output/x86_64-linux-gnu/bitcoin-45a0f4e01448-x86_64-linux-gnu-debug.tar.gz 66aca3767407f6c2e77b8b93edc58e71c00bed518a75362e3c2f5009739c666c guix-build-45a0f4e01448/output/x86_64-linux-gnu/bitcoin-45a0f4e01448-x86_64-linux-gnu.tar.gz 7ac04c1d5f2dbb6c2c392add9c4e2c5c838c718910b920fe6691a5e9881065b9 guix-build-45a0f4e01448/output/x86_64-w64-mingw32/SHA256SUMS.part 2c51afbcf5645516d01d5f730e9883d9ed3cb90b9b9baf90792ecdb2b3eb21cf guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64-debug.zip 81738a0690e954d6850f210fa3933ca5de8800078734f8b0810b5e7fe3e63e5d guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64-setup-unsigned.exe ecade9ee23ad156e057d466afe79943f008de316973738efdf5ae33d2a527631 guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64-unsigned.tar.gz 3b17762d01825a3f7d5aecf34cf038938d9ee467e63ea3f34efd1dfa2af5e284 guix-build-45a0f4e01448/output/x86_64-w64-mingw32/bitcoin-45a0f4e01448-win64.zip ``` ACKs for top commit: fanquake: ACK 45a0f4e Tree-SHA512: e48d79aa0e3563aeae981ddf1281420fff9b739af43e3d77f13cace158724ff01a7622762aadfd093dcd18822a2c1b76d1c548ae64faf727ba93044887b560fb
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Contains:
#include <string>bitcoin-core/minisketch#68totallocal variables bitcoin-core/minisketch#69-Qunused-argumentsworkaround for clang + ccache bitcoin-core/minisketch#70CountBits()function bitcoin-core/minisketch#72Fixes #26262.
Required for #25797.
Guix builds on
arm64: