use tmp context for ballot logic

x/crosschain/keeper/msg_server_vote_inbound_tx.go

@@ -59,8 +59,10 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 	index := msg.Digest()
 
 	// vote on inbound ballot
+	// use a temporary context to not commit any ballot state change in case of error
+	tmpCtx, commit := ctx.CacheContext()
 	finalized, isNew, err := k.zetaObserverKeeper.VoteOnInboundBallot(
-		ctx,
+		tmpCtx,
 		msg.SenderChainId,
 		msg.ReceiverChain,
 		msg.CoinType,
@@ -77,9 +79,13 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 	// This check prevents double spending
 	if isNew {
 		if k.IsFinalizedInbound(ctx, msg.InTxHash, msg.SenderChainId, msg.EventIndex) {
-			return nil, errorsmod.Wrap(types.ErrObservedTxAlreadyFinalized, fmt.Sprintf("InTxHash:%s, SenderChainID:%d, EventIndex:%d", msg.InTxHash, msg.SenderChainId, msg.EventIndex))
+			return nil, errorsmod.Wrap(
+				types.ErrObservedTxAlreadyFinalized,
+				fmt.Sprintf("InTxHash:%s, SenderChainID:%d, EventIndex:%d", msg.InTxHash, msg.SenderChainId, msg.EventIndex),
+			)
 		}
 	}
+	commit()
 
 	// If the ballot is not finalized return nil here to add vote to commit state
 	if !finalized {
@@ -181,7 +187,7 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 	}
 
 	// Receiver is not ZetaChain: Cross Chain SWAP
-	tmpCtx, commit := ctx.CacheContext()
+	tmpCtx, commit = ctx.CacheContext()
 	err = func() error {
 		err := k.PayGasAndUpdateCctx(
 			tmpCtx,

x/crosschain/keeper/msg_server_vote_inbound_tx_test.go

@@ -123,6 +123,7 @@ func TestNoDoubleEventProtections(t *testing.T) {
 	ballot, found := zk.ObserverKeeper.GetBallot(ctx, msg.Digest())
 	require.True(t, found)
 	require.Equal(t, ballot.BallotStatus, observerTypes.BallotStatus_BallotFinalized_SuccessObservation)
+
 	//Perform the SAME event. Except, this time, we resubmit the event.
 	msg2 := &types.MsgVoteOnObservedInboundTx{
 		Creator:       validatorAddr,
@@ -145,6 +146,7 @@ func TestNoDoubleEventProtections(t *testing.T) {
 		ctx,
 		msg2,
 	)
+	require.Error(t, err)
 	require.ErrorIs(t, err, types.ErrObservedTxAlreadyFinalized)
 	_, found = zk.ObserverKeeper.GetBallot(ctx, msg2.Digest())
 	require.False(t, found)

x/observer/keeper/vote_inbound.go

@@ -75,10 +75,10 @@ func (k Keeper) VoteOnInboundBallot(
 	// adds a vote and sets the ballot
 	ballot, err = k.AddVoteToBallot(ctx, ballot, voter, types.VoteType_SuccessObservation)
 	if err != nil {
-		return false, false, err
+		return false, isNew, err
 	}
 
 	// checks if the ballot is finalized
 	_, isFinalized := k.CheckIfFinalizingVote(ctx, ballot)
-	return isFinalized, false, nil
+	return isFinalized, isNew, nil
 }