@w3lib/solana-batch-call 0.5.0 → 0.6.0

package/dist/history.d.ts

@@ -0,0 +1,125 @@
+import type { RequestOptions, SolanaClient } from './client.js';
+import { type AssetDelta } from './describe.js';
+export type ActivityType = 'transfer' | 'swap' | 'approve' | 'liquidity' | 'mint' | 'contract' | 'other';
+export interface ActivityChange extends AssetDelta {
+}
+export interface Activity {
+    /** 交易签名 */
+    hash: string;
+    /** 区块时间（unix 秒）；节点没有给时为 0 */
+    time: number;
+    /** slot */
+    block?: number;
+    status: 'success' | 'failed';
+    type: ActivityType;
+    /** 对这个地址来说：资产只增加 in、只减少 out、转给自己 self；兑换等有增有减时不填 */
+    direction?: 'in' | 'out' | 'self';
+    /** 转账的对手方 */
+    counterparty?: string;
+    /** 一句话说明，如 “Swap 1 SOL for 150 USDC on Jupiter” */
+    label?: string;
+    /** 这个地址的资产变化（SOL 不含手续费，Wrapped SOL 并入 SOL；asset 原生为 'native'，其他是 mint） */
+    changes: ActivityChange[];
+    /** 这个地址付的手续费（lamports，十进制字符串）；不是手续费支付者时不填 */
+    fee?: string;
+    protocol?: string;
+}
+export interface HistoryPage {
+    items: Activity[];
+    /** 还有更多时：下一页的游标（最后一条处理过的签名）；没有更多时不返回 */
+    nextCursor?: string;
+}
+export interface HistoryContext {
+    client: SolanaClient;
+    address: string;
+    limit: number;
+    cursor?: string;
+    /** 只要这个时间（unix 秒）之前 / 之后的 */
+    before?: number;
+    after?: number;
+    types?: readonly ActivityType[];
+    fetch: typeof fetch;
+    signal?: AbortSignal;
+}
+/** 历史数据源：返回统一格式的 Activity（代币的 symbol 先用缩写的 mint，getHistory 统一补全）；游标是签名 */
+export interface HistorySource {
+    readonly name: string;
+    getHistory(ctx: HistoryContext): Promise<HistoryPage>;
+}
+export interface HistoryOptions extends RequestOptions {
+    /** 每页条数，默认 20，最多 100 */
+    limit?: number;
+    /** 上一页的 nextCursor */
+    cursor?: string;
+    /** 区块时间上限（不含）/ 下限（含），unix 秒 */
+    before?: number;
+    after?: number;
+    /** 只要这些类型（不够 limit 时会往后多找，最多看 limit × 5 笔） */
+    types?: readonly ActivityType[];
+    /** 数据源，默认 rpcHistory()；传数组时按顺序尝试，前一个失败换下一个 */
+    source?: HistorySource | readonly HistorySource[];
+    /** 补全代币符号（读 mint 的元数据），默认 true */
+    symbols?: boolean;
+    fetch?: typeof fetch;
+}
+export declare const MAX_HISTORY_LIMIT = 100;
+/**
+ * 查地址的交易历史。
+ *
+ * ```ts
+ * const page = await history(client, address, { limit: 20 })
+ * const next = await history(client, address, { cursor: page.nextCursor })
+ * ```
+ */
+export declare function history(client: SolanaClient, address: string, options?: HistoryOptions): Promise<HistoryPage>;
+export interface RpcHistoryOptions {
+    /** 同时取多少笔交易的详情，默认 6（公共节点限频很严，节点自己会对 429 退避重试） */
+    concurrency?: number;
+    /** 一次翻页最多检查多少笔签名（含被 types / 时间过滤掉的），默认 limit × 5，最多 500 */
+    maxScan?: number;
+}
+interface RawTransaction {
+    slot: number;
+    blockTime: number | null;
+    meta: {
+        err: unknown;
+        fee: number;
+        preBalances: number[];
+        postBalances: number[];
+        preTokenBalances?: RawTokenBalance[];
+        postTokenBalances?: RawTokenBalance[];
+        loadedAddresses?: {
+            writable: string[];
+            readonly: string[];
+        };
+    } | null;
+    transaction: {
+        signatures: string[];
+        message: {
+            accountKeys: string[];
+            instructions: Array<{
+                programIdIndex: number;
+                accounts: number[];
+                data: string;
+            }>;
+        };
+    };
+}
+interface RawTokenBalance {
+    accountIndex: number;
+    mint: string;
+    owner?: string;
+    uiTokenAmount: {
+        amount: string;
+        decimals: number;
+    };
+}
+/**
+ * 默认数据源：getSignaturesForAddress（用 before 翻页）+ getTransaction（逐笔，json 编码、支持 v0）。
+ * 先按区块时间过滤签名再取详情，只取需要的笔数；失败的交易也列出（status 为 failed）。每页的请求数 ≈ limit + 1
+ */
+export declare function rpcHistory(options?: RpcHistoryOptions): HistorySource;
+/** 一笔 getTransaction（json 编码）整理成 Activity，address 的角度；导出供测试和自己取到交易的场景使用 */
+export declare function activityFromTransaction(address: string, tx: RawTransaction): Activity | null;
+export {};
+//# sourceMappingURL=history.d.ts.map

