Skip to content

fix: nc-fail should not count for excluding conflicts from mempool#1532

Merged
jansegre merged 1 commit intomasterfrom
fix/conflict-with-execution-fail
Jan 6, 2026
Merged

fix: nc-fail should not count for excluding conflicts from mempool#1532
jansegre merged 1 commit intomasterfrom
fix/conflict-with-execution-fail

Conversation

@jansegre
Copy link
Member

@jansegre jansegre commented Dec 22, 2025

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 ./hathor in this PR have already been released in #1524 in the following commit: 3963e25

Acceptance Criteria

  • Only exclude conflicting transaction in mempool if the confirmed transaction is not voided.

Checklist

  • If you are requesting a merge into master, confirm this code is production-ready and can be included in future releases as soon as it gets merged

@jansegre jansegre self-assigned this Dec 22, 2025
@jansegre jansegre requested a review from msbrogli as a code owner December 22, 2025 19:34
@jansegre jansegre moved this from Todo to In Progress (WIP) in Hathor Network Dec 22, 2025
This was referenced Dec 22, 2025
@github-actions
Copy link

github-actions bot commented Dec 22, 2025

🐰 Bencher Report

Branchfix/conflict-with-execution-fail
Testbedubuntu-22.04
Click to view all benchmark results
BenchmarkLatencyBenchmark 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%)
🐰 View full continuous benchmarking report in Bencher

@jansegre jansegre force-pushed the fix/conflict-with-execution-fail branch 2 times, most recently from a7d9020 to 6987732 Compare December 22, 2025 22:03
@jansegre jansegre force-pushed the fix/conflict-with-execution-fail branch from 6987732 to 4177803 Compare January 6, 2026 16:21
@jansegre jansegre moved this from In Progress (WIP) to In Progress (Done) in Hathor Network Jan 6, 2026
@jansegre jansegre requested a review from glevco January 6, 2026 16:25
@jansegre jansegre force-pushed the fix/conflict-with-execution-fail branch from 4177803 to 3a4bda4 Compare January 6, 2026 16:26
@jansegre jansegre moved this from In Progress (Done) to In Review (WIP) in Hathor Network Jan 6, 2026
@jansegre jansegre force-pushed the fix/conflict-with-execution-fail branch from 3a4bda4 to ec30175 Compare January 6, 2026 20:42
@codecov
Copy link

codecov bot commented Jan 6, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.28%. Comparing base (b680d42) to head (ec30175).
⚠️ Report is 4 commits behind head on master.

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.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@glevco glevco removed the status in Hathor Network Jan 6, 2026
@glevco glevco moved this to In Review (Done) in Hathor Network Jan 6, 2026
@jansegre jansegre merged commit 44a8bb4 into master Jan 6, 2026
8 checks passed
@jansegre jansegre deleted the fix/conflict-with-execution-fail branch January 6, 2026 21:34
@github-project-automation github-project-automation bot moved this from In Review (Done) to Waiting to be deployed in Hathor Network Jan 6, 2026
@jansegre jansegre moved this from Waiting to be deployed to Parking Lot in Hathor Network Jan 7, 2026
@jansegre jansegre moved this from Parking Lot to Done in Hathor Network Jan 7, 2026
@jansegre jansegre mentioned this pull request Jan 14, 2026
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants