@w3lib/solana-batch-call 0.5.0 → 0.7.0

package/src/lp.ts

@@ -1,11 +1,25 @@
 import { sha256 } from '@noble/hashes/sha2.js'
 import { base64 } from '@scure/base'
 
-import { decodeAddress, encodeAddress, findProgramAddress, isAddress } from './address.js'
+import { decodeAddress, findProgramAddress, InvalidAddressError, isAddress } from './address.js'
 import type { RequestOptions, SolanaClient } from './client.js'
 import { formatUnits, parseMint, parseTokenAccount, type AccountInfo } from './layout.js'
 import { AllNodesFailedError, HttpError, RpcError } from './rpc.js'
-import { getAmountsForLiquidity, getFeeGrowthInside, getFeesOwed, orcaSqrtPriceAtTick, raydiumSqrtPriceAtTick, sqrtPriceToPrice, tickToPrice, type TickFeeData } from './lpMath.js'
+import { boundedSet, mapPool } from './util.js'
+import { Bytes } from './bytes.js'
+import {
+  getAmountsForLiquidity,
+  getFeeGrowthInside,
+  getFeesOwed,
+  getRewardGrowthInside,
+  orcaSqrtPriceAtTick,
+  raydiumSqrtPriceAtTick,
+  rewardGrowthGlobal,
+  sqrtPriceToPrice,
+  tickToPrice,
+  type RewardEmission,
+  type TickFeeData,
+} from './lpMath.js'
 import { defillamaPrices, type SolanaPriceSource } from './price.js'
 
 export const RAYDIUM_CLMM_PROGRAM_ID = 'CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK'
@@ -97,6 +111,24 @@ export interface SolanaLpClmmPosition extends SolanaLpPositionBase {
   fees1Formatted: string | null
   /** 开启 prices 时：未领取手续费的美元价值（手续费为 null 或缺价格时为 null） */
   feesUsd?: number | null
+  /** 开启 rewards 时：未领取的挖矿奖励（池子里已初始化的每个奖励一项，数量为 0 的也在） */
+  rewards?: SolanaLpReward[]
+  /** 开启 rewards 和 prices 时：未领取挖矿奖励的美元价值（有数量的奖励缺价格或读不到时为 null） */
+  rewardsUsd?: number | null
+}
+
+/** 集中流动性仓位未领取的挖矿奖励（Raydium CLMM reward_infos / Orca Whirlpool reward_infos） */
+export interface SolanaLpReward {
+  /** 奖励在池子里的位置（0~2） */
+  index: number
+  mint: string
+  symbol: string | null
+  decimals: number | null
+  /** 未领取的数量（最小单位）：已记账的 + 按池子最新状态结算的新增；读不到两端的 tick 数据时为 null */
+  amount: string | null
+  formatted: string | null
+  /** 开启 prices 时：美元价值（没有价格时为 null） */
+  usd?: number | null
 }
 
 export type SolanaLpPosition = SolanaLpAmmPosition | SolanaLpClmmPosition
