Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Apr 6, 2024

bitcoin-core/minisketch#81 will fix #29799.
Minor build cleanups after bitcoin-core/minisketch#80.

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 6, 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 dergoegge, hebasto

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

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 6, 2024

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

Debug: https://github.com/bitcoin/bitcoin/runs/23521358444

@fanquake fanquake force-pushed the pull_minisketch_tree branch 2 times, most recently from 2161196 to c03fd4e Compare April 10, 2024 08:04
@dergoegge
Copy link
Member

Fuzzed for 2000 CPU hours, no more UB was found

Copy link
Member

@dergoegge dergoegge left a comment

Choose a reason for hiding this comment

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

ACK c03fd4e

@fanquake fanquake force-pushed the pull_minisketch_tree branch from c03fd4e to 89be2df Compare April 11, 2024 09:33
@fanquake fanquake changed the title minisketch: pull subtree + #81 minisketch: pull subtree + #80 & #81 Apr 11, 2024
@fanquake fanquake force-pushed the pull_minisketch_tree branch 2 times, most recently from 396873b to d66eefc Compare April 11, 2024 14:11
@fanquake fanquake changed the title minisketch: pull subtree + #80 & #81 minisketch: pull subtree + #81 Apr 11, 2024
@sipa
Copy link
Member

sipa commented Apr 12, 2024

bitcoin-core/minisketch#81 is now merged upstream.

3472e2f5ec Merge bitcoin-core/minisketch#81: Avoid overflowing shift by special casing inverse of 1
653d8b2e26 Avoid overflowing shift by special casing inverse of 1
33b7c200b9 Merge bitcoin-core/minisketch#80: Add c++20 version of CountBits
4a48f31a37 Merge bitcoin-core/minisketch#83: ci: Fix "s390x (big-endian)" task
82b6488acb Add c++20 version of CountBits
0498084d31 ci: Fix "s390x (big-endian)" task
71709dca9e Merge bitcoin-core/minisketch#82: ci: Fix `x86_64-w64-mingw32` task
9e6127fa98 Merge bitcoin-core/minisketch#74: Avoid >> above type width in BitWriter
ed420bc170 ci: Fix `x86_64-w64-mingw32` task
fe1040f227 Drop -Wno-shift-count-overflow compile flag
154bcd43bd Avoid >> above type width in BitWriter
67b87acdb6 Merge bitcoin-core/minisketch#78: ci: Update macOS image for CI
7de7250416 ci: Update macOS image for CI
83d812ea9f Merge bitcoin-core/minisketch#73: ci: Use correct variable to designate C++ compiler
e051a7d690 ci: Install wine32 package for Windows tests
2d2c695d78 build: Drop unused `CC` variable
1810fcbd11 ci: Use correct variable to designate C++ compiler
022b959049 Merge bitcoin-core/minisketch#77: Add missing include
08443c4892 Add missing include

git-subtree-dir: src/minisketch
git-subtree-split: 3472e2f5ec75ace39ce9243af6b3fee233a67492
@fanquake fanquake changed the title minisketch: pull subtree + #81 minisketch: update subtree to 3472e2f5ec75ace39ce9243af6b3fee233a67492 Apr 12, 2024
@fanquake fanquake force-pushed the pull_minisketch_tree branch from d66eefc to 4722b7c Compare April 12, 2024 12:31
@fanquake fanquake marked this pull request as ready for review April 12, 2024 12:31
@fanquake
Copy link
Member Author

bitcoin-core/minisketch#81 is now merged upstream.

This is now ready for review.

Copy link
Member

@dergoegge dergoegge left a comment

Choose a reason for hiding this comment

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

utACK 4722b7c

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 4722b7c, I have verified the subtree update and reviewed the build system changes. Both look OK.

@fanquake fanquake merged commit d29fc3a into bitcoin:master Apr 15, 2024
@fanquake fanquake deleted the pull_minisketch_tree branch April 15, 2024 09:00
hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 18, 2024
hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 18, 2024
hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 18, 2024
fd71331 fixup! cmake: Build `minisketch` static library (Hennadii Stepanov)
49a902a fixup! cmake: Check system symbols (Hennadii Stepanov)

Pull request description:

  Backport changes from bitcoin#29823.

ACKs for top commit:
  theuni:
    utACK fd71331

Tree-SHA512: 5259b9c7aa1f4466846c2974aa2a73b5bc507da9c53ac574e6ee6ca1a0c16502e1cde87d0a4119f32b44a5b7fe672ba3919da3b949eff5f9beac736695e89a61
kwvg added a commit to kwvg/dash that referenced this pull request Oct 29, 2024
excludes:
- 1eea10a (subtree manipulation done in previous commits)
- e58e132 (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 Apr 15, 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.

fuzz: minisketch: Undefined-shift in std::__1::vector<Field<unsigned int, 32, 141u, RecLinTrans<unsigned int, 6, 6, 5
5 participants