@byreal-io/byreal-clmm-sdk 0.2.0

package/dist/esm/instructions/utils/poolUtils.d.ts

@@ -0,0 +1,136 @@
+import { PublicKey } from '@solana/web3.js';
+import BN from 'bn.js';
+import { IAmmConfigLayout } from '../layout.js';
+import { IPoolLayoutWithId } from '../models.js';
+import { TickArrayContainer, TickArrayBitmapExtensionType } from './models.js';
+export declare class PoolUtils {
+    static isOverflowDefaultTickarrayBitmap(tickSpacing: number, tickarrayStartIndexs: number[]): boolean;
+    static _tickRange(tickSpacing: number): {
+        maxTickBoundary: number;
+        minTickBoundary: number;
+    };
+    /**
+     * Calculate the maximum and minimum ticks selectable by users in the UI
+     * Unlike _tickRange, this method directly returns the available tick value range, not the tickarray boundaries
+     *
+     * @param tickSpacing tick spacing
+     * @returns Maximum and minimum tick values selectable by users
+     */
+    static tickRange(tickSpacing: number): {
+        maxTickBoundary: number;
+        minTickBoundary: number;
+    };
+    static nextInitializedTickArrayStartIndex(poolInfo: {
+        tickCurrent: number;
+        tickSpacing: number;
+        tickArrayBitmap: BN[];
+        exBitmapInfo: TickArrayBitmapExtensionType;
+    }, lastTickArrayStartIndex: number, zeroForOne: boolean): {
+        isExist: boolean;
+        nextStartIndex: number;
+    };
+    static getFirstInitializedTickArray(poolInfo: {
+        programId: PublicKey;
+        poolId: PublicKey;
+        tickCurrent: number;
+        tickSpacing: number;
+        tickArrayBitmap: BN[];
+        exBitmapInfo: TickArrayBitmapExtensionType;
+    }, zeroForOne: boolean): {
+        isExist: true;
+        startIndex: number;
+        nextAccountMeta: PublicKey;
+    } | {
+        isExist: false;
+        startIndex: undefined;
+        nextAccountMeta: undefined;
+    };
+    /**
+     * Calculate the output amount and required account list for token swap
+     *
+     * This function is the core of CLMM (Concentrated Liquidity Market Maker) swap logic, used to calculate the expected output amount for a given input amount,
+     * and determine all tick array accounts that need to be accessed during trade execution.
+     *
+     * @param params Swap calculation parameter object
+     * @param params.poolInfo - Complete information of the liquidity pool, including current price, liquidity, tick and other states
+     * @param params.exBitmapInfo - Tick array bitmap extension information, used to handle ticks beyond the default range
+     * @param params.ammConfig - AMM configuration information, including transaction fee rates and other parameters
+     * @param params.tickArrayInfo - Loaded tick array information cache, with keys as tick array start indices
+     * @param params.inputTokenMint - Input token mint address, used to determine trade direction
+     * @param params.inputAmount - Input token amount (using minimum units)
+     * @param params.sqrtPriceLimitX64 - Optional price limit, representing the worst price for the trade (Q64.64 format)
+     * @param params.catchLiquidityInsufficient - Whether to catch liquidity insufficient situations, default false
+     *
+     * @returns Swap calculation result object
+     * @returns allTrade - Boolean value indicating whether the specified input amount can be fully traded
+     *                    true: All amount can be traded
+     *                    false: Only partial trading due to insufficient liquidity or price limit
+     * @returns expectedAmountOut - Expected output token amount to be obtained (using minimum units)
+     * @returns remainingAccounts - List of all tick array account addresses that need to be accessed during trading
+     *                             These accounts need to be passed as remaining accounts in the trade instruction
+     * @returns executionPrice - Final price after trade execution (square root price in Q64.64 format)
+     * @returns feeAmount - Total fees generated by the trade (using input token minimum units)
+     *
+     * @throws Error Throws 'Invalid tick array' error when no valid tick array is found
+     */
+    static getOutputAmountAndRemainAccounts(params: {
+        poolInfo: IPoolLayoutWithId;
+        exBitmapInfo: TickArrayBitmapExtensionType;
+        ammConfig: IAmmConfigLayout;
+        tickArrayInfo: {
+            [key: string]: TickArrayContainer;
+        };
+        inputTokenMint: PublicKey;
+        inputAmount: BN;
+        sqrtPriceLimitX64?: BN;
+        catchLiquidityInsufficient?: boolean;
+    }): {
+        allTrade: boolean;
+        expectedAmountOut: BN;
+        remainingAccounts: PublicKey[];
+        executionPrice: BN;
+        feeAmount: BN;
+    };
+    /**
+     * Calculate the required input token amount and account list for exact output
+     *
+     * This function is used for "exact output" scenarios, where the user specifies the desired output token amount,
+     * and the function calculates how many tokens need to be input to obtain the specified output amount.
+     *
+     * @param params Swap calculation parameter object
+     * @param params.poolInfo - Complete information of the liquidity pool
+     * @param params.exBitmapInfo - Tick array bitmap extension information
+     * @param params.ammConfig - AMM configuration information
+     * @param params.tickArrayInfo - Loaded tick array information cache
+     * @param params.outputTokenMint - Output token mint address
+     * @param params.outputAmount - Expected output token amount (using minimum units)
+     * @param params.sqrtPriceLimitX64 - Optional price limit (Q64.64 format)
+     * @param params.catchLiquidityInsufficient - Whether to catch liquidity insufficient situations
+     *
+     * @returns Swap calculation result object
+     * @returns allTrade - Whether the specified output amount can be fully obtained
+     * @returns expectedAmountIn - Required input token amount (including fees)
+     * @returns remainingAccounts - List of tick array accounts that need to be accessed during trading
+     * @returns executionPrice - Final price after trade execution
+     * @returns feeAmount - Total fees generated by the trade
+     */
+    static getInputAmountAndRemainAccounts(params: {
+        poolInfo: IPoolLayoutWithId;
+        exBitmapInfo: TickArrayBitmapExtensionType;
+        ammConfig: IAmmConfigLayout;
+        tickArrayInfo: {
+            [key: string]: TickArrayContainer;
+        };
+        outputTokenMint: PublicKey;
+        outputAmount: BN;
+        sqrtPriceLimitX64?: BN;
+        catchLiquidityInsufficient?: boolean;
+    }): {
+        allTrade: boolean;
+        expectedAmountIn: BN;
+        remainingAccounts: PublicKey[];
+        executionPrice: BN;
+        feeAmount: BN;
+    };
+}
+//# sourceMappingURL=poolUtils.d.ts.map

