@ocap/indexdb-elasticsearch 1.13.70 → 1.13.74

package/lib/db.js

@@ -5,6 +5,7 @@ const { formatPagination } = require('@ocap/indexdb/lib/util');
 const { parseDateTime } = require('@ocap/indexdb/lib/util');
 const { formatTxAfterRead } = require('@ocap/indexdb/lib/util');
 const { DEFAULT_TOKEN_DECIMAL } = require('@ocap/util/lib/constant');
+const { toChecksumAddress } = require('@arcblock/did/lib/type');
 
 const debug = require('debug')(require('../package.json').name);
 
@@ -439,7 +440,7 @@ class ESIndexDB extends BaseIndexDB {
     return { stakes: items.map((item) => Stake.formatAfterRead(item)), paging: nextPaging };
   }
 
-  async listRollups({ paging, tokenAddress = '', erc20TokenAddress = '' } = {}) {
+  async listRollups({ paging, tokenAddress = '', erc20TokenAddress = '', foreignTokenAddress = '' } = {}) {
     const pagination = formatPagination({
       paging,
       defaultSortField: 'renaissanceTime',
@@ -450,8 +451,14 @@ class ESIndexDB extends BaseIndexDB {
     if (tokenAddress) {
       conditions.push({ term: { tokenAddress } });
     }
-    if (erc20TokenAddress) {
-      conditions.push({ match: { erc20TokenAddress } });
+    const foreignTokenAddr = foreignTokenAddress || erc20TokenAddress;
+    if (foreignTokenAddr) {
+      conditions.push({
+        nested: {
+          path: 'foreignToken',
+          query: { bool: { must: { term: { 'foreignToken.contractAddress': toChecksumAddress(foreignTokenAddr) } } } },
+        },
+      });
     }
 
     debug('listRollups', { paging, pagination, conditions });

package/lib/model/rollup.js

@@ -72,6 +72,8 @@ module.exports = () => ({
       totalDepositAmount: { type: 'text' },
       totalWithdrawAmount: { type: 'text' },
 
+      migrateHistory: { type: 'keyword' },
+
       data: { type: 'object', enabled: false },
     },
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-elasticsearch",
   "description": "OCAP indexdb adapter that uses elasticsearch as backend",
-  "version": "1.13.70",
+  "version": "1.13.74",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues",
@@ -38,11 +38,12 @@
     "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage"
   },
-  "gitHead": "17d673049138356f4cce9ca3d59e2f531b479c2d",
+  "gitHead": "24531e4142d2dc888d6f6091d82d2f7e5abe22ae",
   "dependencies": {
+    "@arcblock/did": "1.13.74",
     "@elastic/elasticsearch": "7.13.0",
-    "@ocap/indexdb": "1.13.70",
-    "@ocap/util": "1.13.70",
+    "@ocap/indexdb": "1.13.74",
+    "@ocap/util": "1.13.74",
     "axios": "^0.21.4",
     "bn.js": "^5.2.0",
     "debug": "^4.3.2",