@picon-finance/dlmm-sdk 1.5.0 → 1.7.0

package/README.md

@@ -67,8 +67,8 @@ const openPositionIxs = await pool.openPosition(ownerSigner, positionMintSigner,
 
 const position = await pool.getPositionByPositionMint(positionMintSigner.address);
 
-// depositByWeight checks the deposit against the pool's cached activeBinId — if the pool was
-// fetched a while ago (or opened before other activity could've moved the price), refresh it
+// depositByWeight checks the deposit against the pool's cached activeBinId — if time has
+// passed since pool was fetched (other activity could've moved the price since), refresh it
 // first so the deposit isn't built/checked against a stale active bin.
 await pool.refresh();
 
@@ -93,12 +93,28 @@ const closeIx = await position.close(ownerSigner);
 console.log(position.data.lowerBinId, position.data.upperBinId);
 ```
 
-`position.data.feeStates[i].feeOwedX`/`feeOwedY` is the fee already swept into the position (materialized by the last deposit/withdraw/claim_fee call), not the full claimable amount — fees earned since then aren't reflected until the next such call. `position.getPendingFee()` computes that remaining delta from the same cached position + bin array data (no RPC):
+`position.getInfo()` returns a full summary: deposited amounts and the total fee a `claimFee` call would sweep right now, each in both `gross*` (before any Token-2022 transfer fee) and `net*` (what you'd actually receive) forms, plus the per-bin data they're summed from:
 
 ```ts
-const { amountX: pendingFeeX, amountY: pendingFeeY } = position.getPendingFee();
-const owedFeeX = position.data.feeStates.reduce((sum, feeState) => sum + feeState.feeOwedX, 0n);
-// owedFeeX + pendingFeeX is the total a claimFee call would sweep right now.
+const info = await position.getInfo();
+console.log(`Deposited: ${info.netAmountX} X / ${info.netAmountY} Y`);
+console.log(`Claimable fee: ${info.netFeeX} X / ${info.netFeeY} Y`);
+```
+
+`info.bins` (same as calling `position.getBinInfos()` directly) is the per-bin breakdown `getInfo()` sums to produce those totals — always raw, since `gross*`/`net*` only apply once, to the aggregate:
+
+```ts
+for (const { bin, amountX, amountY, feeX, feeY } of position.getBinInfos()) {
+  console.log(`bin ${bin.id}: deposited ${amountX} X / ${amountY} Y, fee ${feeX} X / ${feeY} Y`);
+}
+```
+
+Both are computed entirely from cached position + bin array data — `getBinInfos()` makes no RPC calls at all; `getInfo()` makes one round trip (via `Pool.getTransferFees()`) to resolve each mint's live transfer-fee rate.
+
+`Pool.getTransferFees()` resolves each mint's active [Token-2022 transfer-fee](https://spl.solana.com/token-2022/extensions#transfer-fees) config from cached mint data — `undefined` per side means that mint has no `TransferFeeConfig` extension, not that the fee is zero:
+
+```ts
+const { transferFeeX, transferFeeY } = await pool.getTransferFees();
 ```
 
 Refresh a position's cached state after it changes on-chain (e.g. after a deposit lands):

package/dist/entities/pool.d.ts

@@ -1,6 +1,6 @@
 import { createSolanaRpc, type Address, type Account, type Instruction, type TransactionSigner, type FetchAccountConfig, type FetchAccountsConfig } from "@solana/kit";
 import { generated } from "..";
-import { type QuoteOutput } from "../quote";
+import { type QuoteOutput, type TransferFee } from "../quote";
 import { Position } from "./position";
 import { type ProgramConfig } from "./types";
 export declare class Pool {
@@ -19,6 +19,10 @@ export declare class Pool {
     get tokenVaultY(): Address;
     get tokenProgramX(): Address;
     get tokenProgramY(): Address;
+    getTransferFees(): Promise<{
+        transferFeeX?: TransferFee;
+        transferFeeY?: TransferFee;
+    }>;
     refresh(data: Account<generated.Pool>): Promise<void>;
     refresh(config?: FetchAccountConfig): Promise<void>;
     getPosition(address: Address, config?: FetchAccountsConfig): Promise<Position>;

package/dist/entities/pool.d.ts.map

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

package/dist/entities/pool.js

@@ -1,7 +1,7 @@
 import { AccountRole, } from "@solana/kit";
 import { fetchAllMint, } from "@solana-program/token-2022";
 import { generated } from "..";
-import { quote } from "../quote";
+import { quote, } from "../quote";
 import { isAccount } from "../utils/type_guards";
 import { resolveAdminConfigAddress } from "./admin_config";
 import { processAssociatedTokenAccountPair } from "../utils/ata";
@@ -36,6 +36,13 @@ export class Pool {
     get tokenVaultY() { return this.data.tokenVaultY; }
     get tokenProgramX() { return this.#mintX.programAddress; }
     get tokenProgramY() { return this.#mintY.programAddress; }
+    async getTransferFees() {
+        const { epoch } = await this.#rpc.getEpochInfo().send();
+        return {
+            transferFeeX: resolveTransferFee(this.#mintX.data, epoch),
+            transferFeeY: resolveTransferFee(this.#mintY.data, epoch),
+        };
+    }
     async refresh(arg) {
         if (!isAccount(arg)) {
             arg = await generated.fetchPool(this.#rpc, this.address, arg);
@@ -95,13 +102,11 @@ export class Pool {
     async quote({ xToY, amountIn, slippageToleranceBps, }) {
         const indices = generateBinArrayIndicesForSwap(this.activeBinId, xToY, MAX_BIN_ARRAYS_PER_SWAP);
         const binArrayAddresses = await findAllBinArrayAddresses({ pool: this.address, indices }, { programAddress: this.#programAddress });
-        const [maybeBinArrays, { epoch }] = await Promise.all([
+        const [maybeBinArrays, { transferFeeX, transferFeeY }] = await Promise.all([
             generated.fetchAllMaybeBinArray(this.#rpc, binArrayAddresses),
-            this.#rpc.getEpochInfo().send(),
+            this.getTransferFees(),
         ]);
         const binArrays = maybeBinArrays.map(maybeBinArray => maybeBinArray.exists ? maybeBinArray.data : undefined);
-        const transferFeeX = resolveTransferFee(this.#mintX.data, epoch);
-        const transferFeeY = resolveTransferFee(this.#mintY.data, epoch);
         return await quote({
             amountIn,
             xToY,

package/dist/entities/position.d.ts

@@ -2,21 +2,21 @@ import { createSolanaRpc, type Address, type Account, type Instruction, type Tra
 import { generated } from "..";
 import { type BinIdRange } from "../utils/bin_location";
 import { Pool } from "./pool";
-import { type ProgramConfig } from "./types";
+import { BinArray } from "./bin_array";
+import { type PositionInfo, type ProgramConfig, type PositionBinInfo } from "./types";
 export declare class Position {
     #private;
     private constructor();
     get address(): Address<string>;
     get data(): generated.Position;
     get positionMint(): Address;
+    get binArrays(): readonly BinArray[];
     get binArrayAddresses(): {
         lowerBinArray: Address;
         upperBinArray?: Address | undefined;
     };
-    getPendingFee(): {
-        amountX: bigint;
-        amountY: bigint;
-    };
+    getBinInfos(): PositionBinInfo[];
+    getInfo(): Promise<PositionInfo>;
     refresh(data: [Account<generated.Position>, Account<generated.BinArray>[]]): Promise<void>;
     refresh(config?: FetchAccountsConfig): Promise<void>;
     depositByWeight(owner: TransactionSigner, { amountX, amountY, lowerBinId, binWeights, maxActiveBinSlippage, distributionMode, }: {

package/dist/entities/position.d.ts.map

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

package/dist/entities/position.js

@@ -1,5 +1,6 @@
 import { decodeAccount, assertAccountExists, fetchEncodedAccounts, } from "@solana/kit";
 import { generated } from "..";
+import { applyTransferFee } from "../quote";
 import { findPositionTokenAccount, processAssociatedTokenAccountPair, } from "../utils/ata";
 import { getBinIndex, getBinArrayIndex, getPositionBinArrayIndices, } from "../utils/bin_location";
 import { assertRangeWithinRange, assertPositionBelongsToPool, } from "../utils/assert";
@@ -20,30 +21,74 @@ export class Position {
     get address() { return this.#account.address; }
     get data() { return this.#account.data; }
     get positionMint() { return this.data.positionMint; }
+    get binArrays() { return this.#binArrays; }
     get binArrayAddresses() {
         const lowerBinArray = this.#binArrays[0].address;
         const upperBinArray = this.#binArrays.length > 1 ? this.#binArrays[1].address : undefined;
         return { lowerBinArray, upperBinArray };
     }
-    getPendingFee() {
+    getBinInfos() {
         const { lowerBinId, upperBinId, feeStates } = this.data;
         const lowerBinArrayIndex = getBinArrayIndex(lowerBinId);
-        return Array.from({ length: upperBinId - lowerBinId + 1 }, (_, i) => i)
-            .flatMap(i => {
-            const feeState = feeStates[i];
-            if (feeState.shares === 0n)
-                return [];
+        const binCount = upperBinId - lowerBinId + 1;
+        return feeStates
+            .slice(0, binCount)
+            .map((feeState, i) => {
             const binId = lowerBinId + i;
             const binIndex = getBinIndex(binId);
-            const binArrayIndex = getBinArrayIndex(binId) - lowerBinArrayIndex;
-            const binArray = this.#binArrays[binArrayIndex];
+            const localBinArrayIndex = getBinArrayIndex(binId) - lowerBinArrayIndex;
+            const binArray = this.#binArrays[localBinArrayIndex];
             const bin = binArray.bins[binIndex];
-            return bin.totalShares > 0n ? [{ feeState, bin }] : [];
-        })
-            .reduce((total, { feeState, bin }) => ({
-            amountX: total.amountX + earnedAmount(bin.feePerShareX, feeState.feePerShareCheckpointX, feeState.shares),
-            amountY: total.amountY + earnedAmount(bin.feePerShareY, feeState.feePerShareCheckpointY, feeState.shares),
-        }), { amountX: 0n, amountY: 0n });
+            const amountX = bin.totalShares > 0n ? (feeState.shares * bin.amountX) / bin.totalShares : 0n;
+            const amountY = bin.totalShares > 0n ? (feeState.shares * bin.amountY) / bin.totalShares : 0n;
+            let feeX = feeState.feeOwedX;
+            let feeY = feeState.feeOwedY;
+            if (feeState.shares > 0n && bin.totalShares > 0n) {
+                feeX += earnedAmount(bin.feePerShareX, feeState.feePerShareCheckpointX, feeState.shares);
+                feeY += earnedAmount(bin.feePerShareY, feeState.feePerShareCheckpointY, feeState.shares);
+            }
+            return {
+                bin: {
+                    id: binId,
+                    price: bin.price,
+                    amountX: bin.amountX,
+                    amountY: bin.amountY,
+                    shares: bin.totalShares
+                },
+                amountX,
+                amountY,
+                shares: feeState.shares,
+                feeX,
+                feeY,
+            };
+        });
+    }
+    async getInfo() {
+        const bins = this.getBinInfos();
+        const gross = bins.reduce((acc, { amountX, amountY, feeX, feeY }) => ({
+            amountX: acc.amountX + amountX,
+            amountY: acc.amountY + amountY,
+            feeX: acc.feeX + feeX,
+            feeY: acc.feeY + feeY,
+        }), { amountX: 0n, amountY: 0n, feeX: 0n, feeY: 0n });
+        const { transferFeeX, transferFeeY } = await this.#pool.getTransferFees();
+        const [netAmountX, netAmountY, netFeeX, netFeeY] = await Promise.all([
+            applyTransferFee(gross.amountX, transferFeeX),
+            applyTransferFee(gross.amountY, transferFeeY),
+            applyTransferFee(gross.feeX, transferFeeX),
+            applyTransferFee(gross.feeY, transferFeeY),
+        ]);
+        return {
+            bins,
+            grossAmountX: gross.amountX,
+            grossAmountY: gross.amountY,
+            netAmountX,
+            netAmountY,
+            grossFeeX: gross.feeX,
+            grossFeeY: gross.feeY,
+            netFeeX,
+            netFeeY,
+        };
     }
     async refresh(arg) {
         if (!Array.isArray(arg)) {

package/dist/entities/types.d.ts

@@ -2,4 +2,30 @@ import { type Address } from "@solana/kit";
 export type ProgramConfig = {
     programAddress: Address;
 };
+export type BinInfo = {
+    id: number;
+    price: bigint;
+    amountX: bigint;
+    amountY: bigint;
+    shares: bigint;
+};
+export type PositionBinInfo = {
+    bin: BinInfo;
+    amountX: bigint;
+    amountY: bigint;
+    shares: bigint;
+    feeX: bigint;
+    feeY: bigint;
+};
+export type PositionInfo = {
+    bins: PositionBinInfo[];
+    grossAmountX: bigint;
+    grossAmountY: bigint;
+    netAmountX: bigint;
+    netAmountY: bigint;
+    grossFeeX: bigint;
+    grossFeeY: bigint;
+    netFeeX: bigint;
+    netFeeY: bigint;
+};
 //# sourceMappingURL=types.d.ts.map

package/dist/entities/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/entities/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/entities/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IAEd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,OAAO,CAAC;IAEb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,eAAe,EAAE,CAAC;IAExB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}

package/dist/index.d.ts

@@ -4,6 +4,6 @@ export * as events from "./events";
 export * from "./entities";
 export * from "./utils/constants";
 export { NATIVE_MINT_ADDRESS } from "./utils/ata";
-export type { QuoteInput, QuoteOutput, PoolState, TransferFee } from "./quote";
+export type { QuoteOutput, TransferFee } from "./quote";
 export * from "./program_addresses";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC/E,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACxD,cAAc,qBAAqB,CAAC"}

package/dist/quote/index.d.ts

@@ -1,4 +1,5 @@
 import { type QuoteInput, type QuoteOutput, type PoolState, type TransferFee } from "#wasm";
 export type { QuoteInput, QuoteOutput, PoolState, TransferFee };
 export declare function quote(input: QuoteInput): Promise<QuoteOutput>;
+export declare function applyTransferFee(amount: bigint, fee?: TransferFee): Promise<bigint>;
 //# sourceMappingURL=index.d.ts.map

package/dist/quote/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/quote/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,OAAO,CAAC;AAEf,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AAEhE,wBAAsB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAGnE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/quote/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,WAAW,EACjB,MAAM,OAAO,CAAC;AAEf,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AAEhE,wBAAsB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAGnE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAGzF"}

package/dist/quote/index.js

@@ -3,3 +3,7 @@ export async function quote(input) {
     const wasm = await loadWasm();
     return wasm.quote(input);
 }
+export async function applyTransferFee(amount, fee) {
+    const wasm = await loadWasm();
+    return wasm.applyTransferFee(amount, fee);
+}

package/dist/quote/wasm-node/picon_dlmm_quote.d.ts

@@ -61,4 +61,10 @@ export interface TransferFee {
 }
 
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ */
+export function applyTransferFee(amount: bigint, fee?: TransferFee | null): bigint;
+
 export function quote(input: QuoteInput): QuoteOutput;

package/dist/quote/wasm-node/picon_dlmm_quote.js

@@ -2,6 +2,21 @@
 import { readFileSync } from 'node:fs';
 
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ * @param {bigint} amount
+ * @param {TransferFee | null} [fee]
+ * @returns {bigint}
+ */
+export function applyTransferFee(amount, fee) {
+    const ret = wasm.applyTransferFee(amount, isLikeNone(fee) ? 0 : addToExternrefTable0(fee));
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return BigInt.asUintN(64, ret[0]);
+}
+
 /**
  * @param {QuoteInput} input
  * @returns {QuoteOutput}

package/dist/quote/wasm-node/picon_dlmm_quote_bg.wasm.d.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const applyTransferFee: (a: bigint, b: number) => [bigint, number, number];
 export const quote: (a: any) => [number, number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

package/dist/quote/wasm-web/picon_dlmm_quote.d.ts

@@ -61,12 +61,19 @@ export interface TransferFee {
 }
 
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ */
+export function applyTransferFee(amount: bigint, fee?: TransferFee | null): bigint;
+
 export function quote(input: QuoteInput): QuoteOutput;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
     readonly memory: WebAssembly.Memory;
+    readonly applyTransferFee: (a: bigint, b: number) => [bigint, number, number];
     readonly quote: (a: any) => [number, number, number];
     readonly __wbindgen_malloc: (a: number, b: number) => number;
     readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

package/dist/quote/wasm-web/picon_dlmm_quote.js

@@ -1,5 +1,20 @@
 /* @ts-self-types="./picon_dlmm_quote.d.ts" */
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ * @param {bigint} amount
+ * @param {TransferFee | null} [fee]
+ * @returns {bigint}
+ */
+export function applyTransferFee(amount, fee) {
+    const ret = wasm.applyTransferFee(amount, isLikeNone(fee) ? 0 : addToExternrefTable0(fee));
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return BigInt.asUintN(64, ret[0]);
+}
+
 /**
  * @param {QuoteInput} input
  * @returns {QuoteOutput}

package/dist/quote/wasm-web/picon_dlmm_quote_bg.wasm.d.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const applyTransferFee: (a: bigint, b: number) => [bigint, number, number];
 export const quote: (a: any) => [number, number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picon-finance/dlmm-sdk",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Typescript SDK for interacting with the Picon DLMM protocol",
   "author": "Picon Finance",
   "license": "MIT",

package/src/entities/pool.ts

@@ -14,7 +14,11 @@ import {
 } from "@solana-program/token-2022";
 
 import { generated } from "..";
-import { quote, type QuoteOutput } from "../quote";
+import {
+  quote,
+  type QuoteOutput,
+  type TransferFee,
+} from "../quote";
 import { isAccount } from "../utils/type_guards";
 import { resolveAdminConfigAddress } from "./admin_config";
 import { processAssociatedTokenAccountPair } from "../utils/ata";
@@ -78,6 +82,14 @@ export class Pool {
   public get tokenProgramX() { return this.#mintX.programAddress; }
   public get tokenProgramY() { return this.#mintY.programAddress; }
 
+  public async getTransferFees(): Promise<{ transferFeeX?: TransferFee, transferFeeY?: TransferFee }> {
+    const { epoch } = await this.#rpc.getEpochInfo().send();
+    return {
+      transferFeeX: resolveTransferFee(this.#mintX.data, epoch),
+      transferFeeY: resolveTransferFee(this.#mintY.data, epoch),
+    };
+  }
+
   public async refresh(data: Account<generated.Pool>): Promise<void>;
   public async refresh(config?: FetchAccountConfig): Promise<void>;
   public async refresh(arg?: Account<generated.Pool> | FetchAccountConfig) {
@@ -211,15 +223,12 @@ export class Pool {
       { programAddress: this.#programAddress },
     );
 
-    const [maybeBinArrays, { epoch }] = await Promise.all([
+    const [maybeBinArrays, { transferFeeX, transferFeeY }] = await Promise.all([
       generated.fetchAllMaybeBinArray(this.#rpc, binArrayAddresses),
-      this.#rpc.getEpochInfo().send(),
+      this.getTransferFees(),
     ]);
     const binArrays = maybeBinArrays.map(maybeBinArray => maybeBinArray.exists ? maybeBinArray.data : undefined);
 
-    const transferFeeX = resolveTransferFee(this.#mintX.data, epoch);
-    const transferFeeY = resolveTransferFee(this.#mintY.data, epoch);
-
     return await quote({
       amountIn,
       xToY,

package/src/entities/position.ts

@@ -12,6 +12,7 @@ import {
 } from "@solana/kit";
 
 import { generated } from "..";
+import { applyTransferFee } from "../quote";
 import {
   findPositionTokenAccount,
   processAssociatedTokenAccountPair,
@@ -38,7 +39,11 @@ import {
   createAllBinArrays,
   fetchAllBinArraysChunked,
 } from "./bin_array";
-import { type ProgramConfig } from "./types";
+import {
+  type PositionInfo,
+  type ProgramConfig,
+  type PositionBinInfo,
+} from "./types";
 
 export class Position {
   #pool: Pool;
@@ -58,6 +63,7 @@ export class Position {
   public get address() { return this.#account.address; }
   public get data() { return this.#account.data; }
   public get positionMint() { return this.data.positionMint; }
+  public get binArrays(): readonly BinArray[] { return this.#binArrays; }
 
   public get binArrayAddresses(): { lowerBinArray: Address, upperBinArray?: Address | undefined } {
     const lowerBinArray = this.#binArrays[0].address;
@@ -65,29 +71,75 @@ export class Position {
     return { lowerBinArray, upperBinArray };
   }
 
-  public getPendingFee(): { amountX: bigint, amountY: bigint } {
+  public getBinInfos(): PositionBinInfo[] {
     const { lowerBinId, upperBinId, feeStates } = this.data;
     const lowerBinArrayIndex = getBinArrayIndex(lowerBinId);
+    const binCount = upperBinId - lowerBinId + 1;
 
-    return Array.from({ length: upperBinId - lowerBinId + 1 }, (_, i) => i)
-      .flatMap(i => {
-        const feeState = feeStates[i]!;
-        if (feeState.shares === 0n) return [];
-
+    return feeStates
+      .slice(0, binCount)
+      .map((feeState, i) => {
         const binId = lowerBinId + i;
-
         const binIndex = getBinIndex(binId);
-        const binArrayIndex = getBinArrayIndex(binId) - lowerBinArrayIndex;
-
-        const binArray = this.#binArrays[binArrayIndex];
+        const localBinArrayIndex = getBinArrayIndex(binId) - lowerBinArrayIndex;
+        const binArray = this.#binArrays[localBinArrayIndex];
         const bin = binArray.bins[binIndex];
 
-        return bin.totalShares > 0n ? [{ feeState, bin }] : [];
-      })
-      .reduce((total, { feeState, bin }) => ({
-        amountX: total.amountX + earnedAmount(bin.feePerShareX, feeState.feePerShareCheckpointX, feeState.shares),
-        amountY: total.amountY + earnedAmount(bin.feePerShareY, feeState.feePerShareCheckpointY, feeState.shares),
-      }), { amountX: 0n, amountY: 0n });
+        const amountX = bin.totalShares > 0n ? (feeState.shares * bin.amountX) / bin.totalShares : 0n;
+        const amountY = bin.totalShares > 0n ? (feeState.shares * bin.amountY) / bin.totalShares : 0n;
+
+        let feeX = feeState.feeOwedX;
+        let feeY = feeState.feeOwedY;
+        if (feeState.shares > 0n && bin.totalShares > 0n) {
+          feeX += earnedAmount(bin.feePerShareX, feeState.feePerShareCheckpointX, feeState.shares);
+          feeY += earnedAmount(bin.feePerShareY, feeState.feePerShareCheckpointY, feeState.shares);
+        }
+
+        return {
+          bin: {
+            id: binId,
+            price: bin.price,
+            amountX: bin.amountX,
+            amountY: bin.amountY,
+            shares: bin.totalShares
+          },
+          amountX,
+          amountY,
+          shares: feeState.shares,
+          feeX,
+          feeY,
+        };
+      });
+  }
+
+  public async getInfo(): Promise<PositionInfo> {
+    const bins = this.getBinInfos();
+    const gross = bins.reduce((acc, { amountX, amountY, feeX, feeY }) => ({
+      amountX: acc.amountX + amountX,
+      amountY: acc.amountY + amountY,
+      feeX: acc.feeX + feeX,
+      feeY: acc.feeY + feeY,
+    }), { amountX: 0n, amountY: 0n, feeX: 0n, feeY: 0n });
+
+    const { transferFeeX, transferFeeY } = await this.#pool.getTransferFees();
+    const [netAmountX, netAmountY, netFeeX, netFeeY] = await Promise.all([
+      applyTransferFee(gross.amountX, transferFeeX),
+      applyTransferFee(gross.amountY, transferFeeY),
+      applyTransferFee(gross.feeX, transferFeeX),
+      applyTransferFee(gross.feeY, transferFeeY),
+    ]);
+
+    return {
+      bins,
+      grossAmountX: gross.amountX,
+      grossAmountY: gross.amountY,
+      netAmountX,
+      netAmountY,
+      grossFeeX: gross.feeX,
+      grossFeeY: gross.feeY,
+      netFeeX,
+      netFeeY,
+    };
   }
 
   public async refresh(data: [Account<generated.Position>, Account<generated.BinArray>[]]): Promise<void>;

package/src/entities/types.ts

@@ -1,3 +1,39 @@
 import { type Address } from "@solana/kit";
 
-export type ProgramConfig = { programAddress: Address };
+export type ProgramConfig = { programAddress: Address };
+
+export type BinInfo = {
+  id: number;
+  price: bigint;
+
+  amountX: bigint;
+  amountY: bigint;
+  shares: bigint;
+}
+
+export type PositionBinInfo = {
+  bin: BinInfo;
+
+  amountX: bigint;
+  amountY: bigint;
+  shares: bigint;
+
+  feeX: bigint;
+  feeY: bigint;
+}
+
+export type PositionInfo = {
+  bins: PositionBinInfo[];
+
+  grossAmountX: bigint;
+  grossAmountY: bigint;
+
+  netAmountX: bigint;
+  netAmountY: bigint;
+
+  grossFeeX: bigint;
+  grossFeeY: bigint;
+
+  netFeeX: bigint;
+  netFeeY: bigint;
+};

package/src/index.ts

@@ -4,5 +4,5 @@ export * as events from "./events";
 export * from "./entities";
 export * from "./utils/constants";
 export { NATIVE_MINT_ADDRESS } from "./utils/ata";
-export type { QuoteInput, QuoteOutput, PoolState, TransferFee } from "./quote";
+export type { QuoteOutput, TransferFee } from "./quote";
 export * from "./program_addresses";

package/src/quote/index.ts

@@ -12,3 +12,8 @@ export async function quote(input: QuoteInput): Promise<QuoteOutput> {
   const wasm = await loadWasm();
   return wasm.quote(input);
 }
+
+export async function applyTransferFee(amount: bigint, fee?: TransferFee): Promise<bigint> {
+  const wasm = await loadWasm();
+  return wasm.applyTransferFee(amount, fee);
+}

package/src/quote/wasm-node/picon_dlmm_quote.d.ts

@@ -61,4 +61,10 @@ export interface TransferFee {
 }
 
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ */
+export function applyTransferFee(amount: bigint, fee?: TransferFee | null): bigint;
+
 export function quote(input: QuoteInput): QuoteOutput;

package/src/quote/wasm-node/picon_dlmm_quote.js

@@ -2,6 +2,21 @@
 import { readFileSync } from 'node:fs';
 
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ * @param {bigint} amount
+ * @param {TransferFee | null} [fee]
+ * @returns {bigint}
+ */
+export function applyTransferFee(amount, fee) {
+    const ret = wasm.applyTransferFee(amount, isLikeNone(fee) ? 0 : addToExternrefTable0(fee));
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return BigInt.asUintN(64, ret[0]);
+}
+
 /**
  * @param {QuoteInput} input
  * @returns {QuoteOutput}

package/src/quote/wasm-node/picon_dlmm_quote_bg.wasm.d.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const applyTransferFee: (a: bigint, b: number) => [bigint, number, number];
 export const quote: (a: any) => [number, number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

package/src/quote/wasm-web/picon_dlmm_quote.d.ts

@@ -61,12 +61,19 @@ export interface TransferFee {
 }
 
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ */
+export function applyTransferFee(amount: bigint, fee?: TransferFee | null): bigint;
+
 export function quote(input: QuoteInput): QuoteOutput;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
     readonly memory: WebAssembly.Memory;
+    readonly applyTransferFee: (a: bigint, b: number) => [bigint, number, number];
     readonly quote: (a: any) => [number, number, number];
     readonly __wbindgen_malloc: (a: number, b: number) => number;
     readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

package/src/quote/wasm-web/picon_dlmm_quote.js

@@ -1,5 +1,20 @@
 /* @ts-self-types="./picon_dlmm_quote.d.ts" */
 
+/**
+ * Applies `fee` to a gross `amount`, returning the net amount — or `amount` unchanged when
+ * `fee` is `None` (the mint has no `TransferFeeConfig` extension).
+ * @param {bigint} amount
+ * @param {TransferFee | null} [fee]
+ * @returns {bigint}
+ */
+export function applyTransferFee(amount, fee) {
+    const ret = wasm.applyTransferFee(amount, isLikeNone(fee) ? 0 : addToExternrefTable0(fee));
+    if (ret[2]) {
+        throw takeFromExternrefTable0(ret[1]);
+    }
+    return BigInt.asUintN(64, ret[0]);
+}
+
 /**
  * @param {QuoteInput} input
  * @returns {QuoteOutput}

package/src/quote/wasm-web/picon_dlmm_quote_bg.wasm.d.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const applyTransferFee: (a: bigint, b: number) => [bigint, number, number];
 export const quote: (a: any) => [number, number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;