package/dist/esm/instructions/utils/poolUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"poolUtils.d.ts","sourceRoot":"","sources":["../../../../src/instructions/utils/poolUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAK/E,qBAAa,SAAS;WAEN,gCAAgC,CAAC,WAAW,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,GAAG,OAAO;WAc9F,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG;QAC7C,eAAe,EAAE,MAAM,CAAC;QACxB,eAAe,EAAE,MAAM,CAAC;KACzB;IAaD;;;;;;OAMG;WACW,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG;QAC5C,eAAe,EAAE,MAAM,CAAC;QACxB,eAAe,EAAE,MAAM,CAAC;KACzB;WAYa,kCAAkC,CAC9C,QAAQ,EAAE;QACR,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,EAAE,EAAE,CAAC;QACtB,YAAY,EAAE,4BAA4B,CAAC;KAC5C,EACD,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,OAAO,GAClB;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE;WA+BjC,4BAA4B,CACxC,QAAQ,EAAE;QACR,SAAS,EAAE,SAAS,CAAC;QACrB,MAAM,EAAE,SAAS,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,EAAE,EAAE,CAAC;QACtB,YAAY,EAAE,4BAA4B,CAAC;KAC5C,EACD,UAAU,EAAE,OAAO,GAEjB;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,SAAS,CAAA;KAAE,GACjE;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,UAAU,EAAE,SAAS,CAAC;QAAC,eAAe,EAAE,SAAS,CAAA;KAAE;IAuCzE;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;WACW,gCAAgC,CAAC,MAAM,EAAE;QACrD,QAAQ,EAAE,iBAAiB,CAAC;QAC5B,YAAY,EAAE,4BAA4B,CAAC;QAC3C,SAAS,EAAE,gBAAgB,CAAC;QAC5B,aAAa,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;SAAE,CAAC;QACrD,cAAc,EAAE,SAAS,CAAC;QAC1B,WAAW,EAAE,EAAE,CAAC;QAChB,iBAAiB,CAAC,EAAE,EAAE,CAAC;QACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;KACtC,GAAG;QACF,QAAQ,EAAE,OAAO,CAAC;QAClB,iBAAiB,EAAE,EAAE,CAAC;QACtB,iBAAiB,EAAE,SAAS,EAAE,CAAC;QAC/B,cAAc,EAAE,EAAE,CAAC;QACnB,SAAS,EAAE,EAAE,CAAC;KACf;IAwFD;;;;;;;;;;;;;;;;;;;;;;OAsBG;WACW,+BAA+B,CAAC,MAAM,EAAE;QACpD,QAAQ,EAAE,iBAAiB,CAAC;QAC5B,YAAY,EAAE,4BAA4B,CAAC;QAC3C,SAAS,EAAE,gBAAgB,CAAC;QAC5B,aAAa,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;SAAE,CAAC;QACrD,eAAe,EAAE,SAAS,CAAC;QAC3B,YAAY,EAAE,EAAE,CAAC;QACjB,iBAAiB,CAAC,EAAE,EAAE,CAAC;QACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;KACtC,GAAG;QACF,QAAQ,EAAE,OAAO,CAAC;QAClB,gBAAgB,EAAE,EAAE,CAAC;QACrB,iBAAiB,EAAE,SAAS,EAAE,CAAC;QAC/B,cAAc,EAAE,EAAE,CAAC;QACnB,SAAS,EAAE,EAAE,CAAC;KACf;CAoFF"}

