@raydium-io/raydium-sdk-v2 0.1.95-alpha → 0.1.96-alpha

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

@@ -1,4 +1,4 @@
-import { bE as TokenInfo } from '../../api-0eb57ba2.js';
+import { bE as TokenInfo } from '../../api-153bc957.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 { bH as LpToken, bG as SplToken, bE as TokenInfo, bF as TokenJson } from '../../api-0eb57ba2.js';
+export { bH as LpToken, bG as SplToken, bE as TokenInfo, bF as TokenJson } from '../../api-153bc957.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-0eb57ba2.js';
-export { k as default } from '../../raydium-2dba5baa.js';
+import '../../api-153bc957.js';
+export { k as default } from '../../raydium-77fc4407.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-28a58c39.js';
+import '../../type-953d8113.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';
 import '../cpmm/layout.js';

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

@@ -1,4 +1,4 @@
-export { bH as LpToken, bG as SplToken, bE as TokenInfo, bF as TokenJson } from '../../api-0eb57ba2.js';
+export { bH as LpToken, bG as SplToken, bE as TokenInfo, bF as TokenJson } from '../../api-153bc957.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 { bE as TokenInfo, ad as BigNumberish, c7 as TokenAmount, i as ApiV3Token } from '../../api-0eb57ba2.js';
+import { bE as TokenInfo, ad as BigNumberish, c7 as TokenAmount, i as ApiV3Token } from '../../api-153bc957.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-0eb57ba2.js';
+import '../../api-153bc957.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-28a58c39.js';
+import '../../type-953d8113.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 { r as ApiV3PoolInfoItem, D as PoolKeys } from '../../api-0eb57ba2.js';
+import { r as ApiV3PoolInfoItem, D as PoolKeys } from '../../api-153bc957.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-28a58c39.js';
+import '../../type-953d8113.js';
 import '../clmm/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';

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

@@ -1,9 +1,9 @@
 import '@solana/web3.js';
 import 'bn.js';
-import '../../api-0eb57ba2.js';
+import '../../api-153bc957.js';
 import '../../common/txTool/txType.js';
-export { j as default } from '../../raydium-2dba5baa.js';
-import '../../type-28a58c39.js';
+export { j as default } from '../../raydium-77fc4407.js';
+import '../../type-953d8113.js';
 import '../liquidity/type.js';
 import '../cpmm/type.js';
 import './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 { bQ as TransferAmountFee, c7 as TokenAmount, D as PoolKeys, r as ApiV3PoolInfoItem } from '../../api-0eb57ba2.js';
+import { bQ as TransferAmountFee, c7 as TokenAmount, D as PoolKeys, r as ApiV3PoolInfoItem } from '../../api-153bc957.js';
 import { Token } from '../../module/token.js';
-import { d as ComputeClmmPoolInfo } from '../../type-28a58c39.js';
+import { d as ComputeClmmPoolInfo } from '../../type-953d8113.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 { bY as ArrayItem, bO as ComputeBudgetConfig, c3 as Cover, bZ as ExactPartial, b_ as ExactRequired, c2 as Fallback, bR as GetTransferAmountFee, c0 as GetValue, bN as InstructionReturn, bP as LoadParams, bM as MakeMultiTransaction, bK as MakeTransaction, bL as MakeV0Transaction, bV as MayArray, bW as MayDeepArray, bX as MayFunction, bU as ReplaceType, bS as ReturnTypeFetchMultipleMintInfo, bT as ReturnTypeFetchMultipleMintInfos, bI as ReturnTypeMakeInstructions, b$ as SKeyof, c1 as SOR, bJ as SignAllTransactions, bQ as TransferAmountFee, c4 as UnionCover, c5 as unionArr } from '../api-0eb57ba2.js';
+export { bY as ArrayItem, bO as ComputeBudgetConfig, c3 as Cover, bZ as ExactPartial, b_ as ExactRequired, c2 as Fallback, bR as GetTransferAmountFee, c0 as GetValue, bN as InstructionReturn, bP as LoadParams, bM as MakeMultiTransaction, bK as MakeTransaction, bL as MakeV0Transaction, bV as MayArray, bW as MayDeepArray, bX as MayFunction, bU as ReplaceType, bS as ReturnTypeFetchMultipleMintInfo, bT as ReturnTypeFetchMultipleMintInfos, bI as ReturnTypeMakeInstructions, b$ as SKeyof, c1 as SOR, bJ as SignAllTransactions, bQ as TransferAmountFee, c4 as UnionCover, c5 as unionArr } from '../api-153bc957.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-2dba5baa.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-77fc4407.js';
 import '@solana/web3.js';
-import '../../api-0eb57ba2.js';
+import '../../api-153bc957.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-28a58c39.js';
+import '../../type-953d8113.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.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-2dba5baa.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-77fc4407.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../api-0eb57ba2.js';
+import '../../api-153bc957.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-28a58c39.js';
+import '../../type-953d8113.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';
 import '../cpmm/layout.js';

package/lib/{raydium-2dba5baa.d.ts → raydium-77fc4407.d.ts}

@@ -1,5 +1,5 @@
 import { PublicKey, Commitment, EpochInfo, Connection, Transaction, Signer, TransactionInstruction, Keypair } from '@solana/web3.js';
