@ocap/resolver 1.18.165 → 1.19.0

package/lib/hooks.js

@@ -9,7 +9,7 @@ const { toStakeAddress } = require('@arcblock/did-util');
 
 const debug = require('debug')(require('../package.json').name);
 
-const onCreateRollup = async (rollup, ctx, indexdb) => {
+const onCreateRollup = (rollup, ctx, indexdb) => {
   rollup.seedValidators.forEach(async (x) => {
     const { pk, address, endpoint } = x;
     try {
@@ -106,7 +106,7 @@ const ensureRollupValidator = async (address, rollupAddress, ctx, indexdb, upser
   });
 };
 
-const onCreateRollupBlock = async (block, ctx, indexdb) => {
+const onCreateRollupBlock = (block, ctx, indexdb) => {
   const { validators, proposer } = block;
   const { rollupState, txStates } = ctx;
 
@@ -178,27 +178,29 @@ const onDepositTokenV2 = async (tx, ctx, indexdb) => {
   await updateRollupStats(ctx.rollupState.address, amount.toString(), 'totalDepositAmount', indexdb);
 };
 
-const onClaimBlockReward = async (tx, ctx, indexdb) => {
+const onClaimBlockReward = (tx, ctx, indexdb) => {
   const { rollupState, blockState } = ctx;
   const { signatures } = blockState;
   // TODO: delegation is not supported here
-  signatures.forEach(async ({ signer }) => {
-    try {
-      const doc = await ensureRollupValidator(signer, rollupState.address, ctx, indexdb);
-
-      const receipt = tx.receipts.find((x) => x.address === signer);
-      if (receipt) {
-        const change = receipt.changes.find(
-          (x) => x.target === rollupState.tokenAddress && new BN(x.value).isNeg() === false
-        );
-        doc.totalGain = new BN(doc.totalGain).add(new BN(change.value).abs()).toString(10);
-        await indexdb.rollupValidator.update(signer, doc);
-        debug('update rollup validator on claim reward', signer);
+  return Promise.all(
+    signatures.map(async ({ signer }) => {
+      try {
+        const doc = await ensureRollupValidator(signer, rollupState.address, ctx, indexdb);
+
+        const receipt = tx.receipts.find((x) => x.address === signer);
+        if (receipt) {
+          const change = receipt.changes.find(
+            (x) => x.target === rollupState.tokenAddress && new BN(x.value).isNeg() === false
+          );
+          doc.totalGain = new BN(doc.totalGain).add(new BN(change.value).abs()).toString(10);
+          await indexdb.rollupValidator.update(signer, doc);
+          debug('update rollup validator on claim reward', signer);
+        }
+      } catch (err) {
+        console.error('update rollup validator on claim reward error', err);
       }
-    } catch (err) {
-      console.error('update rollup validator on claim reward error', err);
-    }
-  });
+    })
+  );
 };
 
 const onJoinRollup = async (tx, ctx, indexdb) => {
@@ -293,7 +295,7 @@ const onAccountMigrate = async (tx, resolver) => {
   }
 };
 
-const onCreateTx = async (tx, ctx, resolver) => {
+const onCreateTx = (tx, ctx, resolver) => {
   if (tx.code !== 'OK') {
     return;
   }

package/lib/index.js

@@ -209,7 +209,7 @@ module.exports = class OCAPResolver {
     });
   }
 
-  async sendTx({ tx: txBase64 }, ctx = {}) {
+  async sendTx({ tx: txBase64, extra }, ctx = {}) {
     debug('sendTx', { txBase64, request: ctx.request });
 
     if (process.env.CHAIN_MODE === 'readonly') {
@@ -225,7 +225,10 @@ module.exports = class OCAPResolver {
       config: this.config,
       filter: this.filter,
       logger: this.logger,
-      extra: ctx,
+      extra: {
+        ...ctx,
+        txExtra: extra,
+      },
     };
 
     // 1. execute and persist the transaction
@@ -684,7 +687,7 @@ module.exports = class OCAPResolver {
     return this._doPaginatedSearch('listDelegations', args, 'delegations', 'data', ctx);
   }
 
-  async verifyAccountRisk(args, ctx) {
+  verifyAccountRisk(args, ctx) {
     return tokenFlow.verifyAccountRisk(
       {
         ...args,
@@ -699,7 +702,7 @@ module.exports = class OCAPResolver {
     );
   }
 
-  async listTokenFlows(args, ctx) {
+  listTokenFlows(args, ctx) {
     return tokenFlow.listTokenFlows(args, this, ctx);
   }
 
@@ -731,7 +734,7 @@ module.exports = class OCAPResolver {
     return { results: [] };
   }
 
-  async estimateGas(args = {}) {
+  estimateGas(args = {}) {
     const { typeUrl = '' } = args;
     if (!typeUrl || !maxGasOps[typeUrl]) {
       throw new CustomError('INVALID_REQUEST', 'Unknown tx typeUrl');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.165",
+  "version": "1.19.0",
   "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.165",
-    "@arcblock/did-util": "1.18.165",
-    "@arcblock/validator": "1.18.165",
-    "@ocap/config": "1.18.165",
-    "@ocap/indexdb": "1.18.165",
-    "@ocap/mcrypto": "1.18.165",
-    "@ocap/message": "1.18.165",
-    "@ocap/state": "1.18.165",
-    "@ocap/tx-protocols": "1.18.165",
-    "@ocap/util": "1.18.165",
+    "@arcblock/did": "1.19.0",
+    "@arcblock/did-util": "1.19.0",
+    "@arcblock/validator": "1.19.0",
+    "@ocap/config": "1.19.0",
+    "@ocap/indexdb": "1.19.0",
+    "@ocap/mcrypto": "1.19.0",
+    "@ocap/message": "1.19.0",
+    "@ocap/state": "1.19.0",
+    "@ocap/tx-protocols": "1.19.0",
+    "@ocap/util": "1.19.0",
     "debug": "^4.3.6",
     "lodash": "^4.17.21"
   },
-  "gitHead": "e1a9e9e807ca049f67ffbb5ac556b014461cb7a1"
+  "gitHead": "1b6fac03988fb18507c8ef4c21de282762005f87"
 }