package/dist/esm/instructions/utils/poolUtils.js

@@ -0,0 +1,219 @@
+import { MAX_TICK, MIN_TICK, NEGATIVE_ONE } from '../constants.js';
+import { getPdaTickArrayAddress } from '../pda.js';
+import { SwapMath } from './swapMath.js';
+import { TickQuery, TickUtils } from './tick.js';
+import { TickArrayBitmap, TickArrayBitmapExtensionUtils } from './tickarrayBitmap.js';
+export class PoolUtils {
+    // Used to check if a set of tickarray start indices exceed the boundary range of the default bitmap
+    static isOverflowDefaultTickarrayBitmap(tickSpacing, tickarrayStartIndexs) {
+        const { maxTickBoundary, minTickBoundary } = this._tickRange(tickSpacing);
+        for (const tickIndex of tickarrayStartIndexs) {
+            const tickarrayStartIndex = TickUtils.getTickArrayStartIndexByTick(tickIndex, tickSpacing);
+            if (tickarrayStartIndex >= maxTickBoundary || tickarrayStartIndex < minTickBoundary) {
+                return true;
+            }
+        }
+        return false;
+    }
+    static _tickRange(tickSpacing) {
+        let maxTickBoundary = TickArrayBitmap.maxTickInTickarrayBitmap(tickSpacing);
+        let minTickBoundary = -maxTickBoundary;
+        if (maxTickBoundary > MAX_TICK) {
+            maxTickBoundary = TickQuery.getArrayStartIndex(MAX_TICK, tickSpacing) + TickQuery.tickCount(tickSpacing);
+        }
+        if (minTickBoundary < MIN_TICK) {
+            minTickBoundary = TickQuery.getArrayStartIndex(MIN_TICK, tickSpacing);
+        }
+        return { maxTickBoundary, minTickBoundary };
+    }
+    /**
+     * Calculate the maximum and minimum ticks selectable by users in the UI
+     * Unlike _tickRange, this method directly returns the available tick value range, not the tickarray boundaries
+     *
+     * @param tickSpacing tick spacing
+     * @returns Maximum and minimum tick values selectable by users
+     */
+    static tickRange(tickSpacing) {
+        // Use protocol-defined hard boundaries
+        let maxTickBoundary = MAX_TICK;
+        let minTickBoundary = MIN_TICK;
+        // Ensure returned tick values are divisible by tickSpacing to meet UI selection requirements
+        maxTickBoundary = Math.floor(maxTickBoundary / tickSpacing) * tickSpacing;
+        minTickBoundary = Math.ceil(minTickBoundary / tickSpacing) * tickSpacing;
+        return { maxTickBoundary, minTickBoundary };
+    }
+    static nextInitializedTickArrayStartIndex(poolInfo, lastTickArrayStartIndex, zeroForOne) {
+        // Start scanning from the provided lastTickArrayStartIndex instead of recomputing from tickCurrent
+        // This avoids skipping the immediate adjacent array when tickCurrent happens to equal a start index.
+        while (true) {
+            const { isInit: startIsInit, tickIndex: startIndex } = TickArrayBitmap.nextInitializedTickArrayStartIndex(TickUtils.mergeTickArrayBitmap(poolInfo.tickArrayBitmap), lastTickArrayStartIndex, poolInfo.tickSpacing, zeroForOne);
+            if (startIsInit) {
+                return { isExist: true, nextStartIndex: startIndex };
+            }
+            lastTickArrayStartIndex = startIndex;
+            const { isInit, tickIndex } = TickArrayBitmapExtensionUtils.nextInitializedTickArrayFromOneBitmap(lastTickArrayStartIndex, poolInfo.tickSpacing, zeroForOne, poolInfo.exBitmapInfo);
+            if (isInit)
+                return { isExist: true, nextStartIndex: tickIndex };
+            lastTickArrayStartIndex = tickIndex;
+            if (lastTickArrayStartIndex < MIN_TICK || lastTickArrayStartIndex > MAX_TICK)
+                return { isExist: false, nextStartIndex: 0 };
+        }
+    }
+    static getFirstInitializedTickArray(poolInfo, zeroForOne) {
+        const { isInitialized, startIndex } = PoolUtils.isOverflowDefaultTickarrayBitmap(poolInfo.tickSpacing, [
+            poolInfo.tickCurrent,
+        ])
+            ? TickArrayBitmapExtensionUtils.checkTickArrayIsInit(TickQuery.getArrayStartIndex(poolInfo.tickCurrent, poolInfo.tickSpacing), poolInfo.tickSpacing, poolInfo.exBitmapInfo)
+            : TickUtils.checkTickArrayIsInitialized(TickUtils.mergeTickArrayBitmap(poolInfo.tickArrayBitmap), poolInfo.tickCurrent, poolInfo.tickSpacing);
+        if (isInitialized) {
+            const { publicKey: address } = getPdaTickArrayAddress(poolInfo.programId, poolInfo.poolId, startIndex);
+            return {
+                isExist: true,
+                startIndex,
+                nextAccountMeta: address,
+            };
+        }
+        const { isExist, nextStartIndex } = this.nextInitializedTickArrayStartIndex(poolInfo, TickQuery.getArrayStartIndex(poolInfo.tickCurrent, poolInfo.tickSpacing), zeroForOne);
+        if (isExist) {
+            const { publicKey: address } = getPdaTickArrayAddress(poolInfo.programId, poolInfo.poolId, nextStartIndex);
+            return {
+                isExist: true,
+                startIndex: nextStartIndex,
+                nextAccountMeta: address,
+            };
+        }
+        return { isExist: false, nextAccountMeta: undefined, startIndex: undefined };
+    }
+    /**
+     * Calculate the output amount and required account list for token swap
+     *
+     * This function is the core of CLMM (Concentrated Liquidity Market Maker) swap logic, used to calculate the expected output amount for a given input amount,
+     * and determine all tick array accounts that need to be accessed during trade execution.
+     *
+     * @param params Swap calculation parameter object
+     * @param params.poolInfo - Complete information of the liquidity pool, including current price, liquidity, tick and other states
+     * @param params.exBitmapInfo - Tick array bitmap extension information, used to handle ticks beyond the default range
+     * @param params.ammConfig - AMM configuration information, including transaction fee rates and other parameters
+     * @param params.tickArrayInfo - Loaded tick array information cache, with keys as tick array start indices
+     * @param params.inputTokenMint - Input token mint address, used to determine trade direction
+     * @param params.inputAmount - Input token amount (using minimum units)
+     * @param params.sqrtPriceLimitX64 - Optional price limit, representing the worst price for the trade (Q64.64 format)
+     * @param params.catchLiquidityInsufficient - Whether to catch liquidity insufficient situations, default false
+     *
+     * @returns Swap calculation result object
+     * @returns allTrade - Boolean value indicating whether the specified input amount can be fully traded
+     *                    true: All amount can be traded
+     *                    false: Only partial trading due to insufficient liquidity or price limit
+     * @returns expectedAmountOut - Expected output token amount to be obtained (using minimum units)
+     * @returns remainingAccounts - List of all tick array account addresses that need to be accessed during trading
+     *                             These accounts need to be passed as remaining accounts in the trade instruction
+     * @returns executionPrice - Final price after trade execution (square root price in Q64.64 format)
+     * @returns feeAmount - Total fees generated by the trade (using input token minimum units)
+     *
+     * @throws Error Throws 'Invalid tick array' error when no valid tick array is found
+     */
+    static getOutputAmountAndRemainAccounts(params) {
+        const { poolInfo, exBitmapInfo, ammConfig, tickArrayInfo, inputTokenMint, inputAmount, sqrtPriceLimitX64, catchLiquidityInsufficient = false, } = params;
+        // Step 1: Determine trade direction
+        // zeroForOne = true: means trading tokenA (token0) for tokenB (token1), price decreases
+        // zeroForOne = false: means trading tokenB (token1) for tokenA (token0), price increases
+        const zeroForOne = inputTokenMint.toBase58() === poolInfo.mintA.toBase58();
+        // Step 2: Initialize account list to store all tick array accounts needed during trading
+        const allNeededAccounts = [];
+        // Step 3: Find the first tick array that needs to be accessed
+        // Based on current tick position and trade direction, find the array containing current tick or next initialized tick
+        const { isExist, startIndex: firstTickArrayStartIndex, nextAccountMeta, } = this.getFirstInitializedTickArray({
+            programId: poolInfo.programId,
+            poolId: poolInfo.poolId,
+            tickCurrent: poolInfo.tickCurrent,
+            tickSpacing: poolInfo.tickSpacing,
+            tickArrayBitmap: poolInfo.tickArrayBitmap,
+            exBitmapInfo,
+        }, zeroForOne);
+        // If no valid tick array is found, it indicates abnormal pool state or no liquidity
+        if (!isExist || firstTickArrayStartIndex === undefined || !nextAccountMeta)
+            throw new Error('Invalid tick array');
+        // Step 4: Add the first tick array account to the list
+        allNeededAccounts.push(nextAccountMeta);
+        // Step 5: Execute the core logic of swap calculation
+        // SwapMath.swapCompute simulates the entire swap process, calculating:
+        // - Actual tradable amount
+        // - Output token amount
+        // - Other tick array accounts needed on the trade path
+        // - Final execution price and fees
+        const { allTrade, amountCalculated: outputAmount, accounts: reaminAccounts, sqrtPriceX64: executionPrice, feeAmount, } = SwapMath.swapCompute(poolInfo.programId, poolInfo.poolId, tickArrayInfo, poolInfo.tickArrayBitmap, exBitmapInfo, zeroForOne, ammConfig.tradeFeeRate, poolInfo.liquidity, poolInfo.tickCurrent, poolInfo.tickSpacing, poolInfo.sqrtPriceX64, inputAmount, firstTickArrayStartIndex, sqrtPriceLimitX64, catchLiquidityInsufficient);
+        // Step 6: Add other necessary accounts discovered during swap to the list
+        allNeededAccounts.push(...reaminAccounts);
+        // Step 7: Return calculation results
+        // Note: outputAmount is negative (indicating outflow), needs to be multiplied by -1 to convert to positive
+        return {
+            allTrade,
+            expectedAmountOut: outputAmount.mul(NEGATIVE_ONE),
+            remainingAccounts: allNeededAccounts,
+            executionPrice,
+            feeAmount,
+        };
+    }
+    /**
+     * Calculate the required input token amount and account list for exact output
+     *
+     * This function is used for "exact output" scenarios, where the user specifies the desired output token amount,
+     * and the function calculates how many tokens need to be input to obtain the specified output amount.
+     *
+     * @param params Swap calculation parameter object
+     * @param params.poolInfo - Complete information of the liquidity pool
+     * @param params.exBitmapInfo - Tick array bitmap extension information
+     * @param params.ammConfig - AMM configuration information
+     * @param params.tickArrayInfo - Loaded tick array information cache
+     * @param params.outputTokenMint - Output token mint address
+     * @param params.outputAmount - Expected output token amount (using minimum units)
+     * @param params.sqrtPriceLimitX64 - Optional price limit (Q64.64 format)
+     * @param params.catchLiquidityInsufficient - Whether to catch liquidity insufficient situations
+     *
+     * @returns Swap calculation result object
+     * @returns allTrade - Whether the specified output amount can be fully obtained
+     * @returns expectedAmountIn - Required input token amount (including fees)
+     * @returns remainingAccounts - List of tick array accounts that need to be accessed during trading
+     * @returns executionPrice - Final price after trade execution
+     * @returns feeAmount - Total fees generated by the trade
+     */
+    static getInputAmountAndRemainAccounts(params) {
+        const { poolInfo, exBitmapInfo, ammConfig, tickArrayInfo, outputTokenMint, outputAmount, sqrtPriceLimitX64, catchLiquidityInsufficient = false, } = params;
+        // 步骤1: 确定交易方向
+        // 注意：对于精确输出，交易方向的判断基于输出代币
+        // 如果输出 tokenB，则需要输入 tokenA（zeroForOne = true）
+        // 如果输出 tokenA，则需要输入 tokenB（zeroForOne = false）
+        const zeroForOne = outputTokenMint.toBase58() === poolInfo.mintB.toBase58();
+        // 步骤2: 初始化账户列表
+        const allNeededAccounts = [];
+        // 步骤3: 查找第一个需要访问的 tick 数组
+        const { isExist, startIndex: firstTickArrayStartIndex, nextAccountMeta, } = this.getFirstInitializedTickArray({
+            programId: poolInfo.programId,
+            poolId: poolInfo.poolId,
+            tickCurrent: poolInfo.tickCurrent,
+            tickSpacing: poolInfo.tickSpacing,
+            tickArrayBitmap: poolInfo.tickArrayBitmap,
+            exBitmapInfo,
+        }, zeroForOne);
+        if (!isExist || firstTickArrayStartIndex === undefined || !nextAccountMeta)
+            throw new Error('Invalid tick array');
+        // Step 4: Add the first tick array account to the list
+        allNeededAccounts.push(nextAccountMeta);
+        // 步骤5: 执行交换计算
+        // 对于精确输出，amountSpecified 需要是负数
+        const amountSpecified = outputAmount.mul(NEGATIVE_ONE);
+        const { allTrade, amountCalculated: inputAmount, accounts: reaminAccounts, sqrtPriceX64: executionPrice, feeAmount, } = SwapMath.swapCompute(poolInfo.programId, poolInfo.poolId, tickArrayInfo, poolInfo.tickArrayBitmap, exBitmapInfo, zeroForOne, ammConfig.tradeFeeRate, poolInfo.liquidity, poolInfo.tickCurrent, poolInfo.tickSpacing, poolInfo.sqrtPriceX64, amountSpecified, firstTickArrayStartIndex, sqrtPriceLimitX64, catchLiquidityInsufficient);
+        // 步骤6: 将其他必需账户添加到列表中
+        allNeededAccounts.push(...reaminAccounts);
+        // 步骤7: 返回计算结果
+        // 注意：对于精确输出，inputAmount 包含了手续费
+        return {
+            allTrade,
+            expectedAmountIn: inputAmount,
+            remainingAccounts: allNeededAccounts,
+            executionPrice,
+            feeAmount,
+        };
+    }
+}
+//# sourceMappingURL=poolUtils.js.map

