From b3cd6d5112d92588957a7ed14f2c5e83b7d03d87 Mon Sep 17 00:00:00 2001 From: Ford Date: Thu, 16 Nov 2023 15:49:26 -0800 Subject: [PATCH] *: Upgrade common-ts dependency --- packages/indexer-agent/package.json | 2 +- packages/indexer-cli/package.json | 2 +- packages/indexer-common/package.json | 2 +- .../__tests__/helpers.test.ts | 2 +- packages/indexer-common/src/network.ts | 2 +- packages/indexer-native/package.json | 2 +- packages/indexer-service/package.json | 2 +- packages/indexer-service/src/commands/start.ts | 6 +++++- .../src/server/__tests__/server.test.ts | 2 +- yarn.lock | 18 +++++++++--------- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/packages/indexer-agent/package.json b/packages/indexer-agent/package.json index 0dabd68d1..6bce67846 100644 --- a/packages/indexer-agent/package.json +++ b/packages/indexer-agent/package.json @@ -29,7 +29,7 @@ "graph-indexer-agent": "bin/graph-indexer-agent" }, "dependencies": { - "@graphprotocol/common-ts": "2.0.7", + "@graphprotocol/common-ts": "2.0.9", "@graphprotocol/indexer-common": "^0.20.23", "@thi.ng/heaps": "^1.3.1", "@uniswap/sdk": "3.0.3", diff --git a/packages/indexer-cli/package.json b/packages/indexer-cli/package.json index 9dd822274..b2fdc177a 100644 --- a/packages/indexer-cli/package.json +++ b/packages/indexer-cli/package.json @@ -26,7 +26,7 @@ "test:watch": "jest --watch --detectOpenHandles --verbose" }, "dependencies": { - "@graphprotocol/common-ts": "2.0.7", + "@graphprotocol/common-ts": "2.0.9", "@graphprotocol/indexer-common": "^0.20.23", "@iarna/toml": "2.2.5", "@thi.ng/iterators": "5.1.74", diff --git a/packages/indexer-common/package.json b/packages/indexer-common/package.json index ce2d9ea5c..2ba42dbb5 100644 --- a/packages/indexer-common/package.json +++ b/packages/indexer-common/package.json @@ -22,7 +22,7 @@ "clean": "rm -rf ./node_modules ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { - "@graphprotocol/common-ts": "2.0.7", + "@graphprotocol/common-ts": "2.0.9", "@graphprotocol/cost-model": "0.1.16", "@thi.ng/heaps": "1.2.38", "@types/lodash.clonedeep": "^4.5.7", diff --git a/packages/indexer-common/src/indexer-management/__tests__/helpers.test.ts b/packages/indexer-common/src/indexer-management/__tests__/helpers.test.ts index 906a70e31..36f86539f 100644 --- a/packages/indexer-common/src/indexer-management/__tests__/helpers.test.ts +++ b/packages/indexer-common/src/indexer-management/__tests__/helpers.test.ts @@ -72,7 +72,7 @@ const setupMonitor = async () => { level: __LOG_LEVEL__ ?? 'error', }) ethereum = getTestProvider('goerli') - contracts = await connectContracts(ethereum, 5) + contracts = await connectContracts(ethereum, 5, undefined) const subgraphFreshnessChecker = new SubgraphFreshnessChecker( 'Test Subgraph', diff --git a/packages/indexer-common/src/network.ts b/packages/indexer-common/src/network.ts index d8fd63d91..0104f8844 100644 --- a/packages/indexer-common/src/network.ts +++ b/packages/indexer-common/src/network.ts @@ -450,7 +450,7 @@ async function connectToProtocolContracts( let contracts try { - contracts = await connectContracts(wallet, numericNetworkId) + contracts = await connectContracts(wallet, numericNetworkId, undefined) } catch (error) { const errorMessage = 'Failed to connect to contracts, please ensure you are using the intended protocol network.' diff --git a/packages/indexer-native/package.json b/packages/indexer-native/package.json index 6e5231151..291d16ef6 100644 --- a/packages/indexer-native/package.json +++ b/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.7", + "@graphprotocol/common-ts": "2.0.9", "@mapbox/node-pre-gyp": "1.0.10", "cargo-cp-artifact": "0.1.7", "node-pre-gyp-github": "1.4.4" diff --git a/packages/indexer-service/package.json b/packages/indexer-service/package.json index 17a379e9d..17206dcdd 100644 --- a/packages/indexer-service/package.json +++ b/packages/indexer-service/package.json @@ -32,7 +32,7 @@ }, "dependencies": { "@google-cloud/profiler": "4.1.7", - "@graphprotocol/common-ts": "2.0.7", + "@graphprotocol/common-ts": "2.0.9", "@graphprotocol/indexer-common": "^0.20.23", "@graphprotocol/indexer-native": "0.20.11", "@graphql-tools/load": "8.0.0", diff --git a/packages/indexer-service/src/commands/start.ts b/packages/indexer-service/src/commands/start.ts index 37b373df4..caaa5e8bd 100644 --- a/packages/indexer-service/src/commands/start.ts +++ b/packages/indexer-service/src/commands/start.ts @@ -393,7 +393,11 @@ export default { let contracts = undefined try { - contracts = await connectContracts(networkProvider, networkIdentifier.chainId) + contracts = await connectContracts( + networkProvider, + networkIdentifier.chainId, + undefined, + ) } catch (error) { logger.error( `Failed to connect to contracts, please ensure you are using the intended Ethereum Network`, diff --git a/packages/indexer-service/src/server/__tests__/server.test.ts b/packages/indexer-service/src/server/__tests__/server.test.ts index 92984a000..293397070 100644 --- a/packages/indexer-service/src/server/__tests__/server.test.ts +++ b/packages/indexer-service/src/server/__tests__/server.test.ts @@ -61,7 +61,7 @@ const setup = async () => { queryFeeModels = defineQueryFeeModels(sequelize) models = defineIndexerManagementModels(sequelize) address = '0x90f8bf6a479f320ead074411a4b0e7944ea8c9c1' - contracts = await connectContracts(getTestProvider('goerli'), 5) + contracts = await connectContracts(getTestProvider('goerli'), 5, undefined) sequelize = await sequelize.sync({ force: true }) const statusEndpoint = 'http://localhost:8030/graphql' indexingStatusResolver = new IndexingStatusResolver({ diff --git a/yarn.lock b/yarn.lock index 2e1e757a4..28e47f540 100644 --- a/yarn.lock +++ b/yarn.lock @@ -831,12 +831,12 @@ resolved "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz#9d8705ecb2baa41b6b2673f3a8e9b7b7e1abc52a" integrity sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA== -"@graphprotocol/common-ts@2.0.7": - version "2.0.7" - resolved "https://registry.npmjs.org/@graphprotocol/common-ts/-/common-ts-2.0.7.tgz#733ac3d46c9e24f997e7f8d00ffc9128d129285e" - integrity sha512-1O2bvXibViMTkiWNvOjijHR5+cMsuEXIZiUxR3pl4Lan9U2kBfGqJAas8qnrpdc/RdRGooYRMP3hXVB9N8bERA== +"@graphprotocol/common-ts@2.0.9": + version "2.0.9" + resolved "https://registry.npmjs.org/@graphprotocol/common-ts/-/common-ts-2.0.9.tgz#c92ba7bb7bd5eb662c424b14a67a674228e2c37d" + integrity sha512-ZPONJg1+uMe6kAIILjl/YjKvK8nTcuz4GqL5yLZjPh/0w5fsGs5KCH6yKMLVAf4ZH6YNY0l9xJlRd1Nkb8JH+w== dependencies: - "@graphprotocol/contracts" "5.2.1" + "@graphprotocol/contracts" "5.3.3" "@graphprotocol/pino-sentry-simple" "0.7.1" "@urql/core" "2.4.4" "@urql/exchange-execute" "1.2.2" @@ -858,10 +858,10 @@ prom-client "14.2.0" sequelize "6.33.0" -"@graphprotocol/contracts@5.2.1": - version "5.2.1" - resolved "https://registry.npmjs.org/@graphprotocol/contracts/-/contracts-5.2.1.tgz#537e13697ca83c78498242706708b65550a656f7" - integrity sha512-32L6TN50hUcvVg5LDKQfUeJcrAN+sHMGEXVagMbJf9tLSCFAIheg0MPq0s9lQ+89GS1TJPA/fwwv8o268EtU4Q== +"@graphprotocol/contracts@5.3.3": + version "5.3.3" + resolved "https://registry.npmjs.org/@graphprotocol/contracts/-/contracts-5.3.3.tgz#89c383ce244d9ed6cf1146baafde379cbbdfdfe6" + integrity sha512-fmFSKr+VDinWWotj2q/Ztn92PppcRrYXeO/62gLgkLos/DcYa7bGWKbcOWyMUw0vsUvXxk6QAtr5o/LG3yQ1WQ== dependencies: console-table-printer "^2.11.1" ethers "^5.6.0"