@raydium-io/raydium-sdk-v2 0.0.32-alpha → 0.0.33-alpha

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

@@ -1,4 +1,4 @@
-import { bz as TokenInfo } from '../../type-322fdce2.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 { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-322fdce2.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-322fdce2.js';
-export { j as default } from '../../raydium-03e9d402.js';
+import '../../type-83523f5f.js';
+export { j as default } from '../../raydium-c9712b11.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-5c2ec3f0.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 { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-322fdce2.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 { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-322fdce2.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-322fdce2.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-5c2ec3f0.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-322fdce2.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-5c2ec3f0.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-03e9d402.js';
+export { i as default } from '../../raydium-c9712b11.js';
 import './type.js';
-import '../../type-322fdce2.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-5c2ec3f0.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 { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-322fdce2.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-5c2ec3f0.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 { 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-322fdce2.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-03e9d402.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-c9712b11.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-322fdce2.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-5c2ec3f0.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-03e9d402.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-c9712b11.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-322fdce2.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-5c2ec3f0.js';
+import '../../type-6fd96950.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-03e9d402.d.ts → raydium-c9712b11.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-322fdce2.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-83523f5f.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-5c2ec3f0.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 { CpmmConfigInfoInterface, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { CpmmPoolInfoLayout } from './raydium/cpmm/layout.js';
@@ -291,11 +291,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-5c2ec3f0.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, 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-322fdce2.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-322fdce2.d.ts → type-83523f5f.d.ts}

@@ -843,37 +843,37 @@ 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[], "", {
-    id: PublicKey;
     state: BN__default;
+    id: PublicKey;
     owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
 declare const farmLedgerLayoutV3_2: Structure<PublicKey | BN__default | BN__default[], "", {
-    id: 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[], "", {
-    id: PublicKey;
     state: BN__default;
+    id: PublicKey;
     owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
 declare const farmLedgerLayoutV5_2: Structure<PublicKey | BN__default | BN__default[], "", {
-    id: PublicKey;
     state: BN__default;
+    id: PublicKey;
     owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
 }>;
 declare const farmLedgerLayoutV6_1: Structure<PublicKey | BN__default | BN__default[], "", {
-    id: PublicKey;
     state: BN__default;
+    id: PublicKey;
     owner: PublicKey;
     deposited: BN__default;
     rewardDebts: BN__default[];
@@ -894,7 +894,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;
@@ -904,7 +904,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 | PublicKey | number[] | Buffer | BN__default | BN__default[] | {
     mint: PublicKey;
     grantAuthority: PublicKey;
     baselineVoteWeightScaledFactor: BN__default;
@@ -959,7 +959,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 | PublicKey | number[] | Buffer | {
     reserved: number[];
     lockup: {
         startTime: BN__default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydium-io/raydium-sdk-v2",
-  "version": "0.0.32-alpha",
+  "version": "0.0.33-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

@@ -337,6 +337,13 @@ export default class CpmmModule extends ModuleBase {
       _slippage.mul(lpAmount.mul(rpcPoolData.baseReserve).div(rpcPoolData.lpAmount)).quotient,
       _slippage.mul(lpAmount.mul(rpcPoolData.quoteReserve).div(rpcPoolData.lpAmount)).quotient,
     ];
+
+    const epochInfo = await this.scope.fetchEpochInfo();
+    const [mintAAmountFee, mintBAmountFee] = [
+      getTransferAmountFeeV2(amountMintA, poolInfo.mintA.extensions.feeConfig, epochInfo, true),
+      getTransferAmountFeeV2(amountMintB, poolInfo.mintB.extensions.feeConfig, epochInfo, true),
+    ];
+
     const { account } = this.scope;
     const txBuilder = this.createTxBuilder();
     const [mintA, mintB] = [new PublicKey(poolInfo.mintA.address), new PublicKey(poolInfo.mintB.address)];
@@ -407,8 +414,8 @@ export default class CpmmModule extends ModuleBase {
           new PublicKey(poolInfo.lpMint.address),
 
           lpAmount,
-          amountMintA,
-          amountMintB,
+          amountMintA.sub(mintAAmountFee.fee ?? new BN(0)),
+          amountMintB.sub(mintBAmountFee.fee ?? new BN(0)),
         ),
       ],
       instructionTypes: [InstructionType.CpmmWithdrawLiquidity],