Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 15 commits into from
Feb 6, 2024
Merged

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

merged 15 commits into from
Feb 6, 2024

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Jan 18, 2024 •
edited
Loading

@kwvg kwvg mentioned this pull request Jan 18, 2024
Merged
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please rebase.

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 1, 2024

This pull request has conflicts, please rebase.

@kwvg kwvg 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
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

knst
knst reviewed Feb 5, 2024
View reviewed changes
src/test/fuzz/coins_view.cpp
assert(MoneyRange(tx_fee_out));
} catch (const std::runtime_error&) {
}
(void)Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_out);
Copy link
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
Collaborator Author

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!

src/test/fuzz/tx_pool.cpp Show resolved Hide resolved
@kwvg kwvg 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
View reviewed changes
Copy link
Collaborator

@knst knst left a comment

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 UdjinM6 February 6, 2024 07:24
@UdjinM6 UdjinM6 added this to the 20.1 milestone Feb 6, 2024
UdjinM6
UdjinM6 approved these changes Feb 6, 2024
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

re-utACK

PastaPastaPasta
PastaPastaPasta approved these changes Feb 6, 2024
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

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

kwvg added 12 commits February 6, 2024 08:39
@kwvg @PastaPastaPasta
fuzz: add missing Dash-specific network messages
e12bc1f
@kwvg @PastaPastaPasta
fuzz: drop nonexistent messages from FUZZ_TARGET_MSG in process_mes…
e866162 
…sage

Dash doesn't have feefilters or SegWit.
@kwvg @PastaPastaPasta
merge bitcoin#21336: Make .gitignore ignore src/test/fuzz/fuzz.exe
6ff3a46
@kwvg @PastaPastaPasta
merge bitcoin#21443: Implement fuzzed_dns_lookup_function as lambda
16f13ca
@kwvg @PastaPastaPasta
merge bitcoin#21142: Add tx_pool fuzz targets
b46521b
@kwvg @PastaPastaPasta
merge bitcoin#21512: Fix tx_pool target to properly fuzz immature out…
5bb3ac3 
…points
@kwvg @PastaPastaPasta
merge bitcoin#20833: enable packages through testmempoolaccept
33336b9 
includes:
- c9e1a26
@kwvg @PastaPastaPasta
merge bitcoin#21522: Use PickValue where possible
5112848
@kwvg @PastaPastaPasta
merge bitcoin#21553: Misc refactor
689b513
@kwvg @PastaPastaPasta
merge bitcoin#21970: Add missing CheckTransaction before CheckTxInputs
75118f3
@kwvg @PastaPastaPasta
partial bitcoin#21606: Extend psbt fuzz target a bit
eed4f19 
excludes CountPSBTUnsignedInputs from the PSBT fuzzing test series
@kwvg @PastaPastaPasta
merge bitcoin#24336: Print enable_fuzz_binary in configure
24ae76c
@PastaPastaPasta PastaPastaPasta merged commit 052b689 into dashpay:develop Feb 6, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@knst knst knst approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
20.1
Development

Successfully merging this pull request may close these issues.
4 participants
@kwvg @knst @UdjinM6 @PastaPastaPasta