@@ -116,6 +148,13 @@ export interface LpPositionsOptions extends RequestOptions {
   pools?: readonly string[]
   /** 返回已清空的仓位（流动性为 0、手续费也领完，NFT 还在）。默认 false */
   includeClosed?: boolean
+  /**
+   * 集中流动性仓位同时算未领取的挖矿奖励（Raydium CLMM 农场奖励、Orca 的奖励 slot），放在 rewards 字段，照搬程序的结算：
+   * 池子的奖励增长按时间摊给当前流动性，再按仓位区间内的增长计算。默认 false。有奖励没领的仓位不算“已清空”
+   */
+  rewards?: boolean
+  /** rewards 结算到哪个时刻（unix 秒），默认当前时间；链上用的是区块时间，差几秒影响很小 */
+  now?: number
   /** 查美元价值：true 用 DefiLlama，也可以传自己的 SolanaPriceSource（如 /price 的 combinePrices([defillamaPrices(), onchainPrices()])）。默认不查 */
   prices?: boolean | SolanaPriceSource
   /**
@@ -131,35 +170,10 @@ export interface LpPositionsOptions extends RequestOptions {
 // 账户布局（各程序的 Anchor / 原生账户，偏移量含 8 字节判别符）
 // ---------------------------------------------------------------------------
 
-/** 小端读取账户数据（添加 / 移除流动性也用） */
-export class Bytes {
-  readonly #view: DataView
-  constructor(readonly data: Uint8Array) {
-    this.#view = new DataView(data.buffer, data.byteOffset, data.byteLength)
-  }
-  u8(o: number): number {
-    return this.#view.getUint8(o)
-  }
-  u16(o: number): number {
-    return this.#view.getUint16(o, true)
-  }
-  u32(o: number): number {
-    return this.#view.getUint32(o, true)
-  }
-  i32(o: number): number {
-    return this.#view.getInt32(o, true)
-  }
-  u64(o: number): bigint {
-    return this.#view.getBigUint64(o, true)
-  }
-  u128(o: number): bigint {
-    return (this.#view.getBigUint64(o + 8, true) << 64n) | this.#view.getBigUint64(o, true)
-  }
-  key(o: number): string {
-    return encodeAddress(this.data.subarray(o, o + 32))
-  }
-}
+// 小端读取账户数据：公共的 Bytes（添加 / 移除流动性也从这里引用）
+export { Bytes }
 
+const ZERO_ADDRESS = '11111111111111111111111111111111'
 const RAYDIUM_POSITION_SIZE = 281
 const ORCA_POSITION_SIZE = 216
 /** 池子账户至少要读到的长度（Raydium PoolState 实际 1544 字节，Orca Whirlpool 653 字节） */
@@ -172,7 +186,7 @@ const RAYDIUM_TICK_SIZE = 168
 const ORCA_TICK_ARRAY_SIZE = 88
 const ORCA_TICK_SIZE = 113
 
-interface ClmmPositionState {
+export interface ClmmPositionState {
   protocol: 'raydium-clmm' | 'orca-whirlpool'
   address: string
   mint: string
@@ -184,8 +198,12 @@ interface ClmmPositionState {
   growthLast1: bigint
   owed0: bigint
   owed1: bigint
+  /** 三个挖矿奖励：上次记录的区间内增长、已记账未领取的数量 */
+  rewards: Array<{ growthLast: bigint; owed: bigint }>
 }
 
+const positionRewards = (b: Bytes, offset: number) => [0, 1, 2].map((i) => ({ growthLast: b.u128(offset + i * 24), owed: b.u64(offset + i * 24 + 16) }))
+
 function raydiumPosition(address: string, b: Bytes): ClmmPositionState {
   return {
     protocol: 'raydium-clmm',
@@ -199,6 +217,7 @@ function raydiumPosition(address: string, b: Bytes): ClmmPositionState {
     growthLast1: b.u128(113),
     owed0: b.u64(129),
     owed1: b.u64(137),
+    rewards: positionRewards(b, 145),
   }
 }
 
@@ -215,7 +234,19 @@ function orcaPosition(address: string, b: Bytes): ClmmPositionState {
     owed0: b.u64(112),
     growthLast1: b.u128(120),
     owed1: b.u64(136),
+    rewards: positionRewards(b, 144),
+  }
+}
+
+/** 按程序和账户大小解析仓位账户（Raydium PersonalPositionState 281 字节、Orca Position 216 字节）；不是仓位账户时为 null */
+export function parseClmmPosition(protocol: 'raydium-clmm' | 'orca-whirlpool', address: string, account: AccountInfo): ClmmPositionState | null {
+  if (protocol === 'raydium-clmm' && account.owner === RAYDIUM_CLMM_PROGRAM_ID && account.data.length === RAYDIUM_POSITION_SIZE) {
+    return raydiumPosition(address, new Bytes(account.data))
   }
+  if (protocol === 'orca-whirlpool' && account.owner === ORCA_WHIRLPOOL_PROGRAM_ID && account.data.length === ORCA_POSITION_SIZE) {
+    return orcaPosition(address, new Bytes(account.data))
+  }
+  return null
 }
 
 interface ClmmPoolState {
@@ -231,6 +262,41 @@ interface ClmmPoolState {
   /** Orca：池子里的费率；Raydium：在 AmmConfig 里，ammConfig 为它的地址 */
   fee: number | null
   ammConfig: string | null
+  /** 当前区间内的流动性 */
+  liquidity: bigint
+  /** 已初始化的挖矿奖励（index 是在池子里的位置） */
+  rewards: Array<{ index: number; mint: string; emission: RewardEmission }>
+}
+
+const U64_MAX_VALUE = (1n << 64n) - 1n
+
+/** Raydium reward_infos（每个 169 字节，从 397 开始）：open_time +1、end_time +9、last_update_time +17、emissions_per_second_x64 +25、mint +57、growth_global +153 */
+function raydiumRewards(b: Bytes): ClmmPoolState['rewards'] {
+  if (b.data.length < 397 + 3 * 169) {
+    return []
+  }
+  return [0, 1, 2].flatMap((index) => {
+    const o = 397 + index * 169
+    const mint = b.key(o + 57)
+    return mint === ZERO_ADDRESS
+      ? []
+      : [{ index, mint, emission: { initialized: true, openTime: b.u64(o + 1), endTime: b.u64(o + 9), lastUpdated: b.u64(o + 17), emissionsPerSecondX64: b.u128(o + 25), growthGlobalX64: b.u128(o + 153) } }]
+  })
+}
+
+/** Orca reward_last_updated_timestamp（261）和 reward_infos（每个 128 字节，从 269 开始）：mint +0、emissions_per_second_x64 +96、growth_global +112 */
+function orcaRewards(b: Bytes): ClmmPoolState['rewards'] {
+  if (b.data.length < 269 + 3 * 128) {
+    return []
+  }
+  const lastUpdated = b.u64(261)
+  return [0, 1, 2].flatMap((index) => {
+    const o = 269 + index * 128
+    const mint = b.key(o)
+    return mint === ZERO_ADDRESS
+      ? []
+      : [{ index, mint, emission: { initialized: true, openTime: 0n, endTime: U64_MAX_VALUE, lastUpdated, emissionsPerSecondX64: b.u128(o + 96), growthGlobalX64: b.u128(o + 112) } }]
+  })
 }
 
 function raydiumPool(b: Bytes): ClmmPoolState {
@@ -246,6 +312,8 @@ function raydiumPool(b: Bytes): ClmmPoolState {
     global0: b.u128(277),
     global1: b.u128(293),
     fee: null,
+    liquidity: b.u128(237),
+    rewards: raydiumRewards(b),
   }
 }
 
@@ -262,6 +330,8 @@ function orcaPool(b: Bytes): ClmmPoolState {
     global1: b.u128(245),
     decimals0: null,
     decimals1: null,
+    liquidity: b.u128(49),
+    rewards: orcaRewards(b),
   }
 }
 
@@ -346,7 +416,9 @@ export function orcaTickArray(pool: string, tick: number, spacing: number): { ad
   return { address: findProgramAddress([utf8('tick_array'), decodeAddress(pool), utf8(String(start))], ORCA_WHIRLPOOL_PROGRAM_ID), start }
 }
 
-function raydiumTick(account: AccountInfo, start: number, tick: number, spacing: number): TickFeeData | null {
+const rewardOutside = (b: Bytes, offset: number) => [b.u128(offset), b.u128(offset + 16), b.u128(offset + 32)]
+
+export function raydiumTick(account: AccountInfo, start: number, tick: number, spacing: number): TickFeeData | null {
   raydiumDiscriminator ??= discriminator('TickArrayState')
   const offset = 44 + ((tick - start) / spacing) * RAYDIUM_TICK_SIZE
   // 先认判别符、查长度再读字段（PDA 上可能是别的账户，如被转过 SOL 的系统账户）
@@ -358,7 +430,7 @@ function raydiumTick(account: AccountInfo, start: number, tick: number, spacing:
     return null
   }
   // Raydium 不区分是否初始化：没用过的 tick 各项都是 0，按程序的公式算出来就是对的
-  return { initialized: true, feeGrowthOutside0: b.u128(offset + 36), feeGrowthOutside1: b.u128(offset + 52) }
+  return { initialized: true, feeGrowthOutside0: b.u128(offset + 36), feeGrowthOutside1: b.u128(offset + 52), rewardGrowthsOutside: rewardOutside(b, offset + 68) }
 }
 
 /** Anchor 账户判别符：sha256("account:<名称>") 的前 8 字节 */
@@ -367,7 +439,7 @@ let orcaDiscriminators: { fixed: Uint8Array; dynamic: Uint8Array } | undefined
 let raydiumDiscriminator: Uint8Array | undefined
 const startsWith = (data: Uint8Array, prefix: Uint8Array) => data.length >= prefix.length && prefix.every((byte, i) => data[i] === byte)
 
-function orcaTick(account: AccountInfo, start: number, tick: number, spacing: number): TickFeeData | null {
+export function orcaTick(account: AccountInfo, start: number, tick: number, spacing: number): TickFeeData | null {
   orcaDiscriminators ??= { fixed: discriminator('TickArray'), dynamic: discriminator('DynamicTickArray') }
   if (account.data.length < 60) {
     return null // 两种格式的头部（判别符 + start + …）都放不下
@@ -380,7 +452,7 @@ function orcaTick(account: AccountInfo, start: number, tick: number, spacing: nu
     if (b.i32(8) !== start || offset + ORCA_TICK_SIZE > account.data.length) {
       return null
     }
-    return { initialized: b.u8(offset) === 1, feeGrowthOutside0: b.u128(offset + 33), feeGrowthOutside1: b.u128(offset + 49) }
+    return { initialized: b.u8(offset) === 1, feeGrowthOutside0: b.u128(offset + 33), feeGrowthOutside1: b.u128(offset + 49), rewardGrowthsOutside: rewardOutside(b, offset + 65) }
   }
   if (startsWith(account.data, orcaDiscriminators.dynamic)) {
     // 可变大小：start i32 | whirlpool | tick_bitmap u128 | ticks（未初始化 1 字节 0；初始化 1 字节 1 + 112 字节数据）
@@ -403,7 +475,7 @@ function orcaTick(account: AccountInfo, start: number, tick: number, spacing: nu
     if (offset + 113 > account.data.length) {
       return null
     }
-    return { initialized: true, feeGrowthOutside0: b.u128(offset + 33), feeGrowthOutside1: b.u128(offset + 49) }
+    return { initialized: true, feeGrowthOutside0: b.u128(offset + 33), feeGrowthOutside1: b.u128(offset + 49), rewardGrowthsOutside: rewardOutside(b, offset + 65) }
   }
   return null
 }
@@ -426,6 +498,8 @@ interface RawClmm {
   amount1: bigint
   fees0: bigint | null
   fees1: bigint | null
+  /** rewards 选项开启时：每个已初始化的奖励的未领取数量（读不到 tick 时为 null） */
+  rewards?: Array<{ index: number; mint: string; amount: bigint | null }>
 }
 
 interface RawAmm {
@@ -446,7 +520,7 @@ interface RawAmm {
  */
 export async function lpPositions(client: SolanaClient, owner: string, options: LpPositionsOptions = {}): Promise<SolanaLpPosition[]> {
   if (!isAddress(owner)) {
-    throw new Error(`Invalid owner address: ${owner}`)
+    throw new InvalidAddressError(`Invalid owner address: ${owner}`, owner)
   }
   const protocols = new Set<SolanaLpProtocol>(options.protocols ?? (Object.keys(SOLANA_LP_PROTOCOLS) as SolanaLpProtocol[]))
   for (const p of protocols) {
@@ -456,7 +530,7 @@ export async function lpPositions(client: SolanaClient, owner: string, options:
   }
   for (const address of [...(options.mints ?? []), ...(options.pools ?? [])]) {
     if (!isAddress(address)) {
-      throw new Error(`Invalid address: ${address}`)
+      throw new InvalidAddressError(`Invalid address: ${address}`, address)
     }
   }
   const { signal } = options
@@ -498,11 +572,9 @@ export async function lpPositions(client: SolanaClient, owner: string, options:
     if (!account) {
       return
     }
-    const program = SOLANA_LP_PROTOCOLS[c.protocol].programId
-    if (c.protocol === 'raydium-clmm' && account.owner === program && account.data.length === RAYDIUM_POSITION_SIZE) {
-      positions.push(raydiumPosition(c.address, new Bytes(account.data)))
-    } else if (c.protocol === 'orca-whirlpool' && account.owner === program && account.data.length === ORCA_POSITION_SIZE) {
-      positions.push(orcaPosition(c.address, new Bytes(account.data)))
+    const parsed = parseClmmPosition(c.protocol, c.address, account)
+    if (parsed) {
+      positions.push(parsed)
     }
   })
   // LP mint 的权限是 AMM v4 / CPMM 的固定权限地址时才去找池子
@@ -525,13 +597,30 @@ export async function lpPositions(client: SolanaClient, owner: string, options:
     }
   })
 
-  // 3. 池子：集中流动性的池子账户；LP 代币按 LP mint 找池子
+  // 3. 池子：集中流动性的池子账户；LP 代币按 LP mint 找池子（之前找到过的直接读池子账户，和集中流动性的池子一起读）
   const poolAddresses = [...new Set(positions.map((p) => p.pool))]
+  const cached = lookups.flatMap((l) => {
+    const address = ammPoolByLpMint.get(lpPoolKey(l.protocol, l.lpMint))
+    return address ? [{ ...l, address }] : []
+  })
+  const uncached = lookups.filter((l) => !ammPoolByLpMint.has(lpPoolKey(l.protocol, l.lpMint)))
   const [poolAccounts, found] = await Promise.all([
-    client.accounts(poolAddresses, { signal }),
-    Promise.all(lookups.map((l) => findAmmPool(client, l.protocol, l.lpMint, signal))),
+    client.accounts([...poolAddresses, ...cached.map((c) => c.address)], { signal }),
+    findAmmPools(client, uncached, signal),
   ])
-  for (const pool of found) {
+  // 缓存的池子核对一下（地址不对、账户读不到时重新找）
+  const stale: typeof lookups = []
+  cached.forEach((c, i) => {
+    const account = poolAccounts[poolAddresses.length + i]
+    const pool = account ? parseAmmPool(account) : null
+    if (pool && pool.protocol === c.protocol && pool.lpMint === c.lpMint) {
+      poolByLp.set(pool.lpMint, pool)
+    } else {
+      ammPoolByLpMint.delete(lpPoolKey(c.protocol, c.lpMint))
+      stale.push({ protocol: c.protocol, lpMint: c.lpMint })
+    }
+  })
+  for (const pool of [...found, ...(stale.length ? await findAmmPools(client, stale, signal) : [])]) {
     if (pool) {
       poolByLp.set(pool.lpMint, pool)
     }
@@ -605,10 +694,32 @@ export async function lpPositions(client: SolanaClient, owner: string, options:
         fees1 = null
       }
     }
-    if (!options.includeClosed && position.liquidity === 0n && fees0 === 0n && fees1 === 0n) {
+    // 未领取的挖矿奖励：没有流动性时只有已记账的；有流动性时先把池子的奖励增长结算到 now，再按区间内的增长算新增
+    let rewards: RawClmm['rewards']
+    if (options.rewards) {
+      const now = BigInt(Math.floor(options.now ?? Date.now() / 1000))
+      const ticks = (() => {
+        if (!arrays) return null
+        const read = position.protocol === 'raydium-clmm' ? raydiumTick : orcaTick
+        const lowerAccount = byAddress.get(arrays.lower.address)
+        const upperAccount = byAddress.get(arrays.upper.address)
+        const lower = lowerAccount ? read(lowerAccount, arrays.lower.start, position.tickLower, pool.tickSpacing) : null
+        const upper = upperAccount ? read(upperAccount, arrays.upper.start, position.tickUpper, pool.tickSpacing) : null
+        return lower && upper ? { lower, upper } : null
+      })()
+      rewards = pool.rewards.map(({ index, mint, emission }) => {
+        const state = position.rewards[index] as { growthLast: bigint; owed: bigint }
+        if (!arrays) return { index, mint, amount: state.owed }
+        if (!ticks) return { index, mint, amount: null }
+        const global = rewardGrowthGlobal(pool.liquidity, emission, now)
+        const inside = getRewardGrowthInside(pool.tick, position.tickLower, ticks.lower, position.tickUpper, ticks.upper, index, global)
+        return { index, mint, amount: getFeesOwed(state.owed, position.liquidity, inside, state.growthLast) }
+      })
+    }
+    if (!options.includeClosed && position.liquidity === 0n && fees0 === 0n && fees1 === 0n && !rewards?.some((x) => x.amount !== 0n)) {
       continue
     }
-    raw.push({ type: 'clmm', position, pool: { ...pool, fee: pool.fee ?? (pool.ammConfig ? (feeRates.get(pool.ammConfig) ?? null) : null) }, amount0, amount1, fees0, fees1 })
+    raw.push({ type: 'clmm', position, pool: { ...pool, fee: pool.fee ?? (pool.ammConfig ? (feeRates.get(pool.ammConfig) ?? null) : null) }, amount0, amount1, fees0, fees1, rewards })
   }
   for (const pool of ammHeld) {
     const balance = held.get(pool.lpMint)?.amount ?? 0n
@@ -633,6 +744,19 @@ export async function lpPositions(client: SolanaClient, owner: string, options:
   return finalize(client, raw, options)
 }
 
+/**
+ * 方法不可用（见 methodUnavailable）时把错误换成说明怎么绕过的 Error（cause 为原错误，hint 拿到原错误的 message）；
+ * 取消、限频、超时等原样抛出（保留错误类型）。/lp、/approvals、资产总值共用
+ */
+export function withMethodHint<T>(promise: Promise<T>, signal: AbortSignal | undefined, hint: (detail: string) => string): Promise<T> {
+  return promise.catch((err: unknown) => {
+    if (signal?.aborted || !methodUnavailable(err)) {
+      throw err
+    }
+    throw new Error(hint(err instanceof Error ? err.message : String(err)), { cause: err })
+  })
+}
+
 /**
  * 节点不提供这个方法（方法不存在、被拦截、需要付费 / Token、403 等）：这时报错里说明怎么绕过。
  * 多节点时所有节点都是这个原因才算；限频、超时、网络不对等原样抛出（资产总值 portfolio 也用）
@@ -661,43 +785,63 @@ async function listHoldings(client: SolanaClient, owner: string, mints: readonly
     const balances = list.length ? await client.balances(owner, list, { signal }) : []
     return balances.filter((b) => b.success && !b.native && b.balance !== '0').map((b) => ({ mint: b.token, amount: BigInt(b.balance), decimals: b.decimals }))
   }
-  const tokens = await client.ownerTokens(owner, { signal, metadata: false, includeNative: false, includeNfts: true }).catch((err: unknown) => {
-    if (signal?.aborted || !methodUnavailable(err)) {
-      throw err // 取消、限频、超时等原样抛出（保留错误类型）
-    }
-    throw new Error(
-      `Scanning the token accounts of ${owner} failed (${err instanceof Error ? err.message : String(err)}). ` +
-        'Scanning needs getTokenAccountsByOwner (most free public nodes do not support it): pass the position NFT / LP mints in `mints`, or use a node that supports it',
-      { cause: err },
-    )
-  })
+  const tokens = await withMethodHint(
+    client.ownerTokens(owner, { signal, metadata: false, includeNative: false, includeNfts: true }),
+    signal,
+    (detail) =>
+      `Scanning the token accounts of ${owner} failed (${detail}). ` +
+      'Scanning needs getTokenAccountsByOwner (most free public nodes do not support it): pass the position NFT / LP mints in `mints`, or use a node that supports it',
+  )
   return tokens.map((t) => ({ mint: t.token, amount: BigInt(t.balance), decimals: t.decimals }))
 }
 
-/** 按 LP mint 找 AMM v4 / CPMM 的池子（getProgramAccounts + memcmp），找不到时为 null */
+/**
+ * LP mint → 池子地址（AMM v4 / CPMM）：池子地址不会变，找到后永久缓存（条目数有上限，超出淘汰最早写入的），
+ * 之后不再 getProgramAccounts，用时读池子账户核对
+ */
+const ammPoolByLpMint = new Map<string, string>()
+const MAX_CACHED_LP_POOLS = 10_000
+/** 同时进行的 getProgramAccounts 数（每个都要节点扫描整个程序的账户，很重） */
+const MAX_PARALLEL_POOL_LOOKUPS = 4
+
+function lpPoolKey(protocol: 'raydium-amm' | 'raydium-cpmm', lpMint: string): string {
+  return `${protocol}:${lpMint}`
+}
+
+/** 测试用：清空 LP mint → 池子地址的缓存 */
+export function resetLpPoolCache(): void {
+  ammPoolByLpMint.clear()
+}
+
+/** 按 LP mint 找池子，限制并发；结果与 lookups 一一对应 */
+function findAmmPools(
+  client: SolanaClient,
+  lookups: ReadonlyArray<{ protocol: 'raydium-amm' | 'raydium-cpmm'; lpMint: string }>,
+  signal: AbortSignal | undefined,
+): Promise<Array<AmmPoolState | null>> {
+  return mapPool(lookups, MAX_PARALLEL_POOL_LOOKUPS, (l) => findAmmPool(client, l.protocol, l.lpMint, signal))
+}
+
+/** 按 LP mint 找 AMM v4 / CPMM 的池子（getProgramAccounts + memcmp），找不到时为 null；找到的池子地址写入缓存 */
 async function findAmmPool(client: SolanaClient, protocol: 'raydium-amm' | 'raydium-cpmm', lpMint: string, signal: AbortSignal | undefined): Promise<AmmPoolState | null> {
   const [programId, size, offset] = protocol === 'raydium-amm' ? [RAYDIUM_AMM_PROGRAM_ID, AMM_POOL_SIZE, 464] : [RAYDIUM_CPMM_PROGRAM_ID, CPMM_POOL_SIZE, 136]
-  const res = await client
-    .request<{ pubkey: string; account: { data: [string, string]; owner: string } }[]>(
+  // 免费公共节点大多不支持 getProgramAccounts：说明怎么绕过
+  const res = await withMethodHint(
+    client.request<{ pubkey: string; account: { data: [string, string]; owner: string } }[]>(
       'getProgramAccounts',
       [programId, { encoding: 'base64', commitment: client.commitment, filters: [{ dataSize: size }, { memcmp: { offset, bytes: lpMint } }] }],
       { signal },
-    )
-    .catch((err: unknown) => {
-      if (signal?.aborted || !methodUnavailable(err)) {
-        throw err
-      }
-      // 免费公共节点大多不支持 getProgramAccounts：说明怎么绕过
-      throw new Error(
-        `Finding the ${SOLANA_LP_PROTOCOLS[protocol].name} pool of LP token ${lpMint} uses getProgramAccounts, which failed (${err instanceof Error ? err.message : String(err)}; most free public nodes do not support it). ` +
-          "Pass the pool address in `pools`, use a node that supports getProgramAccounts, or skip LP tokens with `protocols: ['raydium-clmm', 'orca-whirlpool']`",
-        { cause: err },
-      )
-    })
+    ),
+    signal,
+    (detail) =>
+      `Finding the ${SOLANA_LP_PROTOCOLS[protocol].name} pool of LP token ${lpMint} uses getProgramAccounts, which failed (${detail}; most free public nodes do not support it). ` +
+      "Pass the pool address in `pools`, use a node that supports getProgramAccounts, or skip LP tokens with `protocols: ['raydium-clmm', 'orca-whirlpool']`",
+  )
   for (const item of res ?? []) {
     const data = base64.decode(item.account.data[0])
     const pool = parseAmmPool({ address: item.pubkey, owner: item.account.owner, data, lamports: 0n, executable: false })
     if (pool?.lpMint === lpMint) {
+      boundedSet(ammPoolByLpMint, lpPoolKey(protocol, lpMint), pool.address, MAX_CACHED_LP_POOLS)
       return pool
     }
   }
@@ -706,7 +850,7 @@ async function findAmmPool(client: SolanaClient, protocol: 'raydium-amm' | 'rayd
 
 async function finalize(client: SolanaClient, raw: readonly (RawClmm | RawAmm)[], options: LpPositionsOptions): Promise<SolanaLpPosition[]> {
   const { signal } = options
-  const mints = [...new Set(raw.flatMap((r) => [r.pool.mint0, r.pool.mint1]))]
+  const mints = [...new Set(raw.flatMap((r) => [r.pool.mint0, r.pool.mint1, ...(r.type === 'clmm' ? (r.rewards ?? []).map((x) => x.mint) : [])]))]
   const priceSource = options.prices === true ? defillamaPrices() : options.prices || null
   const fetchFn = options.fetch ?? ((...args: Parameters<typeof fetch>) => fetch(...args))
   // 价格源出错（服务不可用、被拦截、同步抛错等）时照样返回仓位，只是不带价格；取消查询时照常 reject
@@ -784,6 +928,11 @@ async function finalize(client: SolanaClient, raw: readonly (RawClmm | RawAmm)[]
     const d1 = token1.decimals
     const fees0Formatted = r.fees0 === null ? null : fmt(r.fees0, token0)
     const fees1Formatted = r.fees1 === null ? null : fmt(r.fees1, token1)
+    const rewards = r.rewards?.map((x): SolanaLpReward => {
+      const t = token(x.mint, null)
+      const formatted = x.amount === null ? null : fmt(x.amount, t)
+      return { index: x.index, mint: x.mint, symbol: t.symbol, decimals: t.decimals, amount: x.amount === null ? null : x.amount.toString(), formatted, ...(priceSource ? { usd: x.amount === 0n ? 0 : usd(t, formatted) } : {}) }
+    })
     return {
       ...base,
       type: 'clmm',
@@ -804,6 +953,8 @@ async function finalize(client: SolanaClient, raw: readonly (RawClmm | RawAmm)[]
       fees0Formatted,
       fees1Formatted,
       ...(priceSource ? { feesUsd: r.fees0 === null || r.fees1 === null ? null : sum(usd(token0, fees0Formatted), usd(token1, fees1Formatted), r.fees0, r.fees1) } : {}),
+      ...(rewards ? { rewards } : {}),
+      ...(rewards && priceSource ? { rewardsUsd: rewards.some((x) => x.usd === null || x.usd === undefined) ? null : rewards.reduce((acc, x) => acc + (x.usd ?? 0), 0) } : {}),
     }
   })
   if (priceSource) {

package/src/lpMath.ts

@@ -153,6 +153,8 @@ export interface TickFeeData {
   initialized: boolean
   feeGrowthOutside0: bigint
   feeGrowthOutside1: bigint
+  /** 三个挖矿奖励的 tick 外增长（读 tick 时带上；只算手续费时可以不给） */
+  rewardGrowthsOutside?: readonly bigint[]
 }
 
 const wrap = (x: bigint) => ((x % (1n << 128n)) + (1n << 128n)) % (1n << 128n)
@@ -192,6 +194,42 @@ export function getFeesOwed(owed: bigint, liquidity: bigint, growthInside: bigin
   return owed + (delta > U64_MAX ? 0n : delta)
 }
 
+/** 池子里一个挖矿奖励的状态（两个程序的 reward_infos 里的同名字段） */
+export interface RewardEmission {
+  /** 已初始化：奖励的 mint 不是默认地址 */
+  initialized: boolean
+  emissionsPerSecondX64: bigint
+  growthGlobalX64: bigint
+  /** 上次更新的时间（秒）。Raydium 每个奖励自己记；Orca 是池子的 reward_last_updated_timestamp（三个奖励相同） */
+  lastUpdated: bigint
+  /** 开始 / 结束时间（秒）：Raydium 的 open_time / end_time；Orca 没有，传 0n / 2^64 − 1 */
+  openTime: bigint
+  endTime: bigint
+}
+
+/**
+ * 池子在 now 时刻的奖励全局增长：程序每次操作池子（交易、增减流动性、领取）前先把排放按时间摊给当前的流动性，
+ * Q64.64：growth += Δt · emissions_per_second / liquidity（向下取整，u128 回绕）。
+ * Raydium：now ≤ open_time 不动，Δt 到 end_time 为止；Orca：池子流动性为 0 或 Δt 为 0 不动
+ */
+export function rewardGrowthGlobal(liquidity: bigint, reward: RewardEmission, now: bigint): bigint {
+  if (!reward.initialized || liquidity === 0n || now <= reward.openTime) {
+    return reward.growthGlobalX64
+  }
+  const latest = now < reward.endTime ? now : reward.endTime
+  const delta = latest > reward.lastUpdated ? latest - reward.lastUpdated : 0n
+  return wrap(reward.growthGlobalX64 + (delta * reward.emissionsPerSecondX64) / liquidity)
+}
+
+/** 区间内某个奖励的增长（u128 回绕），tick 未初始化的处理同 getFeeGrowthInside */
+export function getRewardGrowthInside(tick: number, tickLower: number, lower: TickFeeData, tickUpper: number, upper: TickFeeData, index: number, global: bigint): bigint {
+  const lowerOutside = lower.rewardGrowthsOutside?.[index] ?? 0n
+  const upperOutside = upper.rewardGrowthsOutside?.[index] ?? 0n
+  const below = !lower.initialized ? global : tick < tickLower ? wrap(global - lowerOutside) : lowerOutside
+  const above = !upper.initialized ? 0n : tick < tickUpper ? upperOutside : wrap(global - upperOutside)
+  return wrap(global - below - above)
+}
+
 /** Q64.64 sqrt 价格 → token1 / token0 的价格（按精度换算，浮点数，只用于展示） */
 export function sqrtPriceToPrice(sqrtPrice: bigint, decimals0: number, decimals1: number): number {
   // 先取高位再转浮点，避免 2^128 级别的整数转换丢精度后再平方

package/src/portfolio.ts

@@ -2,7 +2,7 @@
  * 资产总值（子路径 `@w3lib/solana-batch-call/price`）：代币余额 × 价格，可选加上 LP 仓位的价值
  */
 import type { RequestOptions, SolanaClient } from './client.js'
-import { lpPositions, methodUnavailable, type LpPositionsOptions, type SolanaLpPosition } from './lp.js'
+import { lpPositions, withMethodHint, type LpPositionsOptions, type SolanaLpPosition } from './lp.js'
 import { combinePrices, defillamaPrices, onchainPrices, tokenPrices, type SolanaPriceSource } from './price.js'
 
 export interface PortfolioOptions extends RequestOptions {
@@ -110,15 +110,12 @@ async function holdings(client: SolanaClient, owner: string, tokens: readonly st
     const balances = tokens.length ? await client.balances(owner, tokens, { symbol: true, signal }) : []
     return balances.filter((b) => b.success).map((b) => ({ token: b.token, native: b.native, symbol: b.symbol ?? null, balance: b.balance, decimals: b.decimals, formatted: b.formatted }))
   }
-  const owned = await client.ownerTokens(owner, { signal }).catch((err: unknown) => {
-    if (signal?.aborted || !methodUnavailable(err)) {
-      throw err // 取消、限频、超时等原样抛出（保留错误类型）
-    }
-    throw new Error(
-      `Listing the tokens of ${owner} failed (${err instanceof Error ? err.message : String(err)}). ` +
-        'Listing needs getTokenAccountsByOwner (most free public nodes do not support it): pass the mints in `tokens`, or use a node that supports it',
-      { cause: err },
-    )
-  })
+  const owned = await withMethodHint(
+    client.ownerTokens(owner, { signal }),
+    signal,
+    (detail) =>
+      `Listing the tokens of ${owner} failed (${detail}). ` +
+      'Listing needs getTokenAccountsByOwner (most free public nodes do not support it): pass the mints in `tokens`, or use a node that supports it',
+  )
   return owned.map((t) => ({ token: t.token, native: t.native, symbol: t.symbol ?? null, balance: t.balance, decimals: t.decimals, formatted: t.formatted }))
 }