ENSv2 Plugin

.changeset/frank-beds-taste.md

@@ -0,0 +1,8 @@
+---
+"@ensnode/ensnode-schema": minor
+"@ensnode/datasources": minor
+"ensindexer": minor
+"ensapi": minor
+---
+
+Introduces the ENSv2 Plugin ('ensv2') for indexing both ENSv1 and the future ENSv2 protocol.

.changeset/legal-mammals-try.md

@@ -0,0 +1,6 @@
+---
+"ensindexer": minor
+"@ensnode/datasources": minor
+---
+
+BREAKING: Removed holesky ENSNamespace.

.github/actions/build_docker_image/action.yml

@@ -3,23 +3,23 @@ description: builds multi-arch docker image
 
 inputs:
   image:
-    description: 'Target Docker image name'
+    description: "Target Docker image name"
     required: true
 
   dockerfile:
-    description: 'Target Dockerfile path'
+    description: "Target Dockerfile path"
     required: true
 
   tags:
-    description: 'Docker Image Tags'
+    description: "Docker Image Tags"
     required: false
 
   registry_user:
-    description: 'Username for Docker registry'
+    description: "Username for Docker registry"
     required: true
 
   registry_token:
-    description: 'Registry token for Docker registry authentication'
+    description: "Registry token for Docker registry authentication"
     required: true
 
   build_args:
@@ -46,11 +46,11 @@ runs:
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+    - name: Setup Docker Builder
+      uses: useblacksmith/setup-docker-builder@v1
 
     - name: Build & Push
-      uses: docker/build-push-action@v6
+      uses: useblacksmith/build-push-action@v2
       with:
         context: .
         file: ${{ inputs.dockerfile }}
@@ -59,5 +59,3 @@ runs:
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
         build-args: ${{ inputs.build_args }}
-        # cache-from: type=gha
-        # cache-to: type=gha,mode=max

.github/scripts/run_ensindexer_healthcheck.sh

@@ -5,7 +5,7 @@
 
 # Set default timeout if not provided by environment
 # Use env var if set, otherwise default to 60 seconds
-: "${HEALTH_CHECK_TIMEOUT:=60}" 
+: "${HEALTH_CHECK_TIMEOUT:=60}"
 
 # Detect if running from CI or local
 if [ -n "$GITHUB_WORKSPACE" ]; then
@@ -38,19 +38,27 @@ PID=$!
 
 echo "ENSIndexer started with PID: $PID"
 
+# Require ENSINDEXER_URL to be set
+if [ -z "$ENSINDEXER_URL" ]; then
+  echo "Error: ENSINDEXER_URL environment variable must be set"
+  kill -9 $PID 2>/dev/null || true
+  wait $PID 2>/dev/null || true
+  rm -f "$LOG_FILE"
+  [ -f "$ENV_FILE" ] && rm -f "$ENV_FILE"
+  exit 1
+fi
+
 # Wait for health check to pass
-echo "Waiting for health check to pass (up to $HEALTH_CHECK_TIMEOUT seconds)..."
+echo "Waiting for health check to pass at ${ENSINDEXER_URL}/health (up to $HEALTH_CHECK_TIMEOUT seconds)..."
 health_check_start=$(date +%s)
 last_log_check=0
 
 while true; do
   current_time=$(date +%s)
 
-  # Periodically show log progress (every 15 seconds) to prevent CI timeout
+  # Periodically show progress (every 15 seconds) to prevent CI timeout
   if [ $((current_time - last_log_check)) -ge 15 ]; then
     echo "Still waiting for health check at $(date) (elapsed: $((current_time - health_check_start)) seconds)..."
-    echo "Recent log entries:"
-    tail -n 10 "$LOG_FILE"
     last_log_check=$current_time
   fi
 
@@ -63,38 +71,33 @@ while true; do
     echo "Last 30 lines of log:"
     tail -n 30 "$LOG_FILE"
     rm -f "$LOG_FILE"
-    # Clean up env file
     [ -f "$ENV_FILE" ] && rm -f "$ENV_FILE"
     exit 1
   fi
 
