From 89b75e9f9cf755f6f9ae6cee71c14f8db7926566 Mon Sep 17 00:00:00 2001 From: Jem <0x0xjem@gmail.com> Date: Thu, 14 Sep 2023 12:01:54 +0400 Subject: [PATCH 1/3] Bump version --- apps/server/.wundergraph/wundergraph.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/.wundergraph/wundergraph.config.ts b/apps/server/.wundergraph/wundergraph.config.ts index d95cfae..354d9fe 100644 --- a/apps/server/.wundergraph/wundergraph.config.ts +++ b/apps/server/.wundergraph/wundergraph.config.ts @@ -27,7 +27,7 @@ const resolveSubgraphUrl = (url: string): string => { const treasuryEthereum = introspect.graphql({ apiNamespace: "treasuryEthereum", - url: resolveSubgraphUrl("https://gateway-arbitrum.network.thegraph.com/api/[api-key]/deployments/id/QmZ3HZvfgSTZz29q22tJpReEL4Xiprs2croPymiuyEJknK"), // 4.12.2 + url: resolveSubgraphUrl("https://gateway-arbitrum.network.thegraph.com/api/[api-key]/deployments/id/QmNuVSz9VpdPnckaqdpsAhkLiNMketBQe1wCZZFjm47Cd1"), // 4.12.5 schemaExtension: schemaExtension, }); From 7a37681785079bda2095936442e5cb3ac82ed344 Mon Sep 17 00:00:00 2001 From: Jem <0x0xjem@gmail.com> Date: Thu, 14 Sep 2023 12:48:35 +0400 Subject: [PATCH 2/3] Bump deployment --- apps/server/.wundergraph/wundergraph.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/server/.wundergraph/wundergraph.config.ts b/apps/server/.wundergraph/wundergraph.config.ts index 354d9fe..5d0b083 100644 --- a/apps/server/.wundergraph/wundergraph.config.ts +++ b/apps/server/.wundergraph/wundergraph.config.ts @@ -27,7 +27,7 @@ const resolveSubgraphUrl = (url: string): string => { const treasuryEthereum = introspect.graphql({ apiNamespace: "treasuryEthereum", - url: resolveSubgraphUrl("https://gateway-arbitrum.network.thegraph.com/api/[api-key]/deployments/id/QmNuVSz9VpdPnckaqdpsAhkLiNMketBQe1wCZZFjm47Cd1"), // 4.12.5 + url: resolveSubgraphUrl("https://gateway-arbitrum.network.thegraph.com/api/[api-key]/deployments/id/QmSwwBfAoWJLHQeSTagFnkibnkrjeprxcQpXAHk6AVrysA"), // 4.12.6 schemaExtension: schemaExtension, }); From dcd5b1a1df5806b5ad46de8ec5ad6525170a2ae9 Mon Sep 17 00:00:00 2001 From: Jem <0x0xjem@gmail.com> Date: Thu, 14 Sep 2023 13:09:29 +0400 Subject: [PATCH 3/3] Improved logging --- .../.wundergraph/operations/paginated/metrics.ts | 15 ++++++++------- .../operations/paginated/protocolMetrics.ts | 13 +++++++------ .../operations/paginated/tokenRecords.ts | 13 +++++++------ .../operations/paginated/tokenSupplies.ts | 13 +++++++------ 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/apps/server/.wundergraph/operations/paginated/metrics.ts b/apps/server/.wundergraph/operations/paginated/metrics.ts index dead80a..b9d137a 100644 --- a/apps/server/.wundergraph/operations/paginated/metrics.ts +++ b/apps/server/.wundergraph/operations/paginated/metrics.ts @@ -18,10 +18,11 @@ export default createOperation.query({ includeRecords: z.boolean({ description: "If true, includes the records used to calculate each metric." }).optional(), }), handler: async (ctx) => { - console.log(`Commencing paginated query for Metric`); - console.log(`Input: ${JSON.stringify(ctx.input)}`); + const FUNC = "paginated/metrics"; + console.log(`${FUNC}: Commencing paginated query for Metric`); + console.log(`${FUNC}: Input: ${JSON.stringify(ctx.input)}`); const finalStartDate: Date = new Date(ctx.input.startDate); - console.log(`finalStartDate: ${finalStartDate.toISOString()}`); + console.log(`${FUNC}: finalStartDate: ${finalStartDate.toISOString()}`); if (isNaN(finalStartDate.getTime())) { throw new Error(`startDate should be in the YYYY-MM-DD format.`); } @@ -53,7 +54,7 @@ export default createOperation.query({ byDateRecords.set(date, recordContainer); }); - console.log(`Processed ${protocolMetricsQueryResult.data.length} ProtocolMetric records.`); + console.log(`${FUNC}: Processed ${protocolMetricsQueryResult.data.length} ProtocolMetric records.`); } const tokenRecordsQueryResult = await ctx.operations.query({ @@ -79,7 +80,7 @@ export default createOperation.query({ byDateRecords.set(date, recordContainer); }); - console.log(`Processed ${tokenRecordsQueryResult.data.length} TokenRecord records.`); + console.log(`${FUNC}: Processed ${tokenRecordsQueryResult.data.length} TokenRecord records.`); } const tokenSuppliesQueryResult = await ctx.operations.query({ @@ -105,14 +106,14 @@ export default createOperation.query({ byDateRecords.set(date, recordContainer); }); - console.log(`Processed ${tokenSuppliesQueryResult.data.length} TokenSupply records.`); + console.log(`${FUNC}: Processed ${tokenSuppliesQueryResult.data.length} TokenSupply records.`); } // Convert into new Metric objects byDateRecords.forEach((recordContainer, date) => { const metricRecord: Metric | null = getMetricObject(recordContainer.tokenRecords, recordContainer.tokenSupplies, recordContainer.protocolMetrics, ctx.input.includeRecords); if (!metricRecord) { - console.log(`Skipping date ${date} because it is missing data.`); + console.log(`${FUNC}: Skipping date ${date} because it is missing data.`); return; } diff --git a/apps/server/.wundergraph/operations/paginated/protocolMetrics.ts b/apps/server/.wundergraph/operations/paginated/protocolMetrics.ts index e19af1d..885a06f 100644 --- a/apps/server/.wundergraph/operations/paginated/protocolMetrics.ts +++ b/apps/server/.wundergraph/operations/paginated/protocolMetrics.ts @@ -17,10 +17,11 @@ export default createOperation.query({ dateOffset: z.number({ description: "The number of days to paginate by. Reduce the value if data is missing." }).optional(), }), handler: async (ctx) => { - console.log(`Commencing paginated query for ProtocolMetric`); - console.log(`Input: ${JSON.stringify(ctx.input)}`); + const FUNC = "paginated/protocolMetrics"; + console.log(`${FUNC}: Commencing paginated query for ProtocolMetric`); + console.log(`${FUNC}: Input: ${JSON.stringify(ctx.input)}`); const finalStartDate: Date = new Date(ctx.input.startDate); - console.log(`finalStartDate: ${finalStartDate.toISOString()}`); + console.log(`${FUNC}: finalStartDate: ${finalStartDate.toISOString()}`); if (isNaN(finalStartDate.getTime())) { throw new Error(`startDate should be in the YYYY-MM-DD format.`); } @@ -34,7 +35,7 @@ export default createOperation.query({ let currentEndDate: Date = getNextEndDate(null); while (currentStartDate.getTime() >= finalStartDate.getTime()) { - console.log(`Querying for ${getISO8601DateString(currentStartDate)} to ${getISO8601DateString(currentEndDate)}`); + console.log(`${FUNC}: Querying for ${getISO8601DateString(currentStartDate)} to ${getISO8601DateString(currentEndDate)}`); const queryResult = await ctx.operations.query({ operationName: "raw/internal/protocolMetrics", input: { @@ -56,12 +57,12 @@ export default createOperation.query({ // Ensures that a finalStartDate close to the current date (within the first page) is handled correctly // There is probably a cleaner way to do this, but this works for now if (currentStartDate == finalStartDate) { - console.log(`Reached final start date.`); + console.log(`${FUNC}: Reached final start date.`); break; } } - console.log(`Returning ${combinedProtocolMetrics.length} records.`); + console.log(`${FUNC}: Returning ${combinedProtocolMetrics.length} records.`); return sortRecordsDescending(combinedProtocolMetrics); }, }); diff --git a/apps/server/.wundergraph/operations/paginated/tokenRecords.ts b/apps/server/.wundergraph/operations/paginated/tokenRecords.ts index b23532d..df9d5a1 100644 --- a/apps/server/.wundergraph/operations/paginated/tokenRecords.ts +++ b/apps/server/.wundergraph/operations/paginated/tokenRecords.ts @@ -47,10 +47,11 @@ export default createOperation.query({ crossChainDataComplete: z.boolean({ description: "If true, returns data up to the most recent day in which all subgraphs have data." }).optional(), }), handler: async (ctx) => { - console.log(`Commencing paginated query for TokenRecord`); - console.log(`Input: ${JSON.stringify(ctx.input)}`); + const FUNC = "paginated/tokenRecords"; + console.log(`${FUNC}: Commencing paginated query for TokenRecord`); + console.log(`${FUNC}: Input: ${JSON.stringify(ctx.input)}`); const finalStartDate: Date = new Date(ctx.input.startDate); - console.log(`finalStartDate: ${finalStartDate.toISOString()}`); + console.log(`${FUNC}: finalStartDate: ${finalStartDate.toISOString()}`); if (isNaN(finalStartDate.getTime())) { throw new Error(`startDate should be in the YYYY-MM-DD format.`); } @@ -65,7 +66,7 @@ export default createOperation.query({ let hasProcessedFirstDate = false; while (currentStartDate.getTime() >= finalStartDate.getTime()) { - console.log(`Querying for ${getISO8601DateString(currentStartDate)} to ${getISO8601DateString(currentEndDate)}`); + console.log(`${FUNC}: Querying for ${getISO8601DateString(currentStartDate)} to ${getISO8601DateString(currentEndDate)}`); const queryResult = await ctx.operations.query({ operationName: "tokenRecords", input: { @@ -88,12 +89,12 @@ export default createOperation.query({ // Ensures that a finalStartDate close to the current date (within the first page) is handled correctly // There is probably a cleaner way to do this, but this works for now if (currentStartDate == finalStartDate) { - console.log(`Reached final start date.`); + console.log(`${FUNC}: Reached final start date.`); break; } } - console.log(`Returning ${combinedTokenRecords.length} records.`); + console.log(`${FUNC}: Returning ${combinedTokenRecords.length} records.`); return sortRecordsDescending(combinedTokenRecords); }, }); diff --git a/apps/server/.wundergraph/operations/paginated/tokenSupplies.ts b/apps/server/.wundergraph/operations/paginated/tokenSupplies.ts index 8eefdde..0519fce 100644 --- a/apps/server/.wundergraph/operations/paginated/tokenSupplies.ts +++ b/apps/server/.wundergraph/operations/paginated/tokenSupplies.ts @@ -51,10 +51,11 @@ export default createOperation.query({ crossChainDataComplete: z.boolean({ description: "If true, returns data up to the most recent day in which all subgraphs have data." }).optional(), }), handler: async (ctx) => { - console.log(`Commencing paginated query for TokenSupply`); - console.log(`Input: ${JSON.stringify(ctx.input)}`); + const FUNC = "paginated/tokenSupplies"; + console.log(`${FUNC}: Commencing paginated query for TokenSupply`); + console.log(`${FUNC}: Input: ${JSON.stringify(ctx.input)}`); const finalStartDate: Date = new Date(ctx.input.startDate); - console.log(`finalStartDate: ${finalStartDate.toISOString()}`); + console.log(`${FUNC}: finalStartDate: ${finalStartDate.toISOString()}`); if (isNaN(finalStartDate.getTime())) { throw new Error(`startDate should be in the YYYY-MM-DD format.`); } @@ -69,7 +70,7 @@ export default createOperation.query({ let hasProcessedFirstDate = false; while (currentStartDate.getTime() >= finalStartDate.getTime()) { - console.log(`Querying for ${getISO8601DateString(currentStartDate)} to ${getISO8601DateString(currentEndDate)}`); + console.log(`${FUNC}: Querying for ${getISO8601DateString(currentStartDate)} to ${getISO8601DateString(currentEndDate)}`); const queryResult = await ctx.operations.query({ operationName: "tokenSupplies", input: { @@ -92,12 +93,12 @@ export default createOperation.query({ // Ensures that a finalStartDate close to the current date (within the first page) is handled correctly // There is probably a cleaner way to do this, but this works for now if (currentStartDate == finalStartDate) { - console.log(`Reached final start date.`); + console.log(`${FUNC}: Reached final start date.`); break; } } - console.log(`Returning ${combinedTokenSupplies.length} records.`); + console.log(`${FUNC}: Returning ${combinedTokenSupplies.length} records.`); return sortRecordsDescending(combinedTokenSupplies); }, });