Refactor/enssdk refactor continued

apps/ensadmin/src/app/mock/display-identity/page.tsx

@@ -6,7 +6,7 @@ import {
   getEnsManagerAddressDetailsUrl,
 } from "@namehash/namehash-ui";
 import type { Address, ChainId, DefaultableChainId, Name } from "enssdk";
-import { asLowerCaseAddress, DEFAULT_EVM_CHAIN_ID } from "enssdk";
+import { DEFAULT_EVM_CHAIN_ID, toNormalizedAddress } from "enssdk";
 import { useState } from "react";
 import { isAddress } from "viem";
 
@@ -76,7 +76,7 @@ export default function MockDisplayIdentityPage() {
   }
 
   // at a data-model level, we always represent addresses fully in lowercase.
-  selectedAddress = asLowerCaseAddress(selectedAddress);
+  selectedAddress = toNormalizedAddress(selectedAddress);
 
   // fallback to selecting the default name if
   // selectedRawName is an empty string

apps/ensadmin/src/app/mock/registrar-actions/mocks.ts

@@ -1,6 +1,7 @@
+import type { Duration } from "enssdk";
 import { asInterpretedName } from "enssdk";
 
-import { type Duration, type NamedRegistrarAction } from "@ensnode/ensnode-sdk";
+import { type NamedRegistrarAction } from "@ensnode/ensnode-sdk";
 
 export const registrationWithReferral = {
   action: {

apps/ensadmin/src/components/indexing-status/backfill-status.tsx

@@ -4,6 +4,7 @@
  */
 
 import { AbsoluteTime } from "@namehash/namehash-ui";
+import type { UnixTimestamp } from "enssdk";
 import { Clock } from "lucide-react";
 
 import {
@@ -12,7 +13,6 @@ import {
   getTimestampForLowestOmnichainStartBlock,
   type RealtimeIndexingStatusProjection,
   sortChainStatusesByStartBlockAsc,
-  type UnixTimestamp,
 } from "@ensnode/ensnode-sdk";
 
 import {

apps/ensadmin/src/components/indexing-status/projection-info.tsx

@@ -1,11 +1,9 @@
 "use client";
 
 import { formatRelativeTime, RelativeTime, useNow } from "@namehash/namehash-ui";
-import type { UnixTimestamp } from "enssdk";
+import type { Duration, UnixTimestamp } from "enssdk";
 import { InfoIcon } from "lucide-react";
 
-import type { Duration } from "@ensnode/ensnode-sdk";
-
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 
 /**

apps/ensadmin/src/components/indexing-status/use-indexing-status-with-swr.ts

@@ -2,6 +2,7 @@
 
 import { useNow } from "@namehash/namehash-ui";
 import { secondsToMilliseconds } from "date-fns";
+import type { Duration } from "enssdk";
 import { useCallback, useMemo } from "react";
 
 import {
@@ -15,7 +16,6 @@ import {
 import {
   CrossChainIndexingStatusSnapshotOmnichain,
   createRealtimeIndexingStatusProjection,
-  Duration,
   type IndexingStatusRequest,
   IndexingStatusResponseCodes,
   IndexingStatusResponseOk,

apps/ensapi/src/handlers/api/explore/name-tokens-api.ts

@@ -2,8 +2,8 @@ import config from "@/config";
 
 import {
   asInterpretedName,
-  ENS_ROOT,
-  getParentNameFQDN,
+  ENS_ROOT_NAME,
+  getParentInterpretedName,
   type Node,
   namehashInterpretedName,
 } from "enssdk";
@@ -72,7 +72,7 @@ app.openapi(getNameTokensRoute, async (c) => {
     const name = asInterpretedName(request.name);
 
     // return 404 when the requested name was the ENS Root
-    if (name === ENS_ROOT) {
+    if (name === ENS_ROOT_NAME) {
       return c.json(
         serializeNameTokensResponse(
           makeNameTokensNotIndexedResponse(
@@ -83,7 +83,9 @@ app.openapi(getNameTokensRoute, async (c) => {
       );
     }
 
-    const parentNode = namehashInterpretedName(getParentNameFQDN(name));
+    // biome-ignore lint/style/noNonNullAssertion: getParentInterpretedName only throws if name === ENS_ROOT_NAME but we handle that case above
+    const parentName = getParentInterpretedName(name)!;
+    const parentNode = namehashInterpretedName(parentName);
     const subregistry = indexedSubregistries.find((s) => s.node === parentNode);
 
     // Return 404 response with error code for Name Tokens Not Indexed when

apps/ensapi/src/handlers/api/explore/registrar-actions-api.routes.ts

@@ -6,8 +6,8 @@ import {
   RegistrarActionsOrders,
 } from "@ensnode/ensnode-sdk";
 import {
-  makeLowercaseAddressSchema,
   makeNodeSchema,
+  makeNormalizedAddressSchema,
   makePositiveIntegerSchema,
   makeUnixTimestampSchema,
 } from "@ensnode/ensnode-sdk/internal";
@@ -51,7 +51,7 @@ export const registrarActionsQuerySchema = z
       .describe("Filter to only include actions with referrals")
       .openapi({ default: false }),
 
-    decodedReferrer: makeLowercaseAddressSchema("decodedReferrer")
+    decodedReferrer: makeNormalizedAddressSchema("decodedReferrer")
       .optional()
       .describe("Filter by decoded referrer address"),
 

apps/ensapi/src/handlers/api/meta/realtime-api.routes.ts

@@ -1,7 +1,7 @@
 import { createRoute, z } from "@hono/zod-openapi";
 import { minutesToSeconds } from "date-fns";
+import type { Duration } from "enssdk";
 
-import type { Duration } from "@ensnode/ensnode-sdk";
 import { makeDurationSchema } from "@ensnode/ensnode-sdk/internal";
 
 import { params } from "@/lib/handlers/params.schema";

apps/ensapi/src/handlers/api/meta/realtime-api.test.ts

@@ -1,9 +1,9 @@
+import type { UnixTimestamp } from "enssdk";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import {
   type CrossChainIndexingStatusSnapshot,
   createRealtimeIndexingStatusProjection,
-  type UnixTimestamp,
 } from "@ensnode/ensnode-sdk";
 
 import { createApp } from "@/lib/hono-factory";

apps/ensapi/src/handlers/api/resolution/resolution-api.ts

@@ -1,5 +1,6 @@
+import type { Duration } from "enssdk";
+
 import type {
-  Duration,
   ResolvePrimaryNameResponse,
   ResolvePrimaryNamesResponse,
   ResolveRecordsResponse,

apps/ensapi/src/handlers/ensanalytics/ensanalytics-api-v1.routes.ts

@@ -8,7 +8,7 @@ import {
   makeReferrerMetricsEditionsArraySchema,
 } from "@namehash/ens-referrals/v1/internal";
 
-import { makeLowercaseAddressSchema } from "@ensnode/ensnode-sdk/internal";
+import { makeNormalizedAddressSchema } from "@ensnode/ensnode-sdk/internal";
 
 export const basePath = "/v1/ensanalytics";
 
@@ -39,7 +39,7 @@ const referrerLeaderboardPageQuerySchema = z.object({
 
 // Referrer address parameter schema
 const referrerAddressSchema = z.object({
-  referrer: makeLowercaseAddressSchema("Referrer address").describe("Referrer Ethereum address"),
+  referrer: makeNormalizedAddressSchema("Referrer address").describe("Referrer Ethereum address"),
 });
 
 // Editions query parameter schema

apps/ensapi/src/handlers/ensanalytics/ensanalytics-api.routes.ts

@@ -1,7 +1,7 @@
 import { createRoute, z } from "@hono/zod-openapi";
 import { REFERRERS_PER_LEADERBOARD_PAGE_MAX } from "@namehash/ens-referrals";
 
-import { makeLowercaseAddressSchema } from "@ensnode/ensnode-sdk/internal";
+import { makeNormalizedAddressSchema } from "@ensnode/ensnode-sdk/internal";
 
 export const basePath = "/ensanalytics";
 
@@ -28,7 +28,7 @@ const paginationQuerySchema = z.object({
 
 // Referrer address parameter schema
 const referrerAddressSchema = z.object({
-  referrer: makeLowercaseAddressSchema("Referrer address").describe("Referrer Ethereum address"),
+  referrer: makeNormalizedAddressSchema("Referrer address").describe("Referrer Ethereum address"),
 });
 
 export const getReferrerLeaderboardRoute = createRoute({

apps/ensapi/src/handlers/subgraph/subgraph-api.ts

@@ -1,13 +1,14 @@
 import config from "@/config";
 
+import type { Duration } from "enssdk";
 import { createDocumentationMiddleware } from "ponder-enrich-gql-docs-middleware";
 
 // FIXME: use the import from:
 // import { ensIndexerSchema } from "@/lib/ensdb/singleton";
 // Once the lazy proxy implemented for `ensIndexerSchema` export is improved
 // to support Drizzle ORM in `ponder-subgraph` package.
 import * as ensIndexerSchema from "@ensnode/ensdb-sdk/ensindexer-abstract";
-import { type Duration, hasSubgraphApiConfigSupport } from "@ensnode/ensnode-sdk";
+import { hasSubgraphApiConfigSupport } from "@ensnode/ensnode-sdk";
 import { subgraphGraphQLMiddleware } from "@ensnode/ponder-subgraph";
 
 import { createApp } from "@/lib/hono-factory";

apps/ensapi/src/lib/ensanalytics/referrer-leaderboard/closeout.ts

@@ -1,8 +1,8 @@
 import type { ReferralProgramRules } from "@namehash/ens-referrals/v1";
 import { minutesToSeconds } from "date-fns";
-import type { UnixTimestamp } from "enssdk";
+import type { Duration, UnixTimestamp } from "enssdk";
 
-import { addDuration, type Duration } from "@ensnode/ensnode-sdk";
+import { addDuration } from "@ensnode/ensnode-sdk";
 
 /**
  * Duration after which we assume a closed edition is safe from chain reorganizations.

apps/ensapi/src/lib/handlers/params.schema.ts

@@ -5,7 +5,7 @@ import { isSelectionEmpty, type ResolverRecordsSelection } from "@ensnode/ensnod
 import {
   makeCoinTypeStringSchema,
   makeDefaultableChainIdStringSchema,
-  makeLowercaseAddressSchema,
+  makeNormalizedAddressSchema,
 } from "@ensnode/ensnode-sdk/internal";
 
 const excludingDefaultChainId = z
@@ -36,7 +36,7 @@ const name = z
 
 const trace = z.optional(boolstring).default(false).openapi({ default: false });
 const accelerate = z.optional(boolstring).default(false).openapi({ default: false });
-const address = makeLowercaseAddressSchema();
+const address = makeNormalizedAddressSchema();
 const defaultableChainId = makeDefaultableChainIdStringSchema();
 const coinType = makeCoinTypeStringSchema();
 

apps/ensapi/src/lib/name-tokens/find-name-tokens-for-domain.ts

@@ -1,7 +1,7 @@
 import config from "@/config";
 
 import { eq } from "drizzle-orm/sql";
-import { type AccountId, asInterpretedName, type Node } from "enssdk";
+import { type AccountId, asInterpretedName, type Node, type UnixTimestamp } from "enssdk";
 
 import {
   bigIntToNumber,
@@ -11,7 +11,6 @@ import {
   type NFTMintStatus,
   parseAssetId,
   type RegisteredNameTokens,
-  type UnixTimestamp,
 } from "@ensnode/ensnode-sdk";
 
 import { ensDb, ensIndexerSchema } from "@/lib/ensdb/singleton";

apps/ensapi/src/lib/protocol-acceleration/find-resolver.ts

@@ -8,9 +8,7 @@ import {
   asInterpretedName,
   type DomainId,
   getNameHierarchy,
-  type Name,
-  type Node,
-  type NormalizedName,
+  type InterpretedName,
   namehashInterpretedName,
 } from "enssdk";
 import { isAddressEqual, type PublicClient, toHex, zeroAddress } from "viem";
@@ -29,7 +27,7 @@ type FindResolverResult =
       activeResolver: null;
       requiresWildcardSupport: undefined;
     }
-  | { activeName: Name; requiresWildcardSupport: boolean; activeResolver: Address };
+  | { activeName: InterpretedName; requiresWildcardSupport: boolean; activeResolver: Address };
 
 const NULL_RESULT: FindResolverResult = {
   activeName: null,
@@ -62,7 +60,7 @@ export async function findResolver({
   publicClient,
 }: {
   registry: AccountId;
-  name: NormalizedName;
+  name: InterpretedName;
   accelerate: boolean;
   canAccelerate: boolean;
   publicClient: PublicClient;
@@ -94,7 +92,7 @@ export async function findResolver({
  */
 async function findResolverWithUniversalResolver(
   publicClient: PublicClient,
-  name: Name,
+  name: InterpretedName,
 ): Promise<FindResolverResult> {
   return withActiveSpanAsync(
     tracer,
@@ -147,7 +145,8 @@ async function findResolverWithUniversalResolver(
       }
 
       // UniversalResolver returns the offset in bytes within the DNS Encoded Name where the activeName begins
-      const activeName: Name = bytesToPacket(dnsEncodedNameBytes.slice(offset));
+      // Invariant: the decoded name must be an InterpretedName
+      const activeName = asInterpretedName(bytesToPacket(dnsEncodedNameBytes.slice(offset)));
 
       return {
         activeName,
@@ -175,7 +174,7 @@ async function findResolverWithUniversalResolver(
  */
 async function findResolverWithIndex(
   registry: AccountId,
-  name: NormalizedName,
+  name: InterpretedName,
 ): Promise<FindResolverResult> {
   return withActiveSpanAsync(
     tracer,
@@ -194,7 +193,7 @@ async function findResolverWithIndex(
 
       // 2. compute domainId of each node
       // NOTE: this is currently ENSv1-specific
-      const nodes = names.map((name) => namehashInterpretedName(asInterpretedName(name)) as Node);
+      const nodes = names.map((name) => namehashInterpretedName(name));
       const domainIds = nodes as DomainId[];
 
       // 3. for each domain, find its associated resolver in the selected registry

apps/ensapi/src/lib/resolution/forward-resolution.ts

@@ -5,10 +5,9 @@ import { replaceBigInts } from "@ponder/utils";
 import {
   type AccountId,
   asInterpretedName,
-  isNormalizedName,
+  type InterpretedName,
   type Node,
   namehashInterpretedName,
-  normalizeName,
   parseReverseName,
 } from "enssdk";
 
@@ -57,10 +56,6 @@ import {
 const logger = makeLogger("forward-resolution");
 const tracer = trace.getTracer("forward-resolution");
 
-// NOTE: normalize generic name to force the normalization lib to lazy-load itself (otherwise the
-// first trace generated here would be unusually slow)
-normalizeName("example.eth");
-
 /**
  * Implements Forward Resolution of record values for a specified ENS Name.
  *
@@ -95,9 +90,12 @@ export async function resolveForward<SELECTION extends ResolverRecordsSelection>
   selection: ForwardResolutionArgs<SELECTION>["selection"],
   options: Omit<Parameters<typeof _resolveForward>[2], "registry">,
 ): Promise<ForwardResolutionResult<SELECTION>> {
+  // Invariant: Name must be an InterpretedName
+  const interpretedName = asInterpretedName(name);
+
   // NOTE: `resolveForward` is just `_resolveForward` with the enforcement that `registry` must
-  // initially be ENS Root Chain's Registry: see `_resolveForward` for additional context.
-  return _resolveForward(name, selection, {
+  // initially be ENS Root Registry: see `_resolveForward` for additional context.
+  return _resolveForward(interpretedName, selection, {
     ...options,
     registry: getENSv1Registry(config.namespace),
   });
@@ -108,7 +106,7 @@ export async function resolveForward<SELECTION extends ResolverRecordsSelection>
  * `registry`.
  */
 async function _resolveForward<SELECTION extends ResolverRecordsSelection>(
-  name: ForwardResolutionArgs<SELECTION>["name"],
+  name: InterpretedName,
   selection: ForwardResolutionArgs<SELECTION>["selection"],
   options: { registry: AccountId; accelerate: boolean; canAccelerate: boolean },
 ): Promise<ForwardResolutionResult<SELECTION>> {
@@ -141,18 +139,11 @@ async function _resolveForward<SELECTION extends ResolverRecordsSelection>(
           // Validate Input
           //////////////////////////////////////////////////
 
-          // Invariant: Name must be normalized
-          if (!isNormalizedName(name)) {
-            throw new Error(`Invariant: Name "${name}" must be normalized.`);
-          }
-
-          const node: Node = namehashInterpretedName(asInterpretedName(name));
+          const node: Node = namehashInterpretedName(name);
           span.setAttribute("node", node);
 
           // if selection is empty, give them what they asked for
-          if (isSelectionEmpty(selection)) {
-            return makeEmptyResolverRecordsResponse(selection);
-          }
+          if (isSelectionEmpty(selection)) return makeEmptyResolverRecordsResponse(selection);
 
           // construct the set of resolve() calls indicated by selection
           const calls = makeResolveCalls(node, selection);
@@ -224,9 +215,7 @@ async function _resolveForward<SELECTION extends ResolverRecordsSelection>(
             !!activeResolver,
           );
           // we're unable to find an active resolver for this name, return empty response
-          if (!activeResolver) {
-            return makeEmptyResolverRecordsResponse(selection);
-          }
+          if (!activeResolver) return makeEmptyResolverRecordsResponse(selection);
 
           // set some attributes on the span for easy reference
           span.setAttribute("activeResolver", activeResolver);