@ocap/resolver 1.13.68 → 1.13.72

package/lib/hooks.js

@@ -2,6 +2,8 @@
 // Purpose of these hooks: update indexdb to speed up subsequent queries
 // RULE: do not try to update statedb in these hooks
 
+const merge = require('lodash/merge');
+const pick = require('lodash/pick');
 const { BN } = require('@ocap/util');
 const { toStakeAddress } = require('@arcblock/did-util');
 
@@ -105,7 +107,8 @@ const ensureRollupValidator = async (address, rollupAddress, ctx, indexdb, upser
 
 const onCreateRollupBlock = async (block, ctx, indexdb) => {
   const { validators, proposer } = block;
-  const { rollupState } = ctx;
+  const { rollupState, txStates } = ctx;
+
   validators.forEach(async (address) => {
     try {
       const doc = await ensureRollupValidator(address, rollupState.address, ctx, indexdb);
@@ -125,6 +128,22 @@ const onCreateRollupBlock = async (block, ctx, indexdb) => {
       console.error('update rollup validator error', err);
     }
   });
+
+  // Withdraw tx.actualFee needs to be reindexed
+  if (Array.isArray(txStates)) {
+    txStates
+      .filter((x) => x.type === 'withdraw_token_v2')
+      .forEach(async (x) => {
+        try {
+          const doc = await indexdb.tx.get(x.hash);
+          const updates = merge(doc, pick(x, ['tx.itxJson.actualFee']));
+          await indexdb.tx.update(x.hash, updates);
+          debug('update tx on new block', x.hash);
+        } catch (err) {
+          console.error('update tx on new block error', err);
+        }
+      });
+  }
 };
 
 const updateRollupStats = async (address, value, key, indexdb) => {
@@ -153,7 +172,9 @@ const onDepositTokenV2 = async (tx, ctx, indexdb) => {
     }
   });
 
-  await updateRollupStats(ctx.rollupState.address, tx.tx.itxJson.token.value, 'totalDepositAmount', indexdb);
+  // totalDepositAmount should include txFee
+  const amount = new BN(tx.tx.itxJson.token.value).add(new BN(tx.tx.itxJson.actualFee));
+  await updateRollupStats(ctx.rollupState.address, amount.toString(), 'totalDepositAmount', indexdb);
 };
 
 const onClaimBlockReward = async (tx, ctx, indexdb) => {
@@ -277,6 +298,7 @@ const onCreateTx = async (tx, ctx, indexdb) => {
     case 'fg:t:claim_block_reward':
       return onClaimBlockReward(tx, ctx, indexdb);
     case 'fg:t:withdraw_token_v2':
+      // totalWithdrawAmount does not include txFee
       return updateRollupStats(ctx.rollupState.address, tx.tx.itxJson.token.value, 'totalWithdrawAmount', indexdb);
     default:
   }

package/package.json

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