tapimo 0.8.0 → 0.10.0

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

@@ -176,7 +176,12 @@ export function zones() {
       name: 'tempo-api:zone-withdrawals:v1',
       key: (c) => {
         const principal = Auth.getPrincipal(c)
-        return `${principal?.type ?? 'unknown'}:${principal?.id ?? 'unknown'}:${Cache.urlKey(c, schema.listZoneWithdrawals.Query)}`
+        const url = new URL(Cache.urlKey(c, schema.listZoneWithdrawals.Query))
+        url.searchParams.set(
+          'principal',
+          `${principal?.type ?? 'unknown'}:${principal?.id ?? 'unknown'}`,
+        )
+        return url.toString()
       },
     }),
     async (c) => {

package/src/apps/funding/App.ts

@@ -42,22 +42,37 @@ export declare namespace funding {
 
 const openapi = {
   tags: [
-    { name: 'Chains', description: 'Source chains and stablecoins supported for funding.' },
+    {
+      name: 'Chains',
+      description: 'Source chains and stablecoins supported for funding.',
+      'x-pagePath': 'funding/chains',
+    },
     {
       name: 'Deposit Addresses',
       description: 'Reusable funding addresses and deposits detected at those addresses.',
+      'x-pagePath': 'funding/deposit-addresses',
+    },
+    {
+      name: 'Providers',
+      description: 'Providers available for inbound funding.',
+      'x-pagePath': 'funding/providers',
+    },
+    {
+      name: 'Quotes',
+      description: 'Live quotes for funding Tempo from other chains.',
+      'x-pagePath': 'funding/quotes',
     },
-    { name: 'Providers', description: 'Providers available for inbound funding.' },
-    { name: 'Quotes', description: 'Live quotes for funding Tempo from other chains.' },
     {
-      name: 'Transfers',
+      name: 'Funding Transfers',
       description: 'Inbound funding transfers.',
+      'x-displayName': 'Transfers',
+      'x-pagePath': 'funding/transfers',
     },
   ],
   'x-tagGroups': [
     {
       name: 'Funding & Bridge API',
-      tags: ['Chains', 'Deposit Addresses', 'Providers', 'Quotes', 'Transfers'],
+      tags: ['Chains', 'Deposit Addresses', 'Providers', 'Quotes', 'Funding Transfers'],
     },
   ],
 } satisfies App.create.Metadata

package/src/apps/funding/routes/deposit-addresses.test.ts

@@ -1152,10 +1152,16 @@ describe('POST /funding/deposit-addresses/:id/reconcile', () => {
   })
 })
 
