Speedy brl flow #1118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

gianfra-t wants to merge 27 commits into staging from speedy-brl-flow

apps/api/src/api/controllers/brla.controller.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -568,11 +568,12 @@ export const newKyc = async (
  
     * @throws 500 - For any server-side errors during processing

     */

    export const initiateKybLevel1 = async (

      req: Request<unknown, unknown, unknown, { subAccountId?: string }>,

      req: Request<unknown, { redirectUrl: string }, unknown, { subAccountId?: string }>,

      res: Response<KybLevel1Response | BrlaErrorResponse>

    ): Promise<void> => {

      try {

        const { subAccountId } = req.query;

        const { redirectUrl } = req.body as { redirectUrl: string };

        if (!subAccountId) {

          res.status(httpStatus.BAD_REQUEST).json({ error: "Missing subAccountId" });

    @@ -593,7 +594,7 @@ export const initiateKybLevel1 = async (
  
        }

        const brlaApiService = BrlaApiService.getInstance();

        const response = await brlaApiService.initiateKybLevel1(subAccountId);

        const response = await brlaApiService.initiateKybLevel1(subAccountId, redirectUrl);

        res.status(httpStatus.OK).json(response);

      } catch (error) {

apps/api/src/api/services/phases/handlers/brla-onramp-mint-handler.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,8 +6,8 @@ import {
  
      BrlaApiService,

      BrlaCurrency,

      checkEvmBalancePeriodically,

      FiatToken,

      getAnyFiatTokenDetailsMoonbeam,

      EvmToken,

      evmTokenConfig,

      Networks,

      RampPhase,

      waitUntilTrueWithTimeout

    @@ -28,7 +28,7 @@ import { StateMetadata } from "../meta-state-types";
  
    const PAYMENT_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes

    const EVM_BALANCE_CHECK_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes

    // Phase description: wait for the tokens to arrive at the Moonbeam ephemeral address.

    // Phase description: wait for the tokens to arrive at the Base ephemeral address.

    // If the timeout is reached, we assume the user has NOT made the payment and we cancel the ramp.

    export class BrlaOnrampMintHandler extends BasePhaseHandler {

      public getPhaseName(): RampPhase {

    @@ -106,7 +106,7 @@ export class BrlaOnrampMintHandler extends BasePhaseHandler {
  
          inputPaymentMethod: AveniaPaymentMethod.INTERNAL,

          inputThirdParty: false,

          outputCurrency: BrlaCurrency.BRLA,

          outputPaymentMethod: AveniaPaymentMethod.MOONBEAM,

          outputPaymentMethod: AveniaPaymentMethod.BASE,

          outputThirdParty: false,

          subAccountId: taxIdRecord.subAccountId

        });

    @@ -118,7 +118,7 @@ export class BrlaOnrampMintHandler extends BasePhaseHandler {
  
            quoteToken: aveniaQuote.quoteToken,

            ticketBlockchainOutput: {

              walletAddress: state.state.evmEphemeralAddress,

              walletChain: AveniaPaymentMethod.MOONBEAM

              walletChain: AveniaPaymentMethod.BASE

            }

          },

          taxIdRecord.subAccountId

    @@ -127,20 +127,24 @@ export class BrlaOnrampMintHandler extends BasePhaseHandler {
  
        const expectedAmountReceived = quote.metadata.aveniaTransfer?.outputAmountRaw;

        logger.info(

          `BrlaOnrampMintHandler: Created Avenia transfer ticket with id ${aveniaTicket.id} to transfer ${quote.metadata.aveniaTransfer.outputAmountDecimal} BRLA to Moonbeam address ${state.state.evmEphemeralAddress}`

          `BrlaOnrampMintHandler: Created Avenia transfer ticket with id ${aveniaTicket.id} to transfer ${quote.metadata.aveniaTransfer.outputAmountDecimal} BRLA to Base address ${state.state.evmEphemeralAddress}`

        );

        try {

          const pollingTimeMs = 1000;

          const tokenDetails = getAnyFiatTokenDetailsMoonbeam(FiatToken.BRL);

          const tokenDetails = evmTokenConfig[Networks.Base][EvmToken.BRLA];

          if (!tokenDetails) {

            throw new Error("BRLA token details not found for Base network");

          }

          await checkEvmBalancePeriodically(

            tokenDetails.moonbeamErc20Address,

            tokenDetails.erc20AddressSourceChain,

            evmEphemeralAddress,

            expectedAmountReceived,

            pollingTimeMs,

            EVM_BALANCE_CHECK_TIMEOUT_MS,

            Networks.Moonbeam

            Networks.Base

          );

        } catch (error) {

          if (!(error instanceof BalanceCheckError)) throw error;

    @@ -153,7 +157,7 @@ export class BrlaOnrampMintHandler extends BasePhaseHandler {
  
          throw isCheckTimeout

            ? this.createRecoverableError(`BrlaOnrampMintHandler: phase timeout reached with error: ${error}`)

            : new Error(`Error checking Moonbeam balance: ${error}`);

            : new Error(`Error checking Base balance: ${error}`);

        }

        return this.transitionToNextPhase(state, "fundEphemeral");

.../handlers/brla-payout-moonbeam-handler.ts → ...ases/handlers/brla-payout-base-handler.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,12 @@
  
    import { AveniaTicketStatus, BrlaApiService, isFiatTokenEnum, PixOutputTicketPayload, RampPhase } from "@vortexfi/shared";

    import {

      AveniaTicketStatus,

      BrlaApiService,

      EvmClientManager,

      isFiatTokenEnum,

      Networks,

      PixOutputTicketPayload,

      RampPhase

    } from "@vortexfi/shared";

    import Big from "big.js";

    import logger from "../../../../config/logger";

    import QuoteTicket from "../../../../models/quoteTicket.model";

    @@ -8,13 +16,13 @@ import { PhaseError } from "../../../errors/phase-error";
  
    import { BasePhaseHandler } from "../base-phase-handler";

    import { StateMetadata } from "../meta-state-types";

    export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {

    export class BrlaPayoutOnBasePhaseHandler extends BasePhaseHandler {

      public getPhaseName(): RampPhase {

        return "brlaPayoutOnMoonbeam";

        return "brlaPayoutOnBase";

      }

      protected async executePhase(state: RampState): Promise<RampState> {

        const { taxId, pixDestination, payOutTicketId } = state.state as StateMetadata;

        const { taxId, pixDestination, payOutTicketId, brlaPayoutTxHash } = state.state as StateMetadata;

        if (!taxId || !pixDestination) {

          throw new Error("BrlaPayoutOnMoonbeamPhaseHandler: State metadata corrupted. This is a bug.");

    @@ -37,11 +45,11 @@ export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {
  
          throw new Error("BrlaPayoutOnMoonbeamPhaseHandler: Invalid token type.");

        }

        if (!quote.metadata.pendulumToMoonbeamXcm?.outputAmountDecimal) {

          throw new Error("BrlaPayoutOnMoonbeamPhaseHandler: Missing pendulumToMoonbeamXcm metadata.");

        if (!quote.metadata.nablaSwapEvm?.outputAmountDecimal) {

          throw new Error("BrlaPayoutOnMoonbeamPhaseHandler: Missing nablaSwapEvm metadata.");

        }

        const amountForPayout = quote.metadata.pendulumToMoonbeamXcm.outputAmountDecimal;

        const amountForPayout = quote.metadata.nablaSwapEvm.outputAmountDecimal;

        const brlaApiService = BrlaApiService.getInstance();

    @@ -51,6 +59,9 @@ export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {
  
          return this.transitionToNextPhase(state, "complete");

        }

        // send the "final destination"

        await this.sendBrlaPayoutTransaction(state, brlaPayoutTxHash);

        const pollForSufficientBalance = async () => {

          const pollInterval = 5000; // 5 seconds

          const timeout = 5 * 60 * 1000; // 5 minutes

    @@ -104,7 +115,6 @@ export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {
  
            subAccountId: taxIdRecord.subAccountId

          });

          logger.debug("Debug: payOutQuote", payOutQuote);

          const payOutTicketParams: PixOutputTicketPayload = {

            quoteToken: payOutQuote.quoteToken,

            ticketBlockchainInput: {

    @@ -114,8 +124,10 @@ export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {
  
              pixKey: pixDestination

            }

          };

          console.log("payOutTicketParams: ", payOutTicketParams);

          const payOutTicketId = "mocked-ticket-id-for-now";

          const { id: payOutTicketId } = await brlaApiService.createPixOutputTicket(payOutTicketParams, taxIdRecord.subAccountId);

          //const { id: payOutTicketId } = await brlaApiService.createPixOutputTicket(payOutTicketParams, taxIdRecord.subAccountId);

          logger.debug("Debug: payOutTicketId", payOutTicketId);

          // Update the state with the transaction hashes

          await state.update({

    @@ -133,6 +145,78 @@ export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {
  
        }

      }

      private async sendBrlaPayoutTransaction(state: RampState, brlaPayoutTxHash?: `0x${string}`): Promise<void> {

        try {

          const evmClientManager = EvmClientManager.getInstance();

          const baseClient = evmClientManager.getClient(Networks.Base);

          const { txData: brlaPayoutTx } = this.getPresignedTransaction(state, "brlaPayoutOnBase");

          if (!brlaPayoutTx) {

            throw new Error("Missing presigned transaction for brlaPayoutOnBase");

          }

          let txHash: `0x${string}`;

          if (brlaPayoutTxHash) {

            // Check existing transaction status

            logger.info(

              `BrlaPayoutOnBasePhaseHandler: Found existing transaction hash ${brlaPayoutTxHash}. Waiting for receipt...`

            );

            const receipt = await baseClient.waitForTransactionReceipt({ hash: brlaPayoutTxHash });

            if (receipt.status !== "success") {

              logger.warn(

                `BrlaPayoutOnBasePhaseHandler: Existing transaction ${brlaPayoutTxHash} failed. Sending new transaction...`

              );

              txHash = (await evmClientManager.sendRawTransactionWithRetry(

                Networks.Base,

                brlaPayoutTx as `0x${string}`

              )) as `0x${string}`;

              const newReceipt = await baseClient.waitForTransactionReceipt({ hash: txHash });

              if (newReceipt.status !== "success") {

                throw new Error(`Transaction ${txHash} failed on chain`);

              }

              logger.info(`BrlaPayoutOnBasePhaseHandler: New transaction ${txHash} succeeded.`);

              await state.update({

                state: {

                  ...state.state,

                  brlaPayoutTxHash: txHash

                }

              });

            } else {

              logger.info(`BrlaPayoutOnBasePhaseHandler: Existing transaction ${brlaPayoutTxHash} succeeded.`);

            }

          } else {

            txHash = (await evmClientManager.sendRawTransactionWithRetry(

              Networks.Base,

              brlaPayoutTx as `0x${string}`

            )) as `0x${string}`;

            logger.info(`BrlaPayoutOnBasePhaseHandler: Transaction sent with hash ${txHash}. Waiting for receipt...`);

            const receipt = await baseClient.waitForTransactionReceipt({ hash: txHash });

            if (receipt.status !== "success") {

              throw new Error(`Transaction ${txHash} failed on chain`);

            }

            logger.info(`BrlaPayoutOnBasePhaseHandler: Transaction ${txHash} succeeded.`);

            // Store hash in state

            await state.update({

              state: {

                ...state.state,

                brlaPayoutTxHash: txHash

              }

            });

          }

        } catch (error) {

          logger.error("BrlaPayoutOnBasePhaseHandler: Failed to send BRLA payout transaction.", error);

          throw this.createRecoverableError("Failed to send BRLA payout transaction");

        }

      }

      protected async checkTicketStatusPaid({

        ticketId,

        subAccountId

    @@ -179,4 +263,4 @@ export class BrlaPayoutOnMoonbeamPhaseHandler extends BasePhaseHandler {
  
      }

    }

    export default new BrlaPayoutOnMoonbeamPhaseHandler();

    export default new BrlaPayoutOnBasePhaseHandler();

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Speedy brl flow #1118

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Speedy brl flow #1118

Are you sure you want to change the base?

Uh oh!

Speedy brl flow #1118

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!