Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
sainoe committed Nov 16, 2023
1 parent d458eda commit af531f3
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Add the cryptographic verification of equivocation feature to the
provider (cf. ADR-005 & ADR-013) and remove the equivocation proposal.
([\#1340](https://github.com/cosmos/interchain-security/pull/1340))
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
- Add the cryptographic verification of equivocation feature to the provider
(cf. ADR-005 & ADR-013). ([\#1340](https://github.com/cosmos/interchain-
security/pull/1340))
(cf. ADR-005 & ADR-013). ([\#1340](https://github.com/cosmos/interchain-security/pull/1340))
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
- Add the cryptographic verification of equivocation feature to the provider
(cf. ADR-005 & ADR-013). ([\#1340](https://github.com/cosmos/interchain-
security/pull/1340))
(cf. ADR-005 & ADR-013). ([\#1340](https://github.com/cosmos/interchain-security/pull/1340))
1 change: 0 additions & 1 deletion tests/e2e/steps.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ var consumerMisbehaviourSteps = concatSteps(
var consumerDoubleSignSteps = concatSteps(
// start provider and consumer chain
stepsStartChains([]string{"consu"}, false),

// make a consumer validator double sign and get jailed
stepsCauseDoubleSignOnConsumer("consu", "provi"),
)
2 changes: 1 addition & 1 deletion tests/integration/double_vote.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (s *CCVTestSuite) TestHandleConsumerDoubleVoting() {
blockID2 := testutil.MakeBlockID([]byte("blockhash2"), 1000, []byte("partshash"))

// Note that votes are signed along with the chain ID
// see VoteSignBytes in https://github.com/cometbft/cometbft/blob/main/types/vote.go#L139
// see VoteSignBytes in https://github.com/cometbft/cometbft/blob/v0.37.2/types/vote.go#L93

// create two votes using the consumer validator key
consuVote := testutil.MakeAndSignVote(
Expand Down
2 changes: 1 addition & 1 deletion x/ccv/provider/keeper/misbehaviour.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func headerToLightBlock(h ibctmtypes.Header) (*tmtypes.LightBlock, error) {
}

// 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
// a valid light client attack on a light client that tracks an ICS consumer chain
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)
Expand Down
3 changes: 2 additions & 1 deletion x/ccv/provider/types/proposal.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ func (sccp *ConsumerRemovalProposal) ValidateBasic() error {
}

// NewEquivocationProposal creates a new equivocation proposal.
// [DEPRECATED]: do not use
// [DEPRECATED]: do not use since that equivocations can be submitted
// and verified automatically on the provider.
func NewEquivocationProposal(title, description string, equivocations []*evidencetypes.Equivocation) govv1beta1.Content {
return &EquivocationProposal{
Title: title,
Expand Down
1 change: 0 additions & 1 deletion x/ccv/types/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const (
AttributeKeyAckSuccess = "success"
AttributeKeyAck = "acknowledgement"
AttributeKeyAckError = "error"
AttributeValidatorConsumerAddress = "validator_consumer_address"
AttributeInfractionHeight = "infraction_height"
AttributeConsumerHeight = "consumer_height"
AttributeTimestamp = "timestamp"
Expand Down

0 comments on commit af531f3

Please sign in to comment.