-  # Check for health ready message
-  if grep -q "Started returning 200 responses from /health endpoint" "$LOG_FILE"; then
+  # Check health endpoint
+  if curl -sf "${ENSINDEXER_URL}/health" >/dev/null 2>&1; then
     echo "Health check passed! ENSIndexer is up and running."
     echo "Test successful - terminating ENSIndexer"
     # Force kill the ENSIndexer process
     kill -9 $PID 2>/dev/null || true
-    # Make sure we don't wait for the process to exit since we've force killed it
     wait $PID 2>/dev/null || true
     # Clean up the log file and env file
     rm -f "$LOG_FILE"
     [ -f "$ENV_FILE" ] && rm -f "$ENV_FILE"
-    # Explicitly exit with success code
     echo "Exiting with success code 0"
     exit 0
   fi
 
   # Check if we've reached the health check timeout
   elapsed=$((current_time - health_check_start))
-
   if [ $elapsed -ge $HEALTH_CHECK_TIMEOUT ]; then
     echo "Health check timeout reached. ENSIndexer did not become healthy."
     kill -9 $PID 2>/dev/null || true
     wait $PID 2>/dev/null || true
     echo "Last 30 lines of log:"
     tail -n 30 "$LOG_FILE"
     rm -f "$LOG_FILE"
-    # Clean up env file
     [ -f "$ENV_FILE" ] && rm -f "$ENV_FILE"
     exit 1
   fi

.github/workflows/deploy_ensnode_blue_green.yml

@@ -69,9 +69,6 @@ jobs:
               #SEPOLIA
               echo "SEPOLIA_API_SVC_ID="${{ secrets.GREEN_SEPOLIA_API_SVC_ID }} >> "$GITHUB_ENV"
               echo "SEPOLIA_INDEXER_SVC_ID="${{ secrets.GREEN_SEPOLIA_INDEXER_SVC_ID }} >> "$GITHUB_ENV"
-              #HOLESKY
-              echo "HOLESKY_API_SVC_ID="${{ secrets.GREEN_HOLESKY_API_SVC_ID }} >> "$GITHUB_ENV"
-              echo "HOLESKY_INDEXER_SVC_ID="${{ secrets.GREEN_HOLESKY_INDEXER_SVC_ID }} >> "$GITHUB_ENV"
               #ENSRAINBOW
               echo "ENSRAINBOW_SVC_ID="${{ secrets.GREEN_ENSRAINBOW_SVC_ID }} >> "$GITHUB_ENV"
               #ENSADMIN
@@ -93,9 +90,6 @@ jobs:
               #SEPOLIA
               echo "SEPOLIA_API_SVC_ID="${{ secrets.BLUE_SEPOLIA_API_SVC_ID }} >> "$GITHUB_ENV"
               echo "SEPOLIA_INDEXER_SVC_ID="${{ secrets.BLUE_SEPOLIA_INDEXER_SVC_ID }} >> "$GITHUB_ENV"
-              #HOLESKY
-              echo "HOLESKY_API_SVC_ID="${{ secrets.BLUE_HOLESKY_API_SVC_ID }} >> "$GITHUB_ENV"
-              echo "HOLESKY_INDEXER_SVC_ID="${{ secrets.BLUE_HOLESKY_INDEXER_SVC_ID }} >> "$GITHUB_ENV"
               #ENSRAINBOW
               echo "ENSRAINBOW_SVC_ID="${{ secrets.BLUE_ENSRAINBOW_SVC_ID }} >> "$GITHUB_ENV"
               #ENSADMIN
@@ -144,9 +138,6 @@ jobs:
           #SEPOLIA
           update_service_image  ${RAILWAY_ENVIRONMENT_ID} ${SEPOLIA_API_SVC_ID}           ${{ env.ENSAPI_DOCKER_IMAGE }}
           update_service_image  ${RAILWAY_ENVIRONMENT_ID} ${SEPOLIA_INDEXER_SVC_ID}       ${{ env.ENSINDEXER_DOCKER_IMAGE }}
