@ocap/resolver 1.13.64 → 1.13.68

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),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.64",
+  "version": "1.13.68",
   "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.64",
-    "@arcblock/did-util": "1.13.64",
-    "@ocap/config": "1.13.64",
-    "@ocap/indexdb": "1.13.64",
-    "@ocap/mcrypto": "1.13.64",
-    "@ocap/message": "1.13.64",
-    "@ocap/state": "1.13.64",
-    "@ocap/tx-protocols": "1.13.64",
-    "@ocap/util": "1.13.64",
+    "@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",
     "debug": "^4.3.2",
     "lodash": "^4.17.21"
   },
-  "gitHead": "49c94d9fd5f12ec63c34ad609d041a92f68322a8"
+  "gitHead": "d84324870fe9dca3619df362ba09219dd420f274"
 }