Skip to content

Commit

Permalink
*: Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fordN committed Dec 21, 2021
1 parent 17d07eb commit e66af04
Show file tree
Hide file tree
Showing 10 changed files with 262 additions and 759 deletions.
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
"devDependencies": {
"@octokit/core": "3.2.0",
"lerna": "^4.0.0",
"prettier": "^2.4.1"
"prettier": "2.5.1"
},
"resolutions": {
"ethers": "5.4.4",
"@ethersproject/bignumber": "^5.4.1",
"@urql/core": "1.13.1",
"@urql/exchange-execute": "1.0.1",
"ethers": "5.5.2",
"@ethersproject/bignumber": "5.5.0",
"@ethersproject/providers": "5.5.1",
"@urql/core": "2.3.6",
"@urql/exchange-execute": "1.2.2",
"scrypt": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.0.2.tgz"
},
"dependencies": {
Expand Down
32 changes: 16 additions & 16 deletions packages/indexer-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,27 @@
"graph-indexer-agent": "bin/graph-indexer-agent"
},
"dependencies": {
"@graphprotocol/common-ts": "v1.7.0",
"@graphprotocol/contracts": "v1.6.0",
"@graphprotocol/common-ts": "v1.8.0",
"@graphprotocol/contracts": "v1.9.0",
"@graphprotocol/indexer-common": "^0.18.4",
"@thi.ng/heaps": "^1.2.36",
"@thi.ng/iterators": "5.1.40",
"@thi.ng/heaps": "^1.3.1",
"@uniswap/sdk": "3.0.3",
"axios": "0.21.1",
"axios": "0.24.0",
"bs58": "4.0.1",
"delay": "^5.0.0",
"ethers": "5.4.4",
"ethers": "5.5.2",
"evt": "1.9.12",
"global": "4.4.0",
"graphql": "15.4.0",
"graphql-tag": "2.11.0",
"graphql": "16.1.0",
"graphql-tag": "2.12.6",
"isomorphic-fetch": "3.0.0",
"jayson": "3.3.4",
"jayson": "3.6.6",
"ngeohash": "0.6.3",
"p-filter": "2.1.0",
"p-map": "4.0.0",
"p-queue": "6.6.2",
"p-reduce": "2.1.0",
"p-retry": "4.4.0",
"p-retry": "4.6.1",
"umzug": "3.0.0-beta.6",
"yargs": "16.1.0"
},
Expand All @@ -51,17 +50,18 @@
"@types/ngeohash": "0.6.2",
"@types/node": "14.14.6",
"@types/yargs": "15.0.9",
"@typescript-eslint/eslint-plugin": "4.6.0",
"@typescript-eslint/parser": "4.6.0",
"eslint": "7.12.1",
"@typescript-eslint/eslint-plugin": "5.8.0",
"@typescript-eslint/parser": "5.8.0",
"eslint": "8.5.0",
"jest": "26.6.1",
"ts-jest": "26.4.3",
"typechain": "3.0.0",
"typescript": "4.0.5"
"typescript": "4.1.6"
},
"resolutions": {
"ethers": "5.4.4",
"@ethersproject/bignumber": "5.4.1",
"ethers": "5.5.2",
"@ethersproject/bignumber": "5.5.0",
"@ethersproject/providers": "5.5.1",
"scrypt": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.0.2.tgz"
},
"gitHead": "972ab96774007b2aee15b1da169d2ff4be9f9d27"
Expand Down
2 changes: 1 addition & 1 deletion packages/indexer-agent/src/cost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const registerMetrics = (metrics: Metrics): CostModelAutomationMetrics => ({

export interface CostModelAutomationOptions {
logger: Logger
ethereum: providers.StaticJsonRpcProvider
ethereum: providers.BaseProvider
contracts: NetworkContracts
indexerManagement: IndexerManagementClient
injectDai: boolean
Expand Down
31 changes: 15 additions & 16 deletions packages/indexer-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,29 @@
"disputes": "yarn prepare && ./dist/cli.js indexer disputes get"
},
"dependencies": {
"@graphprotocol/common-ts": "1.7.0",
"@graphprotocol/common-ts": "v1.8.0",
"@graphprotocol/indexer-common": "^0.18.4",
"@iarna/toml": "2.2.5",
"@thi.ng/iterators": "5.1.40",
"@urql/core": "1.13.1",
"chalk": "4.1.0",
"env-paths": "2.2.0",
"ethers": "5.4.4",
"gluegun": "4.5.0",
"graphql-tag": "2.11.0",
"@thi.ng/iterators": "5.1.74",
"@urql/core": "2.3.6",
"chalk": "4.1.2",
"env-paths": "2.2.1",
"ethers": "5.5.2",
"gluegun": "4.7.0",
"graphql-tag": "2.12.6",
"isomorphic-fetch": "3.0.0",
"table": "6.0.3",
"yaml": "1.10.0"
"table": "6.7.5",
"yaml": "1.10.2"
},
"devDependencies": {
"@types/isomorphic-fetch": "0.0.35",
"@types/table": "6.0.0",
"@typescript-eslint/eslint-plugin": "4.6.0",
"@typescript-eslint/parser": "4.6.0",
"eslint": "7.12.1",
"typescript": "4.0.5"
"@typescript-eslint/eslint-plugin": "5.8.0",
"@typescript-eslint/parser": "5.8.0",
"eslint": "8.5.0",
"typescript": "4.1.6"
},
"resolutions": {
"ethers": "5.4.4",
"ethers": "5.5.2",
"scrypt": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.0.2.tgz"
},
"gitHead": "972ab96774007b2aee15b1da169d2ff4be9f9d27"
Expand Down
51 changes: 20 additions & 31 deletions packages/indexer-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,56 +16,45 @@
"test:watch": "jest --runInBand --detectOpenHandles --watch --passWithNoTests --verbose"
},
"dependencies": {
"@graphprotocol/common-ts": "1.7.0",
"@graphprotocol/common-ts": "v1.8.0",
"@graphprotocol/cost-model": "0.1.5",
"@thi.ng/heaps": "1.2.38",
"@types/cors": "2.8.8",
"@types/express": "4.17.8",
"@types/jest": "26.0.15",
"@types/morgan": "1.9.2",
"@types/ngeohash": "0.6.2",
"@types/node": "14.14.6",
"@typescript-eslint/eslint-plugin": "4.6.0",
"@typescript-eslint/parser": "4.6.0",
"@urql/core": "1.13.1",
"@urql/exchange-execute": "1.0.1",
"body-parser": "1.19.0",
"@urql/core": "2.3.6",
"@urql/exchange-execute": "1.2.2",
"body-parser": "1.19.1",
"cors": "2.8.5",
"eslint": "7.12.1",
"ethers": "5.4.4",
"evt": "1.9.12",
"ethers": "5.5.2",
"evt": "1.10.1",
"express": "4.17.1",
"fastify": "3.13.0",
"graphql": "15.4.0",
"graphql-tag": "2.11.0",
"fastify": "3.25.0",
"graphql": "16.1.0",
"graphql-tag": "2.12.6",
"morgan": "1.10.0",
"ngeohash": "0.6.3",
"p-retry": "4.4.0",
"p-retry": "4.6.1",
"scrypt": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.0.2.tgz",
"sequelize": "6.3.5",
"ts-custom-error": "^3.2.0",
"ts-jest": "26.4.3",
"typescript": "4.0.5"
"sequelize": "6.12.0",
"ts-custom-error": "^3.2.0"
},
"devDependencies": {
"@types/cors": "2.8.8",
"@types/express": "4.17.8",
"@types/express": "4.17.13",
"@types/jest": "26.0.15",
"@types/morgan": "1.9.2",
"@types/ngeohash": "0.6.2",
"@types/node": "14.14.6",
"@typescript-eslint/eslint-plugin": "4.6.0",
"@typescript-eslint/parser": "4.6.0",
"eslint": "7.12.1",
"@typescript-eslint/eslint-plugin": "5.8.0",
"@typescript-eslint/parser": "5.8.0",
"eslint": "8.5.0",
"jest": "26.6.1",
"prettier": "^2.4.1",
"ts-jest": "26.4.3",
"typescript": "4.0.5"
"typescript": "4.1.6"
},
"resolutions": {
"ethers": "5.4.4",
"@ethersproject/bignumber": "5.4.1",
"@urql/exchange-execute/@urql/core": "1.13.1",
"ethers": "5.5.2",
"@ethersproject/bignumber": "5.5.0",
"@urql/exchange-execute/@urql/core": "2.3.6",
"scrypt": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.0.2.tgz"
},
"gitHead": "972ab96774007b2aee15b1da169d2ff4be9f9d27"
Expand Down
4 changes: 2 additions & 2 deletions packages/indexer-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "Zac Burns <That3Percent@gmail.com>",
"license": "MIT",
"dependencies": {
"@graphprotocol/common-ts": "1.5.1",
"@graphprotocol/common-ts": "v1.8.0",
"neon-cli": "^0.8.0"
},
"scripts": {
Expand All @@ -15,7 +15,7 @@
},
"devDependencies": {
"bs58": "4.0.1",
"ethers": "5.4.4",
"ethers": "5.5.2",
"jest": "^26.6.3"
},
"gitHead": "972ab96774007b2aee15b1da169d2ff4be9f9d27"
Expand Down
51 changes: 28 additions & 23 deletions packages/indexer-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,42 @@
"graph-indexer-service": "./bin/graph-indexer-service"
},
"resolutions": {
"ethers": "5.4.4",
"@ethersproject/bignumber": "^5.4.1",
"graphql": "15.4.0",
"ethers": "5.5.2",
"@ethersproject/bignumber": "5.5.0",
"graphql": "16.1.0",
"scrypt": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.0.2.tgz"
},
"dependencies": {
"@google-cloud/profiler": "4.1.1",
"@graphprotocol/common-ts": "1.7.0",
"@google-cloud/profiler": "4.1.5",
"@graphprotocol/common-ts": "v1.8.0",
"@graphprotocol/indexer-common": "^0.18.4",
"@graphprotocol/indexer-native": "^0.18.1",
"@thi.ng/cache": "1.0.59",
"@urql/core": "1.13.1",
"@graphql-tools/delegate": "8.4.3",
"@graphql-tools/load": "7.5.0",
"@graphql-tools/url-loader": "7.7.0",
"@graphql-tools/utils": "8.5.5",
"@graphql-tools/wrap": "8.3.2",
"@thi.ng/cache": "2.1.4",
"@urql/core": "2.3.6",
"apollo-link-http": "1.5.17",
"axios": "0.21.1",
"body-parser": "1.19.0",
"axios": "0.24.0",
"body-parser": "1.19.1",
"bs58": "4.0.1",
"cors": "2.8.5",
"cross-fetch": "3.0.4",
"ethers": "5.4.4",
"evt": "1.9.12",
"cross-fetch": "3.1.4",
"ethers": "5.5.2",
"evt": "1.10.1",
"express": "4.17.1",
"express-graphql": "0.9.0",
"graphql": "15.4.0",
"graphql-tag": "2.11.0",
"graphql-tools": "5.0.0",
"express-graphql": "0.12.0",
"graphql": "16.1.0",
"graphql-tag": "2.12.6",
"graphql-tools": "8.2.0",
"isomorphic-fetch": "3.0.0",
"merkletreejs": "^0.2.13",
"morgan": "1.9.1",
"p-map": "4.0.0",
"p-queue": "6.4.0",
"p-retry": "4.4.0",
"p-map": "5.3.0",
"p-queue": "7.1.0",
"p-retry": "4.6.1",
"read-pkg": "5.2.0",
"yargs": "15.1.0"
},
Expand All @@ -64,16 +69,16 @@
"@types/morgan": "1.9.2",
"@types/supertest": "2.0.10",
"@types/yargs": "15.0.9",
"@typescript-eslint/eslint-plugin": "4.6.0",
"@typescript-eslint/parser": "4.6.0",
"eslint": "7.12.1",
"@typescript-eslint/eslint-plugin": "5.8.0",
"@typescript-eslint/parser": "5.8.0",
"eslint": "8.5.0",
"jest": "26.6.1",
"lerna": "3.22.1",
"nock": "13.0.4",
"prettier": "^2.4.1",
"supertest": "6.0.0",
"ts-jest": "26.4.3",
"typescript": "4.0.5"
"typescript": "4.1.6"
},
"gitHead": "972ab96774007b2aee15b1da169d2ff4be9f9d27"
}
7 changes: 5 additions & 2 deletions packages/indexer-service/src/server/cost.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import graphqlHTTP from 'express-graphql'
import { graphqlHTTP } from 'express-graphql'
import { Request, Response } from 'express'
import { makeExecutableSchema } from 'graphql-tools'
import { IndexerManagementClient } from '@graphprotocol/indexer-common'
import gql from 'graphql-tag'
Expand All @@ -24,7 +25,9 @@ interface CostModelArgs {
export const createCostServer = async ({
indexerManagementClient,
metrics,
}: GraphQLServerOptions): Promise<graphqlHTTP.Middleware> => {
}: GraphQLServerOptions): Promise<
(request: Request, response: Response) => Promise<void>
> => {
const resolverMetrics = {
costModelQueries: new metrics.client.Counter({
name: 'indexer_service_cost_model_queries_total',
Expand Down
44 changes: 26 additions & 18 deletions packages/indexer-service/src/server/status.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
import graphqlHTTP from 'express-graphql'
import { graphqlHTTP } from 'express-graphql'
import fetch from 'cross-fetch'
import { HttpLink } from 'apollo-link-http'
import {
introspectSchema,
makeRemoteExecutableSchema,
transformSchema,
FilterRootFields,
} from 'graphql-tools'
import { loadSchema } from '@graphql-tools/load'
import { UrlLoader } from '@graphql-tools/url-loader'
import { wrapSchema, FilterRootFields } from '@graphql-tools/wrap'
import { Request, Response } from 'express'

export interface StatusServerOptions {
graphNodeStatusEndpoint: string
}

export const createStatusServer = async ({
graphNodeStatusEndpoint,
}: StatusServerOptions): Promise<graphqlHTTP.Middleware> => {
const nodeLink = new HttpLink({ uri: graphNodeStatusEndpoint, fetch })
const nodeSchema = await introspectSchema(nodeLink)
const schema = transformSchema(nodeSchema, [
new FilterRootFields((_operation, fieldName) => fieldName === 'indexingStatuses'),
])
const executableSchema = makeRemoteExecutableSchema({
schema: schema,
link: nodeLink,
}: StatusServerOptions): Promise<
(request: Request, response: Response) => Promise<void>
> => {
const schema = await loadSchema(graphNodeStatusEndpoint, {
loaders: [new UrlLoader()],
headers: {
Accept: 'application/json',
},
method: 'POST',
fetch,
})

const filteredSchema = wrapSchema({
schema,
transforms: [
new FilterRootFields(
(_operation: 'Query' | 'Mutation' | 'Subscription', rootFieldName: string) =>
rootFieldName === 'indexingStatuses',
),
],
})

return graphqlHTTP({
schema: executableSchema,
schema: filteredSchema,
graphiql: true,
})
}
Loading

0 comments on commit e66af04

Please sign in to comment.