feat: update misbehaviour handling using IBC-Go 7 #1401
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,11 +83,11 @@ | |
| // construct the trusted and conflicted light blocks | ||
| lightBlock1, err := headerToLightBlock(*misbehaviour.Header1) | ||
| if err != nil { | ||
| return | ||
| } | ||
| lightBlock2, err := headerToLightBlock(*misbehaviour.Header2) | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| // Check if the misbehaviour corresponds to an Amnesia attack, | ||
|
|
@@ -97,7 +97,7 @@ | |
| // | ||
| // Note that we cannot differentiate which of the headers is trusted or malicious, | ||
| if !headersStateTransitionsAreConflicting(*lightBlock1.Header, *lightBlock2.Header) && lightBlock1.Commit.Round != lightBlock2.Commit.Round { | ||
| return | ||
| } | ||
|
|
||
| // compare the signatures of the headers | ||
|
|
@@ -153,9 +153,21 @@ | |
| } | ||
|
|
||
| // CheckMisbehaviour checks that headers in the given misbehaviour forms | ||
| // a valid light client attack from an ICS consumer chain and that the light client isn't expired | ||
| func (k Keeper) CheckMisbehaviour(ctx sdk.Context, misbehaviour ibctmtypes.Misbehaviour) error { | ||
| // check that the misbehaviour is for an ICS consumer chain | ||
| clientId, found := k.GetConsumerClientId(ctx, misbehaviour.Header1.Header.ChainID) | ||
| if !found { | ||
| return fmt.Errorf("incorrect misbehaviour with conflicting headers from a non-existent consumer chain: %s", misbehaviour.Header1.Header.ChainID) | ||
| } else if misbehaviour.ClientId != clientId { | ||
| return fmt.Errorf("incorrect misbehaviour: expected client ID for consumer chain %s is %s got %s", | ||
| misbehaviour.Header1.Header.ChainID, | ||
| clientId, | ||
| misbehaviour.ClientId, | ||
| ) | ||
| } | ||
|
|
||
| clientState, found := k.clientKeeper.GetClientState(ctx, clientId) | ||
| if !found { | ||
| return errorsmod.Wrapf(ibcclienttypes.ErrClientNotFound, "cannot check misbehaviour for client with ID %s", misbehaviour.ClientId) | ||
| } | ||
|
|
@@ -169,14 +181,19 @@ | |
| return errorsmod.Wrap(ibcclienttypes.ErrInvalidMisbehaviour, "headers are not at same height") | ||
| } | ||
|
|
||
| // CheckMisbehaviour verifies that the headers have different blockID hashes | ||
sainoe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ok := clientState.CheckForMisbehaviour(ctx, k.cdc, clientStore, &misbehaviour) | ||
| if !ok { | ||
| return errorsmod.Wrapf(ibcclienttypes.ErrInvalidMisbehaviour, "invalid misbehaviour for client-id: %s", misbehaviour.ClientId) | ||
| } | ||
|
|
||
| // VerifyClientMessage calls verifyMisbehaviour which verifies that the headers in the misbehaviour | ||
|
There was a problem hiding this comment. It doesn't seem I can comment in previous lines but we would still need to verify the There was a problem hiding this comment. Good catch! Just cherry-picked the There was a problem hiding this comment. In the previous comment where you have: you can remove the "headers have the same block height" because you do the check before as well. In this case we only call There was a problem hiding this comment. Updated in fda0b0f8461. |
||
| // are valid against their respective trusted consensus states and that at least a TrustLevel of the validator set signed their commit, | ||
| // see checkMisbehaviourHeader in ibc-go/blob/v7.3.0/modules/light-clients/07-tendermint/misbehaviour_handle.go#L126 | ||
| if err := clientState.VerifyClientMessage(ctx, k.cdc, clientStore, &misbehaviour); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: should we move those after
clientHeaderbecause they're not used inclientHeader?