payment-kit 1.25.2 → 1.25.4

package/api/src/libs/payment.ts

@@ -253,6 +253,15 @@ export async function isDelegationSufficientForPayment(args: {
       }
     }
 
+    // Log delegation check context for debugging
+    logger.info('isDelegationSufficientForPayment: checking delegation', {
+      originalUserDid: userDid,
+      resolvedDelegator: delegator,
+      delegatorChanged: userDid !== delegator,
+      walletAddress: wallet.address,
+      paymentMethodApiHost: paymentMethod.settings?.arcblock?.api_host,
+    });
+
     const client = paymentMethod.getOcapClient();
 
     // have delegated before? Use migration-aware fallback query
@@ -263,6 +272,12 @@ export async function isDelegationSufficientForPayment(args: {
       client,
     });
     if (!delegationResult) {
+      logger.error('isDelegationSufficientForPayment: no delegation address found', {
+        delegator,
+        storedDelegationAddress,
+        subscriptionDelegationAddress: subscription?.payment_details?.arcblock?.delegation_address,
+        subscriptionId: subscription?.id,
+      });
       return { sufficient: false, reason: 'NO_DELEGATION' };
     }
 

package/api/src/libs/wallet-migration.ts

@@ -15,17 +15,21 @@ import { wallet } from './auth';
 import logger from './logger';
 import { Subscription } from '../store/models';
 
-// Cache for migratedFrom list (refreshed when wallet.address changes)
+// Cache for migratedFrom list (keyed by wallet.address + chain host)
 let cachedMigratedFrom: string[] | null = null;
 let cachedWalletAddress: string | null = null;
+let cachedChainHost: string | null = null;
 
 /**
  * Get the migratedFrom list for the current app wallet (with caching)
- * The cache is invalidated when wallet.address changes
+ * The cache is invalidated when wallet.address or chain host changes
  */
 export async function getMigratedFromList(client: OcapClient): Promise<string[]> {
-  // If wallet address hasn't changed, use cached value
-  if (wallet.address === cachedWalletAddress && cachedMigratedFrom !== null) {
+  // @ts-ignore - OcapClient has host property
+  const chainHost = client.host || client.endpoint || 'unknown';
+
+  // If wallet address and chain host haven't changed, use cached value
+  if (wallet.address === cachedWalletAddress && chainHost === cachedChainHost && cachedMigratedFrom !== null) {
     return cachedMigratedFrom;
   }
 
@@ -34,17 +38,23 @@ export async function getMigratedFromList(client: OcapClient): Promise<string[]>
     const { state } = await client.getAccountState({ address: wallet.address });
     cachedMigratedFrom = state?.migratedFrom || [];
     cachedWalletAddress = wallet.address;
+    cachedChainHost = chainHost;
 
     if (cachedMigratedFrom.length > 0) {
       logger.info('wallet-migration: loaded migratedFrom list', {
         walletAddress: wallet.address,
+        chainHost,
         migratedFrom: cachedMigratedFrom,
       });
     }
 
     return cachedMigratedFrom;
   } catch (err) {
-    logger.error('wallet-migration: failed to get migratedFrom list', { error: err });
+    logger.error('wallet-migration: failed to get migratedFrom list', {
+      walletAddress: wallet.address,
+      chainHost,
+      error: err,
+    });
     return [];
   }
 }
@@ -54,6 +64,7 @@ export async function getMigratedFromList(client: OcapClient): Promise<string[]>
  */
 export function clearMigratedFromCache(): void {
   cachedMigratedFrom = null;
+  cachedChainHost = null;
   cachedWalletAddress = null;
 }
 
