@ocap/resolver 1.18.153 → 1.18.154

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');
@@ -683,7 +688,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

@@ -147,7 +147,7 @@ const fixMigrateReceipts = async ({ accountAddress, tx }, resolver) => {
 };
 
 const verifyAccountRisk = async (
-  { accountAddress, tokenAddress, accountLimit = 400, txLimit = 10000 },
+  { accountAddress, tokenAddress, accountLimit = 400, txLimit = 10000, tolerance = '0.0000000001' },
   resolver,
   ctx = {}
 ) => {
@@ -160,7 +160,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) {
@@ -261,7 +262,12 @@ 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)))
+        .abs()
+        .gt(toleranceUnit)
+    ) {
       debug('Account balance does not match transfer records', {
         address,
         transferIn: transferIn.toString(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.153",
+  "version": "1.18.154",
   "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.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",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "ad18c565becef73d6ee782502c3f4858de43b68b"
+  "gitHead": "414d4207886905fca9529912a12a3b6b8c811886"
 }