@w3lib/solana-batch-call 0.4.0 → 0.6.0

package/src/historyHelius.ts

@@ -0,0 +1,136 @@
+/** Helius 增强交易历史数据源（需要应用自己的 API key）：把 `/v0/addresses/{address}/transactions` 的结果整理成和 rpcHistory 一样的 Activity */
+import { NATIVE_MINT, SOL_DECIMALS } from './constants.js'
+import { formatUnits } from './layout.js'
+import type { Activity, ActivityChange, ActivityType, HistorySource } from './history.js'
+
+export interface HeliusHistoryOptions {
+  apiKey: string
+  /** 默认 https://api.helius.xyz */
+  baseUrl?: string
+}
+
+interface HeliusItem {
+  signature: string
+  timestamp?: number
+  slot?: number
+  fee?: number
+  feePayer?: string
+  type?: string
+  source?: string
+  description?: string
+  transactionError?: unknown
+  nativeTransfers?: Array<{ fromUserAccount: string; toUserAccount: string; amount: number }>
+  tokenTransfers?: Array<{ fromUserAccount: string | null; toUserAccount: string | null; tokenAmount: number; mint: string }>
+  accountData?: Array<{
+    account: string
+    nativeBalanceChange?: number
+    tokenBalanceChanges?: Array<{ userAccount: string; mint: string; rawTokenAmount: { tokenAmount: string; decimals: number } }>
+  }>
+}
+
+const short = (a: string) => `${a.slice(0, 4)}…${a.slice(-4)}`
+
+/** Helius 的交易类型 → Activity 类型（认不出的按资产变化判断） */
+function typeOf(item: HeliusItem, changes: readonly ActivityChange[]): ActivityType {
+  const t = item.type ?? ''
+  if (/SWAP/.test(t)) return 'swap'
+  if (t === 'TRANSFER') return 'transfer'
+  if (/LIQUIDITY|POSITION|POOL/.test(t)) return 'liquidity'
+  if (/MINT/.test(t)) return 'mint'
+  if (/APPROVE|REVOKE|DELEGATE/.test(t)) return 'approve'
+  const out = changes.filter((c) => c.delta.startsWith('-'))
+  if (out.length && changes.some((c) => !c.delta.startsWith('-') && out.some((o) => o.asset !== c.asset))) return 'swap'
+  return t && t !== 'UNKNOWN' ? 'contract' : 'other'
+}
+
+export function activityFromHelius(address: string, item: HeliusItem): Activity {
+  const me = item.accountData?.find((a) => a.account === address)
+  const isPayer = item.feePayer === address
+  const fee = BigInt(item.fee ?? 0)
+  let native = BigInt(me?.nativeBalanceChange ?? 0) + (isPayer ? fee : 0n)
+  const tokens = new Map<string, { delta: bigint; decimals: number }>()
+  for (const entry of item.accountData ?? []) {
+    for (const t of entry.tokenBalanceChanges ?? []) {
+      if (t.userAccount !== address) continue
+      const prev = tokens.get(t.mint)
+      tokens.set(t.mint, { delta: (prev?.delta ?? 0n) + BigInt(t.rawTokenAmount.tokenAmount), decimals: t.rawTokenAmount.decimals })
+    }
+  }
+  const wsol = tokens.get(NATIVE_MINT)
+  if (wsol) {
+    native += wsol.delta
+    tokens.delete(NATIVE_MINT)
+  }
+  const failed = item.transactionError !== null && item.transactionError !== undefined
+  const changes: ActivityChange[] = []
+  if (!failed) {
+    if (native !== 0n) changes.push({ asset: 'native', symbol: 'SOL', decimals: SOL_DECIMALS, delta: native.toString(), formatted: formatUnits(native, SOL_DECIMALS) })
+    for (const [asset, { delta, decimals }] of tokens) {
+      if (delta !== 0n) changes.push({ asset, symbol: short(asset), decimals, delta: delta.toString(), formatted: formatUnits(delta, decimals) })
+    }
+  }
+  const type = typeOf(item, changes)
+  let counterparty: string | undefined
+  for (const t of [...(item.nativeTransfers ?? []), ...(item.tokenTransfers ?? []).map((x) => ({ fromUserAccount: x.fromUserAccount ?? '', toUserAccount: x.toUserAccount ?? '' }))]) {
+    if (t.fromUserAccount === address && t.toUserAccount) counterparty = t.toUserAccount
+    else if (t.toUserAccount === address && t.fromUserAccount) counterparty = t.fromUserAccount
+    if (counterparty) break
+  }
+  const negative = changes.filter((c) => c.delta.startsWith('-')).length
+  const protocol = item.source && !/^(SYSTEM_PROGRAM|UNKNOWN)$/.test(item.source) ? item.source[0] + item.source.slice(1).toLowerCase().replace(/_/g, ' ') : undefined
+  return {
+    hash: item.signature,
+    time: item.timestamp ?? 0,
+    block: item.slot,
+    status: failed ? 'failed' : 'success',
+    type,
+    direction: (type === 'transfer' || type === 'other') && changes.length ? (negative === 0 ? 'in' : negative === changes.length ? 'out' : undefined) : undefined,
+    counterparty,
+    label: item.description || undefined,
+    changes,
+    ...(isPayer ? { fee: fee.toString() } : {}),
+    protocol,
+  }
+}
+
+/**
+ * Helius 增强交易历史（`GET /v0/addresses/{address}/transactions`，按 before 签名翻页）。apiKey 由应用传入，库里不带。
+ * 按交易类型过滤时翻页最多再取 3 页
+ *
+ * ```ts
+ * await getHistory(address, { source: [heliusHistory({ apiKey }), rpcHistory()] })   // Helius 失败时用节点
+ * ```
+ */
+export function heliusHistory(options: HeliusHistoryOptions): HistorySource {
+  if (!options.apiKey) throw new Error('heliusHistory needs an apiKey')
+  const base = (options.baseUrl ?? 'https://api.helius.xyz').replace(/\/+$/, '')
+  return {
+    name: 'helius',
+    async getHistory(ctx) {
+      const items: Activity[] = []
+      let cursor = ctx.cursor
+      let more = true
+      for (let page = 0; page < (ctx.types ? 4 : 1) && items.length < ctx.limit && more; page++) {
+        const url = `${base}/v0/addresses/${ctx.address}/transactions?api-key=${encodeURIComponent(options.apiKey)}&limit=${Math.min(100, ctx.limit)}${cursor ? `&before=${encodeURIComponent(cursor)}` : ''}`
+        const res = await ctx.fetch(url, { signal: ctx.signal })
+        if (!res.ok) throw new Error(`HTTP ${res.status}`)
+        const raw = (await res.json()) as HeliusItem[]
+        if (!Array.isArray(raw)) throw new Error('Unexpected response')
+        more = raw.length >= Math.min(100, ctx.limit)
+        for (const item of raw) {
+          cursor = item.signature
+          const t = item.timestamp ?? 0
+          if (ctx.before !== undefined && t >= ctx.before) continue
+          if (ctx.after !== undefined && t < ctx.after) {
+            more = false
+            break
+          }
+          const activity = activityFromHelius(ctx.address, item)
+          if (!ctx.types || ctx.types.includes(activity.type)) items.push(activity)
+          if (items.length >= ctx.limit) break
+        }
+      }
+      return { items, ...(more && cursor ? { nextCursor: cursor } : {}) }
+    },
+  }
+}

