@raydium-io/raydium-sdk-v2 0.0.23-alpha → 0.0.25-alpha

package/lib/raydium/token/constant.d.ts

@@ -1,4 +1,4 @@
-import { bA as TokenInfo } from '../../type-2bed92a9.js';
+import { bz as TokenInfo } from '../../type-83523f5f.js';
 import '@solana/web3.js';
 import 'bn.js';
 import '@solana/spl-token';

package/lib/raydium/token/index.d.ts

@@ -1,6 +1,6 @@
 export { SOL_INFO, TOKEN_WSOL } from './constant.js';
 export { SPL_MINT_LAYOUT, SplMintLayout } from './layout.js';
-export { bD as LpToken, bC as SplToken, bA as TokenInfo, bB as TokenJson } from '../../type-2bed92a9.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-83523f5f.js';
 export { parseTokenInfo, solToWSolToken, toToken, toTokenAmount, toTokenInfo, wSolToSolToken } from './utils.js';
 import '@solana/web3.js';
 import 'bn.js';

package/lib/raydium/token/token.d.ts

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
-import '../../type-2bed92a9.js';
-export { j as default } from '../../raydium-97f3539d.js';
+import '../../type-83523f5f.js';
+export { j as default } from '../../raydium-1fe6ab0b.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-485c1df6.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/raydium/token/type.d.ts

@@ -1,4 +1,4 @@
-export { bD as LpToken, bC as SplToken, bA as TokenInfo, bB as TokenJson } from '../../type-2bed92a9.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-83523f5f.js';
 import '../../module/token.js';
 import '@solana/web3.js';
 import 'bn.js';

package/lib/raydium/token/utils.d.ts

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { RawMint } from '@solana/spl-token';
-import { bA as TokenInfo, aa as BigNumberish, c2 as TokenAmount, e as ApiV3Token } from '../../type-2bed92a9.js';
+import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-83523f5f.js';
 import { Token } from '../../module/token.js';
 import 'bn.js';
 import '../../common/txTool/txType.js';

package/lib/raydium/tradeV2/index.d.ts

