payment-kit 1.13.49 → 1.13.50

package/api/src/integrations/stripe/handlers/payment-intent.ts

@@ -13,6 +13,7 @@ import { handleStripeInvoiceCreated } from './invoice';
 export async function handleStripePaymentSucceed(paymentIntent: PaymentIntent, event?: TEventExpanded) {
   await paymentIntent.update({
     status: 'succeeded',
+    last_payment_error: null,
     amount_received: paymentIntent.amount,
     payment_details: merge(
       paymentIntent.metadata,

package/api/src/jobs/payment.ts

@@ -2,7 +2,7 @@ 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 { getGasPayerExtra, isDelegationSufficientForPayment } from '../libs/payment';
 import createQueue from '../libs/queue';
 import { MAX_RETRY_COUNT, getNextRetry } from '../libs/util';
 import { CheckoutSession } from '../store/models/checkout-session';
@@ -128,12 +128,14 @@ export const handlePayment = async (job: PaymentJob) => {
       amount: paymentIntent.amount,
     });
     if (result.sufficient === false) {
+      logger.error('PaymentIntent capture aborted on preCheck', { id: paymentIntent.id, result });
+      // FIXME: send email to customer, pause subscription
       throw new CustomError(result.reason, 'payer balance or delegation not sufficient for this payment');
     }
 
     // do the capture
     await paymentIntent.update({ status: 'processing' });
-    const txHash = await client.sendTransferV2Tx({
+    const signed = await client.signTransferV2Tx({
       tx: {
         itx: {
           to: wallet.address,
@@ -150,14 +152,20 @@ export const handlePayment = async (job: PaymentJob) => {
           },
         },
       },
-      delegator: payer,
       wallet,
+      delegator: payer,
     });
+    // @ts-ignore
+    const { buffer } = await client.encodeTransferV2Tx({ tx: signed });
+    // @ts-ignore
+    const txHash = await client.sendTransferV2Tx({ tx: signed, wallet, delegator: payer }, getGasPayerExtra(buffer));
+
     logger.info(`PaymentIntent capture done: ${paymentIntent.id} with tx ${txHash}`);
 
     await paymentIntent.update({
       status: 'succeeded',
       amount_received: paymentIntent.amount,
+      last_payment_error: null,
       payment_details: {
         arcblock: {
           tx_hash: txHash,

package/api/src/libs/payment.ts

@@ -1,6 +1,8 @@
 import { toDelegateAddress } from '@arcblock/did-util';
+import { sign } from '@arcblock/jwt';
 import { getWalletDid } from '@blocklet/sdk/lib/did';
 import type { DelegateState } from '@ocap/client';
+import { toTxHash } from '@ocap/mcrypto';
 import { BN } from '@ocap/util';
 
 import type { TPaymentCurrency } from '../store/models/payment-currency';
@@ -42,7 +44,7 @@ export async function isDelegationSufficientForPayment(args: {
     if (!token) {
       return { sufficient: false, reason: 'NO_TOKEN' };
     }
-    if (new BN(token.balance).lte(new BN(amount))) {
+    if (new BN(token.balance).lt(new BN(amount))) {
       return { sufficient: false, reason: 'NO_ENOUGH_TOKEN' };
     }
 
@@ -55,3 +57,13 @@ export async function isDelegationSufficientForPayment(args: {
 
   throw new Error(`Payment method ${paymentMethod.type} not supported`);
 }
+
+export function getGasPayerExtra(txBuffer: Buffer) {
+  const txHash = toTxHash(txBuffer);
+  return {
+    headers: {
+      'x-gas-payer-sig': sign(wallet.address, wallet.secretKey, { txHash }),
+      'x-gas-payer-pk': wallet.publicKey,
+    },
+  };
+}

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

@@ -506,11 +506,17 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           return res.status(403).json({ code: 'PAYMENT_PROCESSING', error: 'Checkout session payment processing' });
         }
         paymentIntent = await paymentIntent.update({
+          status: 'requires_capture',
           amount: checkoutSession.amount_total,
           customer_id: customer.id,
           currency_id: paymentCurrency.id,
           payment_method_id: paymentMethod.id,
           receipt_email: customer.email,
+          last_payment_error: null,
+        });
+        logger.info('payment intent for checkout session reset', {
+          session: checkoutSession.id,
+          intent: paymentIntent.id,
         });
       } else {
         paymentIntent = await PaymentIntent.create({
@@ -547,7 +553,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
     }
 
     let setupIntent: SetupIntent | null = null;
-    if (checkoutSession.mode === 'setup' || paymentMethod.type !== 'stripe') {
+    if (checkoutSession.mode === 'setup' && paymentMethod.type !== 'stripe') {
       if (checkoutSession.setup_intent_id) {
         setupIntent = await SetupIntent.findByPk(checkoutSession.setup_intent_id);
       }
@@ -563,16 +569,22 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           return res.status(403).json({ code: 'SETUP_PROCESSING', error: 'Checkout session setup processing' });
         }
         await setupIntent.update({
+          status: 'requires_capture',
           customer_id: customer.id,
           currency_id: paymentCurrency.id,
           payment_method_id: paymentMethod.id,
+          last_setup_error: null,
+        });
+        logger.info('setup intent for checkout session reset', {
+          session: checkoutSession.id,
+          intent: setupIntent.id,
         });
       } else {
         // ensure payment intent
         setupIntent = await SetupIntent.create({
           livemode: !!checkoutSession.livemode,
           customer_id: customer.id,
-          description: '',
+          description: checkoutSession.payment_intent_data?.description || '',
           currency_id: paymentCurrency.id,
           payment_method_id: paymentMethod.id,
           status: 'requires_payment_method',
@@ -698,20 +710,15 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
         });
       }
       if (checkoutSession.mode === 'payment' && paymentIntent) {
-        await paymentIntent.update({ status: 'requires_capture' });
         const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
         if (invoice) {
           await invoice.update({ auto_advance: true, payment_settings: paymentSettings });
           invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
         } else {
-          const job = paymentQueue.push({
+          paymentQueue.push({
             id: paymentIntent.id,
             job: { paymentIntentId: paymentIntent.id, paymentSettings, retryOnError: false },
           });
-          job.on('finished', async () => {
-            await checkoutSession.update({ status: 'complete', payment_status: 'paid' });
-            logger.info(`CheckoutSession ${checkoutSession.id} updated on payment done ${paymentIntent?.id}`);
-          });
         }
       }
       if (checkoutSession.mode === 'setup' && setupIntent && subscription) {

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

@@ -5,6 +5,7 @@ import { invoiceQueue } from '../../jobs/invoice';
 import { handlePaymentSucceed, paymentQueue } from '../../jobs/payment';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
+import { getGasPayerExtra } from '../../libs/payment';
 import { getTxMetadata } from '../../libs/util';
 import { ensureInvoiceForCollect, getAuthPrincipalClaim } from './shared';
 
@@ -49,7 +50,7 @@ export default {
 
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
-  onAuth: async ({ userDid, claims, request, extraParams }: CallbackArgs) => {
+  onAuth: async ({ userDid, claims, extraParams }: CallbackArgs) => {
     const { invoiceId } = extraParams;
     const { invoice, paymentIntent, paymentMethod } = await ensureInvoiceForCollect(invoiceId);
 
@@ -64,16 +65,19 @@ export default {
         tx.from = claim.from;
       }
 
+      // @ts-ignore
+      const { buffer } = await client.encodeTransferV3Tx({ tx });
       const txHash = await client.sendTransferV3Tx(
         // @ts-ignore
         { tx, wallet: fromAddress(userDid) },
-        { headers: client.pickGasPayerHeaders(request) }
+        getGasPayerExtra(buffer)
       );
 
       await paymentIntent.update({
         status: 'succeeded',
         amount_received: invoice.amount_due,
         capture_method: 'manual',
+        last_payment_error: null,
         payment_details: {
           arcblock: {
             tx_hash: txHash,

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

@@ -4,6 +4,7 @@ import { fromAddress } from '@ocap/wallet';
 import { handlePaymentSucceed } from '../../jobs/payment';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
+import { getGasPayerExtra } from '../../libs/payment';
 import { getTxMetadata } from '../../libs/util';
 import { ensureInvoiceForCheckout, ensurePaymentIntent, getAuthPrincipalClaim } from './shared';
 
@@ -50,7 +51,7 @@ export default {
 
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
-  onAuth: async ({ userDid, claims, request, extraParams }: CallbackArgs) => {
+  onAuth: async ({ userDid, claims, extraParams }: CallbackArgs) => {
     const { checkoutSessionId } = extraParams;
     const { checkoutSession, customer, paymentIntent, paymentMethod } = await ensurePaymentIntent(
       checkoutSessionId,
@@ -73,15 +74,18 @@ export default {
         tx.from = claim.from;
       }
 
+      // @ts-ignore
+      const { buffer } = await client.encodeTransferV3Tx({ tx });
       const txHash = await client.sendTransferV3Tx(
         // @ts-ignore
         { tx, wallet: fromAddress(userDid) },
-        { headers: client.pickGasPayerHeaders(request) }
+        getGasPayerExtra(buffer)
       );
 
       await paymentIntent.update({
         status: 'succeeded',
         amount_received: paymentIntent.amount,
+        last_payment_error: null,
         payment_details: {
           arcblock: {
             tx_hash: txHash,

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

@@ -6,6 +6,7 @@ import { fromPublicKey } from '@ocap/wallet';
 import { subscriptionQueue } from '../../jobs/subscription';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
+import { getGasPayerExtra } from '../../libs/payment';
 import { getFastCheckoutAmount } from '../../libs/session';
 import { getTxMetadata } from '../../libs/util';
 import type { TLineItemExpanded } from '../../store/models';
@@ -56,7 +57,7 @@ export default {
           },
           nonce: checkoutSessionId,
           requirement: {
-            tokens: [{ address: paymentCurrency.contract as string, value: amount }],
+            tokens: amount === '0' ? [] : [{ address: paymentCurrency.contract as string, value: amount }],
           },
           chainInfo: {
             host: paymentMethod.settings?.arcblock?.api_host as string,
@@ -68,7 +69,7 @@ export default {
 
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
-  onAuth: async ({ userDid, userPk, claims, request, extraParams }: CallbackArgs) => {
+  onAuth: async ({ userDid, userPk, claims, extraParams }: CallbackArgs) => {
     const { checkoutSessionId } = extraParams;
     const { setupIntent, checkoutSession, paymentMethod, subscription } = await ensureSetupIntent(
       checkoutSessionId,
@@ -80,6 +81,7 @@ export default {
     }
 
     if (paymentMethod.type === 'arcblock') {
+      await setupIntent.update({ status: 'processing' });
       await subscription.update({
         payment_settings: {
           payment_method_types: ['arcblock'],
@@ -94,15 +96,20 @@ export default {
 
       // execute the delegate tx
       const tx: Partial<Transaction> = client.decodeTx(claim.origin);
+      tx.signature = claim.sig;
+
+      // @ts-ignore
+      const { buffer } = await client.encodeDelegateTx({ tx });
       const txHash = await client.sendDelegateTx(
         // @ts-ignore
-        { tx, wallet: fromPublicKey(userPk, toTypeInfo(userDid)), signature: claim.sig },
-        { headers: client.pickGasPayerHeaders(request) }
+        { tx, wallet: fromPublicKey(userPk, toTypeInfo(userDid)) },
+        getGasPayerExtra(buffer)
       );
 
       await setupIntent.update({
         status: 'succeeded',
         payment_method_types: ['arcblock'],
+        last_setup_error: null,
         payment_method_options: {
           arcblock: { payer: userDid },
         },

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

@@ -226,9 +226,20 @@ export async function ensureInvoiceForCheckout({
 
   // Do not create invoice if it's already created
   if (checkoutSession.invoice_id) {
-    logger.warn(`Invoice already created for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
+    logger.info(`Invoice already created for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
+    const invoice = await Invoice.findByPk(checkoutSession.invoice_id);
+    if (invoice) {
+      await invoice.update({ status: 'open' });
+      logger.info(`Invoice status reset for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
+      if (invoice.payment_intent_id) {
+        await PaymentIntent.update({ status: 'requires_capture' }, { where: { id: invoice.payment_intent_id } });
+        logger.info(
+          `PaymentIntent status reset for checkout session ${checkoutSession.id}: ${invoice.payment_intent_id}`
+        );
+      }
+    }
     return {
-      invoice: await Invoice.findByPk(checkoutSession.invoice_id),
+      invoice,
       items: await InvoiceItem.findAll({ where: { invoice_id: checkoutSession.invoice_id } }),
     };
   }

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

@@ -8,6 +8,7 @@ import { invoiceQueue } from '../../jobs/invoice';
 import { subscriptionQueue } from '../../jobs/subscription';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
+import { getGasPayerExtra } from '../../libs/payment';
 import { getFastCheckoutAmount } from '../../libs/session';
 import { getTxMetadata } from '../../libs/util';
 import type { TLineItemExpanded } from '../../store/models';
@@ -58,7 +59,7 @@ export default {
           },
           nonce: checkoutSessionId,
           requirement: {
-            tokens: [{ address: paymentCurrency.contract as string, value: amount }],
+            tokens: amount === '0' ? [] : [{ address: paymentCurrency.contract as string, value: amount }],
           },
           chainInfo: {
             host: paymentMethod.settings?.arcblock?.api_host as string,
@@ -70,7 +71,7 @@ export default {
 
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
-  onAuth: async ({ userDid, userPk, claims, request, extraParams }: CallbackArgs) => {
+  onAuth: async ({ userDid, userPk, claims, extraParams }: CallbackArgs) => {
     const { checkoutSessionId } = extraParams;
     const { checkoutSession, customer, paymentMethod, paymentCurrency, subscription } = await ensurePaymentIntent(
       checkoutSessionId,
@@ -109,10 +110,14 @@ export default {
 
       // execute the delegate tx
       const tx: Partial<Transaction> = client.decodeTx(claim.origin);
+      tx.signature = claim.sig;
+
+      // @ts-ignore
+      const { buffer } = await client.encodeDelegateTx({ tx });
       const txHash = await client.sendDelegateTx(
         // @ts-ignore
-        { tx, wallet: fromPublicKey(userPk, toTypeInfo(userDid)), signature: claim.sig },
-        { headers: client.pickGasPayerHeaders(request) }
+        { tx, wallet: fromPublicKey(userPk, toTypeInfo(userDid)) },
+        getGasPayerExtra(buffer)
       );
 
       await subscription.update({

package/api/src/store/models/payment-intent.ts

@@ -35,7 +35,7 @@ export class PaymentIntent extends Model<InferAttributes<PaymentIntent>, InferCr
   declare last_charge?: string;
 
   // The payment error encountered in the previous PaymentIntent confirmation
-  declare last_payment_error?: PaymentError;
+  declare last_payment_error: PaymentError | null;
 
   declare metadata?: Record<string, any>;
 

package/api/src/store/models/setup-intent.ts

@@ -22,7 +22,7 @@ export class SetupIntent extends Model<InferAttributes<SetupIntent>, InferCreati
   declare customer_id: string;
 
   // The setup error encountered in the previous SetupIntent confirmation
-  declare last_setup_error?: PaymentError;
+  declare last_setup_error: PaymentError | null;
 
   declare metadata?: Record<string, 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.49
+version: 1.13.50
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.49",
+  "version": "1.13.50",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -44,6 +44,7 @@
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@arcblock/did-connect": "^2.8.7",
     "@arcblock/did-util": "^1.18.95",
+    "@arcblock/jwt": "^1.18.95",
     "@arcblock/ux": "^2.8.7",
     "@blocklet/logger": "1.16.17",
     "@blocklet/sdk": "1.16.17",
@@ -103,7 +104,7 @@
     "@abtnode/types": "1.16.17",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.49",
+    "@did-pay/types": "1.13.50",
     "@types/cookie-parser": "^1.4.5",
     "@types/cors": "^2.8.15",
     "@types/dotenv-flow": "^3.3.2",
@@ -140,5 +141,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "8fd11641c7ee8f092afc35eb9615c27d321d398c"
+  "gitHead": "7bdfa2019c557823145e8d262c887b9066c90d04"
 }

package/src/components/blockchain/tx.tsx

@@ -6,7 +6,7 @@ import { joinURL } from 'ufo';
 const getTxLink = (method: TPaymentMethod, details: PaymentDetails) => {
   if (method.type === 'arcblock') {
     return {
-      link: joinURL(method.settings.arcblock?.explorer_host as string, '/tx', details.arcblock?.tx_hash as string),
+      link: joinURL(method.settings.arcblock?.explorer_host as string, '/txs', details.arcblock?.tx_hash as string),
       text: details.arcblock?.tx_hash as string,
     };
   }
@@ -37,8 +37,16 @@ const getTxLink = (method: TPaymentMethod, details: PaymentDetails) => {
   return { text: 'N/A', link: '' };
 };
 
-export default function TxLink(props: { details: PaymentDetails; method: TPaymentMethod }) {
-  if (!props.details) {
+TxLink.defaultProps = {
+  mode: 'dashboard',
+};
+
+export default function TxLink(props: {
+  details: PaymentDetails;
+  method: TPaymentMethod;
+  mode?: 'customer' | 'dashboard';
+}) {
+  if (!props.details || (props.mode === 'customer' && props.method.type === 'stripe')) {
     return (
       <Typography component="small" color="text.secondary">
         None

package/src/components/portal/invoice/list.tsx

@@ -62,7 +62,7 @@ export default function CustomerInvoiceList({ customer_id }: Props) {
   const grouped = groupByDate(data.list);
 
   return (
-    <Stack direction="column" gap={3} sx={{ mt: 1 }}>
+    <Stack direction="column" gap={1} sx={{ mt: 1 }}>
       {Object.entries(grouped).map(([date, invoices]) => (
         <Box key={date}>
           <Typography sx={{ fontWeight: 'bold', color: 'text.secondary', mt: 2, mb: 1 }}>{date}</Typography>
@@ -73,6 +73,7 @@ export default function CustomerInvoiceList({ customer_id }: Props) {
                 xs: 'column',
                 sm: 'row',
               }}
+              sx={{ my: 1 }}
               gap={{
                 xs: 0.5,
                 sm: 1.5,

package/src/pages/customer/invoice.tsx

@@ -111,7 +111,7 @@ export default function CustomerHome() {
                 label={t('common.txHash')}
                 value={
                   data.paymentIntent?.payment_details ? (
-                    <TxLink details={data.paymentIntent.payment_details} method={data.paymentMethod} />
+                    <TxLink details={data.paymentIntent.payment_details} method={data.paymentMethod} mode="customer" />
                   ) : (
                     ''
                   )