payment-kit 1.14.37 → 1.14.38

package/api/src/integrations/arcblock/stake.ts

@@ -189,6 +189,7 @@ export async function getStakeSummaryByDid(did: string, livemode: boolean = true
     return {};
   }
 
+  // FIXME: should use listStakes to find all stakes and summarize here
   const address = toStakeAddress(did, wallet.address);
   const results: GroupedBN = {};
   await Promise.all(

package/api/src/libs/subscription.ts

@@ -30,7 +30,7 @@ import dayjs from './dayjs';
 import env from './env';
 import logger from './logger';
 import { getPriceCurrencyOptions, getPriceUintAmountByCurrency, getRecurringPeriod } from './session';
-import { getConnectQueryParam } from './util';
+import { getConnectQueryParam, getCustomerStakeAddress } from './util';
 
 export function getCustomerSubscriptionPageUrl({
   subscriptionId,
@@ -700,16 +700,25 @@ export async function getSubscriptionRemainingStakeSetup(
   paymentMethod: PaymentMethod,
   action: 'return' | 'slash' = 'return'
 ) {
+  const currency = await PaymentCurrency.findByPk(subscription.currency_id);
+  if (!currency) {
+    return {
+      total: '0',
+      return_amount: '0',
+      sender: '',
+    };
+  }
+
   const client = paymentMethod.getOcapClient();
   const { state } = await client.getStakeState({ address });
-  const currency = await PaymentCurrency.findByPk(subscription.currency_id);
-  if (!state.tokens || !currency) {
+  if (!state) {
     return {
       total: '0',
       return_amount: '0',
       sender: '',
     };
   }
+
   let total = new BN(state.tokens.find((x: any) => x.address === currency.contract)?.value || '0');
   if (action === 'slash') {
     // add revoked tokens to total
@@ -763,17 +772,18 @@ export async function checkRemainingStake(
       revoked: '0',
     };
   }
+
   const client = paymentMethod.getOcapClient();
   const { state } = await client.getStakeState({ address });
-
   if (!state) {
-    logger.warn('getStakeState failed in checkRemainingStake', { address, paymentMethod, paymentCurrency });
+    logger.warn('getStakeState failed in checkRemainingStake', { address });
     return {
       enough: false,
       staked: '0',
       revoked: '0',
     };
   }
+
   const staked = state.tokens?.find((x: any) => x.address === paymentCurrency.contract);
   const revoked = state.revokedTokens?.find((x: any) => x.address === paymentCurrency.contract);
   let total = new BN(0);
@@ -783,6 +793,7 @@ export async function checkRemainingStake(
   if (revoked) {
     total = total.add(new BN(revoked?.value || '0'));
   }
+
   return {
     enough: total.gte(new BN(amount)),
     staked,
@@ -805,3 +816,10 @@ export function getSubscriptionTrialSetup(data: Partial<SubscriptionData>, curre
     trialEnd,
   };
 }
+
+export async function getSubscriptionStakeAddress(subscription: Subscription, customerDid: string) {
+  return (
+    subscription.payment_details?.arcblock?.staking?.address ||
+    (await getCustomerStakeAddress(customerDid, subscription.id))
+  );
+}

package/api/src/libs/util.ts

@@ -2,11 +2,14 @@ import crypto from 'crypto';
 
 import { getUrl } from '@blocklet/sdk/lib/component';
 import env from '@blocklet/sdk/lib/env';
+import { getWalletDid } from '@blocklet/sdk/lib/did';
+import { toStakeAddress } from '@arcblock/did-util';
 import { customAlphabet } from 'nanoid';
 import type { LiteralUnion } from 'type-fest';
 import { withQuery } from 'ufo';
 
 import dayjs from './dayjs';
+import { blocklet, wallet } from './auth';
 
 export const OCAP_PAYMENT_TX_TYPE = 'fg:t:transfer_v2';
 
@@ -260,3 +263,12 @@ export function formatAmountPrecisionLimit(
   }
   return '';
 }
+
+export async function getCustomerStakeAddress(customerDid: string, nonce?: string) {
+  const { user } = await blocklet.getUser(customerDid, { enableConnectedAccount: true });
+  if (user) {
+    return toStakeAddress(getWalletDid(user), wallet.address, nonce);
+  }
+
+  return toStakeAddress(customerDid, wallet.address, nonce);
+}

package/api/src/queues/payment.ts

@@ -1,6 +1,5 @@
 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';
@@ -19,6 +18,7 @@ import {
   getMaxRetryCount,
   getMinRetryMail,
   getSubscriptionCreateSetup,
+  getSubscriptionStakeAddress,
   shouldCancelSubscription,
 } from '../libs/subscription';
 import { MAX_RETRY_COUNT, MIN_RETRY_MAIL, getNextRetry } from '../libs/util';
@@ -402,7 +402,7 @@ const handleStakeSlash = async (
     return;
   }
 
-  const address = toStakeAddress(customer.did, wallet.address, subscription.id);
+  const address = await getSubscriptionStakeAddress(subscription, customer.did);
   const slashAmount = paymentIntent.amount;
   const stakeEnough = await checkRemainingStake(paymentMethod, paymentCurrency, address, slashAmount);
   if (!stakeEnough.enough) {
@@ -432,7 +432,7 @@ const handleStakeSlash = async (
   const signed = await client.signSlashStakeTx({
     tx: {
       itx: {
-        address: toStakeAddress(customer.did, wallet.address, subscription.id),
+        address,
         outputs: [{ owner: wallet.address, tokens: [{ address: paymentCurrency.contract, value: slashAmount }] }],
         message: 'stake_slash_on_subscription_cancel',
         data: {

package/api/src/queues/refund.ts

@@ -1,6 +1,5 @@
-import { toStakeAddress } from '@arcblock/did-util';
-import { isRefundReasonSupportedByStripe } from '@api/libs/refund';
-import { checkRemainingStake } from '@api/libs/subscription';
+import { isRefundReasonSupportedByStripe } from '../libs/refund';
+import { checkRemainingStake, getSubscriptionStakeAddress } from '../libs/subscription';
 import { sendErc20ToUser } from '../integrations/ethereum/token';
 import { wallet } from '../libs/auth';
 import CustomError from '../libs/error';
@@ -14,6 +13,7 @@ import { PaymentCurrency } from '../store/models/payment-currency';
 import { PaymentIntent } from '../store/models/payment-intent';
 import { PaymentMethod } from '../store/models/payment-method';
 import { Refund } from '../store/models/refund';
+import { Subscription } from '../store/models/subscription';
 import type { PaymentError } from '../store/models/types';
 
 type RefundJob = {
@@ -313,7 +313,8 @@ const handleStakeReturnJob = async (
         return;
       }
       const client = paymentMethod.getOcapClient();
-      const address = toStakeAddress(customer.did, wallet.address, refund.subscription_id);
+      const subscription = await Subscription.findByPk(refund.subscription_id);
+      const address = await getSubscriptionStakeAddress(subscription!, customer.did);
       const stakeEnough = await checkRemainingStake(paymentMethod, paymentCurrency, address, refund.amount);
       if (!stakeEnough.enough) {
         logger.warn('Stake return aborted because stake is not enough ', {

package/api/src/queues/subscription.ts

@@ -1,4 +1,3 @@
-import { toStakeAddress } from '@arcblock/did-util';
 import type { LiteralUnion } from 'type-fest';
 
 import { ensurePassportRevoked } from '../integrations/blocklet/passport';
@@ -15,6 +14,7 @@ import {
   checkRemainingStake,
   getSubscriptionCycleAmount,
   getSubscriptionCycleSetup,
+  getSubscriptionStakeAddress,
   getSubscriptionStakeReturnSetup,
   getSubscriptionStakeSlashSetup,
   shouldCancelSubscription,
@@ -329,7 +329,7 @@ const handleStakeSlashAfterCancel = async (subscription: Subscription) => {
 
   // check the staking
   const client = method.getOcapClient();
-  const address = toStakeAddress(customer.did, wallet.address, subscription.id);
+  const address = await getSubscriptionStakeAddress(subscription, customer.did);
   const { state } = await client.getStakeState({ address });
   if (!state || !state.data?.value) {
     logger.warn('Stake slashing aborted because no staking state', {
@@ -374,7 +374,7 @@ const handleStakeSlashAfterCancel = async (subscription: Subscription) => {
   const signed = await client.signSlashStakeTx({
     tx: {
       itx: {
-        address: toStakeAddress(customer.did, wallet.address, subscription.id),
+        address,
         outputs: [{ owner: wallet.address, tokens: [{ address: currency.contract, value: invoice.amount_remaining }] }],
         message: 'uncollectible_past_due_invoice',
         data: {
@@ -530,7 +530,6 @@ const slashStakeOnCancel = async (subscription: Subscription) => {
     });
     return;
   }
-  const address = toStakeAddress(customer.did, wallet.address, subscription.id);
   const currency = await PaymentCurrency.findByPk(subscription.currency_id);
   if (!currency) {
     logger.warn('Stake slashing skipped because currency not found', {
@@ -539,6 +538,7 @@ const slashStakeOnCancel = async (subscription: Subscription) => {
     });
     return;
   }
+  const address = await getSubscriptionStakeAddress(subscription, customer.did);
   const result = await getSubscriptionStakeSlashSetup(subscription, address, paymentMethod);
   const stakeEnough = await checkRemainingStake(paymentMethod, currency, address, result.return_amount);
   if (!stakeEnough.enough) {

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/indent */
 /* eslint-disable prettier/prettier */
 import { toTypeInfo } from '@arcblock/did';
-import { toDelegateAddress, toStakeAddress } from '@arcblock/did-util';
+import { toDelegateAddress } from '@arcblock/did-util';
 import type { Transaction } from '@ocap/client';
 import { BN, fromTokenToUnit, toBase58 } from '@ocap/util';
 import { fromPublicKey } from '@ocap/wallet';
@@ -21,7 +21,7 @@ import {
   getSubscriptionItemPrice,
   getSubscriptionStakeSetup,
 } from '../../libs/subscription';
-import { OCAP_PAYMENT_TX_TYPE } from '../../libs/util';
+import { getCustomerStakeAddress, OCAP_PAYMENT_TX_TYPE } from '../../libs/util';
 import { invoiceQueue } from '../../queues/invoice';
 import type { TLineItemExpanded } from '../../store/models';
 import { CheckoutSession } from '../../store/models/checkout-session';
@@ -745,7 +745,7 @@ export async function getStakeTxClaim({
   if (paymentMethod.type === 'arcblock') {
     // create staking data
     const client = paymentMethod.getOcapClient();
-    const address = toStakeAddress(userDid, wallet.address, subscription.id);
+    const address = await getCustomerStakeAddress(userDid, subscription.id);
     const { state } = await client.getStakeState({ address });
     const data = {
       type: 'json',
@@ -1026,7 +1026,7 @@ export async function executeOcapTransactions(
     type: 'delegate',
     staking: {
       tx_hash: stakingTxHash,
-      address: toStakeAddress(userDid, wallet.address, nonce),
+      address: await getCustomerStakeAddress(userDid, nonce),
     },
   };
 }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.14.37",
+  "version": "1.14.38",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.132",
     "@blocklet/js-sdk": "1.16.30",
     "@blocklet/logger": "1.16.30",
-    "@blocklet/payment-react": "1.14.37",
+    "@blocklet/payment-react": "1.14.38",
     "@blocklet/sdk": "1.16.30",
     "@blocklet/ui-react": "^2.10.23",
     "@blocklet/uploader": "^0.1.27",
@@ -119,7 +119,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.30",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.14.37",
+    "@blocklet/payment-types": "1.14.38",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -161,5 +161,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "645ae0bdbab463eec878af0521eb982b51499639"
+  "gitHead": "f572122a40f30619bd736d8df20e362b6cdab420"
 }