@ocap/resolver 1.13.62 → 1.13.66

package/lib/index.js

@@ -9,6 +9,7 @@ const isEqual = require('lodash/isEqual');
 const uniqBy = require('lodash/unionBy');
 const Config = require('@ocap/config');
 const states = require('@ocap/state');
+const Joi = require('@ocap/validator');
 const md5 = require('@ocap/util/lib/md5');
 const CustomError = require('@ocap/util/lib/error');
 const { types } = require('@ocap/mcrypto');
@@ -166,7 +167,7 @@ module.exports = class OCAPResolver {
   }
 
   getTx({ hash }, ctx) {
-    if (states.Joi.hashRegexp.test(hash)) {
+    if (Joi.patterns.txHash.test(hash)) {
       return this._getState({
         table: 'tx',
         id: hash.toUpperCase(),
@@ -437,8 +438,9 @@ module.exports = class OCAPResolver {
   }
 
   getForgeState() {
+    const { accounts, token, transaction } = this.config;
     return Promise.resolve({
-      accountConfig: [],
+      accountConfig: accounts,
       address: 'forge_state',
       consensus: {
         maxBytes: '150000',
@@ -449,25 +451,13 @@ module.exports = class OCAPResolver {
         validatorChanged: false,
       },
       data: null,
-      gas: [],
-      protocols: [],
-      stakeSummary: [],
       tasks: [],
-      token: this.config.token,
-      tokenSwapConfig: {
-        commissionHolderAddress: '',
-        commissionRate: 0,
-        maxCommission: null,
-        minCommission: null,
-        revokeCommissionRate: 0,
-      },
+      token,
       txConfig: {
-        minimumStake: '10000000000000000',
-        stake: {
-          timeoutGeneral: 86400,
-          timeoutStakeForNode: 604800,
-        },
-        ...this.config.transaction,
+        ...transaction,
+        txFee: Object.keys(transaction.txFee)
+          .filter((x) => x !== 'default')
+          .map((x) => ({ typeUrl: x, fee: fromTokenToUnit(transaction.txFee[x], token.decimal).toString(10) })),
       },
       upgradeInfo: null,
     });
@@ -602,7 +592,7 @@ module.exports = class OCAPResolver {
       return result ? { type, id: keyword } : null;
     };
 
-    if (states.Joi.hashRegexp.test(args.keyword)) {
+    if (Joi.patterns.txHash.test(args.keyword)) {
       const results = await Promise.all([
         doSearch('tx', args.keyword.toUpperCase()),
         doSearch('rollupBlock', args.keyword),
@@ -901,7 +891,14 @@ module.exports = class OCAPResolver {
       return [];
     }
 
-    const rollupTxs = ['DepositTokenV2Tx', 'WithdrawTokenV2Tx', 'JoinRollupTx', 'LeaveRollupTx', 'CreateRollupBlockTx'];
+    const rollupTxs = [
+      'DepositTokenV2Tx',
+      'WithdrawTokenV2Tx',
+      'JoinRollupTx',
+      'LeaveRollupTx',
+      'CreateRollupBlockTx',
+      'ClaimBlockRewardTx',
+    ];
     const typeUrl = formatTxType(tx.tx.itxJson._type);
     const tokens = [];
 
@@ -924,13 +921,21 @@ module.exports = class OCAPResolver {
           'address'
         ).filter((x) => x.address)
       );
-    } else if (['RevokeStakeTx'].includes(typeUrl)) {
+    } else if (typeUrl === 'RevokeStakeTx') {
       tokens.push(
         ...uniqBy(
           tx.tx.itxJson.outputs.reduce((acc, x) => acc.concat(x.tokens), []),
           'address'
         ).filter((x) => x.address)
       );
+    } else if (typeUrl === 'ClaimStakeTx') {
+      const revokeTx = await this.indexdb.tx.get(tx.tx.itxJson.evidence.hash);
+      tokens.push(
+        ...uniqBy(
+          revokeTx.tx.itxJson.outputs.reduce((acc, x) => acc.concat(x.tokens), []),
+          'address'
+        ).filter((x) => x.address)
+      );
     } else if (rollupTxs.includes(typeUrl)) {
       const rollup = await this.indexdb.rollup.get(tx.tx.itxJson.rollup);
       tokens.push({ address: rollup.tokenAddress, value: '0' });

package/package.json

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