-describe('GET /funding/deposit-addresses/:id/deposits', () => {
+describe('GET /funding/deposits?depositAddress', () => {
   test('pages deposits newest-first under an owned address', async () => {
     const app = transfersApp()
-    const address = await seedDepositAddress()
+    const address = await seedDepositAddress({
+      snapshot: TestFunding.depositAddressSnapshot({
+        address: 'TQn9Y2khEsLJW1ChVWFMSMeRDow5KcbLSE',
+        provider: { id: 'relay_list_deposit_address', name: 'Relay' },
+        recipient: `0x${'41'.repeat(20)}`,
+      }),
+    })
     const first = await seedDeposit(address)
     const second = await seedDeposit(address)
     const third = await seedDeposit(address)
@@ -1164,7 +1170,7 @@ describe('GET /funding/deposit-addresses/:id/deposits', () => {
     const sixth = await seedDeposit(address)
 
     const response = await app.request(
-      `/v1/funding/deposit-addresses/${address.id}/deposits?limit=5`,
+      `/v1/funding/deposits?depositAddress=${address.address}&limit=5`,
       as(fundingReader),
     )
     expect(response.status).toBe(200)
@@ -1177,10 +1183,7 @@ describe('GET /funding/deposit-addresses/:id/deposits', () => {
         "etag": null,
       }
     `)
-    const body = await TestApp.json(
-      response,
-      Funding.schema.listFundingDepositAddressDeposits.Response,
-    )
+    const body = await TestApp.json(response, Funding.schema.listFundingDeposits.Response)
     expect(body.data.map((deposit) => deposit.id)).toEqual([
       sixth.id,
       fifth.id,
@@ -1192,10 +1195,10 @@ describe('GET /funding/deposit-addresses/:id/deposits', () => {
 
     const next = await TestApp.json(
       await app.request(
-        `/v1/funding/deposit-addresses/${address.id}/deposits?limit=5&cursor=${body.nextCursor}`,
+        `/v1/funding/deposits?depositAddress=${address.address}&limit=5&cursor=${body.nextCursor}`,
         as(fundingReader),
       ),
-      Funding.schema.listFundingDepositAddressDeposits.Response,
+      Funding.schema.listFundingDeposits.Response,
     )
     expect(next.data.map((deposit) => deposit.id)).toEqual([first.id])
     expect(next.nextCursor).toBeNull()
@@ -1205,6 +1208,7 @@ describe('GET /funding/deposit-addresses/:id/deposits', () => {
     const app = transfersApp()
     const address = await seedDepositAddress({
       snapshot: TestFunding.depositAddressSnapshot({
+        address: 'TF17BgPaZYbz8oxbjhriubPDsA7ArKoLX3',
         provider: { id: 'relay_observed', name: 'Relay' },
         recipient: `0x${'31'.repeat(20)}`,
       }),
@@ -1228,14 +1232,11 @@ describe('GET /funding/deposit-addresses/:id/deposits', () => {
     })
 
     const response = await app.request(
-      `/v1/funding/deposit-addresses/${address.id}/deposits`,
+      `/v1/funding/deposits?depositAddress=${address.address}`,
       as(fundingReader),
     )
     expect(response.status).toBe(200)
-    const body = await TestApp.json(
-      response,
-      Funding.schema.listFundingDepositAddressDeposits.Response,
-    )
+    const body = await TestApp.json(response, Funding.schema.listFundingDeposits.Response)
     expect(body).toMatchInlineSnapshot(
       {
         data: [
@@ -1305,21 +1306,30 @@ describe('GET /funding/deposit-addresses/:id/deposits', () => {
     )
   })
 
-  test('returns the parent not-found error before listing deposits', async () => {
+  test('hides a foreign deposit address', async () => {
     const app = transfersApp()
-    const address = await seedDepositAddress({ orgId: fundingForeign.orgId })
+    const address = await seedDepositAddress({
+      orgId: fundingForeign.orgId,
+      snapshot: TestFunding.depositAddressSnapshot({
+        address: 'TWd4WrZ9wn84f5x1hZhL4DHvk738ns5jwb',
+        provider: { id: 'relay_foreign_deposit_address', name: 'Relay' },
+        recipient: `0x${'42'.repeat(20)}`,
+      }),
+    })
+    await seedDeposit(address)
     const response = await app.request(
-      `/v1/funding/deposit-addresses/${address.id}/deposits`,
+      `/v1/funding/deposits?depositAddress=${address.address}`,
       as(fundingReader),
     )
-    expect(response.status).toBe(404)
-    expect(((await response.json()) as { error: { code: string } }).error.code).toBe(
-      'funding_deposit_address_not_found',
-    )
+    expect(response.status).toBe(200)
+    expect(await TestApp.json(response, Funding.schema.listFundingDeposits.Response)).toEqual({
+      data: [],
+      nextCursor: null,
+    })
   })
 })
 
-describe('GET /funding/deposits', () => {
+describe('GET /funding/deposits?recipient', () => {
   test('requires funding:read and pages recipient deposits across addresses', async () => {
     const app = transfersApp()
     const recipient = '0xABcdEFABcdEFabcdEfAbCdefabcdeFABcDEFabCD'
@@ -1327,6 +1337,17 @@ describe('GET /funding/deposits', () => {
     expect((await app.request(path)).status).toBe(401)
     expect((await app.request(path, as(TestApp.key))).status).toBe(403)
     expect((await app.request('/v1/funding/deposits', as(fundingReader))).status).toBe(400)
+    expect(
+      (await app.request('/v1/funding/deposits?depositAddress=', as(fundingReader))).status,
+    ).toBe(400)
+    expect(
+      (
+        await app.request(
+          `${path}&depositAddress=TJRabPrwbZy45sbavfcjinPJC18kjpRTv8`,
+          as(fundingReader),
+        )
+      ).status,
+    ).toBe(400)
 
     const firstAddress = await seedDepositAddress({
       snapshot: TestFunding.depositAddressSnapshot({

package/src/apps/funding/routes/deposit-addresses.ts

@@ -132,35 +132,36 @@ export namespace schema {
     export const Params = getFundingDepositAddress.Params
   }
 
-  /** Schemas for the listFundingDepositAddressDeposits operation. */
-  export namespace listFundingDepositAddressDeposits {
-    /** Path parameters for listing one address's deposits. */
-    export const Params = getFundingDepositAddress.Params
-
-    /** Query parameters for listing one address's deposits. */
-    export const Query = z
-      .object({ cursor: Schema.Cursor, limit: Schema.Limit })
-      .check(z.describe('Paging parameters for one funding deposit address.'))
-
-    /** One page of detected deposits. */
-    export const Response = z
-      .object({
-        data: z.array(Deposit).check(z.describe('Detected deposits on this page, newest first.')),
-        nextCursor: Schema.NextCursor,
-      })
-      .check(z.describe('A page of deposits detected for one funding deposit address.'))
-  }
-
   /** Schemas for the listFundingDeposits operation. */
   export namespace listFundingDeposits {
-    /** Query parameters for listing one account's funding deposits. */
+    /** Query parameters for listing funding deposits. */
     export const Query = z
       .object({
+        depositAddress: z
+          .optional(z.string().check(z.minLength(1)))
+          .check(
+            z.describe('Reusable source-chain deposit address that received the funds.'),
+            z.meta({ examples: ['TJRabPrwbZy45sbavfcjinPJC18kjpRTv8'] }),
+          ),
         cursor: Schema.Cursor,
         limit: Schema.Limit,
-        recipient: Schema.Address.check(z.describe('Tempo account that received the deposits.')),
+        recipient: z
+          .optional(Schema.Address)
+          .check(
+            z.describe('Tempo account that received the deposits.'),
+            z.meta({ examples: [`0x${'11'.repeat(20)}`] }),
+          ),
       })
-      .check(z.describe('Recipient filter and paging parameters for funding deposits.'))
+      .check(
+        z.refine(
+          (query) => (query.depositAddress === undefined) !== (query.recipient === undefined),
+          {
+            error: 'Pass exactly one of `depositAddress` or `recipient`.',
+            path: ['depositAddress'],
+          },
+        ),
+        z.describe('Exactly one deposit filter and optional paging parameters.'),
+      )
 
     /** One page of detected deposits. */
     export const Response = z
@@ -168,7 +169,7 @@ export namespace schema {
         data: z.array(Deposit).check(z.describe('Detected deposits on this page, newest first.')),
         nextCursor: Schema.NextCursor,
       })
-      .check(z.describe('A page of deposits received by one Tempo account.'))
+      .check(z.describe('A page of funding deposits matching the selected filter.'))
   }
 
   /** Schemas for the getFundingDeposit operation. */
@@ -273,11 +274,6 @@ const fundingDepositExample = {
   updatedAt: '2026-08-04T00:01:00.000Z',
 } satisfies z.output<typeof schema.Deposit>
 
-const fundingDepositAddressDepositsExample = {
-  data: [fundingDepositExample],
-  nextCursor: null,
-} satisfies z.output<typeof schema.listFundingDepositAddressDeposits.Response>
-
 const fundingDepositsExample = {
   data: [fundingDepositExample],
   nextCursor: null,
@@ -650,88 +646,6 @@ export function depositAddresses(options: depositAddresses.Options = {}) {
         }
       },
     )
-    .get(
-      '/v1/funding/deposit-addresses/:id{fda_[A-Za-z0-9_-]+}/deposits',
-      Auth.policy({ apiKey: { scopes: ['funding:read'] } }),
-      OpenApi.validate('param', schema.listFundingDepositAddressDeposits.Params, {
-        code: 'param_invalid',
-        message: 'Check the path parameters and try again.',
-      }),
-      OpenApi.validate('query', schema.listFundingDepositAddressDeposits.Query, {
-        code: 'query_invalid',
-        message: 'Check the query parameters and try again.',
-      }),
-      OpenApi.describeRoute({
-        description: 'Lists deposits detected for one funding deposit address, newest first.',
-        operationId: 'listFundingDepositAddressDeposits',
-        responses: OpenApi.responses({
-          errors: {
-            400: { codes: ['param_invalid', 'query_invalid'] },
-            404: {
-              codes: ['funding_deposit_address_not_found'],
-              description: 'No visible funding deposit address exists for the identifier.',
-            },
-          },
-          success: {
-            description: 'A page of deposits detected for the address.',
-            example: fundingDepositAddressDepositsExample,
-            schema: schema.listFundingDepositAddressDeposits.Response,
-          },
-        }),
-        summary: 'List deposits by deposit address',
-        tags: ['Deposit Addresses'],
-      }),
-      async (c) => {
-        if (Auth.narrowAccess) return Auth.accessError(c)
-        if (OpenApi.narrowValidation)
-          return OpenApi.validationError(c, {
-            code: 'query_invalid',
-            message: 'Check the request parameters and try again.',
-          })
-
-        const owner = Access.owner(c)
-        if (!owner) return Access.unauthorized(c)
-
-        const db = Db.get(c.get('db'))
-        const { id } = c.req.valid('param')
-        const { cursor, limit } = c.req.valid('query')
-        const decoded = cursor ? Cursor.decode(cursor, ['timestamp', 'id']) : undefined
-        try {
-          const address = await FundingDepositAddresses.getOwned(db, owner, id)
-          if (!address)
-            return Response.error(c, {
-              code: 'funding_deposit_address_not_found',
-              message: 'Funding deposit address not found',
-              status: 404,
-            })
-
-          const rows = await FundingDeposits.listByAddress(db, owner, id, {
-            ...(decoded
-              ? { cursor: { createdAt: String(decoded[0]), id: String(decoded[1]) } }
-              : {}),
-            limit: limit + 1,
-          })
-          const page = Cursor.paginate({
-            key: (record) => [record.createdAt, record.id],
-            limit,
-            rows,
-          })
-          const data = page.rows.map(FundingDeposit.toPublic)
-
-          c.header('Cache-Control', Cache.policies.noStore)
-          c.header('Vary', 'Accept-Encoding, Authorization, Tempo-API-Key, X-API-Key')
-          return c.json(
-            Response.validated(schema.listFundingDepositAddressDeposits.Response, {
-              data,
-              nextCursor: page.nextCursor,
-            }),
-            200,
-          )
-        } catch (cause) {
-          return Response.upstream(c, cause)
-        }
-      },
-    )
     .get(
       '/v1/funding/deposit-addresses/:id{fda_[A-Za-z0-9_-]+}',
       Auth.policy({ apiKey: { scopes: ['funding:read'] } }),
@@ -868,19 +782,19 @@ export function depositAddresses(options: depositAddresses.Options = {}) {
         message: 'Check the query parameters and try again.',
       }),
       OpenApi.describeRoute({
-        description: 'Lists deposits received by one Tempo account, newest first.',
+        description: 'Lists deposits by deposit address or Tempo recipient, newest first.',
         operationId: 'listFundingDeposits',
         responses: OpenApi.responses({
           errors: {
             400: { codes: ['query_invalid'] },
           },
           success: {
-            description: 'A page of funding deposits received by the account.',
+            description: 'A page of funding deposits matching the selected filter.',
             example: fundingDepositsExample,
             schema: schema.listFundingDeposits.Response,
           },
         }),
-        summary: 'List deposits by recipient',
+        summary: 'List deposits',
         tags: ['Deposit Addresses'],
       }),
       async (c) => {
@@ -895,17 +809,20 @@ export function depositAddresses(options: depositAddresses.Options = {}) {
         if (!owner) return Access.unauthorized(c)
 
         const db = Db.get(c.get('db'))
-        const { cursor, limit, recipient } = c.req.valid('query')
+        const { cursor, depositAddress, limit, recipient } = c.req.valid('query')
         const decoded = cursor ? Cursor.decode(cursor, ['timestamp', 'id']) : undefined
         try {
-          const rows = await FundingDeposits.listByRecipient(db, {
+          const paging = {
             ...(decoded
               ? { cursor: { createdAt: String(decoded[0]), id: String(decoded[1]) } }
               : {}),
             limit: limit + 1,
             owner,
-            recipient,
-          })
+          }
+          const rows =
+            depositAddress === undefined
+              ? await FundingDeposits.listByRecipient(db, { ...paging, recipient: recipient! })
+              : await FundingDeposits.listByDepositAddress(db, { ...paging, depositAddress })
           const page = Cursor.paginate({
             key: (record) => [record.createdAt, record.id],
             limit,

package/src/apps/funding/routes/quotes.test.ts

@@ -271,7 +271,7 @@ describe('GET /funding/quotes', () => {
       const response_promise = app.request(quoteUrl({ ...baseUsdcQuery, provider: 'across' }), {
         headers: TestApp.auth.headers,
       })
-      await vi.advanceTimersByTimeAsync(2_000)
+      await vi.advanceTimersByTimeAsync(5_000)
       const response = await response_promise
 
       expect(response.status).toBe(502)

package/src/apps/funding/routes/transfers.test.ts

@@ -830,9 +830,6 @@ describe('funding transfers OpenAPI', () => {
         !path.endsWith('/deposits') &&
         !path.endsWith('/reconcile'),
     )!
-    const depositAddressDepositsPath = Object.keys(spec.paths).find(
-      (path) => path.includes('/v1/funding/deposit-addresses/{') && path.endsWith('/deposits'),
-    )!
     const depositPath = Object.keys(spec.paths).find((path) =>
       path.includes('/v1/funding/deposits/{'),
     )!
@@ -847,7 +844,6 @@ describe('funding transfers OpenAPI', () => {
       deposit: summarize(spec.paths[depositPath]!.get!),
       depositAddress: summarize(spec.paths[depositAddressPath]!.get!),
       depositAddressCreate: summarize(spec.paths['/v1/funding/deposit-addresses']!.post!),
-      depositAddressDeposits: summarize(spec.paths[depositAddressDepositsPath]!.get!),
       depositAddressReconcile: summarize(spec.paths[reconcilePath]!.post!),
       deposits: summarize(spec.paths['/v1/funding/deposits']!.get!),
       detail: summarize(spec.paths[detailPath]!.get!),
@@ -896,17 +892,13 @@ describe('funding transfers OpenAPI', () => {
             "description": "Creates or returns a reusable deposit address for funding a Tempo account.",
             "summary": "Create deposit address",
           },
-          "depositAddressDeposits": {
-            "description": "Lists deposits detected for one funding deposit address, newest first.",
-            "summary": "List deposits by deposit address",
-          },
           "depositAddressReconcile": {
             "description": "Queues an immediate provider reconciliation for one reusable funding deposit address.",
             "summary": "Reconcile deposit address",
           },
           "deposits": {
-            "description": "Lists deposits received by one Tempo account, newest first.",
-            "summary": "List deposits by recipient",
+            "description": "Lists deposits by deposit address or Tempo recipient, newest first.",
+            "summary": "List deposits",
           },
           "detail": {
             "description": "Returns a transfer by ID.",
@@ -934,7 +926,6 @@ describe('funding transfers OpenAPI', () => {
           },
         },
         "sidebar": [
-          "List transfers",
           "Get quotes",
           "Get chains",
           "Get providers",
@@ -947,8 +938,7 @@ describe('funding transfers OpenAPI', () => {
           "Get deposit address",
           "Get transfer",
           "Get deposit",
-          "List deposits by deposit address",
-          "List deposits by recipient",
+          "List deposits",
         ],
       }
     `)
@@ -1100,8 +1090,9 @@ describe('funding transfers OpenAPI', () => {
     const operation = spec.paths['/v1/funding/transfers']!.get
     const fields = Object.keys(operation.responses['200']!.content['application/json']!.example.data[0]!) // prettier-ignore
     expect(fields).toEqual([...fields].sort())
-    for (const parameter of operation.parameters ?? [])
-      expect(parameter.example ?? parameter.schema?.examples, parameter.name).toBeDefined()
+    for (const route of [operation, spec.paths['/v1/funding/deposits']!.get])
+      for (const parameter of route.parameters ?? [])
+        expect(parameter.example ?? parameter.schema?.examples, parameter.name).toBeDefined()
   })
 
   test('publishes operation ids and required scopes', async () => {
@@ -1128,9 +1119,6 @@ describe('funding transfers OpenAPI', () => {
         !path.endsWith('/deposits') &&
         !path.endsWith('/reconcile'),
     )
-    const depositAddressDepositsPath = Object.keys(spec.paths).find(
-      (path) => path.includes('/v1/funding/deposit-addresses/{') && path.endsWith('/deposits'),
-    )
     const depositPath = Object.keys(spec.paths).find((path) =>
       path.includes('/v1/funding/deposits/{'),
     )
@@ -1141,11 +1129,6 @@ describe('funding transfers OpenAPI', () => {
       depositAddressCreate: spec.paths['/v1/funding/deposit-addresses']?.post?.operationId,
       depositAddressCreateScopes:
         spec.paths['/v1/funding/deposit-addresses']?.post?.['x-required-scopes'],
-      depositAddressDeposits:
-        depositAddressDepositsPath && spec.paths[depositAddressDepositsPath]?.get.operationId,
-      depositAddressDepositsScopes:
-        depositAddressDepositsPath &&
-        spec.paths[depositAddressDepositsPath]?.get['x-required-scopes'],
       depositAddressReconcile: reconcilePath && spec.paths[reconcilePath]?.post?.operationId,
       depositAddressReconcileScopes:
         reconcilePath && spec.paths[reconcilePath]?.post?.['x-required-scopes'],
@@ -1170,8 +1153,6 @@ describe('funding transfers OpenAPI', () => {
       depositAddress: 'getFundingDepositAddress',
       depositAddressCreate: 'createFundingDepositAddress',
       depositAddressCreateScopes: ['funding:write'],
-      depositAddressDeposits: 'listFundingDepositAddressDeposits',
-      depositAddressDepositsScopes: ['funding:read'],
       depositAddressReconcile: 'reconcileFundingDepositAddress',
       depositAddressReconcileScopes: ['funding:write'],
       depositAddressScopes: ['funding:read'],

package/src/apps/funding/routes/transfers.ts

@@ -290,7 +290,7 @@ export function transfers() {
           },
         }),
         summary: 'List transfers',
-        tags: ['Transfers'],
+        tags: ['Funding Transfers'],
       }),
       fundingEtag,
       async (c) => {
@@ -373,7 +373,7 @@ export function transfers() {
           },
         }),
         summary: 'Get transfer',
-        tags: ['Transfers'],
+        tags: ['Funding Transfers'],
       }),
       async (c) => {
         if (Auth.narrowAccess) return Auth.accessError(c)
@@ -448,7 +448,7 @@ export function transfers() {
           },
         }),
         summary: 'Create transfer',
-        tags: ['Transfers'],
+        tags: ['Funding Transfers'],
       }),
       async (c) => {
         if (Auth.narrowAccess) return Auth.accessError(c)
@@ -637,7 +637,7 @@ export function transfers() {
         operationId: 'createFundingTransferVault',
         responses: unimplementedFundingTransferResponses,
         summary: 'Create transfer into vault',
-        tags: ['Transfers'],
+        tags: ['Funding Transfers'],
       }),
       (c) => {
         if (Auth.narrowAccess) return Auth.accessError(c)
@@ -671,7 +671,7 @@ export function transfers() {
         operationId: 'createFundingTransferZone',
         responses: unimplementedFundingTransferResponses,
         summary: 'Create transfer into zone',
-        tags: ['Transfers'],
+        tags: ['Funding Transfers'],
       }),
       (c) => {
         if (Auth.narrowAccess) return Auth.accessError(c)

package/src/apps/mpp/Mpp.test.ts

@@ -91,6 +91,17 @@ describe('MPP relay', () => {
     expect(await response.json()).toEqual({ success: true })
   })
 
+  test('verifies a zero-amount proof credential', async () => {
+    const app = TestApp.create({ auth: { keys: [key] } })
+    const input = await credential({ amount: '0' })
+    const response = await post(app, '/v1/mpp/validate', input)
+
+    expect(payloadType(input)).toBe('proof')
+    expect(input.source).toBeDefined()
+    expect(response.status).toBe(200)
+    expect(await response.json()).toEqual({ success: true })
+  })
+
   test('validates and finalizes a pushed credential without a second submission', async () => {
     const app = TestApp.create({ auth: { keys: [key] } })
     const input = await credential({ mode: 'push', supportedModes: ['push'] })
@@ -619,7 +630,7 @@ type CredentialPayload = { hash?: string; type?: unknown }
 
 async function credential(options: credential.Options = {}): Promise<Mpp.RelayInput> {
   const issuer = createIssuer(options)
-  const challenge = await issuer.challenge.tempo.charge({ amount: '1' })
+  const challenge = await issuer.challenge.tempo.charge({ amount: options.amount ?? '1' })
   const authorization = await createClient(options).createCredential(
     new Response(null, {
       headers: { 'www-authenticate': Mppx.Challenge.serialize(challenge) },
@@ -631,6 +642,7 @@ async function credential(options: credential.Options = {}): Promise<Mpp.RelayIn
 
 declare namespace credential {
   type Options = {
+    amount?: string | undefined
     feePayer?: boolean | undefined
     mode?: 'pull' | 'push' | undefined
     supportedModes?: ('pull' | 'push')[] | undefined

package/src/apps/mpp/Mpp.ts

@@ -67,6 +67,8 @@ export type RelayInput = {
   challenge: Challenge
   /** Method-specific MPP credential payload. */
   payload: unknown
+  /** Optional payer identifier supplied with the credential. */
+  source?: string | undefined
 }
 
 /** Broadcast MPP payment receipt. */
@@ -200,6 +202,12 @@ export namespace schema {
           z.describe('The method-specific MPP credential payload.'),
           z.meta({ examples: [{ signature: `0x${'aa'.repeat(65)}`, type: 'transaction' }] }),
         ),
+      source: z
+        .optional(z.string())
+        .check(
+          z.describe('An optional payer identifier supplied with the credential.'),
+          z.meta({ examples: ['did:pkh:eip155:4217:0x1234567890abcdef1234567890abcdef12345678'] }),
+        ),
     }),
     'An MPP payment credential and its challenge.',
   )

package/src/apps/mpp/internal/Adapter.ts

@@ -49,7 +49,7 @@ export function create(options: create.Options): Adapter {
   /** Validates and screens a credential, rejecting when either check fails. */
   async function validateOrThrow(input: Mpp.RelayInput) {
     const result = await time('mpp_validate', () =>
-      Mppx.Method.validateCredential(methods, Mppx.Credential.from(input)),
+      Mppx.Method.validateCredential(methods, credential(input)),
     )
     await time('mpp_screen', () => screenManager.screen(Utils.addresses(result)))
   }
@@ -65,7 +65,7 @@ export function create(options: create.Options): Adapter {
       try {
         await validateOrThrow(input)
         const result = await time('mpp_broadcast', () =>
-          Mppx.Method.broadcastCredential(methods, Mppx.Credential.from(input)),
+          Mppx.Method.broadcastCredential(methods, credential(input)),
         )
         return {
           receipt: {
@@ -91,6 +91,14 @@ export function create(options: create.Options): Adapter {
   }
 }
 
+function credential(input: Mpp.RelayInput) {
+  return Mppx.Credential.from({
+    challenge: input.challenge,
+    payload: input.payload,
+    ...(input.source === undefined ? {} : { source: input.source }),
+  })
+}
+
 export declare namespace create {
   /** Dependencies used to validate and broadcast Tempo credentials. */
   type Options = {