payment-kit 1.18.11 → 1.18.12

package/api/src/routes/connect/change-payment.ts

@@ -17,6 +17,7 @@ import logger from '../../libs/logger';
 export default {
   action: 'change-payment',
   authPrincipal: false,
+  persistentDynamicClaims: true,
   claims: {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {
       const { paymentMethod } = await ensureChangePaymentContext(extraParams.subscriptionId);

package/api/src/routes/connect/change-plan.ts

@@ -21,6 +21,7 @@ import logger from '../../libs/logger';
 export default {
   action: 'change-plan',
   authPrincipal: false,
+  persistentDynamicClaims: true,
   claims: {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {
       const { paymentMethod } = await ensureSubscription(extraParams.subscriptionId);

package/api/src/routes/connect/setup.ts

@@ -22,6 +22,7 @@ import { EVM_CHAIN_TYPES } from '../../libs/constants';
 export default {
   action: 'setup',
   authPrincipal: false,
+  persistentDynamicClaims: true,
   claims: {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {
       const { paymentMethod } = await ensureSetupIntent(extraParams.checkoutSessionId);

package/api/src/routes/connect/shared.ts

@@ -1011,6 +1011,7 @@ export async function executeOcapTransactions(
   nonce?: string
 ) {
   const client = paymentMethod.getOcapClient();
+  logger.info('start executeOcapTransactions', claims);
   const delegation = claims.find((x) => x.type === 'signature' && x.meta?.purpose === 'delegation');
   const staking = claims.find((x) => x.type === 'prepareTx' && x.meta?.purpose === 'staking');
   const transactions = [
@@ -1021,40 +1022,45 @@ export async function executeOcapTransactions(
   const stakingAmount =
     staking?.requirement?.tokens?.find((x: any) => x.address === paymentCurrencyContract)?.value || '0';
 
-  const [delegationTxHash, stakingTxHash] = await Promise.all(
-    transactions.map(async ([claim, type]) => {
-      if (!claim) {
-        return '';
-      }
-
-      const tx: Partial<Transaction> = client.decodeTx(claim.finalTx || claim.origin);
-      if (claim.sig) {
-        tx.signature = claim.sig;
-      }
-
-      // @ts-ignore
-      const { buffer } = await client[`encode${type}Tx`]({ tx });
-      // @ts-ignore
-      const txHash = await client[`send${type}Tx`](
-        // @ts-ignore
-        { tx, wallet: fromPublicKey(userPk, toTypeInfo(userDid)) },
-        getGasPayerExtra(buffer, client.pickGasPayerHeaders(request))
+    try {
+      const [delegationTxHash, stakingTxHash] = await Promise.all(
+        transactions.map(async ([claim, type]) => {
+          if (!claim) {
+            return '';
+          }
+    
+          const tx: Partial<Transaction> = client.decodeTx(claim.finalTx || claim.origin);
+          if (claim.sig) {
+            tx.signature = claim.sig;
+          }
+    
+          // @ts-ignore
+          const { buffer } = await client[`encode${type}Tx`]({ tx });
+          // @ts-ignore
+          const txHash = await client[`send${type}Tx`](
+            // @ts-ignore
+            { tx, wallet: fromPublicKey(userPk, toTypeInfo(userDid)) },
+            getGasPayerExtra(buffer, client.pickGasPayerHeaders(request))
+          );
+    
+          return txHash;
+        })
       );
-
-      return txHash;
-    })
-  );
-
-  return {
-    tx_hash: delegationTxHash,
-    payer: userDid,
-    type: 'delegate',
-    staking: {
-      tx_hash: stakingTxHash,
-      address: await getCustomerStakeAddress(userDid, nonce || subscriptionId || ''),
-    },
-    stakingAmount,
-  };
+      
+      return {
+        tx_hash: delegationTxHash,
+        payer: userDid,
+        type: 'delegate',
+        staking: {
+          tx_hash: stakingTxHash,
+          address: await getCustomerStakeAddress(userDid, nonce || subscriptionId || ''),
+        },
+        stakingAmount,
+      };
+    } catch (err) {
+      logger.error('executeOcapTransactions failed', err);
+      throw err;
+    }
 }
 
 

package/api/src/routes/connect/subscribe.ts

@@ -23,6 +23,7 @@ import { EVM_CHAIN_TYPES } from '../../libs/constants';
 export default {
   action: 'subscription',
   authPrincipal: false,
+  persistentDynamicClaims: true,
   claims: {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {
       const { paymentMethod } = await ensurePaymentIntent(extraParams.checkoutSessionId);
@@ -151,15 +152,15 @@ export default {
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
     }
-
+    const paymentSettings = {
+      payment_method_types: [paymentMethod.type],
+      payment_method_options: {
+        [paymentMethod.type]: { payer: userDid },
+      },
+    };
     const prepareTxExecution = async () => {
       await subscription.update({
-        payment_settings: {
-          payment_method_types: [paymentMethod.type],
-          payment_method_options: {
-            [paymentMethod.type]: { payer: userDid },
-          },
-        },
+        payment_settings: paymentSettings,
       });
     };
 
@@ -179,7 +180,9 @@ export default {
     if (paymentMethod.type === 'arcblock') {
       await prepareTxExecution();
       const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, subscription });
-
+      if (invoice) {
+        await invoice.update({ payment_settings: paymentSettings });
+      }
       const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
         userDid,
         userPk,
@@ -217,6 +220,9 @@ export default {
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
       await prepareTxExecution();
       const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, subscription });
+      if (invoice) {
+        await invoice.update({ payment_settings: paymentSettings });
+      }
       broadcastEvmTransaction(checkoutSessionId, 'pending', claimsList);
 
       const paymentDetails = await executeEvmTransaction('approve', userDid, claimsList, paymentMethod);

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.11
+version: 1.18.12
 logo: logo.png
 files:
   - dist
@@ -165,4 +165,4 @@ events:
   - type: invoice.paid
     description: Invoice has been fully paid and settled
   - type: refund.succeeded
-    description: Refund has been successfully processed and completed
+    description: Refund has been successfully processed and completed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.11",
+  "version": "1.18.12",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.39",
-    "@arcblock/did": "^1.19.10",
+    "@arcblock/did": "^1.19.14",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@arcblock/did-connect": "^2.11.48",
-    "@arcblock/did-util": "^1.19.10",
-    "@arcblock/jwt": "^1.19.10",
+    "@arcblock/did-util": "^1.19.14",
+    "@arcblock/jwt": "^1.19.14",
     "@arcblock/ux": "^2.11.48",
-    "@arcblock/validator": "^1.19.10",
+    "@arcblock/validator": "^1.19.14",
     "@blocklet/js-sdk": "^1.16.39",
     "@blocklet/logger": "^1.16.39",
-    "@blocklet/payment-react": "1.18.11",
+    "@blocklet/payment-react": "1.18.12",
     "@blocklet/sdk": "^1.16.39",
     "@blocklet/ui-react": "^2.11.48",
-    "@blocklet/uploader": "^0.1.70",
-    "@blocklet/xss": "^0.1.25",
+    "@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.10",
-    "@ocap/client": "^1.19.10",
-    "@ocap/mcrypto": "^1.19.10",
-    "@ocap/util": "^1.19.10",
-    "@ocap/wallet": "^1.19.10",
+    "@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",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.39",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.11",
+    "@blocklet/payment-types": "1.18.12",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "370cb327400359ab5972ef60316ccd7fc86c174e"
+  "gitHead": "7efd2af5c272e4928da6864edfcbd3f9054c722b"
 }