fix: nc-fail should not count for excluding conflicts from mempool#1532
Merged
fix: nc-fail should not count for excluding conflicts from mempool#1532
Conversation
This was referenced Dec 22, 2025
Merged
|
| Branch | fix/conflict-with-execution-fail |
| Testbed | ubuntu-22.04 |
Click to view all benchmark results
| Benchmark | Latency | Benchmark Result minutes (m) (Result Δ%) | Lower Boundary minutes (m) (Limit %) | Upper Boundary minutes (m) (Limit %) |
|---|---|---|---|---|
| sync-v2 (up to 20000 blocks) | 📈 view plot 🚷 view threshold | 1.68 m(-2.88%)Baseline: 1.73 m | 1.56 m (92.67%) | 2.07 m (80.93%) |
a7d9020 to
6987732
Compare
6987732 to
4177803
Compare
4177803 to
3a4bda4
Compare
msbrogli
approved these changes
Jan 6, 2026
3a4bda4 to
ec30175
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1532 +/- ##
=======================================
Coverage 86.27% 86.28%
=======================================
Files 437 437
Lines 33732 33733 +1
Branches 5269 5269
=======================================
+ Hits 29103 29107 +4
+ Misses 3618 3617 -1
+ Partials 1011 1009 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
glevco
approved these changes
Jan 6, 2026
2 tasks
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
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.
Motivation
When a nano transaction fails it is marked as voided, subsequent transactions that conflict with it should be allowed in the mempool.
The changes in
./hathorin this PR have already been released in #1524 in the following commit: 3963e25Acceptance Criteria
Checklist
master, confirm this code is production-ready and can be included in future releases as soon as it gets merged