@raydium-io/raydium-sdk-v2 0.1.22-alpha → 0.1.23-alpha

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

@@ -3,7 +3,7 @@ import * as BN from 'bn.js';
 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, "", {
+declare const MARKET_STATE_LAYOUT_V3: Structure<Buffer | _solana_web3_js.PublicKey | BN, "", {
     baseMint: _solana_web3_js.PublicKey;
     quoteMint: _solana_web3_js.PublicKey;
     baseLotSize: BN;

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

@@ -1,4 +1,4 @@
-import { bz as TokenInfo } from '../../type-c00e03bd.js';
+import { bz as TokenInfo } from '../../type-00b215cb.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-c00e03bd.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-00b215cb.js';
 export { parseTokenInfo, solToWSolToken, toApiV3Token, toFeeConfig, 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-c00e03bd.js';
-export { j as default } from '../../raydium-c9108dcc.js';
+import '../../type-00b215cb.js';
+export { j as default } from '../../raydium-276d396e.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -21,7 +21,8 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-0d4eb827.js';
+import '../liquidity/stable.js';
+import '../../type-25c99d71.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-c00e03bd.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-00b215cb.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, TransferFeeConfig } from '@solana/spl-token';
-import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-c00e03bd.js';
+import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-00b215cb.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 { 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 '../../type-c00e03bd.js';
+import '../../type-00b215cb.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
 import '../../common/txTool/txType.js';
@@ -17,7 +17,7 @@ import '../../common/logger.js';
 import '../../module/currency.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-0d4eb827.js';
+import '../../type-25c99d71.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.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-c00e03bd.js';
+import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-00b215cb.js';
 import { ComputePoolType, MakeSwapInstructionParam, ReturnTypeMakeSwapInstruction } from './type.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -16,7 +16,7 @@ import '../../common/logger.js';
 import '../../module/currency.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-0d4eb827.js';
+import '../../type-25c99d71.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

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

@@ -1,10 +1,10 @@
 import '@solana/web3.js';
 import '../../common/txTool/txType.js';
-import '../../type-c00e03bd.js';
-export { i as default } from '../../raydium-c9108dcc.js';
+import '../../type-00b215cb.js';
+export { i as default } from '../../raydium-276d396e.js';
 import 'bn.js';
 import '../liquidity/type.js';
-import '../../type-0d4eb827.js';
+import '../../type-25c99d71.js';
 import './type.js';
 import '../cpmm/type.js';
 import '@solana/spl-token';
@@ -23,6 +23,7 @@ import 'axios';
 import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
+import '../liquidity/stable.js';
 import '../clmm/layout.js';
 import '../liquidity/layout.js';
 import '../cpmm/curve/calculator.js';

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

@@ -1,10 +1,10 @@
 import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from '@solana/web3.js';
 import BN__default from 'bn.js';
-import { bK as TransferAmountFee, c1 as TokenAmount, w as PoolKeys, n as ApiV3PoolInfoItem } from '../../type-c00e03bd.js';
+import { bK as TransferAmountFee, c1 as TokenAmount, w as PoolKeys, n as ApiV3PoolInfoItem } from '../../type-00b215cb.js';
 import Decimal from 'decimal.js';
 import { Token } from '../../module/token.js';
 import { ComputeAmountOutParam } from '../liquidity/type.js';
-import { d as ComputeClmmPoolInfo } from '../../type-0d4eb827.js';
+import { d as ComputeClmmPoolInfo } from '../../type-25c99d71.js';
 import { CpmmComputeData } from '../cpmm/type.js';
 import '@solana/spl-token';
 import '../../solana/type.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-c00e03bd.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-00b215cb.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-c9108dcc.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-276d396e.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-c00e03bd.js';
+import '../../type-00b215cb.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -21,7 +21,8 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-0d4eb827.js';
+import '../liquidity/stable.js';
+import '../../type-25c99d71.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-c9108dcc.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-276d396e.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-c00e03bd.js';
+import '../../type-00b215cb.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';
@@ -21,7 +21,8 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-0d4eb827.js';
+import '../liquidity/stable.js';
+import '../../type-25c99d71.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-c9108dcc.d.ts → raydium-276d396e.d.ts}

@@ -1,6 +1,6 @@
 import { PublicKey, Commitment, EpochInfo, Connection, Transaction, Signer, TransactionInstruction, Keypair } 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, bN as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, bL as GetTransferAmountFee, w as PoolKeys, e as ApiV3Token, X as OwnerIdoInfo, Y as IdoKeysData, bJ as LoadParams, J as JupTokenType, bz as TokenInfo, bD as SignAllTransactions, V as AvailabilityCheckAPI3, f as ApiV3TokenRes } from './type-c00e03bd.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, bN as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, bL as GetTransferAmountFee, w as PoolKeys, e as ApiV3Token, X as OwnerIdoInfo, Y as IdoKeysData, bJ as LoadParams, J as JupTokenType, bz as TokenInfo, bD as SignAllTransactions, V as AvailabilityCheckAPI3, f as ApiV3TokenRes } from './type-00b215cb.js';
 import { API_URL_CONFIG } from './api/url.js';
 import { Owner } from './common/owner.js';
 import { Cluster } from './solana/type.js';
@@ -10,7 +10,8 @@ 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, AmmRpcData } 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, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-0d4eb827.js';
+import { StableLayout } from './raydium/liquidity/stable.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, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-25c99d71.js';
 import { ClmmPositionLayout, PositionInfoLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 import { CpmmRpcData, CpmmComputeData, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { ComputeAmountOutLayout, BasicPoolInfo, ReturnTypeGetAllRoute, ComputeRoutePathType, ComputePoolType, ReturnTypeFetchMultipleInfo } from './raydium/tradeV2/type.js';
@@ -115,7 +116,7 @@ declare class Farm extends ModuleBase {
 }
 
 declare class LiquidityModule extends ModuleBase {
-    private stableLayout;
+    stableLayout: StableLayout;
     constructor(params: ModuleBaseProps);
     initLayout(): Promise<void>;
     load(): Promise<void>;
@@ -167,7 +168,7 @@ declare class LiquidityModule extends ModuleBase {
         priceImpact: Decimal;
         fee: BN__default;
     };
-    swap<T extends TxVersion>({ poolInfo, amountIn, amountOut, inputMint, fixedSide, txVersion, computeBudgetConfig, }: SwapParam<T>): Promise<MakeTxData<T>>;
+    swap<T extends TxVersion>({ poolInfo, poolKeys: propPoolKeys, amountIn, amountOut, inputMint, fixedSide, txVersion, computeBudgetConfig, }: SwapParam<T>): Promise<MakeTxData<T>>;
     getRpcPoolInfo(poolId: string): Promise<AmmRpcData>;
     getRpcPoolInfos(poolIds: (string | PublicKey)[], config?: {
         batchRequest?: boolean;
@@ -391,7 +392,7 @@ interface SHOW_INFO {
 declare type canClaimErrorType = "outOfOperationalTime" | "alreadyClaimIt" | undefined;
 declare class Utils1216 extends ModuleBase {
     static CLAIMED_NUM: number;
-    static POOL_LAYOUT: Structure<number | PublicKey | Buffer | BN__default | BN__default[] | {
+    static POOL_LAYOUT: Structure<number | Buffer | PublicKey | BN__default | BN__default[] | {
         mintDecimals: number;
         mintAddress: PublicKey;
         mintVault: PublicKey;
@@ -412,7 +413,7 @@ declare class Utils1216 extends ModuleBase {
             totalClaimedAmount: BN__default;
         }[];
     }>;
-    static OWNER_LAYOUT: Structure<number | PublicKey | Buffer | BN__default | BN__default[] | {
+    static OWNER_LAYOUT: Structure<number | Buffer | PublicKey | BN__default | BN__default[] | {
         mintAddress: PublicKey;
         debtAmount: BN__default;
         claimedAmount: BN__default;

package/lib/{type-c00e03bd.d.ts → type-00b215cb.d.ts}

@@ -661,7 +661,7 @@ declare const realFarmStateV3Layout: Structure<PublicKey | BN__default, "", {
     lastSlot: BN__default;
     perSlotReward: BN__default;
 }>;
-declare const realFarmStateV5Layout: Structure<number | PublicKey | Buffer | BN__default, "", {
+declare const realFarmStateV5Layout: Structure<number | Buffer | PublicKey | BN__default, "", {
     state: BN__default;
     nonce: BN__default;
     lpVault: PublicKey;
@@ -905,7 +905,7 @@ declare const dwLayout: Structure<number | BN__default, "", {
     instruction: number;
     amount: BN__default;
 }>;
-declare const VoterVotingMintConfig: Structure<number[] | PublicKey | BN__default | BN__default[], "", {
+declare const VoterVotingMintConfig: Structure<PublicKey | number[] | BN__default | BN__default[], "", {
     mint: PublicKey;
     grantAuthority: PublicKey;
     baselineVoteWeightScaledFactor: BN__default;
@@ -915,7 +915,7 @@ declare const VoterVotingMintConfig: Structure<number[] | PublicKey | BN__defaul
     reserved1: number[];
     reserved2: BN__default[];
 }>;
-declare const VoterRegistrar: Structure<number | number[] | PublicKey | Buffer | BN__default | BN__default[] | {
+declare const VoterRegistrar: Structure<number | Buffer | PublicKey | number[] | BN__default | BN__default[] | {
     mint: PublicKey;
     grantAuthority: PublicKey;
     baselineVoteWeightScaledFactor: BN__default;
@@ -970,7 +970,7 @@ declare const VoterDepositEntry: Structure<number | boolean | number[] | BN__def
     allowClawback: boolean;
     votingMintConfigIdx: number;
 }>;
-declare const Voter: Structure<number | number[] | PublicKey | Buffer | {
+declare const Voter: Structure<number | Buffer | PublicKey | number[] | {
     reserved: number[];
     lockup: {
         startTime: BN__default;

package/lib/{type-0d4eb827.d.ts → type-25c99d71.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-c00e03bd.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-00b215cb.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { ClmmPositionLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 

package/package.json

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

package/src/raydium/liquidity/liquidity.ts

@@ -55,7 +55,7 @@ import BN from "bn.js";
 import Decimal from "decimal.js";
 
 export default class LiquidityModule extends ModuleBase {
-  private stableLayout: StableLayout;
+  public stableLayout: StableLayout;
 
   constructor(params: ModuleBaseProps) {
     super(params);
@@ -741,7 +741,7 @@ export default class LiquidityModule extends ModuleBase {
     }
 
     const [reserveIn, reserveOut] = reserves;
-    const isVersion4 = poolInfo.programId === AMM_V4.toBase58();
+    const isVersion4 = poolInfo.version === 4;
     let currentPrice: Decimal;
     if (isVersion4) {
       currentPrice = new Decimal(reserveOut.toString()).div(reserveIn.toString());
@@ -823,6 +823,7 @@ export default class LiquidityModule extends ModuleBase {
 
   public async swap<T extends TxVersion>({
     poolInfo,
+    poolKeys: propPoolKeys,
     amountIn,
     amountOut,
     inputMint,
@@ -865,7 +866,7 @@ export default class LiquidityModule extends ModuleBase {
     });
     txBuilder.addInstruction(accountOutIns);
 
-    const poolKeys = await this.getAmmPoolKeys(poolInfo.id);
+    const poolKeys = propPoolKeys || (await this.getAmmPoolKeys(poolInfo.id));
     let version = 4;
     if (poolInfo.pooltype.includes("StablePool")) version = 5;
 

package/src/raydium/liquidity/type.ts

@@ -202,6 +202,7 @@ export interface ComputeAmountOutParam {
 
 export interface SwapParam<T = TxVersion.LEGACY> {
   poolInfo: ApiV3PoolInfoStandardItem;
+  poolKeys?: AmmV4Keys | AmmV5Keys;
   associatedOnly: boolean;
   amountIn: BN;
   amountOut: BN;