-
Notifications
You must be signed in to change notification settings - Fork 135
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: update misbehaviour handling using IBC-Go 7 #1401
Changes from 5 commits
3ce01f2
99423b0
d55d3f0
e75013c
291fbf7
a8bb748
fda0b0f
feac2ad
09a2a38
6f44e0e
30d31f9
7374355
db94dc3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -385,27 +385,55 @@ func (s *CCVTestSuite) TestCheckMisbehaviour() { | |
altSigners[clientTMValset.Validators[0].Address.String()] = clientSigners[clientTMValset.Validators[0].Address.String()] | ||
altSigners[clientTMValset.Validators[1].Address.String()] = clientSigners[clientTMValset.Validators[1].Address.String()] | ||
|
||
// create an alternative validator set using less than 1/3 of the trusted validator set | ||
altValset2 := tmtypes.NewValidatorSet(s.consumerChain.Vals.Validators[0:1]) | ||
altSigners2 := make(map[string]tmtypes.PrivValidator, 1) | ||
altSigners2[clientTMValset.Validators[0].Address.String()] = clientSigners[clientTMValset.Validators[0].Address.String()] | ||
|
||
clientHeader := s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+1), | ||
clientHeight, | ||
headerTs, | ||
clientTMValset, | ||
clientTMValset, | ||
clientTMValset, | ||
clientSigners, | ||
) | ||
|
||
// create a conflicting client header with insufficient voting power | ||
clientHeader2 := s.consumerChain.CreateTMClientHeader( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: shall we rename |
||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+1), | ||
clientHeight, | ||
// use a different block time to change the header BlockID | ||
headerTs.Add(time.Hour), | ||
altValset2, | ||
altValset2, | ||
clientTMValset, | ||
altSigners2, | ||
) | ||
|
||
testCases := []struct { | ||
name string | ||
misbehaviour *ibctmtypes.Misbehaviour | ||
expPass bool | ||
}{ | ||
{ | ||
"client state not found - shouldn't pass", | ||
"identical headers - shouldn't pass", | ||
&ibctmtypes.Misbehaviour{ | ||
ClientId: "clientID", | ||
ClientId: s.path.EndpointA.ClientID, | ||
Header1: clientHeader, | ||
Header2: clientHeader, | ||
}, | ||
false, | ||
}, | ||
{ | ||
"misbehaviour isn't for a consumer chain - shouldn't pass", | ||
&ibctmtypes.Misbehaviour{ | ||
ClientId: s.path.EndpointA.ClientID, | ||
Header1: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+1), | ||
clientHeight, | ||
headerTs, | ||
clientTMValset, | ||
clientTMValset, | ||
clientTMValset, | ||
clientSigners, | ||
), | ||
Header2: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
"aChainID", | ||
int64(clientHeight.RevisionHeight+1), | ||
clientHeight, | ||
headerTs, | ||
|
@@ -414,13 +442,15 @@ func (s *CCVTestSuite) TestCheckMisbehaviour() { | |
clientTMValset, | ||
altSigners, | ||
), | ||
Header2: clientHeader, | ||
}, | ||
false, | ||
}, | ||
{ | ||
"invalid misbehaviour with empty header1 - shouldn't pass", | ||
"client ID doesn't correspond to the client ID of consumer chain - shouldn't pass", | ||
&ibctmtypes.Misbehaviour{ | ||
Header1: &ibctmtypes.Header{}, | ||
ClientId: "clientID", | ||
Header1: clientHeader, | ||
Header2: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+1), | ||
|
@@ -438,16 +468,7 @@ func (s *CCVTestSuite) TestCheckMisbehaviour() { | |
"invalid misbehaviour with different header height - shouldn't pass", | ||
&ibctmtypes.Misbehaviour{ | ||
ClientId: s.path.EndpointA.ClientID, | ||
Header1: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+1), | ||
clientHeight, | ||
headerTs, | ||
clientTMValset, | ||
clientTMValset, | ||
clientTMValset, | ||
clientSigners, | ||
), | ||
Header1: clientHeader, | ||
Header2: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+2), | ||
|
@@ -461,30 +482,20 @@ func (s *CCVTestSuite) TestCheckMisbehaviour() { | |
}, | ||
false, | ||
}, | ||
// TODO: should pass after 1401 is merged | ||
// { | ||
// "one header of the misbehaviour has insufficient voting power - shouldn't pass", | ||
// &ibctmtypes.Misbehaviour{ | ||
// ClientId: s.path.EndpointA.ClientID, | ||
// Header1: clientHeader, | ||
// Header2: clientHeader2, | ||
// }, | ||
// false, | ||
// }, | ||
{ | ||
"one header of the misbehaviour has insufficient voting power - shouldn't pass", | ||
&ibctmtypes.Misbehaviour{ | ||
ClientId: s.path.EndpointA.ClientID, | ||
Header1: clientHeader, | ||
Header2: clientHeader2, | ||
}, | ||
false, | ||
}, | ||
{ | ||
"valid misbehaviour - should pass", | ||
&ibctmtypes.Misbehaviour{ | ||
ClientId: s.path.EndpointA.ClientID, | ||
Header1: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
int64(clientHeight.RevisionHeight+1), | ||
clientHeight, | ||
headerTs, | ||
clientTMValset, | ||
clientTMValset, | ||
clientTMValset, | ||
clientSigners, | ||
), | ||
Header1: clientHeader, | ||
// create header using a different validator set | ||
Header2: s.consumerChain.CreateTMClientHeader( | ||
s.consumerChain.ChainID, | ||
|
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 | ||
|
@@ -176,7 +176,13 @@ | |
return errorsmod.Wrapf(ibcclienttypes.ErrInvalidMisbehaviour, "invalid misbehaviour for client-id: %s", misbehaviour.ClientId) | ||
} | ||
|
||
// TODO check misb valset signatures here | ||
// VerifyClientMessage calls verifyMisbehaviour which verifies that the headers in the misbehaviour | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch! Just cherry-picked the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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 | ||
} | ||
|
||
|
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
clientHeader
because they're not used inclientHeader
?