payment-kit 1.18.30 → 1.18.32

package/api/src/libs/payment.ts

@@ -5,7 +5,7 @@ import { sign } from '@arcblock/jwt';
 import { getWalletDid } from '@blocklet/sdk/lib/did';
 import type { DelegateState, TokenLimit } from '@ocap/client';
 import { toTxHash } from '@ocap/mcrypto';
-import { BN, fromTokenToUnit, fromUnitToToken } from '@ocap/util';
+import { BN, fromUnitToToken } from '@ocap/util';
 import cloneDeep from 'lodash/cloneDeep';
 import type { LiteralUnion } from 'type-fest';
 
@@ -24,7 +24,7 @@ import type { TPaymentCurrency } from '../store/models/payment-currency';
 import { blocklet, ethWallet, wallet, getVaultAddress } from './auth';
 import logger from './logger';
 import { getBlockletJson, getUserOrAppInfo, OCAP_PAYMENT_TX_TYPE, resolveAddressChainTypes } from './util';
-import { CHARGE_SUPPORTED_CHAIN_TYPES, VAULT_BUFFER_THRESHOLD, EVM_CHAIN_TYPES } from './constants';
+import { CHARGE_SUPPORTED_CHAIN_TYPES, EVM_CHAIN_TYPES } from './constants';
 import { getTokenByAddress } from '../integrations/arcblock/stake';
 
 export interface SufficientForPaymentResult {
@@ -44,6 +44,7 @@ export interface SufficientForPaymentResult {
   delegator?: string;
   state?: DelegateState;
   token?: { address: string; balance: string };
+  requestedAmount?: string;
 }
 
 export async function isDelegationSufficientForPayment(args: {
@@ -51,10 +52,17 @@ export async function isDelegationSufficientForPayment(args: {
   paymentCurrency: TPaymentCurrency;
   userDid: string;
   amount: string;
+  delegatorAmounts?: string[];
 }): Promise<SufficientForPaymentResult> {
-  const { paymentCurrency, paymentMethod, userDid, amount } = args;
+  const { paymentCurrency, paymentMethod, userDid, amount, delegatorAmounts } = args;
   const tokenAddress = paymentCurrency.contract as string;
 
+  let totalAmount = new BN(amount);
+  const hasDelegatorAmounts = delegatorAmounts && delegatorAmounts.length > 0;
+  if (hasDelegatorAmounts) {
+    totalAmount = delegatorAmounts.reduce((sum, amt) => sum.add(new BN(amt)), new BN('0'));
+  }
+
   if (paymentMethod.type === 'arcblock') {
     // user have bond wallet did?
     const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
@@ -95,10 +103,25 @@ export async function isDelegationSufficientForPayment(args: {
         return { sufficient: false, reason: 'NO_TRANSFER_TO' };
       }
 
-      const requested = new BN(amount);
-      const allowance = new BN(tokenLimit.txAllowance);
-      if (tokenLimit.txAllowance !== '0' && requested.gt(allowance)) {
-        return { sufficient: false, reason: 'NO_ENOUGH_ALLOWANCE' };
+      // check allowance
+      if (tokenLimit.txAllowance !== '0') {
+        const allowance = new BN(tokenLimit.txAllowance);
+        if (hasDelegatorAmounts) {
+          // check each delegator amount
+          const invalidAmount = delegatorAmounts.find((amt) => new BN(amt).gt(allowance));
+
+          if (invalidAmount) {
+            return {
+              sufficient: false,
+              reason: 'NO_ENOUGH_ALLOWANCE',
+            };
+          }
+        } else if (totalAmount.gt(allowance)) {
+          return {
+            sufficient: false,
+            reason: 'NO_ENOUGH_ALLOWANCE',
+          };
+        }
       }
     }
 
@@ -108,11 +131,23 @@ export async function isDelegationSufficientForPayment(args: {
     if (!token) {
       return { sufficient: false, reason: 'NO_TOKEN' };
     }
-    if (new BN(token.balance).lt(new BN(amount))) {
-      return { sufficient: false, reason: 'NO_ENOUGH_TOKEN', token };
+
+    if (new BN(token.balance).lt(totalAmount)) {
+      return {
+        sufficient: false,
+        reason: 'NO_ENOUGH_TOKEN',
+        token,
+        requestedAmount: totalAmount.toString(),
+      };
     }
 
-    return { sufficient: true, delegator, state, token };
+    return {
+      sufficient: true,
+      delegator,
+      state,
+      token,
+      requestedAmount: totalAmount.toString(),
+    };
   }
 
   if (paymentMethod.type === 'stripe') {
@@ -459,10 +494,8 @@ export async function checkDepositVaultAmount(paymentCurrencyId: string): Promis
     return { depositAmount: '0', message: 'No amount available to deposit after calculations' };
   }
 
-  const bufferThreshold =
-    paymentCurrency?.vault_config?.buffer_threshold ||
-    fromTokenToUnit(VAULT_BUFFER_THRESHOLD, paymentCurrency.decimal).toString();
-  if (new BN(amountToDeposit).lt(new BN(bufferThreshold))) {
+  const bufferThreshold = paymentCurrency?.vault_config?.buffer_threshold;
+  if (bufferThreshold && bufferThreshold !== '0' && new BN(amountToDeposit).lt(new BN(bufferThreshold))) {
     return { depositAmount: '0', message: 'Amount to deposit is less than the buffer threshold' };
   }
 

package/api/src/libs/product.ts

@@ -12,10 +12,7 @@ export async function getMainProductName(subscriptionId: string): Promise<string
     return subscription.description!;
   }
 
-  const checkoutSession = await CheckoutSession.findOne({
-    where: {
-      subscription_id: subscriptionId,
-    },
+  const checkoutSession = await CheckoutSession.findBySubscriptionId(subscriptionId, {
     attributes: ['line_items'],
   });
   const priceId: string = checkoutSession?.line_items.find((x) => !x.cross_sell)?.price_id as string;