[Merged by Bors] - detect double atx-merging malfeasance #6135
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #6135 +/- ##
=======================================
Coverage 82.0% 82.0%
=======================================
Files 308 308
Lines 33844 33905 +61
=======================================
+ Hits 27761 27813 +52
- Misses 4310 4317 +7
- Partials 1773 1775 +2 ☔ View full report in Codecov by Sentry. |
mathcrypto
reviewed
Jul 16, 2024
mathcrypto
approved these changes
Jul 16, 2024
noamnelke
approved these changes
Jul 28, 2024
fasmat
reviewed
Aug 2, 2024
| @@ -62,6 +63,10 @@ func decoder(fn decoderCallback) sql.Decoder { | |||
| stmt.ColumnBytes(12, a.CommitmentATX[:]) | |||
| } | |||
| a.Weight = uint64(stmt.ColumnInt64(13)) | |||
| if stmt.ColumnType(14) != sqlite.SQLITE_NULL { | |||
| a.MarriageATX = new(types.ATXID) | |||
| stmt.ColumnBytes(14, a.MarriageATX[:]) | |||
There was a problem hiding this comment.
NIT:
Suggested change
| stmt.ColumnBytes(14, a.MarriageATX[:]) | |
| stmt.ColumnBytes(14, a.MarriageATX.Bytes()) |
There was a problem hiding this comment.
Why prefer .Bytes() over [:]?
There was a problem hiding this comment.
I guess it depends 🤷. Slicing is the idiomatic way of getting bytes from an array.
| catx.Units = make(map[types.NodeID]uint32) | ||
| if stmt.ColumnType(9) != sqlite.SQLITE_NULL { | ||
| catx.MarriageATX = new(types.ATXID) | ||
| stmt.ColumnBytes(9, catx.MarriageATX[:]) |
There was a problem hiding this comment.
Suggested change
| stmt.ColumnBytes(9, catx.MarriageATX[:]) | |
| stmt.ColumnBytes(9, catx.MarriageATX.Bytes()) |
Co-authored-by: Matthias Fasching <5011972+fasmat@users.noreply.github.com>
fasmat
approved these changes
Aug 5, 2024
|
bors merge |
|
Merge conflict. |
|
bors merge |
spacemesh-bors bot
pushed a commit
that referenced
this pull request
Aug 6, 2024
## Motivation Publishing two merged ATXs in the same epoch is forbidden, even if the sets of IDs participating in both are disjoint. For example, given a married set of IDs (A, B, C, D), it's not allowed to publish two merged ATXs, one with IDs (A, B) and the second with (C, D). The C and D can publish **separately**.
|
Pull request successfully merged into develop. Build succeeded: |
spacemesh-bors
bot
changed the title
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
Publishing two merged ATXs in the same epoch is forbidden, even if the sets of IDs participating in both are disjoint.
For example, given a married set of IDs (A, B, C, D), it's not allowed to publish two merged ATXs, one with IDs (A, B) and the second with (C, D). The C and D can publish separately.
Description
Added a
marriage_atxcolumn toatxstable to quickly identify if a given marriage_atx was already used in a given epoch (only a merged ATX references a marriage_atx).Updated the checkpoint-recovery to persist
marriage_atx.Test Plan
added tests
TODO