@raydium-io/raydium-sdk-v2 0.2.42-alpha → 0.2.43-alpha

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

@@ -1,4 +1,4 @@
-import { bK as TokenInfo } from '../../api-ce8cb0e7.js';
+import { bK as TokenInfo } from '../../api-aa5759c5.js';
 import 'axios';
 import '../../solana/type.js';
 import '@solana/web3.js';

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 { bN as LpToken, bM as SplToken, bK as TokenInfo, bL as TokenJson } from '../../api-ce8cb0e7.js';
+export { bN as LpToken, bM as SplToken, bK as TokenInfo, bL as TokenJson } from '../../api-aa5759c5.js';
 export { parseTokenInfo, solToWSolToken, toApiV3Token, toFeeConfig, toToken, toTokenAmount, toTokenInfo, wSolToSolToken } from './utils.js';
 import 'axios';
 import '../../solana/type.js';

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

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
-import '../../api-ce8cb0e7.js';
-export { n as default } from '../../raydium-d940abae.js';
+import '../../api-aa5759c5.js';
+export { n as default } from '../../raydium-940808d1.js';
 import 'axios';
 import '../../solana/type.js';
 import 'bn.js';
@@ -22,7 +22,7 @@ import '../liquidity/stable.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../clmm/layout.js';
-import '../../type-526e8620.js';
+import '../../type-3ac7311b.js';
 import '../cpmm/curve/calculator.js';
 import '../cpmm/type.js';
 import '../cpmm/layout.js';

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

@@ -1,4 +1,4 @@
-export { bN as LpToken, bM as SplToken, bK as TokenInfo, bL as TokenJson } from '../../api-ce8cb0e7.js';
+export { bN as LpToken, bM as SplToken, bK as TokenInfo, bL as TokenJson } from '../../api-aa5759c5.js';
 import '../../module/token.js';
 import 'axios';
 import '../../solana/type.js';

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

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { RawMint, TransferFeeConfigLayout } from '@solana/spl-token';
-import { bK as TokenInfo, ag as BigNumberish, ce as TokenAmount, i as ApiV3Token } from '../../api-ce8cb0e7.js';
+import { bK as TokenInfo, ag as BigNumberish, ce as TokenAmount, i as ApiV3Token } from '../../api-aa5759c5.js';
 import { Token } from '../../module/token.js';
 import 'axios';
 import '../../solana/type.js';

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

