@ocap/resolver 1.18.154 → 1.18.156

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');
@@ -227,6 +224,7 @@ module.exports = class OCAPResolver {
       indexdb: this.indexdb,
       config: this.config,
       filter: this.filter,
+      logger: this.logger,
       extra: ctx,
     };
 

package/lib/token-flow.js

@@ -131,19 +131,13 @@ const getInitialBalance = (address, config) => {
   return account ? fromTokenToUnit(account.balance) : ZERO;
 };
 
-const fixMigrateReceipts = async ({ accountAddress, tx }, resolver) => {
+const fixMigrateReceipts = async (tx, resolver) => {
   const migrationChain = await resolver.getMigrationChain();
-  const address = migrationChain.findAddressAtTime(accountAddress, new Date(tx.time));
-  const migrations = migrationChain.getMigrationHistory(accountAddress);
-
-  // fix receipts address
-  if (address && migrations.length) {
-    tx.receipts.forEach((receipt) => {
-      if (migrations.some((x) => isSameDid(x.address, receipt.address))) {
-        receipt.address = address;
-      }
-    });
-  }
+  const txTime = new Date(tx.time);
+
+  tx.receipts?.forEach((receipt) => {
+    receipt.address = migrationChain.findAddressAtTime(receipt.address, txTime);
+  });
 };
 
 const verifyAccountRisk = async (
@@ -180,8 +174,10 @@ const verifyAccountRisk = async (
     const address = accountQueue.pop();
     // Avoid circular query
     if (checkedAccounts.has(address)) continue;
-    // skip trusted accounts
-    if (await resolver.filter.isTrusted(address)) {
+
+    const trustedConfig = await resolver.filter?.getTrustedAccountConfig(address);
+    // Skip trusted accounts that do not have tolerance configured
+    if (trustedConfig && !trustedConfig.tolerance) {
       checkedAccounts.set(address, true);
       continue;
     }
@@ -214,14 +210,12 @@ const verifyAccountRisk = async (
     // Parse txs to get transfer amounts
     for (const tx of transactions) {
       // fix migrate receipts
-      if (accountState.migratedFrom?.length || accountState.migratedTo?.length) {
-        await fixMigrateReceipts({ accountAddress: address, tx }, resolver, ctx);
-      }
+      await fixMigrateReceipts(tx, resolver, ctx);
+
       // cache tx
       if (!checkedTx.has(tx.hash)) {
         checkedTx.set(tx.hash, await getTransferList(tx, tokenAddress));
       }
-
       const { transferInList, transferOutList } = checkedTx.get(tx.hash);
 
       // Calculate the total amount of transfer for this address
@@ -265,6 +259,7 @@ const verifyAccountRisk = async (
     if (
       transferIn
         .sub(transferOut.add(new BN(balance)))
+        .add(fromTokenToUnit(trustedConfig?.tolerance || 0))
         .abs()
         .gt(toleranceUnit)
     ) {
@@ -345,7 +340,7 @@ const listTokenFlows = async (
 
       for (const tx of transactions) {
         // fix migrate receipts
-        await fixMigrateReceipts({ accountAddress: address, tx }, resolver, ctx);
+        await fixMigrateReceipts(tx, resolver, ctx);
         // cache tx
         if (!checkedTx.has(tx.hash)) {
           checkedTx.set(tx.hash, await getTransferFlow(tx, tokenAddress));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.154",
+  "version": "1.18.156",
   "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.154",
-    "@arcblock/did-util": "1.18.154",
-    "@arcblock/validator": "1.18.154",
-    "@ocap/config": "1.18.154",
-    "@ocap/indexdb": "1.18.154",
-    "@ocap/mcrypto": "1.18.154",
-    "@ocap/message": "1.18.154",
-    "@ocap/state": "1.18.154",
-    "@ocap/tx-protocols": "1.18.154",
-    "@ocap/util": "1.18.154",
+    "@arcblock/did": "1.18.156",
+    "@arcblock/did-util": "1.18.156",
+    "@arcblock/validator": "1.18.156",
+    "@ocap/config": "1.18.156",
+    "@ocap/indexdb": "1.18.156",
+    "@ocap/mcrypto": "1.18.156",
+    "@ocap/message": "1.18.156",
+    "@ocap/state": "1.18.156",
+    "@ocap/tx-protocols": "1.18.156",
+    "@ocap/util": "1.18.156",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "414d4207886905fca9529912a12a3b6b8c811886"
+  "gitHead": "955c3e7ae8e06fc037e6591267babaae1623ef23"
 }