-import { aC as TxBuilder, au as AddInstructionParam, ad as BigNumberish, bp as CreateFarm, aB as MakeTxData, bq as CreateFarmExtInfo, br as UpdateFarmReward, bs as UpdateFarmRewards, bt as FarmDWParam, Z as FormatFarmInfoOut, bO as ComputeBudgetConfig, aA as MakeMultiTxData, p as ApiV3PoolInfoStandardItem, cb as Percent, c7 as TokenAmount, w as AmmV4Keys, x as AmmV5Keys, o as ApiV3PoolInfoConcentratedItem, Y as FormatFarmInfoOutV6, B as ClmmKeys, bK as MakeTransaction, bT as ReturnTypeFetchMultipleMintInfos, y as CpmmKeys, q as ApiV3PoolInfoStandardItemCpmm, bR as GetTransferAmountFee, D as PoolKeys, i as ApiV3Token, a0 as OwnerIdoInfo, a1 as IdoKeysData, bP as LoadParams, J as JupTokenType, bE as TokenInfo, bJ as SignAllTransactions, a as Api, _ as AvailabilityCheckAPI3, j as ApiV3TokenRes } from './api-0eb57ba2.js';
+import { aC as TxBuilder, au as AddInstructionParam, ad as BigNumberish, bp as CreateFarm, aB as MakeTxData, bq as CreateFarmExtInfo, br as UpdateFarmReward, bs as UpdateFarmRewards, bt as FarmDWParam, Z as FormatFarmInfoOut, bO as ComputeBudgetConfig, aA as MakeMultiTxData, p as ApiV3PoolInfoStandardItem, cb as Percent, c7 as TokenAmount, w as AmmV4Keys, x as AmmV5Keys, o as ApiV3PoolInfoConcentratedItem, Y as FormatFarmInfoOutV6, B as ClmmKeys, bK as MakeTransaction, bT as ReturnTypeFetchMultipleMintInfos, y as CpmmKeys, q as ApiV3PoolInfoStandardItemCpmm, bR as GetTransferAmountFee, D as PoolKeys, i as ApiV3Token, a0 as OwnerIdoInfo, a1 as IdoKeysData, bP as LoadParams, J as JupTokenType, bE as TokenInfo, bJ as SignAllTransactions, a as Api, _ as AvailabilityCheckAPI3, j as ApiV3TokenRes } from './api-153bc957.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, PoolInfoLayout } from './raydium/clmm/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, L as LockPosition, J as ClmmLockAddress, H as HarvestLockPosition, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, y as HarvestAllRewardsParams, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-28a58c39.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, L as LockPosition, J as ClmmLockAddress, H as HarvestLockPosition, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, y as HarvestAllRewardsParams, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-953d8113.js';
 import { CpmmRpcData, CpmmComputeData, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, LockCpmmLpParams, CpmmLockExtInfo, HarvestLockCpmmLpParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { ComputeAmountOutLayout, BasicPoolInfo, ReturnTypeGetAllRoute, ComputeRoutePathType, ComputePoolType, ReturnTypeFetchMultipleInfo } from './raydium/tradeV2/type.js';
 import { Structure } from './marshmallow/index.js';

package/lib/{type-28a58c39.d.ts → type-953d8113.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 { o as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, i as ApiV3Token, bR as GetTransferAmountFee, bQ as TransferAmountFee, cc as Price, cb as Percent, c7 as TokenAmount, bO as ComputeBudgetConfig, c9 as Fraction, bE as TokenInfo, B as ClmmKeys } from './api-0eb57ba2.js';
+import { o as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, i as ApiV3Token, bR as GetTransferAmountFee, bQ as TransferAmountFee, cc as Price, cb as Percent, c7 as TokenAmount, bO as ComputeBudgetConfig, c9 as Fraction, bE as TokenInfo, B as ClmmKeys } from './api-153bc957.js';
 import { TxVersion } from './common/txTool/txType.js';
 import { PoolInfoLayout, ClmmPositionLayout, LockClPositionLayoutV2 } from './raydium/clmm/layout.js';
 

package/package.json

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

package/src/raydium/account/account.ts

@@ -212,6 +212,7 @@ export default class Account extends ModuleBase {
 
     if (associatedOnly) {
       const _createATAIns = createAssociatedTokenAccountInstruction(owner, ata, owner, mint, tokenProgram);
+      const _ataInTokenAcc = this.tokenAccountRawInfos.find((i) => i.pubkey.equals(ata))
       if (checkCreateATAOwner) {
         const ataInfo = await this.scope.connection.getAccountInfo(ata);
         if (ataInfo === null) {
@@ -226,7 +227,7 @@ export default class Account extends ModuleBase {
         } else {
           throw Error(`create ata check error -> mint: ${mint.toString()}, ata: ${ata.toString()}`);
         }
-      } else {
+      } else if (_ataInTokenAcc === undefined) {
         newTxInstructions.instructions!.push(_createATAIns);
         newTxInstructions.instructionTypes!.push(InstructionType.CreateATA);
       }
@@ -257,7 +258,7 @@ export default class Account extends ModuleBase {
         }
       }
 
-      if (!skipCloseAccount) {
+      if (!skipCloseAccount && _ataInTokenAcc === undefined) {
         newTxInstructions.endInstructions!.push(
           closeAccountInstruction({
             owner,