payment-kit 1.19.7 → 1.19.9

package/api/src/index.ts

@@ -10,6 +10,7 @@ import express, { ErrorRequestHandler } from 'express';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { xss } from '@blocklet/xss';
 import { csrf } from '@blocklet/sdk/lib/middlewares';
+import { CustomError, formatError, getStatusFromError } from '@blocklet/error';
 
 import crons from './crons/index';
 import { ensureStakedForGas } from './integrations/arcblock/stake';
@@ -94,18 +95,22 @@ if (isProduction) {
   const staticDir = path.resolve(process.env.BLOCKLET_APP_DIR!, 'dist');
   app.use(express.static(staticDir, { maxAge: '30d', index: false }));
   app.use(fallback('index.html', { root: staticDir }));
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  app.use(<ErrorRequestHandler>((err, req, res, _next) => {
-    logger.error(err);
-    if (req.accepts('json')) {
-      res.status(500).send({ error: err.message });
-    } else {
-      res.status(500).send('Something broke!');
-    }
-  }));
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+app.use(<ErrorRequestHandler>((err, req, res, _next) => {
+  logger.error(err);
+  if (err instanceof CustomError) {
+    res.status(getStatusFromError(err)).json({ error: formatError(err) });
+    return;
+  }
+  if (req.accepts('json')) {
+    res.status(500).send({ error: err.message });
+  } else {
+    res.status(500).send('Something broke!');
+  }
+}));
+
 const port = parseInt(process.env.BLOCKLET_PORT!, 10);
 
 export const server = app.listen(port, (err?: any) => {

package/api/src/libs/notification/index.ts

@@ -1,7 +1,7 @@
 import { Notification as BlockletNotification } from '@blocklet/sdk';
 
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './template/base';
-import { CheckoutSession, Invoice, Subscription } from '../../store/models';
+import { CheckoutSession, CreditGrant, Invoice, Meter, MeterEvent, Subscription } from '../../store/models';
 import { getNotificationSettings, shouldSendSystemNotification } from '../setting';
 import logger from '../logger';
 import { events } from '../event';
@@ -86,6 +86,33 @@ export class Notification {
       }
     }
 
+    if (options.creditGrantId) {
+      const creditGrant = await CreditGrant.findByPk(options.creditGrantId);
+      if (creditGrant) {
+        const meter = await Meter.findOne({
+          where: {
+            currency_id: creditGrant.currency_id,
+            status: 'active',
+          },
+        });
+        if (meter) {
+          return { meter, id: meter.id };
+        }
+      }
+    }
+    if (options.meterEventName) {
+      const meterEvent = await MeterEvent.findOne({
+        where: {
+          event_name: options.meterEventName,
+        },
+      });
+      if (meterEvent) {
+        const meter = await Meter.getMeterByEventName(meterEvent.event_name);
+        if (meter) {
+          return { meter, id: meter.id };
+        }
+      }
+    }
     return null;
   }
 }

package/api/src/libs/payment.ts

