@ocap/resolver 1.18.153 → 1.18.155

package/lib/index.js

@@ -162,7 +162,7 @@ module.exports = class OCAPResolver {
    * @param {object} params.filter bloom filter to do anti-replay check
    * @param {bool} params.validateTokenConfig should we validate token supply and token-holder balance, should be disabled when starting an existing chain
    */
-  constructor({ statedb, indexdb, config, filter, validateTokenConfig = true }) {
+  constructor({ statedb, indexdb, config, filter, validateTokenConfig = true, logger }) {
     if (!statedb) {
       throw new Error('OCAP Resolver requires a valid statedb implementation to work');
     }
@@ -170,6 +170,8 @@ module.exports = class OCAPResolver {
       throw new Error('OCAP Resolver requires a valid indexdb implementation to work');
     }
 
+    this.logger = logger || { info: debug, warn: debug, error: debug, debug };
+
     this.statedb = statedb;
     this.indexdb = indexdb;
     this.filter = filter;
@@ -208,7 +210,10 @@ module.exports = class OCAPResolver {
   }
 
   async sendTx({ tx: txBase64 }, ctx = {}) {
-    debug('sendTx', txBase64);
+    this.logger.info('sendTx', {
+      txBase64,
+      request: ctx.request,
+    });
 
     if (process.env.CHAIN_MODE === 'readonly') {
       throw new CustomError('FORBIDDEN', 'This chain node is running in readonly mode');
@@ -222,6 +227,7 @@ module.exports = class OCAPResolver {
       indexdb: this.indexdb,
       config: this.config,
       filter: this.filter,
+      logger: this.logger,
       extra: ctx,
     };
 
@@ -683,7 +689,12 @@ module.exports = class OCAPResolver {
 
   async verifyAccountRisk(args, ctx) {
     return tokenFlow.verifyAccountRisk(
-      { ...args, accountLimit: process.env.VERIFY_RISK_ACCOUNT_LIMIT, txLimit: process.env.VERIFY_RISK_TX_LIMIT },
+      {
+        ...args,
+        accountLimit: process.env.VERIFY_RISK_ACCOUNT_LIMIT,
+        txLimit: process.env.VERIFY_RISK_TX_LIMIT,
+        tolerance: process.env.VERIFY_RISK_TOLERANCE,
+      },
       this,
       ctx
     );

package/lib/token-flow.js

@@ -131,23 +131,17 @@ 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 (
-  { accountAddress, tokenAddress, accountLimit = 400, txLimit = 10000 },
+  { accountAddress, tokenAddress, accountLimit = 400, txLimit = 10000, tolerance = '0.0000000001' },
   resolver,
   ctx = {}
 ) => {
@@ -160,7 +154,8 @@ const verifyAccountRisk = async (
   const checkedAccounts = new Map();
   const checkedTx = new Map();
   const accountQueue = [accountAddress];
-
+  const tokenState = await resolver.tokenCache.get(tokenAddress);
+  const toleranceUnit = fromTokenToUnit(tolerance, tokenState?.decimal);
   const vaultAccounts = getVaultAccounts(resolver.config);
 
   while (accountQueue.length) {
@@ -179,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;
     }
@@ -213,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
@@ -261,7 +256,13 @@ const verifyAccountRisk = async (
     checkedAccounts.set(address, true);
 
     // Check if the balance not matches the transfer records
-    if (!transferIn.eq(transferOut.add(new BN(balance)))) {
+    if (
+      transferIn
+        .sub(transferOut.add(new BN(balance)))
+        .add(fromTokenToUnit(trustedConfig?.tolerance || 0))
+        .abs()
+        .gt(toleranceUnit)
+    ) {
       debug('Account balance does not match transfer records', {
         address,
         transferIn: transferIn.toString(),
@@ -339,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.153",
+  "version": "1.18.155",
   "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.153",
-    "@arcblock/did-util": "1.18.153",
-    "@arcblock/validator": "1.18.153",
-    "@ocap/config": "1.18.153",
-    "@ocap/indexdb": "1.18.153",
-    "@ocap/mcrypto": "1.18.153",
-    "@ocap/message": "1.18.153",
-    "@ocap/state": "1.18.153",
-    "@ocap/tx-protocols": "1.18.153",
-    "@ocap/util": "1.18.153",
+    "@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",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "ad18c565becef73d6ee782502c3f4858de43b68b"
+  "gitHead": "3d0a23a37564c89d4cf8f374823835efdb6eb24b"
 }