payment-kit 1.13.42 → 1.13.44

package/api/src/jobs/payment.ts

@@ -1,9 +1,8 @@
-import { toBN } from '@ocap/util';
-
 import { wallet } from '../libs/auth';
 import dayjs from '../libs/dayjs';
 import CustomError from '../libs/error';
 import logger from '../libs/logger';
+import { isDelegationSufficientForPayment } from '../libs/payment';
 import createQueue from '../libs/queue';
 import { MAX_RETRY_COUNT, getNextRetry } from '../libs/util';
 import { CheckoutSession } from '../store/models/checkout-session';
@@ -66,10 +65,14 @@ export const handlePayment = async (job: PaymentJob) => {
     const payer = paymentSettings?.payment_method_options.arcblock?.payer;
 
     // check balance before capture
-    const result = await client.getAccountTokens({ address: payer, token: paymentCurrency.contract });
-    const balance = result.tokens.find((x: any) => x.address === paymentCurrency.contract)?.balance;
-    if (balance === undefined || toBN(balance).lt(toBN(paymentIntent.amount))) {
-      throw new CustomError('INSUFFICIENT_BALANCE', 'payer balance not enough for this payment');
+    const result = await isDelegationSufficientForPayment({
+      paymentMethod,
+      paymentCurrency,
+      userDid: payer as string,
+      amount: paymentIntent.amount,
+    });
+    if (result.sufficient === false) {
+      throw new CustomError(result.reason, 'payer balance or delegation not sufficient for this payment');
     }
 
     // do the capture

package/api/src/routes/pricing-table.ts

@@ -363,7 +363,10 @@ router.post('/:id/checkout/:priceId', async (req, res) => {
       behavior: 'per_checkout_session',
       factory: req.query.nft_mint_factory as string,
     };
+    raw.nft_mint_status = 'pending';
     logger.info('use nft_mint_settings from query when checkout from pricing table', { v: raw.nft_mint_settings });
+  } else {
+    raw.nft_mint_status = 'disabled';
   }
 
   const session = await CheckoutSession.create(raw as any);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.42",
+  "version": "1.13.44",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -103,7 +103,7 @@
     "@abtnode/types": "1.16.17",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.42",
+    "@did-pay/types": "1.13.44",
     "@types/cookie-parser": "^1.4.5",
     "@types/cors": "^2.8.15",
     "@types/dotenv-flow": "^3.3.2",
@@ -140,5 +140,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "bc5cda38ac03844a02463f1dfa129dbb556038f4"
+  "gitHead": "77f57fdf65d8b465f818f81f410274adf2f60bc6"
 }