tapimo 0.15.1 → 0.18.1

package/src/analytics/tables/requestEvents.ts

@@ -318,72 +318,60 @@ export async function readProjectUsage(
   analytics: Analytics.Analytics,
   options: ProjectUsageOptions,
 ): Promise<ProjectUsage> {
-  const where = usageWhere(options)
-  const average = `toFloat64(coalesce(round(avgOrNull(duration_ms), 1), 0))`
-  const bucket = options.interval === 'day' ? 'toStartOfDay(timestamp)' : 'toStartOfHour(timestamp)'
-  const [byKey, byRoute, byStatus, series, totals] = await Promise.all([
-    analytics.query<KeyRow>(
-      `
-        SELECT
-          key_id,
-          count() AS requests,
-          countIf(status >= 400 OR rpc_error_count > 0) AS errors,
-          ${average} AS averageDurationMs
-        FROM ${table}
-        WHERE ${where} AND key_id IS NOT NULL
-        GROUP BY key_id
-        ORDER BY requests DESC, key_id ASC
-        LIMIT 100
-      `,
-    ),
-    analytics.query<RouteRow>(
-      `
-        SELECT
-          route,
-          count() AS requests,
-          countIf(status >= 400 OR rpc_error_count > 0) AS errors,
-          ${average} AS averageDurationMs
-        FROM ${table}
-        WHERE ${where}
-        GROUP BY route
-        ORDER BY requests DESC, route ASC
-        LIMIT 100
-      `,
-    ),
-    analytics.query<StatusRow>(
-      `
-        SELECT
-          status,
-          count() AS requests
-        FROM ${table}
-        WHERE ${where}
-        GROUP BY status
-        ORDER BY status ASC
-      `,
-    ),
-    analytics.query<SeriesRow>(
-      `
-        SELECT
-          formatDateTime(${bucket}, '%Y-%m-%dT%H:%i:%S.000Z', 'UTC') AS time,
-          count() AS requests,
-          countIf(status >= 400 OR rpc_error_count > 0) AS errors
+  // Separate attribution scans so ClickHouse can choose each tenant or key projection.
+  // Exclude earlier matches to preserve OR semantics when attribution terms overlap.
+  const source = (options.attributions.length ? options.attributions : [undefined])
+    .map((attribution, index) => {
+      const previous = options.attributions
+        .slice(0, index)
+        .map((term) => `(${attributionWhere(term, options)})`)
+        .join(' OR ')
+      return `
+        SELECT duration_ms, key_id, route, rpc_error_count, status, timestamp
         FROM ${table}
-        WHERE ${where}
-        GROUP BY ${bucket}
-        ORDER BY ${bucket} ASC
-      `,
-    ),
-    analytics.query<TotalsRow>(
+        WHERE ${usageWhere({ ...options, attributions: attribution ? [attribution] : [] })}
+        ${previous ? `AND NOT ifNull((${previous}), 0)` : ''}
       `
-        SELECT
-          count() AS requests,
-          countIf(status >= 400 OR rpc_error_count > 0) AS errors,
-          ${average} AS averageDurationMs
-        FROM ${table}
-        WHERE ${where}
-      `,
-    ),
-  ])
+    })
+    .join(' UNION ALL ')
+  const average = `toFloat64(coalesce(round(avgOrNull(duration_ms), 1), 0))`
+  const bucket = options.interval === 'day' ? 'toStartOfDay(timestamp)' : 'toStartOfHour(timestamp)'
+  // Aggregate every breakdown together after merging the disjoint attribution scans.
+  const rows = await analytics.query<UsageRow>(`
+    SELECT
+      multiIf(
+        grouping(key_id) = 0, 'key',
+        grouping(route) = 0, 'route',
+        grouping(status) = 0, 'status',
+        grouping(${bucket}) = 0, 'series',
+        'total'
+      ) AS kind,
+      key_id,
+      route,
+      status,
+      formatDateTime(${bucket}, '%Y-%m-%dT%H:%i:%S.000Z', 'UTC') AS time,
+      count() AS requests,
+      countIf(status >= 400 OR rpc_error_count > 0) AS errors,
+      ${average} AS averageDurationMs
+    FROM (${source})
+    GROUP BY GROUPING SETS ((key_id), (route), (status), (${bucket}), ())
+    HAVING kind != 'key' OR key_id IS NOT NULL
+    QUALIFY kind NOT IN ('key', 'route') OR row_number() OVER (
+      PARTITION BY kind ORDER BY requests DESC, key_id ASC, route ASC
+    ) <= 100
+    ORDER BY
+      kind ASC,
+      if(kind IN ('key', 'route'), requests, 0) DESC,
+      key_id ASC,
+      route ASC,
+      status ASC,
+      time ASC
+  `)
+  const byKey = rows.filter((row) => row.kind === 'key')
+  const byRoute = rows.filter((row) => row.kind === 'route')
+  const byStatus = rows.filter((row) => row.kind === 'status')
+  const series = rows.filter((row) => row.kind === 'series')
+  const totals = rows.find((row) => row.kind === 'total')
   return {
     byKey: byKey.map((row) => ({
       apiKeyId: String(row.key_id),
@@ -409,11 +397,11 @@ export async function readProjectUsage(
       time: String(row.time),
     })),
     to: options.to,
-    totals: totals[0]
+    totals: totals
       ? {
-          averageDurationMs: ClickHouseValue.number(totals[0].averageDurationMs),
-          errors: ClickHouseValue.number(totals[0].errors),
-          requests: ClickHouseValue.number(totals[0].requests),
+          averageDurationMs: ClickHouseValue.number(totals.averageDurationMs),
+          errors: ClickHouseValue.number(totals.errors),
+          requests: ClickHouseValue.number(totals.requests),
         }
       : { averageDurationMs: 0, errors: 0, requests: 0 },
   }
@@ -471,7 +459,7 @@ export type BillableCountsOptions = {
  * Reads deduped billable request counts grouped by `(org, UTC hour)` for the
  * request-metered billing reporter. Counts dedupe on `request_id` via
  * `uniqExact` (the queue → ClickHouse path can duplicate rows); production rows
- * exclude authentication and quota denials, while sandbox rows also require
+ * exclude authentication and quota denials and client cancellations, while sandbox rows also require
  * `billing_active = 1` at request time.
  *
  * @param analytics - The analytics store.
@@ -497,6 +485,7 @@ export async function readBillableCounts(
         AND coalesce(error_code, '') NOT IN (
           'api_key_forbidden',
           'api_key_ip_forbidden',
+          'client_canceled',
           'forbidden',
           'payment_required',
           'rate_limit_exceeded'
@@ -524,13 +513,6 @@ type BillableCountRow = {
 /** Table name queries read from; the store scopes the database. */
 const table = 'request_events'
 
-type KeyRow = {
-  averageDurationMs: number | string
-  errors: number | string
-  key_id: string
-  requests: number | string
-}
-
 type LastUsedAtRow = {
   key_id: string
   lastUsedAt: string
@@ -541,28 +523,15 @@ type ErrorRow = {
   requests: number | string
 }
 
-type RouteRow = {
+type UsageRow = {
   averageDurationMs: number | string
   errors: number | string
+  key_id: string | null
+  kind: 'key' | 'route' | 'series' | 'status' | 'total'
   requests: number | string
   route: string
-}
-
-type SeriesRow = {
-  errors: number | string
-  requests: number | string
-  time: string
-}
-
-type StatusRow = {
-  requests: number | string
   status: number | string
-}
-
-type TotalsRow = {
-  averageDurationMs: number | string
-  errors: number | string
-  requests: number | string
+  time: string
 }
 
 /** Maps one request log entry to a stored row. */

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

@@ -3,7 +3,7 @@
 import { Address, Hex, Value as core_Value } from 'ox'
 import { FxOracle } from 'tapimo/apps'
 import { createClient, encodeAbiParameters, encodeEventTopics, http } from 'viem'
-import { getLogs, sendTransactionSync } from 'viem/actions'
+import { getLogs, readContract, sendTransactionSync } from 'viem/actions'
 import { Abis, Actions, Addresses } from 'viem/tempo'
 
 import * as TestApp from '../../../../test/App.js'
@@ -391,20 +391,31 @@ describe('GET /addresses/:address/activities', () => {
       const wallet = Tempo.getClient({ account })
       await Actions.faucet.fundSync(Tempo.client, { account, timeout: 60_000 })
 
-      // Burning needs the `issuer` role, so the account burns a token it owns.
-      const { token } = await Actions.token.createSync(wallet, {
-        currency: 'USD',
-        name: 'Seeded Burn USD',
-        symbol: 'SBUSD',
+      // Burning needs the `issuer` role, so the account burns a token it owns. One batch keeps
+      // every step on one node's state; the hosted RPC balances across nodes that can lag.
+      const salt = Hex.random(32)
+      const token = await readContract(wallet, {
+        abi: Abis.tip20Factory,
+        address: Addresses.tip20Factory,
+        args: [account.address, salt],
+        functionName: 'getTokenAddress',
       })
-      await sendTransactionSync(wallet, {
+      const receipt = await sendTransactionSync(wallet, {
         account,
         calls: [
+          Actions.token.create.call(wallet, {
+            admin: account.address,
+            currency: 'USD',
+            name: 'Seeded Burn USD',
+            salt,
+            symbol: 'SBUSD',
+          }),
           Actions.token.grantRoles.call(wallet, { role: 'issuer', to: account.address, token }),
           Actions.token.mint.call(wallet, { amount: 1_000_000n, to: account.address, token }),
+          Actions.token.burn.call(wallet, { amount: 100_000n, token }),
         ],
+        throwOnReceiptRevert: true,
       })
-      const { receipt } = await Actions.token.burnSync(wallet, { amount: 100_000n, token })
 
       const deadline = Date.now() + 90_000
       let burn: Activities.Entry | undefined
@@ -1637,7 +1648,7 @@ describe('Activities.list precompile classification', () => {
     logIdx: number
   }): Activities.Row {
     type Param = { indexed?: boolean; name?: string; type: string }
-    // Standard ERC-4626 events, mirrored from the classifier's decode ABI.
+    // External vault events, mirrored from the classifier's decode ABI.
     const erc4626Events = [
       {
         inputs: [
@@ -1660,6 +1671,17 @@ describe('Activities.list precompile classification', () => {
         name: 'Withdraw',
         type: 'event',
       },
+      {
+        inputs: [
+          { indexed: true, name: 'to', type: 'address' },
+          { indexed: true, name: 'asset', type: 'address' },
+          { indexed: false, name: 'amount', type: 'uint256' },
+          { indexed: true, name: 'from', type: 'address' },
+          { indexed: false, name: 'shares', type: 'uint256' },
+        ],
+        name: 'Exit',
+        type: 'event',
+      },
     ] as const
     const abi = [...Abis.core, ...Abis.earnRouter, ...Abis.earnVault, ...erc4626Events]
     const event = abi.find(
@@ -2660,6 +2682,63 @@ describe('Activities.list precompile classification', () => {
     expect(items.map((item) => item.type)).toEqual(['assets-withdrawn'])
   })
 
+  test('folds a BoringVault payout into its wrapper redemption', async () => {
+    const adapter = '0x9999999999999999999999999999999999999999' as Address.Address
+    const asset = '0x4444444444444444444444444444444444444444' as Address.Address
+    const boringVault = '0x6666666666666666666666666666666666666666' as Address.Address
+    const merchant = '0x7777777777777777777777777777777777777777' as Address.Address
+    const zero = '0x0000000000000000000000000000000000000000' as Address.Address
+    const items = await classify([
+      transferRow({ from: viewer, logIdx: 0, to: tokenA, token: tokenA, value: 100n }),
+      transferRow({ from: tokenA, logIdx: 1, to: zero, token: tokenA, value: 100n }),
+      transferRow({ from: adapter, logIdx: 2, to: zero, token: boringVault, value: 100n }),
+      transferRow({ from: boringVault, logIdx: 3, to: viewer, token: asset, value: 100n }),
+      logRow({
+        address: boringVault,
+        args: { amount: 100n, asset, from: adapter, shares: 100n, to: viewer },
+        eventName: 'Exit',
+        logIdx: 4,
+      }),
+      logRow({
+        address: tokenA,
+        args: { assets: 100n, caller: viewer, earnShares: 100n, receiver: viewer },
+        eventName: 'Redeemed',
+        logIdx: 5,
+      }),
+      transferRow({ from: merchant, logIdx: 6, to: viewer, token: asset, value: 5n }),
+    ])
+    expect(items.map((item) => item.type).sort()).toEqual([
+      'assets-withdrawn',
+      'shares-redeemed',
+      'transfer',
+    ])
+    const payment = items.find((item) => item.type === 'transfer')
+    if (payment?.type !== 'transfer') return
+    expect(payment.data.sender).toBe(merchant)
+  })
+
+  test('keeps a same-sized BoringVault transfer beside an Exit', async () => {
+    const adapter = '0x9999999999999999999999999999999999999999' as Address.Address
+    const asset = '0x4444444444444444444444444444444444444444' as Address.Address
+    const boringVault = '0x6666666666666666666666666666666666666666' as Address.Address
+    const zero = '0x0000000000000000000000000000000000000000' as Address.Address
+    const items = await classify([
+      transferRow({ from: adapter, logIdx: 0, to: zero, token: boringVault, value: 100n }),
+      transferRow({ from: boringVault, logIdx: 1, to: viewer, token: asset, value: 100n }),
+      logRow({
+        address: boringVault,
+        args: { amount: 100n, asset, from: adapter, shares: 100n, to: viewer },
+        eventName: 'Exit',
+        logIdx: 2,
+      }),
+      transferRow({ from: viewer, logIdx: 3, to: boringVault, token: asset, value: 100n }),
+    ])
+    expect(items.map((item) => item.type).sort()).toEqual(['assets-withdrawn', 'transfer'])
+    const payment = items.find((item) => item.type === 'transfer')
+    if (payment?.type !== 'transfer') return
+    expect(payment.data.recipient).toBe(boringVault)
+  })
+
   test('classifies a route delivery to a third party as a cross-token transfer', async () => {
     const router = '0xb92fe925dc43a0ecde6c8b1a2709c170ec4fff4f' as Address.Address
     const recipient = '0x7bc2d22a73706758505e222ed9d13a1a7f251490' as Address.Address
@@ -3409,7 +3488,7 @@ describe('Activities.list receipt replays', () => {
   }
 
   /** Maps a raw receipt log to a Q1 row, viewer as the transaction sender. */
-  function receiptRow(log: ReceiptLog): Activities.Row {
+  function receiptRow(log: ReceiptLog, sender: Address.Address = viewer): Activities.Row {
     return {
       blockNum: 100,
       blockTimestamp: 1_700_000_000,
@@ -3424,16 +3503,16 @@ describe('Activities.list receipt replays', () => {
       topic3: log.topics[3] ?? null,
       txHash,
       txIdx: 0,
-      txSender: viewer,
+      txSender: sender,
     }
   }
 
-  async function classify(logs: readonly ReceiptLog[]) {
+  async function classify(logs: readonly ReceiptLog[], address: Address.Address = viewer) {
     const provider: Activities.Provider = {
       cursorForGroup: (group) => `${group.blockNum}:${group.txIdx}`,
-      fetchRows: async () => ({ rows: logs.map(receiptRow) }),
+      fetchRows: async () => ({ rows: logs.map((log) => receiptRow(log, address)) }),
     }
-    const { items } = await Activities.list(provider, { address: viewer, store: store() })
+    const { items } = await Activities.list(provider, { address, store: store() })
     return items
   }
 
@@ -3699,6 +3778,215 @@ describe('Activities.list receipt replays', () => {
     },
   ]
 
+  const primeRedeemLogs = [
+    {
+      address: '0x20c00000000000000000000065439bf965b62982',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 0,
+      topics: [
+        '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+        '0x000000000000000000000000d857db134413a39ab23e2d8fa0b7960ef81cd41a',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000065439bf965b62982',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 1,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+        '0x000000000000000000000000d857db134413a39ab23e2d8fa0b7960ef81cd41a',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000065439bf965b62982',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 2,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x000000000000000000000000d857db134413a39ab23e2d8fa0b7960ef81cd41a',
+        '0x0000000000000000000000000000000000000000000000000000000000000000',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000065439bf965b62982',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 3,
+      topics: [
+        '0xcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5',
+        '0x000000000000000000000000d857db134413a39ab23e2d8fa0b7960ef81cd41a',
+      ],
+    },
+    {
+      address: '0x7039a6bff996551285c6baa2256c2c7a36a39c82',
+      data: '0x00000000000000000000000000000000000000000000000000000000000f4240',
+      logIdx: 4,
+      topics: ['0x388f446e9526fe5c9af20a5919b342370c8a7c0cb05245afe1e545658fa3cdba'],
+    },
+    {
+      address: '0x20c00000000000000000000058d0b8b2cfdb358c',
+      data: '0x0000000000000000000000000000000000000000000000000000000000000000',
+      logIdx: 5,
+      topics: [
+        '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000058d0b8b2cfdb358c',
+      data: '0x000000000000000000000000000000000000000000000000000000000268e0bc',
+      logIdx: 6,
+      topics: [
+        '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000058d0b8b2cfdb358c',
+      data: '0x000000000000000000000000000000000000000000000000000000000268e0bb',
+      logIdx: 7,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000058d0b8b2cfdb358c',
+      data: '0x000000000000000000000000000000000000000000000000000000000268e0bb',
+      logIdx: 8,
+      topics: [
+        '0x57bc7354aa85aed339e000bccffabbc529466af35f0772c8f8ee1145927de7f0',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+        '0xdfaa8ba4a8fbc7a97b41cc5de776d6b2a2bf74fd6b716714f0afdd956ebf7fc1',
+      ],
+    },
+    {
+      address: '0x20c0000000000000000000000000000000000000',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 9,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+      ],
+    },
+    {
+      address: '0x20c0000000000000000000000000000000000000',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 10,
+      topics: [
+        '0x57bc7354aa85aed339e000bccffabbc529466af35f0772c8f8ee1145927de7f0',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0xc0aeeda6a768d51d779ccf20e96db41dfad0fb6454300c5807f9cdbbd7a990b8',
+      ],
+    },
+    {
+      address: '0x01ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+      data: '0x00000000000000000000000000000000000000000000000000000000020d51480000000000000000000000000000000000000000000000000000000000af2548',
+      logIdx: 11,
+      topics: [
+        '0x68b6919cc2747efaadbd2bd1a5b1f54acdefbe8bf17ba6171e13901d98f5d725',
+        '0x33e9a166f8d1af04f1aebfa08c9835ffafaa9970105b44ba381a57bea822cb22',
+      ],
+    },
+    {
+      address: '0x01ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+      data: '0x99f0b5d68de2632c6212b237883c46ebc7ec7a4c3c39d5e3b5fe958ff2f71bb000000000000000000000000020c00000000000000000000058d0b8b2cfdb358c00000000000000000000000020c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000268e0bb00000000000000000000000000000000000000000000000000000000028ef30b0000000000000000000000000000000000000000000000000000000006540d00000000000000000000000000000000000000000000000000000000006abb50fe',
+      logIdx: 12,
+      topics: [
+        '0xf05a3e016bfb4b6c18830f5c8c2920e373727b22308458b485c35ed0202fe6be',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x70ca45b17a006092ed0c58b7ff1af8c01eb743d8b269eaab4982170147b085b2',
+      ],
+    },
+    {
+      address: '0x20c00000000000000000000058d0b8b2cfdb358c',
+      data: '0x0000000000000000000000000000000000000000000000000000000000000000',
+      logIdx: 13,
+      topics: [
+        '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x00000000000000000000000001ced4c2a58e947b2df3c2e0eb69829261fe6c4d',
+      ],
+    },
+    {
+      address: '0x7ce20fa339cc1e5c79bd44888751cb37124873a6',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 14,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x0000000000000000000000009eb27b71f0f974e968385b32c1d122c9c7787851',
+        '0x0000000000000000000000000000000000000000000000000000000000000000',
+      ],
+    },
+    {
+      address: '0x20c0000000000000000000000000000000000000',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 15,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x0000000000000000000000007ce20fa339cc1e5c79bd44888751cb37124873a6',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+      ],
+    },
+    {
+      address: '0x7ce20fa339cc1e5c79bd44888751cb37124873a6',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 16,
+      topics: [
+        '0xe0c82280a1164680e0cf43be7db4c4c9f985423623ad7a544fb76c772bdc6043',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+        '0x00000000000000000000000020c0000000000000000000000000000000000000',
+        '0x0000000000000000000000009eb27b71f0f974e968385b32c1d122c9c7787851',
+      ],
+    },
+    {
+      address: '0x1816432fa9620998d67815dc80bede941f841ba1',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 17,
+      topics: [
+        '0xdcc60b41ff1c604459e6aa4a7299817416b19fc586a392f111646e26597c4af9',
+        '0x00000000000000000000000020c0000000000000000000000000000000000000',
+      ],
+    },
+    {
+      address: '0x9eb27b71f0f974e968385b32c1d122c9c7787851',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 18,
+      topics: [
+        '0xf3a670cd3af7d64b488926880889d08a8585a138ff455227af6737339a1ec262',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+      ],
+    },
+    {
+      address: '0xd857db134413a39ab23e2d8fa0b7960ef81cd41a',
+      data: '0x00000000000000000000000000000000000000000000000000000000028ef30b00000000000000000000000000000000000000000000000000000000028ef30b',
+      logIdx: 19,
+      topics: [
+        '0x5cdf07ad0fc222442720b108e3ed4c4640f0fadc2ab2253e66f259a0fea83480',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+        '0x000000000000000000000000a3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f',
+      ],
+    },
+    {
+      address: '0x20c0000000000000000000000000000000000000',
+      data: '0x000000000000000000000000000000000000000000000000000000000000010e',
+      logIdx: 20,
+      topics: [
+        '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+        '0x00000000000000000000000058aa7ce42e1d13b2919e2ac7e006c4fbc171442c',
+        '0x000000000000000000000000feec000000000000000000000000000000000000',
+      ],
+    },
+  ]
+
   test('classifies a router swap instead of a lonely approval', async () => {
     // 0xd8be4bfb370d4395c45fb587686b0bd83b01228871896926e92d66d15f25838b
     // (chain 4217): 1.105 USDC.e swapped to pathUSD through a route account.
@@ -3736,4 +4024,17 @@ describe('Activities.list receipt replays', () => {
       amount: '100000',
     })
   })
+
+  test('folds a PRIME redemption payout from its BoringVault', async () => {
+    // 0x4cbe50ce4f59322ae65f65e392f6353aaf1e2a5350863d5d8aac491ecf3621ac
+    // (chain 4217): the BoringVault pays 42.922763 pathUSD straight to the wallet.
+    const wallet = '0xa3b9eb50b9d1a3f584fbe1122a7bc82084eaae2f' as Address.Address
+    const items = await classify(primeRedeemLogs, wallet)
+    expect(items.some((item) => item.type === 'transfer')).toBe(false)
+    const withdrawal = items.find((item) => item.type === 'assets-withdrawn')
+    if (withdrawal?.type !== 'assets-withdrawn') throw new Error('missing withdrawal')
+    expect(withdrawal.data.vault).toBe('0x7ce20fa339cc1e5c79bd44888751cb37124873a6')
+    expect(withdrawal.data.assets).toBe('42922763')
+    expect(withdrawal.data.receiver).toBe(wallet)
+  })
 })

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

@@ -1914,6 +1914,7 @@ const titleByEventName: Record<string, string> = {
   Deposited: 'Assets deposited',
   EarnDeposit: 'Private assets deposited',
   EarnRedeem: 'Private shares redeemed',
+  Exit: 'Assets withdrawn',
   RedeemCancelled: 'Share redemption cancelled',
   RedeemFinalized: 'Share redemption finalized',
   RedeemRequested: 'Share redemption requested',
@@ -2009,6 +2010,18 @@ const erc4626Events = [
     name: 'Withdraw',
     type: 'event',
   },
+  // Veda BoringVault's withdrawal, emitted in place of `Withdraw` (e.g. under Tempo Cash PRIME).
+  {
+    inputs: [
+      { indexed: true, name: 'to', type: 'address' },
+      { indexed: true, name: 'asset', type: 'address' },
+      { indexed: false, name: 'amount', type: 'uint256' },
+      { indexed: true, name: 'from', type: 'address' },
+      { indexed: false, name: 'shares', type: 'uint256' },
+    ],
+    name: 'Exit',
+    type: 'event',
+  },
 ] as const
 
 const tip20ChannelReserve = Addresses.tip20ChannelReserve
@@ -4183,6 +4196,53 @@ function classifyFromLogsCore(
     return undefined
   })
 
+  // BoringVault pays `to` directly; fold its payout like an ERC-4626 withdrawal.
+  recognize(named('Exit'), (event) => {
+    const args = event.args as {
+      amount: bigint
+      asset: Address.Address
+      from: Address.Address
+      shares: bigint
+      to: Address.Address
+    }
+    const vault = event.address as Address.Address
+    // Parse before claiming so a malformed event consumes nothing but itself.
+    const data = {
+      assets: args.amount.toString(),
+      caller: lc(args.from),
+      receiver: lc(args.to),
+      sharesBurned: args.shares.toString(),
+      signer,
+      status: 'completed' as const,
+      vault: lc(vault),
+    }
+    // Shares and payout are often equal, so pair only this Exit's own share burn
+    // and `asset` payout to `to`, leaving same-sized vault transfers visible.
+    const burn = takeTransfer((leg) => {
+      const { amount, from, to } = transferArgs(leg)
+      return (
+        Address.isEqual(leg.address, vault) &&
+        Address.isEqual(from, args.from) &&
+        Address.isEqual(to, zeroAddress as Address.Address) &&
+        amount === args.shares
+      )
+    })
+    const payout = takeTransfer((leg) => {
+      const { amount, from, to } = transferArgs(leg)
+      return (
+        Address.isEqual(leg.address, args.asset) &&
+        Address.isEqual(from, vault) &&
+        Address.isEqual(to, args.to) &&
+        amount === args.amount
+      )
+    })
+    const legs = [burn, payout].filter((leg) => leg !== undefined)
+    const item = { ...itemBase(event.logIndex), data, type: 'assets-withdrawn' as const }
+    if (viewerInvolved([args.from, args.to], legs)) return item
+    suppressedVaultItems.push(item)
+    return undefined
+  })
+
   recognize(named('Deposit'), (event) => {
     const args = event.args as {
       assets: bigint