payment-kit 1.13.59 → 1.13.60

package/api/src/jobs/payment.ts

@@ -1,6 +1,8 @@
+import { ensureStakedForGas } from '../integrations/blockchain/stake';
 import { wallet } from '../libs/auth';
 import dayjs from '../libs/dayjs';
 import CustomError from '../libs/error';
+import { events } from '../libs/event';
 import logger from '../libs/logger';
 import { getGasPayerExtra, isDelegationSufficientForPayment } from '../libs/payment';
 import createQueue from '../libs/queue';
@@ -246,6 +248,15 @@ export const paymentQueue = createQueue<PaymentJob>({
 });
 
 export const startPaymentQueue = async () => {
+  // Do gas stake as soon as possible after payment succeed
+  events.on('payment_intent.succeeded', async (paymentIntent: PaymentIntent) => {
+    const paymentMethod = await PaymentMethod.findByPk(paymentIntent.payment_method_id);
+    if (paymentMethod && paymentMethod.type === 'arcblock') {
+      ensureStakedForGas();
+    }
+  });
+
+  // Restore previous payments
   const payments = await PaymentIntent.findAll({
     where: {
       status: ['requires_capture', 'processing'],

package/api/src/routes/checkout-sessions.ts

@@ -721,6 +721,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
           invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
         } else {
+          await paymentIntent.update({ status: 'requires_capture' });
           paymentQueue.push({
             id: paymentIntent.id,
             job: { paymentIntentId: paymentIntent.id, paymentSettings, retryOnError: false },

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.59",
+  "version": "1.13.60",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -104,7 +104,7 @@
     "@abtnode/types": "1.16.18",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.59",
+    "@did-pay/types": "1.13.60",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -141,5 +141,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "b07b1b9616fd429159569c18d9971cc654037da7"
+  "gitHead": "8e15e9d178ebb2c038066ae2b17f95415b6919cb"
 }