@@ -59,6 +59,7 @@ export async function checkTokenBalance(args: {
   paymentCurrency: TPaymentCurrency;
   userDid: string;
   amount: string;
+  skipUserCheck?: boolean;
 }): Promise<SufficientForPaymentResult> {
   const { paymentMethod, paymentCurrency, userDid, amount } = args;
   const tokenAddress = paymentCurrency.contract as string;
@@ -66,8 +67,20 @@ export async function checkTokenBalance(args: {
 
   if (paymentMethod.type === 'arcblock') {
     // get user wallet did
-    const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    const delegator = getWalletDid(user);
+    let delegator = userDid;
+    if (!args.skipUserCheck) {
+      const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
+      if (!user) {
+        return {
+          sufficient: false,
+          reason: 'NO_CUSTOMER',
+          requestedAmount: totalAmount.toString(),
+        };
+      }
+      if (user) {
+        delegator = getWalletDid(user);
+      }
+    }
     if (!delegator) {
       return {
         sufficient: false,
@@ -226,10 +239,13 @@ export async function isDelegationSufficientForPayment(args: {
 
     // Regular token handling for non-credit currencies
     // user have bond wallet did?
+    let delegator = userDid;
     const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    const delegator = getWalletDid(user);
-    if (!delegator) {
-      return { sufficient: false, reason: 'NO_DID_WALLET' };
+    if (user) {
+      delegator = getWalletDid(user);
+      if (!delegator) {
+        return { sufficient: false, reason: 'NO_DID_WALLET' };
+      }
     }
 
     const client = paymentMethod.getOcapClient();

package/api/src/libs/setting.ts

@@ -1,5 +1,5 @@
 import { Op } from 'sequelize';
-import { CheckoutSession, Invoice, Setting, Subscription } from '../store/models';
+import { CheckoutSession, Invoice, Meter, Setting, Subscription } from '../store/models';
 import type { EventType, NotificationSetting } from '../store/models/types';
 import logger from './logger';
 
@@ -121,15 +121,29 @@ export async function getNotificationSettingFromInvoice(invoice: Invoice): Promi
   return null;
 }
 
+export async function getNotificationSettingFromMeter(meter: Meter): Promise<NotificationSetting | null> {
+  if (!meter) {
+    return null;
+  }
+  const settingId = getSettingIdFromObject(meter);
+  if (settingId) {
+    const settings = await getSettingForNotification(settingId);
+    return settings || null;
+  }
+  return null;
+}
+
 export type NotificationSettingsProps = {
   subscription?: Subscription;
   invoice?: Invoice;
   checkoutSession?: CheckoutSession;
+  meter?: Meter;
 };
 export async function getNotificationSettings({
   subscription,
   invoice,
   checkoutSession,
+  meter,
 }: NotificationSettingsProps): Promise<NotificationSetting | null> {
   if (subscription) {
     const settings = await getNotificationSettingFromSubscription(subscription);
@@ -146,6 +160,11 @@ export async function getNotificationSettings({
     return settings || null;
   }
 
+  if (meter) {
+    const settings = await getNotificationSettingFromMeter(meter);
+    return settings || null;
+  }
+
   return null;
 }
 

package/api/src/locales/zh.ts

@@ -229,7 +229,7 @@ export default flat({
     },
 
     creditGrantGranted: {
-      title: '恭喜！您的额度授予已激活',
+      title: '恭喜！您的额度已激活',
       body: '您已获得 {grantedAmount} 的额度授予，激活时间为 {at}，有效期至 {expiresAt}。祝您使用愉快！',
       bodyNoExpire: '您已获得 {grantedAmount} 的额度授予，激活时间为 {at}。祝您使用愉快！',
       grantedCredit: '授予额度',
@@ -238,8 +238,8 @@ export default flat({
     },
 
     creditGrantLowBalance: {
-      title: '额度授予余额不足提醒',
-      body: '您的额度授予余额已低于 10%，当前剩余额度为 {availableAmount}。请及时充值或联系管理员以避免服务受限。',
+      title: '额度余额不足提醒',
+      body: '您的额度已低于 10%，当前剩余额度为 {availableAmount}。请及时充值或联系管理员以避免服务受限。',
       totalGrantedCredit: '总授予额度',
     },
   },

package/api/src/routes/checkout-sessions.ts

@@ -13,6 +13,7 @@ import sortBy from 'lodash/sortBy';
 import uniq from 'lodash/uniq';
 import type { WhereOptions } from 'sequelize';
 
+import { CustomError, formatError, getStatusFromError } from '@blocklet/error';
 import { MetadataSchema } from '../libs/api';
 import { checkPassportForPaymentLink } from '../integrations/blocklet/passport';
 import dayjs from '../libs/dayjs';
@@ -418,7 +419,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
   // TODO: need to support stake subscription
   if (raw.enable_subscription_grouping === true && !raw.subscription_data?.no_stake) {
-    throw new Error('Subscription grouping is only supported for stake-free subscriptions');
+    throw new CustomError(400, 'Subscription grouping is only supported for stake-free subscriptions');
   }
 
   if (payload.include_free_trial && raw.subscription_data) {
@@ -428,7 +429,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
   if (raw.subscription_data?.service_actions) {
     const { error } = SubscriptionDataSchema.validate(raw.subscription_data);
     if (error) {
-      throw new Error('Invalid service actions for checkout session');
+      throw new CustomError(400, 'Invalid service actions for checkout session');
     }
   }
 
@@ -438,7 +439,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
   if (raw.nft_mint_settings?.enabled) {
     if (!raw.nft_mint_settings?.factory) {
-      throw new Error('factory is required when nft mint is enabled');
+      throw new CustomError(400, 'factory is required when nft mint is enabled');
     }
   }
 
@@ -457,20 +458,20 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
 
   const items = await Price.expand(raw.line_items as any[]);
   if (items.some((x) => !x.price)) {
-    throw new Error('Invalid line items for checkout session, some price may have been deleted');
+    throw new CustomError(400, 'Invalid line items for checkout session, some price may have been deleted');
   }
   if (items.some((x) => !x.price.active)) {
-    throw new Error('Invalid line items for checkout session, some price may have been archived');
+    throw new CustomError(400, 'Invalid line items for checkout session, some price may have been archived');
   }
   const enableSubscriptionGrouping = payload.enable_subscription_grouping;
   for (let i = 0; i < items.length; i++) {
     const result = isLineItemAligned(items, i);
     if (result.currency === false) {
-      throw new Error('line_items should have same currency');
+      throw new CustomError(400, 'line_items should have same currency');
     }
     // if subscription grouping is not enabled, we need to check the recurring
     if (result.recurring === false && !enableSubscriptionGrouping) {
-      throw new Error('line_items should have same recurring');
+      throw new CustomError(400, 'line_items should have same recurring');
     }
   }
 
@@ -790,6 +791,10 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
     raw.created_via = 'portal';
     raw.submit_type = link.submit_type;
     raw.currency_id = link.currency_id || req.currency.id;
+    if (!raw.currency_id) {
+      res.status(400).json({ error: 'Currency not found in payment link' });
+      return;
+    }
     raw.payment_link_id = link.id;
 
     // Inherit multi-subscription settings from payment link
@@ -927,7 +932,11 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
     });
   } catch (err) {
     logger.error(err);
-    res.status(500).json({ error: err.message });
+    if (err instanceof CustomError) {
+      res.status(getStatusFromError(err)).json({ error: formatError(err) });
+    } else {
+      res.status(500).json({ error: err.message });
+    }
   }
 }
 
@@ -2043,7 +2052,13 @@ router.put('/:id/amount', ensureCheckoutSessionOpen, async (req, res) => {
     // validate amount on donation settings
     if (checkoutSession.payment_link_id) {
       const link = await PaymentLink.findByPk(checkoutSession.payment_link_id);
+      if (!checkoutSession.currency_id) {
+        return res.status(400).json({ error: 'Currency not found in checkout session' });
+      }
       const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
+      if (!currency) {
+        return res.status(404).json({ error: 'Currency not found' });
+      }
       if (link?.donation_settings?.amount && currency) {
         const input = Number(fromUnitToToken(amount, currency.decimal));
         const { minimum, maximum, presets, custom } = link.donation_settings.amount;
@@ -2088,10 +2103,13 @@ router.put('/:id/amount', ensureCheckoutSessionOpen, async (req, res) => {
     // recalculate amount
     await checkoutSession.update(await getCheckoutSessionAmounts(checkoutSession));
 
-    res.json({ ...checkoutSession.toJSON(), line_items: await Price.expand(newItems) });
+    return res.json({ ...checkoutSession.toJSON(), line_items: await Price.expand(newItems) });
   } catch (err) {
     logger.error(err);
-    res.status(500).json({ error: err.message });
+    if (err instanceof CustomError) {
+      return res.status(getStatusFromError(err)).json({ error: formatError(err) });
+    }
+    return res.status(500).json({ error: err.message });
   }
 });
 

package/api/src/routes/connect/setup.ts

@@ -32,11 +32,9 @@ export default {
   },
   onConnect: async (args: CallbackArgs) => {
     const { userDid, userPk, extraParams } = args;
-    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
-    const { paymentMethod, paymentCurrency, checkoutSession, subscription, customer } = await ensureSetupIntent(
-      checkoutSessionId,
-      connectedDid || sessionUserDid || userDid
-    );
+    const { checkoutSessionId } = extraParams;
+    const { paymentMethod, paymentCurrency, checkoutSession, subscription, customer } =
+      await ensureSetupIntent(checkoutSessionId);
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
     }
@@ -121,9 +119,9 @@ export default {
   },
   onAuth: async (args: CallbackArgs) => {
     const { request, userDid, userPk, claims, extraParams, updateSession, step } = args;
-    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
+    const { checkoutSessionId } = extraParams;
     const { setupIntent, checkoutSession, paymentMethod, subscription, invoice, paymentCurrency, customer } =
-      await ensureSetupIntent(checkoutSessionId, connectedDid || sessionUserDid || userDid);
+      await ensureSetupIntent(checkoutSessionId);
 
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');

package/api/src/routes/connect/shared.ts

@@ -13,14 +13,14 @@ import { encodeApproveItx } from '../../integrations/ethereum/token';
 import { blocklet, ethWallet, wallet } from '../../libs/auth';
 import logger from '../../libs/logger';
 import { getGasPayerExtra, getTokenLimitsForDelegation } from '../../libs/payment';
-import { 
-  getCheckoutAmount, 
-  getCheckoutSessionSubscriptionIds, 
-  getFastCheckoutAmount, 
-  getStatementDescriptor, 
-  getSubscriptionCreateSetup, 
+import {
+  getCheckoutAmount,
+  getCheckoutSessionSubscriptionIds,
+  getFastCheckoutAmount,
+  getStatementDescriptor,
+  getSubscriptionCreateSetup,
   isDonationCheckoutSession,
-  getSubscriptionLineItems
+  getSubscriptionLineItems,
 } from '../../libs/session';
 import {
   expandSubscriptionItems,
@@ -68,7 +68,11 @@ export async function ensureCheckoutSession(checkoutSessionId: string) {
   return checkoutSession;
 }
 
-export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: string, skipCustomer?: boolean): Promise<Result> {
+export async function ensurePaymentIntent(
+  checkoutSessionId: string,
+  userDid?: string,
+  skipCustomer?: boolean
+): Promise<Result> {
   const checkoutSession = await ensureCheckoutSession(checkoutSessionId);
 
   let paymentCurrencyId;
@@ -100,11 +104,8 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
   let primarySubscription: Subscription | null = null;
   if (subscriptionIds.length > 0) {
     // @ts-ignore
-    subscriptions = await Promise.all(
-      subscriptionIds.filter(Boolean) 
-        .map(id => Subscription.findByPk(id))
-    );
-    
+    subscriptions = await Promise.all(subscriptionIds.filter(Boolean).map((id) => Subscription.findByPk(id)));
+
     subscriptions = subscriptions.filter(Boolean);
     for (const subscription of subscriptions) {
       if (subscription && subscription.status !== 'incomplete') {
@@ -119,81 +120,69 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
     }
   }
   let customer = null;
-  
+
   if (!skipCustomer) {
-  // 检查是否为打赏场景
-  const isDonation = isDonationCheckoutSession(checkoutSession);  
-  
-  // if donation, create customer if not exists
-  if (isDonation && !checkoutSession.customer_id && userDid) {
-    customer = await Customer.findByPkOrDid(userDid);
-    if (!customer) {
-      const { user } = await blocklet.getUser(userDid);
-      if (user) {
-        customer = await Customer.create({
-          did: userDid,
-          email: user.email,
-          name: user.fullName || userDid,
-          description: user.remark,
-          metadata: { fromDonation: true },
-          livemode: checkoutSession.livemode,
-          phone: user.phone,
-          address: Customer.formatAddressFromUser(user),
-          delinquent: false,
-          balance: '0',
-          next_invoice_sequence: 1,
-          invoice_prefix: Customer.getInvoicePrefix(),
-        });
-        logger.info('Customer created for donation', { userDid, customerId: customer.id });
-      } else {
-        customer = await Customer.create({
-          did: userDid,
-          email: '',
-          name: 'anonymous',
-          description: 'Anonymous customer',
-          metadata: { fromDonation: true, anonymous: true },
-          livemode: checkoutSession.livemode,
-          phone:'',
-          delinquent: false,
-          balance: '0',
-          next_invoice_sequence: 1,
-          invoice_prefix: Customer.getInvoicePrefix(),
-        });
+    // 检查是否为打赏场景
+    const isDonation = isDonationCheckoutSession(checkoutSession);
+
+    // if donation, create customer if not exists
+    if (isDonation && !checkoutSession.customer_id && userDid) {
+      customer = await Customer.findByPkOrDid(userDid);
+      if (!customer) {
+        const { user } = await blocklet.getUser(userDid);
+        if (user) {
+          customer = await Customer.create({
+            did: userDid,
+            email: user.email,
+            name: user.fullName || userDid,
+            description: user.remark,
+            metadata: { fromDonation: true },
+            livemode: checkoutSession.livemode,
+            phone: user.phone,
+            address: Customer.formatAddressFromUser(user),
+            delinquent: false,
+            balance: '0',
+            next_invoice_sequence: 1,
+            invoice_prefix: Customer.getInvoicePrefix(),
+          });
+          logger.info('Customer created for donation', { userDid, customerId: customer.id });
+        } else {
+          customer = await Customer.create({
+            did: userDid,
+            email: '',
+            name: 'anonymous',
+            description: 'Anonymous customer',
+            metadata: { fromDonation: true, anonymous: true },
+            livemode: checkoutSession.livemode,
+            phone: '',
+            delinquent: false,
+            balance: '0',
+            next_invoice_sequence: 1,
+            invoice_prefix: Customer.getInvoicePrefix(),
+          });
+        }
       }
-    }
-    
-    if (customer) {
-      await checkoutSession.update({ customer_id: customer.id, customer_did: customer.did });
-      if (paymentIntent) {
-        await paymentIntent.update({ customer_id: customer.id });
+
+      if (customer) {
+        await checkoutSession.update({ customer_id: customer.id, customer_did: customer.did });
+        if (paymentIntent) {
+          await paymentIntent.update({ customer_id: customer.id });
+        }
+        logger.info('Customer associated with donation', {
+          userDid,
+          customerId: customer.id,
+          checkoutSessionId: checkoutSession.id,
+          paymentIntentId: paymentIntent?.id,
+        });
       }
-      logger.info('Customer associated with donation', { 
-        userDid, 
-        customerId: customer.id,
-        checkoutSessionId: checkoutSession.id,
-        paymentIntentId: paymentIntent?.id
-      });
-    }
-  } else {
-    // 非打赏场景或已有客户ID的情况
-    customer = await Customer.findByPk(checkoutSession.customer_id);
-  }
-  if (!customer) {
-    throw new Error('Customer not found');
-  }
-  
-  if (userDid && !isDonation) {
-    const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    if (!user) {
-      throw new Error('Seems you have not connected to this app before');
+    } else {
+      // 非打赏场景或已有客户ID的情况
+      customer = await Customer.findByPk(checkoutSession.customer_id);
     }
-
-    if (customer.did !== user.did) {
-      throw new Error('This is not your payment intent');
+    if (!customer) {
+      throw new Error('Customer not found');
     }
   }
-  }
-
 
   const [paymentMethod, paymentCurrency] = await Promise.all([
     PaymentMethod.findByPk(paymentMethodId),
@@ -223,7 +212,7 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
   };
 }
 
-export async function ensureSetupIntent(checkoutSessionId: string, userDid?: string) {
+export async function ensureSetupIntent(checkoutSessionId: string) {
   const checkoutSession = await ensureCheckoutSession(checkoutSessionId);
 
   if (!checkoutSession.setup_intent_id) {
@@ -256,16 +245,6 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
   if (!customer) {
     throw new Error('Customer not found for checkoutSession');
   }
-  if (userDid) {
-    const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
-    if (!user) {
-      throw new Error('Seems you have not connected to this app before');
-    }
-
-    if (customer.did !== user.did) {
-      throw new Error('This is not your setupIntent');
-    }
-  }
 
   const [paymentMethod, paymentCurrency] = await Promise.all([
     PaymentMethod.findByPk(subscription.default_payment_method_id),
@@ -344,8 +323,13 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
 export async function ensureSubscriptionDelegation(subscriptionId: string) {
   const subscription = (await Subscription.findOne({
     where: { id: subscriptionId },
-    include: [{ model: PaymentCurrency, as: 'paymentCurrency' }, { model: PaymentMethod, as: 'paymentMethod' }],
-  })) as (Subscription & { paymentCurrency: PaymentCurrency; paymentMethod: PaymentMethod; items?: TLineItemExpanded[] }) | null;
+    include: [
+      { model: PaymentCurrency, as: 'paymentCurrency' },
+      { model: PaymentMethod, as: 'paymentMethod' },
+    ],
+  })) as
+    | (Subscription & { paymentCurrency: PaymentCurrency; paymentMethod: PaymentMethod; items?: TLineItemExpanded[] })
+    | null;
   if (!subscription) {
     throw new Error('Subscription not found');
   }
@@ -380,7 +364,6 @@ export async function ensureInvoiceForCheckout({
   subscriptions,
   lineItems,
 }: Args): Promise<{ invoice: Invoice | null; items: InvoiceItem[] }> {
-
   const isGroupInvoice = subscriptions && subscriptions.length > 1;
   // invoices are optional when checkout session is in payment mode
   if (checkoutSession.mode === 'payment' && !checkoutSession.invoice_creation?.enabled) {
@@ -426,9 +409,7 @@ export async function ensureInvoiceForCheckout({
         client.invoices
           .voidInvoice(invoice.metadata.stripe_id)
           .then(() => {
-            logger.info(
-              `Invoice marked void on stripe for checkout session ${checkoutSession.id}: ${existingInvoice}`
-            );
+            logger.info(`Invoice marked void on stripe for checkout session ${checkoutSession.id}: ${existingInvoice}`);
           })
           .catch((err) => {
             logger.error(
@@ -441,16 +422,16 @@ export async function ensureInvoiceForCheckout({
   }
 
   const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
-  
+
   const metadata = {
     ...(checkoutSession.invoice_creation?.invoice_data?.metadata || {}),
   };
-  
+
   if (isGroupInvoice) {
-    metadata.subscription_ids = subscriptions.map(sub => sub.id);
+    metadata.subscription_ids = subscriptions.map((sub) => sub.id);
     metadata.is_group_invoice = true;
   }
-  
+
   const trialInDays = Number(checkoutSession.subscription_data?.trial_period_days || 0);
   const trialEnd = Number(checkoutSession.subscription_data?.trial_end || 0);
   const now = dayjs().unix();
@@ -507,14 +488,13 @@ export async function ensureInvoiceForCheckout({
   return { invoice, items };
 }
 
-
 export async function ensureInvoicesForSubscriptions({
   checkoutSession,
   customer,
   subscriptions,
   invoiceProps,
-}: Omit<Args, 'subscription'> & { subscriptions: Subscription[]; invoiceProps?: Partial<TInvoice> }): Promise<{ 
-  invoices: Invoice[]; 
+}: Omit<Args, 'subscription'> & { subscriptions: Subscription[]; invoiceProps?: Partial<TInvoice> }): Promise<{
+  invoices: Invoice[];
 }> {
   if (!subscriptions?.length) {
     logger.warn('No subscriptions provided for invoice creation');
@@ -523,15 +503,16 @@ export async function ensureInvoicesForSubscriptions({
 
   const lineItems = await Price.expand(checkoutSession.line_items, { product: true });
 
-  const primarySubscription = (subscriptions.find((x) => x.metadata.is_primary_subscription) || subscriptions[0]) as Subscription;
+  const primarySubscription = (subscriptions.find((x) => x.metadata.is_primary_subscription) ||
+    subscriptions[0]) as Subscription;
   const invoices = await Promise.all(
     subscriptions.map(async (subscription) => {
       const subItems = await getSubscriptionLineItems(subscription, lineItems, primarySubscription);
-      const { invoice } = await ensureInvoiceForCheckout({ 
-        checkoutSession, 
-        customer, 
-        subscription, 
-        subscriptions, 
+      const { invoice } = await ensureInvoiceForCheckout({
+        checkoutSession,
+        customer,
+        subscription,
+        subscriptions,
         lineItems: subItems,
         props: invoiceProps,
       });
@@ -540,10 +521,10 @@ export async function ensureInvoicesForSubscriptions({
   );
 
   const createdInvoices = invoices.filter(Boolean);
-  
+
   logger.info(`Created ${createdInvoices.length} invoices for subscriptions`, {
     checkoutSessionId: checkoutSession.id,
-    invoiceIds: createdInvoices.map(inv => inv?.id)
+    invoiceIds: createdInvoices.map((inv) => inv?.id),
   });
 
   return { invoices: createdInvoices as Invoice[] };
@@ -625,7 +606,7 @@ export async function ensureSubscriptionRecharge(subscriptionId: string) {
     paymentMethod: paymentMethod as PaymentMethod,
     receiverAddress,
     subscription,
-    customer
+    customer,
   };
 }
 
@@ -715,7 +696,7 @@ export async function getDelegationTxClaim({
     billingThreshold,
     paymentMethod,
     paymentCurrency,
-    requiredStake
+    requiredStake,
   });
   if (mode === 'delegation') {
     tokenRequirements = [];
@@ -788,7 +769,11 @@ export async function getDelegationTxClaim({
   throw new Error(`getDelegationTxClaim: Payment method ${paymentMethod.type} not supported`);
 }
 
-export function getStakeAmount(subscription: Subscription, paymentCurrency: PaymentCurrency, items: TLineItemExpanded[]) {
+export function getStakeAmount(
+  subscription: Subscription,
+  paymentCurrency: PaymentCurrency,
+  items: TLineItemExpanded[]
+) {
   const billingThreshold = Number(subscription.billing_thresholds?.amount_gte || 0);
   const minStakeAmount = Number(subscription.billing_thresholds?.stake_gte || 0);
   const threshold = fromTokenToUnit(Math.max(billingThreshold, minStakeAmount), paymentCurrency.decimal);
@@ -816,29 +801,29 @@ export async function getStakeTxClaim({
 }) {
   let billingThreshold = Number(subscription.billing_thresholds?.amount_gte || 0);
   let minStakeAmount = Number(subscription.billing_thresholds?.stake_gte || 0);
-  
+
   const hasGrouping = subscriptions && subscriptions.length > 1;
   if (hasGrouping) {
-    const primarySubscription = subscriptions[0] as Subscription; 
+    const primarySubscription = subscriptions[0] as Subscription;
     // use the settings of the primary subscription, not the scattered staking
     billingThreshold = Number(primarySubscription.billing_thresholds?.amount_gte || 0);
     minStakeAmount = Number(primarySubscription.billing_thresholds?.stake_gte || 0);
-    
+
     logger.info('Using primary subscription for staking', {
       primarySubscriptionId: primarySubscription.id,
       billingThreshold,
       minStakeAmount,
-      allSubscriptionIds: subscriptions.map(s => s.id)
+      allSubscriptionIds: subscriptions.map((s) => s.id),
     });
   }
-  
+
   const threshold = fromTokenToUnit(Math.max(billingThreshold, minStakeAmount), paymentCurrency.decimal);
   const staking = getSubscriptionStakeSetup(items, paymentCurrency.id, threshold.toString());
   const amount = staking.licensed.add(staking.metered).toString();
-  
+
   logger.info('getStakeTxClaim', {
     subscriptionId: subscription.id,
-    allSubscriptions: subscriptions?.map(s => s.id) || [],
+    allSubscriptions: subscriptions?.map((s) => s.id) || [],
     billingThreshold,
     minStakeAmount,
     threshold: threshold.toString(),
@@ -849,11 +834,9 @@ export async function getStakeTxClaim({
   if (paymentMethod.type === 'arcblock') {
     // create staking data
     const client = paymentMethod.getOcapClient();
-    
-    const stakeId = hasGrouping 
-      ? `stake-group-${subscription.id}` 
-      : subscription.id;
-      
+
+    const stakeId = hasGrouping ? `stake-group-${subscription.id}` : subscription.id;
+
     const address = await getCustomerStakeAddress(userDid, stakeId);
     const { state } = await client.getStakeState({ address });
     const data = {
@@ -862,10 +845,12 @@ export async function getStakeTxClaim({
         {
           appId: wallet.address,
           subscriptionId: subscription.id,
-          ...(hasGrouping ? {
-            subscriptionGroup: true,
-            subscriptionIds: subscriptions.map(s => s.id)
-          } : {})
+          ...(hasGrouping
+            ? {
+                subscriptionGroup: true,
+                subscriptionIds: subscriptions.map((s) => s.id),
+              }
+            : {}),
         },
         JSON.parse(state?.data?.value || '{}')
       ),
@@ -902,11 +887,13 @@ export async function getStakeTxClaim({
       meta: {
         purpose: 'staking',
         address,
-        ...(hasGrouping ? {
-          subscriptionGroup: true,
-          primarySubscriptionId: subscription.id,
-          allSubscriptionIds: subscriptions.map(s => s.id)
-        } : {})
+        ...(hasGrouping
+          ? {
+              subscriptionGroup: true,
+              primarySubscriptionId: subscription.id,
+              allSubscriptionIds: subscriptions.map((s) => s.id),
+            }
+          : {}),
       },
       chainInfo: {
         host: paymentMethod.settings?.arcblock?.api_host as string,
@@ -1015,7 +1002,7 @@ export async function getTokenRequirements({
   paymentCurrency,
   trialing = false,
   billingThreshold = 0,
-  requiredStake
+  requiredStake,
 }: TokenRequirementArgs) {
   const tokenRequirements = [];
   let amount = getFastCheckoutAmount(items, mode, paymentCurrency.id, !!trialing);
@@ -1197,7 +1184,7 @@ export async function ensureReStakeContext(subscriptionId: string) {
   };
 }
 export async function ensureSubscriptionForCollectBatch(
-  subscriptionId?: string, 
+  subscriptionId?: string,
   currencyId?: string,
   customerId?: string
 ) {
@@ -1258,13 +1245,13 @@ export async function ensureSubscriptionForOverdraftProtection(subscriptionId: s
   if (!subscription) {
     throw new Error(`Subscription ${subscriptionId} not found when prepare SubGuard`);
   }
-    // @ts-ignore
+  // @ts-ignore
   subscription.items = await expandSubscriptionItems(subscription.id);
   const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
   if (!paymentCurrency) {
     throw new Error(`PaymentCurrency ${subscription.currency_id} not found when prepare SubGuard`);
   }
-  
+
   const paymentMethod = await PaymentMethod.findByPk(paymentCurrency.payment_method_id);
 
   if (!paymentMethod) {
@@ -1288,7 +1275,6 @@ export async function ensureSubscriptionForOverdraftProtection(subscriptionId: s
   };
 }
 
-
 async function executeSingleTransaction(
   client: any,
   claim: any,
@@ -1323,13 +1309,12 @@ export async function executeOcapTransactions(
 ) {
   const client = paymentMethod.getOcapClient();
   logger.info('start executeOcapTransactions', { userDid, claims });
-  
-  const delegation = claims.find(x => x.type === 'signature' && x.meta?.purpose === 'delegation');
-  const staking = claims.find(x => x.type === 'prepareTx' && x.meta?.purpose === 'staking');
-  
-  const stakingAmount = staking?.requirement?.tokens?.find(
-    (x: any) => x?.address === paymentCurrencyContract
-  )?.value || '0';
+
+  const delegation = claims.find((x) => x.type === 'signature' && x.meta?.purpose === 'delegation');
+  const staking = claims.find((x) => x.type === 'prepareTx' && x.meta?.purpose === 'staking');
+
+  const stakingAmount =
+    staking?.requirement?.tokens?.find((x: any) => x?.address === paymentCurrencyContract)?.value || '0';
 
   try {
     const getHeaders = (index: number): Record<string, string> => {
@@ -1341,17 +1326,17 @@ export async function executeOcapTransactions(
         const req = requestSource[headerIndex];
         return req ? client.pickGasPayerHeaders(req) : {};
       }
-      
+
       if (requestSource && typeof requestSource === 'object') {
         return client.pickGasPayerHeaders(requestSource);
       }
-      
+
       return {};
     };
 
     const transactions = [
       { claim: delegation, type: 'Delegate' },
-      { claim: staking, type: 'Stake' }
+      { claim: staking, type: 'Stake' },
     ];
 
     const txHashes = [];
@@ -1377,7 +1362,7 @@ export async function executeOcapTransactions(
       type: 'delegate',
       staking: {
         tx_hash: stakingTxHash,
-        address:  await getCustomerStakeAddress(userDid, nonce || subscriptionId || ''),
+        address: await getCustomerStakeAddress(userDid, nonce || subscriptionId || ''),
       },
       stakingAmount,
     };
@@ -1413,7 +1398,7 @@ export async function updateStripeSubscriptionAfterChangePayment(setupIntent: Se
     const toMethod = await PaymentMethod.findByPk(toMethodId);
     if (toMethod?.type === 'stripe') {
       // resume stripe
-      const client =  toMethod?.getStripeClient();
+      const client = toMethod?.getStripeClient();
       const stripeSubscriptionId = subscription.payment_details?.stripe?.subscription_id as string;
       if (client && stripeSubscriptionId) {
         const stripeSubscription = await client.subscriptions.retrieve(stripeSubscriptionId);
@@ -1443,7 +1428,7 @@ export async function returnStakeForCanceledSubscription(subscriptionId: string)
     if (subscription.status !== 'canceled') {
       throw new Error(`Subscription ${subscriptionId} is not canceled`);
     }
-  
+
     if (!subscription.payment_details?.arcblock?.staking?.tx_hash) {
       throw new Error(`No staking transaction found in subscription ${subscriptionId}`);
     }
@@ -1455,4 +1440,4 @@ export async function returnStakeForCanceledSubscription(subscriptionId: string)
   } catch (err) {
     logger.error('returnStakeForCanceledSubscription failed', { error: err, subscriptionId });
   }
-}
+}

package/api/src/routes/connect/subscribe.ts

@@ -233,6 +233,7 @@ export default {
       paymentCurrency,
       userDid,
       amount: fastCheckoutAmount,
+      skipUserCheck: true,
     });
 
     if (tokenBalanceCheck.sufficient === false) {

package/api/src/routes/meters.ts

@@ -151,6 +151,7 @@ router.put('/:id', auth, async (req, res) => {
 
     const updateData: any = {
       ...pick(req.body, ['name', 'description', 'status']),
+      unit: req.body.unit || meter.unit,
       updated_by: req.user?.did,
     };
 

package/api/src/routes/payment-currencies.ts

@@ -306,6 +306,8 @@ const updateCurrencySchema = Joi.object({
   name: Joi.string().empty('').max(32).optional(),
   description: Joi.string().empty('').max(255).optional(),
   logo: Joi.string().empty('').optional(),
+  metadata: Joi.object().optional(),
+  symbol: Joi.string().empty('').optional(),
 }).unknown(true);
 router.put('/:id', auth, async (req, res) => {
   const { id } = req.params;
@@ -329,11 +331,18 @@ router.put('/:id', auth, async (req, res) => {
     return res.status(400).json({ error: 'Payment method not found' });
   }
 
-  const updatedCurrency = await currency.update({
+  const updates: Partial<TPaymentCurrency> = {
     name: raw.name || currency.name,
     description: raw.description || currency.description,
     logo: raw.logo || method.logo,
-  });
+    metadata: raw.metadata || currency.metadata,
+  };
+
+  if (currency.type === 'credit') {
+    updates.symbol = raw.symbol || currency.symbol;
+  }
+
+  const updatedCurrency = await currency.update(updates);
   return res.json(updatedCurrency);
 });
 

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.19.7
+version: 1.19.9
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.19.7",
+  "version": "1.19.9",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -46,17 +46,18 @@
     "@abtnode/cron": "^1.16.46",
     "@arcblock/did": "^1.21.0",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^3.0.32",
+    "@arcblock/did-connect": "^3.0.36",
     "@arcblock/did-util": "^1.21.0",
     "@arcblock/jwt": "^1.21.0",
-    "@arcblock/ux": "^3.0.32",
+    "@arcblock/ux": "^3.0.36",
     "@arcblock/validator": "^1.21.0",
-    "@blocklet/did-space-js": "^1.1.8",
+    "@blocklet/did-space-js": "^1.1.10",
+    "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.46",
     "@blocklet/logger": "^1.16.46",
-    "@blocklet/payment-react": "1.19.7",
+    "@blocklet/payment-react": "1.19.9",
     "@blocklet/sdk": "^1.16.46",
-    "@blocklet/ui-react": "^3.0.32",
+    "@blocklet/ui-react": "^3.0.36",
     "@blocklet/uploader": "^0.2.4",
     "@blocklet/xss": "^0.2.2",
     "@mui/icons-material": "^7.1.2",
@@ -123,7 +124,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.46",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.19.7",
+    "@blocklet/payment-types": "1.19.9",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -169,5 +170,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "83b0e5ac23d05e12d07929789f06f85b30929169"
+  "gitHead": "a65b166cee114b432be7c1e95b8ef7bc88b30fbd"
 }

package/src/components/customer/credit-overview.tsx

@@ -1,6 +1,6 @@
 import { formatBNStr, CreditGrantsList, CreditTransactionsList, api } from '@blocklet/payment-react';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { Avatar, Box, Card, CardContent, Stack, Typography, Tabs, Tab } from '@mui/material';
+import { Box, Card, CardContent, Stack, Typography, Tabs, Tab } from '@mui/material';
 import { useMemo, useState } from 'react';
 import type { TPaymentCurrency } from '@blocklet/payment-types';
 import { useRequest } from 'ahooks';
@@ -103,13 +103,16 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
         <CardContent sx={{ flexGrow: 1 }}>
           <Stack spacing={2}>
             {/* 货币信息 */}
+
             <Stack
-              direction="row"
-              spacing={1}
+              direction="column"
+              spacing={0.5}
               sx={{
-                alignItems: 'center',
+                alignItems: 'flex-start',
+                borderBottom: '1px solid',
+                borderColor: 'divider',
+                pb: 2,
               }}>
-              <Avatar src={currency.logo} alt={currency.symbol} sx={{ width: 24, height: 24 }} />
               <Typography variant="h6" component="div">
                 {currency.name}
               </Typography>
@@ -127,11 +130,11 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
               </Typography>
               <Typography variant="h5" component="div" sx={{ fontWeight: 'normal' }}>
                 {totalAmount === '0' && remainingAmount === '0' ? (
-                  <>0 {currency.symbol}</>
+                  <>0 </>
                 ) : (
                   <>
                     {formatBNStr(remainingAmount, currency.decimal, 6, true)} /{' '}
-                    {formatBNStr(totalAmount, currency.decimal, 6, true)} {currency.symbol}
+                    {formatBNStr(totalAmount, currency.decimal, 6, true)}
                   </>
                 )}
               </Typography>
@@ -153,7 +156,7 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
                   sx={{
                     color: 'error.main',
                   }}>
-                  {formatBNStr(pendingAmount, currency.decimal, 6, true)} {currency.symbol}
+                  {formatBNStr(pendingAmount, currency.decimal, 6, true)}
                 </Typography>
               </Box>
             )}