package/dist/esm/instructions/utils/poolUtils.js.map

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

package/dist/esm/instructions/utils/position.d.ts

@@ -0,0 +1,36 @@
+import { EpochInfo } from '@solana/web3.js';
+import BN from 'bn.js';
+import { IPersonalPositionLayout, IPoolLayout } from '../layout.js';
+import { Tick } from './models.js';
+export interface GetTransferAmountFee {
+    amount: BN;
+    fee: BN | undefined;
+    expirationTime: number | undefined;
+}
+export interface ReturnTypeGetLiquidityAmountOut {
+    liquidity: BN;
+    amountSlippageA: GetTransferAmountFee;
+    amountSlippageB: GetTransferAmountFee;
+    amountA: GetTransferAmountFee;
+    amountB: GetTransferAmountFee;
+    expirationTime: number | undefined;
+}
+export declare class PositionUtils {
+    static getfeeGrowthInside(poolInfo: Pick<IPoolLayout, 'tickCurrent' | 'feeGrowthGlobalX64A' | 'feeGrowthGlobalX64B'>, tickLowerState: Tick, tickUpperState: Tick): {
+        feeGrowthInsideX64A: BN;
+        feeGrowthInsideBX64: BN;
+    };
+    static getPositionFees(poolInfo: Pick<IPoolLayout, 'tickCurrent' | 'feeGrowthGlobalX64A' | 'feeGrowthGlobalX64B'>, positionState: IPersonalPositionLayout, tickLowerState: Tick, tickUpperState: Tick): {
+        tokenFeeAmountA: BN;
+        tokenFeeAmountB: BN;
+    };
+    static getAmountsFromLiquidity(params: {
+        poolInfo: IPoolLayout;
+        ownerPosition: IPersonalPositionLayout;
+        liquidity: BN;
+        slippage: number;
+        add: boolean;
+        epochInfo: EpochInfo;
+    }): ReturnTypeGetLiquidityAmountOut;
+}
+//# sourceMappingURL=position.d.ts.map

