@raydium-io/raydium-sdk-v2 0.1.43-alpha → 0.1.45-alpha

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 { bN as TransferAmountFee, c4 as TokenAmount, z as PoolKeys, q as ApiV3PoolInfoItem } from '../../api-7c7b1543.js';
+import { bN as TransferAmountFee, c4 as TokenAmount, z as PoolKeys, q as ApiV3PoolInfoItem } from '../../api-00b0713a.js';
 import Decimal from 'decimal.js';
 import { Token } from '../../module/token.js';
 import { ComputeAmountOutParam } from '../liquidity/type.js';
-import { d as ComputeClmmPoolInfo } from '../../type-32d4c4bc.js';
+import { d as ComputeClmmPoolInfo } from '../../type-b868e5e7.js';
 import { CpmmComputeData } from '../cpmm/type.js';
 import 'axios';
 import '../../solana/type.js';

package/lib/raydium/type.d.ts

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '@solana/spl-token';
-export { bV as ArrayItem, bL as ComputeBudgetConfig, c0 as Cover, bW as ExactPartial, bX as ExactRequired, b$ as Fallback, bO as GetTransferAmountFee, bZ as GetValue, bK as InstructionReturn, bM as LoadParams, bJ as MakeMultiTransaction, bH as MakeTransaction, bI as MakeV0Transaction, bS as MayArray, bT as MayDeepArray, bU as MayFunction, bR as ReplaceType, bP as ReturnTypeFetchMultipleMintInfo, bQ as ReturnTypeFetchMultipleMintInfos, bY as SKeyof, b_ as SOR, bG as SignAllTransactions, bN as TransferAmountFee, c1 as UnionCover, c2 as unionArr } from '../api-7c7b1543.js';
+export { bV as ArrayItem, bL as ComputeBudgetConfig, c0 as Cover, bW as ExactPartial, bX as ExactRequired, b$ as Fallback, bO as GetTransferAmountFee, bZ as GetValue, bK as InstructionReturn, bM as LoadParams, bJ as MakeMultiTransaction, bH as MakeTransaction, bI as MakeV0Transaction, bS as MayArray, bT as MayDeepArray, bU as MayFunction, bR as ReplaceType, bP as ReturnTypeFetchMultipleMintInfo, bQ as ReturnTypeFetchMultipleMintInfos, bY as SKeyof, b_ as SOR, bG as SignAllTransactions, bN as TransferAmountFee, c1 as UnionCover, c2 as unionArr } from '../api-00b0713a.js';
 import 'bn.js';
 import 'axios';
 import '../solana/type.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-8a28fbc6.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-15ed5dcf.js';
 import '@solana/web3.js';
-import '../../api-7c7b1543.js';
+import '../../api-00b0713a.js';
 import 'axios';
 import '../../solana/type.js';
 import 'bn.js';
@@ -21,7 +21,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-32d4c4bc.js';
+import '../../type-b868e5e7.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.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-8a28fbc6.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-15ed5dcf.js';
 import '../../marshmallow/buffer-layout.js';
-import '../../api-7c7b1543.js';
+import '../../api-00b0713a.js';
 import 'axios';
 import '../../solana/type.js';
 import '@solana/spl-token';
@@ -21,7 +21,7 @@ import '../account/layout.js';
 import '../liquidity/type.js';
 import '../liquidity/layout.js';
 import '../liquidity/stable.js';
-import '../../type-32d4c4bc.js';
+import '../../type-b868e5e7.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-8a28fbc6.d.ts → raydium-15ed5dcf.d.ts}

@@ -1,5 +1,5 @@
 import { PublicKey, Commitment, EpochInfo, Connection, Transaction, Signer, TransactionInstruction, Keypair } from '@solana/web3.js';
