tapimo 0.11.0 → 0.13.0

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

@@ -36,15 +36,20 @@ export namespace schema {
       .check(z.describe('Query parameters for listing funding transfers.'))
 
     /** Paginated funding transfer list. */
-    export const Response = z
-      .object({
-        data: z.array(Transfer).check(z.describe('Funding transfers on this page, newest first.')),
-        meta: z
-          .optional(Schema.CountMeta)
-          .check(z.describe('Extra response metadata requested with `include`.')),
-        nextCursor: Schema.NextCursor,
-      })
-      .check(z.describe('A page of funding transfers.'))
+    export const Response = OpenApi.component(
+      z
+        .object({
+          data: z
+            .array(Transfer)
+            .check(z.describe('Funding transfers on this page, newest first.')),
+          meta: z
+            .optional(Schema.CountMeta)
+            .check(z.describe('Extra response metadata requested with `include`.')),
+          nextCursor: Schema.NextCursor,
+        })
+        .check(z.describe('A page of funding transfers.')),
+      'FundingTransferList',
+    )
   }
 
   /** Schemas for the createFundingTransfer operation. */
@@ -82,18 +87,21 @@ export namespace schema {
   /** Schemas for the createFundingTransferVault operation. */
   export namespace createFundingTransferVault {
     /** Funding transfer creation request for an Earn vault destination. */
-    export const Body = z
-      .strictObject({
-        ...destinationCreateFields,
-        vaultAddress: z
-          .string()
-          .check(
-            z.regex(/^0x[0-9a-fA-F]{40}$/),
-            z.describe('Tempo Earn vault contract address.'),
-            z.meta({ examples: [`0x${'f4'.repeat(20)}`] }),
-          ),
-      })
-      .check(z.describe('Vault funding transfer creation request.'))
+    export const Body = OpenApi.component(
+      z
+        .strictObject({
+          ...destinationCreateFields,
+          vaultAddress: z
+            .string()
+            .check(
+              z.regex(/^0x[0-9a-fA-F]{40}$/),
+              z.describe('Tempo Earn vault contract address.'),
+              z.meta({ examples: [`0x${'f4'.repeat(20)}`] }),
+            ),
+        })
+        .check(z.describe('Vault funding transfer creation request.')),
+      'CreateFundingTransferVaultRequest',
+    )
 
     /** Required headers for vault funding transfer creation. */
     export const Headers = createFundingTransfer.Headers
@@ -102,32 +110,35 @@ export namespace schema {
   /** Schemas for the createFundingTransferZone operation. */
   export namespace createFundingTransferZone {
     /** Funding transfer creation request for a Zone destination. */
-    export const Body = z
-      .strictObject({
-        amount: destinationCreateFields.amount,
-        destinationChain: z
-          .string()
-          .check(
-            z.regex(/^eip155:\d+$/),
-            z.describe('Configured Zone CAIP-2 id.'),
-            z.meta({ examples: ['eip155:1424310001'] }),
-          ),
-        destinationToken: FundingTransfer.schema.CreateRequest.shape.destinationToken,
-        mode: destinationCreateFields.mode,
-        recipient: destinationCreateFields.recipient,
-        recipientFallback: z
-          .string()
-          .check(
-            z.regex(/^0x[0-9a-fA-F]{40}$/),
-            z.describe('Public Tempo recipient used if the Zone credit cannot complete.'),
-            z.meta({ examples: [`0x${'22'.repeat(20)}`] }),
-          ),
-        sender: destinationCreateFields.sender,
-        slippageBps: destinationCreateFields.slippageBps,
-        sourceChain: destinationCreateFields.sourceChain,
-        sourceToken: destinationCreateFields.sourceToken,
-      })
-      .check(z.describe('Zone funding transfer creation request.'))
+    export const Body = OpenApi.component(
+      z
+        .strictObject({
+          amount: destinationCreateFields.amount,
+          destinationChain: z
+            .string()
+            .check(
+              z.regex(/^eip155:\d+$/),
+              z.describe('Configured Zone CAIP-2 id.'),
+              z.meta({ examples: ['eip155:1424310003'] }),
+            ),
+          destinationToken: FundingTransfer.schema.CreateRequest.shape.destinationToken,
+          mode: destinationCreateFields.mode,
+          recipient: destinationCreateFields.recipient,
+          recipientFallback: z
+            .string()
+            .check(
+              z.regex(/^0x[0-9a-fA-F]{40}$/),
+              z.describe('Public Tempo recipient used if the Zone credit cannot complete.'),
+              z.meta({ examples: [`0x${'22'.repeat(20)}`] }),
+            ),
+          sender: destinationCreateFields.sender,
+          slippageBps: destinationCreateFields.slippageBps,
+          sourceChain: destinationCreateFields.sourceChain,
+          sourceToken: destinationCreateFields.sourceToken,
+        })
+        .check(z.describe('Zone funding transfer creation request.')),
+      'CreateFundingTransferZoneRequest',
+    )
 
     /** Required headers for Zone funding transfer creation. */
     export const Headers = createFundingTransfer.Headers
@@ -516,6 +527,7 @@ export function transfers() {
             method: 'transaction',
             mode: body.mode,
             onAttempt: (attempt) => attempts.push(attempt),
+            provider: body.provider,
             providers,
             recipient: body.recipient,
             sender: body.sender,
@@ -532,8 +544,6 @@ export function transfers() {
           }
 
           const { candidate, result } = selected
-          const feeToken = (side: 'destination' | 'source') =>
-            side === 'source' ? candidate.sourceToken : candidate.destinationToken
           const snapshot: FundingTransfer.Snapshot = {
             destinationAmount: Value.tokenAmount({
               baseUnits: result.destinationAmount,
@@ -547,16 +557,21 @@ export function transfers() {
             }),
             destinationChain: candidate.destinationChain,
             destinationToken: candidate.destinationToken,
-            fees: result.fees.map((fee) => ({
-              amount: Value.tokenAmount({
-                baseUnits: fee.amount,
-                currency: feeToken(fee.side).currency,
-                decimals: feeToken(fee.side).decimals,
-              }),
-              side: fee.side,
-              token: feeToken(fee.side),
-              type: 'provider',
-            })),
+            fees: result.fees.map((fee) => {
+              const token =
+                fee.token ??
+                (fee.side === 'source' ? candidate.sourceToken : candidate.destinationToken)
+              return {
+                amount: Value.tokenAmount({
+                  baseUnits: fee.amount,
+                  currency: token.currency,
+                  decimals: token.decimals,
+                }),
+                side: fee.side,
+                token,
+                type: 'provider',
+              }
+            }),
             method: 'transaction',
             mode: body.mode,
             provider: candidate.provider,
@@ -604,6 +619,8 @@ export function transfers() {
           await release()
           if (cause instanceof FundingProvider.InvalidAmountError)
             return Response.error(c, { code: 'body_invalid', message: 'Invalid `amount`.', status: 400 }) // prettier-ignore
+          if (cause instanceof FundingProvider.UnsupportedProviderError)
+            return Response.error(c, { code: 'body_invalid', message: 'Unsupported `provider`.', status: 400 }) // prettier-ignore
           if (cause instanceof FundingProvider.UnsupportedSourceChainError)
             return quoteNotAvailable(c)
           if (cause instanceof FundingProvider.ProviderQuoteError) {

package/src/apps/management/Billing.test.ts

@@ -199,6 +199,32 @@ describe('createReporter', () => {
     await db.close()
   })
 
+  test('behavior: marks a meter event that Stripe already accepted', async () => {
+    const db = create()
+    await db.migrate()
+    await StripeCustomers.create(db, { orgId: 'org_1', stripeCustomerId: 'cus_1' })
+    const row = await finalized(db, { feeAmount: '100000', seed: '03' })
+
+    const { stripe } = stubStripe({
+      meterEvent: (params) => {
+        throw new Error(`An event already exists with identifier ${params.identifier}.`)
+      },
+      subscriptions: [{ items: ['feePayerSpend', 'apiRequests'], status: 'active' }],
+    })
+    expect(await Billing.createReporter({ db, stripe }).tick()).toStrictEqual({
+      failed: 0,
+      reported: 1,
+      skipped: 0,
+    })
+    expect((await SponsoredTransactions.get(db, row.id))?.meterReportedAt).not.toBeNull()
+    expect(await Billing.createReporter({ db, stripe }).tick()).toStrictEqual({
+      failed: 0,
+      reported: 0,
+      skipped: 0,
+    })
+    await db.close()
+  })
+
   test('behavior: canceled customers skip without meter events', async () => {
     const db = create()
     await db.migrate()

package/src/apps/management/Billing.ts

@@ -357,12 +357,18 @@ export function createReporter(options: createReporter.Options): createReporter.
             const stamp = recent && !subscription.items.feePayerSpend?.created
             // The row id makes short-window retries idempotent on Stripe's
             // side; `meter_reported_at` is the durable exactly-once guard.
-            await stripe.billing.meterEvents.create({
-              event_name: meterEventName,
-              identifier: row.id,
-              payload: { stripe_customer_id: customer.stripeCustomerId, value: row.feeAmount! },
-              ...(stamp ? { timestamp: Math.floor(finalizedAt / 1000) } : {}),
-            })
+            try {
+              await stripe.billing.meterEvents.create({
+                event_name: meterEventName,
+                identifier: row.id,
+                payload: { stripe_customer_id: customer.stripeCustomerId, value: row.feeAmount! },
+                ...(stamp ? { timestamp: Math.floor(finalizedAt / 1000) } : {}),
+              })
+            } catch (error) {
+              // Stripe may persist the event before the Worker records its ack.
+              // Its duplicate response proves this exact row was already metered.
+              if (!isDuplicateMeterEvent(error, row.id)) throw error
+            }
             reported++
           } else {
             // Deleted orgs and Stripe-deleted (canceled) customers keep their
@@ -381,6 +387,14 @@ export function createReporter(options: createReporter.Options): createReporter.
   }
 }
 
+/** Whether Stripe confirms that the exact meter event identifier already exists. */
+function isDuplicateMeterEvent(error: unknown, identifier: string): boolean {
+  return (
+    error instanceof Error &&
+    error.message === `An event already exists with identifier ${identifier}.`
+  )
+}
+
 export declare namespace createReporter {
   /** Options for {@link createReporter}. */
   type Options = {
@@ -452,7 +466,10 @@ export function createRequestUsageReporter(
             count: status.count,
             environment,
             oldestPendingAgeSeconds: status.oldestAttemptedAt
-              ? Math.max(0, Math.floor((now() - new Date(status.oldestAttemptedAt).getTime()) / 1_000))
+              ? Math.max(
+                  0,
+                  Math.floor((now() - new Date(status.oldestAttemptedAt).getTime()) / 1_000),
+                )
               : 0,
           }
         }),