payment-kit 1.14.32 → 1.14.33

package/api/src/libs/subscription.ts

@@ -398,7 +398,7 @@ export async function getUpcomingInvoiceAmount(subscriptionId: string) {
   }
 
   if (subscription.isActive() === false) {
-    throw new Error('Subscription not active, so usage check is skipped');
+    throw new Error(`Subscription not active for ${subscriptionId}, so usage check is skipped`);
   }
 
   const currency = await PaymentCurrency.findByPk(subscription.currency_id);

package/api/src/queues/invoice.ts

@@ -122,6 +122,7 @@ export const handleInvoice = async (job: InvoiceJob) => {
       subscription_cycle: 'Subscription cycle',
       subscription_update: 'Subscription update',
       subscription_threshold: 'Subscription threshold',
+      slash_stake: 'Slash stake',
     };
     // TODO: support partial payment from user balance
     paymentIntent = await PaymentIntent.create({

package/api/src/queues/payment.ts

@@ -1,5 +1,6 @@
 import isEmpty from 'lodash/isEmpty';
 
+import { toStakeAddress } from '@arcblock/did-util';
 import { ensureStakedForGas } from '../integrations/arcblock/stake';
 import { transferErc20FromUser } from '../integrations/ethereum/token';
 import { createEvent } from '../libs/audit';
@@ -11,6 +12,7 @@ import logger from '../libs/logger';
 import { getGasPayerExtra, isDelegationSufficientForPayment } from '../libs/payment';
 import createQueue from '../libs/queue';
 import {
+  checkRemainingStake,
   getDaysUntilCancel,
   getDaysUntilDue,
   getDueUnit,
@@ -53,10 +55,10 @@ async function updateQuantitySold(checkoutSession: CheckoutSession) {
   await Promise.all(updatePromises);
 }
 
-export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
+export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, slashStake: boolean = false) => {
   // FIXME: @wangshijun we should check stripe payment here before
 
-  if (paymentIntent.beneficiaries?.length) {
+  if (paymentIntent.beneficiaries?.length && !slashStake) {
     Promise.all(
       paymentIntent.beneficiaries.map(async (x) => {
         let customer = await Customer.findByPkOrDid(x.address);
@@ -119,7 +121,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
   if (paymentIntent.invoice_id) {
     invoice = await Invoice.findByPk(paymentIntent.invoice_id);
   }
-  if (!invoice) {
+  if (!invoice && !slashStake) {
     const checkoutSession = await CheckoutSession.findOne({ where: { payment_intent_id: paymentIntent.id } });
     if (checkoutSession && checkoutSession.status === 'open') {
       updateQuantitySold(checkoutSession).catch((err) => {
@@ -138,7 +140,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
     return;
   }
 
-  if (invoice.status !== 'paid') {
+  if (invoice && invoice?.status !== 'paid') {
     await invoice.update({
       paid: true,
       status: 'paid',
@@ -151,7 +153,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
     logger.info(`Invoice ${invoice.id} updated on payment done: ${paymentIntent.id}`);
   }
 
-  if (invoice.subscription_id) {
+  if (invoice && invoice.subscription_id && !slashStake) {
     const subscription = await Subscription.findByPk(invoice.subscription_id);
 
     // We only update subscription status when the invoice is the latest one
@@ -212,7 +214,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
     }
   }
 
-  if (invoice.checkout_session_id) {
+  if (invoice && invoice.checkout_session_id && !slashStake) {
     const checkoutSession = await CheckoutSession.findByPk(invoice.checkout_session_id);
     if (checkoutSession && checkoutSession.status === 'open') {
       updateQuantitySold(checkoutSession).catch((err) => {
@@ -375,6 +377,105 @@ export const handlePaymentFailed = async (
   return updates.retry;
 };
 
+const handleStakeSlash = async (
+  invoice: Invoice,
+  paymentIntent: PaymentIntent,
+  paymentMethod: PaymentMethod,
+  customer: Customer,
+  paymentCurrency: PaymentCurrency
+) => {
+  const subscription = await Subscription.findByPk(invoice.subscription_id);
+  if (!subscription) {
+    logger.warn('Stake slashing skipped because Subscription not found', {
+      subscription: invoice.subscription_id,
+      paymentIntent: paymentIntent.id,
+      invoice: invoice.id,
+    });
+    return;
+  }
+  if (!subscription.cancelation_details?.slash_stake || subscription.status !== 'canceled') {
+    logger.warn('Stake slashing skipped because subscription not canceled or slash_stake is false', {
+      subscription: invoice.subscription_id,
+      paymentIntent: paymentIntent.id,
+      invoice: invoice.id,
+    });
+    return;
+  }
+
+  const address = toStakeAddress(customer.did, wallet.address, subscription.id);
+  const slashAmount = paymentIntent.amount;
+  const stakeEnough = await checkRemainingStake(paymentMethod, paymentCurrency, address, slashAmount);
+  if (!stakeEnough.enough) {
+    logger.warn('Stake slashing aborted because no enough staking', {
+      subscription: subscription.id,
+      paymentIntent: paymentIntent.id,
+      invoice: invoice.id,
+      address,
+      staked: stakeEnough.revoked,
+      revoked: stakeEnough.revoked,
+    });
+    return;
+  }
+  if (slashAmount === '0') {
+    logger.warn('Stake slashing aborted because slashAmount is 0', {
+      subscription: subscription.id,
+      paymentIntent: paymentIntent.id,
+      invoice: invoice.id,
+      address,
+      slashAmount,
+    });
+    return;
+  }
+
+  // do the slash
+  const client = paymentMethod.getOcapClient();
+  const signed = await client.signSlashStakeTx({
+    tx: {
+      itx: {
+        address: toStakeAddress(customer.did, wallet.address, subscription.id),
+        outputs: [{ owner: wallet.address, tokens: [{ address: paymentCurrency.contract, value: slashAmount }] }],
+        message: 'stake_slash_on_subscription_cancel',
+        data: {
+          typeUrl: 'json',
+          // @ts-ignore
+          value: {
+            appId: wallet.address,
+            reason: 'stake_slash_on_subscription_cancel',
+            subscriptionId: subscription.id,
+            invoiceId: invoice.id,
+            paymentIntentId: paymentIntent.id,
+          },
+        },
+      },
+    },
+    wallet,
+  });
+  // @ts-ignore
+  const { buffer } = await client.encodeSlashStakeTx({ tx: signed });
+  // @ts-ignore
+  const txHash = await client.sendSlashStakeTx({ tx: signed, wallet }, getGasPayerExtra(buffer));
+  logger.info('Stake slashing done', {
+    subscription: subscription.id,
+    amount: slashAmount,
+    paymentIntent: paymentIntent.id,
+    invoice: invoice.id,
+    address,
+    txHash,
+  });
+  await paymentIntent.update({
+    status: 'succeeded',
+    amount_received: slashAmount,
+    payment_details: {
+      arcblock: {
+        tx_hash: txHash,
+        payer: customer.did,
+        type: 'slash',
+      },
+    },
+  });
+  await handlePaymentSucceed(paymentIntent, true);
+};
+
 export const handlePayment = async (job: PaymentJob) => {
   logger.info('handle payment', job);
 
@@ -450,6 +551,10 @@ export const handlePayment = async (job: PaymentJob) => {
   try {
     await paymentIntent.update({ status: 'processing', last_payment_error: null });
     if (paymentMethod.type === 'arcblock') {
+      if (invoice?.billing_reason === 'slash_stake') {
+        await handleStakeSlash(invoice, paymentIntent, paymentMethod, customer, paymentCurrency);
+        return;
+      }
       const client = paymentMethod.getOcapClient();
 
       // check balance before capture with transaction

package/api/src/queues/subscription.ts

@@ -529,7 +529,6 @@ const slashStakeOnCancel = async (subscription: Subscription) => {
     });
     return;
   }
-  const client = paymentMethod.getOcapClient();
   const address = toStakeAddress(customer.did, wallet.address, subscription.id);
   const currency = await PaymentCurrency.findByPk(subscription.currency_id);
   if (!currency) {
@@ -560,99 +559,57 @@ const slashStakeOnCancel = async (subscription: Subscription) => {
     return;
   }
 
-  // do the slash
-  const signed = await client.signSlashStakeTx({
-    tx: {
-      itx: {
-        address: toStakeAddress(customer.did, wallet.address, subscription.id),
-        outputs: [{ owner: wallet.address, tokens: [{ address: currency.contract, value: result.return_amount }] }],
-        message: 'stake_slash_on_subscription_cancel',
-        data: {
-          typeUrl: 'json',
-          // @ts-ignore
-          value: {
-            appId: wallet.address,
-            reason: 'stake_slash_on_subscription_cancel',
-            subscriptionId: subscription.id,
-            invoiceId: subscription.latest_invoice_id,
-            paymentIntentId: result?.lastInvoice?.payment_intent_id as string,
-          },
-        },
-      },
-    },
-    wallet,
-  });
-  // @ts-ignore
-  const { buffer } = await client.encodeSlashStakeTx({ tx: signed });
-  // @ts-ignore
-  const txHash = await client.sendSlashStakeTx({ tx: signed, wallet }, getGasPayerExtra(buffer));
-  logger.info('Stake slashing done', {
-    subscription: subscription.id,
-    amount: result.return_amount,
-    address,
-    txHash,
-  });
-  // create new payment intent
-  const paymentIntent = await PaymentIntent.create({
-    livemode: subscription.livemode,
-    amount: result.return_amount,
-    amount_received: result.return_amount,
-    amount_capturable: '0',
-    currency_id: subscription.currency_id,
-    customer_id: subscription.customer_id,
-    payment_method_id: subscription.default_payment_method_id,
-    status: 'succeeded',
-    capture_method: 'manual',
-    last_payment_error: null,
-    description: 'Stake slash on subscription cancel',
-    statement_descriptor: result.lastInvoice?.statement_descriptor || getStatementDescriptor([]),
-    payment_method_types: ['arcblock'],
-    confirmation_method: '',
-    payment_details: {
-      arcblock: {
-        tx_hash: txHash,
-        payer: subscription.payment_details?.arcblock?.payer as string,
-        type: 'slash',
-      },
+  // FIXME: handle exist one more invoices
+  const invoice = await Invoice.findOne({
+    where: {
+      subscription_id: subscription.id,
+      billing_reason: 'slash_stake',
     },
   });
-  logger.info('Payment intent created for stake slash', {
-    paymentIntent: paymentIntent.id,
-    subscription: subscription.id,
-  });
-  // 创建一笔账单关联到该订阅
-  const { invoice } = await ensureInvoiceAndItems({
-    customer,
-    currency,
-    subscription,
-    trialing: false,
-    metered: true,
-    lineItems: [],
-    props: {
-      livemode: subscription.livemode,
-      description: 'Slash stake',
-      statement_descriptor: result.lastInvoice?.statement_descriptor,
-      period_start: subscription.canceled_at,
-      period_end: subscription.canceled_at,
-
-      auto_advance: true,
-      status: 'paid',
-      billing_reason: 'stake_slash_on_subscription_cancel',
-      currency_id: subscription.currency_id,
-
-      total: result.return_amount,
-      amount_paid: result.return_amount,
-      amount_remaining: '0',
-      amount_due: '0',
-
-      payment_settings: subscription.payment_settings,
-      default_payment_method_id: subscription.default_payment_method_id,
-      payment_intent_id: paymentIntent.id,
-    } as unknown as Invoice,
-  });
-  logger.info('Invoice created for stake slash', { invoice: invoice.id, subscription: subscription.id });
-  paymentIntent.update({ invoice_id: invoice.id });
-  logger.info('Payment intent updated with invoice', { invoice: invoice.id, paymentIntent: paymentIntent.id });
+  if (invoice) {
+    invoiceQueue.push({
+      id: invoice.id,
+      job: { invoiceId: invoice.id, retryOnError: true },
+    });
+    logger.info('Invoice job scheduled for slash stake', { invoice: invoice.id, subscription: subscription.id });
+  } else {
+    const { invoice: newInvoice } = await ensureInvoiceAndItems({
+      customer,
+      currency,
+      subscription,
+      trialing: false,
+      metered: false,
+      lineItems: [],
+      props: {
+        livemode: subscription.livemode,
+        description: 'Slash stake',
+        statement_descriptor: result.lastInvoice?.statement_descriptor,
+        period_start: subscription.canceled_at,
+        period_end: subscription.current_period_end as number,
+
+        auto_advance: true,
+        status: 'open',
+        billing_reason: 'slash_stake',
+        currency_id: subscription.currency_id,
+
+        total: result.return_amount,
+        subtotal: result.return_amount,
+        amount_paid: '0',
+        amount_remaining: result.return_amount,
+        amount_due: result.return_amount,
+
+        payment_settings: subscription.payment_settings,
+        default_payment_method_id: subscription.default_payment_method_id,
+        subscription_id: subscription.id,
+      } as unknown as Invoice,
+    });
+    logger.info('Invoice created for stake slash', { invoice: newInvoice.id, subscription: subscription.id });
+    invoiceQueue.push({
+      id: newInvoice.id,
+      job: { invoiceId: newInvoice.id, retryOnError: true },
+    });
+    logger.info('Invoice job scheduled for slash stake', { invoice: newInvoice.id, subscription: subscription.id });
+  }
 };
 
 // generate invoice for subscription periodically

package/api/src/routes/invoices.ts

@@ -150,11 +150,21 @@ router.get('/', authMine, async (req, res) => {
                 stakeAmount = state.tokens.find((x: any) => x.address === currency?.contract)?.value;
                 // stakeAmount should not be zero if nonce exist
                 if (!Number(stakeAmount)) {
-                  const refund = await Refund.findOne({
-                    where: { subscription_id: subscription.id, status: 'succeeded', type: 'stake_return' },
-                  });
-                  if (refund) {
-                    stakeAmount = refund.amount;
+                  if (subscription.cancelation_details?.return_stake) {
+                    const refund = await Refund.findOne({
+                      where: { subscription_id: subscription.id, status: 'succeeded', type: 'stake_return' },
+                    });
+                    if (refund) {
+                      stakeAmount = refund.amount;
+                    }
+                  }
+                  if (subscription.cancelation_details?.slash_stake) {
+                    const invoice = await Invoice.findOne({
+                      where: { subscription_id: subscription.id, status: 'paid', billing_reason: 'slash_stake' },
+                    });
+                    if (invoice) {
+                      stakeAmount = invoice.total;
+                    }
                   }
                 }
               }

package/api/src/store/models/invoice.ts

@@ -58,7 +58,8 @@ export class Invoice extends Model<InferAttributes<Invoice>, InferCreationAttrib
     | 'subscription_cancel'
     | 'subscription'
     | 'manual'
-    | 'upcoming',
+    | 'upcoming'
+    | 'slash_stake',
     string
   >;
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.14.32",
+  "version": "1.14.33",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.132",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.14.32",
+    "@blocklet/payment-react": "1.14.33",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.23",
     "@blocklet/uploader": "^0.1.23",
@@ -119,7 +119,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.14.32",
+    "@blocklet/payment-types": "1.14.33",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -161,5 +161,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "347accd83eb9354f423e06670d53003b4fd40114"
+  "gitHead": "e5ae487796f7c104b577dbab2a937013c3fbac12"
 }

package/src/components/customer/form.tsx

@@ -76,7 +76,11 @@ export default function CustomerForm() {
       />
 
       <FormLabel className="base-label">{t('payment.checkout.billing.required')}</FormLabel>
-      <Controller name="address.country" control={control} render={({ field }) => <CountrySelect {...field} />} />
+      <Controller
+        name="address.country"
+        control={control}
+        render={({ field }) => <CountrySelect {...field} sx={{ pl: '6px' }} />}
+      />
       <FormInput
         name="address.state"
         variant="outlined"

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

@@ -29,7 +29,7 @@ type Props = {
   changeActive?: (active: boolean) => void;
 } & Omit<StackProps, 'onChange'>;
 
-const pageSize = 4;
+const pageSize = 5;
 
 export default function CurrentSubscriptions({
   id,
@@ -84,6 +84,7 @@ export default function CurrentSubscriptions({
                 md: '500px',
               },
               overflowY: 'auto',
+              webkitOverflowScrolling: 'touch',
             }}>
             {data.list.map((subscription) => {
               return (