@@ -2,7 +2,7 @@ export { ApiSwapV1Out, makeSwapInstruction, route1Instruction, route2Instruction
 export { BasicPoolInfo, ComputeAmountOutAmmLayout, ComputeAmountOutLayout, ComputeAmountOutRouteLayout, ComputePoolType, ComputeRoutePathType, MakeSwapInstructionParam, PoolAccountInfoV4, ReturnTypeFetchMultipleInfo, ReturnTypeGetAddLiquidityDefaultPool, ReturnTypeGetAllRoute, ReturnTypeMakeSwapInstruction, ReturnTypeMakeSwapTransaction, RoutePathType } from './type.js';
 import '@solana/web3.js';
 import 'bn.js';
-import '../../api-ce8cb0e7.js';
+import '../../api-aa5759c5.js';
 import 'axios';
 import '../../solana/type.js';
 import '@solana/spl-token';
@@ -17,7 +17,7 @@ import '../../common/logger.js';
 import '../../module/currency.js';
 import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../type-526e8620.js';
+import '../../type-3ac7311b.js';
 import '../clmm/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/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 { s as ApiV3PoolInfoItem, G as PoolKeys } from '../../api-ce8cb0e7.js';
+import { s as ApiV3PoolInfoItem, G as PoolKeys } from '../../api-aa5759c5.js';
 import { ComputePoolType, MakeSwapInstructionParam, ReturnTypeMakeSwapInstruction } from './type.js';
 import 'axios';
 import '../../solana/type.js';
@@ -16,7 +16,7 @@ import '../../common/logger.js';
 import '../../module/currency.js';
 import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../type-526e8620.js';
+import '../../type-3ac7311b.js';
 import '../clmm/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';

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

@@ -2,10 +2,10 @@ import '@solana/web3.js';
 import '@solana/spl-token';
 import 'bn.js';
 import 'decimal.js';
-import '../../api-ce8cb0e7.js';
+import '../../api-aa5759c5.js';
 import '../../common/txTool/txType.js';
-export { m as default } from '../../raydium-d940abae.js';
-import '../../type-526e8620.js';
+export { m as default } from '../../raydium-940808d1.js';
+import '../../type-3ac7311b.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';
 import '../liquidity/type.js';

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

@@ -1,9 +1,9 @@
 import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from '@solana/web3.js';
 import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
-import { bX as TransferAmountFee, ce as TokenAmount, G as PoolKeys, s as ApiV3PoolInfoItem } from '../../api-ce8cb0e7.js';
+import { bX as TransferAmountFee, ce as TokenAmount, G as PoolKeys, s as ApiV3PoolInfoItem } from '../../api-aa5759c5.js';
 import { Token } from '../../module/token.js';
-import { d as ComputeClmmPoolInfo } from '../../type-526e8620.js';
+import { d as ComputeClmmPoolInfo } from '../../type-3ac7311b.js';
 import { ComputeAmountOutParam } from '../liquidity/type.js';
 import { CpmmComputeData } from '../cpmm/type.js';
 import 'axios';

package/lib/raydium/type.d.ts

@@ -1,7 +1,7 @@
 import '@solana/web3.js';
 import 'bn.js';
 import '@solana/spl-token';
-export { c3 as ArrayItem, bU as ComputeBudgetConfig, ca as Cover, c4 as ExactPartial, c5 as ExactRequired, c9 as Fallback, bY as GetTransferAmountFee, c7 as GetValue, bT as InstructionReturn, bW as LoadParams, bS as MakeMultiTransaction, bQ as MakeTransaction, bR as MakeV0Transaction, c0 as MayArray, c1 as MayDeepArray, c2 as MayFunction, b$ as ReplaceType, bZ as ReturnTypeFetchMultipleMintInfo, b_ as ReturnTypeFetchMultipleMintInfos, bO as ReturnTypeMakeInstructions, c6 as SKeyof, c8 as SOR, bP as SignAllTransactions, bX as TransferAmountFee, bV as TxTipConfig, cb as UnionCover, cc as unionArr } from '../api-ce8cb0e7.js';
+export { c3 as ArrayItem, bU as ComputeBudgetConfig, ca as Cover, c4 as ExactPartial, c5 as ExactRequired, c9 as Fallback, bY as GetTransferAmountFee, c7 as GetValue, bT as InstructionReturn, bW as LoadParams, bS as MakeMultiTransaction, bQ as MakeTransaction, bR as MakeV0Transaction, c0 as MayArray, c1 as MayDeepArray, c2 as MayFunction, b$ as ReplaceType, bZ as ReturnTypeFetchMultipleMintInfo, b_ as ReturnTypeFetchMultipleMintInfos, bO as ReturnTypeMakeInstructions, c6 as SKeyof, c8 as SOR, bP as SignAllTransactions, bX as TransferAmountFee, bV as TxTipConfig, cb as UnionCover, cc as unionArr } from '../api-aa5759c5.js';
 import 'axios';
 import '../solana/type.js';
 import '../api/url.js';

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

@@ -1,6 +1,6 @@
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-d940abae.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-940808d1.js';
 import '@solana/web3.js';
-import '../../api-ce8cb0e7.js';
+import '../../api-aa5759c5.js';
 import 'axios';
 import '../../solana/type.js';
 import 'bn.js';
@@ -22,7 +22,7 @@ import '../liquidity/stable.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../clmm/layout.js';
-import '../../type-526e8620.js';
+import '../../type-3ac7311b.js';
 import '../cpmm/curve/calculator.js';
 import '../cpmm/type.js';
 import '../cpmm/layout.js';

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

@@ -1,9 +1,9 @@
 import '../../marshmallow/index.js';
 import '@solana/web3.js';
 import 'bn.js';
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-d940abae.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-940808d1.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../api-ce8cb0e7.js';
+import '../../api-aa5759c5.js';
 import 'axios';
 import '../../solana/type.js';
 import '@solana/spl-token';
@@ -22,7 +22,7 @@ import '../liquidity/stable.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../clmm/layout.js';
-import '../../type-526e8620.js';
+import '../../type-3ac7311b.js';
 import '../cpmm/curve/calculator.js';
 import '../cpmm/type.js';
 import '../cpmm/layout.js';

package/lib/{raydium-d940abae.d.ts → raydium-940808d1.d.ts}

@@ -1,5 +1,5 @@
 import { PublicKey, Commitment, EpochInfo, Connection, Transaction, Signer, TransactionInstruction, Keypair } from '@solana/web3.js';
-import { aG as TxBuilder, ay as AddInstructionParam, ag as BigNumberish, bt as CreateFarm, aF as MakeTxData, bu as CreateFarmExtInfo, bv as UpdateFarmReward, bw as UpdateFarmRewards, bx as FarmDWParam, $ as FormatFarmInfoOut, bU as ComputeBudgetConfig, bV as TxTipConfig, aE as MakeMultiTxData, q as ApiV3PoolInfoStandardItem, ci as Percent, ce as TokenAmount, x as AmmV4Keys, y as AmmV5Keys, p as ApiV3PoolInfoConcentratedItem, _ as FormatFarmInfoOutV6, D as ClmmKeys, bQ as MakeTransaction, b_ as ReturnTypeFetchMultipleMintInfos, z as CpmmKeys, r as ApiV3PoolInfoStandardItemCpmm, bY as GetTransferAmountFee, G as PoolKeys, i as ApiV3Token, a2 as OwnerIdoInfo, a3 as IdoKeysData, bW as LoadParams, J as JupTokenType, bK as TokenInfo, bP as SignAllTransactions, a as Api, a0 as AvailabilityCheckAPI3, k as ApiV3TokenRes } from './api-ce8cb0e7.js';
+import { aG as TxBuilder, ay as AddInstructionParam, ag as BigNumberish, bt as CreateFarm, aF as MakeTxData, bu as CreateFarmExtInfo, bv as UpdateFarmReward, bw as UpdateFarmRewards, bx as FarmDWParam, $ as FormatFarmInfoOut, bU as ComputeBudgetConfig, bV as TxTipConfig, aE as MakeMultiTxData, q as ApiV3PoolInfoStandardItem, ci as Percent, ce as TokenAmount, x as AmmV4Keys, y as AmmV5Keys, p as ApiV3PoolInfoConcentratedItem, _ as FormatFarmInfoOutV6, D as ClmmKeys, bQ as MakeTransaction, b_ as ReturnTypeFetchMultipleMintInfos, z as CpmmKeys, r as ApiV3PoolInfoStandardItemCpmm, bY as GetTransferAmountFee, G as PoolKeys, i as ApiV3Token, a2 as OwnerIdoInfo, a3 as IdoKeysData, bW as LoadParams, J as JupTokenType, bK as TokenInfo, bP as SignAllTransactions, a as Api, a0 as AvailabilityCheckAPI3, k as ApiV3TokenRes } from './api-aa5759c5.js';
 import { API_URL_CONFIG } from './api/url.js';
 import { Owner } from './common/owner.js';
 import { Cluster } from './solana/type.js';
@@ -11,7 +11,7 @@ import Decimal from 'decimal.js';
 import { StableLayout } from './raydium/liquidity/stable.js';
 import { AddLiquidityParams, RemoveParams, CreatePoolParam, CreatePoolAddress, CreateMarketAndPoolParam, ComputeAmountOutParam, ComputeAmountInParam, SwapParam, AmmRpcData } from './raydium/liquidity/type.js';
 import { ClmmPositionLayout, PositionInfoLayout, LockClPositionLayoutV2, PoolInfoLayout } from './raydium/clmm/layout.js';
-import { m as CreateConcentratedPool, O as OpenPositionFromBase, o as OpenPositionFromBaseExtInfo, p as OpenPositionFromLiquidity, q as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, z as ClosePositionExtInfo, L as LockPosition, F as ClmmLockAddress, H as HarvestLockPosition, r as InitRewardParams, B as InitRewardExtInfo, s as InitRewardsParams, t as SetRewardParams, u as SetRewardsParams, v as CollectRewardParams, w as CollectRewardsParams, x as HarvestAllRewardsParams, E as ClmmParsedRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays, k as ReturnTypeComputeAmountOutBaseOut, i as ReturnTypeComputeAmountOutFormat } from './type-526e8620.js';
+import { m as CreateConcentratedPool, O as OpenPositionFromBase, o as OpenPositionFromBaseExtInfo, p as OpenPositionFromLiquidity, q as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, z as ClosePositionExtInfo, L as LockPosition, F as ClmmLockAddress, H as HarvestLockPosition, r as InitRewardParams, B as InitRewardExtInfo, s as InitRewardsParams, t as SetRewardParams, u as SetRewardsParams, v as CollectRewardParams, w as CollectRewardsParams, x as HarvestAllRewardsParams, E as ClmmParsedRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays, k as ReturnTypeComputeAmountOutBaseOut, i as ReturnTypeComputeAmountOutFormat } from './type-3ac7311b.js';
 import { SwapResult } from './raydium/cpmm/curve/calculator.js';
 import { CpmmParsedRpcData, CpmmComputeData, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, LockCpmmLpParams, CpmmLockExtInfo, HarvestLockCpmmLpParams, HarvestMultiLockCpmmLpParams, CreateCpmmPoolPermissionParam, CollectCreatorFees, CollectMultiCreatorFees, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { TransferFeeConfig } from '@solana/spl-token';

package/lib/{type-526e8620.d.ts → type-3ac7311b.d.ts}

@@ -1,7 +1,7 @@
 import { PublicKey, Transaction, Signer, Keypair, EpochInfo } from '@solana/web3.js';
 import BN__default from 'bn.js';
 import Decimal from 'decimal.js';
-import { p as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, i as ApiV3Token, bY as GetTransferAmountFee, bX as TransferAmountFee, cj as Price, ci as Percent, ce as TokenAmount, bU as ComputeBudgetConfig, bV as TxTipConfig, cg as Fraction, bK as TokenInfo, D as ClmmKeys } from './api-ce8cb0e7.js';
+import { p as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, i as ApiV3Token, bY as GetTransferAmountFee, bX as TransferAmountFee, cj as Price, ci as Percent, ce as TokenAmount, bU as ComputeBudgetConfig, bV as TxTipConfig, cg as Fraction, bK as TokenInfo, D as ClmmKeys } from './api-aa5759c5.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { TickArrayBitmapExtensionLayout, PoolInfoLayout, ClmmPositionLayout, LockClPositionLayoutV2 } from './raydium/clmm/layout.js';
 

package/package.json

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

package/src/api/api.ts

@@ -211,10 +211,12 @@ export class Api {
   }
 
   async getPoolList(props: FetchPoolParams = {}): Promise<PoolsApiReturn> {
-    const { type = "all", sort = "liquidity", order = "desc", page = 0, pageSize = 100 } = props;
+    const { type = "all", sort = "liquidity", order = "desc", showFarms = false, nextPageId, pageSize = 100 } = props;
     const res = await this.api.get<PoolsApiReturn>(
       (this.urlConfigs.POOL_LIST || API_URLS.POOL_LIST) +
-        `?poolType=${type}&poolSortField=${sort}&sortType=${order}&page=${page}&pageSize=${pageSize}`,
+        `?size=${pageSize}&hasReward=${showFarms}${type && type !== "all" ? `&poolType=${type}` : ""}${
+          sort ? `&sortField=${sort}` : ""
+        }${order ? `&sortType=${order}` : ""}${nextPageId ? `&nextPageId=${nextPageId}` : ""}`,
     );
     return res.data;
   }
@@ -256,7 +258,7 @@ export class Api {
     props: {
       mint1: string | PublicKey;
       mint2?: string | PublicKey;
-    } & Omit<FetchPoolParams, "pageSize">,
+    } & FetchPoolParams,
   ): Promise<PoolsApiReturn> {
     const {
       mint1: propMint1,
@@ -264,7 +266,7 @@ export class Api {
       type = PoolFetchType.All,
       sort = "default",
       order = "desc",
-      page = 1,
+      nextPageId,
     } = props;
 
     const [mint1, mint2] = [
@@ -273,9 +275,14 @@ export class Api {
     ];
     const [baseMint, quoteMint] = mint2 && mint1 > mint2 ? [mint2, mint1] : [mint1, mint2];
 
+    if (!mint1 && !mint2) throw new Error("not search mints provided");
     const res = await this.api.get(
       (this.urlConfigs.POOL_SEARCH_MINT || API_URLS.POOL_SEARCH_MINT) +
-        `?mint1=${baseMint}&mint2=${quoteMint}&poolType=${type}&poolSortField=${sort}&sortType=${order}&pageSize=100&page=${page}`,
+        `?size=100&mint1=${baseMint}${quoteMint ? `&mint2=${quoteMint}` : ""}${
+          type && type !== "all" ? `&poolType=${type}` : ""
+        }${sort ? `&sortField=${sort}` : ""}${order ? `&sortType=${order}` : ""}${
+          nextPageId ? `&nextPageId=${nextPageId}` : ""
+        }`,
     );
     return res.data;
   }

package/src/api/type.ts

@@ -357,11 +357,8 @@ export type ApiV3PoolInfoItem =
 
 export enum PoolFetchType {
   All = "all",
-  Standard = "standard",
-  Concentrated = "concentrated",
-  AllFarm = "allFarm",
-  StandardFarm = "standardFarm",
-  ConcentratedFarm = "concentratedFarm",
+  Standard = "Standard",
+  Concentrated = "Concentrated",
 }
 
 export interface FetchPoolParams {
@@ -379,7 +376,10 @@ export interface FetchPoolParams {
     | "apr30d";
   order?: "desc" | "asc";
   pageSize?: number;
-  page?: number;
+  nextPageId?: string;
+  showFarms?: boolean;
+  mint1?: string;
+  mint2?: string;
 }
 
 // liquidity line

package/src/api/url.ts

@@ -26,13 +26,13 @@ export const API_URLS = {
 
   JUP_TOKEN_LIST: "https://lite-api.jup.ag/tokens/v2/tag?query=verified",
   /**
-   * poolType: {all, concentrated, standard, allFarm, concentratedFarm, standardFarm}
-   * poolSortField: {liquidity | volume_24h / 7d / 30d | fee_24h / 7d / 30d | apr_24h / 7d / 30d}
-   * sortType: {desc/asc}
-   * page: number
-   * pageSize: number
+   * poolType: Concentrated / Standard // optional
+   * sortField: liquidity / volume24h / fee24h / apr24h (more time unit 7d/30d e.g. volume27d) // optional
+   * sortType: desc / asc // optional
+   * size: 100
+   * hasReward: true or false // optional
    */
-  POOL_LIST: "/pools/info/list",
+  POOL_LIST: "/pools/info/list-v2",
   /**
    * ?ids=idList.join(',')
    */
@@ -45,7 +45,7 @@ export const API_URLS = {
    * page: number
    * pageSize: number
    */
-  POOL_SEARCH_MINT: "/pools/info/mint",
+  POOL_SEARCH_MINT: "/pools/info/list-v2",
   /** ?lps=lpList.join(',') */
   POOL_SEARCH_LP: "/pools/info/lps",
   /** ?ids=idList.join(',') */