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.

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

Backport remaining "candidates" from develop to v0.15.x #3301

Merged
merged 6 commits into from
Jan 24, 2020

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Jan 22, 2020

And update release notes once again.

UdjinM6 and others added 2 commits January 23, 2020 00:22
* Check MNs up to 24 blocks deep when verifying `dstx`

* Handle DSTX-es more like regular txes and not like "other" invs

* Try asking for a DSTX too when trying to find missing tx parents

* Check DSTX-es when chainlock arrives

`HasChainLock` was always `false` in `IsExpired` because tip is updated before the corresponding chainlock is received

* Apply `Handle DSTX-es more like regular txes` idea to `AlreadyHave()`

* Alternative handling of DSTX+recentRejects

Co-authored-by: Alexander Block <[email protected]>
Sometimes the node we ask for mnlistdiff is so fast to reply that we receive the message back before we reset `last_mnlistdiff`. To fix this we should reset it before sending the message, not after.
@UdjinM6 UdjinM6 added this to the 15 milestone Jan 22, 2020
codablock
codablock previously approved these changes Jan 22, 2020
Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

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

utACK

thephez
thephez previously approved these changes Jan 23, 2020
Copy link
Collaborator

@thephez thephez 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
Copy link

@UdjinM6 you want to reuse this PR to bring in the new backport candidates as well?

@UdjinM6
Copy link
Author

UdjinM6 commented Jan 24, 2020

@codablock Yep, will add them once they are merged.

…ple local addresses are known (dashpay#3304)

* Fix CActiveMasternodeManager::GetLocalAddress to prefer IPv4 if multiple local addresses are known

* Make sure LookupHost succeeded
@UdjinM6 UdjinM6 dismissed stale reviews from thephez and codablock via 335db80 January 24, 2020 14:17
@UdjinM6 UdjinM6 force-pushed the bp15rc2_3 branch 2 times, most recently from 335db80 to 5500014 Compare January 24, 2020 14:17
codablock
codablock previously approved these changes Jan 24, 2020
Copy link

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

@UdjinM6
Copy link
Author

UdjinM6 commented Jan 24, 2020

Oooops, I just force-pushed it to trigger Travis build again 🙈 (didn't see that it was approved already)

@UdjinM6 UdjinM6 requested a review from codablock January 24, 2020 16:53
Copy link

@nmarley nmarley left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6 UdjinM6 removed the request for review from codablock January 24, 2020 17:04
@UdjinM6 UdjinM6 merged commit 863057d into dashpay:v0.15.x Jan 24, 2020
@UdjinM6
Copy link
Author

UdjinM6 commented Jan 24, 2020

FYI: Removed backport-candidate-15.x label from corresponding PRs.

@UdjinM6 UdjinM6 deleted the bp15rc2_3 branch November 26, 2020 11:36
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