Address review feedback on no-permit fallback implementation

apps/api/src/api/services/phases/handlers/squidrouter-permit-execution-handler.ts

@@ -118,7 +118,8 @@ export class SquidrouterPermitExecuteHandler extends BasePhaseHandler {
     state: RampState,
     hash: `0x${string}` | undefined,
     fromNetwork: EvmNetworks,
-    label: string
+    label: string,
+    expectedFrom?: `0x${string}`
   ): Promise<void> {
     if (!hash) {
       throw this.createRecoverableError(`${label} hash not yet reported by frontend`);
@@ -128,29 +129,37 @@ export class SquidrouterPermitExecuteHandler extends BasePhaseHandler {
     if (!receipt || receipt.status !== "success") {
       throw this.createRecoverableError(`${label} tx failed: ${hash}`);
     }
+    if (expectedFrom && receipt.from.toLowerCase() !== expectedFrom.toLowerCase()) {
+      throw this.createUnrecoverableError(`${label} tx ${hash} was sent by ${receipt.from}, expected ${expectedFrom}`);
+    }
     logger.info(`${label} tx confirmed: ${hash}`);
   }
 
   private async executeNoPermitFallback(state: RampState, fromNetwork: EvmNetworks): Promise<RampState> {
+    const expectedFrom = state.state.walletAddress as `0x${string}` | undefined;
+
     if (state.state.isDirectTransfer) {
       await this.waitForUserHash(
         state,
         state.state.squidRouterNoPermitTransferHash as `0x${string}` | undefined,
         fromNetwork,
-        "No-permit direct transfer"
+        "No-permit direct transfer",
+        expectedFrom
       );
     } else {
       await this.waitForUserHash(
         state,
         state.state.squidRouterNoPermitApproveHash as `0x${string}` | undefined,
         fromNetwork,
-        "No-permit approve"
+        "No-permit approve",
+        expectedFrom
       );
       await this.waitForUserHash(
         state,
         state.state.squidRouterNoPermitSwapHash as `0x${string}` | undefined,
         fromNetwork,
-        "No-permit swap"
+        "No-permit swap",
+        expectedFrom
       );
     }
 

apps/api/src/api/services/transactions/offramp/routes/evm-to-alfredpay.ts

@@ -22,7 +22,16 @@ import {
   UnsignedTx
 } from "@vortexfi/shared";
 import Big from "big.js";
-import { encodeAbiParameters, encodeFunctionData, keccak256, PublicClient, pad, parseAbiParameters, toHex } from "viem";
+import {
+  ContractFunctionExecutionError,
+  encodeAbiParameters,
+  encodeFunctionData,
+  keccak256,
+  PublicClient,
+  pad,
+  parseAbiParameters,
+  toHex
+} from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { MOONBEAM_EXECUTOR_PRIVATE_KEY } from "../../../../../constants/constants";
 import AlfredPayCustomer from "../../../../../models/alfredPayCustomer.model";
@@ -232,6 +241,7 @@ export async function prepareEvmToAlfredpayOfframpTransactions({
   const chainId = getNetworkId(fromNetwork)!;
 
   // Probe EIP-2612 support: tokens that don't implement nonces() (e.g. USDT on Base) revert here.
+  // Only treat contract-call failures as "no permit"; rethrow network/transport errors.
   let userNonce: bigint | null = null;
   try {
     userNonce = (await publicClient.readContract({
@@ -240,8 +250,12 @@ export async function prepareEvmToAlfredpayOfframpTransactions({
       args: [userAddress],
       functionName: "nonces"
     })) as bigint;
-  } catch {
-    userNonce = null;
+  } catch (error) {
+    if (error instanceof ContractFunctionExecutionError) {
+      userNonce = null;
+    } else {
+      throw error;
+    }
   }
   const supportsPermit = userNonce !== null;
 

apps/frontend/src/pages/progress/phaseMessages.ts

@@ -100,9 +100,17 @@ export function getMessageForPhase(ramp: RampState | undefined, t: TFunction<"tr
       assetSymbol: outputAssetSymbol
     }),
     squidRouterApprove: getSquidRouterSwapMessage(),
-    squidRouterNoPermitApprove: getSquidRouterPermitMessage(),
-    squidRouterNoPermitSwap: getSquidRouterPermitMessage(),
-    squidRouterNoPermitTransfer: getSquidRouterPermitMessage(),
+    squidRouterNoPermitApprove: t("pages.progress.squidRouterNoPermitApprove", {
+      assetSymbol: inputAssetSymbol
+    }),
+    squidRouterNoPermitSwap: t("pages.progress.squidRouterNoPermitSwap", {
+      assetSymbol: inputAssetSymbol,
+      fromNetwork: quote.from,
+      toNetwork: quote.to
+    }),
+    squidRouterNoPermitTransfer: t("pages.progress.squidRouterNoPermitTransfer", {
+      assetSymbol: inputAssetSymbol
+    }),
     squidRouterPay: getSquidRouterSwapMessage(),
     squidRouterPermitExecute: getSquidRouterPermitMessage(),
     squidRouterSwap: getSquidRouterSwapMessage(),

apps/frontend/src/translations/en.json

@@ -1185,6 +1185,9 @@
       "pendulumToAssethubXcm": "Transferring {{assetSymbol}} from Pendulum --> AssetHub",
       "pendulumToHydrationXcm": "Transferring {{assetSymbol}} from Pendulum --> Hydration",
       "pendulumToMoonbeamXcm": "Transferring {{assetSymbol}} from Pendulum --> Moonbeam",
+      "squidRouterNoPermitApprove": "Approving {{assetSymbol}} for cross-chain transfer",
+      "squidRouterNoPermitSwap": "Transferring {{assetSymbol}} from {{fromNetwork}} to {{toNetwork}}",
+      "squidRouterNoPermitTransfer": "Transferring {{assetSymbol}} to Vortex",
       "squidRouterPermitExecute": "Initializing the transfer of {{assetSymbol}} from {{fromNetwork}}",
       "squidRouterSwap": "Transferring {{assetSymbol}} from {{fromNetwork}} to {{toNetwork}}",
       "stellarPayment": "Transferring {{assetSymbol}} from Stellar --> local partner",

apps/frontend/src/translations/pt.json

@@ -1189,6 +1189,9 @@
       "pendulumToAssethubXcm": "Transferindo {{assetSymbol}} de Pendulum --> AssetHub",
       "pendulumToHydrationXcm": "Transferindo {{assetSymbol}} de Pendulum --> Hydration",
       "pendulumToMoonbeamXcm": "Transferindo {{assetSymbol}} de Pendulum --> Moonbeam",
+      "squidRouterNoPermitApprove": "Aprovando {{assetSymbol}} para transferência cross-chain",
+      "squidRouterNoPermitSwap": "Transferindo {{assetSymbol}} de {{fromNetwork}} para {{toNetwork}}",
+      "squidRouterNoPermitTransfer": "Transferindo {{assetSymbol}} para Vortex",
       "squidRouterPermitExecute": "Autorizando transferência de {{assetSymbol}} de {{fromNetwork}}",
       "squidRouterSwap": "Transferindo {{assetSymbol}} de {{fromNetwork}} para {{toNetwork}}",
       "stellarPayment": "Transferindo {{assetSymbol}} de Stellar --> parceiro local",