@raydium-io/raydium-sdk-v2 0.0.37-alpha → 0.0.39-alpha

package/lib/raydium/serum/layout.d.ts

@@ -4,12 +4,12 @@ import * as _solana_web3_js from '@solana/web3.js';
 import { GetStructureSchema } from '../../marshmallow/buffer-layout.js';
 
 declare const MARKET_STATE_LAYOUT_V3: Structure<_solana_web3_js.PublicKey | Buffer | BN, "", {
+    baseMint: _solana_web3_js.PublicKey;
+    quoteMint: _solana_web3_js.PublicKey;
     baseLotSize: BN;
     quoteLotSize: BN;
     baseVault: _solana_web3_js.PublicKey;
     quoteVault: _solana_web3_js.PublicKey;
-    baseMint: _solana_web3_js.PublicKey;
-    quoteMint: _solana_web3_js.PublicKey;
     ownAddress: _solana_web3_js.PublicKey;
     vaultSignerNonce: BN;
     baseDepositsTotal: BN;

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

@@ -1,4 +1,4 @@
-import { bz as TokenInfo } from '../../type-541fc296.js';
+import { bz as TokenInfo } from '../../type-15746482.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 { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-541fc296.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-15746482.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-541fc296.js';
-export { j as default } from '../../raydium-3aa078dd.js';
+import '../../type-15746482.js';
+export { j as default } from '../../raydium-2631faa2.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-930256a9.js';
+import '../../type-08d7cf11.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 { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-541fc296.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-15746482.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 { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-541fc296.js';
+import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-15746482.js';
 import { Token } from '../../module/token.js';
 import 'bn.js';
 import '../../solana/type.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-541fc296.js';
+import '../../type-15746482.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
 import '../../common/txTool/txType.js';
@@ -15,5 +15,5 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-930256a9.js';
+import '../../type-08d7cf11.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-541fc296.js';
+import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-15746482.js';
 import { ReturnTypeMakeSwapInstruction, ComputeAmountOutLayout } from './type.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -14,7 +14,7 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-930256a9.js';
+import '../../type-08d7cf11.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-3aa078dd.js';
+export { i as default } from '../../raydium-2631faa2.js';
 import './type.js';
-import '../../type-541fc296.js';
+import '../../type-15746482.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-930256a9.js';
+import '../../type-08d7cf11.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 { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-541fc296.js';
+import { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-15746482.js';
 import { Token } from '../../module/token.js';
-import { c as ClmmPoolInfo } from '../../type-930256a9.js';
+import { c as ClmmPoolInfo } from '../../type-08d7cf11.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
 import '../../common/txTool/txType.js';

package/lib/raydium/type.d.ts

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '@solana/spl-token';
-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-541fc296.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-15746482.js';
 import 'bn.js';
 import '../solana/type.js';
 import '../common/txTool/txType.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-3aa078dd.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-2631faa2.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-541fc296.js';
+import '../../type-15746482.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-930256a9.js';
+import '../../type-08d7cf11.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-3aa078dd.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-2631faa2.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-541fc296.js';
+import '../../type-15746482.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-930256a9.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-3aa078dd.d.ts → raydium-2631faa2.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 { 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, bL as GetTransferAmountFee, 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-541fc296.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, bL as GetTransferAmountFee, 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-15746482.js';
 import { API_URL_CONFIG } from './api/url.js';
 import { Owner } from './common/owner.js';
 import { Cluster } from './solana/type.js';
@@ -10,7 +10,7 @@ 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-930256a9.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-08d7cf11.js';
 import { ClmmPositionLayout, PositionInfoLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 import { CpmmConfigInfoInterface, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { CpmmPoolInfoLayout } from './raydium/cpmm/layout.js';
@@ -299,11 +299,11 @@ declare class Utils1216 extends ModuleBase {
         perLpLoss: BN__default;
         totalClaimedAmount: BN__default;
     }[], "", {
+        status: number;
         padding: BN__default[];
         bump: number;
         endTime: BN__default;
         openTime: BN__default;
-        status: number;
         ammId: PublicKey;
         tokenInfo: {
             mintDecimals: number;

package/lib/{type-930256a9.d.ts → type-08d7cf11.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, 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-541fc296.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-15746482.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { ClmmPositionLayout } from './raydium/clmm/layout.js';
 

package/lib/{type-541fc296.d.ts → type-15746482.d.ts}

@@ -1189,11 +1189,14 @@ declare type ApiV3PoolInfoItem = ApiV3PoolInfoConcentratedItem | ApiV3PoolInfoSt
 declare enum PoolFetchType {
     All = "all",
     Standard = "standard",
-    Concentrated = "concentrated"
+    Concentrated = "concentrated",
+    AllFarm = "allFarm",
+    StandardFarm = "standardFarm",
+    ConcentratedFarm = "concentratedFarm"
 }
 interface FetchPoolParams {
     type?: PoolFetchType;
-    sort?: "liquidity" | "volume_24h" | "volume_7d" | "volume_30d" | "fee_24h" | "fee_7d" | "fee_30d" | "apr_24h" | "apr_7d" | "apr_30d";
+    sort?: "liquidity" | "volume24h" | "volume7d" | "volume30d" | "fee24h" | "fee7d" | "fee30d" | "apr24h" | "apr7d" | "apr30d";
     order?: "desc" | "asc";
     pageSize?: number;
     page?: number;

package/package.json

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

package/src/api/api.ts

@@ -14,10 +14,12 @@ import {
   FormatFarmInfoOut,
   FormatFarmKeyOut,
   AvailabilityCheckAPI3,
+  PoolFetchType,
 } from "./type";
 import { API_URLS, API_URL_CONFIG } from "./url";
 import { updateReqHistory } from "./utils";
 import { PublicKey } from "@solana/web3.js";
+import { solToWSol } from "../common";
 
 const logger = createLogger("Raydium_Api");
 const poolKeysCache: Map<string, PoolKeys> = new Map();
@@ -221,6 +223,39 @@ export class Api {
     return cacheList.concat(data);
   }
 
+  async fetchPoolByMints(
+    props: {
+      mint1: string | PublicKey;
+      mint2?: string | PublicKey;
+    } & Omit<FetchPoolParams, "pageSize">,
+  ): Promise<ApiV3PoolInfoItem[]> {
+    const {
+      mint1: propMint1,
+      mint2: propMint2,
+      type = PoolFetchType.All,
+      sort = "default",
+      order = "desc",
+      page = 1,
+    } = props;
+
+    const [mint1, mint2] = [
+      propMint1 ? solToWSol(propMint1).toBase58() : propMint1,
+      propMint2 && propMint2 !== "undefined" ? solToWSol(propMint2).toBase58() : "",
+    ];
+    const [baseMint, quoteMint] = mint2 && mint1 > mint2 ? [mint2, mint1] : [mint1, mint2];
+
+    console.log(
+      123123555,
+      `?mint1=${baseMint}&mint2=${quoteMint}&poolType=${type}&poolSortField=${sort}&sortType=${order}&pageSize=100&page=${page}`,
+    );
+
+    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}`,
+    );
+    return res.data;
+  }
+
   async fetchFarmInfoById(props: { ids: string }): Promise<FormatFarmInfoOut[]> {
     const { ids } = props;
 

package/src/api/type.ts

@@ -240,21 +240,24 @@ export enum PoolFetchType {
   All = "all",
   Standard = "standard",
   Concentrated = "concentrated",
+  AllFarm = "allFarm",
+  StandardFarm = "standardFarm",
+  ConcentratedFarm = "concentratedFarm",
 }
 
 export interface FetchPoolParams {
   type?: PoolFetchType;
   sort?:
     | "liquidity"
-    | "volume_24h"
-    | "volume_7d"
-    | "volume_30d"
-    | "fee_24h"
-    | "fee_7d"
-    | "fee_30d"
-    | "apr_24h"
-    | "apr_7d"
-    | "apr_30d";
+    | "volume24h"
+    | "volume7d"
+    | "volume30d"
+    | "fee24h"
+    | "fee7d"
+    | "fee30d"
+    | "apr24h"
+    | "apr7d"
+    | "apr30d";
   order?: "desc" | "asc";
   pageSize?: number;
   page?: number;

package/src/raydium/liquidity/liquidity.ts

@@ -97,6 +97,10 @@ export default class LiquidityModule extends ModuleBase {
       baseIn ? poolInfo.mintB.symbol : poolInfo.mintA.symbol,
       "slippage:",
       `${slippage.toSignificant()}%`,
+      "baseReserve",
+      baseReserve.toString(),
+      "quoteReserve",
+      quoteReserve.toString(),
     );
 
     // input is fixed
@@ -112,12 +116,11 @@ export default class LiquidityModule extends ModuleBase {
           : divCeil(inputAmount.mul(baseReserve), quoteReserve);
     }
 
-    const liquidity = divCeil(
-      inputAmount.mul(lpAmount),
-      new BN(input === "base" ? poolInfo.mintAmountA : poolInfo.mintAmountB).mul(
-        new BN(10).pow(new BN(poolInfo[input === "base" ? "mintA" : "mintB"].decimals)),
-      ),
-    );
+    this.logDebug("amountRaw:", amountRaw.toString(), "lpAmount:", lpAmount.toString());
+
+    const liquidity = divCeil(inputAmount.mul(lpAmount), input === "base" ? baseReserve : quoteReserve);
+
+    this.logDebug("liquidity:", liquidity.toString());
 
     const _slippage = new Percent(new BN(1)).add(slippage);
     const slippageAdjustedAmount = _slippage.mul(amountRaw).quotient;