tapimo 0.4.4 → 0.5.1

package/src/Client.test-d.ts

@@ -1189,25 +1189,28 @@ describe('narrows responses by status', () => {
     }
   })
 
-  test('GET /v1/funding/routes', async () => {
+  test('GET /v1/funding/quotes', async () => {
     const client = Client.create()
-    const res = await client.v1.funding.routes.$get({
+    const res = await client.v1.funding.quotes.$get({
       query: {
+        provider: 'across',
         sourceAmount: '1000000',
         sourceChain: 'base',
         sourceToken: 'USDC',
       },
     })
 
-    expectTypeOf(res.status).toEqualTypeOf<200 | 400 | PaidAccessStatus>()
+    expectTypeOf(res.status).toEqualTypeOf<200 | 400 | 502 | PaidAccessStatus>()
 
     switch (res.status) {
       case 200: {
         const json = await res.json()
         expectTypeOf(json.data[0]!.sourceAmount).toEqualTypeOf<
-          z.output<typeof Funding.schema.listFundingRoutes.Response>['data'][number]['sourceAmount']
+          z.output<typeof Funding.schema.quoteFunding.Response>['data'][number]['sourceAmount']
         >()
-        expectTypeOf(json.data[0]!.provider.id).toEqualTypeOf<string>()
+        expectTypeOf(json.data[0]!.provider.id).toEqualTypeOf<'across' | 'relay' | 'rhino'>()
+        expectTypeOf(json.data[0]!.quote.expiresAt).toEqualTypeOf<string | undefined>()
+        expectTypeOf(json.data[0]!.quote.outputAmount).toEqualTypeOf<string>()
         void json
         return
       }
@@ -1218,6 +1221,13 @@ describe('narrows responses by status', () => {
         void json
         return
       }
+      case 502: {
+        const json = await res.json()
+        expectTypeOf(json.error.code).toEqualTypeOf<'upstream_error'>()
+        expectTypeOf(json.error.message).toEqualTypeOf<string>()
+        void json
+        return
+      }
     }
   })
 
@@ -1248,24 +1258,24 @@ describe('narrows responses by status', () => {
     }
   })
 
-  test('GET /v1/providers', async () => {
+  test('GET /v1/funding/providers', async () => {
     const client = Client.create()
-    const res = await client.v1.providers.$get({ query: { capability: 'fundingRoutes' } })
+    const res = await client.v1.funding.providers.$get()
 
-    expectTypeOf(res.status).toEqualTypeOf<200 | 400 | PaidAccessStatus>()
+    expectTypeOf(res.status).toEqualTypeOf<200 | PaidAccessStatus>()
 
     switch (res.status) {
       case 200: {
         const json = await res.json()
-        expectTypeOf(json.data[0]!.capabilities).toEqualTypeOf<
-          z.output<typeof Funding.schema.listProviders.Response>['data'][number]['capabilities']
+        expectTypeOf(json.data[0]!.status).toEqualTypeOf<
+          z.output<typeof Funding.schema.listProviders.Response>['data'][number]['status']
         >()
         void json
         return
       }
       case 400: {
         const json = await res.json()
-        expectTypeOf(json.error.code).toEqualTypeOf<Access400<'query_invalid'>>()
+        expectTypeOf(json.error.code).toEqualTypeOf<'api_key_malformed'>()
         expectTypeOf(json.error.message).toEqualTypeOf<string>()
         void json
         return

package/src/Scope.test.ts

@@ -12,6 +12,7 @@ describe('extend', () => {
       ]),
     ).toEqual([
       ...Scope.catalog,
+      Scope.zoneEntry,
       {
         description: 'Read project accounts.',
         scope: 'accounts:read',

package/src/Scope.ts

@@ -4,6 +4,8 @@
  * API-key validation.
  */
 
+import * as z from 'zod/mini'
+
 /**
  * Wildcard scope. A key whose `scopes` contains this value satisfies every
  * required scope, so it never needs re-provisioning when new scopes are added.
@@ -69,8 +71,32 @@ export const catalog = [
   },
 ] as const satisfies readonly Entry[]
 
+/**
+ * Templated `/v1/scopes` entry for per-zone read scopes. Concrete grants use
+ * `zone:<chainId>:read` and are never self-serve.
+ */
+export const zoneEntry = {
+  description: 'Read RPC and indexed data for one zone chain id.',
+  scope: 'zone:<chainId>:read',
+  selfServe: false,
+} as const satisfies Entry
+
+/** Zod schemas owned by the scope vocabulary. */
+export namespace schema {
+  /** A concrete per-zone read scope (`zone:421700001:read`). */
+  export const Zone = z
+    .templateLiteral(['zone:', z.int(), ':read'])
+    .check(
+      z.regex(/^zone:[1-9]\d*:read$/),
+      z.describe('Per-zone read scope (`zone:<chainId>:read`).'),
+    )
+}
+
+/** Per-zone read scope, granting access to one zone chain id. */
+export type Zone = z.output<typeof schema.Zone>
+
 /** Issuable API-key scope identifier, including host-defined scopes. */
-export type Id = (typeof catalog)[number]['scope'] | (string & {})
+export type Id = (typeof catalog)[number]['scope'] | Zone | (string & {})
 
 /** Scope catalog used by API-key issuance and discovery. */
 export type Catalog = readonly Entry[]
@@ -92,7 +118,7 @@ export const selfServe: readonly Id[] = catalog
  */
 export function extend(entries: readonly Entry[] = []): Catalog {
   const identifiers = new Set<string>()
-  const result = [...catalog, ...entries]
+  const result = [...catalog, zoneEntry, ...entries]
   for (const entry of result) {
     if (!entry.scope.trim()) throw new Error('Scope identifier must not be empty.')
     if (identifiers.has(entry.scope)) throw new Error(`Duplicate scope \`${entry.scope}\`.`)
@@ -103,10 +129,12 @@ export function extend(entries: readonly Entry[] = []): Catalog {
 
 /** Returns whether a catalog contains a scope identifier. */
 export function includes(catalog: Catalog, scope: string): scope is Id {
-  return catalog.some((entry) => entry.scope === scope)
+  return schema.Zone.safeParse(scope).success || catalog.some((entry) => entry.scope === scope)
 }
 
 /** Returns the self-issuable identifiers in a scope catalog. */
 export function selfServeFrom(catalog: Catalog): readonly Id[] {
-  return catalog.filter((entry) => entry.selfServe).map((entry) => entry.scope)
+  return catalog
+    .filter((entry) => entry.selfServe && !schema.Zone.safeParse(entry.scope).success)
+    .map((entry) => entry.scope)
 }

package/src/Webhooks.ts

@@ -28,7 +28,7 @@ export { eventTypes, schema } from './apps/data/routes/webhooks.js'
  *
  * The monitoring event types (`log:emitted`, `block:created`,
  * `transaction:included`) scan a confirmed window directly over JSON-RPC, so the
- * poller builds memoized viem clients (via {@link Viem.getClient}); the legacy
+ * poller builds memoized viem clients (via {@link Viem.createGetClient}); the legacy
  * `token:transfer` type still reads from TIDX, so it
  * also builds memoized TIDX clients (via {@link Tidx.createGetClient}) when a
  * `tidx` config is supplied. The poller keeps `App.create` a pure Hono app: it
@@ -42,15 +42,10 @@ export function createPoller(options: createPoller.Options): createPoller.Poller
   const getTidx = options.tidx
     ? Tidx.createGetClient({ defaultChainId: options.defaultChainId, tidx: options.tidx })
     : undefined
-  const clients = new Map<number, Viem.getClient.ReturnType>()
-  const getClient = (chainId: Viem.ChainId) => {
-    let client = clients.get(chainId)
-    if (!client) {
-      client = Viem.getClient({ chainId, rpc: options.rpc })
-      clients.set(chainId, client)
-    }
-    return client
-  }
+  const getClient = Viem.createGetClient({
+    defaultChainId: options.defaultChainId,
+    rpc: options.rpc,
+  })
 
   const metrics = options.metrics ? MetricSink.webhooks(options.metrics) : undefined
 

package/src/admin/apps/api-keys.test.ts

@@ -68,6 +68,19 @@ describe('POST /api-keys', () => {
     expect(resolved?.environment).toBe('sandbox')
   })
 
+  test('mints a key with a concrete Zone read scope', async () => {
+    const { client, store } = TestAdmin.setup()
+    const scope = 'zone:421700001:read' as const
+    const response = await client['api-keys'].$post({
+      json: { ...validBody, scopes: [scope] },
+    })
+    const body = await TestApp.json(response, ApiKeys.schema.createApiKey.Response)
+
+    expect(response.status).toBe(200)
+    expect(body.scopes).toEqual([scope])
+    expect((await core_ApiKeys.resolve(store, body.token))?.scopes).toEqual([scope])
+  })
+
   test('records the expiry when provided', async () => {
     const { client, store } = TestAdmin.setup()
     const expiresAt = '2100-01-01T00:00:00.000Z'
@@ -91,6 +104,20 @@ describe('POST /api-keys', () => {
     expect(body.error?.code).toMatchInlineSnapshot(`"body_invalid"`)
   })
 
+  test('rejects non-concrete or non-canonical Zone scopes with 400', async () => {
+    for (const scope of ['zone:<chainId>:read', 'zone:0:read', 'zone:000421700001:read']) {
+      const { client } = TestAdmin.setup()
+      const response = await client['api-keys'].$post({
+        // Cast past the typed client to exercise runtime validation.
+        json: { ...validBody, scopes: [scope] } as never,
+      })
+      const body = (await response.json()) as { error?: { code?: string } }
+
+      expect(response.status).toBe(400)
+      expect(body.error?.code).toBe('body_invalid')
+    }
+  })
+
   test('ignores a client-supplied createdBy (audit trail is server-set)', async () => {
     const { client } = TestAdmin.setup()
     const response = await client['api-keys'].$post({

package/src/admin/apps/api-keys.ts

@@ -19,7 +19,14 @@ export namespace schema {
     export const Body = Schema.describe(
       z.extend(z.omit(ApiKeys.schema.MintInput, { createdBy: true }), {
         scopes: z
-          .readonly(z.array(z.enum([...Scope.catalog.map((entry) => entry.scope), Scope.wildcard])))
+          .readonly(
+            z.array(
+              z.union([
+                z.enum([...Scope.catalog.map((entry) => entry.scope), Scope.wildcard]),
+                Scope.schema.Zone,
+              ]),
+            ),
+          )
           .check(z.describe("Granted scopes. '*' grants all scopes.")),
       }),
       'Fields accepted when minting an API key.',

package/src/admin/apps/scopes.test.ts

@@ -54,17 +54,22 @@ describe('GET /scopes', () => {
             "scope": "webhooks:write",
             "selfServe": false,
           },
+          {
+            "description": "Read RPC and indexed data for one zone chain id.",
+            "scope": "zone:<chainId>:read",
+            "selfServe": false,
+          },
         ],
       }
     `)
   })
 
-  test('serves the Scope.catalog source of truth verbatim', async () => {
+  test('serves the extended Scope catalog source of truth verbatim', async () => {
     const { client } = TestAdmin.setup()
     const response = await client.scopes.$get()
     const body = await TestApp.json(response, Scopes.schema.getScopes.Response)
 
-    expect(body.data).toEqual(Scope.catalog)
+    expect(body.data).toEqual(Scope.extend())
   })
 
   test('is never cached (admin responses are per-principal)', async () => {

package/src/admin/apps/scopes.ts

@@ -33,7 +33,7 @@ export namespace schema {
   }
 }
 
-/** Catalog of issuable API-key scopes, served from {@link Scope.catalog}. */
+/** Catalog of API-key scopes, including dynamic scope templates. */
 export function scopes() {
   return new Hono<App.Environment>().get(
     '/',
@@ -45,6 +45,6 @@ export function scopes() {
       summary: 'List scopes',
       tags: ['Scopes'],
     }),
-    (c) => c.json({ data: Scope.catalog }),
+    (c) => c.json({ data: Scope.extend() }),
   )
 }

package/src/admin/ui/src/components/Dialog.tsx

@@ -1,12 +1,18 @@
 import { Dialog as Base } from '@base-ui/react/dialog'
 import type { ComponentProps, ReactNode } from 'react'
+import { cx } from 'regen-ui'
 
 /** Backdrop + centered popup shell. Children render inside; pair with Title/Description. */
-function Popup(props: { children: ReactNode }) {
+function Popup(props: { children: ReactNode; className?: string | undefined }) {
   return (
     <Base.Portal>
       <Base.Backdrop className="fixed inset-0 z-40 bg-black/60 transition-opacity duration-150 data-[ending-style]:opacity-0 data-[starting-style]:opacity-0" />
-      <Base.Popup className="fixed left-1/2 top-1/2 z-50 w-[calc(100vw-2rem)] max-w-md -translate-x-1/2 -translate-y-1/2 border border-border bg-surface p-6 shadow-lg outline-none transition-opacity duration-150 data-[ending-style]:opacity-0 data-[starting-style]:opacity-0">
+      <Base.Popup
+        className={cx(
+          'fixed left-1/2 top-1/2 z-50 w-[calc(100vw-2rem)] max-w-md -translate-x-1/2 -translate-y-1/2 border border-border bg-surface p-6 shadow-lg outline-none transition-opacity duration-150 data-[ending-style]:opacity-0 data-[starting-style]:opacity-0',
+          props.className,
+        )}
+      >
         {props.children}
       </Base.Popup>
     </Base.Portal>

package/src/admin/ui/src/lib/scopes.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect, it } from 'vite-plus/test'
+
+import { fromZoneChainId } from './scopes'
+
+describe('fromZoneChainId', () => {
+  it('builds a canonical Zone read scope', () => {
+    expect(fromZoneChainId(' 000421700001 ')).toBe('zone:421700001:read')
+  })
+
+  it('rejects non-positive and malformed chain ids', () => {
+    expect(['', '0', '-1', '1.5', 'mainnet'].map(fromZoneChainId)).toEqual([
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+    ])
+  })
+})

package/src/admin/ui/src/lib/scopes.ts

@@ -6,6 +6,18 @@ import { client } from './client'
 /** A single issuable API-key scope from the catalog endpoint. */
 export type Scope = InferResponseType<(typeof client)['scopes']['$get'], 200>['data'][number]
 
+/** Dynamic Zone scope template returned by the scope catalog. */
+export const zoneTemplate = 'zone:<chainId>:read'
+
+/** Builds a canonical Zone read scope from a positive integer chain id. */
+export function fromZoneChainId(value: string): `zone:${string}:read` | undefined {
+  const chainId = value.trim()
+  if (!/^\d+$/.test(chainId)) return undefined
+  const normalized = BigInt(chainId)
+  if (normalized === 0n) return undefined
+  return `zone:${normalized}:read`
+}
+
 /** List the issuable API-key scope catalog. */
 export namespace get {
   export const key = ['scopes'] as const

package/src/admin/ui/src/routes/api-keys.tsx

@@ -36,7 +36,18 @@ function RouteComponent() {
     const rateLimit = field('rateLimit')
     const perMinute = rateLimit ? Number(rateLimit) : undefined
     const environment = field('environment') === 'sandbox' ? 'sandbox' : 'production'
-    const scopes = form.getAll('scopes').filter((v): v is string => typeof v === 'string')
+    const zoneChainId = field('zoneChainId')
+    const pendingZoneScope = zoneChainId ? Scopes.fromZoneChainId(zoneChainId) : undefined
+    if (zoneChainId && !pendingZoneScope) {
+      alert('Enter a positive integer Zone chain ID.')
+      return
+    }
+    const scopes = [
+      ...new Set([
+        ...form.getAll('scopes').filter((v): v is string => typeof v === 'string'),
+        ...(pendingZoneScope ? [pendingZoneScope] : []),
+      ]),
+    ]
     if (scopes.length === 0) {
       alert('Select at least one scope.')
       return
@@ -98,7 +109,7 @@ function RouteComponent() {
           )}
           loading={keys.isPending}
         />
-        <Dialog.Popup>
+        <Dialog.Popup className="flex max-h-[calc(100dvh-2rem)] flex-col overflow-hidden">
           <ProvisionForm
             onSubmit={onSubmit}
             orgId={filters.orgId}
@@ -169,7 +180,7 @@ function ProvisionForm(props: {
           : 'Create a key that authenticates requests to the API.'}
       </Dialog.Description>
       <form
-        className="mt-6 flex flex-col gap-8"
+        className="mt-6 flex min-h-0 flex-1 flex-col gap-8"
         onSubmit={(event) => {
           event.preventDefault()
           props.onSubmit(new FormData(event.currentTarget))
@@ -190,7 +201,10 @@ function ProvisionForm(props: {
             ) : null}
           </div>
         ) : null}
-        <Fields className="gap-6" variant="default">
+        <Fields
+          className="min-h-0 flex-1 gap-6 [grid-template-rows:auto_auto_auto_minmax(0,1fr)]"
+          variant="default"
+        >
           <Input label="Name" name="name" placeholder="e.g. production-api" />
           <div className="flex flex-col gap-2">
             <span className="label-13 text-foreground-secondary">Environment</span>
@@ -212,35 +226,41 @@ function ProvisionForm(props: {
             suffix="req/min"
             type="number"
           />
-          <div className="flex flex-col gap-2">
+          <div className="flex min-h-0 flex-col gap-2 overflow-hidden">
             <span className="label-13 text-foreground-secondary">Scopes</span>
             {scopes.isPending ? (
               <span className="text-label-13 text-foreground-secondary">Loading scopes…</span>
             ) : scopes.error ? (
               <span className="text-label-13 text-negative">{scopes.error.message}</span>
             ) : (
-              <Rows className="border border-border" variant="surface">
-                {(scopes.data?.data ?? []).map((entry) => (
-                  <Rows.Row
-                    key={entry.scope}
-                    className="min-h-[56px] py-3"
-                    render={<label className="cursor-pointer" />}
-                    style={{ height: 'auto' }}
-                  >
-                    <Checkbox
-                      defaultChecked={entry.scope === 'data:read'}
-                      name="scopes"
-                      value={entry.scope}
-                    />
-                    <span className="flex min-w-0 flex-col gap-0.5">
-                      <span className="text-label-13 text-foreground">{entry.scope}</span>
-                      <span className="text-label-12 text-foreground-secondary">
-                        {entry.description}
-                      </span>
-                    </span>
-                  </Rows.Row>
-                ))}
-              </Rows>
+              <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain border border-border">
+                <Rows variant="surface">
+                  {(scopes.data?.data ?? []).map((entry) =>
+                    entry.scope === Scopes.zoneTemplate ? (
+                      <ZoneScopeRow description={entry.description} key={entry.scope} />
+                    ) : (
+                      <Rows.Row
+                        key={entry.scope}
+                        className="min-h-[56px] py-3"
+                        render={<label className="cursor-pointer" />}
+                        style={{ height: 'auto' }}
+                      >
+                        <Checkbox
+                          defaultChecked={entry.scope === 'data:read'}
+                          name="scopes"
+                          value={entry.scope}
+                        />
+                        <span className="flex min-w-0 flex-col gap-0.5">
+                          <span className="text-label-13 text-foreground">{entry.scope}</span>
+                          <span className="text-label-12 text-foreground-secondary">
+                            {entry.description}
+                          </span>
+                        </span>
+                      </Rows.Row>
+                    ),
+                  )}
+                </Rows>
+              </div>
             )}
           </div>
         </Fields>
@@ -255,6 +275,87 @@ function ProvisionForm(props: {
   )
 }
 
+function ZoneScopeRow(props: { description: string }) {
+  const [chainId, setChainId] = useState('')
+  const [selected, setSelected] = useState<readonly string[]>([])
+  const scope = Scopes.fromZoneChainId(chainId)
+  const duplicate = scope ? selected.includes(scope) : false
+  const error =
+    chainId && !scope
+      ? 'Enter a positive integer chain ID.'
+      : duplicate
+        ? 'Zone already added.'
+        : false
+
+  function add() {
+    if (!scope || duplicate) return
+    setSelected((current) => [...current, scope])
+    setChainId('')
+  }
+
+  return (
+    <Rows.Row className="min-h-[56px] flex-col items-stretch py-3" style={{ height: 'auto' }}>
+      <span className="flex min-w-0 flex-col gap-0.5">
+        <span className="text-label-13 text-foreground">{Scopes.zoneTemplate}</span>
+        <span className="text-label-12 text-foreground-secondary">{props.description}</span>
+      </span>
+      <div className="flex items-start gap-2 max-sm:flex-col">
+        <div className="min-w-0 flex-1 max-sm:w-full">
+          <Input
+            aria-label="Zone chain ID"
+            autoComplete="off"
+            error={error}
+            inputMode="numeric"
+            name="zoneChainId"
+            onChange={(event) => setChainId(event.target.value)}
+            onKeyDown={(event) => {
+              if (event.key !== 'Enter') return
+              event.preventDefault()
+              add()
+            }}
+            pattern="[0-9]*"
+            placeholder="421700001"
+            prefix="zone:"
+            suffix=":read"
+            value={chainId}
+          />
+        </div>
+        <Button
+          className="max-sm:w-full"
+          disabled={!scope || duplicate}
+          onClick={add}
+          type="button"
+        >
+          Add zone
+        </Button>
+      </div>
+      {selected.length > 0 ? (
+        <ul className="flex flex-col gap-2">
+          {selected.map((scope) => (
+            <li
+              className="flex min-w-0 items-center gap-2 border border-border bg-secondary py-1 pr-1 pl-2"
+              key={scope}
+            >
+              <input name="scopes" type="hidden" value={scope} />
+              <code className="min-w-0 flex-1 truncate text-label-12 text-foreground">{scope}</code>
+              <Button.Icon
+                onClick={() =>
+                  setSelected((current) => current.filter((candidate) => candidate !== scope))
+                }
+                size="md"
+                title={`Remove ${scope}`}
+                variant="plain"
+              >
+                <X className="size-4" />
+              </Button.Icon>
+            </li>
+          ))}
+        </ul>
+      ) : null}
+    </Rows.Row>
+  )
+}
+
 function KeyList(props: {
   environment: 'production' | 'sandbox'
   error: Error | null