payment-kit 1.18.28 → 1.18.30

package/api/src/crons/index.ts

@@ -7,6 +7,7 @@ import {
   batchHandleStripeSubscriptions,
 } from '../integrations/stripe/resource';
 import {
+  depositVaultCronTime,
   expiredSessionCleanupCronTime,
   meteringSubscriptionDetectionCronTime,
   notificationCronTime,
@@ -25,6 +26,7 @@ import { SubscriptionTrialWillEndSchedule } from './subscription-trial-will-end'
 import { SubscriptionWillCanceledSchedule } from './subscription-will-canceled';
 import { SubscriptionWillRenewSchedule } from './subscription-will-renew';
 import { createMeteringSubscriptionDetection } from './metering-subscription-detection';
+import { startDepositVaultQueue } from '../queues/payment';
 
 function init() {
   Cron.init({
@@ -99,6 +101,12 @@ function init() {
         fn: () => createMeteringSubscriptionDetection(),
         options: { runOnInit: false },
       },
+      {
+        name: 'deposit.vault',
+        time: depositVaultCronTime,
+        fn: () => startDepositVaultQueue(),
+        options: { runOnInit: true },
+      },
     ],
     onError: (error: Error, name: string) => {
       logger.error('run job failed', { name, error });

package/api/src/libs/constants.ts

@@ -1,3 +1,5 @@
 export const EVM_CHAIN_TYPES = ['ethereum', 'base'];
 
 export const CHARGE_SUPPORTED_CHAIN_TYPES = ['arcblock', 'ethereum', 'base'];
+
+export const VAULT_BUFFER_THRESHOLD = 10;

package/api/src/libs/env.ts

@@ -8,11 +8,11 @@ export const notificationCronConcurrency: number = Number(process.env.NOTIFICATI
 export const stripeInvoiceCronTime: string = process.env.STRIPE_INVOICE_CRON_TIME || '0 */30 * * * *'; // 默认每 30min 执行一次
 export const stripePaymentCronTime: string = process.env.STRIPE_PAYMENT_CRON_TIME || '0 */20 * * * *'; // 默认每 20min 执行一次
 export const stripeSubscriptionCronTime: string = process.env.STRIPE_SUBSCRIPTION_CRON_TIME || '0 10 */8 * * *'; // 默认每 8小时 执行一次
-export const revokeStakeCronTime: string = process.env.REVOKE_STAKE_CRON_TIME || '0 */5 * * * *'; // 默认每 5 min 行一次
+export const revokeStakeCronTime: string = process.env.REVOKE_STAKE_CRON_TIME || '0 */5 * * * *'; // 默认每 5 min 执行一次
 export const daysUntilCancel: string | undefined = process.env.DAYS_UNTIL_CANCEL;
 export const meteringSubscriptionDetectionCronTime: string =
   process.env.METERING_SUBSCRIPTION_DETECTION_CRON_TIME || '0 0 10 * * *'; // 默认每天 10:00 执行
-
+export const depositVaultCronTime: string = process.env.DEPOSIT_VAULT_CRON_TIME || '0 */5 * * * *'; // 默认每 5 min 执行一次
 // sequelize 配置相关
 export const sequelizeOptionsPoolMin: number = process.env.SEQUELIZE_OPTIONS_POOL_MIN
   ? +process.env.SEQUELIZE_OPTIONS_POOL_MIN

package/api/src/libs/payment.ts

@@ -5,7 +5,7 @@ import { sign } from '@arcblock/jwt';
 import { getWalletDid } from '@blocklet/sdk/lib/did';
 import type { DelegateState, TokenLimit } from '@ocap/client';
 import { toTxHash } from '@ocap/mcrypto';
-import { BN, fromUnitToToken } from '@ocap/util';
+import { BN, fromTokenToUnit, fromUnitToToken } from '@ocap/util';
 import cloneDeep from 'lodash/cloneDeep';
 import type { LiteralUnion } from 'type-fest';
 
@@ -24,7 +24,7 @@ import type { TPaymentCurrency } from '../store/models/payment-currency';
 import { blocklet, ethWallet, wallet, getVaultAddress } from './auth';
 import logger from './logger';
 import { getBlockletJson, getUserOrAppInfo, OCAP_PAYMENT_TX_TYPE, resolveAddressChainTypes } from './util';
-import { CHARGE_SUPPORTED_CHAIN_TYPES, EVM_CHAIN_TYPES } from './constants';
+import { CHARGE_SUPPORTED_CHAIN_TYPES, VAULT_BUFFER_THRESHOLD, EVM_CHAIN_TYPES } from './constants';
 import { getTokenByAddress } from '../integrations/arcblock/stake';
 
 export interface SufficientForPaymentResult {
@@ -459,6 +459,13 @@ export async function checkDepositVaultAmount(paymentCurrencyId: string): Promis
     return { depositAmount: '0', message: 'No amount available to deposit after calculations' };
   }
 
+  const bufferThreshold =
+    paymentCurrency?.vault_config?.buffer_threshold ||
+    fromTokenToUnit(VAULT_BUFFER_THRESHOLD, paymentCurrency.decimal).toString();
+  if (new BN(amountToDeposit).lt(new BN(bufferThreshold))) {
+    return { depositAmount: '0', message: 'Amount to deposit is less than the buffer threshold' };
+  }
+
   return {
     depositAmount: amountToDeposit,
     vaultAddress,

package/api/src/queues/payment.ts

@@ -1,6 +1,7 @@
 import isEmpty from 'lodash/isEmpty';
 
 import { BN } from '@ocap/util';
+import pAll from 'p-all';
 import { ensureStakedForGas } from '../integrations/arcblock/stake';
 import { transferErc20FromUser } from '../integrations/ethereum/token';
 import { createEvent } from '../libs/audit';
@@ -39,7 +40,7 @@ import { ensureOverdraftProtectionInvoiceAndItems } from '../libs/invoice';
 import { Lock } from '../store/models';
 import { ensureOverdraftProtectionPrice } from '../libs/overdraft-protection';
 import createQueue from '../libs/queue';
-import { EVM_CHAIN_TYPES } from '../libs/constants';
+import { CHARGE_SUPPORTED_CHAIN_TYPES, EVM_CHAIN_TYPES } from '../libs/constants';
 
 type PaymentJob = {
   paymentIntentId: string;
@@ -802,14 +803,16 @@ export const handlePayment = async (job: PaymentJob) => {
         wallet,
         delegator: result.delegator,
       });
+      logger.info('PaymentIntent signed', { signed });
       // @ts-ignore
       const { buffer } = await client.encodeTransferV2Tx({ tx: signed });
+      logger.info('PaymentIntent buffer', { buffer, gas: getGasPayerExtra(buffer) });
       const txHash = await client.sendTransferV2Tx(
         // @ts-ignore
         { tx: signed, wallet, delegator: result.delegator },
         getGasPayerExtra(buffer)
       );
-
+      logger.info('PaymentIntent txHash', { txHash });
       logger.info('PaymentIntent capture done', { id: paymentIntent.id, txHash });
 
       await paymentIntent.update({
@@ -1022,3 +1025,21 @@ events.on('payment.queued', async (id, job, args = {}) => {
     events.emit('payment.queued.error', { id, job, error });
   }
 });
+
+export async function startDepositVaultQueue() {
+  logger.debug('startDepositVaultQueue');
+  const paymentCurrencies = (await PaymentCurrency.scope('withVaultConfig').findAll({
+    include: [{ model: PaymentMethod, as: 'payment_method' }],
+  })) as (PaymentCurrency & { payment_method: PaymentMethod })[];
+  await pAll(
+    paymentCurrencies.map((x) => {
+      if (CHARGE_SUPPORTED_CHAIN_TYPES.includes(x.payment_method.type) && x.vault_config?.enabled === true) {
+        depositVaultQueue.push({ id: `deposit-vault-${x.id}`, job: { currencyId: x.id } });
+      }
+      return async () => {};
+    }),
+    {
+      concurrency: 5,
+    }
+  );
+}

package/api/src/routes/customers.ts

@@ -227,6 +227,7 @@ router.get('/:id/overdue/invoices', sessionMiddleware(), async (req, res) => {
       summary,
       invoices,
       subscriptionCount,
+      customer: doc,
     });
   } catch (err) {
     logger.error(err);

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

@@ -8,7 +8,7 @@ import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { PaymentCurrency, TPaymentCurrency } from '../store/models/payment-currency';
 import { PaymentMethod } from '../store/models/payment-method';
-import { EVM_CHAIN_TYPES } from '../libs/constants';
+import { VAULT_BUFFER_THRESHOLD, EVM_CHAIN_TYPES } from '../libs/constants';
 import { ethWallet, getVaultAddress, wallet } from '../libs/auth';
 import { resolveAddressChainTypes } from '../libs/util';
 import { depositVaultQueue } from '../queues/payment';
@@ -215,6 +215,10 @@ router.put('/:id/deposit-vault', auth, async (req, res) => {
   if (!paymentCurrency) {
     return res.status(404).json({ error: 'Payment currency not found' });
   }
+  const vaultAddress = await getVaultAddress();
+  if (!vaultAddress) {
+    return res.status(400).json({ error: 'Vault address not found' });
+  }
   depositVaultQueue.push({
     id: `deposit-vault-${paymentCurrency.id}`,
     job: { currencyId: paymentCurrency.id },
@@ -239,6 +243,7 @@ const UpdateVaultConfigSchema = Joi.object({
   enabled: Joi.boolean().required(),
   deposit_threshold: Joi.number().greater(0).required(),
   withdraw_threshold: Joi.number().min(0).required(),
+  buffer_threshold: Joi.number().greater(0).required(),
 });
 router.put('/:id/vault-config', authOwner, async (req, res) => {
   try {
@@ -254,11 +259,20 @@ router.put('/:id/vault-config', authOwner, async (req, res) => {
       return res.status(404).json({ error: 'payment currency not found' });
     }
 
+    const vaultAddress = await getVaultAddress();
+    if (!vaultAddress) {
+      return res.status(400).json({ error: 'Vault address not found' });
+    }
+
     const updateData: Partial<TPaymentCurrency> = {
       vault_config: {
         enabled: vaultConfig.enabled,
         deposit_threshold: fromTokenToUnit(vaultConfig.deposit_threshold, paymentCurrency.decimal).toString(),
         withdraw_threshold: fromTokenToUnit(vaultConfig.withdraw_threshold, paymentCurrency.decimal).toString(),
+        buffer_threshold: fromTokenToUnit(
+          vaultConfig.buffer_threshold || VAULT_BUFFER_THRESHOLD,
+          paymentCurrency.decimal
+        ).toString(),
       },
     };
 

package/api/src/store/models/types.ts

@@ -299,6 +299,7 @@ export type VaultConfig = {
   enabled: boolean;
   deposit_threshold: string; // 存入阈值
   withdraw_threshold: string; // 提取阈值
+  buffer_threshold: string; // 差额阈值
 };
 
 export type PaymentSettings = {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.28",
+  "version": "1.18.30",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -43,30 +43,30 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.41",
-    "@arcblock/did": "^1.19.19",
+    "@abtnode/cron": "^1.16.42",
+    "@arcblock/did": "^1.20.0",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.12.70",
-    "@arcblock/did-util": "^1.19.19",
-    "@arcblock/jwt": "^1.19.19",
-    "@arcblock/ux": "^2.12.70",
-    "@arcblock/validator": "^1.19.19",
-    "@blocklet/js-sdk": "^1.16.41",
-    "@blocklet/logger": "^1.16.41",
-    "@blocklet/payment-react": "1.18.28",
-    "@blocklet/sdk": "^1.16.41",
-    "@blocklet/ui-react": "^2.12.70",
+    "@arcblock/did-connect": "^2.13.1",
+    "@arcblock/did-util": "^1.20.0",
+    "@arcblock/jwt": "^1.20.0",
+    "@arcblock/ux": "^2.13.1",
+    "@arcblock/validator": "^1.20.0",
+    "@blocklet/js-sdk": "^1.16.42",
+    "@blocklet/logger": "^1.16.42",
+    "@blocklet/payment-react": "1.18.30",
+    "@blocklet/sdk": "^1.16.42",
+    "@blocklet/ui-react": "^2.13.1",
     "@blocklet/uploader": "^0.1.82",
     "@blocklet/xss": "^0.1.31",
     "@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.19.19",
-    "@ocap/client": "^1.19.19",
-    "@ocap/mcrypto": "^1.19.19",
-    "@ocap/util": "^1.19.19",
-    "@ocap/wallet": "^1.19.19",
+    "@ocap/asset": "^1.20.0",
+    "@ocap/client": "^1.20.0",
+    "@ocap/mcrypto": "^1.20.0",
+    "@ocap/util": "^1.20.0",
+    "@ocap/wallet": "^1.20.0",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -119,9 +119,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.41",
+    "@abtnode/types": "^1.16.42",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.28",
+    "@blocklet/payment-types": "1.18.30",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "5e904113fcdc51ef6ef4d67b664ed14f733da384"
+  "gitHead": "ed1753c48ee405a104cd2a0cab87cccb21e70ba8"
 }

package/src/locales/en.tsx

@@ -759,6 +759,10 @@ export default flat({
       enabledNo: 'Disabled',
       depositThreshold: 'Deposit Threshold',
       withdrawThreshold: 'Withdrawal Threshold',
+      bufferThreshold: 'Buffer Threshold',
+      bufferThresholdHelp:
+        'Only when the amount exceeding the deposit threshold reaches the buffer threshold will the collection operation be triggered.',
+      bufferThresholdInvalid: 'Buffer threshold must be greater than 0',
       edit: 'Configure',
       enable: 'Enable',
       editTitle: 'Configure {currency} Vault Settings',

package/src/locales/zh.tsx

@@ -741,6 +741,9 @@ export default flat({
       enabledNo: '未启用',
       depositThreshold: '存入阈值',
       withdrawThreshold: '提取阈值',
+      bufferThreshold: '差额阈值',
+      bufferThresholdHelp: '只有当超出存入阈值的金额达到差额阈值时，才会触发归集操作.',
+      bufferThresholdInvalid: '差额阈值必须大于0',
       edit: '配置',
       enable: '启用',
       editTitle: '配置 {currency} 冷钱包设置',

package/src/pages/admin/settings/vault-config/edit-form.tsx

@@ -20,9 +20,11 @@ type VaultConfigFormData = {
   enabled: boolean;
   deposit_threshold: string;
   withdraw_threshold: string;
+  buffer_threshold: string;
 };
 
-const DEFAULT_DEPOSIT_THRESHOLD = '100';
+const VAULT_DEPOSIT_THRESHOLD = '100';
+const VAULT_BUFFER_THRESHOLD = '10';
 
 const updateVaultConfig = async (currencyId: string, data: VaultConfigFormData) => {
   const res = await api.put(`/api/payment-currencies/${currencyId}/vault-config`, data);
@@ -42,10 +44,13 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
       deposit_threshold:
         item?.vault_config?.deposit_threshold && item?.vault_config?.deposit_threshold !== '0'
           ? formatBNStr(item.vault_config.deposit_threshold, item?.decimal || 18)
-          : DEFAULT_DEPOSIT_THRESHOLD,
+          : VAULT_DEPOSIT_THRESHOLD,
       withdraw_threshold: item?.vault_config?.withdraw_threshold
         ? formatBNStr(item.vault_config.withdraw_threshold, item?.decimal || 18)
         : '0',
+      buffer_threshold: item?.vault_config?.buffer_threshold
+        ? formatBNStr(item.vault_config.buffer_threshold, item?.decimal || 18)
+        : VAULT_BUFFER_THRESHOLD,
     },
     mode: 'onChange',
   });
@@ -58,6 +63,11 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
     return t('admin.vaultConfig.depositThresholdHelp');
   };
 
+  const getBufferHelperText = (error?: { message?: string }) => {
+    if (error) return error.message;
+    return t('admin.vaultConfig.bufferThresholdHelp');
+  };
+
   // const getWithdrawHelperText = (error?: { message?: string }, threshold?: string) => {
   //   if (error) return error.message;
   //   return Number(threshold) === 0
@@ -192,7 +202,52 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
                         },
                       }}
                       sx={{ mt: 1 }}
-                      placeholder={DEFAULT_DEPOSIT_THRESHOLD}
+                      placeholder={VAULT_DEPOSIT_THRESHOLD}
+                    />
+                  )}
+                />
+              </Box>
+
+              {/* 差额阈值设置 */}
+              <Box>
+                {renderLabelWithTooltip(
+                  t('admin.vaultConfig.bufferThreshold'),
+                  t('admin.vaultConfig.bufferThresholdHelp')
+                )}
+                <Controller
+                  name="buffer_threshold"
+                  control={control}
+                  rules={{
+                    required: true,
+                    validate: (value) => {
+                      if (Number(value) <= 0) {
+                        return t('admin.vaultConfig.bufferThresholdInvalid');
+                      }
+                      const validPrecision = formatAmountPrecisionLimit(value.toString(), locale, item.decimal || 6);
+                      return validPrecision || true;
+                    },
+                  }}
+                  render={({ field }) => (
+                    <TextField
+                      {...field}
+                      fullWidth
+                      type="number"
+                      error={!!errors.buffer_threshold}
+                      helperText={getBufferHelperText(errors.buffer_threshold)}
+                      InputProps={{
+                        endAdornment: (
+                          <InputAdornment position="end">
+                            <Box sx={{ display: 'flex', alignItems: 'center', ml: 1 }}>
+                              <Currency logo={item.logo} name={item.symbol} />
+                            </Box>
+                          </InputAdornment>
+                        ),
+                        inputProps: {
+                          min: 0,
+                        },
+                      }}
+                      sx={{ mt: 1 }}
+                      placeholder={VAULT_BUFFER_THRESHOLD}
                     />
                   )}
                 />

package/src/pages/admin/settings/vault-config/index.tsx

@@ -203,6 +203,40 @@ export default function VaultConfig() {
         },
       },
     },
+    {
+      label: t('admin.vaultConfig.bufferThreshold'),
+      name: 'buffer_threshold',
+      options: {
+        customBodyRenderLite: (dataIndex: number) => {
+          const item = data.list?.[dataIndex];
+          if (!item) {
+            return '-';
+          }
+          if (!item?.vault_config) {
+            return (
+              <Typography variant="body2" color="text.secondary">
+                {t('admin.vaultConfig.notConfig')}
+              </Typography>
+            );
+          }
+          return (
+            <Typography variant="body1">
+              {formatBNStr(item.vault_config?.buffer_threshold || '0', item.decimal)} {item.symbol}
+            </Typography>
+          );
+        },
+        customHeadLabelRender: () => {
+          return (
+            <Box display="flex" alignItems="center" gap={1}>
+              {t('admin.vaultConfig.bufferThreshold')}
+              <Tooltip title={t('admin.vaultConfig.bufferThresholdHelp')}>
+                <HelpOutline fontSize="small" sx={{ color: 'text.lighter' }} />
+              </Tooltip>
+            </Box>
+          );
+        },
+      },
+    },
     // {
     //   label: t('admin.vaultConfig.withdrawThreshold'),
     //   name: 'withdraw_threshold',
@@ -289,7 +323,7 @@ export default function VaultConfig() {
             ) : (
               <Link
                 key={part.content}
-                to={`${window.location.origin}/.well-known/service/admin/configuration`}
+                to={`${window.location.origin}/.well-known/service/admin/operations/advanced`}
                 style={{ color: '#3b82f6' }}>
                 {part.content}
               </Link>

package/src/pages/integrations/overview.tsx

@@ -128,7 +128,7 @@ export default function Overview() {
               }}>
               <Box mb={1}>
                 {item.icon}
-                <Typography variant="h6" mt={1.5}>
+                <Typography variant="h4" mt={1.5}>
                   {t(item.title)}
                 </Typography>
               </Box>