package/dist/esm/instructions/utils/position.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../../../src/instructions/utils/position.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMpE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,EAAE,CAAC;IACX,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,MAAM,WAAW,+BAA+B;IAC9C,SAAS,EAAE,EAAE,CAAC;IACd,eAAe,EAAE,oBAAoB,CAAC;IACtC,eAAe,EAAE,oBAAoB,CAAC;IACtC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,oBAAoB,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,kBAAkB,CACvB,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC,EAC1F,cAAc,EAAE,IAAI,EACpB,cAAc,EAAE,IAAI,GACnB;QAAE,mBAAmB,EAAE,EAAE,CAAC;QAAC,mBAAmB,EAAE,EAAE,CAAA;KAAE;IAgCvD,MAAM,CAAC,eAAe,CACpB,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC,EAC1F,aAAa,EAAE,uBAAuB,EACtC,cAAc,EAAE,IAAI,EACpB,cAAc,EAAE,IAAI,GACnB;QAAE,eAAe,EAAE,EAAE,CAAC;QAAC,eAAe,EAAE,EAAE,CAAA;KAAE;IAwB/C,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE;QACrC,QAAQ,EAAE,WAAW,CAAC;QACtB,aAAa,EAAE,uBAAuB,CAAC;QACvC,SAAS,EAAE,EAAE,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,GAAG,EAAE,OAAO,CAAC;QACb,SAAS,EAAE,SAAS,CAAC;KACtB,GAAG,+BAA+B;CA0DpC"}

