payment-kit 1.23.5 → 1.23.7

package/api/src/integrations/arcblock/token.ts

@@ -359,6 +359,22 @@ export async function getTokenContext(paymentCurrency: TPaymentCurrency) {
   };
 }
 
+/**
+ * Get the latest DID address for a customer, handling DID migration.
+ */
+export async function getAccountState(paymentCurrency: TPaymentCurrency, did?: string) {
+  if (!did) return null;
+
+  try {
+    const { client } = await getTokenContext(paymentCurrency);
+    const { state } = await client.getAccountState({ address: did, traceMigration: true });
+    return state;
+  } catch (error) {
+    logger.error('Failed to get account state', { did, error });
+    return null;
+  }
+}
+
 export async function mintToken({
   paymentCurrency,
   amount,

package/api/src/queues/credit-grant.ts

@@ -19,7 +19,7 @@ import {
 } from '../store/models';
 import { events } from '../libs/event';
 import { calculateExpiresAt, createCreditGrant } from '../libs/credit-grant';
-import { mintToken, transferTokenFromCustomer } from '../integrations/arcblock/token';
+import { getAccountState, mintToken, transferTokenFromCustomer } from '../integrations/arcblock/token';
 import logger from '../libs/logger';
 
 type CreditGrantJob =
@@ -66,17 +66,19 @@ async function activateGrant(creditGrant: CreditGrant) {
 
   // Verify customer
   const customer = await Customer.findByPk(creditGrant.customer_id);
-  if (!customer?.did) {
+  if (!customer) {
     throw new Error(`Customer DID not found for credit grant ${creditGrant.id}`);
   }
 
+  const customerState = await getAccountState(paymentCurrency, customer.did);
+
   // Step 1: Mint token on-chain
   // TODO: check if already minted
   const mintAmount = fromUnitToToken(creditGrant.amount, paymentCurrency.decimal);
   const hash = await mintToken({
     paymentCurrency,
     amount: mintAmount,
-    receiver: customer.did,
+    receiver: customerState?.address || customer.did,
     creditGrantId: creditGrant.id,
   });
 
@@ -172,11 +174,12 @@ export async function expireGrant(creditGrant: CreditGrant) {
 
   // Transfer remaining tokens to system wallet (same as consumption flow)
   const chainDetail = creditGrant.chain_detail || {};
+  const customerState = await getAccountState(paymentCurrency, customer.did);
 
   try {
     const hash = await transferTokenFromCustomer({
       paymentCurrency,
-      customerDid: customer.did,
+      customerDid: customerState?.address || customer.did,
       amount: remainingAmount.toString(),
       data: {
         reason: 'credit_expired',

package/api/src/queues/credit-reconciliation.ts

@@ -8,7 +8,7 @@
 import { BN } from '@ocap/util';
 import logger from '../libs/logger';
 import createQueue from '../libs/queue';
-import { getCustomerTokenBalance } from '../integrations/arcblock/token';
+import { getAccountState, getCustomerTokenBalance } from '../integrations/arcblock/token';
 import { CreditGrant, CreditTransaction, Customer, PaymentCurrency } from '../store/models';
 import { events } from '../libs/event';
 
@@ -98,21 +98,23 @@ async function handleReconciliation(job: ReconciliationJob) {
   });
 
   try {
-    const customer = await Customer.findByPk(customerId);
-    if (!customer) {
-      logger.warn('Customer not found for reconciliation', { customerId });
-      return;
-    }
-
     const currency = await PaymentCurrency.findByPk(currencyId);
     if (!currency || !currency.isOnChainCredit()) {
       logger.warn('Currency not found or not on-chain credit', { currencyId });
       return;
     }
 
+    const customer = await Customer.findByPk(customerId);
+    if (!customer?.did) {
+      logger.warn('Customer not found for reconciliation', { customerId });
+      return;
+    }
+    const customerState = await getAccountState(currency, customer.did);
+    const customerDid = customerState?.address || customer.did;
+
     // Get balance info (considering pending transfers)
     const balanceInfo = await getBalanceInfo(customerId, currencyId);
-    const chainBalance = await getCustomerTokenBalance(customer.did, currency);
+    const chainBalance = await getCustomerTokenBalance(customerDid, currency);
 
     const difference = new BN(chainBalance).sub(new BN(balanceInfo.expectedChainBalance));
     const isMatched = difference.eq(new BN(0));
@@ -131,7 +133,7 @@ async function handleReconciliation(job: ReconciliationJob) {
     } else {
       logger.error('Credit balance mismatch detected', {
         customerId,
-        customerDid: customer.did,
+        customerDid,
         currencyId,
         creditGrantId,
         trigger,
@@ -145,7 +147,7 @@ async function handleReconciliation(job: ReconciliationJob) {
       // Emit event for monitoring/alerting
       events.emit('customer.credit.reconciliation.mismatch', {
         customerId,
-        customerDid: customer.did,
+        customerDid,
         currencyId,
         creditGrantId,
         trigger,

package/api/src/queues/refund.ts

@@ -17,7 +17,7 @@ import { Refund } from '../store/models/refund';
 import { Subscription } from '../store/models/subscription';
 import { CreditGrant } from '../store/models/credit-grant';
 import { Invoice } from '../store/models/invoice';
-import { burnToken } from '../integrations/arcblock/token';
+import { burnToken, getAccountState } from '../integrations/arcblock/token';
 import type { EVMChainType, PaymentError } from '../store/models/types';
 import { EVM_CHAIN_TYPES } from '../libs/constants';
 
@@ -587,12 +587,16 @@ export async function handleOnchainCreditRefund(refund: Refund): Promise<string
 
     // Only burn if user has remaining tokens
     if (actualBurnAmount.gt(new BN(0))) {
+      // Get the latest DID for burn (handles DID migration via on-chain state)
+      // eslint-disable-next-line no-await-in-loop
+      const customerState = await getAccountState(grantCurrency, customer.did);
+
       try {
         // eslint-disable-next-line no-await-in-loop
         burnHash = await burnToken({
           paymentCurrency: grantCurrency,
           amount: fromUnitToToken(actualBurnAmount.toString(), grantCurrency.decimal),
-          sender: customer.did,
+          sender: customerState?.address || customer.did,
           data: {
             reason: 'credit_grant_refund',
             creditGrantId: creditGrant.id,

package/api/src/queues/token-transfer.ts

@@ -1,7 +1,7 @@
 import { BN } from '@ocap/util';
 import logger from '../libs/logger';
 import createQueue from '../libs/queue';
-import { transferTokenFromCustomer, getCustomerTokenBalance } from '../integrations/arcblock/token';
+import { getAccountState, transferTokenFromCustomer, getCustomerTokenBalance } from '../integrations/arcblock/token';
 import { CreditTransaction, CreditGrant, Customer, MeterEvent, PaymentCurrency, Subscription } from '../store/models';
 
 type TokenTransferJob = {
@@ -101,6 +101,10 @@ export async function handleTokenTransfer(job: TokenTransferJob): Promise<void>
 
   const { creditTransaction, creditGrant, customer, paymentCurrency, meterEvent } = validation;
 
+  // Get the latest DID for transfer (handles DID migration via on-chain state)
+  const customerState = await getAccountState(paymentCurrency, customer.did);
+  const customerDid = customerState?.address || customer.did;
+
   let txHash: string | null = null;
   // Record partial transfer details when chain balance is insufficient
   let transferResult: { expected: string; actual: string } | null = null;
@@ -109,7 +113,7 @@ export async function handleTokenTransfer(job: TokenTransferJob): Promise<void>
     // Attempt token transfer
     txHash = await transferTokenFromCustomer({
       paymentCurrency,
-      customerDid: customer.did,
+      customerDid,
       amount: job.amount,
       data: {
         reason: 'credit_consumption',
@@ -147,7 +151,7 @@ export async function handleTokenTransfer(job: TokenTransferJob): Promise<void>
     });
 
     // Get actual chain balance
-    const chainBalance = await getCustomerTokenBalance(customer.did, paymentCurrency);
+    const chainBalance = await getCustomerTokenBalance(customerDid, paymentCurrency);
     const chainBalanceBN = new BN(chainBalance);
     const expectBalanceBN = new BN(job.amount);
     const chainDebt = expectBalanceBN.sub(chainBalanceBN);
@@ -174,7 +178,7 @@ export async function handleTokenTransfer(job: TokenTransferJob): Promise<void>
     if (chainBalanceBN.gt(new BN(0))) {
       txHash = await transferTokenFromCustomer({
         paymentCurrency,
-        customerDid: customer.did,
+        customerDid,
         amount: transferAmount.toString(),
         data: {
           reason: 'credit_consumption',
@@ -185,7 +189,7 @@ export async function handleTokenTransfer(job: TokenTransferJob): Promise<void>
 
       logger.warn('Partial token transfer completed - chain balance insufficient', {
         creditTransactionId: creditTransaction.id,
-        customerDid: customer.did,
+        customerDid,
         currencyId: paymentCurrency.id,
         actualBalance: chainBalanceBN.toString(),
         expectedAmount: expectBalanceBN.toString(),
@@ -195,7 +199,7 @@ export async function handleTokenTransfer(job: TokenTransferJob): Promise<void>
     } else {
       logger.error('Zero chain balance - no tokens transferred', {
         creditTransactionId: creditTransaction.id,
-        customerDid: customer.did,
+        customerDid,
         currencyId: paymentCurrency.id,
         expectedAmount: expectBalanceBN.toString(),
       });

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

@@ -19,6 +19,7 @@ import { checkDepositVaultAmount } from '../libs/payment';
 import { getTokenSummaryByDid } from '../integrations/arcblock/stake';
 import { MetadataSchema } from '../libs/api';
 import { getRechargePaymentUrl } from '../libs/currency';
+import { checkCurrencySupportRecurring } from '../libs/product';
 
 const router = Router();
 
@@ -577,4 +578,29 @@ router.put('/:id/recharge-config', auth, async (req, res) => {
   });
 });
 
+// check if currencies support recurring subscriptions
+router.post('/check-recurring-support', async (req, res) => {
+  try {
+    const { currency_ids: currencyIds } = req.body;
+    if (!Array.isArray(currencyIds)) {
+      return res.status(400).json({ error: 'currency_ids must be an array' });
+    }
+    if (currencyIds.length === 0) {
+      return res.status(400).json({ error: 'currency_ids cannot be empty' });
+    }
+    const { notSupportCurrencies, validate } = await checkCurrencySupportRecurring(currencyIds, true);
+    return res.json({
+      supported: validate,
+      unsupported_currencies: notSupportCurrencies.map((c) => ({
+        id: c.id,
+        name: c.name,
+        symbol: c.symbol,
+      })),
+    });
+  } catch (err) {
+    logger.error('check recurring support error', err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 export default router;

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.23.5
+version: 1.23.7
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.23.5",
+  "version": "1.23.7",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -44,7 +44,7 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.17.5",
+    "@abtnode/cron": "^1.17.6",
     "@arcblock/did": "^1.27.15",
     "@arcblock/did-connect-react": "^3.2.19",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
@@ -56,15 +56,15 @@
     "@arcblock/vc": "^1.27.15",
     "@blocklet/did-space-js": "^1.2.11",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/js-sdk": "^1.17.5",
-    "@blocklet/logger": "^1.17.5",
-    "@blocklet/payment-broker-client": "1.23.5",
-    "@blocklet/payment-react": "1.23.5",
-    "@blocklet/payment-vendor": "1.23.5",
-    "@blocklet/sdk": "^1.17.5",
+    "@blocklet/js-sdk": "^1.17.6",
+    "@blocklet/logger": "^1.17.6",
+    "@blocklet/payment-broker-client": "1.23.7",
+    "@blocklet/payment-react": "1.23.7",
+    "@blocklet/payment-vendor": "1.23.7",
+    "@blocklet/sdk": "^1.17.6",
     "@blocklet/ui-react": "^3.2.19",
-    "@blocklet/uploader": "^0.3.16",
-    "@blocklet/xss": "^0.3.14",
+    "@blocklet/uploader": "^0.3.17",
+    "@blocklet/xss": "^0.3.15",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
@@ -128,9 +128,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.17.5",
+    "@abtnode/types": "^1.17.6",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.23.5",
+    "@blocklet/payment-types": "1.23.7",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -177,5 +177,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "486456ed522207cc4efa54cd14b1f65c6433d179"
+  "gitHead": "74ae6bd8f41bf89e0d404af26c788431b4ca4779"
 }

package/src/components/customer/related-credit-grants.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { formatBNStr, formatToDate, Table, usePaymentContext } from '@blocklet/payment-react';
+import { formatBNStr, formatCreditAmount, formatToDate, Table, usePaymentContext } from '@blocklet/payment-react';
 import type { TCreditGrantExpanded } from '@blocklet/payment-types';
 import { Box, Chip, Divider, styled, Typography } from '@mui/material';
 import { useNavigate } from 'react-router-dom';
@@ -88,8 +88,10 @@ export default function RelatedCreditGrants({ grants, showDivider = true, mode =
           return (
             <Box onClick={() => handleShowGrantDetail(grant)}>
               <Typography variant="body2">
-                {formatBNStr(grant.remaining_amount, grant.paymentCurrency?.decimal || 0)}{' '}
-                {grant.paymentCurrency?.symbol}
+                {formatCreditAmount(
+                  formatBNStr(grant.remaining_amount, grant.paymentCurrency?.decimal || 0),
+                  grant.paymentCurrency?.symbol || ''
+                )}
               </Typography>
             </Box>
           );

package/src/components/invoice/table.tsx

@@ -1,6 +1,12 @@
 /* eslint-disable react/no-unstable-nested-components */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { formatAmount, Table, getPriceUintAmountByCurrency, formatNumber } from '@blocklet/payment-react';
+import {
+  formatAmount,
+  Table,
+  getPriceUintAmountByCurrency,
+  formatNumber,
+  formatCreditForCheckout,
+} from '@blocklet/payment-react';
 import type { TInvoiceExpanded, TInvoiceItem } from '@blocklet/payment-types';
 import { InfoOutlined } from '@mui/icons-material';
 import { Box, Stack, Tooltip, Typography } from '@mui/material';
@@ -77,7 +83,7 @@ export function getInvoiceRows(invoice: TInvoiceExpanded, t: (key: string) => st
     if (creditInfo?.amount) {
       credits = {
         total: creditInfo.amount,
-        currency: creditInfo.currency?.name || 'Credits',
+        currency: creditInfo.currency?.symbol || 'Credits',
       };
     }
 
@@ -245,8 +251,7 @@ export default function InvoiceTable({ invoice, simple = false, emptyNodeText =
                     },
                   }}>
                   {t('customer.invoice.creditsInfo', {
-                    amount: formatNumber(item.credits.total),
-                    currency: item.credits.currency,
+                    amount: formatCreditForCheckout(formatNumber(item.credits.total), item.credits.currency, locale),
                   })}
                 </Typography>
               )}

package/src/locales/en.tsx

@@ -1874,7 +1874,7 @@ export default flat({
     invoice: {
       relatedInvoice: 'Related Invoice',
       donation: 'Donation',
-      creditsInfo: 'Total {amount} {currency} included',
+      creditsInfo: 'Total {amount} included',
       appliedDiscounts: 'Applied Discounts',
     },
     payout: {

package/src/locales/zh.tsx

@@ -1818,7 +1818,7 @@ export default flat({
     invoice: {
       relatedInvoice: '关联账单',
       donation: '打赏记录',
-      creditsInfo: '总共包含 {amount} {currency}',
+      creditsInfo: '总共包含 {amount}',
       appliedDiscounts: '已应用优惠',
     },
     payout: {