@ocap/resolver 1.13.13 → 1.13.17

package/lib/index.js

@@ -13,7 +13,7 @@ const md5 = require('@ocap/util/lib/md5');
 const CustomError = require('@ocap/util/lib/error');
 const { types } = require('@ocap/mcrypto');
 const { fromTypeUrl } = require('@ocap/message');
-const { fromPublicKey, toTypeInfo } = require('@arcblock/did');
+const { fromPublicKey, toTypeInfo, isValid: isValidDid } = require('@arcblock/did');
 const { toBN, fromTokenToUnit } = require('@ocap/util');
 const { DEFAULT_TOKEN_DECIMAL } = require('@ocap/util/lib/constant');
 const { createExecutor } = require('@ocap/tx-protocols');
@@ -87,7 +87,6 @@ const extractTokenMeta = (address, tokenStates) => {
   const tokenState = tokenStates.find((t) => t.address === address);
 
   return {
-    key: address, // TODO: 这里是为了测试时的兼容
     address,
     decimal: typeof tokenState.decimal === 'undefined' ? DEFAULT_TOKEN_DECIMAL : tokenState.decimal,
     unit: tokenState.unit,
@@ -263,7 +262,6 @@ module.exports = class OCAPResolver {
           if (state.tokens) {
             state.tokens = await this.formatTokenMap(state.tokens);
           }
-          return this.restoreStateBalance(state, ctx);
         }
 
         return state;
@@ -298,7 +296,7 @@ module.exports = class OCAPResolver {
       onRead: async (state) => {
         if (state) {
           const tokens = await this.formatTokenMap({ [state.tokenAddress]: '0' });
-          state.tokenInfo = tokens[state.tokenAddress];
+          state.tokenInfo = tokens.find((x) => x.address === state.tokenAddress);
         }
 
         return state;
@@ -314,7 +312,7 @@ module.exports = class OCAPResolver {
 
     const blockHeight = Number(height || 0);
     if (blockHeight > 0 && rollupAddress) {
-      const { blocks } = await this._doSearch(
+      const { blocks } = await this._doPaginatedSearch(
         'listRollupBlocks',
         { height: blockHeight, rollupAddress },
         'blocks',
@@ -350,15 +348,11 @@ module.exports = class OCAPResolver {
 
           state.output.data = formatData(state.output.data);
 
-          if (!get(ctx, 'featureSwitch.consistentTokens')) {
-            const index = state.input.tokens.findIndex((x) => x.address === this.tokenItx.address);
-            if (index > -1) {
-              state.input.value = state.input.tokens[index].value;
-              state.input.tokens.splice(index, 1);
-            }
+          const index = state.input.tokens.findIndex((x) => x.address === this.tokenItx.address);
+          if (index > -1) {
+            state.input.value = state.input.tokens[index].value;
+            state.input.tokens.splice(index, 1);
           }
-
-          return this.restoreStateBalance(state, ctx);
         }
 
         return state;
@@ -394,8 +388,6 @@ module.exports = class OCAPResolver {
       state = await this._getState({ table: 'account', id: address, dataKey: 'data', expandContext: false, ctx });
     }
 
-    state = this.restoreStateBalance(state, ctx);
-
     if (!state || !state.tokens) {
       return [];
     }
@@ -491,51 +483,74 @@ module.exports = class OCAPResolver {
   }
 
   listTransactions(args, ctx) {
-    return this._doSearch('listTransactions', args, 'transactions', 'tx.itxJson.data', ctx);
+    return this._doPaginatedSearch('listTransactions', args, 'transactions', 'tx.itxJson.data', ctx);
   }
 
   listAssets(args, ctx) {
-    return this._doSearch('listAssets', args, 'assets', 'data', ctx);
+    return this._doPaginatedSearch('listAssets', args, 'assets', 'data', ctx);
   }
 
   listAssetTransactions(args, ctx) {
-    return this._doSearch('listAssetTransactions', args, 'transactions', 'tx.itxJson.data', ctx);
+    return this._doPaginatedSearch('listAssetTransactions', args, 'transactions', 'tx.itxJson.data', ctx);
   }
 
   async listFactories(args, ctx) {
-    const result = await this._doSearch('listFactories', args, 'factories', 'data', ctx);
+    const result = await this._doPaginatedSearch('listFactories', args, 'factories', 'data', ctx);
     result.factories = result.factories.map((x) => {
       x.output.data = formatData(x.output.data);
-      return this.restoreStateBalance(x, ctx);
+      return x;
     });
 
     return result;
   }
 
-  async listTopAccounts(args, ctx) {
+  listTopAccounts(args) {
     if (!args.tokenAddress) {
       args.tokenAddress = this.tokenItx.address;
     }
 
-    const result = await this._doSearch('listTopAccounts', args, 'accounts');
-    result.accounts = result.accounts.map((x) => this.restoreStateBalance(x, ctx));
-    return result;
+    return this._doPaginatedSearch('listTopAccounts', args, 'accounts');
   }
 
   listTokens(args, ctx) {
-    return this._doSearch('listTokens', args, 'tokens', 'data', ctx);
+    return this._doPaginatedSearch('listTokens', args, 'tokens', 'data', ctx);
   }
 
   listStakes(args, ctx) {
-    return this._doSearch('listStakes', args, 'stakes', 'data', ctx);
+    return this._doPaginatedSearch('listStakes', args, 'stakes', 'data', ctx);
   }
 
   listRollups(args, ctx) {
-    return this._doSearch('listRollups', args, 'rollups', 'data', ctx);
+    return this._doPaginatedSearch('listRollups', args, 'rollups', 'data', ctx);
   }
 
   listRollupBlocks(args, ctx) {
-    return this._doSearch('listRollupBlocks', args, 'blocks', 'data', ctx);
+    return this._doPaginatedSearch('listRollupBlocks', args, 'blocks', 'data', ctx);
+  }
+
+  async search(args) {
+    if (!args.keyword) {
+      return { results: [] };
+    }
+
+    const doSearch = async (type) => {
+      const result = await this.indexdb[type].get(args.keyword);
+      return result ? { type, id: args.keyword } : null;
+    };
+
+    const entitiesByDid = ['account', 'asset', 'delegation', 'factory', 'token', 'stake', 'rollup'];
+    if (isValidDid(args.keyword)) {
+      const results = await Promise.all(entitiesByDid.map(doSearch));
+      return { results: results.filter(Boolean) };
+    }
+
+    const entitiesByHash = ['tx', 'rollupBlock'];
+    if (states.Joi.hashRegexp.test(args.keyword)) {
+      const results = await Promise.all(entitiesByHash.map(doSearch));
+      return { results: results.filter(Boolean) };
+    }
+
+    return { results: [] };
   }
 
   listBlocks() {
@@ -726,7 +741,7 @@ module.exports = class OCAPResolver {
     return onRead(state);
   }
 
-  async _doSearch(fn, args, listKey, dataKey, ctx) {
+  async _doPaginatedSearch(fn, args, listKey, dataKey, ctx) {
     const result = await this.indexdb[fn](args);
     const { [listKey]: items = [], ...rest } = result;
     let data = items;
@@ -822,14 +837,17 @@ module.exports = class OCAPResolver {
       tokens.push(...tx.tx.itxJson.receiver.tokens);
     } else if (typeUrl === 'TransferV2Tx') {
       tokens.push(...tx.tx.itxJson.tokens);
-    } else if (['TransferV3Tx', 'AcquireAssetV3Tx'].includes(typeUrl)) {
+    } else if (['TransferV3Tx', 'AcquireAssetV3Tx', 'StakeTx'].includes(typeUrl)) {
+      tokens.push(
+        ...uniqBy(
+          tx.tx.itxJson.inputs.reduce((acc, x) => acc.concat(x.tokens), []),
+          'address'
+        ).filter((x) => x.address)
+      );
+    } else if (['RevokeStakeTx'].includes(typeUrl)) {
       tokens.push(
         ...uniqBy(
-          tx.tx.itxJson.inputs.reduce((acc, x) => {
-            // eslint-disable-next-line no-param-reassign
-            acc = acc.concat(x.tokens);
-            return acc;
-          }, []),
+          tx.tx.itxJson.outputs.reduce((acc, x) => acc.concat(x.tokens), []),
           'address'
         ).filter((x) => x.address)
       );
@@ -844,69 +862,28 @@ module.exports = class OCAPResolver {
     return [];
   }
 
-  fixReceiptTokens(tx, ctx) {
-    if (get(ctx, 'featureSwitch.consistentTokens')) {
-      // Auto populate initial token address in tx receipts
-      tx.receipts.forEach((receipt) =>
-        receipt.changes.forEach((x) => {
-          if (x.target === '') {
-            x.target = this.tokenItx.address;
-          }
-        })
-      );
-    } else {
-      // TODO: only exist for backwards compatibility
-      tx.receipts.forEach((receipt) =>
-        receipt.changes.forEach((x) => {
-          if (x.target === this.tokenItx.address) {
-            x.target = '';
-          }
-        })
-      );
-    }
+  fixReceiptTokens(tx) {
+    // Auto populate initial token address in tx receipts
+    tx.receipts.forEach((receipt) =>
+      receipt.changes.forEach((x) => {
+        if (x.target === '') {
+          x.target = this.tokenItx.address;
+        }
+      })
+    );
 
     return tx;
   }
 
-  fixTokenSymbols(tx, ctx) {
+  fixTokenSymbols(tx) {
     const index = tx.tokenSymbols.findIndex((x) => x.address === this.tokenItx.address);
-    if (get(ctx, 'featureSwitch.consistentTokens')) {
-      if (index === -1) {
-        tx.tokenSymbols.push(extractTokenMeta(this.tokenItx.address, [this.tokenItx]));
-      }
-    } else if (index > -1) {
-      tx.tokenSymbols.splice(index, 1);
+    if (index === -1) {
+      tx.tokenSymbols.push(extractTokenMeta(this.tokenItx.address, [this.tokenItx]));
     }
 
     return tx;
   }
 
-  // TODO: only exist for backwards compatibility
-  restoreStateBalance(state, ctx) {
-    if (!state || !state.tokens) {
-      return state;
-    }
-
-    if (get(ctx, 'featureSwitch.consistentTokens')) {
-      return state;
-    }
-
-    // For indexdb
-    if (Array.isArray(state.tokens)) {
-      const index = state.tokens.findIndex((x) => x.address === this.tokenItx.address);
-      if (index > -1) {
-        state.balance = state.tokens[index].value || state.tokens[index].balance;
-        state.tokens.splice(index, 1);
-      }
-    } else if (state.tokens[this.tokenItx.address]) {
-      // For statedb
-      state.balance = state.tokens[this.tokenItx.address];
-      delete state.tokens[this.tokenItx.address];
-    }
-
-    return state;
-  }
-
   enrichIndexContext(ctx) {
     if (Array.isArray(ctx.tokenStates)) {
       ctx.tokenStates.push(this.tokenItx);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.13",
+  "version": "1.13.17",
   "description": "GraphQL resolver built upon ocap statedb and GQL layer",
   "main": "lib/index.js",
   "files": [
@@ -22,16 +22,16 @@
     "jest": "^26.6.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.13.13",
-    "@ocap/config": "1.13.13",
-    "@ocap/indexdb": "1.13.13",
-    "@ocap/mcrypto": "1.13.13",
-    "@ocap/message": "1.13.13",
-    "@ocap/state": "1.13.13",
-    "@ocap/tx-protocols": "1.13.13",
-    "@ocap/util": "1.13.13",
+    "@arcblock/did": "1.13.17",
+    "@ocap/config": "1.13.17",
+    "@ocap/indexdb": "1.13.17",
+    "@ocap/mcrypto": "1.13.17",
+    "@ocap/message": "1.13.17",
+    "@ocap/state": "1.13.17",
+    "@ocap/tx-protocols": "1.13.17",
+    "@ocap/util": "1.13.17",
     "debug": "^4.3.2",
     "lodash": "^4.17.21"
   },
-  "gitHead": "928f6e414625da954067edb6c9f0b44a7086ee83"
+  "gitHead": "8f5e7a52b90cbe52dda7182ad1780771b03442e7"
 }