Skip to content

backport: merge bitcoin#19806, #21582, #21584, #21270, #21789, #22415, #21525, #21592 (assumeutxo project backports, part 3)#5236

Merged
PastaPastaPasta merged 8 commits intodashpay:developfrom
kwvg:utxo_assume
Jun 6, 2023

Conversation

@kwvg kwvg changed the base branch from master to develop March 5, 2023 20:13
@kwvg kwvg changed the title backports: merge bitcoin#19806, #21523, #21582, #21584, partial #17938 (assumeutxo project backports, part 3) backport: merge bitcoin#19806, #21523, #21582, #21584, partial #17938 (assumeutxo project backports, part 3) Mar 5, 2023
@kwvg kwvg force-pushed the utxo_assume branch 12 times, most recently from 7483db9 to 4534f62 Compare March 13, 2023 16:16
@kwvg kwvg force-pushed the utxo_assume branch 2 times, most recently from 34c07a7 to ba8bc46 Compare March 16, 2023 08:55
@github-actions
Copy link

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the utxo_assume branch 3 times, most recently from 8dc73c0 to f965d97 Compare March 27, 2023 14:52
@github-actions
Copy link

github-actions bot commented Apr 4, 2023

This pull request has conflicts, please rebase.

@kwvg kwvg force-pushed the utxo_assume branch 2 times, most recently from 798ca0f to ac60187 Compare April 5, 2023 22:34
@kwvg kwvg requested review from PastaPastaPasta and UdjinM6 June 1, 2023 12:24
@UdjinM6 UdjinM6 added this to the 20 milestone Jun 1, 2023
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.

LGTM, one tiny issue

@kwvg kwvg requested a review from UdjinM6 June 1, 2023 14:59
UdjinM6
UdjinM6 previously approved these changes Jun 1, 2023
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

Copy link
Collaborator

Choose a reason for hiding this comment

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

how did you get these values?

Copy link
Collaborator Author

@kwvg kwvg Jun 1, 2023

Choose a reason for hiding this comment

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

The expected value is generated through the following call chain that starts from validation_chainstatemanager_tests.cpp and ends with a hash comparison check against hardcoded assumeutxo hashes:

CreateAndActivateUTXOSnapshot > ActivateSnapshot > PopulateAndValidateSnapshot

It's just a matter of running ./src/test/test_dash -t validation_chainstatemanager_tests -- DEBUG_LOG_OUT | grep bad and taking the expected hash. Be careful not the take the expected hash generated from one of the tests where the results are expected to be a validation failure.

The hash value for height 210 was calculated similarly by modifying the test to mine 100 more blocks.

@kwvg kwvg requested a review from knst June 1, 2023 18:51
@github-actions
Copy link

github-actions bot commented Jun 4, 2023

This pull request has conflicts, please rebase.

UdjinM6
UdjinM6 previously approved these changes Jun 6, 2023
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.

LGTM, utACK

@github-actions
Copy link

github-actions bot commented Jun 6, 2023

This pull request has conflicts, please rebase.

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

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

rebase looks correct; merging to avoid further conflicts

Sign up for free to 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