Merge branch 'main' into kirill/1450-hard-fork-revisions

dymensionxyz · Nov 15, 2024 · 9f4a9fe · 9f4a9fe
2 parents 81042c5 + 3e66754
commit 9f4a9fe
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 50 deletions.
diff --git a/proto/dymensionxyz/dymension/rollapp/fraud_proposal.proto b/proto/dymensionxyz/dymension/rollapp/fraud_proposal.proto
@@ -20,11 +20,11 @@ message MsgRollappFraudProposal {
 
   // RollappID is the rollapp id.
 	string rollapp_id = 2;
-  // rollapp revision. used to verify the rollapp revision is the same as the one in the fraud proposal
-  uint64 rollapp_revision = 3;
 
-  // The height of the fraudelent block
+  // The height of the fraudulent block
 	uint64 fraud_height = 4;
+  // Revision of fraudulent block
+  uint64 fraud_revision = 3;
 
   // sequencer address to punish. optional
   string punish_sequencer_address = 6;

diff --git a/x/rollapp/keeper/fraud_proposal.go b/x/rollapp/keeper/fraud_proposal.go
@@ -36,13 +36,6 @@ func (k Keeper) SubmitRollappFraud(goCtx context.Context, msg *types.MsgRollappF
 		return nil, err
 	}
 
-	// check revision number
-	if rollapp.LatestRevision().Number != msg.RollappRevision {
-		err := errorsmod.Wrap(gerrc.ErrFailedPrecondition, "revision number mismatch")
-		ctx.Logger().Error(err.Error())
-		return nil, err
-	}
-
 	// validate the rollapp is past its genesis bridge phase
 	if !rollapp.IsTransferEnabled() {
 		err := errorsmod.Wrap(gerrc.ErrFailedPrecondition, "rollapp is not past genesis bridge phase")

diff --git a/x/rollapp/types/fraud_proposal.pb.go b/x/rollapp/types/fraud_proposal.pb.go