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

Ask for locked TXs after removing conflicting TXs #2898

Merged
merged 3 commits into from
May 6, 2019

Conversation

codablock
Copy link

No description provided.

When we removed a conflicting TX from the mempool, the correct/locked TX
is not available locally as the first-seen rule would have filtered before.
We need to re-request this TX if any other node announced it before.
@codablock codablock added this to the 14.0 milestone May 3, 2019
qa/rpc-tests/p2p-instantsend.py Outdated Show resolved Hide resolved
qa/rpc-tests/p2p-instantsend.py Outdated Show resolved Hide resolved
qa/rpc-tests/p2p-instantsend.py Outdated Show resolved Hide resolved
Co-Authored-By: codablock <ablock84@gmail.com>
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

Tests pass locally. Travis failures are ok-ish, pls see #2901

@codablock codablock merged commit 7fdc66d into dashpay:develop May 6, 2019
@codablock codablock deleted the pr_is_requestcorrecttx branch May 6, 2019 13:26
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.

None yet

2 participants