@w3lib/solana-batch-call 0.5.0 → 0.7.0

package/dist/lp.d.ts

@@ -1,5 +1,7 @@
 import type { RequestOptions, SolanaClient } from './client.js';
 import { type AccountInfo } from './layout.js';
+import { Bytes } from './bytes.js';
+import { type TickFeeData } from './lpMath.js';
 import { type SolanaPriceSource } from './price.js';
 export declare const RAYDIUM_CLMM_PROGRAM_ID = "CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK";
 export declare const ORCA_WHIRLPOOL_PROGRAM_ID = "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc";
@@ -77,6 +79,23 @@ 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;
 export interface LpPositionsOptions extends RequestOptions {
@@ -94,6 +113,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;
     /**
@@ -104,19 +130,27 @@ export interface LpPositionsOptions extends RequestOptions {
     /** 查价格用的 fetch，默认全局 fetch */
     fetch?: typeof fetch;
 }
-/** 小端读取账户数据（添加 / 移除流动性也用） */
-export declare class Bytes {
-    #private;
-    readonly data: Uint8Array;
-    constructor(data: Uint8Array);
-    u8(o: number): number;
-    u16(o: number): number;
-    u32(o: number): number;
-    i32(o: number): number;
-    u64(o: number): bigint;
-    u128(o: number): bigint;
-    key(o: number): string;
+export { Bytes };
+export interface ClmmPositionState {
+    protocol: 'raydium-clmm' | 'orca-whirlpool';
+    address: string;
+    mint: string;
+    pool: string;
+    tickLower: number;
+    tickUpper: number;
+    liquidity: bigint;
+    growthLast0: bigint;
+    growthLast1: bigint;
+    owed0: bigint;
+    owed1: bigint;
+    /** 三个挖矿奖励：上次记录的区间内增长、已记账未领取的数量 */
+    rewards: Array<{
+        growthLast: bigint;
+        owed: bigint;
+    }>;
 }
+/** 按程序和账户大小解析仓位账户（Raydium PersonalPositionState 281 字节、Orca Position 216 字节）；不是仓位账户时为 null */
+export declare function parseClmmPosition(protocol: 'raydium-clmm' | 'orca-whirlpool', address: string, account: AccountInfo): ClmmPositionState | null;
 export interface AmmPoolState {
     protocol: 'raydium-amm' | 'raydium-cpmm';
     address: string;
@@ -144,6 +178,8 @@ export declare function orcaTickArray(pool: string, tick: number, spacing: numbe
     address: string;
     start: number;
 };
+export declare function raydiumTick(account: AccountInfo, start: number, tick: number, spacing: number): TickFeeData | null;
+export declare function orcaTick(account: AccountInfo, start: number, tick: number, spacing: number): TickFeeData | null;
 /**
  * 查一个地址的 LP 仓位：Raydium CLMM / Orca Whirlpool 的仓位 NFT，Raydium AMM v4 / CPMM 的 LP 代币。
  * 返回两种代币的数量、未领取的手续费（集中流动性），可选美元价值。
@@ -153,9 +189,16 @@ export declare function orcaTickArray(pool: string, tick: number, spacing: numbe
  * - 质押在农场里的 LP、Orca 的仓位组合（Position Bundle）、锁仓的 Raydium 仓位不在用户名下，查不到
  */
 export declare function lpPositions(client: SolanaClient, owner: string, options?: LpPositionsOptions): Promise<SolanaLpPosition[]>;
+/**
+ * 方法不可用（见 methodUnavailable）时把错误换成说明怎么绕过的 Error（cause 为原错误，hint 拿到原错误的 message）；
+ * 取消、限频、超时等原样抛出（保留错误类型）。/lp、/approvals、资产总值共用
+ */
+export declare function withMethodHint<T>(promise: Promise<T>, signal: AbortSignal | undefined, hint: (detail: string) => string): Promise<T>;
 /**
  * 节点不提供这个方法（方法不存在、被拦截、需要付费 / Token、403 等）：这时报错里说明怎么绕过。
  * 多节点时所有节点都是这个原因才算；限频、超时、网络不对等原样抛出（资产总值 portfolio 也用）
  */
 export declare function methodUnavailable(err: unknown): boolean;
+/** 测试用：清空 LP mint → 池子地址的缓存 */
+export declare function resetLpPoolCache(): void;
 //# sourceMappingURL=lp.d.ts.map

package/dist/lp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lp.d.ts","sourceRoot":"","sources":["../src/lp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lp.d.ts","sourceRoot":"","sources":["../src/lp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAA6C,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAGzF,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAWL,KAAK,WAAW,EACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEpE,eAAO,MAAM,uBAAuB,iDAAiD,CAAA;AACrF,eAAO,MAAM,yBAAyB,gDAAgD,CAAA;AACtF,eAAO,MAAM,sBAAsB,iDAAiD,CAAA;AACpF,eAAO,MAAM,uBAAuB,iDAAiD,CAAA;AACrF,gCAAgC;AAChC,eAAO,MAAM,qBAAqB,iDAAiD,CAAA;AACnF,4DAA4D;AAC5D,eAAO,MAAM,sBAAsB,iDAAiD,CAAA;AAEpF,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,gBAAgB,GAAG,aAAa,GAAG,cAAc,CAAA;AAEjG,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAK7H,CAAA;AAGD,OAAO,EAAE,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAMnG,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,2DAA2D;IAC3D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACxB;AAED,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,aAAa,CAAA;IACrB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB;AAED,sCAAsC;AACtC,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAC/D,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,8BAA8B;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,kBAAkB;IAClB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,2CAA2C;AAC3C,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE,IAAI,EAAE,MAAM,CAAA;IACZ,oBAAoB;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,4CAA4C;IAC5C,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,uDAAuD;IACvD,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,qDAAqD;IACrD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,+DAA+D;IAC/D,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,sDAAsD;IACtD,OAAO,CAAC,EAAE,cAAc,EAAE,CAAA;IAC1B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAED,+EAA+E;AAC/E,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,oCAAoC;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB;AAED,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG,oBAAoB,CAAA;AAEzE,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,kBAAkB;IAClB,SAAS,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAA;IACvC;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzB;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACzB,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,4HAA4H;IAC5H,MAAM,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAA;IACpC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IACvC,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;CACrB;AAOD,OAAO,EAAE,KAAK,EAAE,CAAA;AAehB,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,cAAc,GAAG,gBAAgB,CAAA;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,kCAAkC;IAClC,OAAO,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACrD;AAsCD,8FAA8F;AAC9F,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,iBAAiB,GAAG,IAAI,CAQ9I;AAwFD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,aAAa,GAAG,cAAc,CAAA;IACxC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,gEAAgE;IAChE,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAoCD,wBAAgB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,YAAY,GAAG,IAAI,CAStE;AAED,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,4BAAgC,CAAA;AAM9D,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAKhH;AAED,+EAA+E;AAC/E,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAG7G;AAID,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAalH;AAQD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAuC/G;AAgCD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAgOpI;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAOpI;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAevD;AAgCD,+BAA+B;AAC/B,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}

package/dist/lp.js

@@ -1,9 +1,11 @@
 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 { formatUnits, parseMint, parseTokenAccount } from './layout.js';
 import { AllNodesFailedError, HttpError, RpcError } from './rpc.js';
-import { getAmountsForLiquidity, getFeeGrowthInside, getFeesOwed, orcaSqrtPriceAtTick, raydiumSqrtPriceAtTick, sqrtPriceToPrice, tickToPrice } from './lpMath.js';
+import { boundedSet, mapPool } from './util.js';
+import { Bytes } from './bytes.js';
+import { getAmountsForLiquidity, getFeeGrowthInside, getFeesOwed, getRewardGrowthInside, orcaSqrtPriceAtTick, raydiumSqrtPriceAtTick, rewardGrowthGlobal, sqrtPriceToPrice, tickToPrice, } from './lpMath.js';
 import { defillamaPrices } from './price.js';
 export const RAYDIUM_CLMM_PROGRAM_ID = 'CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK';
 export const ORCA_WHIRLPOOL_PROGRAM_ID = 'whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc';
@@ -24,36 +26,9 @@ export { defillamaPrices } from './price.js';
 // ---------------------------------------------------------------------------
 // 账户布局（各程序的 Anchor / 原生账户，偏移量含 8 字节判别符）
 // ---------------------------------------------------------------------------
-/** 小端读取账户数据（添加 / 移除流动性也用） */
-export class Bytes {
-    data;
-    #view;
-    constructor(data) {
-        this.data = data;
-        this.#view = new DataView(data.buffer, data.byteOffset, data.byteLength);
-    }
-    u8(o) {
-        return this.#view.getUint8(o);
-    }
-    u16(o) {
-        return this.#view.getUint16(o, true);
-    }
-    u32(o) {
-        return this.#view.getUint32(o, true);
-    }
-    i32(o) {
-        return this.#view.getInt32(o, true);
-    }
-    u64(o) {
-        return this.#view.getBigUint64(o, true);
-    }
-    u128(o) {
-        return (this.#view.getBigUint64(o + 8, true) << 64n) | this.#view.getBigUint64(o, true);
-    }
-    key(o) {
-        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 字节） */
@@ -65,6 +40,7 @@ const RAYDIUM_TICK_ARRAY_SIZE = 60;
 const RAYDIUM_TICK_SIZE = 168;
 const ORCA_TICK_ARRAY_SIZE = 88;
 const ORCA_TICK_SIZE = 113;
+const positionRewards = (b, offset) => [0, 1, 2].map((i) => ({ growthLast: b.u128(offset + i * 24), owed: b.u64(offset + i * 24 + 16) }));
 function raydiumPosition(address, b) {
     return {
         protocol: 'raydium-clmm',
@@ -78,6 +54,7 @@ function raydiumPosition(address, b) {
         growthLast1: b.u128(113),
         owed0: b.u64(129),
         owed1: b.u64(137),
+        rewards: positionRewards(b, 145),
     };
 }
 function orcaPosition(address, b) {
@@ -93,8 +70,47 @@ function orcaPosition(address, b) {
         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, address, account) {
+    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;
+}
+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) {
+    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) {
+    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) {
     return {
         ammConfig: b.key(9),
@@ -108,6 +124,8 @@ function raydiumPool(b) {
         global0: b.u128(277),
         global1: b.u128(293),
         fee: null,
+        liquidity: b.u128(237),
+        rewards: raydiumRewards(b),
     };
 }
 function orcaPool(b) {
@@ -123,6 +141,8 @@ function orcaPool(b) {
         global1: b.u128(245),
         decimals0: null,
         decimals1: null,
+        liquidity: b.u128(49),
+        rewards: orcaRewards(b),
     };
 }
 function ammPool(address, b) {
@@ -183,7 +203,8 @@ export function orcaTickArray(pool, tick, spacing) {
     const start = floorDiv(tick, spacing * ORCA_TICK_ARRAY_SIZE);
     return { address: findProgramAddress([utf8('tick_array'), decodeAddress(pool), utf8(String(start))], ORCA_WHIRLPOOL_PROGRAM_ID), start };
 }
-function raydiumTick(account, start, tick, spacing) {
+const rewardOutside = (b, offset) => [b.u128(offset), b.u128(offset + 16), b.u128(offset + 32)];
+export function raydiumTick(account, start, tick, spacing) {
     raydiumDiscriminator ??= discriminator('TickArrayState');
     const offset = 44 + ((tick - start) / spacing) * RAYDIUM_TICK_SIZE;
     // 先认判别符、查长度再读字段（PDA 上可能是别的账户，如被转过 SOL 的系统账户）
@@ -195,14 +216,14 @@ function raydiumTick(account, start, tick, 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 字节 */
 const discriminator = (name) => sha256(utf8(`account:${name}`)).subarray(0, 8);
 let orcaDiscriminators;
 let raydiumDiscriminator;
 const startsWith = (data, prefix) => data.length >= prefix.length && prefix.every((byte, i) => data[i] === byte);
-function orcaTick(account, start, tick, spacing) {
+export function orcaTick(account, start, tick, spacing) {
     orcaDiscriminators ??= { fixed: discriminator('TickArray'), dynamic: discriminator('DynamicTickArray') };
     if (account.data.length < 60) {
         return null; // 两种格式的头部（判别符 + start + …）都放不下
@@ -215,7 +236,7 @@ function orcaTick(account, start, tick, spacing) {
         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 字节数据）
@@ -238,7 +259,7 @@ function orcaTick(account, start, tick, spacing) {
         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;
 }
@@ -252,7 +273,7 @@ function orcaTick(account, start, tick, spacing) {
  */
 export async function lpPositions(client, owner, options = {}) {
     if (!isAddress(owner)) {
-        throw new Error(`Invalid owner address: ${owner}`);
+        throw new InvalidAddressError(`Invalid owner address: ${owner}`, owner);
     }
     const protocols = new Set(options.protocols ?? Object.keys(SOLANA_LP_PROTOCOLS));
     for (const p of protocols) {
@@ -262,7 +283,7 @@ export async function lpPositions(client, owner, 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;
@@ -301,12 +322,9 @@ export async function lpPositions(client, owner, 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 的固定权限地址时才去找池子
@@ -330,13 +348,31 @@ export async function lpPositions(client, owner, options = {}) {
             lookups.push({ protocol: 'raydium-cpmm', lpMint: h.mint });
         }
     });
-    // 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 = [];
+    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);
         }
@@ -410,10 +446,35 @@ export async function lpPositions(client, owner, options = {}) {
                 fees1 = null;
             }
         }
-        if (!options.includeClosed && position.liquidity === 0n && fees0 === 0n && fees1 === 0n) {
+        // 未领取的挖矿奖励：没有流动性时只有已记账的；有流动性时先把池子的奖励增长结算到 now，再按区间内的增长算新增
+        let 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];
+                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;
@@ -438,6 +499,18 @@ export async function lpPositions(client, owner, options = {}) {
     }
     return finalize(client, raw, options);
 }
+/**
+ * 方法不可用（见 methodUnavailable）时把错误换成说明怎么绕过的 Error（cause 为原错误，hint 拿到原错误的 message）；
+ * 取消、限频、超时等原样抛出（保留错误类型）。/lp、/approvals、资产总值共用
+ */
+export function withMethodHint(promise, signal, hint) {
+    return promise.catch((err) => {
+        if (signal?.aborted || !methodUnavailable(err)) {
+            throw err;
+        }
+        throw new Error(hint(err instanceof Error ? err.message : String(err)), { cause: err });
+    });
+}
 /**
  * 节点不提供这个方法（方法不存在、被拦截、需要付费 / Token、403 等）：这时报错里说明怎么绕过。
  * 多节点时所有节点都是这个原因才算；限频、超时、网络不对等原样抛出（资产总值 portfolio 也用）
@@ -465,32 +538,40 @@ async function listHoldings(client, owner, mints, extra, signal) {
         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) => {
-        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();
+const MAX_CACHED_LP_POOLS = 10_000;
+/** 同时进行的 getProgramAccounts 数（每个都要节点扫描整个程序的账户，很重） */
+const MAX_PARALLEL_POOL_LOOKUPS = 4;
+function lpPoolKey(protocol, lpMint) {
+    return `${protocol}:${lpMint}`;
+}
+/** 测试用：清空 LP mint → 池子地址的缓存 */
+export function resetLpPoolCache() {
+    ammPoolByLpMint.clear();
+}
+/** 按 LP mint 找池子，限制并发；结果与 lookups 一一对应 */
+function findAmmPools(client, lookups, signal) {
+    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, protocol, lpMint, signal) {
     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('getProgramAccounts', [programId, { encoding: 'base64', commitment: client.commitment, filters: [{ dataSize: size }, { memcmp: { offset, bytes: lpMint } }] }], { signal })
-        .catch((err) => {
-        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 });
-    });
+    // 免费公共节点大多不支持 getProgramAccounts：说明怎么绕过
+    const res = await withMethodHint(client.request('getProgramAccounts', [programId, { encoding: 'base64', commitment: client.commitment, filters: [{ dataSize: size }, { memcmp: { offset, bytes: lpMint } }] }], { signal }), 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;
         }
     }
@@ -498,7 +579,7 @@ async function findAmmPool(client, protocol, lpMint, signal) {
 }
 async function finalize(client, raw, options) {
     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) => fetch(...args));
     // 价格源出错（服务不可用、被拦截、同步抛错等）时照样返回仓位，只是不带价格；取消查询时照常 reject
@@ -577,6 +658,11 @@ async function finalize(client, raw, options) {
         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) => {
+            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',
@@ -597,6 +683,8 @@ async function finalize(client, raw, options) {
             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) {