@raydium-io/raydium-sdk-v2 0.1.29-alpha → 0.1.30-alpha

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

@@ -1,4 +1,4 @@
-import { bz as TokenInfo } from '../../type-60acc172.js';
+import { bz as TokenInfo } from '../../type-2596119f.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-60acc172.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-2596119f.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-60acc172.js';
-export { j as default } from '../../raydium-1e9cad89.js';
+import '../../type-2596119f.js';
+export { j as default } from '../../raydium-8871c9e8.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -22,7 +22,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-b95eb35d.js';
+import '../../type-0de39dab.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-60acc172.js';
+export { bC as LpToken, bB as SplToken, bz as TokenInfo, bA as TokenJson } from '../../type-2596119f.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-60acc172.js';
+import { bz as TokenInfo, a9 as BigNumberish, c1 as TokenAmount, e as ApiV3Token } from '../../type-2596119f.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-60acc172.js';
+import '../../type-2596119f.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-b95eb35d.js';
+import '../../type-0de39dab.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-60acc172.js';
+import { n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-2596119f.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-b95eb35d.js';
+import '../../type-0de39dab.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-60acc172.js';
-export { i as default } from '../../raydium-1e9cad89.js';
+import '../../type-2596119f.js';
+export { i as default } from '../../raydium-8871c9e8.js';
 import 'bn.js';
 import '../liquidity/type.js';
-import '../../type-b95eb35d.js';
+import '../../type-0de39dab.js';
 import './type.js';
 import '../cpmm/type.js';
 import '@solana/spl-token';

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-60acc172.js';
+import { bK as TransferAmountFee, c1 as TokenAmount, w as PoolKeys, n as ApiV3PoolInfoItem } from '../../type-2596119f.js';
 import Decimal from 'decimal.js';
 import { Token } from '../../module/token.js';
 import { ComputeAmountOutParam } from '../liquidity/type.js';
-import { d as ComputeClmmPoolInfo } from '../../type-b95eb35d.js';
+import { d as ComputeClmmPoolInfo } from '../../type-0de39dab.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-60acc172.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-2596119f.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-1e9cad89.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-8871c9e8.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-60acc172.js';
+import '../../type-2596119f.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
@@ -22,7 +22,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-b95eb35d.js';
+import '../../type-0de39dab.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-1e9cad89.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-8871c9e8.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
 import '../../solana/type.js';
-import '../../type-60acc172.js';
+import '../../type-2596119f.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';
 import '../../common/owner.js';
@@ -22,7 +22,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-b95eb35d.js';
+import '../../type-0de39dab.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-1e9cad89.d.ts → raydium-8871c9e8.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, m as ApiV3PoolInfoStandardItemCpmm, 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-60acc172.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, m as ApiV3PoolInfoStandardItemCpmm, 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-2596119f.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, AmmRpcData } from './raydium/liquidity/type.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-b95eb35d.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-0de39dab.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';
@@ -168,7 +168,7 @@ declare class LiquidityModule extends ModuleBase {
         priceImpact: Decimal;
         fee: BN__default;
     };
-    swap<T extends TxVersion>({ poolInfo, poolKeys: propPoolKeys, amountIn, amountOut, inputMint, fixedSide, txVersion, computeBudgetConfig, }: SwapParam<T>): Promise<MakeTxData<T>>;
+    swap<T extends TxVersion>({ poolInfo, poolKeys: propPoolKeys, amountIn, amountOut, inputMint, fixedSide, txVersion, config, computeBudgetConfig, }: SwapParam<T>): Promise<MakeTxData<T>>;
     getRpcPoolInfo(poolId: string): Promise<AmmRpcData>;
     getRpcPoolInfos(poolIds: (string | PublicKey)[], config?: {
         batchRequest?: boolean;
@@ -419,11 +419,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-b95eb35d.d.ts → type-0de39dab.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-60acc172.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-2596119f.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.29-alpha",
+  "version": "0.1.30-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

@@ -51,6 +51,7 @@ import { LIQUIDITY_FEES_NUMERATOR, LIQUIDITY_FEES_DENOMINATOR } from "./constant
 
 import BN from "bn.js";
 import Decimal from "decimal.js";
+import { WSOLMint } from "@/common";
 
 export default class LiquidityModule extends ModuleBase {
   public stableLayout: StableLayout;
@@ -836,42 +837,87 @@ export default class LiquidityModule extends ModuleBase {
     inputMint,
     fixedSide,
     txVersion,
+    config,
     computeBudgetConfig,
   }: SwapParam<T>): Promise<MakeTxData<T>> {
     const txBuilder = this.createTxBuilder();
+    const { associatedOnly = false, inputUseSolBalance = true, outputUseSolBalance = true } = config || {};
+
     const [tokenIn, tokenOut] =
       inputMint === poolInfo.mintA.address ? [poolInfo.mintA, poolInfo.mintB] : [poolInfo.mintB, poolInfo.mintA];
-    const tokenAccountIn = await this.scope.account.getCreatedTokenAccount({
-      mint: new PublicKey(tokenIn.address),
-      programId: new PublicKey(tokenIn.programId),
-      associatedOnly: false,
-    });
 
-    const tokenAccountOut = await this.scope.account.getCreatedTokenAccount({
-      mint: new PublicKey(tokenOut.address),
-      programId: new PublicKey(tokenOut.programId),
-      associatedOnly: false,
-    });
+    const inputTokenUseSolBalance = inputUseSolBalance && tokenIn.address === WSOLMint.toBase58();
+    const outputTokenUseSolBalance = outputUseSolBalance && tokenOut.address === WSOLMint.toBase58();
 
-    const { tokenAccount: _tokenAccountIn, ...accountInIns } = await this.scope.account.handleTokenAccount({
-      side: "in",
-      amount: amountIn,
-      mint: new PublicKey(tokenIn.address),
-      tokenAccount: tokenAccountIn,
-      bypassAssociatedCheck: false,
-      checkCreateATAOwner: false,
-    });
-    txBuilder.addInstruction(accountInIns);
+    const { account: _tokenAccountIn, instructionParams: ownerTokenAccountBaseInstruction } =
+      await this.scope.account.getOrCreateTokenAccount({
+        tokenProgram: TOKEN_PROGRAM_ID,
+        mint: new PublicKey(tokenIn.address),
+        owner: this.scope.ownerPubKey,
 
-    const { tokenAccount: _tokenAccountOut, ...accountOutIns } = await this.scope.account.handleTokenAccount({
-      side: "out",
-      amount: 0,
-      mint: new PublicKey(tokenOut.address),
-      tokenAccount: tokenAccountOut,
-      bypassAssociatedCheck: false,
-      checkCreateATAOwner: false,
-    });
-    txBuilder.addInstruction(accountOutIns);
+        createInfo: inputTokenUseSolBalance
+          ? {
+              payer: this.scope.ownerPubKey,
+              amount: amountIn,
+            }
+          : undefined,
+        skipCloseAccount: !inputTokenUseSolBalance,
+        notUseTokenAccount: inputTokenUseSolBalance,
+        associatedOnly,
+      });
+    txBuilder.addInstruction(ownerTokenAccountBaseInstruction || {});
+
+    if (!_tokenAccountIn) this.logAndCreateError("input token account not found", tokenIn.address);
+
+    const { account: _tokenAccountOut, instructionParams: ownerTokenAccountQuoteInstruction } =
+      await this.scope.account.getOrCreateTokenAccount({
+        tokenProgram: TOKEN_PROGRAM_ID,
+        mint: new PublicKey(tokenOut.address),
+        owner: this.scope.ownerPubKey,
+        createInfo: outputTokenUseSolBalance
+          ? {
+              payer: this.scope.ownerPubKey!,
+              amount: 0,
+            }
+          : undefined,
+        skipCloseAccount: !outputTokenUseSolBalance,
+        notUseTokenAccount: outputTokenUseSolBalance,
+        associatedOnly,
+      });
+    txBuilder.addInstruction(ownerTokenAccountQuoteInstruction || {});
+    if (_tokenAccountOut === undefined) throw new Error("output token account not found");
+
+    // const tokenAccountIn = await this.scope.account.getCreatedTokenAccount({
+    //   mint: new PublicKey(tokenIn.address),
+    //   programId: new PublicKey(tokenIn.programId),
+    //   associatedOnly: false,
+    // });
+
+    // const tokenAccountOut = await this.scope.account.getCreatedTokenAccount({
+    //   mint: new PublicKey(tokenOut.address),
+    //   programId: new PublicKey(tokenOut.programId),
+    //   associatedOnly: false,
+    // });
+
+    // const { tokenAccount: _tokenAccountIn, ...accountInIns } = await this.scope.account.handleTokenAccount({
+    //   side: "in",
+    //   amount: amountIn,
+    //   mint: new PublicKey(tokenIn.address),
+    //   tokenAccount: tokenAccountIn,
+    //   bypassAssociatedCheck: false,
+    //   checkCreateATAOwner: false,
+    // });
+    // txBuilder.addInstruction(accountInIns);
+
+    // const { tokenAccount: _tokenAccountOut, ...accountOutIns } = await this.scope.account.handleTokenAccount({
+    //   side: "out",
+    //   amount: 0,
+    //   mint: new PublicKey(tokenOut.address),
+    //   tokenAccount: tokenAccountOut,
+    //   bypassAssociatedCheck: false,
+    //   checkCreateATAOwner: false,
+    // });
+    // txBuilder.addInstruction(accountOutIns);
 
     const poolKeys = propPoolKeys || (await this.getAmmPoolKeys(poolInfo.id));
     let version = 4;
@@ -883,8 +929,8 @@ export default class LiquidityModule extends ModuleBase {
           version,
           poolKeys,
           userKeys: {
-            tokenAccountIn: _tokenAccountIn,
-            tokenAccountOut: _tokenAccountOut,
+            tokenAccountIn: _tokenAccountIn!,
+            tokenAccountOut: _tokenAccountOut!,
             owner: this.scope.ownerPubKey,
           },
           amountIn,

package/src/raydium/liquidity/type.ts

@@ -205,11 +205,15 @@ export interface ComputeAmountOutParam {
 export interface SwapParam<T = TxVersion.LEGACY> {
   poolInfo: ApiV3PoolInfoStandardItem;
   poolKeys?: AmmV4Keys | AmmV5Keys;
-  associatedOnly: boolean;
   amountIn: BN;
   amountOut: BN;
   inputMint: string;
   fixedSide: SwapSide;
+  config?: {
+    associatedOnly?: boolean;
+    inputUseSolBalance?: boolean;
+    outputUseSolBalance?: boolean;
+  };
   computeBudgetConfig?: ComputeBudgetConfig;
   txVersion?: T;
 }

package/lib/{type-60acc172.d.ts → type-2596119f.d.ts}

@@ -855,37 +855,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[];