-          #HOLESKY
-          update_service_image  ${RAILWAY_ENVIRONMENT_ID} ${HOLESKY_API_SVC_ID}           ${{ env.ENSAPI_DOCKER_IMAGE }}
-          update_service_image  ${RAILWAY_ENVIRONMENT_ID} ${HOLESKY_INDEXER_SVC_ID}       ${{ env.ENSINDEXER_DOCKER_IMAGE }}
           #ENSRAINBOW
           update_service_image  ${RAILWAY_ENVIRONMENT_ID} ${ENSRAINBOW_SVC_ID}            ${{ env.ENSRAINBOW_DOCKER_IMAGE }}
           #ENSADMIN
@@ -174,7 +165,6 @@ jobs:
           set_shared_variable ${RAILWAY_ENVIRONMENT_ID} "MAINNET_DATABASE_SCHEMA" "mainnetSchema${TAG}"
           set_shared_variable ${RAILWAY_ENVIRONMENT_ID} "ALPHA-SEPOLIA_DATABASE_SCHEMA" "alphaSepoliaSchema${TAG}"
           set_shared_variable ${RAILWAY_ENVIRONMENT_ID} "SEPOLIA_DATABASE_SCHEMA" "sepoliaSchema${TAG}"
-          set_shared_variable ${RAILWAY_ENVIRONMENT_ID} "HOLESKY_DATABASE_SCHEMA" "holeskySchema${TAG}"
 
       - name: Redeploy ENSNode instances
         run: |
@@ -203,9 +193,6 @@ jobs:
           #SEPOLIA
           redeploy_service  ${RAILWAY_ENVIRONMENT_ID} ${SEPOLIA_API_SVC_ID}
           redeploy_service  ${RAILWAY_ENVIRONMENT_ID} ${SEPOLIA_INDEXER_SVC_ID}
-          #HOLESKY
-          redeploy_service  ${RAILWAY_ENVIRONMENT_ID} ${HOLESKY_API_SVC_ID}
-          redeploy_service  ${RAILWAY_ENVIRONMENT_ID} ${HOLESKY_INDEXER_SVC_ID}
           #ENSRAINBOW
           redeploy_service  ${RAILWAY_ENVIRONMENT_ID} ${ENSRAINBOW_SVC_ID}
           #ENSADMIN

.github/workflows/deploy_switch_ensnode_environment.yml

@@ -70,19 +70,9 @@ jobs:
           redis-cli -u $REDIS_URL SET traefik/http/routers/lb-header-alpha-sepolia-indexer-router/service "${TARGET_ENVIRONMENT}-alpha-sepolia-indexer"
 
           # SEPOLIA
-          redis-cli -u $REDIS_URL SET traefik/http/routers/sepolia-api-router/service "${TARGET_ENVIRONMENT}-sepolia-api"
-          redis-cli -u $REDIS_URL SET traefik/http/routers/sepolia-indexer-router/service "${TARGET_ENVIRONMENT}-sepolia-indexer"
-
           redis-cli -u $REDIS_URL SET traefik/http/routers/lb-header-sepolia-api-router/service "${TARGET_ENVIRONMENT}-sepolia-api"
           redis-cli -u $REDIS_URL SET traefik/http/routers/lb-header-sepolia-indexer-router/service "${TARGET_ENVIRONMENT}-sepolia-indexer"
 
-          # HOLESKY
-          redis-cli -u $REDIS_URL SET traefik/http/routers/holesky-api-router/service "${TARGET_ENVIRONMENT}-holesky-api"
-          redis-cli -u $REDIS_URL SET traefik/http/routers/holesky-indexer-router/service "${TARGET_ENVIRONMENT}-holesky-indexer"
-
-          redis-cli -u $REDIS_URL SET traefik/http/routers/lb-header-holesky-api-router/service "${TARGET_ENVIRONMENT}-holesky-api"
-          redis-cli -u $REDIS_URL SET traefik/http/routers/lb-header-holesky-indexer-router/service "${TARGET_ENVIRONMENT}-holesky-indexer"
-
           # ENSRAINBOW
           redis-cli -u $REDIS_URL SET traefik/http/routers/ensrainbow-api-router/service "${TARGET_ENVIRONMENT}-ensrainbow-api"
 

