@raydium-io/raydium-sdk-v2 0.1.92-alpha → 0.1.94-alpha

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

@@ -1,9 +1,9 @@
 import { Structure } from '../../marshmallow/index.js';
-import * as BN from 'bn.js';
 import * as _solana_web3_js from '@solana/web3.js';
+import * as BN from 'bn.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<BN | Buffer | _solana_web3_js.PublicKey, "", {
     baseMint: _solana_web3_js.PublicKey;
     quoteMint: _solana_web3_js.PublicKey;
     ownAddress: _solana_web3_js.PublicKey;

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

@@ -1,4 +1,4 @@
-import { bE as TokenInfo } from '../../api-9d98bd04.js';
+import { bE as TokenInfo } from '../../api-c8ce9f12.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-9d98bd04.js';
+export { bH as LpToken, bG as SplToken, bE as TokenInfo, bF as TokenJson } from '../../api-c8ce9f12.js';
 export { parseTokenInfo, solToWSolToken, toApiV3Token, toFeeConfig, toToken, toTokenAmount, toTokenInfo, wSolToSolToken } from './utils.js';
 import 'axios';
 import '../../solana/type.js';

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

@@ -1,9 +1,9 @@
 import { Structure } from '../../marshmallow/index.js';
-import * as BN from 'bn.js';
 import * as _solana_web3_js from '@solana/web3.js';
+import * as BN from 'bn.js';
 import '../../marshmallow/buffer-layout.js';
 
