payment-kit 1.18.12 → 1.18.14

package/api/src/index.ts

@@ -25,6 +25,7 @@ import { startEventQueue } from './queues/event';
 import { startInvoiceQueue } from './queues/invoice';
 import { startNotificationQueue } from './queues/notification';
 import { startPaymentQueue } from './queues/payment';
+import { startPayoutQueue } from './queues/payout';
 import { startRefundQueue } from './queues/refund';
 import { startSubscriptionQueue } from './queues/subscription';
 import routes from './routes';
@@ -108,6 +109,7 @@ export const server = app.listen(port, (err?: any) => {
   startInvoiceQueue().then(() => logger.info('invoice queue started'));
   startSubscriptionQueue().then(() => logger.info('subscription queue started'));
   startEventQueue().then(() => logger.info('event queue started'));
+  startPayoutQueue().then(() => logger.info('payout queue started'));
   startCheckoutSessionQueue().then(() => logger.info('checkoutSession queue started'));
   startNotificationQueue().then(() => logger.info('notification queue started'));
   startRefundQueue().then(() => logger.info('refund queue started'));

package/api/src/integrations/stripe/resource.ts

@@ -24,6 +24,7 @@ import {
 } from '../../store/models';
 import { syncStripeInvoice } from './handlers/invoice';
 import { syncStripePayment } from './handlers/payment-intent';
+import { getLock } from '../../libs/lock';
 
 export async function ensureStripeProduct(internal: Product, method: PaymentMethod) {
   const client = method.getStripeClient();
@@ -118,16 +119,45 @@ export async function ensureStripePrice(internal: Price, method: PaymentMethod,
 
 export async function ensureStripeCustomer(internal: Customer, method: PaymentMethod) {
   const client = method.getStripeClient();
+
+  // 1. check local metadata
+  if (internal.metadata?.stripe_id) {
+    try {
+      const customer = await client.customers.retrieve(internal.metadata.stripe_id);
+      if (customer) {
+        return customer;
+      }
+    } catch (error) {
+      logger.warn('Stored Stripe customer ID not found, will recreate', {
+        customerId: internal.id,
+        stripeId: internal.metadata.stripe_id,
+      });
+    }
+  }
+
+  // 2. search customer on stripe
   const result = await client.customers.search({ query: `metadata['did']:'${internal.did}'` });
   if (result.data.length > 0) {
-    return result.data[0] as any;
+    const stripeCustomer = result.data[0];
+    if (stripeCustomer) {
+      // update local metadata
+      if (!internal.metadata?.stripe_id || internal.metadata.stripe_id !== stripeCustomer!.id) {
+        await internal.update({
+          metadata: merge(internal.metadata || {}, {
+            stripe_id: stripeCustomer!.id,
+            stripe_invoice_prefix: stripeCustomer!.invoice_prefix,
+          }),
+        });
+      }
+      return stripeCustomer;
+    }
   }
 
+  // 3. create new customer, let stripe generate invoice prefix
   const customer = await client.customers.create({
     name: internal.name,
     email: internal.email,
     phone: internal.phone,
-    invoice_prefix: internal.invoice_prefix,
     metadata: {
       appPid: env.appPid,
       id: internal.id,
@@ -135,7 +165,14 @@ export async function ensureStripeCustomer(internal: Customer, method: PaymentMe
     },
   });
 
-  await internal.update({ metadata: merge(internal.metadata || {}, { stripe_id: customer.id }) });
+  // 4. update local metadata
+  await internal.update({
+    metadata: merge(internal.metadata || {}, {
+      stripe_id: customer.id,
+      stripe_invoice_prefix: customer.invoice_prefix,
+    }),
+  });
+
   logger.info('customer created on stripe', { local: internal.id, remote: customer.id });
 
   return customer;
@@ -143,15 +180,20 @@ export async function ensureStripeCustomer(internal: Customer, method: PaymentMe
 
 export async function ensureStripePaymentCustomer(internal: any, method: PaymentMethod) {
   const client = method.getStripeClient();
-  let customer = null;
-  if (internal.payment_details?.stripe?.customer_id) {
-    customer = await client.customers.retrieve(internal.payment_details.stripe.customer_id);
-  } else {
-    const local = await Customer.findByPk(internal.customer_id);
-    customer = await ensureStripeCustomer(local as Customer, method);
+  const lock = getLock(`stripe-customer-${internal.customer_id}`);
+  await lock.acquire();
+  try {
+    let customer = null;
+    if (internal.payment_details?.stripe?.customer_id) {
+      customer = await client.customers.retrieve(internal.payment_details.stripe.customer_id);
+    } else {
+      const local = await Customer.findByPk(internal.customer_id);
+      customer = await ensureStripeCustomer(local as Customer, method);
+    }
+    return customer;
+  } finally {
+    lock.release();
   }
-
-  return customer;
 }
 
 export async function ensureStripePaymentIntent(

package/api/src/libs/auth.ts

@@ -10,6 +10,7 @@ import type { LiteralUnion } from 'type-fest';
 import type { WalletObject } from '@ocap/wallet';
 
 import env from './env';
+import logger from './logger';
 
 export const wallet: WalletObject = getWallet();
 export const ethWallet: WalletObject = getWallet('ethereum');
@@ -25,6 +26,19 @@ export const handlers = new WalletHandler({
 
 export const blocklet = new AuthService();
 
+export async function getVaultAddress() {
+  try {
+    const vault = await blocklet.getVault();
+    if (!vault) {
+      return null;
+    }
+    return vault;
+  } catch (error) {
+    logger.info('get vault wallet failed', { error });
+    return null;
+  }
+}
+
 export type CallbackArgs = {
   request: Request & { context: Record<string, any> };
   userDid: string;

package/api/src/libs/notification/template/one-time-payment-succeeded.ts

@@ -87,9 +87,6 @@ export class OneTimePaymentSucceededEmailTemplate
     const productName = await getMainProductNameByCheckoutSession(checkoutSession);
     const at: string = formatTime(checkoutSession.created_at);
 
-    const paymentInfo: string = `${fromUnitToToken(checkoutSession?.amount_total, paymentCurrency.decimal)} ${
-      paymentCurrency.symbol
-    }`;
     const hasNft: boolean = checkoutSession?.nft_mint_status === 'minted';
     const nftMintItem: NftMintItem | undefined = hasNft
       ? // @ts-expect-error
@@ -98,6 +95,11 @@ export class OneTimePaymentSucceededEmailTemplate
 
     const paymentIntent = await PaymentIntent.findByPk(checkoutSession!.payment_intent_id);
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(paymentIntent!.payment_method_id);
+
+    const paymentInfo: string = `${fromUnitToToken(checkoutSession?.amount_total, paymentCurrency.decimal)} ${
+      paymentCurrency.symbol
+    }${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
     const viewSubscriptionLink = '';

package/api/src/libs/notification/template/subscription-canceled.ts

@@ -76,9 +76,6 @@ export class SubscriptionCanceledEmailTemplate implements BaseEmailTemplate<Subs
     const locale = await getUserLocale(userDid);
     const productName = await getMainProductName(subscription.id);
     const at: string = formatTime(subscription.canceled_at * 1000);
-
-    // @ts-ignore
-    const paymentInfo: string = `${fromUnitToToken(invoice.total, invoice?.paymentCurrency?.decimal)} ${invoice?.paymentCurrency?.symbol}`;
     const currentPeriodStart: string = formatTime(invoice.period_start * 1000);
     const currentPeriodEnd: string = formatTime(invoice.period_end * 1000);
     const duration: string = prettyMsI18n(
@@ -89,6 +86,9 @@ export class SubscriptionCanceledEmailTemplate implements BaseEmailTemplate<Subs
     );
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
 
+    // @ts-ignore
+    const paymentInfo: string = `${fromUnitToToken(invoice.total, invoice?.paymentCurrency?.decimal)} ${invoice?.paymentCurrency?.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     const customerCancelRequest = subscription.cancelation_details?.reason === 'cancellation_requested';
     let cancellationReason = '';
     const { stakeEnough, stakeReturn, stakeSlash, hasStake } = await getSubscriptionStakeCancellation(

package/api/src/libs/notification/template/subscription-refund-succeeded.ts

@@ -75,9 +75,6 @@ export class SubscriptionRefundSucceededEmailTemplate
     const productName = await getMainProductName(refund.subscription_id!);
     const at: string = formatTime(refund.created_at);
 
-    const paymentInfo: string = `${fromUnitToToken(paymentIntent?.amount_received || '0', paymentCurrency.decimal)} ${paymentCurrency.symbol}`;
-    const refundInfo: string = `${fromUnitToToken(refund.amount, paymentCurrency.decimal)} ${paymentCurrency.symbol}`;
-
     let invoice = null;
     let currentPeriodStart;
     let currentPeriodEnd;
@@ -105,6 +102,10 @@ export class SubscriptionRefundSucceededEmailTemplate
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(
       refund.payment_method_id || invoice?.default_payment_method_id
     );
+
+    const paymentInfo: string = `${fromUnitToToken(paymentIntent?.amount_received || '0', paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const refundInfo: string = `${fromUnitToToken(refund.amount, paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
     const viewSubscriptionLink = getCustomerSubscriptionPageUrl({

package/api/src/libs/notification/template/subscription-renew-failed.ts

@@ -112,9 +112,6 @@ export class SubscriptionRenewFailedEmailTemplate
     const nftMintItem: NftMintItem | undefined = hasNft
       ? checkoutSession?.nft_mint_details?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]
       : undefined;
-    const paymentInfo: string = `${fromUnitToToken(invoice.amount_remaining, paymentCurrency.decimal)} ${
-      paymentCurrency.symbol
-    }`;
 
     const currentPeriodStart: string = formatTime(invoice.period_start * 1000);
     const currentPeriodEnd: string = formatTime(invoice.period_end * 1000);
@@ -124,8 +121,12 @@ export class SubscriptionRenewFailedEmailTemplate
         locale: getPrettyMsI18nLocale(locale),
       }
     );
-
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
+
+    const paymentInfo: string = `${fromUnitToToken(invoice.amount_remaining, paymentCurrency.decimal)} ${
+      paymentCurrency.symbol
+    }${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     const chainHost: string | undefined =
       paymentMethod?.settings?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]?.api_host;
     const viewSubscriptionLink = getCustomerSubscriptionPageUrl({

package/api/src/libs/notification/template/subscription-renewed.ts

@@ -102,7 +102,6 @@ export class SubscriptionRenewedEmailTemplate implements BaseEmailTemplate<Subsc
       ? checkoutSession?.nft_mint_details?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]
       : undefined;
     const amountPaid = +fromUnitToToken(invoice.total, paymentCurrency.decimal);
-    const paymentInfo: string = `${fromUnitToToken(invoice.total, paymentCurrency.decimal)} ${paymentCurrency.symbol}`;
     const currentPeriodStart: string = formatTime(invoice.period_start * 1000);
     const currentPeriodEnd: string = formatTime(invoice.period_end * 1000);
     const duration: string = prettyMsI18n(
@@ -113,6 +112,8 @@ export class SubscriptionRenewedEmailTemplate implements BaseEmailTemplate<Subsc
     );
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
+    const paymentInfo: string = `${fromUnitToToken(invoice.total, paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     const chainHost: string | undefined =
       paymentMethod?.settings?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]?.api_host;
     const viewSubscriptionLink = getCustomerSubscriptionPageUrl({

package/api/src/libs/notification/template/subscription-stake-slash-succeeded.ts

@@ -10,7 +10,6 @@ import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime } from '../../time';
 import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
-import logger from '../../logger';
 
 export interface SubscriptionStakeSlashSucceededEmailTemplateOptions {
   paymentIntentId: string;
@@ -83,9 +82,10 @@ export class SubscriptionStakeSlashSucceededEmailTemplate
     const productName = await getMainProductName(this.options.subscriptionId);
     const at: string = formatTime(paymentIntent.created_at);
 
-    const slashInfo: string = `${fromUnitToToken(paymentIntent?.amount_received || '0', paymentCurrency.decimal)} ${paymentCurrency.symbol}`;
-
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(paymentIntent.payment_method_id);
+
+    const slashInfo: string = `${fromUnitToToken(paymentIntent?.amount_received || '0', paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
     const viewSubscriptionLink = getCustomerSubscriptionPageUrl({
@@ -140,7 +140,6 @@ export class SubscriptionStakeSlashSucceededEmailTemplate
       customActions,
     } = await this.getContext();
 
-    logger.info('SubscriptionStakeSlashSucceededEmailTemplate getTemplate', { productName, at, userDid, slashInfo, viewSubscriptionLink, viewTxHashLink });
     const template: BaseEmailTemplateType = {
       title: `${translate('notification.subscriptionStakeSlashSucceeded.title', locale, {
         productName,

package/api/src/libs/notification/template/subscription-succeeded.ts

@@ -120,7 +120,6 @@ export class SubscriptionSucceededEmailTemplate
     const oneTimeProductInfo = await getOneTimeProductInfo(subscription.latest_invoice_id as string, paymentCurrency);
     const paymentAmount = await getPaymentAmountForCycleSubscription(subscription, paymentCurrency);
 
-    const paymentInfo: string = `${paymentAmount} ${paymentCurrency.symbol}`;
     const hasNft: boolean = checkoutSession?.nft_mint_status === 'minted';
     const nftMintItem: NftMintItem | undefined = hasNft
       ? checkoutSession?.nft_mint_details?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]
@@ -135,6 +134,8 @@ export class SubscriptionSucceededEmailTemplate
     );
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
+    const paymentInfo: string = `${paymentAmount} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     // @FIXME: 获取 chainHost 困难的一批?
     const chainHost: string | undefined =
       paymentMethod?.settings?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]?.api_host;

package/api/src/libs/notification/template/subscription-upgraded.ts

@@ -88,10 +88,6 @@ export class SubscriptionUpgradedEmailTemplate implements BaseEmailTemplate<Subs
     const productName = await getMainProductName(subscription.id);
     const at: string = formatTime(subscription.created_at);
 
-    const paymentInfo: string = `${fromUnitToToken(
-      paymentIntent?.amount || invoice.amount_paid,
-      paymentCurrency.decimal
-    )} ${paymentCurrency.symbol}`;
     const hasNft: boolean = checkoutSession?.nft_mint_status === 'minted';
     const nftMintItem: NftMintItem | undefined = hasNft
       ? checkoutSession?.nft_mint_details?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]
@@ -110,6 +106,12 @@ export class SubscriptionUpgradedEmailTemplate implements BaseEmailTemplate<Subs
     );
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
+
+    const paymentInfo: string = `${fromUnitToToken(
+      paymentIntent?.amount || invoice.amount_paid,
+      paymentCurrency.decimal
+    )} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
     const viewSubscriptionLink = getCustomerSubscriptionPageUrl({

package/api/src/libs/notification/template/subscription-will-canceled.ts

@@ -6,7 +6,7 @@ import type { ManipulateType } from 'dayjs';
 import dayjs from '../../dayjs';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
-import { Customer, Invoice, Subscription } from '../../../store/models';
+import { Customer, Invoice, PaymentMethod, Subscription } from '../../../store/models';
 import { PaymentCurrency } from '../../../store/models/payment-currency';
 import { getCustomerInvoicePageUrl } from '../../invoice';
 import logger from '../../logger';
@@ -82,7 +82,10 @@ export class SubscriptionWillCanceledEmailTemplate
       where: {
         id: subscription.latest_invoice_id,
       },
-      include: [{ model: PaymentCurrency, as: 'paymentCurrency' }],
+      include: [
+        { model: PaymentCurrency, as: 'paymentCurrency' },
+        { model: PaymentMethod, as: 'paymentMethod' },
+      ],
     });
     if (!invoice) {
       throw new Error(`Invoice(${subscription.latest_invoice_id}) not found`);
@@ -94,7 +97,7 @@ export class SubscriptionWillCanceledEmailTemplate
     const at: string = formatTime(cancelAt * 1000);
     const willCancelDuration: string = getSimplifyDuration((cancelAt - now) * 1000, locale);
     // @ts-ignore
-    const paymentInfo: string = `${fromUnitToToken(+invoice.total, invoice?.paymentCurrency?.decimal)} ${invoice?.paymentCurrency?.symbol}`;
+    const paymentInfo: string = `${fromUnitToToken(+invoice.total, invoice?.paymentCurrency?.decimal)} ${invoice?.paymentCurrency?.symbol}${invoice?.paymentMethod ? `(${invoice?.paymentMethod.name})` : ''}`;
 
     let body: string = translate('notification.subscriptWillCanceled.body', locale, {
       productName,

package/api/src/libs/notification/template/subscription-will-renew.ts

@@ -117,7 +117,7 @@ export class SubscriptionWillRenewEmailTemplate
     const paidType: string = isPrePaid
       ? translate('notification.common.prepaid', locale)
       : translate('notification.common.postpaid', locale);
-    const paymentInfo: string = `${paymentDetail?.price || '0'} ${paymentCurrency.symbol}`;
+    const paymentInfo: string = `${paymentDetail?.price || '0'} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
     const currentPeriodStart: string = isPrePaid
       ? formatTime(invoice.period_end * 1000)
       : formatTime(invoice.period_start * 1000);

package/api/src/libs/payment.ts

@@ -18,12 +18,14 @@ import {
   PaymentMethod,
   TCustomer,
   TLineItemExpanded,
+  Payout,
 } from '../store/models';
 import type { TPaymentCurrency } from '../store/models/payment-currency';
-import { blocklet, ethWallet, wallet } from './auth';
+import { blocklet, ethWallet, wallet, getVaultAddress } from './auth';
 import logger from './logger';
-import { getBlockletJson, getUserOrAppInfo, OCAP_PAYMENT_TX_TYPE } from './util';
+import { getBlockletJson, getUserOrAppInfo, OCAP_PAYMENT_TX_TYPE, resolveAddressChainTypes } from './util';
 import { CHARGE_SUPPORTED_CHAIN_TYPES, EVM_CHAIN_TYPES } from './constants';
+import { getTokenByAddress } from '../integrations/arcblock/stake';
 
 export interface SufficientForPaymentResult {
   sufficient: boolean;
@@ -390,3 +392,76 @@ export async function getDonationBenefits(paymentLink: PaymentLink, url?: string
   );
   return result;
 }
+
+/**
+ * 检查是否需要向冷钱包转账及可转账金额
+ * @param paymentCurrencyId
+ * @returns {Promise<{depositAmount: string, message?: string, vaultAddress?: string, paymentMethod?: PaymentMethod, paymentCurrency?: PaymentCurrency}>}
+ */
+export async function checkDepositVaultAmount(paymentCurrencyId: string): Promise<{
+  depositAmount: string;
+  message?: string;
+  vaultAddress?: string;
+  paymentCurrency?: PaymentCurrency;
+}> {
+  const paymentCurrency = await PaymentCurrency.scope('withVaultConfig').findByPk(paymentCurrencyId);
+  if (!paymentCurrency) {
+    return { depositAmount: '0', message: 'Payment currency not found' };
+  }
+
+  if (!paymentCurrency?.vault_config?.enabled) {
+    return { depositAmount: '0', message: 'Deposit vault is not enabled' };
+  }
+
+  const depositThreshold = paymentCurrency?.vault_config?.deposit_threshold;
+  if (!depositThreshold || depositThreshold === '0') {
+    return { depositAmount: '0', message: 'Deposit threshold is not set or zero' };
+  }
+
+  const paymentMethod = await PaymentMethod.findByPk(paymentCurrency.payment_method_id);
+  if (!paymentMethod) {
+    return { depositAmount: '0', message: 'Payment method not found' };
+  }
+
+  const vaultAddress = await getVaultAddress();
+  if (!vaultAddress) {
+    return { depositAmount: '0', message: 'Vault address is not found' };
+  }
+
+  const vaultChainTypes = resolveAddressChainTypes(vaultAddress);
+  if (!vaultChainTypes.includes(paymentMethod.type)) {
+    return { depositAmount: '0', message: 'Vault chain type is not supported' };
+  }
+
+  const walletAddress = paymentMethod.type === 'arcblock' ? wallet.address : ethWallet.address;
+  const balance = await getTokenByAddress(walletAddress, paymentMethod, paymentCurrency);
+
+  const depositThresholdBN = new BN(depositThreshold);
+  if (new BN(balance).lte(depositThresholdBN)) {
+    return { depositAmount: '0', message: 'No enough balance to deposit to vault' };
+  }
+
+  const balanceBN = new BN(balance);
+  let amountToDeposit = balanceBN.sub(depositThresholdBN).toString();
+
+  const { [paymentCurrency.id]: lockedAmount } = await Payout.getPayoutLockedAmount({
+    currency_id: paymentCurrency.id,
+  });
+
+  // check if the amount to payout is already greater than the deposit threshold
+  if (new BN(lockedAmount).add(depositThresholdBN).gte(balanceBN)) {
+    return { depositAmount: '0', message: 'Amount to payout is already greater than the deposit threshold' };
+  }
+
+  amountToDeposit = new BN(amountToDeposit).sub(new BN(lockedAmount)).toString();
+
+  if (new BN(amountToDeposit).lte(new BN(0))) {
+    return { depositAmount: '0', message: 'No amount available to deposit after calculations' };
+  }
+
+  return {
+    depositAmount: amountToDeposit,
+    vaultAddress,
+    paymentCurrency,
+  };
+}

package/api/src/libs/util.ts

@@ -9,6 +9,7 @@ import type { LiteralUnion } from 'type-fest';
 import { joinURL, withQuery, withTrailingSlash } from 'ufo';
 
 import axios from 'axios';
+import { ethers } from 'ethers';
 import dayjs from './dayjs';
 import { blocklet, wallet } from './auth';
 import type { PaymentMethod, Subscription } from '../store/models';
@@ -508,3 +509,10 @@ export async function isUserInBlocklist(did: string, paymentMethod: PaymentMetho
     return false; // Default to allowing payment on error
   }
 }
+
+export function resolveAddressChainTypes(address: string): LiteralUnion<'ethereum' | 'base' | 'arcblock', string>[] {
+  if (ethers.isAddress(address)) {
+    return ['ethereum', 'base', 'arcblock'];
+  }
+  return ['arcblock'];
+}

package/api/src/queues/payment.ts

@@ -9,7 +9,7 @@ import dayjs from '../libs/dayjs';
 import CustomError from '../libs/error';
 import { events } from '../libs/event';
 import logger from '../libs/logger';
-import { getGasPayerExtra, isDelegationSufficientForPayment } from '../libs/payment';
+import { getGasPayerExtra, isDelegationSufficientForPayment, checkDepositVaultAmount } from '../libs/payment';
 import {
   checkRemainingStake,
   getDaysUntilCancel,
@@ -47,6 +47,10 @@ type PaymentJob = {
   retryOnError?: boolean;
 };
 
+type DepositVaultJob = {
+  currencyId: string;
+};
+
 async function updateQuantitySold(checkoutSession: CheckoutSession) {
   const updatePromises = checkoutSession.line_items.map((item) => {
     const priceId = item.upsell_price_id || item.price_id;
@@ -62,6 +66,46 @@ async function updateQuantitySold(checkoutSession: CheckoutSession) {
   await Promise.all(updatePromises);
 }
 
+const handleDepositVault = async (paymentCurrencyId: string) => {
+  const { depositAmount, message, vaultAddress, paymentCurrency } = await checkDepositVaultAmount(paymentCurrencyId);
+  if (depositAmount === '0') {
+    logger.info(`Deposit vault skipped: ${message}`, { currencyId: paymentCurrencyId });
+    return;
+  }
+  const payout = await Payout.create({
+    livemode: paymentCurrency!.livemode,
+    automatic: true,
+    description: 'Deposit vault',
+    amount: depositAmount,
+    destination: vaultAddress!,
+    payment_method_id: paymentCurrency!.payment_method_id,
+    currency_id: paymentCurrency!.id,
+    customer_id: '',
+    payment_intent_id: '',
+    status: 'pending',
+    attempt_count: 0,
+    attempted: false,
+    next_attempt: 0,
+    last_attempt_error: null,
+    metadata: {
+      system: true,
+    },
+  });
+  logger.info('Deposit vault payout created', { payoutId: payout.id });
+};
+
+export const depositVaultQueue = createQueue<DepositVaultJob>({
+  name: 'deposit-vault',
+  onJob: async (job) => {
+    await handleDepositVault(job.currencyId);
+  },
+  options: {
+    concurrency: 1,
+    maxRetries: 3,
+    enableScheduledJob: true,
+  },
+});
+
 export const handlePaymentSucceed = async (
   paymentIntent: PaymentIntent,
   triggerRenew: boolean = true,
@@ -128,6 +172,11 @@ export const handlePaymentSucceed = async (
       );
   }
 
+  depositVaultQueue.push({
+    id: `deposit-vault-${paymentIntent.currency_id}`,
+    job: { currencyId: paymentIntent.currency_id },
+  });
+
   let invoice;
   if (paymentIntent.invoice_id) {
     invoice = await Invoice.findByPk(paymentIntent.invoice_id);