package/dist/esm/instructions/utils/position.js

@@ -0,0 +1,86 @@
+import BN from 'bn.js';
+import { Decimal } from 'decimal.js';
+import { Q64 } from '../constants.js';
+import { LiquidityMath } from './liquidityMath.js';
+import { MathUtils } from './mathUtils.js';
+import { SqrtPriceMath } from './sqrtPriceMath.js';
+import { getTransferAmountFee, minExpirationTime } from './transfer.js';
+export class PositionUtils {
+    static getfeeGrowthInside(poolInfo, tickLowerState, tickUpperState) {
+        let feeGrowthBelowX64A = new BN(0);
+        let feeGrowthBelowX64B = new BN(0);
+        if (poolInfo.tickCurrent >= tickLowerState.tick) {
+            feeGrowthBelowX64A = tickLowerState.feeGrowthOutsideX64A;
+            feeGrowthBelowX64B = tickLowerState.feeGrowthOutsideX64B;
+        }
+        else {
+            feeGrowthBelowX64A = poolInfo.feeGrowthGlobalX64A.sub(tickLowerState.feeGrowthOutsideX64A);
+            feeGrowthBelowX64B = poolInfo.feeGrowthGlobalX64B.sub(tickLowerState.feeGrowthOutsideX64B);
+        }
+        let feeGrowthAboveX64A = new BN(0);
+        let feeGrowthAboveX64B = new BN(0);
+        if (poolInfo.tickCurrent < tickUpperState.tick) {
+            feeGrowthAboveX64A = tickUpperState.feeGrowthOutsideX64A;
+            feeGrowthAboveX64B = tickUpperState.feeGrowthOutsideX64B;
+        }
+        else {
+            feeGrowthAboveX64A = poolInfo.feeGrowthGlobalX64A.sub(tickUpperState.feeGrowthOutsideX64A);
+            feeGrowthAboveX64B = poolInfo.feeGrowthGlobalX64B.sub(tickUpperState.feeGrowthOutsideX64B);
+        }
+        const feeGrowthInsideX64A = MathUtils.wrappingSubU128(MathUtils.wrappingSubU128(poolInfo.feeGrowthGlobalX64A, feeGrowthBelowX64A), feeGrowthAboveX64A);
+        const feeGrowthInsideBX64 = MathUtils.wrappingSubU128(MathUtils.wrappingSubU128(poolInfo.feeGrowthGlobalX64B, feeGrowthBelowX64B), feeGrowthAboveX64B);
+        return { feeGrowthInsideX64A, feeGrowthInsideBX64 };
+    }
+    static getPositionFees(poolInfo, positionState, tickLowerState, tickUpperState) {
+        const { feeGrowthInsideX64A, feeGrowthInsideBX64 } = this.getfeeGrowthInside(poolInfo, tickLowerState, tickUpperState);
+        const feeGrowthdeltaA = MathUtils.mulDivFloor(MathUtils.wrappingSubU128(feeGrowthInsideX64A, positionState.feeGrowthInsideLastX64A), positionState.liquidity, Q64);
+        const tokenFeeAmountA = positionState.tokenFeesOwedA.add(feeGrowthdeltaA);
+        const feeGrowthdelta1 = MathUtils.mulDivFloor(MathUtils.wrappingSubU128(feeGrowthInsideBX64, positionState.feeGrowthInsideLastX64B), positionState.liquidity, Q64);
+        const tokenFeeAmountB = positionState.tokenFeesOwedB.add(feeGrowthdelta1);
+        return { tokenFeeAmountA, tokenFeeAmountB };
+    }
+    static getAmountsFromLiquidity(params) {
+        const { poolInfo, ownerPosition, liquidity, slippage, add, epochInfo } = params;
+        const sqrtPriceX64 = poolInfo.sqrtPriceX64;
+        const sqrtPriceX64A = SqrtPriceMath.getSqrtPriceX64FromTick(ownerPosition.tickLower);
+        const sqrtPriceX64B = SqrtPriceMath.getSqrtPriceX64FromTick(ownerPosition.tickUpper);
+        const coefficientRe = add ? 1 + slippage : 1 - slippage;
+        const amounts = LiquidityMath.getAmountsFromLiquidity(sqrtPriceX64, sqrtPriceX64A, sqrtPriceX64B, liquidity, add);
+        // TODO: Temporarily not considering Token 2022 transfer fee scenarios. If needed in the future, this should be added here;
+        const [amountA, amountB] = [
+            getTransferAmountFee(amounts.amountA, undefined, epochInfo, true),
+            getTransferAmountFee(amounts.amountB, undefined, epochInfo, true),
+        ];
+        const [amountSlippageA, amountSlippageB] = [
+            getTransferAmountFee(new BN(new Decimal(amounts.amountA.toString()).mul(coefficientRe).toFixed(0)), undefined, epochInfo, true),
+            getTransferAmountFee(new BN(new Decimal(amounts.amountB.toString()).mul(coefficientRe).toFixed(0)), undefined, epochInfo, true),
+        ];
+        // const [amountA, amountB] = [
+        //   getTransferAmountFee(amounts.amountA, poolInfo.mintA.extensions?.feeConfig, epochInfo, true),
+        //   getTransferAmountFee(amounts.amountB, poolInfo.mintB.extensions?.feeConfig, epochInfo, true),
+        // ];
+        // const [amountSlippageA, amountSlippageB] = [
+        //   getTransferAmountFee(
+        //     new BN(new Decimal(amounts.amountA.toString()).mul(coefficientRe).toFixed(0)),
+        //     poolInfo.mintA.extensions?.feeConfig,
+        //     epochInfo,
+        //     true,
+        //   ),
+        //   getTransferAmountFee(
+        //     new BN(new Decimal(amounts.amountB.toString()).mul(coefficientRe).toFixed(0)),
+        //     poolInfo.mintB.extensions?.feeConfig,
+        //     epochInfo,
+        //     true,
+        //   ),
+        // ];
+        return {
+            liquidity,
+            amountA,
+            amountB,
+            amountSlippageA,
+            amountSlippageB,
+            expirationTime: minExpirationTime(amountA.expirationTime, amountB.expirationTime),
+        };
+    }
+}
+//# sourceMappingURL=position.js.map

