Correctly handle VSC packet with duplicate val updates on consumer #846
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
shaspitz
requested review from
jtremback,
mpoke,
sainoe,
MSalopek,
mmulji-ic,
glnro and
yaruwangway
as code owners
glnro
approved these changes
Apr 12, 2023
x/ccv/consumer/keeper/relay.go
Outdated
Comment on lines
53
to
58
| if !exists { | ||
| pendingChanges = newChanges.ValidatorUpdates | ||
| // Still accumulate changes if no pending changes exist. New changes must be deduplicated | ||
| pendingChanges = utils.AccumulateChanges([]abci.ValidatorUpdate{}, newChanges.ValidatorUpdates) | ||
| } else { | ||
| pendingChanges = utils.AccumulateChanges(currentChanges.ValidatorUpdates, newChanges.ValidatorUpdates) | ||
| } |
There was a problem hiding this comment.
What about:
currentValUpdates := []abci.ValidatorUpdate{}
currentChanges, exists := k.GetPendingChanges(ctx)
if exists {
currentValUpdates = currentChanges.ValidatorUpdates
}
pendingChanges = utils.AccumulateChanges(currentValUpdates, newChanges.ValidatorUpdates)
sainoe
approved these changes
Apr 13, 2023
mpoke
approved these changes
Apr 13, 2023
sainoe
added a commit
that referenced
this pull request
Apr 13, 2023
) * fix dup val update consumer * gofumpt * add small refactor to OnRecvVSCPacket --------- Co-authored-by: Marius Poke <[email protected]> Co-authored-by: Simon Noetzlin <[email protected]>
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.
Description
Fixes a bug seen in the Neutron testnet where tendermint was sent duplicate val updates for the same validator, with different powers. This is a consumer side fix, and a corresponding provider side fix (involving key assignment), should be made eventually.
Linked issues
Closes:
#<issue>Type of change
If you've checked more than one of the first three boxes, consider splitting this PR into multiple PRs!
Feature: Changes and/or adds code behavior, irrelevant to bug fixesFix: Changes and/or adds code behavior, specifically to fix a bugRefactor: Changes existing code style, naming, structure, etc.Testing: Adds testingDocs: Adds documentationRegression tests
Existing tests for
OnRecvVSCPacketlikeTestOnRecvVSCPacketNew behavior tests
TestOnRecvVSCPacketDuplicateUpdates, which fails without the fix fromrelay.goVersioning Implications
If the above box is checked, which version should be bumped?
MAJOR: Consensus breaking changes to both the provider and consumers(s), including updates/breaking changes to IBC communication between provider and consumer(s)MINOR: Consensus breaking changes which affect either only the provider or only the consumer(s)PATCH: Non consensus breaking changesTargeting