@ocap/resolver 1.18.113 → 1.18.115

package/lib/index.js

@@ -16,7 +16,7 @@ const { types } = require('@ocap/mcrypto');
 const { fromTypeUrl } = require('@ocap/message');
 const { toStakeAddress } = require('@arcblock/did-util');
 const { fromPublicKey, toTypeInfo, isValid: isValidDid } = require('@arcblock/did');
-const { BN, toBN, fromTokenToUnit } = require('@ocap/util');
+const { BN, toBN, fromTokenToUnit, toAddress } = require('@ocap/util');
 const { DEFAULT_TOKEN_DECIMAL } = require('@ocap/util/lib/constant');
 const { createExecutor } = require('@ocap/tx-protocols');
 const { decodeAnySafe } = require('@ocap/tx-protocols/lib/util');
@@ -689,7 +689,8 @@ module.exports = class OCAPResolver {
 
     const entitiesByDid = ['account', 'asset', 'delegation', 'factory', 'token', 'stake', 'rollup'];
     if (isValidDid(args.keyword)) {
-      const results = await Promise.all(entitiesByDid.map((type) => doSearch(type, args.keyword)));
+      const keyword = toAddress(args.keyword);
+      const results = await Promise.all(entitiesByDid.map((type) => doSearch(type, keyword)));
       return { results: results.filter(Boolean) };
     }
 
@@ -867,7 +868,8 @@ module.exports = class OCAPResolver {
       throw new CustomError('INVALID_REQUEST', `Missing required parameter to read ${table} state`);
     }
 
-    const state = await this.runAsLambda((txn) => this.statedb[table].get(id, { txn, ...extraParams }));
+    const unified = isValidDid(id) ? toAddress(id) : id;
+    const state = await this.runAsLambda((txn) => this.statedb[table].get(unified, { txn, ...extraParams }));
     if (state) {
       if (dataKey) {
         set(state, dataKey, formatData(get(state, dataKey)));

package/package.json

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