@ocap/indexdb-memory 1.13.36 → 1.13.40

package/lib/db/base.js

@@ -21,6 +21,7 @@ class LocalBaseIndexDB extends BaseIndexDB {
     accountFilter = {},
     validityFilter = {},
     txFilter = {},
+    rollupFilter = {},
   } = {}) {
     const query = this.tx.collection.chain();
 
@@ -31,11 +32,13 @@ class LocalBaseIndexDB extends BaseIndexDB {
     const { tokens = [] } = tokenFilter;
     const { accounts = [] } = accountFilter;
     const { txs = [] } = txFilter;
+    const { rollups = [] } = rollupFilter;
     let { startDateTime, endDateTime } = timeFilter;
     startDateTime = parseDateTime(startDateTime);
     endDateTime = parseDateTime(endDateTime);
 
     const pagination = formatPagination({ paging, defaultSortField: 'time' });
+    debug('listTransactions', { sender, receiver, pagination, types, factories, assets, tokens, accounts, rollups });
 
     if (sender && receiver) {
       if (direction === 'MUTUAL') {
@@ -104,6 +107,10 @@ class LocalBaseIndexDB extends BaseIndexDB {
       query.where((x) => txs.includes(x.hash));
     }
 
+    if (rollups.length) {
+      query.where((x) => x.rollups.some((f) => rollups.includes(f)));
+    }
+
     const transactions = query
       .simplesort(pagination.order.field, paging.order.type === 'desc')
       .offset(pagination.cursor)
@@ -165,27 +172,6 @@ class LocalBaseIndexDB extends BaseIndexDB {
     return { assets, account, paging: formatNextPagination(total, pagination) };
   }
 
-  listAssetTransactions({ address, paging } = {}) {
-    if (!address) {
-      return { transactions: [] };
-    }
-
-    const pagination = formatPagination({ paging, defaultSortField: 'time' });
-    const conditions = { assets: { $contains: address } };
-    debug('listAssetTransactions', { address, paging, conditions, pagination });
-
-    const transactions = this.tx.collection
-      .chain()
-      .find(conditions)
-      .simplesort(pagination.order.field, pagination.order.type === 'desc')
-      .offset(pagination.cursor)
-      .limit(pagination.size)
-      .data();
-
-    const total = this.tx.count(Object.keys(conditions).length ? conditions : undefined);
-    return { transactions, paging: formatNextPagination(total, pagination) };
-  }
-
   async listTopAccounts({ paging, tokenAddress } = {}) {
     const query = this.account.collection.chain();
     const pagination = formatPagination({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-memory",
   "description": "OCAP indexdb adapter that uses memory as backend, just for test purpose",
-  "version": "1.13.36",
+  "version": "1.13.40",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues",
@@ -37,10 +37,10 @@
     "test": "node tools/jest.js",
     "coverage": "npm run test -- --coverage"
   },
-  "gitHead": "856b0a35bdc74c11d18f19f49bfa9cd2a85dd8db",
+  "gitHead": "b540a835813d114c47236f929c7cf0df84949be9",
   "dependencies": {
-    "@ocap/indexdb": "1.13.36",
-    "@ocap/util": "1.13.36",
+    "@ocap/indexdb": "1.13.40",
+    "@ocap/util": "1.13.40",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",