Skip to content

Conversation

fanquake
Copy link
Member

Includes bitcoin-core/minisketch#87 which is used in #30234.
Includes bitcoin-core/minisketch#88 which is used in #29876.

fanquake added 2 commits June 12, 2024 14:38
eb37a9b8e7 Merge bitcoin-core/minisketch#87: Avoid copy in self-assign
fe6557642e Merge bitcoin-core/minisketch#88: build: Add `-Wundef`
8ea298bfa7 Avoid copy in self-assign
978a3d8869 build: Add `-Wundef`
3387044179 Merge bitcoin-core/minisketch#86: doc: fix typo in sketch_impl.h
15c2d13b60 doc: fix typo in sketch_impl.h
7be08b8a46 Merge bitcoin-core/minisketch#85: Fixes for integer precision loss
00fb4a4d83 Avoid or make integer precision conversion explicit
9d62a4d27c Avoid the need to cast/convert to size_t for vector operations
19e06cc7af Prevent overflows from large capacity/max_elements

git-subtree-dir: src/minisketch
git-subtree-split: eb37a9b8e79f9e49d73b96a49bf97a96d9eb676c
@fanquake fanquake requested a review from theuni June 12, 2024 13:42
@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 12, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK theuni, sipa

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 89464ad

@sipa
Copy link
Member

sipa commented Jun 12, 2024

utACK 89464ad

@fanquake
Copy link
Member Author

Guix Build (aarch64):

