Skip to content

Commit a165572

Browse files
committed
Remove remaining ENSINDEXER_URL references across codebase
1 parent f5244c0 commit a165572

File tree

9 files changed

+4
-29
lines changed

9 files changed

+4
-29
lines changed

.github/scripts/run_ensindexer_healthcheck.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,10 @@ PID=$!
3838

3939
echo "ENSIndexer started with PID: $PID"
4040

41-
# Require ENSINDEXER_URL to be set
42-
if [ -z "$ENSINDEXER_URL" ]; then
43-
echo "Error: ENSINDEXER_URL environment variable must be set"
44-
kill -9 $PID 2>/dev/null || true
45-
wait $PID 2>/dev/null || true
46-
rm -f "$LOG_FILE"
47-
[ -f "$ENV_FILE" ] && rm -f "$ENV_FILE"
48-
exit 1
49-
fi
41+
ENSINDEXER_HEALTHCHECK="http://localhost:42069/health"
5042

5143
# Wait for health check to pass
52-
echo "Waiting for health check to pass at ${ENSINDEXER_URL}/health (up to $HEALTH_CHECK_TIMEOUT seconds)..."
44+
echo "Waiting for health check to pass at ${ENSINDEXER_HEALTHCHECK} (up to $HEALTH_CHECK_TIMEOUT seconds)..."
5345
health_check_start=$(date +%s)
5446
last_log_check=0
5547

@@ -76,7 +68,7 @@ while true; do
7668
fi
7769

7870
# Check health endpoint
79-
if curl -sf "${ENSINDEXER_URL}/health" >/dev/null 2>&1; then
71+
if curl -sf "${ENSINDEXER_HEALTHCHECK}" >/dev/null 2>&1; then
8072
echo "Health check passed! ENSIndexer is up and running."
8173
echo "Test successful - terminating ENSIndexer"
8274
# Force kill the ENSIndexer process

.github/workflows/test_ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ jobs:
133133
DATABASE_SCHEMA: public
134134
PLUGINS: subgraph,basenames,lineanames,threedns,protocol-acceleration,registrars,tokenscope
135135
ENSRAINBOW_URL: https://api.ensrainbow.io
136-
ENSINDEXER_URL: http://localhost:42069
137136
ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
138137
QUICKNODE_API_KEY: ${{ secrets.QUICKNODE_API_KEY }}
139138
QUICKNODE_ENDPOINT_NAME: ${{ secrets.QUICKNODE_ENDPOINT_NAME}}

apps/ensindexer/.env.local.example

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,6 @@ LABEL_SET_ID=subgraph
226226
# LABEL_SET_VERSION: see https://ensnode.io/ensrainbow/concepts/glossary#label-set-version.
227227
LABEL_SET_VERSION=0
228228

229-
# The "primary" ENSIndexer service URL
230-
# Required. This must be an instance of ENSIndexer using either `ponder start` or `ponder dev`,
231-
# (not `ponder serve`). This URL is used to read Ponder's internal indexing state to power the Config
232-
# and Indexing Status APIs. This should be configured so that ENSIndexer refers back to itself.
233-
# ex: http://localhost:{port}.
234-
ENSINDEXER_URL=http://localhost:42069
235-
236229
# A feature flag to enable/disable ENSIndexer's Subgraph Compatible Indexing Behavior
237230
# Optional. If this is not set, the default value is set to `DEFAULT_SUBGRAPH_COMPAT` (false).
238231
#

apps/ensindexer/src/lib/__test__/mockConfig.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const _defaultMockConfig = buildConfigFromEnvironment({
1212
DATABASE_SCHEMA: "test_schema",
1313
NAMESPACE: "mainnet",
1414
PLUGINS: "subgraph",
15-
ENSINDEXER_URL: "http://localhost:42069",
1615
ENSRAINBOW_URL: "http://localhost:3223",
1716
LABEL_SET_ID: "ens-test-env",
1817
LABEL_SET_VERSION: "0",

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ services:
99
DATABASE_URL: postgresql://postgres:password@postgres:5432/postgres
1010
DATABASE_SCHEMA: ensindexer_0
1111
ENSRAINBOW_URL: http://ensrainbow:3223
12-
ENSINDEXER_URL: http://ensindexer:42069
1312
env_file:
1413
# NOTE: must define apps/ensindexer/.env.local (see apps/ensindexer/.env.local.example)
1514
# Copy .env.local.example to .env.local and configure all required values

packages/ensnode-sdk/src/shared/config/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type { UrlString } from "../serialized-types";
44
import type { ChainId } from "../types";
55
import type {
66
DatabaseSchemaNameSchema,
7-
EnsIndexerUrlSchema,
87
PortNumberSchema,
98
TheGraphApiKeySchema,
109
} from "./zod-schemas";
@@ -47,7 +46,6 @@ export type RpcConfigs = Map<ChainId, RpcConfig>;
4746

4847
export type DatabaseUrl = UrlString;
4948
export type DatabaseSchemaName = z.infer<typeof DatabaseSchemaNameSchema>;
50-
export type EnsIndexerUrl = z.infer<typeof EnsIndexerUrlSchema>;
5149
export type TheGraphApiKey = z.infer<typeof TheGraphApiKeySchema>;
5250

5351
export type PortNumber = z.infer<typeof PortNumberSchema>;

packages/ensnode-sdk/src/shared/config/zod-schemas.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ export const RpcConfigsSchema = z
5151
return rpcConfigs;
5252
});
5353

54-
export const EnsIndexerUrlSchema = makeUrlSchema("ENSINDEXER_URL");
55-
5654
export const ENSNamespaceSchema = z.enum(ENSNamespaceIds, {
5755
error: ({ input }) =>
5856
`Invalid NAMESPACE. Got '${input}', but supported ENS namespaces are: ${Object.keys(ENSNamespaceIds).join(", ")}`,

packages/integration-test-env/src/orchestrator.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ async function main() {
317317
await waitForHealth(`http://localhost:${ENSRAINBOW_PORT}/health`, 30_000, "ENSRainbow");
318318

319319
// Phase 3: Start ENSIndexer
320-
const ENSINDEXER_URL = `http://localhost:${ENSINDEXER_PORT}`;
321320
const ENSINDEXER_SCHEMA_NAME = "ensindexer_0";
322321

323322
log("Starting ENSIndexer...");
@@ -331,7 +330,6 @@ async function main() {
331330
DATABASE_SCHEMA: ENSINDEXER_SCHEMA_NAME,
332331
PLUGINS: "ensv2,protocol-acceleration",
333332
ENSRAINBOW_URL,
334-
ENSINDEXER_URL,
335333
LABEL_SET_ID,
336334
LABEL_SET_VERSION,
337335
},

terraform/modules/ensindexer/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ resource "render_web_service" "ensindexer" {
3434
"LABEL_SET_VERSION" = { value = var.ensindexer_label_set_version },
3535
"PLUGINS" = { value = var.plugins },
3636
"NAMESPACE" = { value = var.namespace },
37-
"SUBGRAPH_COMPAT" = { value = var.subgraph_compat },
38-
"ENSINDEXER_URL" = { value = "http://ensindexer-${var.ensnode_indexer_type}:10000" }
37+
"SUBGRAPH_COMPAT" = { value = var.subgraph_compat }
3938
})
4039

4140
# See https://render.com/docs/custom-domains

0 commit comments

Comments
 (0)