feat: added check to revert migration event for already created event on one chain

Author: 0xNilesh

test/integration/utss/fund_migration_test.go

@@ -201,9 +201,9 @@ func TestInitiateFundMigration(t *testing.T) {
 		_, err := app.UtssKeeper.InitiateFundMigration(ctx, oldKeyId, testChain)
 		require.NoError(t, err)
 
-		// Try again — should fail
+		// Try again — should fail (same chain already has pending migration)
 		_, err = app.UtssKeeper.InitiateFundMigration(ctx, oldKeyId, testChain)
-		require.ErrorContains(t, err, "pending migration already exists")
+		require.ErrorContains(t, err, "pending migration already exists for chain")
 	})
 }
 

x/utss/keeper/msg_initiate_fund_migration.go

@@ -58,15 +58,15 @@ func (k Keeper) InitiateFundMigration(ctx context.Context, oldKeyId, chain strin
 		return 0, fmt.Errorf("chain %s still has pending outbounds; wait for them to drain before migration", chain)
 	}
 
-	// 6. Check no existing PENDING migration for this (old_key_id, chain) combo
+	// 6. Check no existing PENDING migration for this chain
 	err = k.PendingMigrations.Walk(ctx, nil, func(migrationId uint64, _ uint64) (bool, error) {
 		m, err := k.FundMigrations.Get(ctx, migrationId)
 		if err != nil {
 			return true, err
 		}
-		if m.OldKeyId == oldKeyId && m.Chain == chain {
-			return true, fmt.Errorf("pending migration already exists for key %s on chain %s (migration_id: %d)",
-				oldKeyId, chain, migrationId)
+		if m.Chain == chain {
+			return true, fmt.Errorf("pending migration already exists for chain %s (migration_id: %d, old_key: %s)",
+				chain, migrationId, m.OldKeyId)
 		}
 		return false, nil
 	})