Move SubmitIntent VM swap PDA logic up a level

Author: jeffyanta

pkg/code/server/transaction/intent_handler.go

@@ -703,6 +703,7 @@ func (h *SendPublicPaymentIntentHandler) validateActions(
 
 			// Ensure the destination is the intent mint ATA for the client-provided owner,
 			// if provided. We'll check later if this is absolutely required.
+			var isVmSwapPda bool
 			if metadata.DestinationOwner != nil {
 				destinationOwner, err := common.NewAccountFromProto(metadata.DestinationOwner)
 				if err != nil {
@@ -717,34 +718,7 @@ func (h *SendPublicPaymentIntentHandler) validateActions(
 				if ata.PublicKey().ToBase58() != destination.PublicKey().ToBase58() {
 					return NewIntentValidationErrorf("destination is not the ata for %s", destinationOwner.PublicKey().ToBase58())
 				}
-			}
-
-			// Technically we should always enforce a fee payment, but these checks are only
-			// disabled for tests
-			if h.conf.disableBlockchainChecks.Get(ctx) {
-				return nil
-			}
-
-			// Check whether the destination account is a token account of the same mint that's
-			// been created on the blockchain. If not, a fee is likely required
-			err = validateExternalTokenAccountWithinIntent(ctx, h.data, destination, intentMint)
-			switch err {
-			case nil:
-			default:
-				if !strings.Contains(strings.ToLower(err.Error()), "doesn't exist on the blockchain") {
-					return err
-				}
-
-				if metadata.DestinationOwner == nil {
-					return NewIntentValidationError("destination owner account is required to derive ata")
-				}
 
-				destinationOwner, err := common.NewAccountFromProto(metadata.DestinationOwner)
-				if err != nil {
-					return err
-				}
-
-				var isVmSwapPda bool
 				vmSwapPdaTimelockRecord, err := h.data.GetTimelockBySwapPda(ctx, destinationOwner.PublicKey().ToBase58())
 				if err == nil {
 					isVmSwapPda = true
@@ -766,6 +740,27 @@ func (h *SendPublicPaymentIntentHandler) validateActions(
 						return NewIntentValidationError("vm swap pda is for a different mint")
 					}
 				}
+			}
+
+			// Technically we should always enforce a fee payment, but these checks are only
+			// disabled for tests
+			if h.conf.disableBlockchainChecks.Get(ctx) {
+				return nil
+			}
+
+			// Check whether the destination account is a token account of the same mint that's
+			// been created on the blockchain. If not, a fee is likely required
+			err = validateExternalTokenAccountWithinIntent(ctx, h.data, destination, intentMint)
+			switch err {
+			case nil:
+			default:
+				if !strings.Contains(strings.ToLower(err.Error()), "doesn't exist on the blockchain") {
+					return err
+				}
+
+				if metadata.DestinationOwner == nil {
+					return NewIntentValidationError("destination owner account is required to derive ata")
+				}
 
 				// Only VM swap PDAs are subsidized by server
 				if !simResult.HasAnyFeePayments() && !isVmSwapPda {