payment-kit 1.18.13 → 1.18.15

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

@@ -9,11 +9,16 @@ 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 { ethWallet, getVaultAddress, wallet } from '../libs/auth';
+import { resolveAddressChainTypes } from '../libs/util';
+import { depositVaultQueue } from '../queues/payment';
+import { checkDepositVaultAmount } from '../libs/payment';
+import { getTokenSummaryByDid } from '../integrations/arcblock/stake';
 
 const router = Router();
 
 const auth = authenticate<PaymentCurrency>({ component: true, roles: ['owner', 'admin'] });
-
+const authOwner = authenticate<PaymentCurrency>({ component: true, roles: ['owner'] });
 router.post('/', auth, async (req, res) => {
   const raw: Partial<TPaymentCurrency> = req.body;
 
@@ -140,6 +145,84 @@ router.get('/', auth, async (req, res) => {
   res.json(list);
 });
 
+router.get('/vault-config', auth, async (req, res) => {
+  const vaultAddress = await getVaultAddress();
+  if (!vaultAddress) {
+    return res.json({
+      list: [],
+      balances: {},
+    });
+  }
+  const chainTypes = resolveAddressChainTypes(vaultAddress);
+  try {
+    const paymentMethods = await PaymentMethod.findAll({
+      where: {
+        type: {
+          [Op.in]: chainTypes,
+        },
+      },
+      attributes: ['id'],
+    });
+
+    const paymentMethodIds = paymentMethods.map((method) => method.id);
+    const list = await PaymentCurrency.scope('withVaultConfig').findAll({
+      where: {
+        payment_method_id: {
+          [Op.in]: paymentMethodIds,
+        },
+        livemode: !!req.livemode,
+      },
+      include: [{ model: PaymentMethod, as: 'payment_method' }],
+    });
+    try {
+      const [arcblock, ethereum] = await Promise.all([
+        getTokenSummaryByDid(wallet.address, !!req.livemode, 'arcblock'),
+        getTokenSummaryByDid(ethWallet.address, !!req.livemode, EVM_CHAIN_TYPES),
+      ]);
+      return res.json({
+        list,
+        balances: {
+          ...arcblock,
+          ...ethereum,
+        },
+      });
+    } catch (err) {
+      logger.error('get token summary failed', err);
+      return res.status(400).json({ error: err.message, list, balances: {} });
+    }
+  } catch (err) {
+    logger.error('get payment currency vault config failed', err);
+    return res.status(400).json({ error: err.message, list: [], balances: {} });
+  }
+});
+
+router.get('/:id/deposit-vault', auth, async (req, res) => {
+  const { id } = req.params;
+  if (!id) {
+    return res.status(400).json({ error: 'Missing payment currency id' });
+  }
+  try {
+    const result = await checkDepositVaultAmount(id);
+    return res.json(result);
+  } catch (error) {
+    logger.error('Error checking deposit vault amount', { error, id });
+    return res.status(400).json({ error: 'Failed to check deposit vault amount', message: error.message });
+  }
+});
+
+router.put('/:id/deposit-vault', auth, async (req, res) => {
+  const paymentCurrency = await PaymentCurrency.findByPk(req.params.id);
+  if (!paymentCurrency) {
+    return res.status(404).json({ error: 'Payment currency not found' });
+  }
+  depositVaultQueue.push({
+    id: `deposit-vault-${paymentCurrency.id}`,
+    job: { currencyId: paymentCurrency.id },
+  });
+  logger.info('Deposit vault job pushed', { currencyId: paymentCurrency.id });
+  return res.json({ message: 'Deposit vault job pushed' });
+});
+
 router.get('/:id', auth, async (req, res) => {
   const doc = await PaymentCurrency.findOne({
     where: { [Op.or]: [{ id: req.params.id }, { symbol: req.params.id }] },
@@ -152,6 +235,42 @@ router.get('/:id', auth, async (req, res) => {
   }
 });
 
+const UpdateVaultConfigSchema = Joi.object({
+  enabled: Joi.boolean().required(),
+  deposit_threshold: Joi.number().greater(0).required(),
+  withdraw_threshold: Joi.number().min(0).required(),
+});
+router.put('/:id/vault-config', authOwner, async (req, res) => {
+  try {
+    const { id } = req.params;
+
+    const { error, value: vaultConfig } = UpdateVaultConfigSchema.validate(req.body);
+    if (error) {
+      return res.status(400).json({ error: error.message });
+    }
+
+    const paymentCurrency = await PaymentCurrency.findByPk(id);
+    if (!paymentCurrency) {
+      return res.status(404).json({ error: 'payment currency 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(),
+      },
+    };
+
+    await paymentCurrency.update(updateData);
+
+    return res.json(paymentCurrency.toJSON());
+  } catch (err) {
+    logger.error('update payment currency vault config failed', err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 const updateCurrencySchema = Joi.object({
   name: Joi.string().empty('').optional(),
   description: Joi.string().empty('').optional(),

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

@@ -192,15 +192,25 @@ router.get('/', auth, async (req, res) => {
       include: [{ model: PaymentCurrency, as: 'payment_currencies', order: [['created_at', 'ASC']] }],
     });
     if (query.addresses === 'true') {
-      const [arcblock, ethereum] = await Promise.all([
-        getTokenSummaryByDid(wallet.address, !!req.livemode, 'arcblock'),
-        getTokenSummaryByDid(ethWallet.address, !!req.livemode, EVM_CHAIN_TYPES),
-      ]);
-      res.json({
-        list,
-        addresses: { arcblock: wallet.address, ethereum: ethWallet.address },
-        balances: { ...arcblock, ...ethereum },
-      });
+      try {
+        const [arcblock, ethereum] = await Promise.all([
+          getTokenSummaryByDid(wallet.address, !!req.livemode, 'arcblock'),
+          getTokenSummaryByDid(ethWallet.address, !!req.livemode, EVM_CHAIN_TYPES),
+        ]);
+        res.json({
+          list,
+          addresses: { arcblock: wallet.address, ethereum: ethWallet.address },
+          balances: { ...arcblock, ...ethereum },
+        });
+      } catch (err) {
+        logger.error('get token summary failed', err.message);
+        res.json({
+          list,
+          addresses: { arcblock: wallet.address, ethereum: ethWallet.address },
+          balances: {},
+          error: `get token summary failed: ${err.message}`,
+        });
+      }
     } else {
       res.json(list);
     }

package/api/src/routes/subscriptions.ts

@@ -9,12 +9,7 @@ import uniq from 'lodash/uniq';
 import { literal, Op, OrderItem } from 'sequelize';
 import { BN } from '@ocap/util';
 import { createEvent } from '../libs/audit';
-import {
-  ensureStripeCustomer,
-  ensureStripePaymentCustomer,
-  ensureStripePrice,
-  ensureStripeSubscription,
-} from '../integrations/stripe/resource';
+import { ensureStripeCustomer, ensureStripePrice, ensureStripeSubscription } from '../integrations/stripe/resource';
 import { createListParamSchema, getWhereFromKvQuery, getWhereFromQuery, MetadataSchema } from '../libs/api';
 import dayjs from '../libs/dayjs';
 import logger from '../libs/logger';
@@ -1540,7 +1535,6 @@ router.post('/:id/change-payment', authPortal, async (req, res) => {
         const settings = PaymentMethod.decryptSettings(paymentMethod.settings);
 
         // changing from crypto to stripe: create/resume stripe subscription, pause crypto subscription
-        const stripeCustomer = await ensureStripePaymentCustomer(subscription, paymentMethod);
         const stripeSubscription = await ensureStripeSubscription(
           subscription,
           paymentMethod,
@@ -1554,7 +1548,7 @@ router.post('/:id/change-payment', authPortal, async (req, res) => {
             payment_details: {
               ...subscription.payment_details,
               stripe: {
-                customer_id: stripeCustomer.id,
+                customer_id: stripeSubscription.customer,
                 subscription_id: stripeSubscription.id,
                 setup_intent_id: stripeSubscription.pending_setup_intent?.id,
               },

package/api/src/store/migrations/20250305-vault-config.ts

@@ -0,0 +1,21 @@
+import { DataTypes } from 'sequelize';
+
+import { Migration, safeApplyColumnChanges } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await safeApplyColumnChanges(context, {
+    payment_currencies: [
+      {
+        name: 'vault_config',
+        field: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
+      },
+    ],
+  });
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('payment_currencies', 'vault_config');
+};

package/api/src/store/models/payment-currency.ts

@@ -11,6 +11,7 @@ import {
 } from 'sequelize';
 
 import { createIdGenerator } from '../../libs/util';
+import { VaultConfig } from './types';
 
 const nextId = createIdGenerator('pc', 12);
 
@@ -41,6 +42,7 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
 
   declare created_at: CreationOptional<Date>;
   declare updated_at: CreationOptional<Date>;
+  declare vault_config?: VaultConfig;
 
   public static readonly GENESIS_ATTRIBUTES = {
     id: {
@@ -120,6 +122,10 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
       defaultValue: DataTypes.NOW,
       allowNull: false,
     },
+    vault_config: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
   };
 
   public static initialize(sequelize: any) {
@@ -129,6 +135,14 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
       tableName: 'payment_currencies',
       createdAt: 'created_at',
       updatedAt: 'updated_at',
+      defaultScope: {
+        attributes: { exclude: ['vault_config'] },
+      },
+      scopes: {
+        withVaultConfig: {
+          attributes: { include: ['vault_config'] },
+        },
+      },
     });
   }
 

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

@@ -251,6 +251,27 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
       raw: true,
     }).then((res) => res.rows);
   }
+
+  public static async getPayoutLockedAmount(where?: any) {
+    const payouts = await Payout.findAll({
+      where: {
+        status: {
+          [Op.in]: ['pending', 'in_transit'],
+        },
+        ...(where || {}),
+      },
+      attributes: ['amount'],
+    });
+
+    return payouts.reduce((acc: GroupedBN, payout) => {
+      const key = payout.currency_id;
+      if (!acc[key]) {
+        acc[key] = '0';
+      }
+      acc[key] = new BN(acc[key]).add(new BN(payout.amount)).toString();
+      return acc;
+    }, {});
+  }
 }
 
 export type TPayout = InferAttributes<Payout>;

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

@@ -290,6 +290,12 @@ export type PaymentMethodSettings = {
   };
 };
 
+export type VaultConfig = {
+  enabled: boolean;
+  deposit_threshold: string; // 存入阈值
+  withdraw_threshold: string; // 提取阈值
+};
+
 export type PaymentSettings = {
   payment_method_options: PaymentMethodOptions;
   payment_method_types: string[];

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.13",
+  "version": "1.18.15",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.39",
-    "@arcblock/did": "^1.19.14",
+    "@arcblock/did": "^1.19.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.11.48",
-    "@arcblock/did-util": "^1.19.14",
-    "@arcblock/jwt": "^1.19.14",
-    "@arcblock/ux": "^2.11.48",
-    "@arcblock/validator": "^1.19.14",
+    "@arcblock/did-connect": "^2.12.12",
+    "@arcblock/did-util": "^1.19.15",
+    "@arcblock/jwt": "^1.19.15",
+    "@arcblock/ux": "^2.12.12",
+    "@arcblock/validator": "^1.19.15",
     "@blocklet/js-sdk": "^1.16.39",
     "@blocklet/logger": "^1.16.39",
-    "@blocklet/payment-react": "1.18.13",
+    "@blocklet/payment-react": "1.18.15",
     "@blocklet/sdk": "^1.16.39",
-    "@blocklet/ui-react": "^2.11.48",
+    "@blocklet/ui-react": "^2.12.12",
     "@blocklet/uploader": "^0.1.71",
     "@blocklet/xss": "^0.1.27",
     "@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.14",
-    "@ocap/client": "^1.19.14",
-    "@ocap/mcrypto": "^1.19.14",
-    "@ocap/util": "^1.19.14",
-    "@ocap/wallet": "^1.19.14",
+    "@ocap/asset": "^1.19.15",
+    "@ocap/client": "^1.19.15",
+    "@ocap/mcrypto": "^1.19.15",
+    "@ocap/util": "^1.19.15",
+    "@ocap/wallet": "^1.19.15",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -80,7 +80,7 @@
     "dayjs": "^1.11.12",
     "debug": "^4.3.6",
     "dotenv-flow": "^3.3.0",
-    "ethers": "^6.13.2",
+    "ethers": "^6.13.5",
     "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.39",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.13",
+    "@blocklet/payment-types": "1.18.15",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -151,7 +151,7 @@
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.22",
+    "vite-plugin-blocklet": "^0.9.23",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "b26aa859ba5961c7a8dedfc238a31476cf16036c"
+  "gitHead": "fd58f00bb5d9c625439c03577d9b5f33676823e2"
 }