Create new production release

apps/api/src/api/services/hydration/swap.ts

@@ -11,30 +11,40 @@ const CACHED_ASSET_IDS = [
 ];
 
 export class HydrationRouter {
-  private sdk: Promise<SdkCtx>;
+  private sdk?: Promise<SdkCtx>;
   private cachedXcmFees: Record<string, XcmFees>;
+  private xcmFeeRefreshInterval?: ReturnType<typeof setInterval>;
 
   constructor() {
-    const apiManager = ApiManager.getInstance();
     this.cachedXcmFees = {};
-    this.sdk = apiManager.getApi("hydration").then(async ({ api }) => {
-      return createSdkContext(api, {
-        router: { includeOnly: [PoolType.Omni, PoolType.Stable, PoolType.Aave] }
-      });
-    });
-
-    // Refresh transaction fees every hour
-    void this.refreshCachedXcmTransactionFeeToAssethub();
-    setInterval(() => this.refreshCachedXcmTransactionFeeToAssethub, 60 * 60 * 1000);
+  }
+
+  private getSdk(): Promise<SdkCtx> {
+    if (!this.sdk) {
+      const apiManager = ApiManager.getInstance();
+      this.sdk = apiManager
+        .getApi("hydration")
+        .then(async ({ api }) => {
+          return createSdkContext(api, {
+            router: { includeOnly: [PoolType.Omni, PoolType.Stable, PoolType.Aave] }
+          });
+        })
+        .catch(error => {
+          this.sdk = undefined;
+          throw error;
+        });
+    }
+
+    return this.sdk;
   }
 
   async getBestSellPriceFor(assetIn: string, assetOut: string, amountIn: string): Promise<Trade> {
-    const sdk = await this.sdk;
+    const sdk = await this.getSdk();
     return sdk.api.router.getBestSell(assetIn, assetOut, amountIn);
   }
 
   async createTransactionForTrade(trade: Trade, beneficiaryAddress: string, slippage = 0.1): Promise<SubstrateTransaction> {
-    const sdk = await this.sdk;
+    const sdk = await this.getSdk();
     const txBuilder = sdk.tx.trade(trade);
     txBuilder.withBeneficiary(beneficiaryAddress);
     txBuilder.withSlippage(slippage);
@@ -47,10 +57,25 @@ export class HydrationRouter {
       return this.cachedXcmFees[assetId];
     } else {
       await this.refreshCachedXcmTransactionFeeToAssethub();
+      this.startXcmFeeRefreshInterval();
       return this.cachedXcmFees[assetId];
     }
   }
 
+  private startXcmFeeRefreshInterval() {
+    if (!this.xcmFeeRefreshInterval) {
+      this.xcmFeeRefreshInterval = setInterval(
+        () => {
+          this.refreshCachedXcmTransactionFeeToAssethub().catch(error => {
+            const message = error instanceof Error ? error.message : String(error);
+            logger.error(`HydrationRouter: Error refreshing cached XCM transaction fees: ${message}`);
+          });
+        },
+        60 * 60 * 1000
+      );
+    }
+  }
+
   private async refreshCachedXcmTransactionFeeToAssethub() {
     logger.info("HydrationRouter: Refreshing cached XCM transaction fees..");
     const placeholderSenderAddress = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";

apps/api/src/api/services/phases/handlers/final-settlement-subsidy.ts

@@ -66,25 +66,29 @@ export class FinalSettlementSubsidyHandler extends BasePhaseHandler {
   protected async executePhase(state: RampState): Promise<RampState> {
     logger.debug(`FinalSettlementSubsidyHandler: Starting phase execution for ramp ${state.id}, type=${state.type}`);
 
-    if (state.state.isDirectTransfer === true) {
+    const quote = await QuoteTicket.findByPk(state.quoteId);
+    if (!quote) {
+      throw new Error("FinalSettlementSubsidyHandler: Quote not found for the given state");
+    }
+
+    if (
+      state.state.isDirectTransfer === true &&
+      !(state.type === RampDirection.SELL && isAlfredpayToken(quote.outputCurrency as FiatToken))
+    ) {
       logger.info(`FinalSettlementSubsidyHandler: Skipping subsidy for direct-transfer ramp ${state.id}`);
-      return this.transitionToNextPhase(state, "destinationTransfer");
+      return this.transitionToNextPhase(state, this.getNextPhase(state, quote));
     }
 
     const evmClientManager = EvmClientManager.getInstance();
     const fundingAccount = getEvmFundingAccount(Networks.Moonbeam);
 
-    const quote = await QuoteTicket.findByPk(state.quoteId);
-    if (!quote) {
-      throw new Error("FinalSettlementSubsidyHandler: Quote not found for the given state");
-    }
     logger.debug(
       `FinalSettlementSubsidyHandler: Quote found. inputCurrency=${quote.inputCurrency}, outputCurrency=${quote.outputCurrency}, network=${quote.network}`
     );
 
     if (isFiatToOwnStablecoinBaseDirect(quote.inputCurrency, quote.outputCurrency, quote.network)) {
       logger.info(`FinalSettlementSubsidyHandler: Skipping subsidy for Base direct-transfer route (ramp ${state.id})`);
-      return this.transitionToNextPhase(state, "destinationTransfer");
+      return this.transitionToNextPhase(state, this.getNextPhase(state, quote));
     }
 
     const isAlfredpaySell = state.type === RampDirection.SELL && isAlfredpayToken(quote.outputCurrency as FiatToken);

apps/api/src/api/services/phases/handlers/fund-ephemeral-handler.ts

@@ -242,7 +242,8 @@ export class FundEphemeralPhaseHandler extends BasePhaseHandler {
 
   protected nextPhaseSelector(state: RampState, quote: QuoteTicket): RampPhase {
     if (
-      state.state.isDirectTransfer === true ||
+      (state.state.isDirectTransfer === true &&
+        !(state.type === RampDirection.SELL && isAlfredpayToken(quote.outputCurrency as FiatToken))) ||
       (isOnramp(state) && isFiatToOwnStablecoinBaseDirect(quote.inputCurrency, quote.outputCurrency, quote.network))
     ) {
       return "destinationTransfer";

apps/api/src/api/services/priceFeed.service.ts

@@ -63,19 +63,6 @@ export class PriceFeedService {
 
     logger.info(`PriceFeedService initialized with CoinGecko API URL: ${this.coingeckoApiBaseUrl}`);
     logger.info(`Cache TTLs configured - Crypto: ${this.cryptoCacheTtlMs}ms, Fiat: ${this.fiatCacheTtlMs}ms`);
-
-    // Start cron job to check onchain oracle prices
-    this.checkOnchainOraclePricesUpToDate().catch(error => {
-      logger.error(`Error checking onchain oracle prices: ${error.message}`);
-    });
-    setInterval(
-      () => {
-        this.checkOnchainOraclePricesUpToDate().catch(error => {
-          logger.error(`Error checking onchain oracle prices: ${error.message}`);
-        });
-      },
-      24 * 60 * 60 * 1000
-    ); // Check every 24 hours
   }
 
   /**

apps/api/src/api/services/ramp/ramp.service.ts

@@ -10,6 +10,7 @@ import {
   AveniaPaymentMethod,
   BrlaApiService,
   BrlaCurrency,
+  CreateAlfredpayOfframpQuoteRequest,
   CreateAlfredpayOnrampRequest,
   EphemeralAccountType,
   FiatToken,
@@ -207,6 +208,7 @@ export class RampService extends BaseRampService {
         normalizedSigningAccounts,
         additionalData,
         signingAccounts,
+        transaction,
         request.userId // will be undefined if not logged in. registerRamp is optional.
       );
 
@@ -1028,8 +1030,15 @@ export class RampService extends BaseRampService {
     quote: QuoteTicket,
     normalizedSigningAccounts: AccountMeta[],
     additionalData: RegisterRampRequest["additionalData"],
+    transaction: Transaction,
     userId?: string
   ): Promise<{ unsignedTxs: UnsignedTx[]; stateMeta: Partial<StateMetadata> }> {
+    // We refresh the quote. It will be used in the transaction creation process, right after this.
+    if (isAlfredpayToken(quote.outputCurrency as FiatToken) && quote.metadata.alfredpayOfframp) {
+      const toCurrency = quote.outputCurrency as unknown as AlfredpayFiatCurrency;
+      await this.refreshAlfredpayOfframpQuoteIfMatching(quote, quote.metadata.alfredpayOfframp, toCurrency, transaction);
+    }
+
     const { unsignedTxs, stateMeta } = await prepareOfframpTransactions({
       destinationAddress: additionalData?.destinationAddress,
       email: additionalData?.email,
@@ -1177,6 +1186,7 @@ export class RampService extends BaseRampService {
     normalizedSigningAccounts: AccountMeta[],
     additionalData: RegisterRampRequest["additionalData"],
     signingAccounts: AccountMeta[],
+    transaction: Transaction,
     userId?: string
   ): Promise<{
     unsignedTxs: UnsignedTx[];
@@ -1190,7 +1200,7 @@ export class RampService extends BaseRampService {
         return this.prepareOfframpBrlTransactions(quote, normalizedSigningAccounts, additionalData);
 
       case RampTransactionPreparationKind.OfframpNonBrl:
-        return this.prepareOfframpNonBrlTransactions(quote, normalizedSigningAccounts, additionalData, userId);
+        return this.prepareOfframpNonBrlTransactions(quote, normalizedSigningAccounts, additionalData, transaction, userId);
 
       case RampTransactionPreparationKind.OnrampMykobo:
         return this.prepareMykoboOnrampTransactions(quote, normalizedSigningAccounts, additionalData, userId);
@@ -1460,6 +1470,61 @@ export class RampService extends BaseRampService {
     }
   }
 
+  private async refreshAlfredpayOfframpQuoteIfMatching(
+    quote: QuoteTicket,
+    originalAlfredpayOfframp: NonNullable<QuoteTicket["metadata"]["alfredpayOfframp"]>,
+    toCurrency: AlfredpayFiatCurrency,
+    transaction: Transaction
+  ): Promise<string> {
+    const alfredpayService = AlfredpayApiService.getInstance();
+    const originalQuoteId = originalAlfredpayOfframp.quoteId;
+
+    const freshQuote = await alfredpayService.createOfframpQuote({
+      chain: AlfredpayChain.MATIC,
+      fromAmount: originalAlfredpayOfframp.inputAmountDecimal.toString(),
+      fromCurrency: ALFREDPAY_ONCHAIN_CURRENCY,
+      metadata: { businessId: "vortex", customerId: quote.userId || "unknown" },
+      paymentMethodType: AlfredpayPaymentMethodType.BANK,
+      toCurrency
+    } satisfies CreateAlfredpayOfframpQuoteRequest);
+
+    const originalToAmount = new Big(originalAlfredpayOfframp.outputAmountDecimal as unknown as string);
+    const freshToAmount = new Big(freshQuote.toAmount);
+
+    const originalFee = new Big(originalAlfredpayOfframp.fee as unknown as string);
+    const freshFee = AlfredpayApiService.sumFeesByCurrency(freshQuote.fees, toCurrency);
+
+    if (!freshToAmount.eq(originalToAmount) || !freshFee.eq(originalFee)) {
+      throw new APIError({
+        message:
+          `[refreshAlfredpayOfframpQuote] Quote ${quote.id}: refreshed Alfredpay offramp quote drifted. ` +
+          `toAmount original=${originalToAmount.toString()} fresh=${freshToAmount.toString()}, ` +
+          `fee original=${originalFee.toString()} fresh=${freshFee.toString()}. ` +
+          "Cannot proceed with offramp order.",
+        status: httpStatus.INTERNAL_SERVER_ERROR
+      });
+    }
+
+    await quote.update(
+      {
+        metadata: {
+          ...quote.metadata,
+          alfredpayOfframp: {
+            ...originalAlfredpayOfframp,
+            expirationDate: new Date(freshQuote.expiration),
+            quoteId: freshQuote.quoteId
+          }
+        }
+      },
+      { transaction }
+    );
+
+    logger.info(
+      `[refreshAlfredpayOfframpQuote] Quote ${quote.id}: swapped Alfredpay offramp quote ${originalQuoteId} -> ${freshQuote.quoteId}.`
+    );
+    return freshQuote.quoteId;
+  }
+
   private async processAlfredpayOfframpStart(
     rampState: RampState,
     quote: QuoteTicket,

apps/api/src/index.ts

@@ -1,4 +1,4 @@
-import { ApiManager, EvmClientManager, initializeEvmTokens, setLogger } from "@vortexfi/shared";
+import { EvmClientManager, initializeEvmTokens, setLogger } from "@vortexfi/shared";
 import dotenv from "dotenv";
 import path from "path";
 import cryptoService from "./config/crypto";
@@ -57,9 +57,6 @@ const initializeApp = async () => {
     // Run database migrations
     await runMigrations();
 
-    const apiManager = ApiManager.getInstance();
-    await apiManager.populateAllApis();
-
     // Initialize EVM clients
     const _evmClientManager = EvmClientManager.getInstance();
 

apps/frontend/package.json

@@ -54,8 +54,8 @@
     "lottie-react": "^2.4.1",
     "lucide-react": "^0.562.0",
     "motion": "^12.0.3",
-    "numora": "^3.0.2",
-    "numora-react": "3.0.3",
+    "numora": "^4.0.0",
+    "numora-react": "^4.0.0",
     "qrcode.react": "^4.2.0",
     "radix-ui": "^1.4.3",
     "react": "=19.2.0",
@@ -66,6 +66,7 @@
     "stellar-sdk": "catalog:",
     "tailwind-merge": "^3.4.0",
     "tailwindcss": "^4.0.3",
+    "torph": "^0.0.9",
     "viem": "catalog:",
     "wagmi": "catalog:",
     "web3": "^4.16.0",

apps/frontend/src/components/AssetNumericInput/index.tsx

@@ -1,6 +1,5 @@
 import { EvmToken, Networks } from "@vortexfi/shared";
 import type { ChangeEvent, FC } from "react";
-import type { UseFormRegisterReturn } from "react-hook-form";
 import { cn } from "../../helpers/cn";
 import { QuoteFormValues } from "../../hooks/quote/schema";
 import { AssetButton } from "../buttons/AssetButton";
@@ -23,7 +22,7 @@ interface AssetNumericInputProps {
   tokenLoading?: boolean;
   logoURI?: string;
   fallbackLogoURI?: string;
-  registerInput: UseFormRegisterReturn<keyof QuoteFormValues>;
+  name: keyof QuoteFormValues;
   id: string;
   network?: Networks;
 }
@@ -32,7 +31,7 @@ export const AssetNumericInput: FC<AssetNumericInputProps> = ({
   assetIcon,
   tokenSymbol,
   onClick,
-  registerInput,
+  name,
   loading,
   tokenLoading,
   ...rest
@@ -62,7 +61,7 @@ export const AssetNumericInput: FC<AssetNumericInputProps> = ({
         additionalStyle={cn("text-right text-lg", rest.readOnly && "text-xl", rest.disabled && "input-disabled opacity-50")}
         loading={loading}
         maxDecimals={getMaxDecimalsForToken(tokenSymbol)}
-        register={registerInput}
+        name={name}
         {...rest}
       />
     )}