-declare const SPL_MINT_LAYOUT: Structure<number | _solana_web3_js.PublicKey | BN, "", {
+declare const SPL_MINT_LAYOUT: Structure<number | BN | _solana_web3_js.PublicKey, "", {
     decimals: number;
     freezeAuthority: _solana_web3_js.PublicKey;
     mintAuthority: _solana_web3_js.PublicKey;

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

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
-import '../../api-9d98bd04.js';
-export { k as default } from '../../raydium-cfb7854f.js';
+import '../../api-c8ce9f12.js';
+export { k as default } from '../../raydium-7bc83789.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-351304d7.js';
+import '../../type-2c421f5d.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-9d98bd04.js';
+export { bH as LpToken, bG as SplToken, bE as TokenInfo, bF as TokenJson } from '../../api-c8ce9f12.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-9d98bd04.js';
+import { bE as TokenInfo, ad as BigNumberish, c7 as TokenAmount, i as ApiV3Token } from '../../api-c8ce9f12.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-9d98bd04.js';
+import '../../api-c8ce9f12.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-351304d7.js';
+import '../../type-2c421f5d.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-9d98bd04.js';
+import { r as ApiV3PoolInfoItem, D as PoolKeys } from '../../api-c8ce9f12.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-351304d7.js';
+import '../../type-2c421f5d.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-9d98bd04.js';
+import '../../api-c8ce9f12.js';
 import '../../common/txTool/txType.js';
-export { j as default } from '../../raydium-cfb7854f.js';
-import '../../type-351304d7.js';
+export { j as default } from '../../raydium-7bc83789.js';
+import '../../type-2c421f5d.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-9d98bd04.js';
+import { bQ as TransferAmountFee, c7 as TokenAmount, D as PoolKeys, r as ApiV3PoolInfoItem } from '../../api-c8ce9f12.js';
 import { Token } from '../../module/token.js';
-import { d as ComputeClmmPoolInfo } from '../../type-351304d7.js';
+import { d as ComputeClmmPoolInfo } from '../../type-2c421f5d.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-9d98bd04.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-c8ce9f12.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-cfb7854f.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-7bc83789.js';
 import '@solana/web3.js';
-import '../../api-9d98bd04.js';
+import '../../api-c8ce9f12.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-351304d7.js';
+import '../../type-2c421f5d.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-cfb7854f.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-7bc83789.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../api-9d98bd04.js';
+import '../../api-c8ce9f12.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-351304d7.js';
+import '../../type-2c421f5d.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';
 import '../cpmm/layout.js';

package/lib/{raydium-cfb7854f.d.ts → raydium-7bc83789.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-9d98bd04.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-c8ce9f12.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-351304d7.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-2c421f5d.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';
@@ -61,6 +61,7 @@ declare class Account extends ModuleBase {
         tokenAccounts: TokenAccount[];
         tokenAccountRawInfos: TokenAccountRaw[];
     }>;
+    clearAccountChangeCkb(): void;
     getCreatedTokenAccount({ mint, programId, associatedOnly, }: {
         mint: PublicKey;
         programId?: PublicKey;
@@ -491,7 +492,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 | BN__default | Buffer | PublicKey | BN__default[] | {
         mintDecimals: number;
         mintAddress: PublicKey;
         mintVault: PublicKey;
@@ -512,13 +513,13 @@ declare class Utils1216 extends ModuleBase {
             totalClaimedAmount: BN__default;
         }[];
     }>;
-    static OWNER_LAYOUT: Structure<number | PublicKey | Buffer | BN__default | BN__default[] | {
+    static OWNER_LAYOUT: Structure<number | BN__default | Buffer | PublicKey | BN__default[] | {
         mintAddress: PublicKey;
         debtAmount: BN__default;
         claimedAmount: BN__default;
     }[], "", {
-        owner: PublicKey;
         padding: BN__default[];
+        owner: PublicKey;
         version: number;
         bump: number;
         poolId: PublicKey;

package/lib/{type-351304d7.d.ts → type-2c421f5d.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-9d98bd04.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-c8ce9f12.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.92-alpha",
+  "version": "0.1.94-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

@@ -37,7 +37,7 @@ export default class Account extends ModuleBase {
     const { tokenAccounts, tokenAccountRawInfos, notSubscribeAccountChange } = params;
     this._tokenAccounts = tokenAccounts || [];
     this._tokenAccountRawInfos = tokenAccountRawInfos || [];
-    this._notSubscribeAccountChange = notSubscribeAccountChange ?? false;
+    this._notSubscribeAccountChange = notSubscribeAccountChange ?? true;
     this._clientOwnedToken = !!(tokenAccounts || tokenAccountRawInfos);
   }
 
@@ -87,7 +87,9 @@ export default class Account extends ModuleBase {
   }> {
     if (
       this._clientOwnedToken ||
-      (!config?.forceUpdate && this._tokenAccounts.length && Date.now() - this._accountFetchTime < 1000 * 60 * 3)
+      (!config?.forceUpdate &&
+        this._tokenAccounts.length &&
+        Date.now() - this._accountFetchTime < (this._notSubscribeAccountChange ? 1000 * 5 : 1000 * 60 * 3))
     ) {
       return {
         tokenAccounts: this._tokenAccounts,
@@ -144,6 +146,11 @@ export default class Account extends ModuleBase {
     return { tokenAccounts, tokenAccountRawInfos };
   }
 
+  public clearAccountChangeCkb(): void {
+    if (this._accountChangeListenerId !== undefined)
+      this.scope.connection.removeAccountChangeListener(this._accountChangeListenerId);
+  }
+
   // user token account needed, old _selectTokenAccount
   public async getCreatedTokenAccount({
     mint,
@@ -264,22 +271,6 @@ export default class Account extends ModuleBase {
 
       return { account: ata, instructionParams: newTxInstructions };
     } else {
-      // if (mint.equals(WSOLMint)) {
-      //   const txInstruction = await createWSolAccountInstructions({
-      //     connection: this.scope.connection,
-      //     owner: this.scope.ownerPubKey,
-      //     payer: createInfo.payer || this.scope.ownerPubKey,
-      //     amount: createInfo.amount ?? 0,
-      //     skipCloseAccount,
-      //   });
-      //   newTxInstructions.instructions!.push(...(txInstruction.instructions || []));
-      //   newTxInstructions.endInstructions!.push(...(txInstruction.endInstructions || []));
-      //   newTxInstructions.signers!.push(...(txInstruction.signers || []));
-      //   newTxInstructions.instructionTypes!.push(...(txInstruction.instructionTypes || []));
-      //   newTxInstructions.endInstructionTypes!.push(...(txInstruction.endInstructionTypes || []));
-
-      //   return { account: txInstruction.addresses.newAccount, instructionParams: newTxInstructions };
-      // } else {
       const newTokenAccount = generatePubKey({ fromPublicKey: owner, programId: tokenProgram, assignSeed });
       const balanceNeeded = await this.scope.connection.getMinimumBalanceForRentExemption(AccountLayout.span);
 

package/src/raydium/farm/farm.ts

@@ -585,7 +585,7 @@ export default class Farm extends ModuleBase {
       }
     }
 
-    if (!deposited && version !== 4) {
+    if (version !== 4) {
       const ledger = getAssociatedLedgerAccount({
         programId: new PublicKey(farmInfo.programId),
         poolId: new PublicKey(farmInfo.id),
@@ -593,9 +593,10 @@ export default class Farm extends ModuleBase {
         version,
       });
       const ledgerData = await this.scope.connection.getAccountInfo(ledger);
+
       if (!ledgerData) {
-        // user has old not ata farm vault and don't have ata vault
-        if (version !== 6 && (userAuxiliaryLedgers || []).length > 0) {
+        // user has old none ata farm vault and don't have ata vault
+        if (version !== 6) {
           const { instruction, instructionType } = createAssociatedLedgerAccountInstruction({
             id: new PublicKey(farmKeys.id),
             programId: new PublicKey(farmKeys.programId),
@@ -604,18 +605,49 @@ export default class Farm extends ModuleBase {
             owner: this.scope.ownerPubKey,
           });
           txBuilder.addInstruction({ instructions: [instruction], instructionTypes: [instructionType] });
-        } else {
-          this.logAndCreateError("no lp data", { farmId: farmInfo.id, version, ledgerData });
         }
       } else {
         const ledgerLayout = getFarmLedgerLayout(version)!;
         const ledgerInfo = ledgerLayout.decode(ledgerData!.data);
         if (ledgerInfo.deposited.isZero()) this.logAndCreateError("no deposited lp", { farmId: farmInfo.id });
       }
-    } else if (deposited) {
-      if (deposited.isZero()) this.logAndCreateError("no deposited lp", { farmId: farmInfo.id });
     }
 
+    if (deposited && deposited.isZero() && !(userAuxiliaryLedgers || []).length)
+      this.logAndCreateError("no deposited lp", { farmId: farmInfo.id });
+
+    // if (!deposited && version !== 4) {
+    // const ledger = getAssociatedLedgerAccount({
+    //   programId: new PublicKey(farmInfo.programId),
+    //   poolId: new PublicKey(farmInfo.id),
+    //   owner: this.scope.ownerPubKey,
+    //   version,
+    // });
+    // const ledgerData = await this.scope.connection.getAccountInfo(ledger);
+    // if (!ledgerData) {
+    // user has old not ata farm vault and don't have ata vault
+    // if (version !== 6 && (userAuxiliaryLedgers || []).length > 0) {
+    //   const { instruction, instructionType } = createAssociatedLedgerAccountInstruction({
+    //     id: new PublicKey(farmKeys.id),
+    //     programId: new PublicKey(farmKeys.programId),
+    //     version,
+    //     ledger,
+    //     owner: this.scope.ownerPubKey,
+    //   });
+    //   txBuilder.addInstruction({ instructions: [instruction], instructionTypes: [instructionType] });
+    // } else {
+    //   this.logAndCreateError("no lp data", { farmId: farmInfo.id, version, ledgerData });
+    // }
+    // } else {
+    //   const ledgerLayout = getFarmLedgerLayout(version)!;
+    //   const ledgerInfo = ledgerLayout.decode(ledgerData!.data);
+    //   if (ledgerInfo.deposited.isZero()) this.logAndCreateError("no deposited lp", { farmId: farmInfo.id });
+    // }
+    // } else if (deposited) {
+    //   if (deposited.isZero() && !(userAuxiliaryLedgers || []).length)
+    //     this.logAndCreateError("no deposited lp", { farmId: farmInfo.id });
+    // }
+
     const lpMint = farmKeys.lpMint.address;
     const lpMintUseSOLBalance = useSOLBalance && lpMint === WSOLMint.toString();
 
@@ -687,10 +719,10 @@ export default class Farm extends ModuleBase {
       version === 6
         ? makeWithdrawInstructionV6(insParams)
         : version === 5
-          ? makeWithdrawInstructionV5(insParams)
-          : version === 4
-            ? makeWithdrawInstructionV4(insParams)
-            : makeWithdrawInstructionV3(insParams);
+        ? makeWithdrawInstructionV5(insParams)
+        : version === 4
+        ? makeWithdrawInstructionV4(insParams)
+        : makeWithdrawInstructionV3(insParams);
 
     const insType = {
       3: InstructionType.FarmV3Withdraw,