@raydium-io/raydium-sdk-v2 0.1.6-alpha → 0.1.7-alpha

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

@@ -1,4 +1,4 @@
-import { bz as TokenInfo } from '../../type-9fe71e3c.js';
+import { bz as TokenInfo } from '../../type-bdbaf9b2.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-9fe71e3c.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-bdbaf9b2.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-9fe71e3c.js';
-export { j as default } from '../../raydium-4f9e818a.js';
+import '../../type-bdbaf9b2.js';
+export { j as default } from '../../raydium-6c4df6ad.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -21,7 +21,7 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-389634c9.js';
+import '../../type-68b778f2.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-9fe71e3c.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-bdbaf9b2.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-9fe71e3c.js';
+import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-bdbaf9b2.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-9fe71e3c.js';
+import '../../type-bdbaf9b2.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-389634c9.js';
+import '../../type-68b778f2.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-9fe71e3c.js';
+import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-bdbaf9b2.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-389634c9.js';
+import '../../type-68b778f2.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-4f9e818a.js';
+export { i as default } from '../../raydium-6c4df6ad.js';
 import './type.js';
-import '../../type-9fe71e3c.js';
+import '../../type-bdbaf9b2.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
@@ -22,7 +22,7 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-389634c9.js';
+import '../../type-68b778f2.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-9fe71e3c.js';
+import { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-bdbaf9b2.js';
 import { Token } from '../../module/token.js';
-import { c as ClmmPoolInfo } from '../../type-389634c9.js';
+import { c as ClmmPoolInfo } from '../../type-68b778f2.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-9fe71e3c.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-bdbaf9b2.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-4f9e818a.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-6c4df6ad.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-9fe71e3c.js';
+import '../../type-bdbaf9b2.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -21,7 +21,7 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-389634c9.js';
+import '../../type-68b778f2.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-4f9e818a.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-6c4df6ad.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-9fe71e3c.js';
+import '../../type-bdbaf9b2.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';
@@ -21,7 +21,7 @@ import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
-import '../../type-389634c9.js';
+import '../../type-68b778f2.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-4f9e818a.d.ts → raydium-6c4df6ad.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-9fe71e3c.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-bdbaf9b2.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 BN__default from 'bn.js';
 import Decimal from 'decimal.js';
 import { AddLiquidityParams, RemoveParams, CreatePoolParam, CreatePoolAddress, ComputeAmountOutParam, SwapParam } from './raydium/liquidity/type.js';
 import { liquidityStateV4Layout } from './raydium/liquidity/layout.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-389634c9.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-68b778f2.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';
@@ -348,8 +348,8 @@ declare class Utils1216 extends ModuleBase {
         debtAmount: BN__default;
         claimedAmount: BN__default;
     }[], "", {
-        padding: BN__default[];
         owner: PublicKey;
+        padding: BN__default[];
         version: number;
         bump: number;
         poolId: PublicKey;

package/lib/{type-389634c9.d.ts → type-68b778f2.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-9fe71e3c.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-bdbaf9b2.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { ClmmPositionLayout } from './raydium/clmm/layout.js';
 

package/lib/{type-9fe71e3c.d.ts → type-bdbaf9b2.d.ts}

@@ -850,38 +850,38 @@ declare type FarmStateV6 = GetStructureSchema<FarmStateLayoutV6>;
 declare type FarmState = FarmStateV3 | FarmStateV5 | FarmStateV6;
 declare type FarmStateLayout = FarmStateLayoutV3 | FarmStateLayoutV5 | FarmStateLayoutV6;
 declare const farmLedgerLayoutV3_1: Structure<PublicKey | BN__default | BN__default[], "", {
+    owner: PublicKey;
     state: BN__default;
     id: PublicKey;
-    owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
 declare const farmLedgerLayoutV3_2: Structure<PublicKey | BN__default | BN__default[], "", {
+    owner: PublicKey;
     state: BN__default;
     id: PublicKey;
-    owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
     voteLockedBalance: BN__default;
 }>;
 declare const farmLedgerLayoutV5_1: Structure<PublicKey | BN__default | BN__default[], "", {
+    owner: PublicKey;
     state: BN__default;
     id: PublicKey;
-    owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
 declare const farmLedgerLayoutV5_2: Structure<PublicKey | BN__default | BN__default[], "", {
+    owner: PublicKey;
     state: BN__default;
     id: PublicKey;
-    owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
 declare const farmLedgerLayoutV6_1: Structure<PublicKey | BN__default | BN__default[], "", {
+    owner: PublicKey;
     state: BN__default;
     id: PublicKey;
-    owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
@@ -911,7 +911,7 @@ declare const VoterVotingMintConfig: Structure<PublicKey | number[] | BN__defaul
     reserved1: number[];
     reserved2: BN__default[];
 }>;
-declare const VoterRegistrar: Structure<number | PublicKey | number[] | Buffer | BN__default | BN__default[] | {
+declare const VoterRegistrar: Structure<number | PublicKey | Buffer | number[] | BN__default | BN__default[] | {
     mint: PublicKey;
     grantAuthority: PublicKey;
     baselineVoteWeightScaledFactor: BN__default;
@@ -966,7 +966,7 @@ declare const VoterDepositEntry: Structure<number | boolean | number[] | BN__def
     allowClawback: boolean;
     votingMintConfigIdx: number;
 }>;
-declare const Voter: Structure<number | PublicKey | number[] | Buffer | {
+declare const Voter: Structure<number | PublicKey | Buffer | number[] | {
     reserved: number[];
     lockup: {
         startTime: BN__default;

package/package.json

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

package/src/raydium/cpmm/cpmm.ts

@@ -481,7 +481,7 @@ export default class CpmmModule extends ModuleBase {
   }
 
   public async swap<T extends TxVersion>(params: CpmmSwapParams): Promise<MakeTxData<T>> {
-    const { poolInfo, baseIn, swapResult, config, computeBudgetConfig, txVersion } = params;
+    const { poolInfo, baseIn, swapResult, slippage = 0, config, computeBudgetConfig, txVersion } = params;
 
     const { bypassAssociatedCheck, checkCreateATAOwner } = {
       // default
@@ -506,9 +506,14 @@ export default class CpmmModule extends ModuleBase {
       associatedOnly: false,
     });
 
+    swapResult.destinationAmountSwapped = swapResult.destinationAmountSwapped
+      .mul(new BN((1 - slippage) * 10000))
+      .div(new BN(10000));
+
     const { tokenAccount: _mintATokenAcc, ...mintATokenAccInstruction } = await this.scope.account.handleTokenAccount({
       side: baseIn ? "in" : "out",
       amount: baseIn ? swapResult.sourceAmountSwapped : swapResult.destinationAmountSwapped,
+      programId: new PublicKey(poolInfo.mintA.programId),
       mint: mintA,
       tokenAccount: mintATokenAcc,
       bypassAssociatedCheck,
@@ -519,6 +524,7 @@ export default class CpmmModule extends ModuleBase {
     const { tokenAccount: _mintBTokenAcc, ...mintBTokenAccInstruction } = await this.scope.account.handleTokenAccount({
       side: baseIn ? "out" : "in",
       amount: baseIn ? swapResult.destinationAmountSwapped : swapResult.sourceAmountSwapped,
+      programId: new PublicKey(poolInfo.mintB.programId),
       mint: mintB,
       tokenAccount: mintBTokenAcc,
       bypassAssociatedCheck,

package/src/raydium/cpmm/type.ts

@@ -117,6 +117,7 @@ export interface CpmmSwapParams<T = TxVersion.LEGACY> {
   poolInfo: ApiV3PoolInfoStandardItemCpmm;
   payer?: PublicKey;
   baseIn: boolean;
+  slippage?: number;
   swapResult: SwapResult;
 
   config?: {