tapimo 0.9.0 → 0.10.1

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

@@ -248,6 +248,146 @@ export namespace schema {
 
   /** The classified activity item variants (discriminated by `type`). */
   export const items = [
+    z
+      .object({
+        ...base,
+        data: z.object({
+          assets: Schema.DecimalString,
+          caller: Schema.Address,
+          receiver: Schema.Address,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('assets-deposited'),
+      })
+      .check(z.meta({ title: 'Assets deposited' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          caller: Schema.Address,
+          receivedEngineShares: Schema.DecimalString,
+          receiver: Schema.Address,
+          requestedVenueShares: Schema.DecimalString,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('shares-deposited'),
+      })
+      .check(z.meta({ title: 'Shares deposited' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          assets: Schema.DecimalString,
+          caller: Schema.Address,
+          receiver: Schema.Address,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('shares-redeemed'),
+      })
+      .check(z.meta({ title: 'Shares redeemed' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          assets: Schema.DecimalString,
+          caller: Schema.Address,
+          sharesBurned: Schema.DecimalString,
+          receiver: Schema.Address,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('assets-withdrawn'),
+      })
+      .check(z.meta({ title: 'Assets withdrawn' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          receiver: Schema.Address,
+          requestId: Schema.Hash,
+          requester: Schema.Address,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('pending'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('shares-redemption-requested'),
+      })
+      .check(z.meta({ title: 'Share redemption requested' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          asset: Schema.Address,
+          assets: Schema.DecimalString,
+          receiver: Schema.Address,
+          requestId: Schema.Hash,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('shares-redemption-finalized'),
+      })
+      .check(z.meta({ title: 'Share redemption finalized' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          receiver: Schema.Address,
+          requestId: Schema.Hash,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('cancelled'),
+          vault: Schema.Address,
+        }),
+        type: z.literal('shares-redemption-cancelled'),
+      })
+      .check(z.meta({ title: 'Share redemption cancelled' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          actionId: Schema.Hash,
+          assets: Schema.DecimalString,
+          inputAmount: Schema.DecimalString,
+          inputToken: Schema.Address,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+          zoneDepositHash: Schema.Hash,
+        }),
+        type: z.literal('private-assets-deposited'),
+      })
+      .check(z.meta({ title: 'Private assets deposited' })),
+    z
+      .object({
+        ...base,
+        data: z.object({
+          actionId: Schema.Hash,
+          assets: Schema.DecimalString,
+          outputAmount: Schema.DecimalString,
+          outputToken: Schema.Address,
+          shares: Schema.DecimalString,
+          signer: Signer,
+          status: z.literal('completed'),
+          vault: Schema.Address,
+          zoneDepositHash: Schema.Hash,
+        }),
+        type: z.literal('private-shares-redeemed'),
+      })
+      .check(z.meta({ title: 'Private shares redeemed' })),
     z
       .object({
         ...base,
@@ -1550,9 +1690,11 @@ type RawItem = {
  * OpenAPI schema titles. Used to stamp {@link Item.title} during {@link list}.
  */
 const titleByType: Record<Item['type'], string> = {
-  approval: 'Allowance approved',
   'access-key-created': 'Access key created',
   'access-key-revoked': 'Access key revoked',
+  approval: 'Allowance approved',
+  'assets-deposited': 'Assets deposited',
+  'assets-withdrawn': 'Assets withdrawn',
   'blacklist-updated': 'Blacklist updated',
   burn: 'Token burned',
   'burn-blocked': 'Burn blocked',
@@ -1581,11 +1723,18 @@ const titleByType: Record<Item['type'], string> = {
   'pair-created': 'Trading pair created',
   'policy-admin-set': 'Policy admin set',
   'policy-created': 'Policy created',
+  'private-assets-deposited': 'Private assets deposited',
+  'private-shares-redeemed': 'Private shares redeemed',
   'reward-distributed': 'Reward distributed',
   'reward-recipient-set': 'Reward recipient set',
   'role-admin-set': 'Role admin set',
   'role-membership-set': 'Role membership set',
   'session-closed': 'Session closed',
+  'shares-deposited': 'Shares deposited',
+  'shares-redeemed': 'Shares redeemed',
+  'shares-redemption-cancelled': 'Share redemption cancelled',
+  'shares-redemption-finalized': 'Share redemption finalized',
+  'shares-redemption-requested': 'Share redemption requested',
   'spending-limit-updated': 'Spending limit updated',
   swap: 'Tokens swapped',
   'token-created': 'Token created',
@@ -1624,6 +1773,15 @@ const titleByEventName: Record<string, string> = {
   BlacklistUpdated: 'Blacklist updated',
   Burn: 'Token burned',
   BurnBlocked: 'Burn blocked',
+  Deposited: 'Assets deposited',
+  EarnDeposit: 'Private assets deposited',
+  EarnRedeem: 'Private shares redeemed',
+  RedeemCancelled: 'Share redemption cancelled',
+  RedeemFinalized: 'Share redemption finalized',
+  RedeemRequested: 'Share redemption requested',
+  Redeemed: 'Shares redeemed',
+  VenueSharesDeposited: 'Shares deposited',
+  WithdrewExact: 'Assets withdrawn',
   ChannelClosed: 'Channel closed',
   ChannelOpened: 'Channel opened',
   CloseRequestCancelled: 'Channel close cancelled',
@@ -1853,7 +2011,7 @@ export function addresses(options: addresses.Options = {}) {
       const { address } = c.req.valid('param')
       const query = c.req.valid('query')
 
-      // Cursor pages carry current valuations and curated verification data.
+      // Cursor pages can carry current valuations and curated verification data.
       if (query.cursor !== undefined) Cache.setPolicy(c, Cache.policies.metadata)
 
       try {
@@ -1884,7 +2042,7 @@ export function addresses(options: addresses.Options = {}) {
         // Build immutable token and structured amount copies from RPC metadata.
         const { items, rates } = await enrichTokens(c, {
           chainId,
-          denomination: query['valuation.currency'] ?? 'USD',
+          denomination: query['valuation.currency'],
           include: query.include,
           items: unenrichedItems,
           oracle,
@@ -1964,7 +2122,7 @@ export function transactions(options: transactions.Options = {}) {
     }),
     Cache.response<App.Environment>({
       // Default to no-store so a 404 does not mask the eventual mined result.
-      // Successful responses use the metadata policy for current valuations.
+      // Successful responses use the metadata policy for optional valuations.
       cacheControl: Cache.policies.noStore,
       name: 'tempo-api:transactions:v1',
       key: (c) => Cache.urlKey(c, schema.getTransactionActivities.Query),
@@ -2012,13 +2170,13 @@ export function transactions(options: transactions.Options = {}) {
             status: 404,
           })
 
-        // Mined activity still carries current valuations and verification data.
+        // Mined activity can carry current valuations and verification data.
         Cache.setPolicy(c, Cache.policies.metadata)
 
         // Build immutable token and structured amount copies from RPC metadata.
         const { items, rates } = await enrichTokens(c, {
           chainId,
-          denomination: query['valuation.currency'] ?? 'USD',
+          denomination: query['valuation.currency'],
           include: query.include,
           items: unenrichedItems,
           oracle,
@@ -2697,6 +2855,243 @@ function classifyFromLogsCore(
       'amount' in e.args,
   )
 
+  const privateDeposit = finalEvents.find((event) => event.eventName === 'EarnDeposit')
+  if (privateDeposit) {
+    const args = privateDeposit.args as {
+      actionId: Hex.Hex
+      earnShares: bigint
+      earnVault: Address.Address
+      inputAmount: bigint
+      inputToken: Address.Address
+      vaultAssets: bigint
+      zoneDepositHash: Hex.Hex
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(privateDeposit)),
+        data: {
+          actionId: args.actionId,
+          assets: args.vaultAssets.toString(),
+          inputAmount: args.inputAmount.toString(),
+          inputToken: args.inputToken.toLowerCase() as Address.Address,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'completed',
+          vault: args.earnVault.toLowerCase() as Address.Address,
+          zoneDepositHash: args.zoneDepositHash,
+        },
+        type: 'private-assets-deposited',
+      },
+    ]
+  }
+
+  const privateRedeem = finalEvents.find((event) => event.eventName === 'EarnRedeem')
+  if (privateRedeem) {
+    const args = privateRedeem.args as {
+      actionId: Hex.Hex
+      earnShares: bigint
+      earnVault: Address.Address
+      outputAmount: bigint
+      outputToken: Address.Address
+      vaultAssets: bigint
+      zoneDepositHash: Hex.Hex
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(privateRedeem)),
+        data: {
+          actionId: args.actionId,
+          assets: args.vaultAssets.toString(),
+          outputAmount: args.outputAmount.toString(),
+          outputToken: args.outputToken.toLowerCase() as Address.Address,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'completed',
+          vault: args.earnVault.toLowerCase() as Address.Address,
+          zoneDepositHash: args.zoneDepositHash,
+        },
+        type: 'private-shares-redeemed',
+      },
+    ]
+  }
+
+  const deposited = finalEvents.find((event) => event.eventName === 'Deposited')
+  if (deposited) {
+    const args = deposited.args as {
+      assets: bigint
+      caller: Address.Address
+      earnShares: bigint
+      receiver: Address.Address
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(deposited)),
+        data: {
+          assets: args.assets.toString(),
+          caller: args.caller.toLowerCase() as Address.Address,
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'completed',
+          vault: deposited.address.toLowerCase() as Address.Address,
+        },
+        type: 'assets-deposited',
+      },
+    ]
+  }
+
+  const venueDeposit = finalEvents.find((event) => event.eventName === 'VenueSharesDeposited')
+  if (venueDeposit) {
+    const args = venueDeposit.args as {
+      caller: Address.Address
+      earnShares: bigint
+      receivedEngineShares: bigint
+      receiver: Address.Address
+      requestedVenueShares: bigint
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(venueDeposit)),
+        data: {
+          caller: args.caller.toLowerCase() as Address.Address,
+          receivedEngineShares: args.receivedEngineShares.toString(),
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          requestedVenueShares: args.requestedVenueShares.toString(),
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'completed',
+          vault: venueDeposit.address.toLowerCase() as Address.Address,
+        },
+        type: 'shares-deposited',
+      },
+    ]
+  }
+
+  const redeemed = finalEvents.find((event) => event.eventName === 'Redeemed')
+  if (redeemed) {
+    const args = redeemed.args as {
+      assets: bigint
+      caller: Address.Address
+      earnShares: bigint
+      receiver: Address.Address
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(redeemed)),
+        data: {
+          assets: args.assets.toString(),
+          caller: args.caller.toLowerCase() as Address.Address,
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'completed',
+          vault: redeemed.address.toLowerCase() as Address.Address,
+        },
+        type: 'shares-redeemed',
+      },
+    ]
+  }
+
+  const withdrew = finalEvents.find((event) => event.eventName === 'WithdrewExact')
+  if (withdrew) {
+    const args = withdrew.args as {
+      assets: bigint
+      caller: Address.Address
+      earnSharesBurned: bigint
+      receiver: Address.Address
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(withdrew)),
+        data: {
+          assets: args.assets.toString(),
+          caller: args.caller.toLowerCase() as Address.Address,
+          sharesBurned: args.earnSharesBurned.toString(),
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          signer,
+          status: 'completed',
+          vault: withdrew.address.toLowerCase() as Address.Address,
+        },
+        type: 'assets-withdrawn',
+      },
+    ]
+  }
+
+  const requested = finalEvents.find((event) => event.eventName === 'RedeemRequested')
+  if (requested) {
+    const args = requested.args as {
+      earnShares: bigint
+      receiver: Address.Address
+      requestId: Hex.Hex
+      requester: Address.Address
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(requested)),
+        data: {
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          requestId: args.requestId,
+          requester: args.requester.toLowerCase() as Address.Address,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'pending',
+          vault: requested.address.toLowerCase() as Address.Address,
+        },
+        type: 'shares-redemption-requested',
+      },
+    ]
+  }
+
+  const finalized = finalEvents.find((event) => event.eventName === 'RedeemFinalized')
+  if (finalized) {
+    const args = finalized.args as {
+      asset: Address.Address
+      assets: bigint
+      earnShares: bigint
+      receiver: Address.Address
+      requestId: Hex.Hex
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(finalized)),
+        data: {
+          asset: args.asset.toLowerCase() as Address.Address,
+          assets: args.assets.toString(),
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          requestId: args.requestId,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'completed',
+          vault: finalized.address.toLowerCase() as Address.Address,
+        },
+        type: 'shares-redemption-finalized',
+      },
+    ]
+  }
+
+  const cancelled = finalEvents.find((event) => event.eventName === 'RedeemCancelled')
+  if (cancelled) {
+    const args = cancelled.args as {
+      earnShares: bigint
+      receiver: Address.Address
+      requestId: Hex.Hex
+    }
+    return [
+      {
+        ...itemBase(logIndexOfEvent(cancelled)),
+        data: {
+          receiver: args.receiver.toLowerCase() as Address.Address,
+          requestId: args.requestId,
+          shares: args.earnShares.toString(),
+          signer,
+          status: 'cancelled',
+          vault: cancelled.address.toLowerCase() as Address.Address,
+        },
+        type: 'shares-redemption-cancelled',
+      },
+    ]
+  }
+
   // Swap: a transfer into the DEX paired with one out of the DEX.
   const toDex = transfers.find((e) =>
     Address.isEqual((e.args as { to: Address.Address }).to, Addresses.stablecoinDex),
@@ -3954,7 +4349,11 @@ function decodeRows(rows: readonly Row[]) {
     transactionHash: r.txHash as `0x${string}`,
     transactionIndex: r.txIdx,
   }))
-  return parseEventLogs({ abi: [...Abis.abis], logs: viemLogs, strict: false })
+  return parseEventLogs({
+    abi: [...Abis.abis, ...Abis.earnRouter, ...Abis.earnVault],
+    logs: viemLogs,
+    strict: false,
+  })
 }
 
 /**
@@ -4088,27 +4487,27 @@ async function enrichTokens(
   const { chainId, denomination, include, items, oracle } = options
   const addresses = new Set<Address.Address>()
   for (const item of items) collectTokens(item, addresses)
-  // Valuation keys off the curated snapshot; a snapshot failure degrades the
-  // values to `null` rather than failing the feed.
+  const includeLogoUri = include.includes('token.logoUri')
+  const includeVerified = include.includes('token.verified')
+  // Curated data is needed only for requested valuation or token fields.
   const snapshot =
-    addresses.size > 0
+    addresses.size > 0 && (denomination !== undefined || includeLogoUri || includeVerified)
       ? await VerifiedTokens.snapshot(c, chainId).catch(() => undefined)
       : undefined
-  const rates = await Valuation.ratesFor(c, {
-    currencies: snapshot
-      ? [...addresses].flatMap((address) => {
-          const held = snapshot.byAddress.get(address)?.currency
-          return held === undefined ? [] : [held]
-        })
-      : [],
-    denomination,
-    oracle,
-  })
+  const rates = denomination
+    ? await Valuation.ratesFor(c, {
+        currencies: snapshot
+          ? [...addresses].flatMap((address) => {
+              const held = snapshot.byAddress.get(address)?.currency
+              return held === undefined ? [] : [held]
+            })
+          : [],
+        denomination,
+        oracle,
+      })
+    : undefined
   if (addresses.size === 0) return { items: items as Item[], rates }
 
-  const includeLogoUri = include.includes('token.logoUri')
-  const includeVerified = include.includes('token.verified')
-
   const resolved = await Timing.time(c, 'tokens', () =>
     Promise.all(
       [...addresses].map(async (address) => {
@@ -4145,7 +4544,7 @@ declare namespace enrichTokens {
   type Options = {
     chainId: z.output<typeof Schema.ChainId>
     /** Currency the amount valuations are denominated in (uppercase). */
-    denomination: string
+    denomination?: string | undefined
     include: readonly z.output<typeof schema.Include>[]
     items: readonly UnenrichedItem[]
     /** FX rate oracle backing amount valuation. */
@@ -4173,13 +4572,17 @@ function enrichItem(
         currency: meta.currency,
         decimals: meta.decimals,
       }),
-      // Valued via the curated display currency, never the on-chain metadata.
-      valuation: Valuation.valuationFor({
-        amount: BigInt(t.amount),
-        denomination: valuation.denomination,
-        rates: valuation.rates,
-        token: valuation.snapshot?.byAddress.get(t.address.toLowerCase()),
-      }),
+      ...(valuation.denomination
+        ? {
+            // Valued via the curated display currency, never the on-chain metadata.
+            valuation: Valuation.valuationFor({
+              amount: BigInt(t.amount),
+              denomination: valuation.denomination,
+              rates: valuation.rates,
+              token: valuation.snapshot?.byAddress.get(t.address.toLowerCase()),
+            }),
+          }
+        : {}),
     }
     data[key] = {
       address: t.address,
@@ -4198,7 +4601,7 @@ declare namespace enrichItem {
   /** Valuation inputs threaded from {@link enrichTokens}. */
   type Valuation = {
     /** Currency the amount valuations are denominated in (uppercase). */
-    denomination: string
+    denomination?: string | undefined
     /** Oracle rate set, when loaded. */
     rates: FxOracle.RateSet | undefined
     /** Compiled verified-token snapshot, when available. */

package/src/apps/data/routes/balances.bench.ts

@@ -0,0 +1,21 @@
+import * as QueryBench from '../../../../test/QueryBench.js'
+
+const address = '0x68f94cfca22e5969c0553bbeab00a2acde88939b'
+
+QueryBench.bench({
+  name: 'getAddressBalances',
+  path: `/v1/addresses/${address}/balances`,
+  queries: [
+    'currency=USD',
+    'feeEligible=true',
+    'include=totalCount',
+    'valuation.currency=USD',
+    'verified=true',
+  ],
+})
+
+QueryBench.bench({
+  name: 'getAddressBalance',
+  path: `/v1/addresses/${address}/balances/${QueryBench.pathUsd}`,
+  queries: ['valuation.currency=USD'],
+})