.tool-versions

@@ -1,2 +1,2 @@
 nodejs 22.14.0
-pnpm 10.20.0
+pnpm 10.26.0

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Script: ENSApi Dev",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["run", "dev"],
+      "cwd": "${workspaceFolder}/apps/ensapi",
+      "env": {
+        "NODE_ENV": "development"
+      },
+      "console": "integratedTerminal",
+      "outputCapture": "std"
+    }
+  ]
+}

apps/ensadmin/.env.local.example

@@ -7,8 +7,8 @@
 ENSADMIN_PUBLIC_URL=http://localhost:4173
 
 # Server's library of ENSNode URLs offered as connection options in the connection picker.
-# Optional. If not set, defaults to `DEFAULT_SERVER_CONNECTION_LIBRARY` (https://api.alpha.ensnode.io,https://api.alpha-sepolia.ensnode.io,https://api.mainnet.ensnode.io,https://api.sepolia.ensnode.io,https://api.holesky.ensnode.io).
+# Optional. If not set, defaults to `DEFAULT_SERVER_CONNECTION_LIBRARY` (https://api.alpha.ensnode.io,https://api.alpha-sepolia.ensnode.io,https://api.mainnet.ensnode.io,https://api.sepolia.ensnode.io).
 # Note: it must be a comma-separated list of URLs that are accessible from a web browser
 # (i.e. it cannot be a hostname in a docker network)
 # Note: if a user doesn't explicitly select an ENSNode connection then, by default, ENSAdmin will automatically select the first URL in this list as the ENSNode instance to connect the user to.
-NEXT_PUBLIC_SERVER_CONNECTION_LIBRARY=https://api.alpha.ensnode.io,https://api.alpha-sepolia.ensnode.io,https://api.mainnet.ensnode.io,https://api.sepolia.ensnode.io,https://api.holesky.ensnode.io
+NEXT_PUBLIC_SERVER_CONNECTION_LIBRARY=https://api.alpha.ensnode.io,https://api.alpha-sepolia.ensnode.io,https://api.mainnet.ensnode.io,https://api.sepolia.ensnode.io

apps/ensadmin/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "description": "Explore the ENS Protocol like never before",
   "license": "MIT",
-  "packageManager": "pnpm@10.20.0",
+  "packageManager": "pnpm@10.26.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/namehash/ensnode.git",

apps/ensadmin/src/app/mock/config-info/data.json

@@ -122,33 +122,6 @@
       "isSubgraphCompatible": true
     }
   },
-  "Subgraph Holesky": {
-    "version": "0.35.0",
-    "theGraphFallback": {
-      "canFallback": false,
-      "reason": "no-api-key"
-    },
-    "ensIndexerPublicConfig": {
-      "labelSet": {
-        "labelSetId": "subgraph",
-        "labelSetVersion": 0
-      },
-      "versionInfo": {
-        "nodejs": "22.18.0",
-        "ponder": "0.11.43",
-        "ensDb": "0.35.0",
-        "ensIndexer": "0.35.0",
-        "ensNormalize": "1.11.1",
-        "ensRainbow": "0.34.0",
-        "ensRainbowSchema": 3
-      },
-      "indexedChainIds": [17000],
-      "namespace": "holesky",
-      "plugins": ["subgraph"],
-      "databaseSchemaName": "holeskySchema0.34.0",
-      "isSubgraphCompatible": true
-    }
-  },
   "Serialization Error": {
     "version": "0.35.0",
     "theGraphFallback": {
@@ -169,8 +142,8 @@
         "ensRainbow": "",
         "ensRainbowSchema": -1
       },
-      "indexedChainIds": [17000],
-      "namespace": "holesky",
+      "indexedChainIds": [11155111],
+      "namespace": "sepolia",
       "plugins": ["subgraph"],
       "databaseSchemaName": "DeserializationSchema0.34.0",
       "isSubgraphCompatible": true

apps/ensadmin/src/components/chains/ChainIcon.tsx

@@ -3,7 +3,6 @@ import {
   arbitrumSepolia,
   base,
   baseSepolia,
-  holesky,
   linea,
   lineaSepolia,
   mainnet,
@@ -58,9 +57,6 @@ const chainIcons = new Map<number, React.ComponentType<React.SVGProps<SVGSVGElem
   [arbitrumSepolia.id, ArbitrumTestnetIcon],
   [scrollSepolia.id, ScrollTestnetIcon],
 
-  // holesky
-  [holesky.id, EthereumTestnetIcon],
-
   // ens-test-env
   [ensTestEnvL1Chain.id, EthereumLocalIcon],
 ]);

