Merge pull request #35 from initia-labs/bug/can-delete-finalized-output

delete output proposal bug

x/ophost/keeper/output.go

@@ -22,6 +22,16 @@ func (k Keeper) GetOutputProposal(ctx context.Context, bridgeId, outputIndex uin
 }
 
 func (k Keeper) DeleteOutputProposal(ctx context.Context, bridgeId, outputIndex uint64) error {
+	output, err := k.GetOutputProposal(ctx, bridgeId, outputIndex)
+	if err != nil {
+		return err
+	}
+	if isFinalized, err := k.isFinalized(ctx, bridgeId, output); err != nil {
+		return err
+	} else if isFinalized {
+		return types.ErrAlreadyFinalized
+	}
+
 	return k.OutputProposals.Remove(ctx, collections.Join(bridgeId, outputIndex))
 }
 
@@ -35,6 +45,10 @@ func (k Keeper) IsFinalized(ctx context.Context, bridgeId, outputIndex uint64) (
 		return false, err
 	}
 
+	return k.isFinalized(ctx, bridgeId, output)
+}
+
+func (k Keeper) isFinalized(ctx context.Context, bridgeId uint64, output types.Output) (bool, error) {
 	bridgeConfig, err := k.GetBridgeConfig(ctx, bridgeId)
 	if err != nil {
 		return false, err

x/ophost/keeper/output_test.go

@@ -130,3 +130,33 @@ func Test_NextOutputIndex(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, uint64(101), index)
 }
+
+func Test_DeleteOutputProposal(t *testing.T) {
+	ctx, input := createDefaultTestInput(t)
+
+	output := types.Output{
+		OutputRoot:    []byte{1, 2, 3},
+		L1BlockTime:   ctx.BlockTime(),
+		L2BlockNumber: 100,
+	}
+	err := input.OPHostKeeper.SetOutputProposal(ctx, 1, 1, output)
+	require.NoError(t, err)
+
+	err = input.OPHostKeeper.SetBridgeConfig(ctx, 1, types.BridgeConfig{
+		Challenger:          "",
+		Proposer:            "",
+		SubmissionInterval:  time.Second * 10,
+		FinalizationPeriod:  time.Second * 10,
+		SubmissionStartTime: ctx.BlockTime(),
+		Metadata:            nil,
+	})
+	require.NoError(t, err)
+
+	// delete should fail due to already finalized error
+	err = input.OPHostKeeper.DeleteOutputProposal(ctx.WithBlockTime(ctx.BlockTime().Add(time.Second*11)), 1, 1)
+	require.ErrorIs(t, err, types.ErrAlreadyFinalized)
+
+	// delete should success
+	err = input.OPHostKeeper.DeleteOutputProposal(ctx.WithBlockTime(ctx.BlockTime().Add(time.Second*9)), 1, 1)
+	require.NoError(t, err)
+}

x/ophost/types/error.go

@@ -13,6 +13,7 @@ var (
 	ErrInvalidSequence            = errorsmod.Register(ModuleName, 6, "invalid sequence")
 	ErrInvalidL2BlockNumber       = errorsmod.Register(ModuleName, 7, "invalid l2 block number")
 	ErrNotFinalized               = errorsmod.Register(ModuleName, 8, "output has not finalized")
-	ErrFailedToVerifyWithdrawal   = errorsmod.Register(ModuleName, 9, "failed to verify withdrawal tx")
-	ErrWithdrawalAlreadyFinalized = errorsmod.Register(ModuleName, 10, "withdrawal already finalized")
+	ErrAlreadyFinalized           = errorsmod.Register(ModuleName, 9, "output has already finalized")
+	ErrFailedToVerifyWithdrawal   = errorsmod.Register(ModuleName, 10, "failed to verify withdrawal tx")
+	ErrWithdrawalAlreadyFinalized = errorsmod.Register(ModuleName, 11, "withdrawal already finalized")
 )