@@ -85,19 +96,46 @@ export async function getDelegationAddressWithFallback({
   delegator,
   client,
 }: GetDelegationAddressParams): Promise<AddressWithFallbackResult | null> {
-  // 1. Check stored delegation_address first
+  // 1. Check stored delegation_address first - but verify it has valid state
   if (storedAddress) {
-    return { address: storedAddress, needsBackfill: false, source: 'stored' };
+    try {
+      const { state: storedState } = await client.getDelegateState({ address: storedAddress });
+      if (storedState?.ops?.length > 0) {
+        return { address: storedAddress, needsBackfill: false, source: 'stored' };
+      }
+      logger.warn('wallet-migration: stored delegation address has no valid state, falling back', {
+        storedAddress,
+        delegator,
+        hasState: !!storedState,
+        opsCount: storedState?.ops?.length || 0,
+      });
+    } catch (err) {
+      logger.warn('wallet-migration: failed to query stored delegation address, falling back', {
+        storedAddress,
+        delegator,
+        error: err,
+      });
+    }
+    // Continue to fallback instead of returning early
   }
 
   // 2. Try current wallet.address
   const currentAddress = toDelegateAddress(delegator, wallet.address);
+  let currentStateResult: { hasState: boolean; opsCount: number; error?: string } = {
+    hasState: false,
+    opsCount: 0,
+  };
   try {
     const { state: currentState } = await client.getDelegateState({ address: currentAddress });
+    currentStateResult = {
+      hasState: !!currentState,
+      opsCount: currentState?.ops?.length || 0,
+    };
     if (currentState?.ops?.length > 0) {
       return { address: currentAddress, needsBackfill: true, source: 'current' };
     }
   } catch (err) {
+    currentStateResult.error = String(err);
     logger.warn('wallet-migration: failed to query current delegation state', {
       address: currentAddress,
       error: err,
@@ -106,11 +144,24 @@ export async function getDelegationAddressWithFallback({
 
   // 3. Fallback to migratedFrom addresses
   const migratedFrom = await getMigratedFromList(client);
+  const migratedResults: Array<{
+    appDid: string;
+    address: string;
+    hasState: boolean;
+    opsCount: number;
+    error?: string;
+  }> = [];
   for (const oldAppDid of migratedFrom) {
     const oldAddress = toDelegateAddress(delegator, oldAppDid);
     try {
       // eslint-disable-next-line no-await-in-loop
       const { state: oldState } = await client.getDelegateState({ address: oldAddress });
+      migratedResults.push({
+        appDid: oldAppDid,
+        address: oldAddress,
+        hasState: !!oldState,
+        opsCount: oldState?.ops?.length || 0,
+      });
       if (oldState?.ops?.length > 0) {
         logger.info('wallet-migration: found delegation in migratedFrom', {
           delegator,
@@ -120,6 +171,13 @@ export async function getDelegationAddressWithFallback({
         return { address: oldAddress, needsBackfill: true, source: 'migrated' };
       }
     } catch (err) {
+      migratedResults.push({
+        appDid: oldAppDid,
+        address: oldAddress,
+        hasState: false,
+        opsCount: 0,
+        error: String(err),
+      });
       logger.warn('wallet-migration: failed to query migrated delegation state', {
         address: oldAddress,
         oldAppDid,
@@ -128,7 +186,15 @@ export async function getDelegationAddressWithFallback({
     }
   }
 
-  // Not found
+  // Not found - log detailed search results
+  logger.error('wallet-migration: no delegation found after full search', {
+    delegator,
+    currentWalletAddress: wallet.address,
+    currentDelegationAddress: currentAddress,
+    currentStateResult,
+    migratedFromCount: migratedFrom.length,
+    migratedResults,
+  });
   return null;
 }
 

package/api/tests/libs/wallet-migration.spec.ts

@@ -25,6 +25,7 @@ jest.mock('../../src/libs/logger', () => ({
 describe('wallet-migration', () => {
   // Mock OcapClient
   const createMockClient = (overrides: any = {}) => ({
+    host: 'https://main.abtnetwork.io/api',
     getAccountState: jest.fn().mockResolvedValue({
       state: {
         migratedFrom: ['zNKq13Dr2TBHELpLDUJFGxepiGP7YHbAVxPn', 'zNKq6yG8AVbwdRBDJSNCDVJJUQD1AXdkK7Wp'],
@@ -76,8 +77,15 @@ describe('wallet-migration', () => {
     const currentWalletAddress = 'zNKcF7wyrvAvn4YaADjr4p9gpFUSHnW2aQJa';
     const oldAppDid = 'zNKq13Dr2TBHELpLDUJFGxepiGP7YHbAVxPn';
 
-    it('should return stored address if available', async () => {
-      const mockClient = createMockClient();
+    it('should return stored address if available and valid', async () => {
+      const mockClient = createMockClient({
+        getDelegateState: jest.fn().mockImplementation(({ address }) => {
+          if (address === 'stored_delegation_address') {
+            return { state: { ops: [{ key: 'fg:x:transfer' }] } };
+          }
+          return { state: null };
+        }),
+      });
 
       const result = await getDelegationAddressWithFallback({
         storedAddress: 'stored_delegation_address',
@@ -90,8 +98,34 @@ describe('wallet-migration', () => {
         needsBackfill: false,
         source: 'stored',
       });
-      // Should not query chain if stored
-      expect(mockClient.getDelegateState).not.toHaveBeenCalled();
+      // Should verify stored address
+      expect(mockClient.getDelegateState).toHaveBeenCalledWith({ address: 'stored_delegation_address' });
+    });
+
+    it('should fallback if stored address has no valid state', async () => {
+      const oldAddress = toDelegateAddress(delegator, oldAppDid);
+      const mockClient = createMockClient({
+        getDelegateState: jest.fn().mockImplementation(({ address }) => {
+          // stored address has no state, but migratedFrom address has
+          if (address === oldAddress) {
+            return { state: { ops: [{ key: 'fg:x:transfer' }] } };
+          }
+          return { state: null };
+        }),
+      });
+
+      const result = await getDelegationAddressWithFallback({
+        storedAddress: 'invalid_stored_address',
+        delegator,
+        client: mockClient as any,
+      });
+
+      // Should fallback to migratedFrom
+      expect(result).toEqual({
+        address: oldAddress,
+        needsBackfill: true,
+        source: 'migrated',
+      });
     });
 
     it('should return current address if delegation exists on current wallet', async () => {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "prelint": "npm run types",
@@ -59,9 +59,9 @@
     "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/logger": "^1.17.8-beta-20260104-120132-cb5b1914",
-    "@blocklet/payment-broker-client": "1.25.2",
-    "@blocklet/payment-react": "1.25.2",
-    "@blocklet/payment-vendor": "1.25.2",
+    "@blocklet/payment-broker-client": "1.25.4",
+    "@blocklet/payment-react": "1.25.4",
+    "@blocklet/payment-vendor": "1.25.4",
     "@blocklet/sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/ui-react": "^3.4.7",
     "@blocklet/uploader": "^0.3.19",
@@ -132,7 +132,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.25.2",
+    "@blocklet/payment-types": "1.25.4",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -179,5 +179,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "11621a1c925f94bf4f73644de70088e5f0580f74"
+  "gitHead": "e551d0dd9b08432ff880a33d859fa9a00c8ff649"
 }