apps/ensadmin/src/lib/default-records-selection.ts

@@ -52,10 +52,6 @@ export const DefaultRecordsSelection = {
     addresses: getCommonCoinTypes(ENSNamespaceIds.Sepolia),
     texts: TEXTS,
   },
-  [ENSNamespaceIds.Holesky]: {
-    addresses: getCommonCoinTypes(ENSNamespaceIds.Holesky),
-    texts: TEXTS,
-  },
   [ENSNamespaceIds.EnsTestEnv]: {
     addresses: getCommonCoinTypes(ENSNamespaceIds.EnsTestEnv),
     texts: TEXTS,

apps/ensadmin/src/lib/env.ts

@@ -8,7 +8,6 @@ const DEFAULT_SERVER_CONNECTION_LIBRARY = [
   "https://api.alpha-sepolia.ensnode.io",
   "https://api.mainnet.ensnode.io",
   "https://api.sepolia.ensnode.io",
-  "https://api.holesky.ensnode.io",
 ].join(",");
 
 /**

apps/ensadmin/src/lib/namespace-utils.ts

@@ -4,7 +4,6 @@ import {
   arbitrumSepolia,
   base,
   baseSepolia,
-  holesky,
   linea,
   lineaSepolia,
   mainnet,
@@ -28,7 +27,6 @@ const SUPPORTED_CHAINS = [
   ensTestEnvL1Chain,
   mainnet,
   sepolia,
-  holesky,
   base,
   baseSepolia,
   linea,
@@ -50,7 +48,6 @@ const CUSTOM_CHAIN_NAMES = new Map<number, string>([
   [ensTestEnvL1Chain.id, "Ethereum Local (ens-test-env)"],
   [mainnet.id, "Ethereum"],
   [sepolia.id, "Ethereum Sepolia"],
-  [holesky.id, "Ethereum Holesky"],
   [base.id, "Base"],
   [baseSepolia.id, "Base Sepolia"],
   [linea.id, "Linea"],
@@ -84,8 +81,6 @@ export function getEnsManagerAppUrl(namespaceId: ENSNamespaceId): URL | null {
       return new URL(`https://app.ens.domains/`);
     case ENSNamespaceIds.Sepolia:
       return new URL(`https://sepolia.app.ens.domains/`);
-    case ENSNamespaceIds.Holesky:
-      return new URL(`https://holesky.app.ens.domains/`);
     case ENSNamespaceIds.EnsTestEnv:
       // ens-test-env runs on a local chain and is not supported by app.ens.domains
       return null;
@@ -115,9 +110,6 @@ export function buildEnsMetadataServiceAvatarUrl(
       return new URL(name, `https://metadata.ens.domains/mainnet/avatar/`);
     case ENSNamespaceIds.Sepolia:
       return new URL(name, `https://metadata.ens.domains/sepolia/avatar/`);
-    case ENSNamespaceIds.Holesky:
-      // metadata.ens.domains doesn't currently support holesky
-      return null;
     case ENSNamespaceIds.EnsTestEnv:
       // ens-test-env runs on a local chain and is not supported by metadata.ens.domains
       // TODO: Above comment is not true. Details at https://github.com/namehash/ensnode/issues/1078