package/src/layout.ts

@@ -134,8 +134,8 @@ export function parseMint(data: Uint8Array): MintInfo {
   }
 }
 
-/** 在 Token-2022 账户的扩展（TLV：u16 类型 + u16 长度 + 数据）里找指定类型，返回其数据；没有或数据不完整时为 null */
-function findExtension(data: Uint8Array, extensionType: number): Uint8Array | null {
+/** 在 Token-2022 账户的扩展（TLV：u16 类型 + u16 长度 + 数据）里找指定类型，返回其数据；没有或数据不完整时为 null（包内使用，不从主入口导出） */
+export function findExtension(data: Uint8Array, extensionType: number): Uint8Array | null {
   if (data.length <= EXTENSIONS_OFFSET) {
     return null
   }

package/src/liquidity/orca.ts

@@ -223,6 +223,20 @@ export async function orcaAdd(ctx: Ctx, params: SolanaIncreaseLiquidityParams |
   })
 }
 
+/**
+ * 关闭已清空的仓位（流动性、手续费、奖励都为 0）：销毁仓位 NFT、关闭仓位账户和 NFT 的代币账户（nftAccount，默认 owner 的 ATA），租金退给 receiver。
+ * NFT 是 Token-2022（带元数据扩展）时连 mint 一起关闭，否则（Metaplex 时代的 SPL Token NFT）mint 留着
+ */
+export function orcaClosePosition(owner: string, receiver: string, positionMint: string, nftProgram: string, nftAccount = getAssociatedTokenAddress(owner, positionMint, nftProgram)): Instruction {
+  const position = positionAddress(positionMint)
+  const token2022 = nftProgram === TOKEN_2022_PROGRAM_ID
+  return {
+    programId: PROGRAM,
+    keys: [r(owner, true), w(receiver), w(position), w(positionMint), w(nftAccount), r(nftProgram)],
+    data: anchorIx(token2022 ? 'close_position_with_token_extensions' : 'close_position'),
+  }
+}
+
 /** 移除（decrease + 领取手续费和奖励）/ 只领取（collectOnly） */
 export async function orcaRemove(ctx: Ctx, params: SolanaRemoveLiquidityParams, collectOnly = false): Promise<SolanaLiquidityPlan> {
   const mint = refMint(params.position)
@@ -304,11 +318,7 @@ export async function orcaRemove(ctx: Ctx, params: SolanaRemoveLiquidityParams,
     })
   })
   if (burn) {
-    main.push(
-      nftProgram === TOKEN_2022_PROGRAM_ID
-        ? { programId: PROGRAM, keys: [r(ctx.owner, true), w(ctx.owner), w(positionAccount), w(mint), w(nftAccount), r(TOKEN_2022_PROGRAM_ID)], data: anchorIx('close_position_with_token_extensions') }
-        : { programId: PROGRAM, keys: [r(ctx.owner, true), w(ctx.owner), w(positionAccount), w(mint), w(nftAccount), r(TOKEN_PROGRAM_ID)], data: anchorIx('close_position') },
-    )
+    main.push(orcaClosePosition(ctx.owner, ctx.owner, mint, nftProgram))
   }
   return makePlan(ctx, {
     action: collectOnly ? 'collect' : 'remove',

package/src/liquidity/raydiumClmm.ts

@@ -249,6 +249,18 @@ export async function raydiumAdd(ctx: Ctx, params: SolanaIncreaseLiquidityParams
   })
 }
 
