Compare signature data in misbehaviours only if path differs (#2744)

fix(statemachine)!: (06-solomachine) [#2744] Misbehaviour.ValidateBasic() now only enforces that signature data does not match when the signature paths are different.
cosmos · Nov 14, 2022 · d46f59b · d46f59b
1 parent 2dfd275
commit d46f59b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -69,6 +69,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### State Machine Breaking
 
 * (light-clients/07-tendermint) [\#2554](https://github.com/cosmos/ibc-go/pull/2554) Forbid negative values for `TrustingPeriod`, `UnbondingPeriod` and `MaxClockDrift` (as specified in ICS-07).
+* (06-solomachine) [\#2744](https://github.com/cosmos/ibc-go/pull/2744)  `Misbehaviour.ValidateBasic()` now only enforces that signature data does not match when the signature paths are different.
 
 ### Improvements
 

diff --git a/modules/light-clients/06-solomachine/misbehaviour.go b/modules/light-clients/06-solomachine/misbehaviour.go
@@ -40,13 +40,14 @@ func (misbehaviour Misbehaviour) ValidateBasic() error {
 		return sdkerrors.Wrap(err, "signature two failed basic validation")
 	}
 
-	// misbehaviour signatures cannot be identical
+	// misbehaviour signatures cannot be identical.
 	if bytes.Equal(misbehaviour.SignatureOne.Signature, misbehaviour.SignatureTwo.Signature) {
 		return sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "misbehaviour signatures cannot be equal")
 	}
 
-	// message data signed cannot be identical
-	if bytes.Equal(misbehaviour.SignatureOne.Data, misbehaviour.SignatureTwo.Data) {
+	// message data signed cannot be identical if both paths are the same.
+	if bytes.Equal(misbehaviour.SignatureOne.Path, misbehaviour.SignatureTwo.Path) &&
+		bytes.Equal(misbehaviour.SignatureOne.Data, misbehaviour.SignatureTwo.Data) {
 		return sdkerrors.Wrap(clienttypes.ErrInvalidMisbehaviour, "misbehaviour signature data must be signed over different messages")
 	}
 

diff --git a/modules/light-clients/06-solomachine/misbehaviour_test.go b/modules/light-clients/06-solomachine/misbehaviour_test.go
@@ -76,10 +76,18 @@ func (suite *SoloMachineTestSuite) TestMisbehaviourValidateBasic() {
 				false,
 			},
 			{
-				"data signed is identical",
+				"data signed is identical but path differs",
 				func(misbehaviour *solomachine.Misbehaviour) {
 					misbehaviour.SignatureTwo.Data = misbehaviour.SignatureOne.Data
 				},
+				true,
+			},
+			{
+				"data signed and path are identical",
+				func(misbehaviour *solomachine.Misbehaviour) {
+					misbehaviour.SignatureTwo.Path = misbehaviour.SignatureOne.Path
+					misbehaviour.SignatureTwo.Data = misbehaviour.SignatureOne.Data
+				},
 				false,
 			},
 			{