Merge pull request #176 from rsksmart/staging

Merge Staging into Develop

prisma/rsk-explorer-database.sql

@@ -2,6 +2,9 @@
 
 /*
 
+V1.1.4 Notes:
+- add index on table transaction_in_pool(pool_id)
+
 V1.1.3 Notes:
 - add index on table contract(symbol)
 
@@ -181,6 +184,7 @@ status VARCHAR NOT NULL,
 CONSTRAINT pk_transaction_in_pool_hash_poolId PRIMARY KEY (hash, pool_id),
 CONSTRAINT fk_transaction_in_pool_poolId FOREIGN KEY (pool_id) REFERENCES tx_pool(id)
 );
+CREATE INDEX idx_transaction_in_pool_pool_id ON transaction_in_pool(pool_id);
 
 CREATE TABLE address (
 id SERIAL,

prisma/schema.prisma

@@ -298,6 +298,7 @@ model transaction_in_pool {
   tx_pool          tx_pool @relation(fields: [poolId], references: [id], onDelete: NoAction, onUpdate: NoAction, map: "fk_transaction_in_pool_pool_id")
 
   @@id([hash, poolId], map: "pk_transaction_in_pool_hash_poolid")
+  @@index([poolId], map: "idx_transaction_in_pool_pool_id")
 }
 
 model transaction_pending {

src/api/TxPool.js

@@ -13,7 +13,7 @@ export class TxPool extends DataCollector {
   start () {
     super.start()
     this.log.info('Tx Pool started')
-    this.updatePool()
+    this.tick()
   }
 
   tick () {
@@ -22,12 +22,18 @@ export class TxPool extends DataCollector {
 
   async updatePool () {
     try {
+      // this.log.debug(`Checking for new tx pools... (checking every ${this.tickDelay} ms)`)
       let pool = await this.getPool()
       if (pool && pool.timestamp !== this.state.timestamp) {
+        // this.log.debug("New tx pool detected")
         this.state = Object.assign({}, pool)
         this.events.emit('newPool', this.getState())
+
+        // this.log.debug("Updating tx pool chart...")
         await this.updatePoolChart()
         this.events.emit('poolChart', this.getPoolChart())
+      } else {
+        // this.log.debug("No new tx pool detected")
       }
     } catch (err) {
       this.log.error(err)

src/api/modules/Address.js

@@ -79,7 +79,7 @@ export class Address extends DataCollectorItem {
       getAddresses: params => {
         let type = (params.query) ? params.query.type : null
         let query = (type) ? { type } : {}
-        return this.getPageData(query, params, { deleteCodeAndInput: true })
+        return this.getPageData(query, params, { useV2: true, action: 'getAddresses' })
       },
       /**
        * @swagger
@@ -163,7 +163,7 @@ export class Address extends DataCollectorItem {
           }
         }
 
-        return this.getPageData(query, params, { deleteCodeAndInput: true })
+        return this.getPageData(query, params, { useV2: true, action: 'getTokens' })
       },
       /**
        * @swagger

src/converters/address.converters.js

@@ -58,6 +58,7 @@ function rawContractToEntity ({
 }
 
 function addressEntityToRaw ({
+  id,
   address,
   address_latest_balance_address_latest_balance_addressToaddress: latestBalance,
   isNative,
@@ -113,6 +114,8 @@ function addressEntityToRaw ({
     if (addressToReturn.createdByTx) delete addressToReturn.createdByTx.input
   }
 
+  addressToReturn.id = id
+
   return removeNullFields(addressToReturn, ['name'])
 }
 

src/lib/prismaClient.js

@@ -19,14 +19,23 @@ const prismaClient = new PrismaClient({
       url: `${protocol}${user}:${password}@${host}:${port}/${databaseName}?connection_limit=${connectionLimit}`
     }
   },
-  // log: ['query', 'info', 'warn', 'error'],
   errorFormat: 'pretty'
 })
 
-// prismaClient.$on('query', (e) => {
-//   console.log('Query: ' + e.query)
-//   console.log('Params: ' + e.params)
-//   console.log('Duration: ' + e.duration + 'ms')
-// })
+const prismaClientWithLogging = new PrismaClient({
+  datasources: {
+    db: {
+      url: `${protocol}${user}:${password}@${host}:${port}/${databaseName}?connection_limit=${connectionLimit}`
+    }
+  },
+  log: ['query', 'info', 'warn', 'error'],
+  errorFormat: 'pretty'
+})
+
+prismaClientWithLogging.$on('query', (e) => {
+  console.log('Query: ' + e.query)
+  console.log('Params: ' + e.params)
+  console.log('Duration: ' + e.duration + 'ms')
+})
 
-export { prismaClient }
+export { prismaClient, prismaClientWithLogging }

src/lib/utils.js

@@ -154,27 +154,13 @@ export const hash = (thing, alg = 'sha1', out = 'hex') => {
 
 export const createHash = (v) => hash(v, 'sha1', 'hex')
 
-export const measurePromiseTime = async (promise, { label = undefined, log = console, printMeasurement = false, msThreshold = 1000 } = {}) => {
-  let time = Date.now()
+const enableAllMeasuresLogging = false
+
+export const measurePromiseTime = async (promise, { name = 'Measurement', forceMeasureLogging = false, ...extraData }) => {
+  const time = Date.now()
   const result = await promise
-  time = Date.now() - time
-  const printMetrics = () => {
-    if (label) {
-      log.info(`Time taken for ${label}: ${time} ms.`)
-    } else {
-      log.info(`Time taken: ${time} ms.`)
-    }
-  }
 
-  if (printMeasurement) {
-    if (msThreshold) {
-      if (time > msThreshold) {
-        printMetrics()
-      }
-    } else {
-      printMetrics()
-    }
-  }
+  if (enableAllMeasuresLogging || forceMeasureLogging) console.dir({ [name]: `${Date.now() - time}ms`, ...extraData }, { depth: null })
 
   return result
 }

src/repositories/address.repository.js

@@ -9,6 +9,10 @@ import { generateFindQuery } from './utils'
 import { addressRelatedTables } from './includeRelatedTables'
 import { addrTypes } from '../lib/types'
 
+const relatedTables = {
+  latestBalance: 'address_latest_balance_address_latest_balance_addressToaddress'
+}
+
 export function getAddressRepository (prismaClient) {
   return {
     async findOne (query = {}, project = {}, endpointOptions) {
@@ -17,6 +21,29 @@ export function getAddressRepository (prismaClient) {
       return address ? addressEntityToRaw(address, endpointOptions) : null
     },
     async find (query = {}, project = {}, sort = {}, limit = 0, endpointOptions) {
+      const { useV2, action } = endpointOptions
+      if (useV2) {
+        if (action === 'getAddresses') {
+          const projection = {}
+          const include = { [relatedTables.latestBalance]: true }
+
+          const prismaQuery = generateFindQuery(query, projection, include, sort, limit)
+          const rawAddresses = await prismaClient.address.findMany(prismaQuery)
+
+          return formatAddressesWithBalances(rawAddresses)
+        } else if (action === 'getTokens') {
+          const projection = {}
+          const include = {
+            [relatedTables.latestBalance]: true
+          }
+
+          const prismaQuery = generateFindQuery(query, projection, include, sort, limit)
+          const rawTokens = await prismaClient.address.findMany(prismaQuery)
+
+          return formatAddressesWithBalances(rawTokens)
+        }
+      }
+
       if (endpointOptions.isForGetMiners) {
         const miners = await prismaClient.miner_address.findMany(generateFindQuery(query, project, {}, sort, limit))
 
@@ -124,3 +151,18 @@ function generateSaveContractQueries (data, prismaClient, upserting) {
 
   return transactionQueries
 }
+
+function formatAddressesWithBalances (rawAddresses) {
+  return rawAddresses.map(address => {
+    if (address[relatedTables.latestBalance]) {
+      const { balance, blockNumber } = address[relatedTables.latestBalance]
+      address.balance = balance
+      address.blockNumber = blockNumber
+      delete address[relatedTables.latestBalance]
+    } else {
+      address.balance = '0'
+      address.blockNumber = 0
+    }
+    return address
+  })
+}