@ocap/indexdb-elasticsearch 1.13.38 → 1.13.42

package/lib/db.js

@@ -99,6 +99,7 @@ class ESIndexDB extends BaseIndexDB {
     accountFilter = {},
     validityFilter = {},
     txFilter = {},
+    rollupFilter = {},
   } = {}) {
     const pagination = formatPagination({ paging, defaultSortField: 'time' });
 
@@ -109,6 +110,7 @@ class ESIndexDB extends BaseIndexDB {
     const { tokens = [] } = tokenFilter;
     const { accounts = [] } = accountFilter;
     const { txs = [] } = txFilter;
+    const { rollups = [] } = rollupFilter;
     let { startDateTime, endDateTime } = timeFilter;
     startDateTime = parseDateTime(startDateTime);
     endDateTime = parseDateTime(endDateTime);
@@ -172,6 +174,10 @@ class ESIndexDB extends BaseIndexDB {
       conditions.push({ terms: { hash: txs } });
     }
 
+    if (rollups.length) {
+      conditions.push({ terms: { rollups } });
+    }
+
     if (startDateTime && endDateTime) {
       conditions.push({ range: { time: { gt: startDateTime, lte: endDateTime } } });
     } else if (startDateTime) {
@@ -249,30 +255,6 @@ class ESIndexDB extends BaseIndexDB {
     return { assets: items, account, paging: nextPaging };
   }
 
-  async listAssetTransactions({ address, paging } = {}) {
-    if (!address) {
-      return { transactions: [] };
-    }
-
-    const pagination = formatPagination({ paging, defaultSortField: 'time' });
-    if (pagination.order.field !== 'time') {
-      pagination.order.field = 'time';
-    }
-
-    const result = await this.tx.search({
-      from: pagination.cursor,
-      size: pagination.size,
-      body: {
-        query: { bool: { must: [{ term: { assets: address } }] } },
-        sort: [{ [pagination.order.field]: { order: pagination.order.type } }],
-        _source: { exclude: ['tx.itxJson.data', 'tx.itxJson.encoded_value'] }, // required to make api fast
-      },
-    });
-
-    const { items, paging: nextPaging } = formatQueryResult(result, pagination);
-    return { transactions: items.map((item) => formatTxAfterRead(item)), paging: nextPaging };
-  }
-
   async listTopAccounts({ tokenAddress, paging } = {}) {
     const filter = { term: { 'tokens.address': tokenAddress } };
     const pagination = formatPagination({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-elasticsearch",
   "description": "OCAP indexdb adapter that uses elasticsearch as backend",
-  "version": "1.13.38",
+  "version": "1.13.42",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues",
@@ -38,11 +38,11 @@
     "test": "node tools/jest.js",
     "coverage": "npm run test -- --coverage"
   },
-  "gitHead": "1a63d4006790a3a995317552e6f332be8d523e67",
+  "gitHead": "a35134ea41dd3283233bf27f9b618da0d142db4f",
   "dependencies": {
     "@elastic/elasticsearch": "7.13.0",
-    "@ocap/indexdb": "1.13.38",
-    "@ocap/util": "1.13.38",
+    "@ocap/indexdb": "1.13.42",
+    "@ocap/util": "1.13.42",
     "axios": "^0.21.4",
     "bn.js": "^5.2.0",
     "debug": "^4.3.2",