payment-kit 1.17.3 → 1.17.4

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

@@ -57,7 +57,7 @@ export async function mintNftForCheckoutSession(id: string) {
       client.getAccountState({ address: wallet.address }),
     ]);
 
-    const preMint = preMintFromFactory({
+    const preMint = await preMintFromFactory({
       factory: formatFactoryState(factoryState as any),
       inputs: inputs || {},
       owner: nftOwner,

package/api/src/libs/middleware.ts

@@ -12,7 +12,7 @@ export function ensureI18n() {
   };
 }
 
-export function contextMiddleware(req: Request, _res: Response, next: NextFunction) {
+export async function contextMiddleware(req: Request, _res: Response, next: NextFunction) {
   const requestId =
     (req.headers['x-request-id'] as string) || `req_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
   let requestedBy = 'system';
@@ -22,7 +22,7 @@ export function contextMiddleware(req: Request, _res: Response, next: NextFuncti
   const componentDid = req.get('x-component-did');
   if (sig && componentDid) {
     const data = typeof req.body === 'undefined' ? {} : req.body;
-    const verified = verify(data, sig);
+    const verified = await verify(data, sig);
     if (verified) {
       requestedBy = componentDid;
     }

package/api/src/libs/security.ts

@@ -34,7 +34,7 @@ export function authenticate<T extends Model>({ component, roles, record, mine,
     const sig = req.get('x-component-sig');
     if (component && sig) {
       const { data } = getVerifyData(req as any, 'component');
-      const verified = verify(data, sig);
+      const verified = await verify(data, sig);
       if (!verified) {
         return res.status(401).json({ error: 'Invalid signature for component call' });
       }
@@ -56,7 +56,7 @@ export function authenticate<T extends Model>({ component, roles, record, mine,
     const id = req.params.id || req.query.subscription_id || '';
     if (embed && token && id) {
       try {
-        const verified = wallet.verify(id as string, token as string);
+        const verified = await wallet.verify(id as string, token as string);
         if (!verified) {
           return res.status(401).json({ error: `Invalid signature for embed: ${id}` });
         }

package/api/src/locales/en.ts

@@ -194,8 +194,8 @@ export default flat({
     },
 
     overdraftProtectionExhausted: {
-      title: 'Insufficient Credit for SubGuard',
-      body: 'Your subscription to {productName} has insufficient staked credit for SubGuard. Please increase your stake to maintain the service or disable it if no longer needed.',
+      title: 'Insufficient Credit for SubGuard™',
+      body: 'Your subscription to {productName} has insufficient staked credit for SubGuard™. Please increase your stake to maintain the service or disable it if no longer needed.',
     },
   },
 });

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.17.3",
+  "version": "1.17.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -43,30 +43,30 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.36",
-    "@arcblock/did": "^1.18.166",
+    "@abtnode/cron": "^1.16.37",
+    "@arcblock/did": "^1.19.2",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.11.15",
-    "@arcblock/did-util": "^1.18.166",
-    "@arcblock/jwt": "^1.18.166",
-    "@arcblock/ux": "^2.11.15",
-    "@arcblock/validator": "^1.18.166",
-    "@blocklet/js-sdk": "^1.16.36",
-    "@blocklet/logger": "^1.16.36",
-    "@blocklet/payment-react": "1.17.3",
-    "@blocklet/sdk": "^1.16.36",
-    "@blocklet/ui-react": "^2.11.15",
-    "@blocklet/uploader": "^0.1.62",
-    "@blocklet/xss": "^0.1.19",
+    "@arcblock/did-connect": "^2.11.23",
+    "@arcblock/did-util": "^1.19.2",
+    "@arcblock/jwt": "^1.19.2",
+    "@arcblock/ux": "^2.11.23",
+    "@arcblock/validator": "^1.19.2",
+    "@blocklet/js-sdk": "^1.16.37",
+    "@blocklet/logger": "^1.16.37",
+    "@blocklet/payment-react": "1.17.4",
+    "@blocklet/sdk": "^1.16.37",
+    "@blocklet/ui-react": "^2.11.23",
+    "@blocklet/uploader": "^0.1.63",
+    "@blocklet/xss": "^0.1.20",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.18.166",
-    "@ocap/client": "^1.18.166",
-    "@ocap/mcrypto": "^1.18.166",
-    "@ocap/util": "^1.18.166",
-    "@ocap/wallet": "^1.18.166",
+    "@ocap/asset": "^1.19.2",
+    "@ocap/client": "^1.19.2",
+    "@ocap/mcrypto": "^1.19.2",
+    "@ocap/util": "^1.19.2",
+    "@ocap/wallet": "^1.19.2",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -118,9 +118,9 @@
     "validator": "^13.12.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.36",
+    "@abtnode/types": "^1.16.37",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.17.3",
+    "@blocklet/payment-types": "1.17.4",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -166,5 +166,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "bc8adef7ff5a032048eef64dc1753bcee88acb98"
+  "gitHead": "2d25cbcf146ba2195b1c3434ab3f64566f851893"
 }

package/src/components/customer/overdraft-protection.tsx

@@ -17,6 +17,7 @@ import {
   RadioGroup,
   Radio,
   Link,
+  Skeleton,
 } from '@mui/material';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import { EventHandler, useState } from 'react';
@@ -105,6 +106,7 @@ export default function OverdraftProtectionDialog({
       amount: '0',
       gas: '0',
     },
+    loading: cycleAmountLoading,
   } = useRequest(
     () =>
       fetchCycleAmount(subscription.id, {
@@ -356,62 +358,91 @@ export default function OverdraftProtectionDialog({
             </Typography>
 
             <Grid container spacing={2} ml={-2} sx={{ mt: -1 }}>
-              {presetAmounts.map(({ amount: presetAmount, cycles }) => (
-                <Grid item xs={6} sm={4} key={presetAmount}>
-                  <Card
-                    variant="outlined"
-                    sx={{
-                      height: '100%',
-                      transition: 'all 0.3s',
-                      cursor: 'pointer',
-                      '&:hover': {
-                        transform: 'translateY(-4px)',
-                        boxShadow: 3,
-                      },
-                      ...(amount === presetAmount && !customAmount
-                        ? { borderColor: 'primary.main', borderWidth: 2 }
-                        : {}),
-                    }}>
-                    <CardActionArea
-                      onClick={() => {
-                        methods.setValue('amount', presetAmount);
-                        setCustomAmount(false);
-                      }}
-                      sx={{ height: '100%', p: 1 }}>
-                      <Stack spacing={1} alignItems="center">
-                        <Typography variant="h6" sx={{ fontWeight: 600 }}>
-                          {presetAmount} {currency.symbol}
-                        </Typography>
-                        <Typography variant="caption" color="text.secondary">
-                          {formatEstimatedDuration(cycles)}
-                        </Typography>
-                      </Stack>
-                    </CardActionArea>
-                  </Card>
-                </Grid>
-              ))}
-              <Grid item xs={6} sm={4}>
-                <Card
-                  variant="outlined"
-                  sx={{
-                    height: '100%',
-                    transition: 'all 0.3s',
-                    cursor: 'pointer',
-                    '&:hover': {
-                      transform: 'translateY(-4px)',
-                      boxShadow: 3,
-                    },
-                    ...(customAmount ? { borderColor: 'primary.main', borderWidth: 2 } : {}),
-                  }}>
-                  <CardActionArea onClick={handleCustomSelect} sx={{ height: '100%', p: 2 }}>
-                    <Stack spacing={1} alignItems="center">
-                      <Typography variant="h6" sx={{ fontWeight: 600 }}>
-                        {t('common.custom')}
-                      </Typography>
-                    </Stack>
-                  </CardActionArea>
-                </Card>
-              </Grid>
+              {cycleAmountLoading ? (
+                // 加载状态的占位
+                <>
+                  {[1, 2, 3, 4, 5].map((key) => (
+                    <Grid item xs={6} sm={4} key={key}>
+                      <Card variant="outlined" sx={{ height: '100%' }}>
+                        <CardActionArea sx={{ height: '100%', p: 1 }}>
+                          <Stack spacing={1} alignItems="center">
+                            <Skeleton variant="rectangular" width={80} height={32} />
+                            <Skeleton width={100} />
+                          </Stack>
+                        </CardActionArea>
+                      </Card>
+                    </Grid>
+                  ))}
+                  <Grid item xs={6} sm={4}>
+                    <Card variant="outlined" sx={{ height: '100%' }}>
+                      <CardActionArea sx={{ height: '100%', p: 2 }}>
+                        <Stack spacing={1} alignItems="center">
+                          <Skeleton variant="rectangular" width={80} height={24} />
+                        </Stack>
+                      </CardActionArea>
+                    </Card>
+                  </Grid>
+                </>
+              ) : (
+                <>
+                  {presetAmounts.map(({ amount: presetAmount, cycles }) => (
+                    <Grid item xs={6} sm={4} key={presetAmount}>
+                      <Card
+                        variant="outlined"
+                        sx={{
+                          height: '100%',
+                          transition: 'all 0.3s',
+                          cursor: 'pointer',
+                          '&:hover': {
+                            transform: 'translateY(-4px)',
+                            boxShadow: 3,
+                          },
+                          ...(amount === presetAmount && !customAmount
+                            ? { borderColor: 'primary.main', borderWidth: 2 }
+                            : {}),
+                        }}>
+                        <CardActionArea
+                          onClick={() => {
+                            methods.setValue('amount', presetAmount);
+                            setCustomAmount(false);
+                          }}
+                          sx={{ height: '100%', p: 1 }}>
+                          <Stack spacing={1} alignItems="center">
+                            <Typography variant="h6" sx={{ fontWeight: 600 }}>
+                              {presetAmount} {currency.symbol}
+                            </Typography>
+                            <Typography variant="caption" color="text.secondary">
+                              {formatEstimatedDuration(cycles)}
+                            </Typography>
+                          </Stack>
+                        </CardActionArea>
+                      </Card>
+                    </Grid>
+                  ))}
+                  <Grid item xs={6} sm={4}>
+                    <Card
+                      variant="outlined"
+                      sx={{
+                        height: '100%',
+                        transition: 'all 0.3s',
+                        cursor: 'pointer',
+                        '&:hover': {
+                          transform: 'translateY(-4px)',
+                          boxShadow: 3,
+                        },
+                        ...(customAmount ? { borderColor: 'primary.main', borderWidth: 2 } : {}),
+                      }}>
+                      <CardActionArea onClick={handleCustomSelect} sx={{ height: '100%', p: 2 }}>
+                        <Stack spacing={1} alignItems="center">
+                          <Typography variant="h6" sx={{ fontWeight: 600 }}>
+                            {t('common.custom')}
+                          </Typography>
+                        </Stack>
+                      </CardActionArea>
+                    </Card>
+                  </Grid>
+                </>
+              )}
             </Grid>
 
             {customAmount && (

package/src/locales/en.tsx

@@ -652,39 +652,39 @@ export default flat({
       error: 'Delegate failed',
     },
     overdraftProtection: {
-      title: 'SubGuard',
-      setting: 'Set SubGuard',
-      tip: 'To avoid service interruption due to unpaid invoices, you can enable SubGuard by staking. Timely payment will not incur additional fees. Please settle your invoices promptly. If your available stake is insufficient or payment is overdue, we will deduct the amount from your stake and charge a service fee.',
+      title: 'SubGuard™',
+      setting: 'Set SubGuard™',
+      tip: 'To avoid service interruption due to unpaid invoices, you can enable SubGuard™ by staking. Timely payment will not incur additional fees. Please settle your invoices promptly. If your available stake is insufficient or payment is overdue, we will deduct the amount from your stake and charge a service fee.',
       enabled: 'Enabled',
       disabled: 'Disabled',
       returnRemaining: 'Return Remaining Stake',
       returnRemainingTip:
-        'Once the remaining stake is returned, the SubGuard will be automatically disabled. Please confirm the action.',
+        'Once the remaining stake is returned, the SubGuard™ will be automatically disabled. Please confirm the action.',
       applyRemainingSuccess: 'Stake return application successful',
       remaining:
         'Your current remaining stake: {amount} {symbol}, estimated required stake per cycle: {estimateAmount} {symbol}.',
       noRemaining:
-        'No remaining stake available. Please stake at least {estimateAmount} {symbol} as soon as possible to ensure SubGuard is enabled.',
+        'No remaining stake available. Please stake at least {estimateAmount} {symbol} as soon as possible to ensure SubGuard™ is enabled.',
       remainingNotEnough:
         'You have unpaid invoices totaling {due} {symbol}. If not paid, your remaining stake will be insufficient to cover the next invoice. Available stake: {unused} {symbol}. Please stake at least {min} {symbol}.',
       due: 'Please pay the outstanding amount first',
       insufficient: 'Insufficient Stake to cover the next invoice, please add stake',
-      insufficientTip: 'Insufficient Stake, please stake to ensure SubGuard is enabled.',
+      insufficientTip: 'Insufficient Stake, please stake to ensure SubGuard™ is enabled.',
       intervals: 'cycles',
       estimatedDuration: '{duration} {unit} est.',
       rule: 'Rule: N * ( P + Fee )',
       ruleTip:
-        'N is the number of cycles, P is the subscription bill amount, Fee is the SubGuard service fee, the single fee is {gas} {symbol}',
+        'N is the number of cycles, P is the subscription bill amount, Fee is the SubGuard™ service fee, the single fee is {gas} {symbol}',
       min: 'The amount must be greater or equal to {min} {symbol}',
-      settingSuccess: 'Set SubGuard Successful',
-      settingError: 'Set SubGuard Failed',
-      keepStake: 'Keep Remaining Stake For SubGuard',
+      settingSuccess: 'Set SubGuard™ Successful',
+      settingError: 'Set SubGuard™ Failed',
+      keepStake: 'Keep Remaining Stake For SubGuard™',
       returnStake: 'Return Remaining Stake',
       stake: 'Stake',
       address: 'Staking Address',
       total: 'Total Stake: {total} {symbol}, ',
       disableConfirm: 'You currently have unpaid invoices, please settle your invoices first.',
-      open: 'Enable SubGuard',
+      open: 'Enable SubGuard™',
       payerAddress: 'Payer',
       stakingAddress: 'Staking Address',
     },