043f66f1a8d58b8dcba45fe88bc1fd0e8cd2222d05a678e3f14bcd52c905533e  guix-build-89464ad59cf1/output/aarch64-linux-gnu/SHA256SUMS.part
11f73219fdfe67f878aaf9552d30076267e6925cfac82cf1dfd276b4bc416a38  guix-build-89464ad59cf1/output/aarch64-linux-gnu/bitcoin-89464ad59cf1-aarch64-linux-gnu-debug.tar.gz
ac903add0b8fe9fa3eb578e2270a64c6f7ed1ec054069647a40c564d5b6d0c3c  guix-build-89464ad59cf1/output/aarch64-linux-gnu/bitcoin-89464ad59cf1-aarch64-linux-gnu.tar.gz
c9ae08ca3c1bf3dfaed4f6ccaf7fef00c2f9e3d28e691ba1f9323b5eaef35853  guix-build-89464ad59cf1/output/arm-linux-gnueabihf/SHA256SUMS.part
a1a4edad41f789ba29bcc02e9ecf092ca3849254be395cea544a7c4cf8c824aa  guix-build-89464ad59cf1/output/arm-linux-gnueabihf/bitcoin-89464ad59cf1-arm-linux-gnueabihf-debug.tar.gz
be00312a8986b67d058138c67cb035ffdbd7181becc067040508b920d42c0c92  guix-build-89464ad59cf1/output/arm-linux-gnueabihf/bitcoin-89464ad59cf1-arm-linux-gnueabihf.tar.gz
e602b8b84028bfbaa982b118f1b368387b9f844be9dbd9fcb9767a19a93d5b90  guix-build-89464ad59cf1/output/arm64-apple-darwin/SHA256SUMS.part
4eac7e2901457b05eecf7b0336b81ab7bcf4b2ff300ce7ba4375b383e1a27fc2  guix-build-89464ad59cf1/output/arm64-apple-darwin/bitcoin-89464ad59cf1-arm64-apple-darwin-unsigned.tar.gz
ff9db12c85898e49179621c1faa360ec2a5d34deff2dcc6969cf72517a98fae0  guix-build-89464ad59cf1/output/arm64-apple-darwin/bitcoin-89464ad59cf1-arm64-apple-darwin-unsigned.zip
86865327202af1f5a3e9ddbdaf41528468b1bd1a25c5e144e7aa48a2b054038a  guix-build-89464ad59cf1/output/arm64-apple-darwin/bitcoin-89464ad59cf1-arm64-apple-darwin.tar.gz
5a4616646631b80320d204e597d7c1f7cb9ff8cc4bda4d7511b6be8c1aac2223  guix-build-89464ad59cf1/output/dist-archive/bitcoin-89464ad59cf1.tar.gz
916024d95479d1a8b3f17f6775d8c74306b0df78e2ff2f146cf8bbabc7b6579b  guix-build-89464ad59cf1/output/powerpc64-linux-gnu/SHA256SUMS.part
7d61eb841b3c64f8a01be40f6973686427bd47b984a62200a970bc01531aeab8  guix-build-89464ad59cf1/output/powerpc64-linux-gnu/bitcoin-89464ad59cf1-powerpc64-linux-gnu-debug.tar.gz
90321dfb5ccafcbf31069eebdee663818bdec313a1244b3bce85430c7c34eccc  guix-build-89464ad59cf1/output/powerpc64-linux-gnu/bitcoin-89464ad59cf1-powerpc64-linux-gnu.tar.gz
76a67e0495b7c8cb7c64aa45ce63dd9cb5e12ec5dd30017e11f9a66bd6edfb97  guix-build-89464ad59cf1/output/riscv64-linux-gnu/SHA256SUMS.part
5a810071b0f42d593f8465a4df3365a3925f6fc097db0dea82f80c49cec12e3d  guix-build-89464ad59cf1/output/riscv64-linux-gnu/bitcoin-89464ad59cf1-riscv64-linux-gnu-debug.tar.gz
2562baa01fc24bd338a640b240b9df9895c54bd920bd811708f091feef710ad7  guix-build-89464ad59cf1/output/riscv64-linux-gnu/bitcoin-89464ad59cf1-riscv64-linux-gnu.tar.gz
d681cac933906cd53d7481537f4203a3e3aef265e683c37c96efec544f5d7785  guix-build-89464ad59cf1/output/x86_64-apple-darwin/SHA256SUMS.part
68d44980b474b5d0f0f7d9d24536521e46f0bd4d76e706f25b914238fb510e0b  guix-build-89464ad59cf1/output/x86_64-apple-darwin/bitcoin-89464ad59cf1-x86_64-apple-darwin-unsigned.tar.gz
4147577809c2f89130ddc7997dee2828615169b4c6fc31e61b070eeefd5e30d0  guix-build-89464ad59cf1/output/x86_64-apple-darwin/bitcoin-89464ad59cf1-x86_64-apple-darwin-unsigned.zip
0000e24d6ece4ff9e7e12d8ab71a4bd85e3805df573575911adf2332e18ca6d4  guix-build-89464ad59cf1/output/x86_64-apple-darwin/bitcoin-89464ad59cf1-x86_64-apple-darwin.tar.gz
ad7281d06e35c157ca536decb3ab420d1403011d9243f42e6623e060a33d9588  guix-build-89464ad59cf1/output/x86_64-linux-gnu/SHA256SUMS.part
b257e5089ca05945d002fd8960accf94938c329009950c706ff92c438eaa1f4e  guix-build-89464ad59cf1/output/x86_64-linux-gnu/bitcoin-89464ad59cf1-x86_64-linux-gnu-debug.tar.gz
80872dbe43c753ed1e6b235439580a0dd3f11f53fcfc2a10ca44d3b5afa6dddd  guix-build-89464ad59cf1/output/x86_64-linux-gnu/bitcoin-89464ad59cf1-x86_64-linux-gnu.tar.gz
45b282460d32f7c0f4570aa56ab4e080d632ecd8a40ad8899cf238af23f122c0  guix-build-89464ad59cf1/output/x86_64-w64-mingw32/SHA256SUMS.part
88800b2dd2395b7c39ec2a7f288aabd8245e81825ce99244da8d762fe3bb547d  guix-build-89464ad59cf1/output/x86_64-w64-mingw32/bitcoin-89464ad59cf1-win64-debug.zip
2d1895791bc1da90575cc76d543ae8bb624c0eb36c7fbe9de1fe7a60de0584a9  guix-build-89464ad59cf1/output/x86_64-w64-mingw32/bitcoin-89464ad59cf1-win64-setup-unsigned.exe
1a4718df87308788dbc1d13e158ceda44b7cf1dc426ca4d09c70eee20f679ac4  guix-build-89464ad59cf1/output/x86_64-w64-mingw32/bitcoin-89464ad59cf1-win64-unsigned.tar.gz
c7889e30d009ef9f317ecb678eb7801b4e6109d0e59a1452110b0b2dac31c19a  guix-build-89464ad59cf1/output/x86_64-w64-mingw32/bitcoin-89464ad59cf1-win64.zip

