Skip to content

backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #21970, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7) - #5835

Merged
PastaPastaPasta merged 15 commits into
dashpay:developfrom
kwvg:bps_jan_02
Feb 6, 2024

Conversation

@kwvg

@kwvgkwvg commented Jan 18, 2024

Copy link
Copy Markdown
Collaborator

@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@kwvgkwvg changed the title backport: merge bitcoin#20332, #20908, #20915, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7)backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7)Feb 4, 2024
@kwvg
kwvg marked this pull request as ready for review February 5, 2024 05:48
UdjinM6
UdjinM6 previously approved these changes Feb 5, 2024

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

utACK

Comment threadsrc/test/fuzz/coins_view.cpp Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

21553: Need to include also bitcoin#21970 in batch:

 This bug was introduced by myself in commit eeee8f5be1d4ccfb7e237248be5c6bef45b0fbb8 (https://github.com/bitcoin/bitcoin/pull/21553)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Good catch, resolved in latest push!

Comment threadsrc/test/fuzz/tx_pool.cpp Outdated
@kwvgkwvg changed the title backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7)backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #21970, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7)Feb 5, 2024
knst
knst approved these changes Feb 6, 2024

@knstknst left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

utACK

@kwvg
kwvg requested a review from UdjinM6February 6, 2024 07:24
@UdjinM6UdjinM6 added this to the 20.1 milestone Feb 6, 2024

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

re-utACK

@PastaPastaPastaPastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK for merging via merge commit

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@kwvg@knst@UdjinM6@PastaPastaPasta