package/dist/esm/instructions/utils/position.js.map

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

package/dist/esm/instructions/utils/sqrtPriceMath.d.ts

@@ -0,0 +1,14 @@
+import BN from 'bn.js';
+import { Decimal } from 'decimal.js';
+export declare class SqrtPriceMath {
+    static sqrtPriceX64ToPrice(sqrtPriceX64: BN, decimalsA: number, decimalsB: number): Decimal;
+    static priceToSqrtPriceX64(price: Decimal, decimalsA: number, decimalsB: number): BN;
+    static getNextSqrtPriceX64FromInput(sqrtPriceX64: BN, liquidity: BN, amountIn: BN, zeroForOne: boolean): BN;
+    static getNextSqrtPriceX64FromOutput(sqrtPriceX64: BN, liquidity: BN, amountOut: BN, zeroForOne: boolean): BN;
+    private static getNextSqrtPriceFromTokenAmountARoundingUp;
+    private static getNextSqrtPriceFromTokenAmountBRoundingDown;
+    static getSqrtPriceX64FromTick(tick: number): BN;
+    static getTickFromPrice(price: Decimal, decimalsA: number, decimalsB: number): number;
+    static getTickFromSqrtPriceX64(sqrtPriceX64: BN): number;
+}
+//# sourceMappingURL=sqrtPriceMath.d.ts.map

package/dist/esm/instructions/utils/sqrtPriceMath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sqrtPriceMath.d.ts","sourceRoot":"","sources":["../../../../src/instructions/utils/sqrtPriceMath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAmCrC,qBAAa,aAAa;WACV,mBAAmB,CAAC,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;WAMpF,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,EAAE;WAI7E,4BAA4B,CAAC,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE;WAapG,6BAA6B,CAAC,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE;IAapH,OAAO,CAAC,MAAM,CAAC,0CAA0C;IA0BzD,OAAO,CAAC,MAAM,CAAC,4CAA4C;WAkB7C,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,EAAE;WAiCzC,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;WAI9E,uBAAuB,CAAC,YAAY,EAAE,EAAE,GAAG,MAAM;CAuChE"}