Skip to content

Commit fe276c0

Browse files
xrsvxrsv
authored
Revert "fix: pin base v4 subgraph ellipfra index directly (for oncall issue)" (#1384)
Revert "fix: pin base v4 subgraph ellipfra index directly (for oncall issue) …" This reverts commit d5c2b9b.
1 parent 21cdc2c commit fe276c0

4 files changed

Lines changed: 1 addition & 29 deletions

File tree

‎bin/app.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ export class RoutingAPIStage extends Stage {
4040
alchemyQueryKey?: string
4141
alchemyQueryKey2?: string
4242
graphBaseV4SubgraphId?: string
43-
graphBaseV4DeploymentId?: string
44-
graphBaseV4IndexId?: string
4543
graphXlayerV4Id?: string
4644
graphXlayerV3Id?: string
4745
graphXLayerV2Id?: string
@@ -117,8 +115,6 @@ export class RoutingAPIStage extends Stage {
117115
alchemyQueryKey,
118116
alchemyQueryKey2,
119117
graphBaseV4SubgraphId,
120-
graphBaseV4DeploymentId,
121-
graphBaseV4IndexId,
122118
graphXlayerV4Id,
123119
graphXlayerV3Id,
124120
graphXLayerV2Id,
@@ -193,8 +189,6 @@ export class RoutingAPIStage extends Stage {
193189
alchemyQueryKey,
194190
alchemyQueryKey2,
195191
graphBaseV4SubgraphId,
196-
graphBaseV4DeploymentId,
197-
graphBaseV4IndexId,
198192
graphXlayerV4Id,
199193
graphXlayerV3Id,
200194
graphXLayerV2Id,
@@ -450,8 +444,6 @@ export class RoutingAPIPipeline extends Stack {
450444
// below secret namings are wrong, but we take it as is
451445
graphBearerToken: alchemySubgraphSecret.secretValueFromJson('alchemy-bearer-token').toString(),
452446
graphBaseV4SubgraphId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-subgraph-id').toString(),
453-
graphBaseV4DeploymentId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-deployment-id').toString(),
454-
graphBaseV4IndexId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-index-id').toString(),
455447
graphXlayerV4Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V4_ID').toString(),
456448
graphXlayerV3Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V3_ID').toString(),
457449
graphXLayerV2Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V2_ID').toString(),
@@ -543,8 +535,6 @@ export class RoutingAPIPipeline extends Stack {
543535
// below secret namings are wrong, but we take it as is
544536
graphBearerToken: alchemySubgraphSecret.secretValueFromJson('alchemy-bearer-token').toString(),
545537
graphBaseV4SubgraphId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-subgraph-id').toString(),
546-
graphBaseV4DeploymentId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-deployment-id').toString(),
547-
graphBaseV4IndexId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-index-id').toString(),
548538
graphXlayerV4Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V4_ID').toString(),
549539
graphXlayerV3Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V3_ID').toString(),
550540
graphXLayerV2Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V2_ID').toString(),
@@ -753,8 +743,6 @@ new RoutingAPIStack(app, 'RoutingAPIStack', {
753743
alchemyQueryKey: process.env.ALCHEMY_QUERY_KEY!,
754744
alchemyQueryKey2: process.env.ALCHEMY_QUERY_KEY_2!,
755745
graphBaseV4SubgraphId: process.env.GRAPH_BASE_V4_SUBGRAPH_ID!,
756-
graphBaseV4DeploymentId: process.env.GRAPH_BASE_V4_DEPLOYMENT_ID!,
757-
graphBaseV4IndexId: process.env.GRAPH_BASE_V4_INDEX_ID!,
758746
graphXlayerV4Id: process.env.GRAPH_XLAYER_V4_ID!,
759747
graphXlayerV3Id: process.env.GRAPH_XLAYER_V4_ID!,
760748
graphXLayerV2Id: process.env.GRAPH_XLAYER_V4_ID!,

‎bin/stacks/routing-api-stack.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ export class RoutingAPIStack extends cdk.Stack {
5252
alchemyQueryKey?: string
5353
alchemyQueryKey2?: string
5454
graphBaseV4SubgraphId?: string
55-
graphBaseV4DeploymentId?: string
56-
graphBaseV4IndexId?: string
5755
graphXlayerV4Id?: string
5856
graphXlayerV3Id?: string
5957
graphXLayerV2Id?: string
@@ -131,8 +129,6 @@ export class RoutingAPIStack extends cdk.Stack {
131129
alchemyQueryKey,
132130
alchemyQueryKey2,
133131
graphBaseV4SubgraphId,
134-
graphBaseV4DeploymentId,
135-
graphBaseV4IndexId,
136132
graphXlayerV4Id,
137133
graphXlayerV3Id,
138134
graphXLayerV2Id,
@@ -206,8 +202,6 @@ export class RoutingAPIStack extends cdk.Stack {
206202
alchemyQueryKey,
207203
alchemyQueryKey2,
208204
graphBaseV4SubgraphId,
209-
graphBaseV4DeploymentId,
210-
graphBaseV4IndexId,
211205
graphXlayerV4Id,
212206
graphXlayerV3Id,
213207
graphXLayerV2Id,

‎bin/stacks/routing-caching-stack.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ export interface RoutingCachingStackProps extends cdk.NestedStackProps {
2929
alchemyQueryKey?: string
3030
alchemyQueryKey2?: string
3131
graphBaseV4SubgraphId?: string
32-
graphBaseV4DeploymentId?: string
33-
graphBaseV4IndexId?: string
3432
graphXlayerV4Id?: string
3533
graphXlayerV3Id?: string
3634
graphXLayerV2Id?: string
@@ -95,8 +93,6 @@ export class RoutingCachingStack extends cdk.NestedStack {
9593
public readonly alchemyQueryKey: string | undefined = undefined
9694
public readonly alchemyQueryKey2: string | undefined = undefined
9795
public readonly graphBaseV4SubgraphId: string | undefined = undefined
98-
public readonly graphBaseV4DeploymentId: string | undefined = undefined
99-
public readonly graphBaseV4IndexId: string | undefined = undefined
10096
public readonly graphXlayerV4Id: string | undefined = undefined
10197
public readonly graphXlayerV3Id: string | undefined = undefined
10298
public readonly graphXLayerV2Id: string | undefined = undefined
@@ -157,8 +153,6 @@ export class RoutingCachingStack extends cdk.NestedStack {
157153
alchemyQueryKey,
158154
alchemyQueryKey2,
159155
graphBaseV4SubgraphId,
160-
graphBaseV4DeploymentId,
161-
graphBaseV4IndexId,
162156
graphXlayerV4Id,
163157
graphXlayerV3Id,
164158
graphXLayerV2Id,
@@ -217,8 +211,6 @@ export class RoutingCachingStack extends cdk.NestedStack {
217211
this.alchemyQueryKey = alchemyQueryKey
218212
this.alchemyQueryKey2 = alchemyQueryKey2
219213
this.graphBaseV4SubgraphId = graphBaseV4SubgraphId
220-
this.graphBaseV4DeploymentId = graphBaseV4DeploymentId
221-
this.graphBaseV4IndexId = graphBaseV4IndexId
222214
this.graphXlayerV4Id = graphXlayerV4Id
223215
this.graphXlayerV3Id = graphXlayerV3Id
224216
this.graphXLayerV2Id = graphXLayerV2Id
@@ -354,8 +346,6 @@ export class RoutingCachingStack extends cdk.NestedStack {
354346
ALCHEMY_QUERY_KEY: this.alchemyQueryKey ?? '',
355347
ALCHEMY_QUERY_KEY_2: this.alchemyQueryKey2 ?? '',
356348
GRAPH_BASE_V4_SUBGRAPH_ID: this.graphBaseV4SubgraphId ?? '',
357-
GRAPH_BASE_V4_DEPLOYMENT_ID: this.graphBaseV4DeploymentId ?? '',
358-
GRAPH_BASE_V4_INDEX_ID: this.graphBaseV4IndexId ?? '',
359349
GRAPH_XLAYER_V4_ID: this.graphXlayerV4Id ?? '',
360350
GRAPH_XLAYER_V3_ID: this.graphXlayerV3Id ?? '',
361351
GRAPH_XLAYER_V2_ID: this.graphXLayerV2Id ?? '',

‎lib/cron/cache-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export const v4SubgraphUrlOverride = (chainId: ChainId) => {
137137
case ChainId.ARBITRUM_ONE:
138138
return `https://api.aws-us-east-1.goldsky.com/c/uniswap2/gn/subgraphs/id/${process.env.GOLD_SKY_ARBITRUM_V4_ID}`
139139
case ChainId.BASE:
140-
return `https://gateway.thegraph.com/api/deployments/id/${process.env.GRAPH_BASE_V4_DEPLOYMENT_ID}/indexers/id/${process.env.GRAPH_BASE_V4_INDEX_ID}`
140+
return `https://gateway.thegraph.com/api/subgraphs/id/${process.env.GRAPH_BASE_V4_SUBGRAPH_ID}`
141141
case ChainId.POLYGON:
142142
return `https://api.aws-us-east-1.goldsky.com/c/uniswap2/gn/subgraphs/id/${process.env.GOLD_SKY_POLYGON_V4_ID}`
143143
case ChainId.WORLDCHAIN:

0 commit comments

Comments
 (0)