Skip to content

fix: pin base v4 subgraph ellipfra index directly (for oncall issue) #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsy1218 merged 2 commits into from
Mar 17, 2026
Merged

fix: pin base v4 subgraph ellipfra index directly (for oncall issue) #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad76fc
Revert "Revert "fix: pin base v4 subgraph ellipfra index directly (fo…
jsy1218 Mar 16, 2026
d3443f9
fix: pin base v4 subgraph ellipfra index directly (for oncall issue)
jsy1218 Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions bin/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export class RoutingAPIStage extends Stage {
unicornSecret: string
alchemyQueryKey?: string
alchemyQueryKey2?: string
graphBaseV4SubgraphId?: string
graphBaseV4DeploymentId?: string
graphBaseV4IndexId?: string
graphXlayerV4Id?: string
graphXlayerV3Id?: string
graphXLayerV2Id?: string
Expand Down Expand Up @@ -114,7 +115,8 @@ export class RoutingAPIStage extends Stage {
unicornSecret,
alchemyQueryKey,
alchemyQueryKey2,
graphBaseV4SubgraphId,
graphBaseV4DeploymentId,
graphBaseV4IndexId,
graphXlayerV4Id,
graphXlayerV3Id,
graphXLayerV2Id,
Expand Down Expand Up @@ -188,7 +190,8 @@ export class RoutingAPIStage extends Stage {
unicornSecret,
alchemyQueryKey,
alchemyQueryKey2,
graphBaseV4SubgraphId,
graphBaseV4DeploymentId,
graphBaseV4IndexId,
graphXlayerV4Id,
graphXlayerV3Id,
graphXLayerV2Id,
Expand Down Expand Up @@ -443,7 +446,8 @@ export class RoutingAPIPipeline extends Stack {
// bearer token and base subgraph id are not from alchemy subgraph, but from the graph
// below secret namings are wrong, but we take it as is
graphBearerToken: alchemySubgraphSecret.secretValueFromJson('alchemy-bearer-token').toString(),
graphBaseV4SubgraphId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-subgraph-id').toString(),
graphBaseV4DeploymentId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-deployment-id').toString(),
graphBaseV4IndexId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-index-id').toString(),
graphXlayerV4Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V4_ID').toString(),
graphXlayerV3Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V3_ID').toString(),
graphXLayerV2Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V2_ID').toString(),
Expand Down Expand Up @@ -534,7 +538,8 @@ export class RoutingAPIPipeline extends Stack {
// bearer token and base subgraph id are not from alchemy subgraph, but from the graph
// below secret namings are wrong, but we take it as is
graphBearerToken: alchemySubgraphSecret.secretValueFromJson('alchemy-bearer-token').toString(),
graphBaseV4SubgraphId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-subgraph-id').toString(),
graphBaseV4DeploymentId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-deployment-id').toString(),
graphBaseV4IndexId: alchemySubgraphSecret.secretValueFromJson('alchemy-base-v4-index-id').toString(),
graphXlayerV4Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V4_ID').toString(),
graphXlayerV3Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V3_ID').toString(),
graphXLayerV2Id: routingApiNewSecrets.secretValueFromJson('GRAPH_XLAYER_V2_ID').toString(),
Expand Down Expand Up @@ -742,7 +747,8 @@ new RoutingAPIStack(app, 'RoutingAPIStack', {
uniGraphQLHeaderOrigin: process.env.GQL_H_ORGN!,
alchemyQueryKey: process.env.ALCHEMY_QUERY_KEY!,
alchemyQueryKey2: process.env.ALCHEMY_QUERY_KEY_2!,
graphBaseV4SubgraphId: process.env.GRAPH_BASE_V4_SUBGRAPH_ID!,
graphBaseV4DeploymentId: process.env.GRAPH_BASE_V4_DEPLOYMENT_ID!,
graphBaseV4IndexId: process.env.GRAPH_BASE_V4_INDEX_ID!,
graphXlayerV4Id: process.env.GRAPH_XLAYER_V4_ID!,
graphXlayerV3Id: process.env.GRAPH_XLAYER_V4_ID!,
graphXLayerV2Id: process.env.GRAPH_XLAYER_V4_ID!,
Expand Down
9 changes: 6 additions & 3 deletions bin/stacks/routing-api-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ export class RoutingAPIStack extends cdk.Stack {
unicornSecret: string
alchemyQueryKey?: string
alchemyQueryKey2?: string
graphBaseV4SubgraphId?: string
graphBaseV4DeploymentId?: string
graphBaseV4IndexId?: string
graphXlayerV4Id?: string
graphXlayerV3Id?: string
graphXLayerV2Id?: string
Expand Down Expand Up @@ -128,7 +129,8 @@ export class RoutingAPIStack extends cdk.Stack {
unicornSecret,
alchemyQueryKey,
alchemyQueryKey2,
graphBaseV4SubgraphId,
graphBaseV4DeploymentId,
graphBaseV4IndexId,
graphXlayerV4Id,
graphXlayerV3Id,
graphXLayerV2Id,
Expand Down Expand Up @@ -201,7 +203,8 @@ export class RoutingAPIStack extends cdk.Stack {
hosted_zone,
alchemyQueryKey,
alchemyQueryKey2,
graphBaseV4SubgraphId,
graphBaseV4DeploymentId,
graphBaseV4IndexId,
graphXlayerV4Id,
graphXlayerV3Id,
graphXLayerV2Id,
Expand Down
15 changes: 10 additions & 5 deletions bin/stacks/routing-caching-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export interface RoutingCachingStackProps extends cdk.NestedStackProps {
chatbotSNSArn?: string
alchemyQueryKey?: string
alchemyQueryKey2?: string
graphBaseV4SubgraphId?: string
graphBaseV4DeploymentId?: string
graphBaseV4IndexId?: string
graphXlayerV4Id?: string
graphXlayerV3Id?: string
graphXLayerV2Id?: string
Expand Down Expand Up @@ -92,7 +93,8 @@ export class RoutingCachingStack extends cdk.NestedStack {
public readonly poolCacheLambdaNameArray: string[] = []
public readonly alchemyQueryKey: string | undefined = undefined
public readonly alchemyQueryKey2: string | undefined = undefined
public readonly graphBaseV4SubgraphId: string | undefined = undefined
public readonly graphBaseV4DeploymentId: string | undefined = undefined
public readonly graphBaseV4IndexId: string | undefined = undefined
public readonly graphXlayerV4Id: string | undefined = undefined
public readonly graphXlayerV3Id: string | undefined = undefined
public readonly graphXLayerV2Id: string | undefined = undefined
Expand Down Expand Up @@ -152,7 +154,8 @@ export class RoutingCachingStack extends cdk.NestedStack {
chatbotSNSArn,
alchemyQueryKey,
alchemyQueryKey2,
graphBaseV4SubgraphId,
graphBaseV4DeploymentId,
graphBaseV4IndexId,
graphXlayerV4Id,
graphXlayerV3Id,
graphXLayerV2Id,
Expand Down Expand Up @@ -210,7 +213,8 @@ export class RoutingCachingStack extends cdk.NestedStack {

this.alchemyQueryKey = alchemyQueryKey
this.alchemyQueryKey2 = alchemyQueryKey2
this.graphBaseV4SubgraphId = graphBaseV4SubgraphId
this.graphBaseV4DeploymentId = graphBaseV4DeploymentId
this.graphBaseV4IndexId = graphBaseV4IndexId
this.graphXlayerV4Id = graphXlayerV4Id
this.graphXlayerV3Id = graphXlayerV3Id
this.graphXLayerV2Id = graphXLayerV2Id
Expand Down Expand Up @@ -345,7 +349,8 @@ export class RoutingCachingStack extends cdk.NestedStack {
POOL_CACHE_GZIP_KEY: this.poolCacheGzipKey,
ALCHEMY_QUERY_KEY: this.alchemyQueryKey ?? '',
ALCHEMY_QUERY_KEY_2: this.alchemyQueryKey2 ?? '',
GRAPH_BASE_V4_SUBGRAPH_ID: this.graphBaseV4SubgraphId ?? '',
GRAPH_BASE_V4_DEPLOYMENT_ID: this.graphBaseV4DeploymentId ?? '',
GRAPH_BASE_V4_INDEX_ID: this.graphBaseV4IndexId ?? '',
GRAPH_XLAYER_V4_ID: this.graphXlayerV4Id ?? '',
GRAPH_XLAYER_V3_ID: this.graphXlayerV3Id ?? '',
GRAPH_XLAYER_V2_ID: this.graphXLayerV2Id ?? '',
Expand Down
2 changes: 1 addition & 1 deletion lib/cron/cache-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export const v4SubgraphUrlOverride = (chainId: ChainId) => {
case ChainId.ARBITRUM_ONE:
return `https://api.aws-us-east-1.goldsky.com/c/uniswap2/gn/subgraphs/id/${process.env.GOLD_SKY_ARBITRUM_V4_ID}`
case ChainId.BASE:
return `https://gateway.thegraph.com/api/subgraphs/id/${process.env.GRAPH_BASE_V4_SUBGRAPH_ID}`
return `https://gateway.thegraph.com/api/deployments/id/${process.env.GRAPH_BASE_V4_DEPLOYMENT_ID}/indexers/id/${process.env.GRAPH_BASE_V4_INDEX_ID}`
case ChainId.POLYGON:
return `https://api.aws-us-east-1.goldsky.com/c/uniswap2/gn/subgraphs/id/${process.env.GOLD_SKY_POLYGON_V4_ID}`
case ChainId.WORLDCHAIN:
Expand Down
Loading