tapimo 0.10.0 → 0.10.2

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',
@@ -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,
+  })
 }
 
 /**

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'],
+})

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

@@ -374,13 +374,15 @@ export function addresses(options: addresses.Options = {}) {
               Tokens.resolveToken(c, { address: token, chainId, include: [], snapshot }),
             ),
           )
+          const client = c.get('getClient')(chainId)
+          const caller = c.get('zones').has(chainId) ? address : undefined
           const [balance, feeTokens, snapshot, resolvedToken] = await Promise.all([
             Timing.time(c, 'balance_rpc', async () => {
-              const result = await Actions.token.getBalance(c.get('getClient')(chainId), {
+              const call = Actions.token.getBalance.call(client, {
                 account: address,
                 token,
               })
-              return result.amount
+              return client.readContract({ ...call, account: caller })
             }),
             FeeAmm.feeTokenSet(c, chainId).catch(() => undefined),
             snapshotPromise,
@@ -512,16 +514,18 @@ async function getAddressBalances(
   const correctedPromise = holdingsPromise.then(async (holdings) => {
     if (holdings.length === 0) return []
     const client = c.get('getClient')(chainId)
+    const caller = c.get('zones').has(chainId) ? address : undefined
     return Timing.time(c, 'balances_rpc', async () => {
       // Concurrent reads enter viem's shared batch window and become one
       // deployless multicall. A failed read fails the request rather than serving
       // a stale or partial balance page.
       const results = await Promise.all(
         holdings.map(async (holding) => {
-          const { amount } = await Actions.token.getBalance(client, {
+          const call = Actions.token.getBalance.call(client, {
             account: address,
             token: holding.address,
           })
+          const amount = await client.readContract({ ...call, account: caller })
           return amount === 0n ? undefined : { address: holding.address, amount: amount.toString() }
         }),
       )

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

@@ -0,0 +1,34 @@
+import * as QueryBench from '../../../../test/QueryBench.js'
+
+const fixtures = {
+  4217: { number: 34_335_551, timestamp: 1_786_485_830 },
+  42431: { number: 30_469_074, timestamp: 1_786_485_831 },
+} as const
+
+QueryBench.bench({ name: 'getBlocks', path: '/v1/blocks' })
+
+QueryBench.bench({
+  name: 'getBlock',
+  path: {
+    4217: `/v1/blocks/${fixtures[4217].number}`,
+    42431: `/v1/blocks/${fixtures[42431].number}`,
+  },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'getBlockByTimestamp',
+  path: {
+    4217: `/chains/4217/blocks/by-timestamp?closest=before&timestamp=${fixtures[4217].timestamp}`,
+    42431: `/chains/42431/blocks/by-timestamp?closest=before&timestamp=${fixtures[42431].timestamp}`,
+  },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'getBlockByTimestamp?closest=after',
+  path: {
+    4217: `/chains/4217/blocks/by-timestamp?closest=after&timestamp=${fixtures[4217].timestamp}`,
+    42431: `/chains/42431/blocks/by-timestamp?closest=after&timestamp=${fixtures[42431].timestamp}`,
+  },
+})

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

@@ -0,0 +1,53 @@
+import * as QueryBench from '../../../../test/QueryBench.js'
+
+const pairId = {
+  4217: '0xc91fa403390f4eaf7f555b1ee33f54408befc79c5665728a2ac7e7ffa39c42ef',
+  42431: '0xb2b3f6d58ad8554d56200ebcd347ee2461a07276b764e0c0daf56b192bc7d341',
+} as const
+
+const block = { 4217: 34_335_551, 42431: 30_469_074 } as const
+
+QueryBench.bench({
+  chainId: false,
+  name: 'coingeckoLatestBlock',
+  path: { 4217: '/gecko/4217/latest-block', 42431: '/gecko/42431/latest-block' },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'coingeckoAsset',
+  path: {
+    4217: `/gecko/4217/assets/${QueryBench.pathUsd}`,
+    42431: `/gecko/42431/assets/${QueryBench.pathUsd}`,
+  },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'coingeckoPairs',
+  path: { 4217: '/gecko/4217/pairs', 42431: '/gecko/42431/pairs' },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'coingeckoPair',
+  path: {
+    4217: `/gecko/4217/pairs/${pairId[4217]}`,
+    42431: `/gecko/42431/pairs/${pairId[42431]}`,
+  },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'coingeckoEvents',
+  path: { 4217: '/gecko/4217/events', 42431: '/gecko/42431/events' },
+})
+
+QueryBench.bench({
+  chainId: false,
+  name: 'coingeckoEvents?fromBlock&toBlock',
+  path: {
+    4217: `/gecko/4217/events?fromBlock=${block[4217] - 100}&toBlock=${block[4217]}`,
+    42431: `/gecko/42431/events?fromBlock=${block[42431] - 100}&toBlock=${block[42431]}`,
+  },
+})

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

@@ -0,0 +1,71 @@
+import * as QueryBench from '../../../../test/QueryBench.js'
+
+const fixtures = {
+  4217: {
+    address: '0xbe058e1c4df8a4366a387bf595b284246a93039e',
+    vault: '0xf06e5740e5c72f61a10cf8149fa145fee48e560e',
+  },
+  42431: {
+    address: '0x68f94cfca22e5969c0553bbeab00a2acde88939b',
+    vault: '0xf4ae63687d6753a78e7f551d2eda1d0d31a5ea3a',
+  },
+} as const
+
+const vaultQueries = [
+  'apy.window=1d',
+  'include=access',
+  'include=apy',
+  'include=capabilities',
+  'include=token.logoUri',
+  'include=tvl',
+  'include=zone',
+] as const
+
+const collectionQueries = ['capability=deposit', ...vaultQueries] as const
+
+QueryBench.bench({
+  name: 'getEarnVaults',
+  path: '/v1/earn/vaults',
+  queries: collectionQueries,
+})
+
+QueryBench.bench({
+  name: 'getVerifiedEarnVaults',
+  path: '/v1/earn/vaults/verified',
+  queries: collectionQueries,
+})
+
+QueryBench.bench({
+  name: 'getEarnAddressPositions',
+  path: {
+    4217: `/v1/earn/addresses/${fixtures[4217].address}/positions`,
+    42431: `/v1/earn/addresses/${fixtures[42431].address}/positions`,
+  },
+  queries: ['valuation.currency=USD', 'verified=true'],
+})
+
+QueryBench.bench({
+  name: 'getEarnVaultPosition',
+  path: {
+    4217: `/v1/earn/vaults/${fixtures[4217].vault}/positions/${fixtures[4217].address}`,
+    42431: `/v1/earn/vaults/${fixtures[42431].vault}/positions/${fixtures[42431].address}`,
+  },
+})
+
+QueryBench.bench({
+  name: 'getEarnVaultEarnings',
+  path: {
+    4217: `/v1/earn/vaults/${fixtures[4217].vault}/earnings/${fixtures[4217].address}`,
+    42431: `/v1/earn/vaults/${fixtures[42431].vault}/earnings/${fixtures[42431].address}`,
+  },
+  queries: ['period=30d', 'period=active'],
+})
+
+QueryBench.bench({
+  name: 'getEarnVault',
+  path: {
+    4217: `/v1/earn/vaults/${fixtures[4217].vault}`,
+    42431: `/v1/earn/vaults/${fixtures[42431].vault}`,
+  },
+  queries: vaultQueries,
+})