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 into
dashpay:developfrom
kwvg:utxo_assume
Jun 6, 2023
Merged

Conversation

@kwvg

@kwvgkwvg commented Mar 5, 2023•
edited
Loading

Copy link
Copy Markdown
Collaborator

@kwvg
kwvg changed the base branch from master to developMarch 5, 2023 20:13
@kwvgkwvg 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
kwvgforce-pushed the utxo_assume branch 12 times, most recently from 7483db9 to 4534f62CompareMarch 13, 2023 16:16
@kwvg
kwvgforce-pushed the utxo_assume branch 2 times, most recently from 34c07a7 to ba8bc46CompareMarch 16, 2023 08:55
@github-actions

github-actionsBot commented Mar 19, 2023

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@kwvg
kwvgforce-pushed the utxo_assume branch 3 times, most recently from 8dc73c0 to f965d97CompareMarch 27, 2023 14:52
@github-actions

github-actionsBot commented Apr 4, 2023

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@kwvg
kwvgforce-pushed the utxo_assume branch 2 times, most recently from 798ca0f to ac60187CompareApril 5, 2023 22:34
@UdjinM6UdjinM6 added this to the 20 milestone Jun 1, 2023
UdjinM6
UdjinM6 reviewed Jun 1, 2023
View reviewed changes

@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.

LGTM, one tiny issue

Comment threadsrc/rpc/blockchain.cpp Outdated
@kwvg
kwvg requested a review from UdjinM6June 1, 2023 14:59
UdjinM6
UdjinM6 previously approved these changes Jun 1, 2023
View reviewed changes

@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

knst
knst reviewed Jun 1, 2023
View reviewed changes
Comment threadsrc/chainparams.cpp Outdated

@knstknstJun 1, 2023

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.

how did you get these values?

@kwvgkwvgJun 1, 2023•
edited
Loading

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.

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 commented Jun 1, 2023
View reviewed changes
Comment threadsrc/test/util/setup_common.cpp Outdated
@kwvg
kwvg requested a review from knstJune 1, 2023 18:51
@github-actions

github-actionsBot commented Jun 4, 2023

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

UdjinM6
UdjinM6 previously approved these changes Jun 6, 2023
View reviewed changes

@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.

LGTM, utACK

@github-actions

github-actionsBot commented Jun 6, 2023

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

UdjinM6
UdjinM6 approved these changes Jun 6, 2023
View reviewed changes

@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

PastaPastaPasta
PastaPastaPasta approved these changes Jun 6, 2023
View reviewed changes

@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

rebase looks correct; merging to avoid further conflicts

This was referenced Jul 16, 2024
Merged
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
@PastaPastaPastaPastaPastaPastaPastaPastaPasta approved these changes
@knstknstAwaiting requested review from knst

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

20

Development

Successfully merging this pull request may close these issues.

4 participants

@kwvg@knst@UdjinM6@PastaPastaPasta