tapimo 0.7.1 → 0.7.2

package/src/apps/data/routes/indexer.test.ts

@@ -76,11 +76,14 @@ describe('GET /indexer/query', () => {
     try {
       const client = TestApp.client({
         auth: { keys: [zoneReader] },
-        tidx: ({ chainId }) =>
-          chainId === zone
-            ? { baseUrl: 'https://zone.tidx.test', basicAuth: 'zone-secret' }
-            : { baseUrl: 'https://public.tidx.test', basicAuth: 'public-secret' },
-        zones: [{ chainId: zone, forwardRpcUrl: runtime.zone.forwardRpcUrl }],
+        tidx: { auth: JSON.stringify({ [zone]: 'zone:secret' }) },
+        zones: [
+          TestApp.zone({
+            chainId: zone,
+            rpcUrl: runtime.zone.publicZoneUrl,
+            tidxUrl: 'https://zone.tidx.test',
+          }),
+        ],
       })
       const response = await client.v1.indexer.query.$get(
         { query: { chainId: String(zone), sql: 'select 1' } },
@@ -95,7 +98,7 @@ describe('GET /indexer/query', () => {
 
       expect(response.status).toBe(200)
       expect(new URL(upstream.url).origin).toBe('https://zone.tidx.test')
-      expect(upstream.headers.get('authorization')).toBe('Basic em9uZS1zZWNyZXQ=')
+      expect(upstream.headers.get('authorization')).toBe('Basic em9uZTpzZWNyZXQ=')
       expect(upstream.headers.get(ZoneRpcAuthentication.headerName)).toBeNull()
     } finally {
       fetch.mockRestore()
@@ -118,8 +121,8 @@ describe('GET /indexer/query', () => {
     try {
       const client = TestApp.client({
         auth: { keys: [zoneReader] },
-        tidx: { baseUrl: 'https://zone.tidx.test', bearerAuth: 'zone-secret' },
-        zones: [{ chainId: zone, forwardRpcUrl: runtime.zone.forwardRpcUrl }],
+        tidx: { auth: 'zone-secret', baseUrl: 'https://zone.tidx.test' },
+        zones: [TestApp.zone({ chainId: zone, rpcUrl: runtime.zone.publicZoneUrl })],
       })
       const response = await client.v1.indexer.query.$get(
         { query: { chainId: String(zone), sql: 'select 1' } },
@@ -221,16 +224,18 @@ describe('GET /indexer/query', () => {
     expect(body.ok).toMatchInlineSnapshot(`true`)
   })
 
-  test('challenges anonymous callers for MPP payment', async () => {
+  test('challenges anonymous callers for MPP payment', { retry: 1 }, async () => {
     const app = TestApp.create({
-      mpp: {
-        secretKey: 'secret_test_key_0123456789abcdef',
-        session: {
-          chainId: Tempo.chain.id,
-          currency: Tempo.currency,
-          decimals: 6,
-          getClient: () => Tempo.client,
-          recipient: Tempo.accounts[2].address,
+      auth: {
+        mpp: {
+          secretKey: 'secret_test_key_0123456789abcdef',
+          session: {
+            chainId: Tempo.chain.id,
+            currency: Tempo.currency,
+            decimals: 6,
+            getClient: () => Tempo.client,
+            recipient: Tempo.accounts[2].address,
+          },
         },
       },
     })
@@ -259,14 +264,16 @@ describe('GET /indexer/query', () => {
 
   test('rejects an unsupported chain before issuing an MPP challenge', async () => {
     const app = TestApp.create({
-      mpp: {
-        secretKey: 'secret_test_key_0123456789abcdef',
-        session: {
-          chainId: Tempo.chain.id,
-          currency: Tempo.currency,
-          decimals: 6,
-          getClient: () => Tempo.client,
-          recipient: Tempo.accounts[2].address,
+      auth: {
+        mpp: {
+          secretKey: 'secret_test_key_0123456789abcdef',
+          session: {
+            chainId: Tempo.chain.id,
+            currency: Tempo.currency,
+            decimals: 6,
+            getClient: () => Tempo.client,
+            recipient: Tempo.accounts[2].address,
+          },
         },
       },
     })
@@ -282,15 +289,17 @@ describe('GET /indexer/query', () => {
 
   test('accepts session management POSTs', { timeout: 120_000 }, async () => {
     const app = TestApp.create({
-      mpp: {
-        secretKey: 'secret_test_key_0123456789abcdef',
-        session: {
-          account: Tempo.accounts[2],
-          chainId: Viem.chainId.mainnet,
-          currency: Tempo.currency,
-          decimals: 6,
-          getClient: () => Tempo.client,
-          suggestedDeposit: '0.01',
+      auth: {
+        mpp: {
+          secretKey: 'secret_test_key_0123456789abcdef',
+          session: {
+            account: Tempo.accounts[2],
+            chainId: Viem.chainId.mainnet,
+            currency: Tempo.currency,
+            decimals: 6,
+            getClient: () => Tempo.client,
+            suggestedDeposit: '0.01',
+          },
         },
       },
     })

package/src/apps/data/routes/indexer.ts

@@ -10,6 +10,7 @@ import * as Path from '../../../internal/Path.js'
 import * as Response from '../../../internal/Response.js'
 import * as Schema from '../../../internal/Schema.js'
 import * as Tidx from '../../../internal/Tidx.js'
+import * as Timing from '../../../internal/Timing.js'
 
 // Request headers that must not be forwarded upstream: hop-by-hop headers, the
 // inbound host, and any caller auth so the consumer's Tempo API credentials never
@@ -261,6 +262,7 @@ async function passthrough(
   const { baseUrl, basicAuth, bearerAuth } = Tidx.resolve(tidx, {
     chainId,
     principal: Auth.getPrincipal(c),
+    zone: c.get('zones').get(chainId),
   })
   // The chain id is syntactically valid but this deployment has no indexer
   // upstream configured for it (no `tidx` config and no built-in default).
@@ -311,10 +313,24 @@ async function passthrough(
   // request forever: the upstream's own per-query ceiling is 30 s, so 35 s
   // only fires when the connection itself stalls. The SSE `live` stream is
   // long-lived by design and gets no timeout.
-  if (!isLive(c)) init.signal = AbortSignal.timeout(35_000)
+  const live = isLive(c)
+  if (!live) init.signal = AbortSignal.timeout(35_000)
 
   try {
-    const response = await fetch(new Request(upstream, init))
+    const { failure, response } = await Timing.time(c, 'tidx', async () => {
+      const response = await fetch(new Request(upstream, init))
+      // Syntax/validation failures belong to the caller, not the dependency's
+      // operational error ratio.
+      const failure = Tidx.isQueryRejection(response)
+        ? undefined
+        : live
+          ? response.ok
+            ? undefined
+            : Tidx.providerFailure(response)
+          : await Tidx.responseFailure(response)
+      return { failure, response }
+    })
+    c.set('providerFailure', failure ? { ...failure, chainId } : undefined)
 
     // Stream the upstream response back verbatim so both JSON queries and
     // SSE `live` streams pass through untouched.
@@ -323,6 +339,7 @@ async function passthrough(
   } catch (cause) {
     // Timeouts and network failures become the standard 502 envelope instead
     // of an unhandled 500.
+    c.set('providerFailure', { ...Tidx.providerFailure(cause), chainId })
     return Response.upstream(c, cause) as never
   }
 }

package/src/apps/data/routes/receipts.test.ts

@@ -1,3 +1,5 @@
+/** @module-tag localnet */
+
 import { Schema } from 'tapimo'
 import { FxOracle } from 'tapimo/apps'
 import { Hex, Value as core_Value } from 'ox'
@@ -205,7 +207,7 @@ describe('GET /transactions/receipts', () => {
 
     // Denominations are case-insensitive.
     const response = await client.v1.transactions[':transactionHash'].receipt.$get(
-      { param: { transactionHash: transactionHash! }, query: { denomination: 'aud' } },
+      { param: { transactionHash: transactionHash! }, query: { 'valuation.currency': 'aud' } },
       TestApp.auth,
     )
     const body = await TestApp.json(response, Receipts.schema.getReceipt.Response)
@@ -219,7 +221,7 @@ describe('GET /transactions/receipts', () => {
       amount: core_Value.format((BigInt(body.feeAmount.baseUnits) * 16n) / 10n, 6),
       currency: 'AUD',
     })
-    expect(body.meta.pricing).toMatchInlineSnapshot(`
+    expect(body.meta.valuation).toMatchInlineSnapshot(`
       {
         "asOf": "2026-01-01T00:00:00.000Z",
         "basis": "nominal",
@@ -299,7 +301,7 @@ describe('GET /transactions/receipts', () => {
         amount: receipt.feeAmount.formatted,
         currency: 'USD',
       })
-    expect(body.meta!.pricing).toBeUndefined()
+    expect(body.meta!.valuation).toBeUndefined()
 
     // Without `include=totalCount`, the same page omits `meta` and the count.
     const bare = await client.v1.transactions.receipts.$get(

package/src/apps/data/routes/receipts.ts

@@ -189,7 +189,7 @@ export namespace schema {
   /** Receipt metadata containing valuation provenance and the verbatim JSON-RPC receipt. */
   export const ReceiptMeta = z
     .object({
-      pricing: z
+      valuation: z
         .optional(Valuation.schema.Pricing)
         .check(
           z.describe(
@@ -198,7 +198,7 @@ export namespace schema {
         ),
       rpc: Rpc.Receipt.check(z.describe('The original JSON-RPC receipt payload.')),
     })
-    .check(z.describe('Metadata for this receipt, including pricing and the JSON-RPC payload.'))
+    .check(z.describe('Metadata for this receipt, including valuation and the JSON-RPC payload.'))
 
   /** The fee charged to the fee payer, carrying its value in the requested denomination. */
   export const FeeAmount = z
@@ -207,7 +207,7 @@ export namespace schema {
         .optional(z.nullable(Valuation.schema.Value))
         .check(
           z.describe(
-            'The fee’s nominal value in the requested `denomination`. `null` when rates were unavailable.',
+            'The fee’s nominal value in the requested `valuation.currency`. `null` when rates were unavailable.',
           ),
         ),
     })
@@ -283,7 +283,9 @@ export namespace schema {
           z.describe('Event logs emitted by this transaction, returned in JSON-RPC log format.'),
         ),
       meta: ReceiptMeta.check(
-        z.describe('Receipt metadata containing pricing provenance and the JSON-RPC payload.'),
+        z.describe(
+          'Receipt metadata containing valuation rate provenance and the JSON-RPC payload.',
+        ),
       ),
       recipient: z
         .nullable(Schema.Address)
@@ -360,8 +362,8 @@ export namespace schema {
     export const Query = z
       .strictObject({
         chainId: Schema.ChainIdQuery,
-        denomination: Schema.Denomination,
         include: includeQuery,
+        'valuation.currency': Schema.Denomination,
       })
       .check(z.describe('Query parameters for looking up a receipt.'))
 
@@ -398,7 +400,6 @@ export namespace schema {
         'blockNumber.to': Schema.blockNumberBound('receipts', 'to'),
         chainId: Schema.ChainIdQuery,
         cursor: Schema.Cursor,
-        denomination: Schema.Denomination,
         feePayer: z
           .optional(Schema.Address)
           .check(z.describe('Filter to receipts whose transaction fee was paid by this address.')),
@@ -425,6 +426,7 @@ export namespace schema {
           ),
         'timestamp.from': Schema.timestampBound('receipts', 'from'),
         'timestamp.to': Schema.timestampBound('receipts', 'to'),
+        'valuation.currency': Schema.Denomination,
       })
       .check(...Schema.pageChecks(), z.describe('Query parameters for listing receipts.'))
 
@@ -438,7 +440,7 @@ export namespace schema {
     /** Page-level resources: opt-in counts plus valuation rate provenance. */
     export const Meta = z
       .object({
-        pricing: z
+        valuation: z
           .optional(Valuation.schema.Pricing)
           .check(
             z.describe(
@@ -551,7 +553,7 @@ export function receipts(options: receipts.Options = {}) {
 
           // Value each fee via its own currency tag, in the requested
           // denomination.
-          const denomination = query.denomination ?? 'USD'
+          const denomination = query['valuation.currency'] ?? 'USD'
           const rates = await Valuation.ratesFor(c, {
             currencies: receipts.data.map((receipt) => receipt.feeAmount.currency),
             denomination,
@@ -572,7 +574,7 @@ export function receipts(options: receipts.Options = {}) {
 
           const counts = countPromise ? await countPromise : undefined
           const meta = {
-            ...(rates ? { pricing: Valuation.pricing(rates, oracle) } : {}),
+            ...(rates ? { valuation: Valuation.pricing(rates, oracle) } : {}),
             ...counts,
           }
           return c.json(
@@ -678,7 +680,7 @@ export function receipts(options: receipts.Options = {}) {
 
           // Value the fee via its own currency tag, in the requested
           // denomination.
-          const denomination = query.denomination ?? 'USD'
+          const denomination = query['valuation.currency'] ?? 'USD'
           const rates = await Valuation.ratesFor(c, {
             currencies: [enriched.feeAmount.currency],
             denomination,
@@ -697,7 +699,7 @@ export function receipts(options: receipts.Options = {}) {
             },
             meta: {
               ...enriched.meta,
-              ...(rates ? { pricing: Valuation.pricing(rates, oracle) } : {}),
+              ...(rates ? { valuation: Valuation.pricing(rates, oracle) } : {}),
             },
           }
           return c.json(Response.validated(schema.getReceipt.Response, valued), 200)