@ocap/indexdb-elasticsearch 1.13.16 → 1.13.20

package/lib/db.js

@@ -17,6 +17,7 @@ const Token = require('./table/token');
 const Stake = require('./table/stake');
 const Rollup = require('./table/rollup');
 const RollupBlock = require('./table/rollup-block');
+const RollupValidator = require('./table/rollup-validator');
 
 const { name, version } = require('../package.json');
 const { formatQueryResult, getAuthHeaders } = require('./util');
@@ -82,6 +83,7 @@ class ESIndexDB extends BaseIndexDB {
     this.stake = new Stake(this);
     this.rollup = new Rollup(this);
     this.rollupBlock = new RollupBlock(this);
+    this.rollupValidator = new RollupValidator(this);
 
     this.attachReadyListeners();
   }
@@ -272,7 +274,13 @@ class ESIndexDB extends BaseIndexDB {
   }
 
   async listTopAccounts({ tokenAddress, paging } = {}) {
-    const pagination = formatPagination({ paging, defaultSortField: 'balance' });
+    const filter = { term: { 'tokens.address': tokenAddress } };
+    const pagination = formatPagination({
+      paging,
+      defaultSortField: 'balance',
+      supportedSortFields: ['genesisTime', 'renaissanceTime', 'balance'],
+    });
+
     let sort = null;
     if (pagination.order.field === 'balance') {
       sort = [
@@ -282,9 +290,7 @@ class ESIndexDB extends BaseIndexDB {
             order: pagination.order.type,
             nested: {
               path: 'tokens',
-              filter: {
-                term: { 'tokens.address': tokenAddress },
-              },
+              filter,
             },
           },
         },
@@ -304,7 +310,15 @@ class ESIndexDB extends BaseIndexDB {
     const result = await this.account.search({
       from: pagination.cursor,
       size: pagination.size,
-      body: { query: FALLBACK_QUERY, sort },
+      body: {
+        query: {
+          nested: {
+            path: 'tokens',
+            query: { bool: { filter } },
+          },
+        },
+        sort,
+      },
     });
 
     const { items, paging: nextPaging } = formatQueryResult(result, pagination);
@@ -455,7 +469,7 @@ class ESIndexDB extends BaseIndexDB {
       conditions.push({ term: { tokenAddress } });
     }
     if (erc20TokenAddress) {
-      conditions.push({ term: { erc20TokenAddress } });
+      conditions.push({ match: { erc20TokenAddress } });
     }
 
     debug('listRollups', { paging, pagination, conditions });
@@ -544,6 +558,34 @@ class ESIndexDB extends BaseIndexDB {
     const { items, paging: nextPaging } = formatQueryResult(result, pagination);
     return { blocks: items, paging: nextPaging };
   }
+
+  async listRollupValidators({ paging = {}, rollupAddress = '' } = {}) {
+    const pagination = formatPagination({
+      paging,
+      defaultSortField: 'genesisTime',
+      supportedSortFields: ['joinTime', 'leaveTime', 'genesisTime', 'renaissanceTime'],
+    });
+
+    const conditions = [];
+
+    if (rollupAddress) {
+      conditions.push({ term: { rollup: rollupAddress } });
+    }
+
+    debug('listRollupValidators query conditions', conditions);
+
+    const result = await this.rollupValidator.search({
+      from: pagination.cursor,
+      size: pagination.size,
+      body: {
+        query: conditions.length ? { bool: { must: conditions } } : FALLBACK_QUERY,
+        sort: [{ [pagination.order.field]: { order: pagination.order.type } }],
+      },
+    });
+
+    const { items, paging: nextPaging } = formatQueryResult(result, pagination);
+    return { validators: items.map((x) => RollupValidator.formatAfterRead(x)), paging: nextPaging };
+  }
 }
 
 module.exports = ESIndexDB;

package/lib/model/rollup-validator.js

@@ -0,0 +1,35 @@
+module.exports = () => ({
+  mappings: {
+    dynamic: false,
+    properties: {
+      pk: { type: 'text', index: false },
+      address: { type: 'keyword' },
+      moniker: { type: 'text' },
+      endpoint: { type: 'text' },
+
+      joinTime: { type: 'date' },
+      leaveTime: { type: 'date' },
+      genesisTime: { type: 'date' },
+      renaissanceTime: { type: 'date' },
+
+      totalStake: { type: 'keyword' },
+      availableStake: { type: 'keyword' },
+
+      totalGain: { type: 'keyword' },
+
+      proposedBlockCount: { type: 'integer' },
+      verifiedBlockCount: { type: 'integer' },
+
+      latestBlockHeight: { type: 'integer' },
+      latestBlockHash: { type: 'keyword' },
+
+      rollup: { type: 'keyword' },
+    },
+  },
+  settings: {
+    index: {
+      number_of_shards: 1,
+      number_of_replicas: 0,
+    },
+  },
+});

package/lib/model/rollup.js

@@ -4,7 +4,7 @@ module.exports = () => ({
     properties: {
       address: { type: 'keyword' },
       tokenAddress: { type: 'keyword' },
-      erc20TokenAddress: { type: 'keyword' },
+      erc20TokenAddress: { type: 'text' },
       contractAddress: { type: 'keyword' },
 
       seedValidators: {

package/lib/table/rollup-validator.js

@@ -0,0 +1,58 @@
+const ESIndex = require('./base');
+const getParams = require('../model/rollup-validator');
+const { getTableName } = require('../util');
+
+const DEFAULT_TIME = '2000-01-01T00:00:00.000Z';
+
+class RollupValidator extends ESIndex {
+  constructor(db) {
+    super({
+      name: getTableName(db.config.prefix, 'rollup_validator'),
+      docId: 'address',
+      client: db.client,
+      http: db.http,
+      indexParams: getParams(),
+    });
+  }
+
+  static formatBeforeUpdate(data, tokenLength) {
+    data.totalStake = super.padBalance(data.totalStake, tokenLength);
+    data.availableStake = super.padBalance(data.availableStake, tokenLength);
+    data.totalGain = super.padBalance(data.totalGain, tokenLength);
+    data.joinTime = data.joinTime || DEFAULT_TIME;
+    data.leaveTime = data.leaveTime || DEFAULT_TIME;
+
+    return data;
+  }
+
+  static formatAfterRead(data) {
+    if (data) {
+      data.totalStake = super.trimBalance(data.totalStake);
+      data.availableStake = super.trimBalance(data.availableStake);
+      data.totalGain = super.trimBalance(data.totalGain);
+      data.joinTime = data.joinTime === DEFAULT_TIME ? '' : data.joinTime;
+      data.leaveTime = data.leaveTime === DEFAULT_TIME ? '' : data.leaveTime;
+    }
+
+    return data;
+  }
+
+  batchInsert(rows) {
+    const formatted = rows.map((x) => RollupValidator.formatBeforeUpdate(x, this.tokenLength));
+    return super.batchInsert(formatted);
+  }
+
+  _insert(row) {
+    return super._insert(RollupValidator.formatBeforeUpdate(row, this.tokenLength));
+  }
+
+  _get(key) {
+    return super._get(key).then((doc) => RollupValidator.formatAfterRead(doc));
+  }
+
+  _update(key, updates) {
+    return super._update(key, RollupValidator.formatBeforeUpdate(updates));
+  }
+}
+
+module.exports = RollupValidator;

package/lib/table/rollup.js

@@ -5,7 +5,7 @@ const { getTableName } = require('../util');
 class Rollup extends ESIndex {
   constructor(db) {
     super({
-      name: getTableName(db.config.prefix, 'rollup'),
+      name: getTableName(db.config.prefix, 'rollup_v2'),
       docId: 'address',
       client: db.client,
       http: db.http,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/indexdb-elasticsearch",
   "description": "OCAP indexdb adapter that uses elasticsearch as backend",
-  "version": "1.13.16",
+  "version": "1.13.20",
   "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": "7b5bdaf7b0404fa5d59c4160ab986e2dc6c565a3",
+  "gitHead": "fbb1920c30088668db5d015d695fb01416ecefc7",
   "dependencies": {
     "@elastic/elasticsearch": "^7.10.0",
-    "@ocap/indexdb": "1.13.16",
-    "@ocap/util": "1.13.16",
+    "@ocap/indexdb": "1.13.20",
+    "@ocap/util": "1.13.20",
     "axios": "^0.21.4",
     "bn.js": "^5.2.0",
     "debug": "^4.3.2",