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

[0.13.x] Backports from develop #2828

Merged
merged 6 commits into from
Apr 4, 2019
Merged

[0.13.x] Backports from develop #2828

merged 6 commits into from
Apr 4, 2019

Conversation

codablock
Copy link

See individual commits. These are all PRs currently marked with backport-candidate-13.x.
I'l later also add #2826.

@codablock codablock added this to the 13.3 milestone Apr 4, 2019
@UdjinM6
Copy link

UdjinM6 commented Apr 4, 2019

Looks gooks (8c58799)

@codablock
Do not skip pushing of vMatch and vHashes in CMerkleBlock (dashpay#2826)
575cafc 
Even if its a TX type which we don't want in merkle blocks. Wrongfully
omitting the pushes causes invalid partial merkle trees, which in turn
causes SPV nodes to ban us.
@codablock
Copy link
Author

Added #2826

@codablock codablock marked this pull request as ready for review April 4, 2019 06:22
UdjinM6
UdjinM6 approved these changes Apr 4, 2019
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

@codablock codablock merged commit 3db4e31 into dashpay:v0.13.x Apr 4, 2019
@codablock codablock deleted the pr_v13_backports branch April 4, 2019 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@codablock @UdjinM6