*: use common-ts v2.0.3

Author: tilacog

packages/indexer-agent/package.json

@@ -29,7 +29,7 @@
     "graph-indexer-agent": "bin/graph-indexer-agent"
   },
   "dependencies": {
-    "@graphprotocol/common-ts": "2.0.1",
+    "@graphprotocol/common-ts": "2.0.3",
     "@graphprotocol/indexer-common": "^0.20.20",
     "@thi.ng/heaps": "^1.3.1",
     "@uniswap/sdk": "3.0.3",

packages/indexer-agent/src/commands/start.ts

@@ -4,13 +4,13 @@ import { Argv } from 'yargs'
 import { SequelizeStorage, Umzug } from 'umzug'
 import {
   createMetrics,
+  connectDatabase,
   createMetricsServer,
   formatGRT,
   Logger,
   SubgraphDeploymentID,
 } from '@graphprotocol/common-ts'
 import {
-  connectDatabase,
   createIndexerManagementClient,
   createIndexerManagementServer,
   defineIndexerManagementModels,

packages/indexer-cli/package.json

@@ -26,7 +26,7 @@
     "test:watch": "jest --watch --detectOpenHandles --verbose"
   },
   "dependencies": {
-    "@graphprotocol/common-ts": "2.0.1",
+    "@graphprotocol/common-ts": "2.0.3",
     "@graphprotocol/indexer-common": "^0.20.20",
     "@iarna/toml": "2.2.5",
     "@thi.ng/iterators": "5.1.74",

packages/indexer-common/package.json

@@ -22,7 +22,7 @@
     "clean": "rm -rf ./node_modules ./dist ./tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "@graphprotocol/common-ts": "2.0.1",
+    "@graphprotocol/common-ts": "2.0.3",
     "@graphprotocol/cost-model": "0.1.16",
     "@thi.ng/heaps": "1.2.38",
     "@types/lodash.intersection": "^4.4.7",

packages/indexer-common/src/utils.ts

@@ -8,17 +8,6 @@ import { Logger, Metrics, timer } from '@graphprotocol/common-ts'
 import { indexerError, IndexerErrorCode } from './errors'
 import { Sequelize } from 'sequelize'
 
-interface ConnectOptions {
-  host: string
-  port?: number
-  username: string
-  password: string
-  database: string
-  logging?: (sql: string, timing?: number) => void
-  poolMin?: number
-  poolMax?: number
-}
-
 export const parseBoolean = (
   val: string | boolean | number | undefined | null,
 ): boolean => {
@@ -74,35 +63,3 @@ export async function monitorEthBalance(
     }
   })
 }
-
-// Copied from @graphprotocol/common-ts, but adding pool size options
-// TODO: Add these options in common-ts and remove this
-export const connectDatabase = async (options: ConnectOptions): Promise<Sequelize> => {
-  const { host, username, password, database, logging } = options
-
-  // Use port 5432 by default
-  const port = options.port || 5432
-  const poolMin = options.poolMin || 0
-  const poolMax = options.poolMax || 10
-
-  // Connect to the database
-  const sequelize = new Sequelize({
-    dialect: 'postgres',
-    host,
-    port,
-    username,
-    password,
-    database,
-    pool: {
-      max: poolMax,
-      min: poolMin,
-    },
-    logging,
-  })
-
-  // Test the connection
-  await sequelize.authenticate()
-
-  // All good, return the connection
-  return sequelize
-}

packages/indexer-native/package.json

@@ -46,7 +46,7 @@
     "clean": "rm -rf ./node_modules ./binary ./build ./coverage ./native/target ./native/artifacts.json ./native/index.node"
   },
   "dependencies": {
-    "@graphprotocol/common-ts": "2.0.1",
+    "@graphprotocol/common-ts": "2.0.3",
     "@mapbox/node-pre-gyp": "1.0.10",
     "cargo-cp-artifact": "0.1.7",
     "node-pre-gyp-github": "1.4.4"

packages/indexer-service/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@google-cloud/profiler": "4.1.7",
-    "@graphprotocol/common-ts": "2.0.1",
+    "@graphprotocol/common-ts": "2.0.3",
     "@graphprotocol/indexer-common": "^0.20.20",
     "@graphprotocol/indexer-native": "0.20.11",
     "@graphql-tools/load": "7.5.8",

yarn.lock

@@ -775,10 +775,10 @@
   resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"
   integrity sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA==
 
-"@graphprotocol/[email protected].1":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@graphprotocol/common-ts/-/common-ts-2.0.1.tgz"
-  integrity sha512-dmcTWVOS4HEvglMtH0wZTMeqlzniLAo+k04kZ7/cY+QgLXAYB7X1Sz3sHqkGmNbn89kBQ3Z/nPDLLSlln69hYg==
+"@graphprotocol/[email protected].3":
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/@graphprotocol/common-ts/-/common-ts-2.0.3.tgz#d72eda1022aad8a0fcdcd6a5bfc52d5f7ec050ca"
+  integrity sha512-HMa5DhpIMKVEu9O0h73OlwZjw5SrIFPng0dNLA3mlniO7rdTynJRCGf0Sf7yUEh4qdPoy9oAaPEWnpJiBsbRfg==
   dependencies:
     "@graphprotocol/contracts" "2.1.0"
     "@graphprotocol/pino-sentry-simple" "0.7.1"
@@ -800,7 +800,7 @@
     pino "7.6.0"
     pino-multi-stream "6.0.0"
     prom-client "14.0.1"
-    sequelize "6.19.0"
+    sequelize "6.31.1"
 
 "@graphprotocol/[email protected]":
   version "2.1.0"
@@ -9779,7 +9779,7 @@ sequelize-pool@^7.1.0:
   resolved "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz"
   integrity sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==
 
-sequelize@6.19.0, sequelize@6.31.1:
+[email protected]:
   version "6.31.1"
   resolved "https://registry.npmjs.org/sequelize/-/sequelize-6.31.1.tgz"
   integrity sha512-cahWtRrYLjqoZP/aurGBoaxn29qQCF4bxkAUPEQ/ozjJjt6mtL4Q113S3N39mQRmX5fgxRbli+bzZARP/N51eg==