+/**
+ * 关闭已清空的仓位（流动性、手续费、奖励都为 0）：销毁仓位 NFT、关闭 NFT 的代币账户和仓位账户，租金退给 owner（程序固定，不能指定别人）。
+ * pool 是仓位所在的池子（官方 SDK 也带着它）
+ */
+export function raydiumClosePosition(owner: string, positionMint: string, nftProgram: string, pool: string, nftAccount = getAssociatedTokenAddress(owner, positionMint, nftProgram)): Instruction {
+  return {
+    programId: PROGRAM,
+    keys: [w(owner, true), w(positionMint), w(nftAccount), w(personalPositionAddress(positionMint)), r(SYSTEM_PROGRAM_ID), r(nftProgram), w(pool)],
+    data: anchorIx('close_position'),
+  }
+}
+
 /** 移除（liquidity > 0）/ 只领取手续费和奖励（collectOnly：流动性为 0 的 decrease） */
 export async function raydiumRemove(ctx: Ctx, params: SolanaRemoveLiquidityParams, collectOnly = false): Promise<SolanaLiquidityPlan> {
   const mint = refMint(params.position)
@@ -308,11 +320,7 @@ export async function raydiumRemove(ctx: Ctx, params: SolanaRemoveLiquidityParam
   }
   const main: Instruction[] = [decrease]
   if (burn) {
-    main.push({
-      programId: PROGRAM,
-      keys: [w(ctx.owner, true), w(mint), w(nftAta), w(personal), r(SYSTEM_PROGRAM_ID), r(nftProgram), w(pool.address)],
-      data: anchorIx('close_position'),
-    })
+    main.push(raydiumClosePosition(ctx.owner, mint, nftProgram, pool.address))
   }
   return makePlan(ctx, {
     action: collectOnly ? 'collect' : 'remove',

package/src/lp.ts

@@ -5,7 +5,20 @@ import { decodeAddress, encodeAddress, findProgramAddress, isAddress } from './a
 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 {
+  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'
 export const ORCA_WHIRLPOOL_PROGRAM_ID = 'whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc'
@@ -25,45 +38,8 @@ export const SOLANA_LP_PROTOCOLS: Readonly<Record<SolanaLpProtocol, { name: stri
   'raydium-cpmm': { name: 'Raydium CPMM', type: 'amm', programId: RAYDIUM_CPMM_PROGRAM_ID },
 }
 
-// ---------------------------------------------------------------------------
-// 价格源
-// ---------------------------------------------------------------------------
-
-export interface SolanaPriceSource {
-  readonly name: string
-  /** 返回 mint → 美元价格；没有价格的不返回 */
-  prices(ctx: { mints: readonly string[]; fetch: typeof fetch; signal?: AbortSignal }): Promise<Map<string, number>>
-}
-
-/** DefiLlama 价格（免费免 Key，按 100 个一批查询）；confidence 低于 minConfidence（默认 0.9）的价格不用 */
-export function defillamaPrices(options: { minConfidence?: number } = {}): SolanaPriceSource {
-  const minConfidence = options.minConfidence ?? 0.9
-  return {
-    name: 'defillama',
-    async prices({ mints, fetch: fetchFn, signal }) {
-      const result = new Map<string, number>()
-      const batches: string[][] = []
-      for (let i = 0; i < mints.length; i += 100) {
-        batches.push(mints.slice(i, i + 100))
-      }
-      await Promise.all(
-        batches.map(async (batch) => {
-          const res = await fetchFn(`https://coins.llama.fi/prices/current/${batch.map((m) => `solana:${m}`).join(',')}`, { signal })
-          if (!res.ok) {
-            throw new Error(`DefiLlama prices: HTTP ${res.status}`)
-          }
-          const body = (await res.json()) as { coins?: Record<string, { price?: number; confidence?: number }> }
-          for (const [key, coin] of Object.entries(body.coins ?? {})) {
-            if (typeof coin.price === 'number' && Number.isFinite(coin.price) && (coin.confidence === undefined || coin.confidence >= minConfidence)) {
-              result.set(key.slice(key.indexOf(':') + 1), coin.price)
-            }
-          }
-        }),
-      )
-      return result
-    },
-  }
-}
+// 价格源在 price.ts（子路径 /price）；这里继续导出，旧的 import 不受影响
+export { defillamaPrices, type SolanaPriceSource, type SolanaPriceSourceContext } from './price.js'
 
 // ---------------------------------------------------------------------------
 // 结果类型
@@ -133,6 +109,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
@@ -152,7 +146,14 @@ export interface LpPositionsOptions extends RequestOptions {
   pools?: readonly string[]
   /** 返回已清空的仓位（流动性为 0、手续费也领完，NFT 还在）。默认 false */
   includeClosed?: boolean
-  /** 查美元价值：true 用 DefiLlama，也可以传自己的 SolanaPriceSource。默认不查 */
+  /**
+   * 集中流动性仓位同时算未领取的挖矿奖励（Raydium CLMM 农场奖励、Orca 的奖励 slot），放在 rewards 字段，照搬程序的结算：
+   * 池子的奖励增长按时间摊给当前流动性，再按仓位区间内的增长计算。默认 false。有奖励没领的仓位不算“已清空”
+   */
+  rewards?: boolean
+  /** rewards 结算到哪个时刻（unix 秒），默认当前时间；链上用的是区块时间，差几秒影响很小 */
+  now?: number
+  /** 查美元价值：true 用 DefiLlama，也可以传自己的 SolanaPriceSource（如 /price 的 combinePrices([defillamaPrices(), onchainPrices()])）。默认不查 */
   prices?: boolean | SolanaPriceSource
   /**
    * 价格源出错时调用（服务不可用、被拦截等）：这时照样返回仓位，只是 valueUsd / feesUsd 为 null，
@@ -196,6 +197,7 @@ export class Bytes {
   }
 }
 
+const ZERO_ADDRESS = '11111111111111111111111111111111'
 const RAYDIUM_POSITION_SIZE = 281
 const ORCA_POSITION_SIZE = 216
 /** 池子账户至少要读到的长度（Raydium PoolState 实际 1544 字节，Orca Whirlpool 653 字节） */
@@ -208,7 +210,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
@@ -220,8 +222,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',
@@ -235,6 +241,7 @@ function raydiumPosition(address: string, b: Bytes): ClmmPositionState {
     growthLast1: b.u128(113),
     owed0: b.u64(129),
     owed1: b.u64(137),
+    rewards: positionRewards(b, 145),
   }
 }
 
@@ -251,9 +258,21 @@ 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 {
   mint0: string
   mint1: string
@@ -267,6 +286,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 {
@@ -282,6 +336,8 @@ function raydiumPool(b: Bytes): ClmmPoolState {
     global0: b.u128(277),
     global1: b.u128(293),
     fee: null,
+    liquidity: b.u128(237),
+    rewards: raydiumRewards(b),
   }
 }
 
@@ -298,6 +354,8 @@ function orcaPool(b: Bytes): ClmmPoolState {
     global1: b.u128(245),
     decimals0: null,
     decimals1: null,
+    liquidity: b.u128(49),
+    rewards: orcaRewards(b),
   }
 }
 
@@ -382,7 +440,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 的系统账户）
@@ -394,7 +454,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 字节 */
@@ -403,7 +463,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 + …）都放不下
@@ -416,7 +476,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 字节数据）
@@ -439,7 +499,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
 }
@@ -462,6 +522,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 {
@@ -534,11 +596,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 的固定权限地址时才去找池子
@@ -641,10 +701,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
@@ -671,9 +753,9 @@ export async function lpPositions(client: SolanaClient, owner: string, options:
 
 /**
  * 节点不提供这个方法（方法不存在、被拦截、需要付费 / Token、403 等）：这时报错里说明怎么绕过。
- * 多节点时所有节点都是这个原因才算；限频、超时、网络不对等原样抛出
+ * 多节点时所有节点都是这个原因才算；限频、超时、网络不对等原样抛出（资产总值 portfolio 也用）
  */
-function methodUnavailable(err: unknown): boolean {
+export function methodUnavailable(err: unknown): boolean {
   if (err instanceof AllNodesFailedError) {
     return err.errors.length > 0 && err.errors.every((e) => methodUnavailable(e.error))
   }
@@ -742,7 +824,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
@@ -751,8 +833,8 @@ async function finalize(client: SolanaClient, raw: readonly (RawClmm | RawAmm)[]
       return new Map()
     }
     try {
-      // wSOL 的价格就是 SOL 的价格，DefiLlama 用 So111…112 查得到
-      return await priceSource.prices({ mints, fetch: fetchFn, signal })
+      // wSOL 的价格就是 SOL 的价格，DefiLlama 用 So111…112 查得到；client 给链上价格源读池子
+      return await priceSource.prices({ mints, fetch: fetchFn, signal, client })
     } catch (err) {
       if (signal?.aborted) {
         throw err
@@ -820,6 +902,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',
@@ -840,6 +927,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 级别的整数转换丢精度后再平方