@ocap/resolver 1.18.155 → 1.18.157

package/lib/index.js

@@ -210,10 +210,7 @@ module.exports = class OCAPResolver {
   }
 
   async sendTx({ tx: txBase64 }, ctx = {}) {
-    this.logger.info('sendTx', {
-      txBase64,
-      request: ctx.request,
-    });
+    debug('sendTx', { txBase64, request: ctx.request });
 
     if (process.env.CHAIN_MODE === 'readonly') {
       throw new CustomError('FORBIDDEN', 'This chain node is running in readonly mode');
@@ -990,8 +987,14 @@ module.exports = class OCAPResolver {
       }
     }
 
-    // https://github.com/blocklet/abt-wallet/issues/681
-    if (typeUrl === 'fg:t:deposit_token' || typeUrl === 'fg:t:withdraw_token') {
+    if (
+      [
+        // https://github.com/blocklet/abt-wallet/issues/681
+        'fg:t:deposit_token',
+        'fg:t:withdraw_token',
+        'fg:t:revoke_swap',
+      ].includes(typeUrl)
+    ) {
       tx.receipts = getTxReceipts(tx, { config: this.config });
     }
 
@@ -1020,27 +1023,30 @@ module.exports = class OCAPResolver {
   }
 
   async _getAllResults(dataKey, fn, limit) {
-    const results = [];
     const pageSize = 100;
-
     const { paging, [dataKey]: firstPage } = await fn({ size: pageSize });
 
     // Skip if total exceeds limit cause we cannot query full data
     if (limit && paging.total > limit) {
       throw new CustomError('EXCEED_LIMIT', `Total exceeds limit ${limit}`);
     }
-
     if (paging.total < pageSize) {
       return firstPage;
     }
 
-    results.push(...firstPage);
+    const totalPage = Math.floor(paging.total / pageSize);
+    const cursors = new Array(totalPage).fill(true).map((_, i) => (i + 1) * pageSize);
+    const step = 3;
+    let results = firstPage;
 
-    const total = Math.floor(paging.total / pageSize);
-    for (let i = 1; i <= total; i++) {
-      // eslint-disable-next-line no-await-in-loop
-      const { [dataKey]: nextPage } = await fn({ size: pageSize, cursor: i * pageSize });
-      results.push(...nextPage);
+    for (let i = 0; i < cursors.length; i += step) {
+      const batchResults = await Promise.all(
+        cursors.slice(i, i + step).map(async (cursor) => {
+          const { [dataKey]: list } = await fn({ size: pageSize, cursor });
+          return list;
+        })
+      );
+      results = results.concat(batchResults.flat());
     }
 
     return results;

package/lib/token-flow.js

@@ -198,7 +198,7 @@ const verifyAccountRisk = async (
       throw e;
     }
 
-    const accountState = await resolver.getAccountState({ address, traceMigration: false }, ctx);
+    const accountState = await resolver.getAccountState({ address, traceMigration: false, expandContext: false }, ctx);
     if (!accountState) {
       throw new CustomError('INVALID_REQUEST', `Invalid address ${address}`);
     }
@@ -209,12 +209,10 @@ const verifyAccountRisk = async (
 
     // Parse txs to get transfer amounts
     for (const tx of transactions) {
-      // fix migrate receipts
-      await fixMigrateReceipts(tx, resolver, ctx);
-
       // cache tx
       if (!checkedTx.has(tx.hash)) {
-        checkedTx.set(tx.hash, await getTransferList(tx, tokenAddress));
+        await fixMigrateReceipts(tx, resolver, ctx);
+        checkedTx.set(tx.hash, getTransferList(tx, tokenAddress));
       }
       const { transferInList, transferOutList } = checkedTx.get(tx.hash);
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.155",
+  "version": "1.18.157",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,18 +22,18 @@
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.155",
-    "@arcblock/did-util": "1.18.155",
-    "@arcblock/validator": "1.18.155",
-    "@ocap/config": "1.18.155",
-    "@ocap/indexdb": "1.18.155",
-    "@ocap/mcrypto": "1.18.155",
-    "@ocap/message": "1.18.155",
-    "@ocap/state": "1.18.155",
-    "@ocap/tx-protocols": "1.18.155",
-    "@ocap/util": "1.18.155",
+    "@arcblock/did": "1.18.157",
+    "@arcblock/did-util": "1.18.157",
+    "@arcblock/validator": "1.18.157",
+    "@ocap/config": "1.18.157",
+    "@ocap/indexdb": "1.18.157",
+    "@ocap/mcrypto": "1.18.157",
+    "@ocap/message": "1.18.157",
+    "@ocap/state": "1.18.157",
+    "@ocap/tx-protocols": "1.18.157",
+    "@ocap/util": "1.18.157",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "3d0a23a37564c89d4cf8f374823835efdb6eb24b"
+  "gitHead": "df2103bb05ee43fdb6b530e05ce608c574fdd5d6"
 }