payment-kit 1.13.58 → 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.58
+version: 1.13.60
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.58",
+  "version": "1.13.60",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -40,28 +40,28 @@
     ]
   },
   "dependencies": {
-    "@arcblock/did": "^1.18.95",
+    "@arcblock/did": "^1.18.101",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.8.14",
-    "@arcblock/did-util": "^1.18.95",
-    "@arcblock/jwt": "^1.18.95",
-    "@arcblock/ux": "^2.8.14",
+    "@arcblock/did-connect": "^2.8.17",
+    "@arcblock/did-util": "^1.18.101",
+    "@arcblock/jwt": "^1.18.101",
+    "@arcblock/ux": "^2.8.17",
     "@blocklet/logger": "1.16.18",
     "@blocklet/sdk": "1.16.18",
-    "@blocklet/ui-react": "^2.8.14",
+    "@blocklet/ui-react": "^2.8.17",
     "@blocklet/uploader": "^0.0.38",
     "@mui/icons-material": "^5.14.18",
     "@mui/lab": "^5.0.0-alpha.153",
     "@mui/material": "^5.14.18",
     "@mui/styles": "^5.14.18",
     "@mui/system": "^5.14.18",
-    "@ocap/asset": "^1.18.95",
-    "@ocap/client": "^1.18.95",
-    "@ocap/mcrypto": "^1.18.95",
-    "@ocap/util": "^1.18.95",
-    "@ocap/wallet": "^1.18.95",
-    "@stripe/react-stripe-js": "^2.3.2",
-    "@stripe/stripe-js": "^2.1.11",
+    "@ocap/asset": "^1.18.101",
+    "@ocap/client": "^1.18.101",
+    "@ocap/mcrypto": "^1.18.101",
+    "@ocap/util": "^1.18.101",
+    "@ocap/wallet": "^1.18.101",
+    "@stripe/react-stripe-js": "^2.4.0",
+    "@stripe/stripe-js": "^2.2.0",
     "ahooks": "^3.7.8",
     "axios": "^0.27.2",
     "body-parser": "^1.20.2",
@@ -89,9 +89,9 @@
     "react-error-boundary": "^4.0.11",
     "react-hook-form": "^7.48.2",
     "react-international-phone": "^3.1.2",
-    "react-router-dom": "^6.18.0",
+    "react-router-dom": "^6.20.0",
     "rimraf": "^3.0.2",
-    "sequelize": "^6.35.0",
+    "sequelize": "^6.35.1",
     "sqlite3": "^5.1.6",
     "stripe": "^13.11.0",
     "typewriter-effect": "^2.21.0",
@@ -104,18 +104,18 @@
     "@abtnode/types": "1.16.18",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.58",
+    "@did-pay/types": "1.13.60",
     "@types/cookie-parser": "^1.4.6",
-    "@types/cors": "^2.8.16",
+    "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
     "@types/express": "^4.17.21",
-    "@types/node": "^18.18.9",
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
+    "@types/node": "^18.18.13",
+    "@types/react": "^18.2.39",
+    "@types/react-dom": "^18.2.17",
     "@vitejs/plugin-react": "^2.2.0",
     "bumpp": "^8.2.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.53.0",
+    "eslint": "^8.54.0",
     "import-sort-style-module": "^6.0.0",
     "lint-staged": "^12.5.0",
     "nodemon": "^2.0.22",
@@ -123,7 +123,7 @@
     "prettier": "^2.8.8",
     "prettier-plugin-import-sort": "^0.0.7",
     "ts-node": "^10.9.1",
-    "type-fest": "^4.7.1",
+    "type-fest": "^4.8.2",
     "typescript": "^4.9.5",
     "vite": "^4.5.0",
     "vite-plugin-blocklet": "^0.6.15",
@@ -141,5 +141,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "a3c5b252962afff89885e7b244ef44c6023d0504"
+  "gitHead": "8e15e9d178ebb2c038066ae2b17f95415b6919cb"
 }