@DrahtBot
Copy link
Contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit aa6b876
(master)
commit a2ed551
(master and this pull)
SHA256SUMS.part d5892f57f6b5b43b... b737de584f1d4853...
*-aarch64-linux-gnu-debug.tar.gz c6f281279b510bc8... afa2ac901ed4e3c0...
*-aarch64-linux-gnu.tar.gz e682d7fe85fd41d3... 7f2e8cc8cf401d35...
*-arm-linux-gnueabihf-debug.tar.gz 1c85c10719f51805... 68860dbdd9d00e79...
*-arm-linux-gnueabihf.tar.gz a7e376ab157dc8b9... 8bf0bffdaef0aa15...
*-arm64-apple-darwin-unsigned.tar.gz 74a2a4a76c8cadb7... e3b181fda14fd432...
*-arm64-apple-darwin-unsigned.zip a6cfb5876d68cbc6... 079e90711172f466...
*-arm64-apple-darwin.tar.gz b8facb95f9c7a60d... 6d71c78acd875b47...
*-powerpc64-linux-gnu-debug.tar.gz d7cefcdb2eb894fc... 63858337053a4f94...
*-powerpc64-linux-gnu.tar.gz a4fbbc3c8950228d... 4e7d130c44c9e807...
*-riscv64-linux-gnu-debug.tar.gz e812bd7b16a1db6a... ad4bfa8db60a98fb...
*-riscv64-linux-gnu.tar.gz 172197a1c9e27323... 53d12ce94558e27a...
*-x86_64-apple-darwin-unsigned.tar.gz 0236a33a703fbc61... 38f23ba83ec25e81...
*-x86_64-apple-darwin-unsigned.zip ef884a6e68832271... 74a9e933046b9fba...
*-x86_64-apple-darwin.tar.gz b2b020ba2dd8edb1... bb5f53ca427ccd6d...
*-x86_64-linux-gnu-debug.tar.gz 2e2033c457d99ef3... d41ed6f4577386d0...
*-x86_64-linux-gnu.tar.gz 4263e4d7887a3671... 4763992dab62292d...
*.tar.gz a916d8a919f6783d... c9bf34c057469186...
guix_build.log eda8405828986375... 77259888f3e494fc...
guix_build.log.diff 5f5f074fc3b8cbd2...

@bitcoin bitcoin deleted a comment from Hokulans Jun 13, 2024
@bitcoin bitcoin deleted a comment from Hokulans Jun 13, 2024
@fanquake fanquake merged commit 080a47c into bitcoin:master Jun 13, 2024
@fanquake fanquake deleted the update_minisketch_subtree branch June 13, 2024 11:30
kwvg added a commit to kwvg/dash that referenced this pull request Oct 29, 2024
excludes:
- cb59af3 (subtree manipulation done in previous commits)
- 89464ad (see above)
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Oct 29, 2024
…c/minisketch' to bitcoin-core/minisketch@eb37a9b8)

5e65bb4 merge bitcoin#30270: update subtree to eb37a9b8 (Kittywhiskers Van Gogh)
ef10e83 Squashed 'src/minisketch/' changes from 3472e2f5ec..eb37a9b8e7 (Kittywhiskers Van Gogh)
94dca7f merge bitcoin#29823: update subtree to 3472e2f5e (Kittywhiskers Van Gogh)
9540ecb Squashed 'src/minisketch/' changes from a571ba20f9..3472e2f5ec (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional information

  Unexpected failure was found in UBSan unit test run originating from minisketch tests ([build](https://gitlab.com/dashpay/dash/-/jobs/8206813511#L3512)), resolved in subtree with bitcoin-core/minisketch#81 and updated upstream in bitcoin#29823.  This pull request updates the subtree to latest subtree pulls done on upstream `master` (as of this writing, [`da10e0ba`](https://github.com/bitcoin/bitcoin/tree/da10e0bab4a3e98868dd663af02c43b1dc8b7f4a)).

  Special thanks to knst for reporting this bug! 🎉

  ## Breaking Changes

  None expected.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 5e65bb4

Tree-SHA512: be3c75436425c8662d6af46641a6fc744d01043a832884b29aa9767dd4b9090cef93bcb31355032131392a6ccf29cbbcb771a5786c654f26f4fa0a2d5f0e8a5f
@bitcoin bitcoin locked and limited conversation to collaborators Jun 13, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants