Ignore recent rejects filter for locked txes#3124
Merged
codablock merged 2 commits intodashpay:developfrom Oct 1, 2019
Merged
Conversation
If we had a conflicting tx in the mempool before the locked tx arrived and the locked one arrived before the corresponding islock (i.e. we don't really know it's the one that should be included yet), the locked one is going to be rejected due to a mempool conflict. The old tx is going to be removed from the mempool by an incoming islock a bit later, however, we won't be able to re-request the locked tx until the tip changes because of the recentRejects filter. This patch fixes it.
PastaPastaPasta
previously approved these changes
Sep 29, 2019
Member
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK, concept ACK, is there any good way to test this?
|
@UdjinM6 can you add a comment there? This change compared to Bitcoin is not obvious when looked at in a year :) |
Author
|
@codablock agree, done :) |
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Nov 19, 2019
* Ignore recent rejects filter for locked txes If we had a conflicting tx in the mempool before the locked tx arrived and the locked one arrived before the corresponding islock (i.e. we don't really know it's the one that should be included yet), the locked one is going to be rejected due to a mempool conflict. The old tx is going to be removed from the mempool by an incoming islock a bit later, however, we won't be able to re-request the locked tx until the tip changes because of the recentRejects filter. This patch fixes it. * Add some explanation
MIPPL
pushed a commit
to biblepay/biblepay
that referenced
this pull request
Nov 24, 2019
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits) [v0.14.0.x] Update release notes with change log (dashpay#3213) [v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203) Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100) Fix compile issues Merge bitcoin#11397: net: Improve and document SOCKS code Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184) Update activemn if protx info changed (dashpay#3176) Actually update spent index on DisconnectBlock (dashpay#3167) Only track last seen time instead of first and last seen time (dashpay#3165) Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161) Simulate BlockConnected/BlockDisconnected for PS caches Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144) Various fixes for mixing queues (dashpay#3138) Also consider txindex for transactions in AlreadyHave() (dashpay#3126) Ignore recent rejects filter for locked txes (dashpay#3124) Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121) Update/modernize macOS plist (dashpay#3074) Fix bip69 vs change position issue (dashpay#3063) Partially revert 3061 (dashpay#3150) Fix SelectCoinsMinConf to allow instant respends (dashpay#3061) ... # Conflicts: # configure.ac # doc/man/biblepay-cli.1 # doc/man/biblepay-qt.1 # doc/man/biblepay-tx.1 # doc/man/biblepayd.1 # doc/release-notes.md # src/clientversion.h # src/wallet/wallet.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If we had a conflicting tx in the mempool before the locked tx arrived and the locked one arrived before the corresponding islock (i.e. we don't really know it's the one that should be included yet), the locked one is going to be rejected due to a mempool conflict. The old tx is going to be removed from the mempool by an incoming islock a bit later, however, we won't be able to re-request the locked tx until the tip changes because of the recentRejects filter. This patch fixes it.