-import { aA as TxBuilder, as as AddInstructionParam, ac as BigNumberish, bn as CreateFarm, az as MakeTxData, bo as CreateFarmExtInfo, bp as UpdateFarmReward, bq as UpdateFarmRewards, br as FarmDWParam, X as FormatFarmInfoOut, bL as ComputeBudgetConfig, ay as MakeMultiTxData, o as ApiV3PoolInfoStandardItem, c8 as Percent, c4 as TokenAmount, v as AmmV4Keys, w as AmmV5Keys, n as ApiV3PoolInfoConcentratedItem, W as FormatFarmInfoOutV6, y as ClmmKeys, bH as MakeTransaction, bQ as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, p as ApiV3PoolInfoStandardItemCpmm, bO as GetTransferAmountFee, z as PoolKeys, h as ApiV3Token, _ as OwnerIdoInfo, $ as IdoKeysData, bM as LoadParams, J as JupTokenType, bC as TokenInfo, bG as SignAllTransactions, a as Api, Y as AvailabilityCheckAPI3, i as ApiV3TokenRes } from './api-7c7b1543.js';
+import { aA as TxBuilder, as as AddInstructionParam, ac as BigNumberish, bn as CreateFarm, az as MakeTxData, bo as CreateFarmExtInfo, bp as UpdateFarmReward, bq as UpdateFarmRewards, br as FarmDWParam, X as FormatFarmInfoOut, bL as ComputeBudgetConfig, ay as MakeMultiTxData, o as ApiV3PoolInfoStandardItem, c8 as Percent, c4 as TokenAmount, v as AmmV4Keys, w as AmmV5Keys, n as ApiV3PoolInfoConcentratedItem, W as FormatFarmInfoOutV6, y as ClmmKeys, bH as MakeTransaction, bQ as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, p as ApiV3PoolInfoStandardItemCpmm, bO as GetTransferAmountFee, z as PoolKeys, h as ApiV3Token, _ as OwnerIdoInfo, $ as IdoKeysData, bM as LoadParams, J as JupTokenType, bC as TokenInfo, bG as SignAllTransactions, a as Api, Y as AvailabilityCheckAPI3, i as ApiV3TokenRes } from './api-00b0713a.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 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-32d4c4bc.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-b868e5e7.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';
@@ -418,11 +418,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;
@@ -522,7 +522,7 @@ interface ExtInfo {
 declare class MarketV2$1 extends ModuleBase {
     create<T extends TxVersion>({ baseInfo, quoteInfo, lotSize, // 1
     tickSize, // 0.01
-    dexProgramId, txVersion, computeBudgetConfig, }: {
+    dexProgramId, requestQueueSpace, eventQueueSpace, orderbookQueueSpace, txVersion, computeBudgetConfig, }: {
         baseInfo: {
             mint: PublicKey;
             decimals: number;
@@ -536,6 +536,9 @@ declare class MarketV2$1 extends ModuleBase {
         dexProgramId: PublicKey;
         eventQueue?: PublicKey;
         requestQueue?: PublicKey;
+        requestQueueSpace?: number;
+        eventQueueSpace?: number;
+        orderbookQueueSpace?: number;
         txVersion?: T;
         computeBudgetConfig?: ComputeBudgetConfig;
     }): Promise<MakeMultiTxData<T, ExtInfo>>;

package/lib/{type-32d4c4bc.d.ts → type-b868e5e7.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 { n as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, h as ApiV3Token, bO as GetTransferAmountFee, bN as TransferAmountFee, c9 as Price, c8 as Percent, c4 as TokenAmount, bL as ComputeBudgetConfig, c6 as Fraction, bC as TokenInfo, y as ClmmKeys } from './api-7c7b1543.js';
+import { n as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, h as ApiV3Token, bO as GetTransferAmountFee, bN as TransferAmountFee, c9 as Price, c8 as Percent, c4 as TokenAmount, bL as ComputeBudgetConfig, c6 as Fraction, bC as TokenInfo, y as ClmmKeys } from './api-00b0713a.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.43-alpha",
+  "version": "0.1.45-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

@@ -631,6 +631,7 @@ export default class CpmmModule extends ModuleBase {
       poolInfo,
       poolKeys: propPoolKeys,
       baseIn,
+      inputAmount,
       swapResult,
       slippage = 0,
       config,
@@ -723,7 +724,7 @@ export default class CpmmModule extends ModuleBase {
           baseIn ? mintB : mintA,
           getPdaObservationId(new PublicKey(poolInfo.programId), new PublicKey(poolInfo.id)).publicKey,
 
-          swapResult.sourceAmountSwapped,
+          inputAmount,
           swapResult.destinationAmountSwapped,
         ),
         // baseIn

package/src/raydium/cpmm/type.ts

@@ -123,6 +123,7 @@ export interface CpmmSwapParams<T = TxVersion.LEGACY> {
   baseIn: boolean;
   slippage?: number;
   swapResult: SwapResult;
+  inputAmount: BN;
 
   config?: {
     bypassAssociatedCheck?: boolean;

package/src/raydium/marketV2/createMarket.ts

@@ -3,11 +3,11 @@ import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import BN from "bn.js";
 import ModuleBase from "../moduleBase";
 import { TxVersion } from "@/common/txTool/txType";
-import { MakeMultiTxData, TxBuildData, TxV0BuildData } from "@/common/txTool/txTool";
+import { MakeMultiTxData } from "@/common/txTool/txTool";
 import { generatePubKey } from "../account/util";
 import { BN_ZERO } from "@/common/bignumber";
 import { makeCreateMarketInstruction } from "./instrument";
-import { ComputeBudgetConfig, MakeMultiTransaction } from "@/raydium/type";
+import { ComputeBudgetConfig } from "@/raydium/type";
 
 interface ExtInfo {
   address: {
@@ -30,6 +30,9 @@ export default class MarketV2 extends ModuleBase {
     lotSize, // 1
     tickSize, // 0.01
     dexProgramId,
+    requestQueueSpace,
+    eventQueueSpace,
+    orderbookQueueSpace,
     txVersion,
     computeBudgetConfig,
   }: {
@@ -46,6 +49,9 @@ export default class MarketV2 extends ModuleBase {
     dexProgramId: PublicKey;
     eventQueue?: PublicKey;
     requestQueue?: PublicKey;
+    requestQueueSpace?: number;
+    eventQueueSpace?: number;
+    orderbookQueueSpace?: number;
     txVersion?: T;
     computeBudgetConfig?: ComputeBudgetConfig;
   }): Promise<MakeMultiTxData<T, ExtInfo>> {
@@ -102,6 +108,10 @@ export default class MarketV2 extends ModuleBase {
         vaultSignerNonce,
         baseLotSize,
         quoteLotSize,
+
+        requestQueueSpace,
+        eventQueueSpace,
+        orderbookQueueSpace,
       },
     });
     const txBuilder = this.createTxBuilder();

package/src/raydium/marketV2/instrument.ts

@@ -120,6 +120,10 @@ export async function makeCreateMarketInstruction({
 
     baseLotSize: BN;
     quoteLotSize: BN;
+
+    requestQueueSpace?: number;
+    eventQueueSpace?: number;
+    orderbookQueueSpace?: number;
   };
 }): Promise<Transactions> {
   const tx1 = new Transaction();
@@ -163,8 +167,8 @@ export async function makeCreateMarketInstruction({
       basePubkey: wallet,
       seed: marketInfo.requestQueue.seed,
       newAccountPubkey: marketInfo.requestQueue.publicKey,
-      lamports: await connection.getMinimumBalanceForRentExemption(5120 + 12),
-      space: 5120 + 12,
+      lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.requestQueueSpace ?? 5120 + 12),
+      space: marketInfo.requestQueueSpace ?? 5120 + 12,
       programId: marketInfo.programId,
     }),
     SystemProgram.createAccountWithSeed({
@@ -172,8 +176,8 @@ export async function makeCreateMarketInstruction({
       basePubkey: wallet,
       seed: marketInfo.eventQueue.seed,
       newAccountPubkey: marketInfo.eventQueue.publicKey,
-      lamports: await connection.getMinimumBalanceForRentExemption(262144 + 12),
-      space: 262144 + 12,
+      lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.eventQueueSpace ?? 262144 + 12),
+      space: marketInfo.eventQueueSpace ?? 262144 + 12,
       programId: marketInfo.programId,
     }),
     SystemProgram.createAccountWithSeed({
@@ -181,8 +185,8 @@ export async function makeCreateMarketInstruction({
       basePubkey: wallet,
       seed: marketInfo.bids.seed,
       newAccountPubkey: marketInfo.bids.publicKey,
-      lamports: await connection.getMinimumBalanceForRentExemption(65536 + 12),
-      space: 65536 + 12,
+      lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.orderbookQueueSpace ?? 65536 + 12),
+      space: marketInfo.orderbookQueueSpace ?? 65536 + 12,
       programId: marketInfo.programId,
     }),
     SystemProgram.createAccountWithSeed({
@@ -190,8 +194,8 @@ export async function makeCreateMarketInstruction({
       basePubkey: wallet,
       seed: marketInfo.asks.seed,
       newAccountPubkey: marketInfo.asks.publicKey,
-      lamports: await connection.getMinimumBalanceForRentExemption(65536 + 12),
-      space: 65536 + 12,
+      lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.orderbookQueueSpace ?? 65536 + 12),
+      space: marketInfo.orderbookQueueSpace ?? 65536 + 12,
       programId: marketInfo.programId,
     }),
     initializeMarket({

package/src/raydium/tradeV2/trade.ts

@@ -225,20 +225,16 @@ export default class TradeV2 extends ModuleBase {
         amountOut.amount.token.isToken2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID,
       );
     } else {
-      const baseIn = swapInfo.poolInfoList[0].mintA.address === inputMint.toBase58();
       const { account, instructionParams } = await this.scope.account.getOrCreateTokenAccount({
         tokenProgram: amountOut.amount.token.isToken2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID,
         mint: outputMint,
         notUseTokenAccount: isOutputSol,
         owner: this.scope.ownerPubKey,
         skipCloseAccount: true,
-        createInfo:
-          isOutputSol || baseIn
-            ? {
-                payer: this.scope.ownerPubKey,
-                amount: baseIn ? 0 : amountIn.amount.raw,
-              }
-            : undefined,
+        createInfo: {
+          payer: this.scope.ownerPubKey,
+          amount: 0,
+        },
         associatedOnly: isOutputSol ? false : ownerInfo.associatedOnly,
         checkCreateATAOwner: ownerInfo.checkCreateATAOwner,
       });
@@ -586,7 +582,7 @@ export default class TradeV2 extends ModuleBase {
         for (const infoOut of info.out) {
           if (infoIn.version === 6 && needTickArray[infoIn.id.toString()] === undefined) {
             needTickArray[infoIn.id.toString()] = infoIn;
-          } else if (infoIn.version === 7 && cpmmPools[infoIn.id.toString()] === undefined) {
+          } else if (infoIn.version === 7 && cpmmPoolList[infoIn.id.toString()] === undefined) {
             cpmmPoolList[infoIn.id.toString()] = infoIn;
           } else if (
             (infoIn.version === 4 || infoIn.version === 5) &&
@@ -596,7 +592,7 @@ export default class TradeV2 extends ModuleBase {
           }
           if (infoOut.version === 6 && needTickArray[infoOut.id.toString()] === undefined) {
             needTickArray[infoOut.id.toString()] = infoOut;
-          } else if (infoOut.version === 7 && cpmmPools[infoOut.id.toString()] === undefined) {
+          } else if (infoOut.version === 7 && cpmmPoolList[infoOut.id.toString()] === undefined) {
             cpmmPoolList[infoOut.id.toString()] = infoOut;
           } else if (
             (infoOut.version === 4 || infoOut.version === 5) &&
@@ -1115,7 +1111,7 @@ export default class TradeV2 extends ModuleBase {
       pools.filter((p) => p.version === 6 && !clmmRpcData[p.id.toString()]).map((p) => p.id.toString()),
     );
     if (clmmFetchKeys.size > 0) {
-      const clmmData = this.scope.clmm.getRpcClmmPoolInfos({ poolIds: Array.from(clmmFetchKeys) });
+      const clmmData = await this.scope.clmm.getRpcClmmPoolInfos({ poolIds: Array.from(clmmFetchKeys) });
       Object.keys(clmmData).forEach((poolId) => {
         clmmRpcData[poolId] = clmmData[poolId];
       });
@@ -1125,7 +1121,7 @@ export default class TradeV2 extends ModuleBase {
       pools.filter((p) => p.version === 4 && !ammRpcData[p.id.toString()]).map((p) => p.id.toString()),
     );
     if (ammFetchKeys.size > 0) {
-      const ammData = this.scope.liquidity.getRpcPoolInfos(Array.from(clmmFetchKeys));
+      const ammData = await this.scope.liquidity.getRpcPoolInfos(Array.from(clmmFetchKeys));
       Object.keys(ammData).forEach((poolId) => {
         ammRpcData[poolId] = ammData[poolId];
       });