tapimo 0.6.0 → 0.7.1

package/src/App.ts

@@ -29,14 +29,22 @@ import openrpcSpec from './openrpc.json' with { type: 'json' }
 import * as Metadata from './apps/metadata.js'
 import * as Data from './apps/data/App.js'
 import * as Management from './apps/management/App.js'
+import * as Mpp from './apps/mpp/App.js'
+import * as Relay from './apps/relay/App.js'
 
 export import data = Data.data
 export import management = Management.management
+export import mpp = Mpp.mpp
+export import relay = Relay.relay
 
 /** The chain-data route group; see {@link data}. */
 export type DataApp = ReturnType<typeof data>
 /** The management route group; see {@link management}. */
 export type ManagementApp = ReturnType<typeof management>
+/** The MPP credential relay route group; see {@link mpp}. */
+export type MppApp = ReturnType<typeof mpp>
+/** The wallet relay route group; see {@link relay}. */
+export type RelayApp = ReturnType<typeof relay>
 
 /** Hono environment variables set by the Tempo API app. */
 export type Environment = {
@@ -82,7 +90,7 @@ export type Environment = {
 }
 
 /**
- * The canonical fully-composed Tempo API app ({@link create} with both route
+ * The canonical fully-composed Tempo API app ({@link create} with all route
  * groups). {@link Client} and the reference worker target this type; a subset
  * consumer infers its own narrower type from its own composition chain.
  */
@@ -97,7 +105,11 @@ export function from<const app extends Hono<any, any>>(app: app, metadata: creat
 // `App` (and thus `Client`) reflect the full route surface; real consumers
 // compose explicitly.
 function compose(options: create.Options) {
-  return create(options).route('/', data()).route('/', management())
+  return create(options)
+    .route('/', data())
+    .route('/', relay())
+    .route('/', mpp())
+    .route('/', management())
 }
 
 /** Node.js request listener for `node:http` and compatible interfaces. */

package/src/Client.test-d.ts

@@ -1,4 +1,5 @@
 import { Client } from 'tapimo'
+import { Mpp as PublicMpp } from 'tapimo/mpp'
 import type * as z from 'zod/mini'
 
 import * as Activities from './apps/data/routes/activities.js'
@@ -12,6 +13,7 @@ import * as Funding from './apps/data/routes/funding.js'
 import * as Indexer from './apps/data/routes/indexer.js'
 import * as InviteLinks from './apps/management/routes/invite-links.js'
 import * as Me from './apps/management/routes/me.js'
+import * as Mpp from './apps/mpp/Mpp.js'
 import * as Orgs from './apps/management/routes/orgs.js'
 import * as OrgWebhooks from './apps/management/routes/webhooks.js'
 import * as Receipts from './apps/data/routes/receipts.js'
@@ -28,6 +30,18 @@ import * as Webhooks from './apps/data/routes/webhooks.js'
 type Access400<code extends string> = code | 'api_key_malformed'
 type PaidAccessStatus = PublicAccessStatus | 402
 type PublicAccessStatus = 400 | 401 | 403 | 429
+const mppInput = {
+  challenge: {
+    description: 'Tempo API payment',
+    id: 'ch_01j3j1k2l3m4n5p6q7r8s9t0u',
+    intent: 'charge',
+    method: 'tempo',
+    opaque: 'eyJhbGciOiJIUzI1NiJ9',
+    realm: 'merchant.example',
+    request: { amount: '1', currency: 'USD' },
+  },
+  payload: { signature: `0x${'aa'.repeat(65)}`, type: 'transaction' },
+} satisfies Mpp.RelayInput
 /** A `Schema.TokenAmount` carrying its optional nested valuation. */
 type ValuedTokenAmount = {
   baseUnits: string
@@ -54,9 +68,49 @@ test('returns typed client', async () => {
 
   const typed: Client.Client = client
   void typed
+
+  expectTypeOf<PublicMpp.RelayInput>().toEqualTypeOf<Mpp.RelayInput>()
 })
 
 describe('narrows responses by status', () => {
+  test('POST /v1/mpp/verify', async () => {
+    const client = Client.create()
+    const res = await client.v1.mpp.verify.$post({ json: mppInput })
+
+    expectTypeOf(res.status).toEqualTypeOf<200 | 400 | 401 | 403 | 429 | 503>()
+
+    if (res.status === 200) {
+      const json = await res.json()
+      expectTypeOf(json).toEqualTypeOf<Mpp.VerifyResponse>()
+      return
+    }
+
+    if (res.status === 503) {
+      const json = await res.json()
+      expectTypeOf(json).toEqualTypeOf<Mpp.Unavailable>()
+      return
+    }
+  })
+
+  test('POST /v1/mpp/broadcast', async () => {
+    const client = Client.create()
+    const res = await client.v1.mpp.broadcast.$post({ json: mppInput })
+
+    expectTypeOf(res.status).toEqualTypeOf<200 | 400 | 401 | 403 | 429 | 503>()
+
+    if (res.status === 200) {
+      const json = await res.json()
+      expectTypeOf(json).toEqualTypeOf<Mpp.BroadcastResponse>()
+      return
+    }
+
+    if (res.status === 503) {
+      const json = await res.json()
+      expectTypeOf(json).toEqualTypeOf<Mpp.Unavailable>()
+      return
+    }
+  })
+
   test('GET /v1/blocks', async () => {
     const client = Client.create()
     const res = await client.v1.blocks.$get()
@@ -125,7 +179,6 @@ describe('narrows responses by status', () => {
       case 200: {
         const json = await res.json()
         expectTypeOf(json.id).toEqualTypeOf<z.output<typeof Me.schema.User>['id']>()
-        expectTypeOf(json.tmp_earlyAccess).toEqualTypeOf<boolean>()
         void json
         return
       }
@@ -229,6 +282,14 @@ describe('narrows responses by status', () => {
         expectTypeOf(json.tokens).toEqualTypeOf<
           z.output<typeof Faucet.schema.FundResponse>['tokens']
         >()
+        expectTypeOf(json.tokens[0]!.amount).toEqualTypeOf<
+          z.output<typeof Faucet.schema.FundResponse>['tokens'][number]['amount']
+        >()
+        expectTypeOf(json.tokens[0]!.token.symbol).toEqualTypeOf<string>()
+        // @ts-expect-error token metadata is nested under `token`
+        void json.tokens[0]!.symbol
+        // @ts-expect-error quantities are nested under `amount`
+        void json.tokens[0]!.token.amount
         expectTypeOf(json.transactionHashes).toEqualTypeOf<
           z.output<typeof Faucet.schema.FundResponse>['transactionHashes']
         >()
@@ -250,21 +311,16 @@ describe('narrows responses by status', () => {
       param: { orgId: 'org_test' },
     })
 
-    expectTypeOf(res.status).toEqualTypeOf<200 | 404 | 501 | 502 | PublicAccessStatus>()
+    expectTypeOf(res.status).toEqualTypeOf<200 | 404 | 502 | PublicAccessStatus>()
 
     switch (res.status) {
       case 200: {
         const json = await res.json()
+        expectTypeOf(json.enabledSources).toEqualTypeOf<('stripe' | 'tempo')[]>()
         expectTypeOf(json.status).toEqualTypeOf<z.output<typeof Billing.schema.Billing>['status']>()
         void json
         return
       }
-      case 501: {
-        const json = await res.json()
-        expectTypeOf(json.error.code).toEqualTypeOf<'billing_unconfigured'>()
-        void json
-        return
-      }
     }
   })
 
@@ -302,11 +358,12 @@ describe('narrows responses by status', () => {
       param: { orgId: 'org_test' },
     })
 
-    expectTypeOf(res.status).toEqualTypeOf<200 | 404 | 501 | 502 | PublicAccessStatus>()
+    expectTypeOf(res.status).toEqualTypeOf<200 | 404 | 502 | PublicAccessStatus>()
 
     switch (res.status) {
       case 200: {
         const json = await res.json()
+        expectTypeOf(json.enabledSources).toEqualTypeOf<('stripe' | 'tempo')[]>()
         expectTypeOf(json.spendLimit).toEqualTypeOf<
           z.output<typeof Billing.schema.SpendLimit> | undefined
         >()
@@ -314,12 +371,6 @@ describe('narrows responses by status', () => {
         void json
         return
       }
-      case 501: {
-        const json = await res.json()
-        expectTypeOf(json.error.code).toEqualTypeOf<'billing_unconfigured'>()
-        void json
-        return
-      }
     }
   })
 
@@ -341,7 +392,7 @@ describe('narrows responses by status', () => {
       case 403: {
         const json = await res.json()
         expectTypeOf(json.error.code).toEqualTypeOf<
-          'api_key_forbidden' | 'early_access_required' | 'forbidden'
+          'api_key_forbidden' | 'billing_source_disabled' | 'forbidden'
         >()
         void json
         return
@@ -644,9 +695,7 @@ describe('narrows responses by status', () => {
       }
       case 403: {
         const json = await res.json()
-        expectTypeOf(json.error.code).toEqualTypeOf<
-          'early_access_required' | 'forbidden' | 'scope_not_issuable'
-        >()
+        expectTypeOf(json.error.code).toEqualTypeOf<'forbidden' | 'scope_not_issuable'>()
         void json
         return
       }
@@ -1503,10 +1552,20 @@ describe('narrows responses by status', () => {
         expectTypeOf(json.data[0]!.attribution).toEqualTypeOf<
           z.output<typeof Transfers.schema.getTransfers.Transfer>['attribution']
         >()
-        // `valuation` is `null` for unverified or unpriceable legs.
-        expectTypeOf(json.data[0]!.sourceToken.valuation).toEqualTypeOf<
-          { amount: string; currency: string } | null | undefined
-        >()
+        expectTypeOf(json.data[0]!.destinationAmount).toEqualTypeOf<ValuedTokenAmount | undefined>()
+        expectTypeOf(json.data[0]!.sourceAmount).toEqualTypeOf<ValuedTokenAmount>()
+        expectTypeOf(json.data[0]!.sourceToken.currency).toEqualTypeOf<string>()
+        expectTypeOf(json.data[0]!.sourceToken.decimals).toEqualTypeOf<number>()
+        expectTypeOf(json.data[0]!.sourceToken.name).toEqualTypeOf<string>()
+        expectTypeOf(json.data[0]!.sourceToken.symbol).toEqualTypeOf<string>()
+        // @ts-expect-error token references do not contain quantities
+        void json.data[0]!.sourceToken.amount
+        // @ts-expect-error valuations belong to amount fields
+        void json.data[0]!.sourceToken.valuation
+        // @ts-expect-error destination token references do not contain quantities
+        void json.data[0]!.destinationToken?.amount
+        // @ts-expect-error destination valuations belong to amount fields
+        void json.data[0]!.destinationToken?.valuation
         // `meta` (the opt-in `include=totalCount` capped count) is optional.
         expectTypeOf(json.meta).toEqualTypeOf<
           z.output<typeof Transfers.schema.getTransfers.Response>['meta']
@@ -1547,14 +1606,32 @@ describe('narrows responses by status', () => {
     switch (res.status) {
       case 200: {
         const json = await res.json()
+        expectTypeOf(json.data[0]!.destinationAmount).toEqualTypeOf<{
+          baseUnits: string
+          currency: string
+          decimals: number
+          formatted: string
+        }>()
+        expectTypeOf(json.data[0]!.destinationAmountMin).toEqualTypeOf<
+          | {
+              baseUnits: string
+              currency: string
+              decimals: number
+              formatted: string
+            }
+          | undefined
+        >()
         expectTypeOf(json.data[0]!.sourceAmount).toEqualTypeOf<
           z.output<typeof Funding.schema.quoteFunding.Response>['data'][number]['sourceAmount']
         >()
+        // @ts-expect-error token references do not contain quantities
+        void json.data[0]!.sourceToken.amount
+        // @ts-expect-error provider details no longer duplicate destination amounts
+        void json.data[0]!.quote.outputAmount
         expectTypeOf(json.data[0]!.provider.id).toEqualTypeOf<
           'across' | 'relay' | 'rhino' | 'squid' | 'symbiosis'
         >()
         expectTypeOf(json.data[0]!.quote.expiresAt).toEqualTypeOf<string | undefined>()
-        expectTypeOf(json.data[0]!.quote.outputAmount).toEqualTypeOf<string>()
         void json
         return
       }
@@ -2053,12 +2130,16 @@ describe('narrows responses by status', () => {
         expectTypeOf(json.data[0]!.userToken.address).toEqualTypeOf<
           z.output<typeof FeeAmm.schema.getFeeAmmPools.Token>['address']
         >()
-        expectTypeOf(json.data[0]!.userToken.amount).toEqualTypeOf<
-          z.output<typeof FeeAmm.schema.getFeeAmmPools.Token>['amount']
+        expectTypeOf(json.data[0]!.userAmount).toEqualTypeOf<
+          z.output<typeof FeeAmm.schema.getFeeAmmPools.Pool>['userAmount']
         >()
-        expectTypeOf(json.data[0]!.validatorToken.formatted).toEqualTypeOf<
-          z.output<typeof FeeAmm.schema.getFeeAmmPools.Token>['formatted']
+        expectTypeOf(json.data[0]!.validatorAmount).toEqualTypeOf<
+          z.output<typeof FeeAmm.schema.getFeeAmmPools.Pool>['validatorAmount']
         >()
+        // @ts-expect-error token references do not contain quantities
+        void json.data[0]!.userToken.amount
+        // @ts-expect-error token references do not contain formatted quantities
+        void json.data[0]!.validatorToken.formatted
         expectTypeOf(json.nextCursor).toEqualTypeOf<string | null>()
         void json
         return

package/src/Scope.ts

@@ -49,6 +49,11 @@ export const catalog = [
     scope: 'management:write',
     selfServe: true,
   },
+  {
+    description: 'Validate and broadcast MPP payment credentials through the Tempo relay.',
+    scope: 'mpp:write',
+    selfServe: true,
+  },
   {
     description: 'Fill and submit transactions through the relay.',
     scope: 'rpc-relay:read',

package/src/admin/App.test.ts

@@ -20,6 +20,10 @@ describe('create', () => {
         new Request('http://admin/api-keys/key_x', { method: 'DELETE' }),
         new Request('http://admin/organizations'),
         new Request('http://admin/organizations/org_x'),
+        new Request('http://admin/organizations/org_x/billing-sources/stripe', { method: 'PUT' }),
+        new Request('http://admin/organizations/org_x/billing-sources/stripe', {
+          method: 'DELETE',
+        }),
         new Request('http://admin/organizations/org_x/members'),
         new Request('http://admin/organizations/org_x/projects'),
         new Request('http://admin/verified-tokens?chainId=42431', {

package/src/admin/apps/early-access.ts

@@ -29,7 +29,7 @@ export namespace schema {
       z.object({
         data: z.array(Entry).check(z.describe('Allowlist entries, ordered by entry.')),
       }),
-      'Early-access allowlist entries.',
+      'Accounts whose new organizations receive early access features by default.',
     )
   }
 
@@ -42,7 +42,7 @@ export namespace schema {
           z.trim(),
           z.toLowerCase(),
           z.regex(entryPattern, 'Must be a bare domain (example.org) or a full email (user@example.org).'), // prettier-ignore
-          z.describe('Domain or exact email to grant early access; normalized lowercase.'),
+          z.describe('Domain or exact email whose new organizations receive early access features; normalized lowercase.'), // prettier-ignore
         ),
       })
       .check(z.describe('Request body for adding an allowlist entry.'))
@@ -77,8 +77,8 @@ export namespace schema {
 }
 
 /**
- * Management routes for the temporary early-access allowlist (`early_access`
- * table): entries are lowercase domains or exact emails.
+ * Management routes for the early-access allowlist (`early_access` table).
+ * Matching users receive Stripe by default when they create an organization.
  *
  * - `GET /` lists entries.
  * - `POST /` adds an entry (`409` on a duplicate).
@@ -92,7 +92,8 @@ export function earlyAccess() {
         operationId: 'listEarlyAccessEntries',
         responses: OpenApi.responses({
           success: {
-            description: 'Early-access allowlist entries.',
+            description:
+              'Accounts whose new organizations receive early access features by default.',
             schema: schema.listEarlyAccessEntries.Response,
           },
         }),

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

@@ -1,6 +1,7 @@
 import type * as Analytics from '../../analytics/Analytics.js'
 import * as ApiKeys from '../../ApiKeys.js'
 import * as BillingSettings from '../../db/tables/billingSettings.js'
+import * as EnabledBillingSources from '../../db/tables/enabledBillingSources.js'
 import * as Memberships from '../../db/tables/memberships.js'
 import * as Organizations from '../../db/tables/organizations.js'
 import * as Projects from '../../db/tables/projects.js'
@@ -134,6 +135,16 @@ describe('GET /organizations/:orgId', () => {
     })
     await Users.setEmail(db, user.id, 'owner@tempo.xyz')
     const organization = await Organizations.createOwned(db, { name: 'Tempo', userId: user.id })
+    await EnabledBillingSources.add(db, {
+      createdBy: TestAdmin.identity.email,
+      orgId: organization.id,
+      source: 'stripe',
+    })
+    await EnabledBillingSources.add(db, {
+      createdBy: TestAdmin.identity.email,
+      orgId: organization.id,
+      source: 'tempo',
+    })
     await Projects.create(db, { name: 'API', orgId: organization.id })
     await BillingSettings.upsert(db, {
       environment: 'production',
@@ -161,6 +172,7 @@ describe('GET /organizations/:orgId', () => {
     expect(response.status).toBe(200)
     expect(body.memberCount).toBe(1)
     expect(body.projectCount).toBe(1)
+    expect(body.billing.enabledSources).toEqual(['stripe', 'tempo'])
     expect(body.billing.production).toMatchObject({
       settings: { spendLimit: '250', txFeeLimit: '0.50' },
       source: { status: 'active', stripeCustomerId: 'cus_admin_lookup' },
@@ -182,6 +194,7 @@ describe('GET /organizations/:orgId', () => {
 
     expect(body).toMatchObject({
       billing: {
+        enabledSources: [],
         production: { settings: null, source: null },
         sandbox: { settings: null, source: null },
       },
@@ -202,6 +215,78 @@ describe('GET /organizations/:orgId', () => {
   })
 })
 
+describe('PUT/DELETE /organizations/:orgId/billing-sources/:source', () => {
+  test('enables and disables sources idempotently', async () => {
+    const { client, db } = TestAdmin.setup()
+    const organization = await Organizations.create(db, { name: 'Billing sources' })
+
+    for (const source of ['tempo', 'stripe', 'stripe'] as const) {
+      const response = await client.organizations[':orgId']['billing-sources'][':source'].$put({
+        param: { orgId: organization.id, source },
+      })
+      const body = await TestApp.json(response, AdminOrganizations.schema.setBillingSource.Response)
+      expect(response.status).toBe(200)
+      expect(body.data).toEqual(source === 'tempo' ? ['tempo'] : ['stripe', 'tempo'])
+    }
+
+    expect(await EnabledBillingSources.listByOrg(db, organization.id)).toMatchObject([
+      { createdBy: TestAdmin.identity.email, source: 'stripe' },
+      { createdBy: TestAdmin.identity.email, source: 'tempo' },
+    ])
+
+    for (const source of ['stripe', 'stripe'] as const) {
+      const response = await client.organizations[':orgId']['billing-sources'][':source'].$delete({
+        param: { orgId: organization.id, source },
+      })
+      const body = await TestApp.json(response, AdminOrganizations.schema.setBillingSource.Response)
+      expect(response.status).toBe(200)
+      expect(body.data).toEqual(['tempo'])
+    }
+
+    const detailResponse = await client.organizations[':orgId'].$get({
+      param: { orgId: organization.id },
+    })
+    const detail = await TestApp.json(
+      detailResponse,
+      AdminOrganizations.schema.getOrganization.Response,
+    )
+    expect(detail.billing.enabledSources).toEqual(['tempo'])
+  })
+
+  test('rejects unsupported sources and unknown organizations', async () => {
+    const { app, client } = TestAdmin.setup()
+    const invalid = await app.request('/organizations/org_example/billing-sources/card', {
+      method: 'PUT',
+    })
+    expect(invalid.status).toBe(400)
+
+    const missing = await client.organizations[':orgId']['billing-sources'][':source'].$put({
+      param: { orgId: 'org_missing', source: 'stripe' },
+    })
+    expect(missing.status).toBe(404)
+  })
+
+  test('records billing-source mutations in the admin audit log', async () => {
+    const { client, db } = TestAdmin.setup()
+    const organization = await Organizations.create(db, { name: 'Audited billing' })
+    await client.organizations[':orgId']['billing-sources'][':source'].$put({
+      param: { orgId: organization.id, source: 'tempo' },
+    })
+
+    const records = await db.kysely
+      .selectFrom('admin_audit_logs')
+      .selectAll()
+      .orderBy('createdAt', 'desc')
+      .execute()
+    expect(records[0]).toMatchObject({
+      actor: TestAdmin.identity.email,
+      method: 'PUT',
+      path: `/organizations/${organization.id}/billing-sources/tempo`,
+      status: 200,
+    })
+  })
+})
+
 describe('GET /organizations/:orgId/members', () => {
   test('returns a bounded cursor page without duplicates', async () => {
     const { client, db } = TestAdmin.setup()
@@ -444,8 +529,7 @@ const usageAnalytics: Analytics.Analytics = {
   async insert() {},
   async migrate() {},
   async query(sql) {
-    if (sql.includes('GROUP BY error_code'))
-      return [{ code: 'upstream_error', requests: 2 }] as never[]
+    if (sql.includes('GROUP BY code')) return [{ code: 'upstream_error', requests: 2 }] as never[]
     if (sql.includes('GROUP BY route'))
       return [{ averageDurationMs: 12.5, errors: 2, requests: 20, route: '/v1/tokens' }] as never[]
     if (sql.includes('GROUP BY status')) return [{ requests: 2, status: 500 }] as never[]