@ocap/indexdb-elasticsearch 1.18.68 → 1.18.70

package/lib/db.js

@@ -28,6 +28,13 @@ const REQUEST_TIMEOUT = 8000;
 const MAX_REQUEST_FACTORY_ADDRESS_SIZE = 100;
 const TRACK_TOTAL_HITS = +process.env.TRACK_TOTAL_HITS || 10000;
 
+const getMigratedFrom = (account) => {
+  if (account.migratedFrom) {
+    return Array.isArray(account.migratedFrom) ? account.migratedFrom[0] : account.migratedFrom;
+  }
+  return '';
+};
+
 class ESIndexDB extends BaseIndexDB {
   /**
    * Creates an instance of ESIndexDB.
@@ -211,10 +218,29 @@ class ESIndexDB extends BaseIndexDB {
     return { transactions: items.map((item) => formatTxAfterRead(item)), paging: nextPaging };
   }
 
+  async getRelatedAddresses(address) {
+    let account = await this.account.get(address);
+    if (!account) {
+      return [];
+    }
+
+    const related = [address];
+    while (account && getMigratedFrom(account) && related.length <= 8) {
+      related.push(getMigratedFrom(account));
+      // eslint-disable-next-line no-await-in-loop
+      account = await this.account.get(getMigratedFrom(account));
+    }
+
+    return related;
+  }
+
   async listAssets({ ownerAddress, factoryAddress, paging, timeFilter = {} } = {}) {
     const conditions = [];
     if (ownerAddress) {
-      conditions.push({ term: { owner: ownerAddress } });
+      const possibleOwners = await this.getRelatedAddresses(ownerAddress);
+      if (possibleOwners.length) {
+        conditions.push({ terms: { owner: possibleOwners } });
+      }
     }
     if (factoryAddress) {
       conditions.push({ term: { parent: factoryAddress } });
@@ -228,6 +254,7 @@ class ESIndexDB extends BaseIndexDB {
       return { assets: [], account: null };
     }
 
+    debug('listAssets query conditions', conditions);
     const pagination = formatPagination({ paging, defaultSortField: 'renaissanceTime' });
 
     const [result, account] = await Promise.all([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-elasticsearch",
   "description": "OCAP indexdb adapter that uses elasticsearch as backend",
-  "version": "1.18.68",
+  "version": "1.18.70",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues",
@@ -38,12 +38,12 @@
     "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage"
   },
-  "gitHead": "85b001bdb1e3711aae31009ae7c506ff984419ed",
+  "gitHead": "1f83cffbbb5ac5f34b07cb9302676352ac174286",
   "dependencies": {
-    "@arcblock/did": "1.18.68",
+    "@arcblock/did": "1.18.70",
     "@elastic/elasticsearch": "7.13.0",
-    "@ocap/indexdb": "1.18.68",
-    "@ocap/util": "1.18.68",
+    "@ocap/indexdb": "1.18.70",
+    "@ocap/util": "1.18.70",
     "axios": "^0.27.2",
     "bn.js": "^5.2.1",
     "debug": "^4.3.4",