impr: delphioracle upsert

.env-sample

@@ -1,3 +1,4 @@
 DATABASE_URL=postgres://user:pass@localhost:5432/chaingraph?sslmode=disable
 WS_URL=ws://127.0.0.1:8080
-RPC_URL=http://127.0.0.1:8888
+RPC_URL=<http://127.0.0.1:8888>
+DELPHIORACLE_PRODUCERS=eosiodetroit,criptolions1,ivote4eosusa,eostitanprod,alohaeosprod,teamgreymass

package.json

@@ -47,8 +47,8 @@
     "@blockmatic/eosio-ship-reader": "^0.5.0",
     "@eoscafe/hyperion": "^3.3.2",
     "@eosrio/node-abieos": "^2.1.1",
-    "@greymass/eosio": "^0.6.4",
-    "@wharfkit/antelope": "^0.10.0",
+    "@greymass/eosio": "^0.7.0",
+    "@wharfkit/antelope": "^1.0.7",
     "bluebird": "^3.7.2",
     "eos-common": "^0.8.1",
     "isomorphic-fetch": "^3.0.0",

src/config/index.ts

@@ -20,12 +20,14 @@ export interface EosioReaderConfig {
 
 export interface Config {
   database_url: string
+  delphioracle_producers: string[]
   hyperion_url: string
   reader: EosioReaderConfig
 }
 
 export const config: Config = {
   database_url: env.get('DATABASE_URL').required().asString(),
+  delphioracle_producers: env.get('DELPHIORACLE_PRODUCERS').required().asArray(),
   reader: {
     chain: 'eos',
     chain_id:

src/database/index.ts

@@ -1,4 +1,9 @@
-import { logger } from '../lib/logger'
+import {
+  ChainGraphAction,
+  ChainGraphBlock,
+  ChainGraphTableRow,
+  ChainGraphTransaction,
+} from '../types'
 import { db } from './db'
 import {
   createDeleteTableRowsQuery,
@@ -7,35 +12,39 @@ import {
   createUpsertTableRowsQuery,
   createUpsertTransactionsQuery,
 } from './queries'
-import {
-  ChainGraphAction,
-  ChainGraphBlock,
-  ChainGraphTableRow,
-  ChainGraphTransaction,
-} from '../types'
 
 export * from './db'
 
 const runQuery = async (query: string) => {
-  logger.info(query)
+  // logger.info(query)
   return db.none(query)
 }
 
-export const upsertBlocks = async (blocks: ChainGraphBlock[]) =>
-  runQuery(createUpsertBlocksQuery(blocks))
+export const upsertBlocks = async (blocks: ChainGraphBlock[]) => {
+  if (!blocks.length) return Promise.resolve()
+  return runQuery(createUpsertBlocksQuery(blocks))
+}
 
-export const upsertTableRows = async (tableRows: ChainGraphTableRow[]) =>{
-  console.log('upsertTableRows', tableRows)
-  runQuery(createUpsertTableRowsQuery(tableRows))}
+export const upsertTableRows = async (tableRows: ChainGraphTableRow[]) => {
+  // console.log('upsertTableRows', tableRows)
+  if (!tableRows.length) return Promise.resolve()
+  return runQuery(createUpsertTableRowsQuery(tableRows))
+}
 
-export const deleteTableRows = async (tableRows: ChainGraphTableRow[]) =>
-  runQuery(createDeleteTableRowsQuery(tableRows))
+export const deleteTableRows = async (tableRows: ChainGraphTableRow[]) => {
+  if (!tableRows.length) return Promise.resolve()
+  return runQuery(createDeleteTableRowsQuery(tableRows))
+}
 
 export const upsertTransactions = async (
   transactions: ChainGraphTransaction[],
-) => runQuery(createUpsertTransactionsQuery(transactions))
+) => {
+  if (!transactions.length) return Promise.resolve()
+  return runQuery(createUpsertTransactionsQuery(transactions))
+}
 
-export const upsertActions = async (actions: ChainGraphAction[]) =>{
-  console.log('upsertActions', actions)
-  runQuery(createUpsertActionsQuery(actions))
+export const upsertActions = async (actions: ChainGraphAction[]) => {
+  // console.log('upsertActions', actions)
+  if (!actions.length) return Promise.resolve()
+  return runQuery(createUpsertActionsQuery(actions))
 }

src/indexer/load-history.ts

@@ -1,17 +1,16 @@
-import { logger } from '../lib/logger'
 import uniqBy from 'lodash.uniqby'
 import pThrottle from 'p-throttle'
-import { whilst } from '../lib/promises'
-import { MappingsReader } from '../mappings'
+import { config } from '../config'
 import { upsertActions, upsertBlocks, upsertTransactions } from '../database'
+import { HyperionAction, hyperion } from '../lib/hyperion'
+import { logger } from '../lib/logger'
+import { whilst } from '../lib/promises'
 import {
   ChainGraphAction,
   ChainGraphActionWhitelist,
   ChainGraphBlock,
   ChainGraphTransaction,
 } from '../types'
-import { hyperion, HyperionAction } from '../lib/hyperion'
-import { config } from '../config'
 import { WhitelistReader } from '../whitelist'
 
 type UpsertCollections = {
@@ -112,9 +111,7 @@ export const loadActionHistory = async (account: string, filter: string) => {
   })
 
   const loadHyperionPages = async () => {
-    const filter_page = `filter: ${account}:${filter}, limit: ${hyperionPageSize}, skip: ${
-      hyperionPageSize * page
-    }, page ${page}`
+    const filter_page = `filter: ${account}:${filter}, limit: ${hyperionPageSize}, skip: ${hyperionPageSize * page}, page ${page}`
     logger.info(`Loading action history from Hyperion for ${filter_page}`)
 
     try {
@@ -128,8 +125,7 @@ export const loadActionHistory = async (account: string, filter: string) => {
       morePages = false
       return false
     } catch (error) {
-      logger.error(error)
-      logger.info('hyperion request failed')
+      logger.error('Hyperion request failed: ', error)
       return process.exit(0) // keep trying
     }
   }
@@ -146,7 +142,7 @@ export const loadHistory = async (whitelistReader: WhitelistReader) => {
       .map(({ contract: code, actions }) => {
         // if wildcard we need reformat for hyperion
         if (actions[0] === '*') return [{ code, action: '*' }]
-        
+
         return (actions as ChainGraphActionWhitelist[]).map(({ action }) => {
           return {
             code,
@@ -157,7 +153,7 @@ export const loadHistory = async (whitelistReader: WhitelistReader) => {
       .flat()
 
     await Promise.all(
-      actionFilters.map(async ({action, code}) => loadActionHistory(code, action),
+      actionFilters.map(async ({ action, code }) => loadActionHistory(code, action),
       ),
     )
   } catch (error) {