pendulum-chain · ebma · Jun 27, 2025 · Jun 16, 2025 · Jun 16, 2025 · Jun 17, 2025
diff --git a/apps/api/src/api/controllers/quote.controller.ts b/apps/api/src/api/controllers/quote.controller.ts
@@ -53,7 +53,7 @@ export const createQuote = async (
 
     res.status(httpStatus.CREATED).json(quote);
   } catch (error) {
-    logger.error("Error creating quote:", error);
+    logger.error(`Error creating quote: ${error instanceof Error ? error.message : String(error)}`);
     next(error);
   }
 };

diff --git a/apps/api/src/api/controllers/ramp.controller.ts b/apps/api/src/api/controllers/ramp.controller.ts
@@ -52,13 +52,12 @@ export const registerRamp = async (req: Request, res: Response<RampProcess>, nex
  * @public
  */
 export const updateRamp = async (
-  req: Request<{ rampId: string }, unknown, Omit<UpdateRampRequest, "rampId">>,
+  req: Request<unknown, unknown, UpdateRampRequest>,
   res: Response<UpdateRampResponse>,
   next: NextFunction
 ): Promise<void> => {
   try {
-    const { rampId } = req.params;
-    const { presignedTxs, additionalData } = req.body;
+    const { rampId, presignedTxs, additionalData } = req.body;
 
     // Validate required fields
     if (!rampId || !presignedTxs) {

diff --git a/apps/api/src/api/routes/v1/ramp.route.ts b/apps/api/src/api/routes/v1/ramp.route.ts
@@ -86,7 +86,7 @@ router.get("/quotes/:id", quoteController.getQuote);
 router.post("/register", rampController.registerRamp);
 
 /**
- * @api {post} v1/ramp/:rampId/update Update ramping process
+ * @api {post} v1/ramp/update Update ramping process
  * @apiDescription Update a ramping process with presigned transactions and additional data
  * @apiVersion 1.0.0
  * @apiName UpdateRamp
@@ -110,7 +110,7 @@ router.post("/register", rampController.registerRamp);
  * @apiError (Not Found 404) NotFound Ramp does not exist
  * @apiError (Conflict 409) ConflictError Ramp is not in a state that allows updates
  */
-router.post("/:rampId/update", rampController.updateRamp);
+router.post("/update", rampController.updateRamp);
 
 /**
  * @api {post} v1/ramp/start Start ramping process

diff --git a/apps/api/src/api/services/brla/brlaTeleportService.ts b/apps/api/src/api/services/brla/brlaTeleportService.ts
@@ -84,7 +84,7 @@ export class BrlaTeleportService {
       status: "claimed",
       subaccountId
     };
-    logger.info(`Requesting teleport ${compositeKey}: ${teleport}`);
+    logger.info(`Requesting teleport ${compositeKey}: ${JSON.stringify(teleport)}`);
     this.teleports.set(compositeKey, teleport);
     this.maybeStartPeriodicChecks();
   }

diff --git a/apps/api/src/api/services/nablaReads/outAmount.ts b/apps/api/src/api/services/nablaReads/outAmount.ts
@@ -1,4 +1,4 @@
-import { NABLA_ROUTER, PendulumDetails } from "@packages/shared";
+import { NABLA_ROUTER, PendulumTokenDetails } from "@packages/shared";
 import { ApiPromise } from "@polkadot/api";
 import Big from "big.js";
 import BigNumber from "big.js";
@@ -21,11 +21,11 @@ export interface TokenOutData {
 export async function getTokenOutAmount(params: {
   api: ApiPromise;
   fromAmountString: string;
-  inputTokenDetails: PendulumDetails;
-  outputTokenDetails: PendulumDetails;
+  inputTokenPendulumDetails: PendulumTokenDetails;
+  outputTokenPendulumDetails: PendulumTokenDetails;
   maximumFromAmount?: BigNumber;
 }): Promise<TokenOutData> {
-  const { api, fromAmountString, inputTokenDetails, outputTokenDetails, maximumFromAmount } = params;
+  const { api, fromAmountString, inputTokenPendulumDetails, outputTokenPendulumDetails, maximumFromAmount } = params;
 
   let amountBig: Big;
   try {
@@ -34,7 +34,7 @@ export async function getTokenOutAmount(params: {
     throw new Error("Invalid amount string provided");
   }
 
-  const fromTokenDecimals = inputTokenDetails.pendulumDecimals;
+  const fromTokenDecimals = inputTokenPendulumDetails.decimals;
   if (fromTokenDecimals === undefined) {
     throw new Error("Input token decimals not defined");
   }
@@ -48,7 +48,7 @@ export async function getTokenOutAmount(params: {
     abi: routerAbi,
     address: NABLA_ROUTER,
     api,
-    args: [amountIn, [inputTokenDetails.pendulumErc20WrapperAddress, outputTokenDetails.pendulumErc20WrapperAddress]],
+    args: [amountIn, [inputTokenPendulumDetails.erc20WrapperAddress, outputTokenPendulumDetails.erc20WrapperAddress]],
     method: "getAmountOut",
     noWalletAddressRequired: true,
     parseError: error => {
@@ -66,8 +66,8 @@ export async function getTokenOutAmount(params: {
       }
     },
     parseSuccessOutput: (data: bigint[]) => {
-      const preciseQuotedAmountOut = parseContractBalanceResponse(outputTokenDetails.pendulumDecimals, data[0]);
-      const swapFee = parseContractBalanceResponse(outputTokenDetails.pendulumDecimals, data[1]);
+      const preciseQuotedAmountOut = parseContractBalanceResponse(outputTokenPendulumDetails.decimals, data[0]);
+      const swapFee = parseContractBalanceResponse(outputTokenPendulumDetails.decimals, data[1]);
       return {
         effectiveExchangeRate: stringifyBigWithSignificantDecimals(preciseQuotedAmountOut.preciseBigDecimal.div(amountBig), 4),
         preciseQuotedAmountOut,

diff --git a/apps/api/src/api/services/phases/handlers/initial-phase-handler.ts b/apps/api/src/api/services/phases/handlers/initial-phase-handler.ts
@@ -29,7 +29,7 @@ export class InitialPhaseHandler extends BasePhaseHandler {
         throw new Error("InitialPhaseHandler: No signed transactions found. Cannot proceed.");
       } else if (state.from === "assethub" && !state.state.assetHubToPendulumHash) {
         throw new Error("InitialPhaseHandler: Missing required additional data for offramps. Cannot proceed.");
-      } else if (state.from !== "assethub" && (!state.state.squidRouterApproveHash || !state.state.squidRouterSwapHash)) {
+      } else if (state.from !== "assethub" && !state.state.squidRouterSwapHash) {
         throw new Error("InitialPhaseHandler: Missing required additional data for offramps. Cannot proceed.");
       }
     }

diff --git a/apps/api/src/api/services/phases/handlers/moonbeam-to-pendulum-handler.ts b/apps/api/src/api/services/phases/handlers/moonbeam-to-pendulum-handler.ts
@@ -51,7 +51,7 @@ export class MoonbeamToPendulumPhaseHandler extends BasePhaseHandler {
     const didInputTokenArrivedOnPendulum = async () => {
       const balanceResponse = await pendulumNode.api.query.tokens.accounts(
         pendulumEphemeralAddress,
-        inputTokenPendulumDetails.pendulumCurrencyId
+        inputTokenPendulumDetails.currencyId
       );
 
       // @ts-ignore

diff --git a/apps/api/src/api/services/phases/handlers/moonbeam-to-pendulum-xcm-handler.ts b/apps/api/src/api/services/phases/handlers/moonbeam-to-pendulum-xcm-handler.ts
@@ -25,10 +25,10 @@ export class MoonbeamToPendulumXcmPhaseHandler extends BasePhaseHandler {
       throw new Error("MoonbeamToPendulumXcmPhaseHandler: State metadata corrupted. This is a bug.");
     }
 
-    const didInputTokenArrivedOnPendulum = async () => {
+    const didInputTokenArriveOnPendulum = async () => {
       const balanceResponse = await pendulumNode.api.query.tokens.accounts(
         pendulumEphemeralAddress,
-        inputTokenPendulumDetails.pendulumCurrencyId
+        inputTokenPendulumDetails.currencyId
       );
 
       // @ts-ignore
@@ -37,7 +37,7 @@ export class MoonbeamToPendulumXcmPhaseHandler extends BasePhaseHandler {
     };
 
     try {
-      if (!(await didInputTokenArrivedOnPendulum())) {
+      if (!(await didInputTokenArriveOnPendulum())) {
         const { txData: moonbeamToPendulumXcmTransaction } = this.getPresignedTransaction(state, "moonbeamToPendulumXcm");
 
         const xcmTransaction = decodeSubmittableExtrinsic(moonbeamToPendulumXcmTransaction as string, moonbeamNode.api);
@@ -61,7 +61,7 @@ export class MoonbeamToPendulumXcmPhaseHandler extends BasePhaseHandler {
 
     try {
       logger.info("waiting for token to arrive on pendulum...");
-      await waitUntilTrue(didInputTokenArrivedOnPendulum, 5000);
+      await waitUntilTrue(didInputTokenArriveOnPendulum, 5000);
     } catch (e) {
       console.error("Error while waiting for transaction receipt:", e);
       throw new Error("MoonbeamToPendulumXcmPhaseHandler: Failed to wait for tokens to arrive on Pendulum.");

diff --git a/apps/api/src/api/services/phases/handlers/nabla-approve-handler.ts b/apps/api/src/api/services/phases/handlers/nabla-approve-handler.ts
@@ -21,7 +21,7 @@ export class NablaApprovePhaseHandler extends BasePhaseHandler {
     // Pre check: check if the approve has already been performed.
     try {
       const approval = await pendulumNode.api.query.tokenAllowance.approvals(
-        state.state.inputTokenPendulumDetails.pendulumCurrencyId,
+        state.state.inputTokenPendulumDetails.currencyId,
         state.state.pendulumEphemeralAddress,
         NABLA_ROUTER
       );

diff --git a/apps/api/src/api/services/phases/handlers/nabla-swap-handler.ts b/apps/api/src/api/services/phases/handlers/nabla-swap-handler.ts
@@ -76,7 +76,7 @@ export class NablaSwapPhaseHandler extends BasePhaseHandler {
         limits: defaultReadLimits,
         messageArguments: [
           inputAmountBeforeSwapRaw,
-          [inputTokenPendulumDetails.pendulumErc20WrapperAddress, outputTokenPendulumDetails.pendulumErc20WrapperAddress]
+          [inputTokenPendulumDetails.erc20WrapperAddress, outputTokenPendulumDetails.erc20WrapperAddress]
         ],
         messageName: "getAmountOut"
       });

diff --git a/apps/api/src/api/services/phases/handlers/pendulum-moonbeam-phase-handler.ts b/apps/api/src/api/services/phases/handlers/pendulum-moonbeam-phase-handler.ts
@@ -4,10 +4,12 @@ import {
   FiatToken,
   getAddressForFormat,
   getAnyFiatTokenDetailsMoonbeam,
+  PENDULUM_USDC_AXL,
   RampPhase
 } from "@packages/shared";
 import Big from "big.js";
 import { moonbeam } from "viem/chains";
+import logger from "../../../../config/logger";
 import RampState from "../../../../models/rampState.model";
 import { getEvmTokenBalance } from "../../moonbeam/balance";
 import { ApiManager } from "../../pendulum/apiManager";
@@ -24,8 +26,7 @@ export class PendulumToMoonbeamXCMPhaseHandler extends BasePhaseHandler {
     const apiManager = ApiManager.getInstance();
     const pendulumNode = await apiManager.getApi("pendulum");
 
-    const { pendulumEphemeralAddress, moonbeamEphemeralAddress, brlaEvmAddress, outputAmountBeforeFinalStep } =
-      state.state as StateMetadata;
+    const { pendulumEphemeralAddress, moonbeamEphemeralAddress, brlaEvmAddress, outputAmountBeforeFinalStep } = state.state;
 
     if (!pendulumEphemeralAddress) {
       throw new Error("Ephemeral address not defined in the state. This is a bug.");
@@ -37,7 +38,20 @@ export class PendulumToMoonbeamXCMPhaseHandler extends BasePhaseHandler {
       );
     }
 
-    const didInputTokenArrivedOnMoonbeam = async () => {
+    const didTokensLeavePendulum = async () => {
+      // Token is always either axlUSDC or BRL.
+      const currencyId =
+        state.type === "off"
+          ? getAnyFiatTokenDetailsMoonbeam(FiatToken.BRL).pendulumRepresentative.currencyId
+          : PENDULUM_USDC_AXL.currencyId;
+      const balanceResponse = await pendulumNode.api.query.tokens.accounts(pendulumEphemeralAddress, currencyId);
+
+      // @ts-ignore
+      const currentBalance = Big(balanceResponse?.free?.toString() ?? "0");
+      return currentBalance.lt(outputAmountBeforeFinalStep.raw);
+    };
+
+    const didTokensArriveOnMoonbeam = async () => {
       // Token is always either axlUSDC or BRL.
       const tokenAddress =
         state.type === "off" ? getAnyFiatTokenDetailsMoonbeam(FiatToken.BRL).moonbeamErc20Address : AXL_USDC_MOONBEAM;
@@ -54,7 +68,12 @@ export class PendulumToMoonbeamXCMPhaseHandler extends BasePhaseHandler {
     };
 
     try {
-      if (await didInputTokenArrivedOnMoonbeam()) {
+      // We have to check if the input token already arrived on Moonbeam and if it left Pendulum.
+      // If we'd only check if it arrived on Moonbeam, we might miss transferring them if the target account already has some tokens.
+      if ((await didTokensLeavePendulum()) && (await didTokensArriveOnMoonbeam())) {
+        logger.info(
+          `PendulumToMoonbeamPhaseHandler: Input token already arrived on Moonbeam, skipping XCM transfer for ramp ${state.id}.`
+        );
         return this.transitionToNextPhase(state, this.nextPhaseSelector(state));
       }
 
@@ -65,11 +84,17 @@ export class PendulumToMoonbeamXCMPhaseHandler extends BasePhaseHandler {
       }
 
       const xcmExtrinsic = decodeSubmittableExtrinsic(pendulumToMoonbeamTransaction, pendulumNode.api);
+      logger.info(`PendulumToMoonbeamPhaseHandler: Submitting XCM transfer to Moonbeam for ramp ${state.id}`);
       const { hash } = await submitXTokens(
         getAddressForFormat(pendulumEphemeralAddress, pendulumNode.ss58Format),
         xcmExtrinsic
       );
 
+      logger.info(
+        `PendulumToMoonbeamPhaseHandler: XCM transfer submitted with hash ${hash} for ramp ${state.id}. Waiting for the token to arrive on Moonbeam...`
+      );
+      await didTokensArriveOnMoonbeam();
+
       state.state = {
         ...state.state,
         pendulumToMoonbeamXcmHash: hash

diff --git a/apps/api/src/api/services/phases/handlers/squid-router-pay-phase-handler.ts b/apps/api/src/api/services/phases/handlers/squid-router-pay-phase-handler.ts
@@ -10,7 +10,7 @@ import RampState from "../../../../models/rampState.model";
 import { PhaseError } from "../../../errors/phase-error";
 import { createMoonbeamClientsAndConfig } from "../../moonbeam/createServices";
 import { getTokenDetailsForEvmDestination } from "../../ramp/quote.service/gross-output";
-import { createOnrampRouteParams, getRoute } from "../../transactions/squidrouter/route";
+import { createOnrampRouteParams, getRoute, getStatus } from "../../transactions/squidrouter/route";
 import { BasePhaseHandler } from "../base-phase-handler";
 
 interface AxelarScanStatusResponse {
@@ -95,7 +95,8 @@ export class SquidRouterPayPhaseHandler extends BasePhaseHandler {
    */
   private async checkStatus(state: RampState, swapHash: string): Promise<void> {
     try {
-      // const _ = await getStatus(swapHash); // Found to be unreliable. Returned "not found" for valid transactions.
+      // Found to be unreliable. We call it anyway so that squidrouter can log the status.
+      getStatus(swapHash).catch(error => logger.error(`Couldn't fetch status for ${swapHash} from squidrouter`, error.message));
 
       let isExecuted = false;
       let payTxHash: string | undefined = state.state.squidRouterPayTxHash; // in case of recovery, we may have already paid.
@@ -152,6 +153,9 @@ export class SquidRouterPayPhaseHandler extends BasePhaseHandler {
         functionName: "addNativeGas"
       });
       const { maxFeePerGas, maxPriorityFeePerGas } = await this.publicClient.estimateFeesPerGas();
+      logger.info(
+        `SquidRouterPayPhaseHandler: Funding Axelar gas service for swap hash ${swapHash} with GLMR: ${gmlrValueRaw}`
+      );
       const gasPaymentHash = await this.walletClient.sendTransaction({
         data: transactionData,
         maxFeePerGas,
@@ -187,7 +191,10 @@ export class SquidRouterPayPhaseHandler extends BasePhaseHandler {
       return (responseData as { data: unknown[] }).data[0] as AxelarScanStatusResponse;
     } catch (error) {
       if ((error as { response: unknown }).response) {
-        console.error("API error:", (error as { response: unknown }).response);
+        logger.error(
+          `SquidRouterPayPhaseHandler: Couldn't get status for ${swapHash} from AxelarScan:`,
+          (error as { response: unknown }).response
+        );
       }
       throw error;
     }
@@ -210,7 +217,7 @@ export class SquidRouterPayPhaseHandler extends BasePhaseHandler {
 
       const { route } = routeResult.data;
       const feeValue = route.transactionRequest.value;
-      console.log(`SquidRouterPayPhaseHandler: Fresh route value fetched: ${feeValue}`);
+      logger.info(`SquidRouterPayPhaseHandler: Fresh route value fetched: ${feeValue}`);
       return feeValue;
     } catch (error) {
       logger.error("SquidRouterPayPhaseHandler: Error fetching fresh route:", error);

diff --git a/apps/api/src/api/services/phases/handlers/subsidize-post-swap-handler.ts b/apps/api/src/api/services/phases/handlers/subsidize-post-swap-handler.ts
@@ -27,7 +27,7 @@ export class SubsidizePostSwapPhaseHandler extends BasePhaseHandler {
     try {
       const balanceResponse = await pendulumNode.api.query.tokens.accounts(
         pendulumEphemeralAddress,
-        outputTokenPendulumDetails.pendulumCurrencyId
+        outputTokenPendulumDetails.currencyId
       );
 
       // @ts-ignore
@@ -44,7 +44,7 @@ export class SubsidizePostSwapPhaseHandler extends BasePhaseHandler {
         );
         const fundingAccountKeypair = getFundingAccount();
         await pendulumNode.api.tx.tokens
-          .transfer(pendulumEphemeralAddress, outputTokenPendulumDetails.pendulumCurrencyId, requiredAmount.toFixed(0, 0))
+          .transfer(pendulumEphemeralAddress, outputTokenPendulumDetails.currencyId, requiredAmount.toFixed(0, 0))
           .signAndSend(fundingAccountKeypair);
       }
 

diff --git a/apps/api/src/api/services/phases/handlers/subsidize-pre-swap-handler.ts b/apps/api/src/api/services/phases/handlers/subsidize-pre-swap-handler.ts
@@ -27,7 +27,7 @@ export class SubsidizePreSwapPhaseHandler extends BasePhaseHandler {
     try {
       const balanceResponse = await pendulumNode.api.query.tokens.accounts(
         pendulumEphemeralAddress,
-        inputTokenPendulumDetails.pendulumCurrencyId
+        inputTokenPendulumDetails.currencyId
       );
 
       // @ts-ignore
@@ -45,7 +45,7 @@ export class SubsidizePreSwapPhaseHandler extends BasePhaseHandler {
         const fundingAccountKeypair = getFundingAccount();
         // TODO this and other calls, add to executeApiCall to avoid low priority errors.
         await pendulumNode.api.tx.tokens
-          .transfer(pendulumEphemeralAddress, inputTokenPendulumDetails.pendulumCurrencyId, requiredAmount.toFixed(0, 0))
+          .transfer(pendulumEphemeralAddress, inputTokenPendulumDetails.currencyId, requiredAmount.toFixed(0, 0))
           .signAndSend(fundingAccountKeypair);
       }
 

diff --git a/apps/api/src/api/services/phases/meta-state-types.ts b/apps/api/src/api/services/phases/meta-state-types.ts
@@ -1,4 +1,4 @@
-import { PendulumDetails, RampCurrency, StellarTokenDetails } from "@packages/shared";
+import { PendulumTokenDetails, RampCurrency, StellarTokenDetails } from "@packages/shared";
 import { ExtrinsicOptions } from "../transactions/nabla";
 
 export interface StateMetadata {
@@ -8,8 +8,8 @@ export interface StateMetadata {
   outputCurrency: RampCurrency;
   nablaSoftMinimumOutputRaw: string;
   pendulumEphemeralAddress: string;
-  inputTokenPendulumDetails: PendulumDetails;
-  outputTokenPendulumDetails: PendulumDetails;
+  inputTokenPendulumDetails: PendulumTokenDetails;
+  outputTokenPendulumDetails: PendulumTokenDetails;
   outputTokenType: RampCurrency;
   inputAmountBeforeSwapRaw: string;
   // The final step for onramp is the squidRouterSwap or XCM transfer, for offramps it's the anchor payout

diff --git a/apps/api/src/api/services/priceFeed.service.ts b/apps/api/src/api/services/priceFeed.service.ts
@@ -208,8 +208,8 @@ export class PriceFeedService {
       const amountOut = await getTokenOutAmount({
         api: apiInstance.api,
         fromAmountString: inputAmount,
-        inputTokenDetails: inputTokenPendulumDetails,
-        outputTokenDetails: outputTokenPendulumDetails
+        inputTokenPendulumDetails,
+        outputTokenPendulumDetails
       });
 
       const exchangeRate = parseFloat(amountOut.effectiveExchangeRate);
@@ -251,7 +251,7 @@ export class PriceFeedService {
       MATIC: "matic-network"
     };
 
-    return tokenIdMap[currency as string] || null;
+    return tokenIdMap[currency.toUpperCase()] || null;
   }
 
   // Helper method to satisfy eslint for 'this' usage