@raydium-io/raydium-sdk-v2 0.0.25-alpha → 0.0.27-alpha

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

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '../../type-83523f5f.js';
-export { j as default } from '../../raydium-1fe6ab0b.js';
+export { j as default } from '../../raydium-d75706f4.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../common/txTool/txType.js';

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

@@ -1,5 +1,5 @@
 import '@solana/web3.js';
-export { i as default } from '../../raydium-1fe6ab0b.js';
+export { i as default } from '../../raydium-d75706f4.js';
 import './type.js';
 import '../../type-83523f5f.js';
 import '../../api/api.js';

package/lib/raydium/utils1216/index.d.ts

@@ -1,4 +1,4 @@
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-1fe6ab0b.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-d75706f4.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';

package/lib/raydium/utils1216/utils1216.d.ts

@@ -1,7 +1,7 @@
 import '../../marshmallow/index.js';
 import '@solana/web3.js';
 import 'bn.js';
-export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-1fe6ab0b.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-d75706f4.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';

package/lib/{raydium-1fe6ab0b.d.ts → raydium-d75706f4.d.ts}

@@ -12,7 +12,7 @@ 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-6fd96950.js';
 import { ClmmPositionLayout } from './raydium/clmm/layout.js';
-import { CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
+import { CpmmConfigInfoInterface, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { CpmmPoolInfoLayout } from './raydium/cpmm/layout.js';
 import { PoolAccountInfoV4, ReturnTypeGetAddLiquidityDefaultPool } from './raydium/tradeV2/type.js';
 import { Structure } from './marshmallow/index.js';
@@ -224,9 +224,10 @@ declare class CpmmModule extends ModuleBase {
     constructor(params: ModuleBaseProps);
     load(): Promise<void>;
     getCpmmPoolKeys(poolId: string): Promise<CpmmKeys>;
-    getRpcPoolInfo(poolId: string): Promise<ReturnType<typeof CpmmPoolInfoLayout.decode> & {
+    getRpcPoolInfo(poolId: string, fetchConfigInfo?: boolean): Promise<ReturnType<typeof CpmmPoolInfoLayout.decode> & {
         baseReserve: BN__default;
         quoteReserve: BN__default;
+        configInfo?: CpmmConfigInfoInterface;
     }>;
     createPool<T extends TxVersion>({ programId, poolFeeAccount, startTime, ownerInfo, associatedOnly, checkCreateATAOwner, txVersion, computeBudgetConfig, ...params }: CreateCpmmPoolParam<T>): Promise<MakeTxData<T, {
         address: CreateCpmmPoolAddress;

package/package.json

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

@@ -17,6 +17,7 @@ import {
   WithdrawCpmmLiquidityParams,
   CpmmSwapParams,
   ComputePairAmountParams,
+  CpmmConfigInfoInterface,
 } from "./type";
 import { getCreatePoolKeys, getPdaObservationId } from "./pda";
 import {
@@ -27,7 +28,7 @@ import {
   makeSwapCpmmBaseOutInInstruction,
 } from "./instruction";
 import BN from "bn.js";
-import { CpmmPoolInfoLayout } from "./layout";
+import { CpmmPoolInfoLayout, CpmmConfigInfoLayout } from "./layout";
 import Decimal from "decimal.js";
 
 export default class CpmmModule extends ModuleBase {
@@ -43,10 +44,14 @@ export default class CpmmModule extends ModuleBase {
     return ((await this.scope.api.fetchPoolKeysById({ idList: [poolId] })) as CpmmKeys[])[0];
   }
 
-  public async getRpcPoolInfo(poolId: string): Promise<
+  public async getRpcPoolInfo(
+    poolId: string,
+    fetchConfigInfo?: boolean,
+  ): Promise<
     ReturnType<typeof CpmmPoolInfoLayout.decode> & {
       baseReserve: BN;
       quoteReserve: BN;
+      configInfo?: CpmmConfigInfoInterface;
     }
   > {
     const accountData = await this.scope.connection.getAccountInfo(new PublicKey(poolId));
@@ -60,6 +65,12 @@ export default class CpmmModule extends ModuleBase {
     if (!poolVaultAState) throw new Error(`pool vaultA info not found: ${poolInfo.vaultA.toBase58()}`);
     if (!poolVaultBState) throw new Error(`pool vaultB info not found: ${poolInfo.vaultB.toBase58()}`);
 
+    let configInfo: CpmmConfigInfoInterface | undefined;
+    if (fetchConfigInfo) {
+      const configState = await this.scope.connection.getAccountInfo(poolInfo.configId);
+      if (configState) configInfo = CpmmConfigInfoLayout.decode(configState.data);
+    }
+
     return {
       ...poolInfo,
       baseReserve: new BN(AccountLayout.decode(poolVaultAState.data).amount.toString())
@@ -68,6 +79,7 @@ export default class CpmmModule extends ModuleBase {
       quoteReserve: new BN(AccountLayout.decode(poolVaultBState.data).amount.toString())
         .sub(poolInfo.protocolFeesMintB)
         .sub(poolInfo.fundFeesMintB),
+      configInfo,
     };
   }
 
@@ -410,40 +422,50 @@ export default class CpmmModule extends ModuleBase {
     const txBuilder = this.createTxBuilder();
 
     const [mintA, mintB] = [new PublicKey(poolInfo.mintA.address), new PublicKey(poolInfo.mintB.address)];
+    const mintAUseSOLBalance = mintA.equals(NATIVE_MINT);
+    const mintBUseSOLBalance = mintB.equals(NATIVE_MINT);
 
-    const mintATokenAcc = await this.scope.account.getCreatedTokenAccount({
-      programId: new PublicKey(poolInfo.mintA.programId ?? TOKEN_PROGRAM_ID),
-      mint: mintA,
-      associatedOnly: false,
-    });
+    const { account: mintATokenAccount, instructionParams: _mintATokenAccountIns } =
+      await this.scope.account.getOrCreateTokenAccount({
+        tokenProgram: poolInfo.mintA.programId,
+        mint: new PublicKey(poolInfo.mintA.address),
+        owner: this.scope.ownerPubKey,
 
-    const mintBTokenAcc = await this.scope.account.getCreatedTokenAccount({
-      programId: new PublicKey(poolInfo.mintB.programId ?? TOKEN_PROGRAM_ID),
-      mint: mintB,
-      associatedOnly: false,
-    });
+        createInfo: mintAUseSOLBalance
+          ? {
+              payer: this.scope.ownerPubKey,
+              amount: baseIn ? swapResult.sourceAmountSwapped : 0,
+            }
+          : undefined,
+        skipCloseAccount: !mintAUseSOLBalance,
+        notUseTokenAccount: mintAUseSOLBalance,
+        associatedOnly: false,
+        checkCreateATAOwner,
+      });
 
-    const { tokenAccount: _mintATokenAcc, ...mintATokenAccInstruction } = await this.scope.account.handleTokenAccount({
-      side: baseIn ? "in" : "out",
-      amount: baseIn ? swapResult.sourceAmountSwapped : swapResult.destinationAmountSwapped,
-      mint: mintA,
-      tokenAccount: mintATokenAcc,
-      bypassAssociatedCheck,
-      checkCreateATAOwner,
-    });
-    txBuilder.addInstruction(mintATokenAccInstruction);
+    txBuilder.addInstruction(_mintATokenAccountIns || {});
 
-    const { tokenAccount: _mintBTokenAcc, ...mintBTokenAccInstruction } = await this.scope.account.handleTokenAccount({
-      side: baseIn ? "out" : "in",
-      amount: baseIn ? swapResult.destinationAmountSwapped : swapResult.sourceAmountSwapped,
-      mint: mintB,
-      tokenAccount: mintBTokenAcc,
-      bypassAssociatedCheck,
-      checkCreateATAOwner,
-    });
-    txBuilder.addInstruction(mintBTokenAccInstruction);
+    const { account: mintBTokenAccount, instructionParams: _mintBTokenAccountIns } =
+      await this.scope.account.getOrCreateTokenAccount({
+        tokenProgram: poolInfo.mintA.programId,
+        mint: new PublicKey(poolInfo.mintA.address),
+        owner: this.scope.ownerPubKey,
+
+        createInfo: mintBUseSOLBalance
+          ? {
+              payer: this.scope.ownerPubKey,
+              amount: baseIn ? 0 : swapResult.sourceAmountSwapped,
+            }
+          : undefined,
+        skipCloseAccount: !mintAUseSOLBalance,
+        notUseTokenAccount: mintAUseSOLBalance,
+        associatedOnly: false,
+        checkCreateATAOwner,
+      });
+
+    txBuilder.addInstruction(_mintBTokenAccountIns || {});
 
-    if (!_mintATokenAcc && !_mintBTokenAcc)
+    if (!mintATokenAccount && !mintBTokenAccount)
       this.logAndCreateError("cannot found target token accounts", "tokenAccounts", this.scope.account.tokenAccounts);
 
     const poolKeys = await this.getCpmmPoolKeys(poolInfo.id);
@@ -455,10 +477,10 @@ export default class CpmmModule extends ModuleBase {
               new PublicKey(poolInfo.programId),
               this.scope.ownerPubKey,
               new PublicKey(poolKeys.authority),
-              new PublicKey(poolKeys.id), // todo config id
+              new PublicKey(poolKeys.config.id),
               new PublicKey(poolInfo.id),
-              _mintATokenAcc!,
-              _mintBTokenAcc!,
+              mintATokenAccount!,
+              mintBTokenAccount!,
               new PublicKey(poolKeys.vault.A),
               new PublicKey(poolKeys.vault.B),
               new PublicKey(poolInfo.mintA.programId ?? TOKEN_PROGRAM_ID),
@@ -474,11 +496,11 @@ export default class CpmmModule extends ModuleBase {
               new PublicKey(poolInfo.programId),
               this.scope.ownerPubKey,
               new PublicKey(poolKeys.authority),
-              new PublicKey(poolKeys.id), // todo config id
+              new PublicKey(poolKeys.config.id),
               new PublicKey(poolInfo.id),
 
-              _mintBTokenAcc!,
-              _mintATokenAcc!,
+              mintBTokenAccount!,
+              mintATokenAccount!,
 
               new PublicKey(poolKeys.vault.B),
               new PublicKey(poolKeys.vault.A),