@ocap/resolver 1.18.143 → 1.18.145

package/lib/token-flow.js

@@ -121,6 +121,10 @@ const getTransferFlow = (tx, tokenAddress) => {
   return txTransfers;
 };
 
+const getVaultAccounts = (config) => {
+  return Object.values(config.vaults).flat();
+};
+
 const verifyAccountRisk = async ({ accountAddress, tokenAddress }, resolver, ctx = {}) => {
   // validate request params
   const { error } = paramsSchema.validate({ accountAddress, tokenAddress, resolver });
@@ -132,6 +136,7 @@ const verifyAccountRisk = async ({ accountAddress, tokenAddress }, resolver, ctx
   const checkedTx = new Map();
   const accountQueue = [accountAddress];
   const maxAccountSize = 400;
+  const vaultAccounts = getVaultAccounts(resolver.config);
 
   while (accountQueue.length) {
     // limit
@@ -151,7 +156,7 @@ const verifyAccountRisk = async ({ accountAddress, tokenAddress }, resolver, ctx
     if (checkedAccounts.has(address)) continue;
 
     const transactions = await resolver._getAllResults('transactions', (paging) =>
-      resolver.listTransactions({ paging, accountFilter: { accounts: address } }, ctx)
+      resolver.listTransactions({ paging, accountFilter: { accounts: [address] } }, ctx)
     );
     const accountState = await resolver.getAccountState({ address }, ctx);
     if (!accountState) {
@@ -191,6 +196,8 @@ const verifyAccountRisk = async ({ accountAddress, tokenAddress }, resolver, ctx
         const accountsToQueue = transferOutList
           .filter((item) => {
             if (accountQueue.includes(item.address)) return false;
+            // Skip vault accounts
+            if (vaultAccounts.includes(item.address)) return false;
             // skip gas、fee
             if (['gas', 'fee'].includes(item.action)) return false;
             // Skip not token holders
@@ -252,8 +259,9 @@ const listTokenFlows = async (
 
   const tokenState = await resolver.tokenCache.get(tokenAddress);
   const minAmount = fromTokenToUnit(1, tokenState?.decimal || 18);
-  const maxAccountSize = Math.min(400, paging.size || 400);
-  const maxDepth = Math.min(6, depth);
+  const maxAccountSize = Math.min(200, paging.size || 200);
+  const maxDepth = Math.min(5, depth);
+  const vaultAccounts = getVaultAccounts(resolver.config);
 
   const tokenFlows = [];
   const checkedAccounts = new Map();
@@ -271,10 +279,12 @@ const listTokenFlows = async (
       if (checkedAccounts.has(address)) continue;
       // Skip not token holders
       if (schemas.tokenHolder.validate(address).error) continue;
+      // Skip vault accounts
+      if (vaultAccounts.includes(address)) continue;
 
       const transactions = await resolver._getAllResults('transactions', (page) =>
         resolver.listTransactions(
-          { paging: page, accountFilter: { accounts: address }, tokenFilter: { tokens: tokenAddress } },
+          { paging: page, accountFilter: { accounts: [address] }, tokenFilter: { tokens: [tokenAddress] } },
           ctx
         )
       );
@@ -288,6 +298,8 @@ const listTokenFlows = async (
         const txTransfers = checkedTx.get(tx.hash).filter((item) => {
           if (direction === 'OUT' && item.from !== address) return false;
           if (direction === 'IN' && item.to !== address) return false;
+          // Skip too small amount
+          if (item.value.lt(minAmount)) return false;
           return true;
         });
 
@@ -297,8 +309,9 @@ const listTokenFlows = async (
         // push to end of queue
         accountsToQueue = accountsToQueue.concat(
           txTransfers
-            .filter((item) => item.value.gte(minAmount))
             .map((item) => (direction === 'IN' ? item.from : item.to))
+            // Skip vault accounts
+            .filter((item) => !vaultAccounts.includes(item))
         );
       }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.143",
+  "version": "1.18.145",
   "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.143",
-    "@arcblock/did-util": "1.18.143",
-    "@arcblock/validator": "1.18.143",
-    "@ocap/config": "1.18.143",
-    "@ocap/indexdb": "1.18.143",
-    "@ocap/mcrypto": "1.18.143",
-    "@ocap/message": "1.18.143",
-    "@ocap/state": "1.18.143",
-    "@ocap/tx-protocols": "1.18.143",
-    "@ocap/util": "1.18.143",
+    "@arcblock/did": "1.18.145",
+    "@arcblock/did-util": "1.18.145",
+    "@arcblock/validator": "1.18.145",
+    "@ocap/config": "1.18.145",
+    "@ocap/indexdb": "1.18.145",
+    "@ocap/mcrypto": "1.18.145",
+    "@ocap/message": "1.18.145",
+    "@ocap/state": "1.18.145",
+    "@ocap/tx-protocols": "1.18.145",
+    "@ocap/util": "1.18.145",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "d60db9ab9a62de1d99cf1fba59866592860bed22"
+  "gitHead": "52b533ef56196496dc068fbf86ea07afbb87366e"
 }