v2.2: include existing zero lamport in duplicates (backport of #6158) #6160
Conversation
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
(cherry picked from commit a1f90ac)
brooksprumo
approved these changes
May 8, 2025
t-nelson
approved these changes
May 8, 2025
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v2.2 #6160 +/- ##
=======================================
Coverage 83.4% 83.4%
=======================================
Files 806 806
Lines 373245 373245
=======================================
+ Hits 311361 311379 +18
+ Misses 61884 61866 -18 🚀 New features to boost your workflow:
|
roryharr
reviewed
May 8, 2025
| InsertNewEntryResults::ExistedNewEntryZeroLamports => {} | ||
| InsertNewEntryResults::ExistedNewEntryNonZeroLamports(other_slot) => { | ||
| InsertNewEntryResults::ExistedNewEntryZeroLamports(other_slot) | ||
| | InsertNewEntryResults::ExistedNewEntryNonZeroLamports(other_slot) => { |
There was a problem hiding this comment.
Do these need to be differentiated anymore?
There was a problem hiding this comment.
Looks like ExistedNewEntryZeroLamports vs ExistedNewEntryNonZeroLamports are handled identically in all uses now, aren't they?
There was a problem hiding this comment.
Yes, they are.
We can refactor them in master with a future PR. For a backport PR, we would like to exclude refactoring changes.
nibty
pushed a commit
to x1-labs/tachyon
that referenced
this pull request
Jun 11, 2025
…yz#6158) (anza-xyz#6160) include existing zero lamport in duplicates (anza-xyz#6158) (cherry picked from commit a1f90ac) Co-authored-by: HaoranYi <219428+HaoranYi@users.noreply.github.com>
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.
Problem
Include exising zero accounts in
duplicateslist so that lthash get the correct set of accounts to mixout when verifying at startup.Summary of Changes
Fixes #6153
This is an automatic backport of pull request #6158 done by [Mergify](https://mergify.com).