@@ -2,7 +2,7 @@ export { makeSwapInstruction, route1Instruction, route2Instruction, routeInstruc
 export { ComputeAmountOutAmmLayout, ComputeAmountOutLayout, ComputeAmountOutRouteLayout, MakeSwapInstructionParam, PoolAccountInfoV4, ReturnTypeFetchMultipleInfo, ReturnTypeGetAddLiquidityDefaultPool, ReturnTypeGetAllRoute, ReturnTypeMakeSwapInstruction, ReturnTypeMakeSwapTransaction, RoutePathType } from './type.js';
 import '@solana/web3.js';
 import 'bn.js';
-import '../../type-2bed92a9.js';
+import '../../type-83523f5f.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';
@@ -14,5 +14,5 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-485c1df6.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';

package/lib/raydium/tradeV2/instrument.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 import BN__default from 'bn.js';
-import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-2bed92a9.js';
+import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-83523f5f.js';
 import { ReturnTypeMakeSwapInstruction, ComputeAmountOutLayout } from './type.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -13,7 +13,7 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-485c1df6.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';
 
 declare function route1Instruction(programId: PublicKey, poolInfoA: ApiV3PoolInfoItem, poolKeyA: PoolKeys, poolKeyB: PoolKeys, userSourceToken: PublicKey, userRouteToken: PublicKey, userPdaAccount: PublicKey, ownerWallet: PublicKey, inputMint: PublicKey, amountIn: BN__default, amountOut: BN__default, tickArrayA?: PublicKey[]): TransactionInstruction;

package/lib/raydium/tradeV2/trade.d.ts

@@ -1,7 +1,7 @@
 import '@solana/web3.js';
-export { i as default } from '../../raydium-97f3539d.js';
+export { i as default } from '../../raydium-1fe6ab0b.js';
 import './type.js';
-import '../../type-2bed92a9.js';
+import '../../type-83523f5f.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
@@ -21,7 +21,7 @@ import '../../module/currency.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-485c1df6.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/raydium/tradeV2/type.d.ts

@@ -1,8 +1,8 @@
 import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from '@solana/web3.js';
 import BN__default from 'bn.js';
-import { bL as TransferAmountFee, c7 as Price, c6 as Percent, c2 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-2bed92a9.js';
+import { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-83523f5f.js';
 import { Token } from '../../module/token.js';
-import { c as ClmmPoolInfo } from '../../type-485c1df6.js';
+import { c as ClmmPoolInfo } from '../../type-6fd96950.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';

package/lib/raydium/type.d.ts

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '@solana/spl-token';
-export { bT as ArrayItem, bJ as ComputeBudgetConfig, b_ as Cover, bU as ExactPartial, bV as ExactRequired, bZ as Fallback, bM as GetTransferAmountFee, bX as GetValue, bI as InstructionReturn, bK as LoadParams, bH as MakeMultiTransaction, bF as MakeTransaction, bG as MakeV0Transaction, bQ as MayArray, bR as MayDeepArray, bS as MayFunction, bP as ReplaceType, bN as ReturnTypeFetchMultipleMintInfo, bO as ReturnTypeFetchMultipleMintInfos, bW as SKeyof, bY as SOR, bE as SignAllTransactions, bL as TransferAmountFee, b$ as UnionCover, c0 as unionArr } from '../type-2bed92a9.js';
+export { bS as ArrayItem, bI as ComputeBudgetConfig, bZ as Cover, bT as ExactPartial, bU as ExactRequired, bY as Fallback, bL as GetTransferAmountFee, bW as GetValue, bH as InstructionReturn, bJ as LoadParams, bG as MakeMultiTransaction, bE as MakeTransaction, bF as MakeV0Transaction, bP as MayArray, bQ as MayDeepArray, bR as MayFunction, bO as ReplaceType, bM as ReturnTypeFetchMultipleMintInfo, bN as ReturnTypeFetchMultipleMintInfos, bV as SKeyof, bX as SOR, bD as SignAllTransactions, bK as TransferAmountFee, b_ as UnionCover, b$ as unionArr } from '../type-83523f5f.js';
 import 'bn.js';
 import '../common/txTool/txType.js';
 import '../common/owner.js';

package/lib/raydium/utils1216/index.d.ts

@@ -1,9 +1,9 @@
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-97f3539d.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-1fe6ab0b.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-2bed92a9.js';
+import '../../type-83523f5f.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-485c1df6.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/raydium/utils1216/utils1216.d.ts

@@ -1,12 +1,12 @@
 import '../../marshmallow/index.js';
 import '@solana/web3.js';
 import 'bn.js';
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-97f3539d.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-1fe6ab0b.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-2bed92a9.js';
+import '../../type-83523f5f.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-485c1df6.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-97f3539d.d.ts → raydium-1fe6ab0b.d.ts}

@@ -1,6 +1,6 @@
 import { PublicKey, Commitment, Connection, Transaction, Signer, TransactionInstruction, Keypair, EpochInfo } from '@solana/web3.js';
 import { Api } from './api/api.js';
-import { ay as TxBuilder, aq as AddInstructionParam, aa as BigNumberish, bl as CreateFarm, ax as MakeTxData, bm as CreateFarmExtInfo, bn as UpdateFarmReward, bo as UpdateFarmRewards, bp as FarmDWParam, V as FormatFarmInfoOut, bJ as ComputeBudgetConfig, aw as MakeMultiTxData, l as ApiV3PoolInfoStandardItem, c6 as Percent, c2 as TokenAmount, s as AmmV4Keys, t as AmmV5Keys, k as ApiV3PoolInfoConcentratedItem, U as FormatFarmInfoOutV6, v as ClmmKeys, bF as MakeTransaction, C as CpmmKeys, Y as OwnerIdoInfo, Z as IdoKeysData, bK as LoadParams, J as JupTokenType, bA as TokenInfo, e as ApiV3Token, bE as SignAllTransactions, W as AvailabilityCheckAPI3, f as ApiV3TokenRes } from './type-2bed92a9.js';
+import { ax as TxBuilder, ap as AddInstructionParam, a9 as BigNumberish, bk as CreateFarm, aw as MakeTxData, bl as CreateFarmExtInfo, bm as UpdateFarmReward, bn as UpdateFarmRewards, bo as FarmDWParam, U as FormatFarmInfoOut, bI as ComputeBudgetConfig, av as MakeMultiTxData, l as ApiV3PoolInfoStandardItem, c5 as Percent, c1 as TokenAmount, s as AmmV4Keys, t as AmmV5Keys, k as ApiV3PoolInfoConcentratedItem, S as FormatFarmInfoOutV6, v as ClmmKeys, bE as MakeTransaction, C as CpmmKeys, X as OwnerIdoInfo, Y as IdoKeysData, bJ as LoadParams, J as JupTokenType, bz as TokenInfo, e as ApiV3Token, bD as SignAllTransactions, V as AvailabilityCheckAPI3, f as ApiV3TokenRes } from './type-83523f5f.js';
 import { API_URL_CONFIG } from './api/url.js';
 import { Owner } from './common/owner.js';
 import { Cluster } from './solana/type.js';
@@ -10,9 +10,9 @@ import { TxVersion } from './common/txTool/txType.js';
 import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
 import { AddLiquidityParams, RemoveParams, CreatePoolParam, CreatePoolAddress, ComputeAmountOutParam, SwapParam } from './raydium/liquidity/type.js';
-import { m as CreateConcentratedPool, O as OpenPositionFromBase, p as OpenPositionFromBaseExtInfo, q as OpenPositionFromLiquidity, r as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, B as ClosePositionExtInfo, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, H as HarvestAllRewardsParams } from './type-485c1df6.js';
+import { m as CreateConcentratedPool, O as OpenPositionFromBase, p as OpenPositionFromBaseExtInfo, q as OpenPositionFromLiquidity, r as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, B as ClosePositionExtInfo, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, H as HarvestAllRewardsParams } from './type-6fd96950.js';
 import { ClmmPositionLayout } from './raydium/clmm/layout.js';
-import { CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams } from './raydium/cpmm/type.js';
+import { CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { CpmmPoolInfoLayout } from './raydium/cpmm/layout.js';
 import { PoolAccountInfoV4, ReturnTypeGetAddLiquidityDefaultPool } from './raydium/tradeV2/type.js';
 import { Structure } from './marshmallow/index.js';
@@ -234,12 +234,7 @@ declare class CpmmModule extends ModuleBase {
     addLiquidity<T extends TxVersion>(params: AddCpmmLiquidityParams<T>): Promise<MakeTxData<T>>;
     withdrawLiquidity<T extends TxVersion>(params: WithdrawCpmmLiquidityParams<T>): Promise<MakeTxData<T>>;
     swap<T extends TxVersion>(params: CpmmSwapParams): Promise<MakeTxData<T>>;
-    computePairAmount({ poolInfo, amount, slippage, baseIn, }: {
-        poolInfo: ApiV3PoolInfoStandardItem;
-        amount: string | Decimal;
-        slippage: Percent;
-        baseIn?: boolean;
-    }): {
+    computePairAmount({ poolInfo, amount, slippage, baseIn, }: ComputePairAmountParams): {
         anotherAmount: TokenAmount;
         maxAnotherAmount: TokenAmount;
         liquidity: BN__default;

package/lib/{type-485c1df6.d.ts → type-6fd96950.d.ts}

@@ -1,7 +1,7 @@
 import { PublicKey, Transaction, Signer, Keypair, TransactionInstruction, EpochInfo } from '@solana/web3.js';
 import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
-import { k as ApiV3PoolInfoConcentratedItem, b as ApiClmmConfigInfo, e as ApiV3Token, bM as GetTransferAmountFee, bL as TransferAmountFee, c7 as Price, c6 as Percent, c2 as TokenAmount, bJ as ComputeBudgetConfig, c4 as Fraction, bA as TokenInfo, v as ClmmKeys } from './type-2bed92a9.js';
+import { k as ApiV3PoolInfoConcentratedItem, b as ApiClmmConfigInfo, e as ApiV3Token, bL as GetTransferAmountFee, bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, bI as ComputeBudgetConfig, c3 as Fraction, bz as TokenInfo, v as ClmmKeys } from './type-83523f5f.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { ClmmPositionLayout } from './raydium/clmm/layout.js';
 

package/lib/{type-2bed92a9.d.ts → type-83523f5f.d.ts}

@@ -1079,12 +1079,6 @@ declare enum JupTokenType {
     Strict = "strict"
 }
 declare type PoolsApiReturn = ApiV3PageIns<ApiV3PoolInfoItem>;
-interface SearchPoolsApiReturn {
-    hasNextPage: boolean;
-    data: ApiV3PoolInfoItem[];
-    bestUse: "id" | "mint" | null;
-    search: string;
-}
 interface TransferFeeDataBaseType {
     transferFeeConfigAuthority: string;
     withdrawWithheldAuthority: string;
@@ -1418,4 +1412,4 @@ declare type FarmPositionData = Record<string, Record<string, Record<string, {
     version: "V1" | "V2";
 }>>>;
 
-export { FarmPositionData as $, ApiPoolInfoV4 as A, FarmRewardTypeV6Key as B, CpmmKeys as C, RewardKeyInfoV345 as D, RewardKeyInfoV6 as E, FarmRewardInfoV6 as F, FormatFarmKeyOutV345 as G, FormatFarmKeyOutV6 as H, FormatFarmKeyOut as I, JupTokenType as J, RewardInfoV345 as K, LiquidityVersion as L, RewardInfoV6 as M, FarmTagsItem as N, FormatFarmInfoOutBase as O, PoolsApiReturn as P, FormatFarmInfoOutV345 as Q, RpcItemA as R, SearchPoolsApiReturn as S, TransferFeeDataBaseType as T, FormatFarmInfoOutV6 as U, FormatFarmInfoOut as V, AvailabilityCheckAPI3 as W, OwnerCreatedFarmInfo as X, OwnerIdoInfo as Y, IdoKeysData as Z, ApiStakePool as _, ApiStakePoolInfo as a, FarmLedgerLayoutV5_2 as a$, Rounding as a0, BN_ZERO as a1, BN_ONE as a2, BN_TWO as a3, BN_THREE as a4, BN_FIVE as a5, BN_TEN as a6, BN_100 as a7, BN_1000 as a8, BN_10000 as a9, withdrawRewardLayout as aA, realFarmStateV3Layout as aB, realFarmStateV5Layout as aC, realFarmV6Layout as aD, farmStateV3Layout as aE, farmStateV5Layout as aF, farmStateV6Layout as aG, farmRewardTimeInfoLayout as aH, farmRewardLayout as aI, farmRewardRestartLayout as aJ, farmAddRewardLayout as aK, FarmStateLayoutV3 as aL, FarmStateLayoutV5 as aM, FarmStateLayoutV6 as aN, FarmStateV3 as aO, FarmStateV5 as aP, FarmStateV6 as aQ, FarmState as aR, FarmStateLayout as aS, farmLedgerLayoutV3_1 as aT, farmLedgerLayoutV3_2 as aU, farmLedgerLayoutV5_1 as aV, farmLedgerLayoutV5_2 as aW, farmLedgerLayoutV6_1 as aX, FarmLedgerLayoutV3_1 as aY, FarmLedgerLayoutV3_2 as aZ, FarmLedgerLayoutV5_1 as a_, BigNumberish as aa, Numberish as ab, parseBigNumberish as ac, tenExponential as ad, parseNumberInfo as ae, divCeil as af, shakeFractionDecimal as ag, toBN as ah, toFraction as ai, toPercent as aj, toTokenPrice as ak, toUsdCurrency as al, toTotalPrice as am, decimalToFraction as an, isDecimal as ao, recursivelyDecimalToFraction as ap, AddInstructionParam as aq, TxBuildData as ar, TxV0BuildData as as, ExecuteParam as at, MultiTxBuildData as au, MultiTxV0BuildData as av, MakeMultiTxData as aw, MakeTxData as ax, TxBuilder as ay, associatedLedgerAccountLayout as az, ApiClmmConfigInfo as b, UnionCover as b$, FarmLedgerLayoutV6_1 as b0, FarmLedgerLayout as b1, FarmLedgerV3_1 as b2, FarmLedgerV3_2 as b3, FarmLedgerV5_1 as b4, FarmLedgerV5_2 as b5, FarmLedgerV6_1 as b6, FarmLedger as b7, dwLayout as b8, VoterVotingMintConfig as b9, TokenInfo as bA, TokenJson as bB, SplToken as bC, LpToken as bD, SignAllTransactions as bE, MakeTransaction as bF, MakeV0Transaction as bG, MakeMultiTransaction as bH, InstructionReturn as bI, ComputeBudgetConfig as bJ, LoadParams as bK, TransferAmountFee as bL, GetTransferAmountFee as bM, ReturnTypeFetchMultipleMintInfo as bN, ReturnTypeFetchMultipleMintInfos as bO, ReplaceType as bP, MayArray as bQ, MayDeepArray as bR, MayFunction as bS, ArrayItem as bT, ExactPartial as bU, ExactRequired as bV, SKeyof as bW, GetValue as bX, SOR as bY, Fallback as bZ, Cover as b_, VoterRegistrar as ba, VoterLockup as bb, VoterDepositEntry as bc, Voter as bd, RewardType as be, APIRewardInfo as bf, RewardInfoWithKey as bg, FarmRewardInfo as bh, FarmRewardInfoConfig as bi, RewardInfoKey as bj, FarmPoolInfoV6 as bk, CreateFarm as bl, CreateFarmExtInfo as bm, UpdateFarmReward as bn, UpdateFarmRewards as bo, FarmDWParam as bp, FarmPoolKeys as bq, FarmVersion as br, FARM_LOCK_MINT as bs, FARM_LOCK_VAULT as bt, FARM_VERSION_TO_STATE_LAYOUT as bu, FARM_VERSION_TO_LEDGER_LAYOUT as bv, isValidFarmVersion as bw, validateFarmRewards as bx, poolTypeV6 as by, FARM_PROGRAM_TO_VERSION as bz, ApiClmmPoolsItemStatistics as c, unionArr as c0, splitNumber as c1, TokenAmount as c2, CurrencyAmount as c3, Fraction as c4, _100_PERCENT as c5, Percent as c6, Price as c7, ApiV3PageIns as d, ApiV3Token as e, ApiV3TokenRes as f, ApiV3PoolInfoCountItem as g, PoolFarmRewardInfo as h, PoolRewardInfoItem as i, ApiV3PoolInfoBaseItem as j, ApiV3PoolInfoConcentratedItem as k, ApiV3PoolInfoStandardItem as l, ApiV3PoolInfoStandardItemCpmm as m, ApiV3PoolInfoItem as n, PoolFetchType as o, FetchPoolParams as p, Point as q, LiquidityLineApi as r, AmmV4Keys as s, AmmV5Keys as t, ClmmRewardType as u, ClmmKeys as v, PoolKeys as w, ApiClmmConfigV3 as x, RpcItemB as y, RpcType as z };
+export { Rounding as $, ApiPoolInfoV4 as A, FarmRewardTypeV6Key as B, CpmmKeys as C, RewardKeyInfoV345 as D, RewardKeyInfoV6 as E, FarmRewardInfoV6 as F, FormatFarmKeyOutV345 as G, FormatFarmKeyOutV6 as H, FormatFarmKeyOut as I, JupTokenType as J, RewardInfoV345 as K, LiquidityVersion as L, RewardInfoV6 as M, FarmTagsItem as N, FormatFarmInfoOutBase as O, PoolsApiReturn as P, FormatFarmInfoOutV345 as Q, RpcItemA as R, FormatFarmInfoOutV6 as S, TransferFeeDataBaseType as T, FormatFarmInfoOut as U, AvailabilityCheckAPI3 as V, OwnerCreatedFarmInfo as W, OwnerIdoInfo as X, IdoKeysData as Y, ApiStakePool as Z, FarmPositionData as _, ApiStakePoolInfo as a, FarmLedgerLayoutV6_1 as a$, BN_ZERO as a0, BN_ONE as a1, BN_TWO as a2, BN_THREE as a3, BN_FIVE as a4, BN_TEN as a5, BN_100 as a6, BN_1000 as a7, BN_10000 as a8, BigNumberish as a9, realFarmStateV3Layout as aA, realFarmStateV5Layout as aB, realFarmV6Layout as aC, farmStateV3Layout as aD, farmStateV5Layout as aE, farmStateV6Layout as aF, farmRewardTimeInfoLayout as aG, farmRewardLayout as aH, farmRewardRestartLayout as aI, farmAddRewardLayout as aJ, FarmStateLayoutV3 as aK, FarmStateLayoutV5 as aL, FarmStateLayoutV6 as aM, FarmStateV3 as aN, FarmStateV5 as aO, FarmStateV6 as aP, FarmState as aQ, FarmStateLayout as aR, farmLedgerLayoutV3_1 as aS, farmLedgerLayoutV3_2 as aT, farmLedgerLayoutV5_1 as aU, farmLedgerLayoutV5_2 as aV, farmLedgerLayoutV6_1 as aW, FarmLedgerLayoutV3_1 as aX, FarmLedgerLayoutV3_2 as aY, FarmLedgerLayoutV5_1 as aZ, FarmLedgerLayoutV5_2 as a_, Numberish as aa, parseBigNumberish as ab, tenExponential as ac, parseNumberInfo as ad, divCeil as ae, shakeFractionDecimal as af, toBN as ag, toFraction as ah, toPercent as ai, toTokenPrice as aj, toUsdCurrency as ak, toTotalPrice as al, decimalToFraction as am, isDecimal as an, recursivelyDecimalToFraction as ao, AddInstructionParam as ap, TxBuildData as aq, TxV0BuildData as ar, ExecuteParam as as, MultiTxBuildData as at, MultiTxV0BuildData as au, MakeMultiTxData as av, MakeTxData as aw, TxBuilder as ax, associatedLedgerAccountLayout as ay, withdrawRewardLayout as az, ApiClmmConfigInfo as b, unionArr as b$, FarmLedgerLayout as b0, FarmLedgerV3_1 as b1, FarmLedgerV3_2 as b2, FarmLedgerV5_1 as b3, FarmLedgerV5_2 as b4, FarmLedgerV6_1 as b5, FarmLedger as b6, dwLayout as b7, VoterVotingMintConfig as b8, VoterRegistrar as b9, TokenJson as bA, SplToken as bB, LpToken as bC, SignAllTransactions as bD, MakeTransaction as bE, MakeV0Transaction as bF, MakeMultiTransaction as bG, InstructionReturn as bH, ComputeBudgetConfig as bI, LoadParams as bJ, TransferAmountFee as bK, GetTransferAmountFee as bL, ReturnTypeFetchMultipleMintInfo as bM, ReturnTypeFetchMultipleMintInfos as bN, ReplaceType as bO, MayArray as bP, MayDeepArray as bQ, MayFunction as bR, ArrayItem as bS, ExactPartial as bT, ExactRequired as bU, SKeyof as bV, GetValue as bW, SOR as bX, Fallback as bY, Cover as bZ, UnionCover as b_, VoterLockup as ba, VoterDepositEntry as bb, Voter as bc, RewardType as bd, APIRewardInfo as be, RewardInfoWithKey as bf, FarmRewardInfo as bg, FarmRewardInfoConfig as bh, RewardInfoKey as bi, FarmPoolInfoV6 as bj, CreateFarm as bk, CreateFarmExtInfo as bl, UpdateFarmReward as bm, UpdateFarmRewards as bn, FarmDWParam as bo, FarmPoolKeys as bp, FarmVersion as bq, FARM_LOCK_MINT as br, FARM_LOCK_VAULT as bs, FARM_VERSION_TO_STATE_LAYOUT as bt, FARM_VERSION_TO_LEDGER_LAYOUT as bu, isValidFarmVersion as bv, validateFarmRewards as bw, poolTypeV6 as bx, FARM_PROGRAM_TO_VERSION as by, TokenInfo as bz, ApiClmmPoolsItemStatistics as c, splitNumber as c0, TokenAmount as c1, CurrencyAmount as c2, Fraction as c3, _100_PERCENT as c4, Percent as c5, Price as c6, ApiV3PageIns as d, ApiV3Token as e, ApiV3TokenRes as f, ApiV3PoolInfoCountItem as g, PoolFarmRewardInfo as h, PoolRewardInfoItem as i, ApiV3PoolInfoBaseItem as j, ApiV3PoolInfoConcentratedItem as k, ApiV3PoolInfoStandardItem as l, ApiV3PoolInfoStandardItemCpmm as m, ApiV3PoolInfoItem as n, PoolFetchType as o, FetchPoolParams as p, Point as q, LiquidityLineApi as r, AmmV4Keys as s, AmmV5Keys as t, ClmmRewardType as u, ClmmKeys as v, PoolKeys as w, ApiClmmConfigV3 as x, RpcItemB as y, RpcType as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydium-io/raydium-sdk-v2",
-  "version": "0.0.23-alpha",
+  "version": "0.0.25-alpha",
   "description": "An SDK for building applications on top of Raydium.",
   "license": "GPL-3.0",
   "main": "./lib/index.js",

package/src/api/api.ts

@@ -8,7 +8,7 @@ import {
   ApiV3Token,
   FetchPoolParams,
   PoolsApiReturn,
-  SearchPoolsApiReturn,
+  ApiV3PoolInfoItem,
   JupTokenType,
   PoolKeys,
   FormatFarmInfoOut,
@@ -187,7 +187,7 @@ export class Api {
     return res.data;
   }
 
-  async fetchPoolById(props: { ids: string }): Promise<SearchPoolsApiReturn> {
+  async fetchPoolById(props: { ids: string }): Promise<ApiV3PoolInfoItem[]> {
     const { ids } = props;
     const res = await this.api.get((this.urlConfigs.POOL_SEARCH_BY_ID || API_URLS.POOL_SEARCH_BY_ID) + `?ids=${ids}`);
     return res.data;

package/src/api/type.ts

@@ -118,12 +118,6 @@ export enum JupTokenType {
   Strict = "strict",
 }
 export type PoolsApiReturn = ApiV3PageIns<ApiV3PoolInfoItem>;
-export interface SearchPoolsApiReturn {
-  hasNextPage: boolean;
-  data: ApiV3PoolInfoItem[];
-  bestUse: "id" | "mint" | null;
-  search: string;
-}
 
 export interface TransferFeeDataBaseType {
   transferFeeConfigAuthority: string;

package/src/raydium/cpmm/cpmm.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT, TOKEN_PROGRAM_ID, AccountLayout } from "@solana/spl-token";
-import { ApiV3PoolInfoStandardItem, CpmmKeys } from "@/api/type";
+import { CpmmKeys } from "@/api/type";
 import { TokenAmount, Percent } from "@/module";
 import { toToken } from "../token";
 import { BN_ZERO } from "@/common/bignumber";
@@ -16,6 +16,7 @@ import {
   AddCpmmLiquidityParams,
   WithdrawCpmmLiquidityParams,
   CpmmSwapParams,
+  ComputePairAmountParams,
 } from "./type";
 import { getCreatePoolKeys, getPdaObservationId } from "./pda";
 import {
@@ -508,12 +509,7 @@ export default class CpmmModule extends ModuleBase {
     // anotherToken,
     slippage,
     baseIn,
-  }: {
-    poolInfo: ApiV3PoolInfoStandardItem;
-    amount: string | Decimal;
-    slippage: Percent;
-    baseIn?: boolean;
-  }): { anotherAmount: TokenAmount; maxAnotherAmount: TokenAmount; liquidity: BN } {
+  }: ComputePairAmountParams): { anotherAmount: TokenAmount; maxAnotherAmount: TokenAmount; liquidity: BN } {
     const inputAmount = new BN(new Decimal(amount).mul(10 ** poolInfo[baseIn ? "mintA" : "mintB"].decimals).toFixed(0));
     const _anotherToken = toToken(poolInfo[baseIn ? "mintB" : "mintA"]);
 

package/src/raydium/cpmm/type.ts

@@ -1,10 +1,11 @@
 import { PublicKey } from "@solana/web3.js";
-import { ApiV3PoolInfoStandardItem, ApiV3Token } from "@/api/type";
+import { ApiV3PoolInfoStandardItemCpmm, ApiV3Token } from "@/api/type";
 import { TxVersion } from "@/common/txTool/txType";
 import BN from "bn.js";
 import { ComputeBudgetConfig } from "@/raydium/type";
 import { SwapResult } from "./curve/calculator";
 import { Percent } from "@/module";
+import Decimal from "decimal.js";
 
 export interface CpmmConfigInfoInterface {
   bump: number;
@@ -84,7 +85,7 @@ export interface CreateCpmmPoolAddress {
 }
 
 export interface AddCpmmLiquidityParams<T = TxVersion.LEGACY> {
-  poolInfo: ApiV3PoolInfoStandardItem;
+  poolInfo: ApiV3PoolInfoStandardItemCpmm;
   payer?: PublicKey;
   inputAmount: BN;
   baseIn: boolean;
@@ -98,7 +99,7 @@ export interface AddCpmmLiquidityParams<T = TxVersion.LEGACY> {
 }
 
 export interface WithdrawCpmmLiquidityParams<T = TxVersion.LEGACY> {
-  poolInfo: ApiV3PoolInfoStandardItem;
+  poolInfo: ApiV3PoolInfoStandardItemCpmm;
   payer?: PublicKey;
   lpAmount: BN;
   slippage: Percent;
@@ -107,7 +108,7 @@ export interface WithdrawCpmmLiquidityParams<T = TxVersion.LEGACY> {
 }
 
 export interface CpmmSwapParams<T = TxVersion.LEGACY> {
-  poolInfo: ApiV3PoolInfoStandardItem;
+  poolInfo: ApiV3PoolInfoStandardItemCpmm;
   payer?: PublicKey;
   baseIn: boolean;
   swapResult: SwapResult;
@@ -119,3 +120,10 @@ export interface CpmmSwapParams<T = TxVersion.LEGACY> {
   computeBudgetConfig?: ComputeBudgetConfig;
   txVersion?: T;
 }
+
+export interface ComputePairAmountParams {
+  poolInfo: ApiV3PoolInfoStandardItemCpmm;
+  amount: string | Decimal;
+  slippage: Percent;
+  baseIn?: boolean;
+}