payment-kit 1.13.38 → 1.13.39

package/api/src/jobs/payment.ts

@@ -1,5 +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 createQueue from '../libs/queue';
 import { MAX_RETRY_COUNT, getNextRetry } from '../libs/util';
@@ -59,8 +62,18 @@ export const handlePayment = async (job: PaymentJob) => {
   // try payment capture and reschedule on error
   logger.info(`PaymentIntent capture attempt: ${paymentIntent.id}`);
   try {
-    await paymentIntent.update({ status: 'processing' });
     const client = paymentMethod.getOcapClient();
+    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');
+    }
+
+    // do the capture
+    await paymentIntent.update({ status: 'processing' });
     const txHash = await client.sendTransferV2Tx({
       tx: {
         itx: {
@@ -78,7 +91,7 @@ export const handlePayment = async (job: PaymentJob) => {
           },
         },
       },
-      delegator: paymentSettings?.payment_method_options.arcblock?.payer,
+      delegator: payer,
       wallet,
     });
     logger.info(`PaymentIntent capture done: ${paymentIntent.id} with tx ${txHash}`);
@@ -89,7 +102,7 @@ export const handlePayment = async (job: PaymentJob) => {
       payment_details: {
         arcblock: {
           tx_hash: txHash,
-          payer: paymentSettings?.payment_method_options.arcblock?.payer as string,
+          payer: payer as string,
         },
       },
     });
@@ -129,7 +142,7 @@ export const handlePayment = async (job: PaymentJob) => {
             payment_details: {
               arcblock: {
                 tx_hash: txHash,
-                payer: paymentSettings?.payment_method_options.arcblock?.payer as string,
+                payer: payer as string,
               },
             },
           });

package/api/src/libs/error.ts

@@ -0,0 +1,13 @@
+export default class CustomError extends Error {
+  code: string;
+
+  constructor(code = 'GENERIC', ...params: any[]) {
+    super(...params);
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, CustomError);
+    }
+
+    this.code = code;
+  }
+}

package/api/src/libs/queue/store.ts

@@ -1,7 +1,7 @@
 import { Op } from 'sequelize';
 
 import { Job, TJob } from '../../store/models/job';
-import { CustomError } from '../util';
+import CustomError from '../error';
 
 export default function createQueueStore(queue: string) {
   return {

package/api/src/libs/util.ts

@@ -119,20 +119,6 @@ export function tryWithTimeout(asyncFn: Function, timeout = 5000) {
   });
 }
 
-export class CustomError extends Error {
-  code: string;
-
-  constructor(code = 'GENERIC', ...params: any) {
-    super(...params);
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, CustomError);
-    }
-
-    this.code = code;
-  }
-}
-
 // simple exponential delay: 2^retryCount
 export const getNextRetry = (retryCount: number) => {
   const delay = 2 ** retryCount;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.38",
+  "version": "1.13.39",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -103,7 +103,7 @@
     "@abtnode/types": "1.16.17-beta-952ef53d",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.38",
+    "@did-pay/types": "1.13.39",
     "@types/cookie-parser": "^1.4.5",
     "@types/cors": "^2.8.15",
     "@types/dotenv-flow": "^3.3.2",
@@ -140,5 +140,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "961b898e9ee66e55ffcbd9247987812f6ed61fe3"
+  "gitHead": "d50fe71988ab503ca4f0adf0eef4293008a3ae4f"
 }