package/dist/history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../src/history.ts"],"names":[],"mappings":"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"}

package/dist/history.js

@@ -0,0 +1,231 @@
+/**
+ * 交易历史（子路径 `@w3lib/solana-batch-call/history`）：把地址的交易整理成统一的 Activity（类型、方向、对手方、资产变化、手续费）。
+ * 数据源可以换：默认 rpcHistory（getSignaturesForAddress 翻页 + getTransaction，免费节点就能用，节点失败自动切换），
+ * 也可以传 heliusHistory 等；传多个时按顺序尝试。游标就是最后一条签名，换数据源也能接着翻
+ */
+import { base58 } from '@scure/base';
+import { isAddress } from './address.js';
+import { NATIVE_MINT, SOL_DECIMALS, SYSTEM_PROGRAM_ID } from './constants.js';
+import { decodeInstruction } from './decode.js';
+import { classify, describe } from './describe.js';
+import { formatUnits } from './layout.js';
+export const MAX_HISTORY_LIMIT = 100;
+/** getTransaction 支持的交易版本：主网已经有 v1 格式的交易（2026-10），只给 0 时遇到它们整个请求报错（-32015）；json 编码下 v1 的账户和指令字段与 v0 相同 */
+const MAX_TX_VERSION = 1;
+const short = (a) => `${a.slice(0, 4)}…${a.slice(-4)}`;
+/**
+ * 查地址的交易历史。
+ *
+ * ```ts
+ * const page = await history(client, address, { limit: 20 })
+ * const next = await history(client, address, { cursor: page.nextCursor })
+ * ```
+ */
+export async function history(client, address, options = {}) {
+    if (!isAddress(address))
+        throw new Error(`Invalid address: ${address}`);
+    const limit = options.limit ?? 20;
+    if (!Number.isInteger(limit) || limit < 1 || limit > MAX_HISTORY_LIMIT)
+        throw new RangeError(`limit must be an integer between 1 and ${MAX_HISTORY_LIMIT}`);
+    const sources = options.source === undefined ? [rpcHistory()] : Array.isArray(options.source) ? options.source : [options.source];
+    if (!sources.length)
+        throw new Error('No history source');
+    const ctx = {
+        client,
+        address,
+        limit,
+        cursor: options.cursor,
+        before: options.before,
+        after: options.after,
+        types: options.types?.length ? options.types : undefined,
+        fetch: options.fetch ?? ((...args) => fetch(...args)),
+        signal: options.signal,
+    };
+    const errors = [];
+    for (const source of sources) {
+        try {
+            const page = await source.getHistory(ctx);
+            if (options.symbols !== false)
+                await fillSymbols(client, page.items, options.signal);
+            return page;
+        }
+        catch (err) {
+            if (options.signal?.aborted)
+                throw err;
+            errors.push(`${source.name}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    throw new Error(`All history sources failed (${errors.join('; ')})`);
+}
+/** 补全还是缩写 mint 的 symbol（一次 tokens 查询，label 里的同步替换）；读不到的用缩写的 mint */
+async function fillSymbols(client, items, signal) {
+    const pending = (c) => c.symbol === short(c.asset);
+    const missing = [...new Set(items.flatMap((a) => a.changes.filter(pending).map((c) => c.asset)))];
+    if (!missing.length)
+        return;
+    const details = await client.tokens(missing, { fields: ['symbol'], signal }).catch(() => null);
+    const symbols = new Map(missing.map((m, i) => [m, details?.[i]?.symbol ?? short(m)]));
+    for (const a of items) {
+        for (const c of a.changes) {
+            if (!pending(c))
+                continue;
+            const symbol = symbols.get(c.asset);
+            if (a.label)
+                a.label = a.label.split(c.symbol).join(symbol);
+            c.symbol = symbol;
+        }
+    }
+}
+async function pool(items, limit, fn) {
+    const results = new Array(items.length);
+    let next = 0;
+    const worker = async () => {
+        while (next < items.length) {
+            const i = next++;
+            results[i] = await fn(items[i]);
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(Math.max(1, limit), items.length) }, worker));
+    return results;
+}
+/**
+ * 默认数据源：getSignaturesForAddress（用 before 翻页）+ getTransaction（逐笔，json 编码、支持 v0）。
+ * 先按区块时间过滤签名再取详情，只取需要的笔数；失败的交易也列出（status 为 failed）。每页的请求数 ≈ limit + 1
+ */
+export function rpcHistory(options = {}) {
+    const concurrency = options.concurrency ?? 6;
+    return {
+        name: 'rpc',
+        async getHistory(ctx) {
+            const { client, address, limit, signal } = ctx;
+            const maxScan = Math.min(options.maxScan ?? limit * 5, 500);
+            const items = [];
+            let cursor = ctx.cursor;
+            let scanned = 0;
+            let more = true;
+            while (items.length < limit && scanned < maxScan && more) {
+                const pageSize = Math.min(1000, Math.max(limit, 20) * (ctx.types ? 3 : 1));
+                const commitment = client.commitment === 'processed' ? 'confirmed' : client.commitment;
+                const sigs = await client.request('getSignaturesForAddress', [address, { limit: pageSize, ...(cursor ? { before: cursor } : {}), commitment }], { signal });
+                if (!sigs.length) {
+                    more = false;
+                    break;
+                }
+                // 按时间过滤：比 before 新的跳过；比 after 旧的之后都不用看了（签名按从新到旧排列）
+                let rows = sigs.filter((s) => ctx.before === undefined || s.blockTime === null || s.blockTime < ctx.before);
+                const old = ctx.after === undefined ? -1 : rows.findIndex((s) => s.blockTime !== null && s.blockTime < ctx.after);
+                if (old >= 0)
+                    rows = rows.slice(0, old);
+                let i = 0;
+                while (i < rows.length && items.length < limit && scanned < maxScan) {
+                    const chunk = rows.slice(i, i + Math.max(1, Math.min(limit - items.length, maxScan - scanned)));
+                    const txs = await pool(chunk, concurrency, (row) => client.request('getTransaction', [row.signature, { encoding: 'json', maxSupportedTransactionVersion: MAX_TX_VERSION, commitment }], { signal }));
+                    for (const [j, tx] of txs.entries()) {
+                        i++;
+                        scanned++;
+                        cursor = chunk[j].signature;
+                        const activity = tx ? activityFromTransaction(address, tx) : null;
+                        if (activity && (!ctx.types || ctx.types.includes(activity.type)))
+                            items.push(activity);
+                        if (items.length >= limit)
+                            break;
+                    }
+                }
+                if (i >= rows.length) {
+                    // 这一页看完了：接着从这一页最后一条往后翻；没有更多（不足一页、或已经到 after）时结束
+                    cursor = sigs[sigs.length - 1].signature;
+                    more = sigs.length >= pageSize && old < 0;
+                }
+            }
+            return { items, ...(more && cursor ? { nextCursor: cursor } : {}) };
+        },
+    };
+}
+const SOL = { asset: 'native', symbol: 'SOL', decimals: SOL_DECIMALS };
+/** 合并资产变化：同一资产相加，去掉 0 */
+function toChanges(native, tokens) {
+    const out = [];
+    if (native !== 0n)
+        out.push({ ...SOL, delta: native.toString(), formatted: formatUnits(native, SOL_DECIMALS) });
+    for (const [asset, { delta, decimals }] of tokens) {
+        if (delta !== 0n)
+            out.push({ asset, symbol: short(asset), decimals, delta: delta.toString(), formatted: formatUnits(delta, decimals) });
+    }
+    return out;
+}
+function directionOf(changes, counterparty, address) {
+    if (!changes.length)
+        return counterparty === address ? 'self' : undefined;
+    const negative = changes.filter((c) => c.delta.startsWith('-')).length;
+    if (negative === 0)
+        return 'in';
+    return negative === changes.length ? 'out' : undefined;
+}
+const toActivityType = (kind) => (kind ? (kind.type === 'unknown' ? 'contract' : kind.type) : 'other');
+/** 一笔 getTransaction（json 编码）整理成 Activity，address 的角度；导出供测试和自己取到交易的场景使用 */
+export function activityFromTransaction(address, tx) {
+    const meta = tx.meta;
+    const hash = tx.transaction.signatures[0];
+    if (!meta || !hash)
+        return null;
+    const message = tx.transaction.message;
+    const keys = [...message.accountKeys, ...(meta.loadedAddresses?.writable ?? []), ...(meta.loadedAddresses?.readonly ?? [])];
+    const failed = meta.err !== null && meta.err !== undefined;
+    const ixs = message.instructions.map((ix, i) => {
+        const programId = keys[ix.programIdIndex];
+        return decodeInstruction(i, programId, ix.accounts.map((a) => keys[a]), base58.decode(ix.data));
+    });
+    const index = keys.indexOf(address);
+    const isPayer = index === 0;
+    const fee = BigInt(meta.fee);
+    let native = index >= 0 ? BigInt(meta.postBalances[index] ?? 0) - BigInt(meta.preBalances[index] ?? 0) + (isPayer ? fee : 0n) : 0n;
+    const tokens = new Map();
+    const ownerOf = new Map();
+    for (const [list, sign] of [[meta.preTokenBalances ?? [], -1n], [meta.postTokenBalances ?? [], 1n]]) {
+        for (const b of list) {
+            if (b.owner)
+                ownerOf.set(b.accountIndex, b.owner);
+            if (b.owner !== address)
+                continue;
+            const prev = tokens.get(b.mint);
+            tokens.set(b.mint, { delta: (prev?.delta ?? 0n) + sign * BigInt(b.uiTokenAmount.amount), decimals: b.uiTokenAmount.decimals });
+        }
+    }
+    // Wrapped SOL 并入 SOL
+    const wsol = tokens.get(NATIVE_MINT);
+    if (wsol) {
+        native += wsol.delta;
+        tokens.delete(NATIVE_MINT);
+    }
+    const changes = failed ? [] : toChanges(native, tokens);
+    // 对手方：第一笔转账的另一头（代币转账取代币账户的 owner）
+    let counterparty;
+    for (const ix of ixs) {
+        if (ix.type !== 'transfer')
+            continue;
+        const args = ix.args;
+        const owner = (account) => (account ? (ownerOf.get(keys.indexOf(account)) ?? (ix.programId === SYSTEM_PROGRAM_ID ? account : undefined)) : undefined);
+        const from = owner(args?.from ?? args?.source);
+        const to = owner(args?.to ?? args?.destination);
+        counterparty = from === address ? to : from;
+        if (counterparty)
+            break;
+    }
+    const kind = classify(ixs, changes);
+    const type = toActivityType(kind);
+    const label = describe(kind, ixs, changes, counterparty);
+    return {
+        hash,
+        time: tx.blockTime ?? 0,
+        block: tx.slot,
+        status: failed ? 'failed' : 'success',
+        type,
+        direction: type === 'transfer' || type === 'other' ? directionOf(changes, counterparty, address) : undefined,
+        counterparty,
+        label: failed ? `Failed: ${label}` : label,
+        changes,
+        ...(isPayer ? { fee: fee.toString() } : {}),
+        protocol: kind?.protocol,
+    };
+}
+//# sourceMappingURL=history.js.map

package/dist/history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"history.js","sourceRoot":"","sources":["../src/history.ts"],"names":[],"mappings":"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"}

package/dist/historyHelius.d.ts

@@ -0,0 +1,52 @@
+import type { Activity, 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;
+            };
+        }>;
+    }>;
+}
+export declare function activityFromHelius(address: string, item: HeliusItem): Activity;
+/**
+ * Helius 增强交易历史（`GET /v0/addresses/{address}/transactions`，按 before 签名翻页）。apiKey 由应用传入，库里不带。
+ * 按交易类型过滤时翻页最多再取 3 页
+ *
+ * ```ts
+ * await getHistory(address, { source: [heliusHistory({ apiKey }), rpcHistory()] })   // Helius 失败时用节点
+ * ```
+ */
+export declare function heliusHistory(options: HeliusHistoryOptions): HistorySource;
+export {};
+//# sourceMappingURL=historyHelius.d.ts.map

package/dist/historyHelius.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"historyHelius.d.ts","sourceRoot":"","sources":["../src/historyHelius.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAgC,aAAa,EAAE,MAAM,cAAc,CAAA;AAEzF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,gCAAgC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,eAAe,CAAC,EAAE,KAAK,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3F,cAAc,CAAC,EAAE,KAAK,CAAC;QAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3H,WAAW,CAAC,EAAE,KAAK,CAAC;QAClB,OAAO,EAAE,MAAM,CAAA;QACf,mBAAmB,CAAC,EAAE,MAAM,CAAA;QAC5B,mBAAmB,CAAC,EAAE,KAAK,CAAC;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE;gBAAE,WAAW,EAAE,MAAM,CAAC;gBAAC,QAAQ,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAC,CAAA;KAC9H,CAAC,CAAA;CACH;AAiBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,QAAQ,CAgD9E;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAgC1E"}

package/dist/historyHelius.js

@@ -0,0 +1,125 @@
+/** Helius 增强交易历史数据源（需要应用自己的 API key）：把 `/v0/addresses/{address}/transactions` 的结果整理成和 rpcHistory 一样的 Activity */
+import { NATIVE_MINT, SOL_DECIMALS } from './constants.js';
+import { formatUnits } from './layout.js';
+const short = (a) => `${a.slice(0, 4)}…${a.slice(-4)}`;
+/** Helius 的交易类型 → Activity 类型（认不出的按资产变化判断） */
+function typeOf(item, changes) {
+    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, item) {
+    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();
+    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 = [];
+    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;
+    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) {
+    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 = [];
+            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());
+                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 } : {}) };
+        },
+    };
+}
+//# sourceMappingURL=historyHelius.js.map

package/dist/historyHelius.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"historyHelius.js","sourceRoot":"","sources":["../src/historyHelius.ts"],"names":[],"mappings":"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"}

package/dist/liquidity/orca.d.ts

@@ -1,6 +1,12 @@
+import type { Instruction } from '../write/transaction.js';
 import { type Ctx } from './common.js';
 import type { SolanaIncreaseLiquidityParams, SolanaLiquidityPlan, SolanaNewPositionParams, SolanaRemoveLiquidityParams } from './types.js';
 export declare function orcaAdd(ctx: Ctx, params: SolanaIncreaseLiquidityParams | SolanaNewPositionParams): Promise<SolanaLiquidityPlan>;
+/**
+ * 关闭已清空的仓位（流动性、手续费、奖励都为 0）：销毁仓位 NFT、关闭仓位账户和 NFT 的代币账户（nftAccount，默认 owner 的 ATA），租金退给 receiver。
+ * NFT 是 Token-2022（带元数据扩展）时连 mint 一起关闭，否则（Metaplex 时代的 SPL Token NFT）mint 留着
+ */
+export declare function orcaClosePosition(owner: string, receiver: string, positionMint: string, nftProgram: string, nftAccount?: string): Instruction;
 /** 移除（decrease + 领取手续费和奖励）/ 只领取（collectOnly） */
 export declare function orcaRemove(ctx: Ctx, params: SolanaRemoveLiquidityParams, collectOnly?: boolean): Promise<SolanaLiquidityPlan>;
 //# sourceMappingURL=orca.d.ts.map

package/dist/liquidity/orca.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/liquidity/orca.ts"],"names":[],"mappings":"AAOA,OAAO,EAkBL,KAAK,GAAG,EAET,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AA2E1I,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,6BAA6B,GAAG,uBAAuB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwHrI;AAED,gDAAgD;AAChD,wBAAsB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,2BAA2B,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqHjI"}
+{"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/liquidity/orca.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAE1D,OAAO,EAkBL,KAAK,GAAG,EAET,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AA2E1I,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,6BAA6B,GAAG,uBAAuB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAwHrI;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,SAA6D,GAAG,WAAW,CAQjM;AAED,gDAAgD;AAChD,wBAAsB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,2BAA2B,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAiHjI"}

package/dist/liquidity/orca.js

@@ -183,6 +183,19 @@ export async function orcaAdd(ctx, params) {
         signers,
     });
 }
+/**
+ * 关闭已清空的仓位（流动性、手续费、奖励都为 0）：销毁仓位 NFT、关闭仓位账户和 NFT 的代币账户（nftAccount，默认 owner 的 ATA），租金退给 receiver。
+ * NFT 是 Token-2022（带元数据扩展）时连 mint 一起关闭，否则（Metaplex 时代的 SPL Token NFT）mint 留着
+ */
+export function orcaClosePosition(owner, receiver, positionMint, nftProgram, nftAccount = getAssociatedTokenAddress(owner, positionMint, nftProgram)) {
+    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, params, collectOnly = false) {
     const mint = refMint(params.position);
@@ -264,9 +277,7 @@ export async function orcaRemove(ctx, params, collectOnly = false) {
         });
     });
     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',