[HOTFIX] Check Relay Number when Accumulating View Sync Votes #2470
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
bfish713
changed the title
jbearer
approved these changes
Jan 28, 2024
crates/types/src/vote.rs
Outdated
Comment on lines
86
to
93
| pub vote_outcomes: VoteMap2<Commitment<VOTE::Commitment>>, | ||
| /// A list of valid signatures for certificate aggregation | ||
| pub sig_lists: Vec<<TYPES::SignatureKey as SignatureKey>::PureAssembledSignatureType>, | ||
| pub sig_lists: HashMap< | ||
| Commitment<VOTE::Commitment>, | ||
| Vec<<TYPES::SignatureKey as SignatureKey>::PureAssembledSignatureType>, | ||
| >, | ||
| /// A bitvec to indicate which node is active and send out a valid signature for certificate aggregation, this automatically do uniqueness check | ||
| pub signers: BitVec, | ||
| pub signers: HashMap<Commitment<VOTE::Commitment>, BitVec>, |
There was a problem hiding this comment.
Does it make sense to combine these all into one map?
There was a problem hiding this comment.
I was debating this I think it makes sense
shenkeyao
reviewed
Jan 28, 2024
| debug!("Forwarding message"); | ||
| let result = relay_task.handle_event(event.clone()).await; | ||
|
|
||
| if result.0 == Some(HotShotTaskCompleted::ShutDown) { | ||
| // The protocol has finished | ||
| return; | ||
| } | ||
|
|
||
| map.insert(vote_view, result.1); | ||
| relay_map.insert(relay, result.1); |
There was a problem hiding this comment.
Should we also remove the vote_view from the map if the relay_map is empty? We did that in the previous code, but now it looks like we only clear the inner relay_map.
There was a problem hiding this comment.
I think if remove the whole view, we'd just end up creating it again on the next vote from this view. We still do the Garbage collection on view change to remove views from the map
shenkeyao
approved these changes
Jan 28, 2024
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.
This PR:
Keys the relay maps by relay number as well. This makes it so that relays will accumulate votes separately for each time they are the relay.
It also changes the vote accumulator to map vote commitment to the signers (sig_list and signers bitvec). This mirrors how we map vote commitment to the vote outcomes and should make it impossible to form an invalid cert by accident.
This PR does not:
No garbage collection for old relay rounds (they will be clean up when the view moves on)
Key places to review:
In view_sync.rs make sure the new mapping makes sense.
In the vote accumulator, check the new mapping as well