@raydium-io/raydium-sdk-v2 0.1.5-alpha → 0.1.6-alpha

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

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '../../type-9fe71e3c.js';
-export { j as default } from '../../raydium-e681ad95.js';
+export { j as default } from '../../raydium-4f9e818a.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../solana/type.js';

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

@@ -1,5 +1,5 @@
 import '@solana/web3.js';
-export { i as default } from '../../raydium-e681ad95.js';
+export { i as default } from '../../raydium-4f9e818a.js';
 import './type.js';
 import '../../type-9fe71e3c.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-e681ad95.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-4f9e818a.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-e681ad95.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-4f9e818a.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';

package/lib/{raydium-e681ad95.d.ts → raydium-4f9e818a.d.ts}

@@ -273,7 +273,7 @@ declare class CpmmModule extends ModuleBase {
     addLiquidity<T extends TxVersion>(params: AddCpmmLiquidityParams<T>): Promise<MakeTxData<T>>;
     withdrawLiquidity<T extends TxVersion>(params: WithdrawCpmmLiquidityParams<T>): Promise<MakeTxData<T>>;
     swap<T extends TxVersion>(params: CpmmSwapParams): Promise<MakeTxData<T>>;
-    computePairAmount({ poolInfo, amount, slippage, epochInfo, baseIn }: ComputePairAmountParams): {
+    computePairAmount({ poolInfo, baseReserve, quoteReserve, amount, slippage, epochInfo, baseIn, }: ComputePairAmountParams): {
         inputAmountFee: GetTransferAmountFee;
         anotherAmount: GetTransferAmountFee;
         maxAnotherAmount: GetTransferAmountFee;

package/package.json

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

@@ -263,7 +263,8 @@ export default class CpmmModule extends ModuleBase {
       // custom
       ...config,
     };
-    const rpcPoolData = await this.getRpcPoolInfo(poolInfo.id);
+    const rpcPoolData = computeResult ? undefined : await this.getRpcPoolInfo(poolInfo.id);
+
     const {
       liquidity,
       inputAmountFee,
@@ -272,10 +273,10 @@ export default class CpmmModule extends ModuleBase {
     this.computePairAmount({
       poolInfo: {
         ...poolInfo,
-        mintAmountA: new Decimal(rpcPoolData.baseReserve.toString()).div(10 ** poolInfo.mintA.decimals).toNumber(),
-        mintAmountB: new Decimal(rpcPoolData.quoteReserve.toString()).div(10 ** poolInfo.mintB.decimals).toNumber(),
-        lpAmount: new Decimal(rpcPoolData.lpAmount.toString()).div(10 ** poolInfo.lpMint.decimals).toNumber(),
+        lpAmount: new Decimal(rpcPoolData!.lpAmount.toString()).div(10 ** poolInfo.lpMint.decimals).toNumber(),
       },
+      baseReserve: rpcPoolData!.baseReserve,
+      quoteReserve: rpcPoolData!.quoteReserve,
       slippage: new Percent(0),
       baseIn,
       epochInfo: await this.scope.fetchEpochInfo(),
@@ -585,7 +586,15 @@ export default class CpmmModule extends ModuleBase {
     return txBuilder.versionBuild({ txVersion }) as Promise<MakeTxData<T>>;
   }
 
-  public computePairAmount({ poolInfo, amount, slippage, epochInfo, baseIn }: ComputePairAmountParams): {
+  public computePairAmount({
+    poolInfo,
+    baseReserve,
+    quoteReserve,
+    amount,
+    slippage,
+    epochInfo,
+    baseIn,
+  }: ComputePairAmountParams): {
     inputAmountFee: GetTransferAmountFee;
     anotherAmount: GetTransferAmountFee;
     maxAnotherAmount: GetTransferAmountFee;
@@ -606,11 +615,6 @@ export default class CpmmModule extends ModuleBase {
     );
     const _inputAmountWithoutFee = inputAmount.sub(inputAmountFee.fee ?? new BN(0));
 
-    const [baseReserve, quoteReserve] = [
-      new BN(new Decimal(poolInfo.mintAmountA).mul(10 ** poolInfo.mintA.decimals).toString()),
-      new BN(new Decimal(poolInfo.mintAmountB).mul(10 ** poolInfo.mintB.decimals).toString()),
-    ];
-
     const lpAmount = new BN(
       new Decimal(poolInfo.lpAmount).mul(10 ** poolInfo.lpMint.decimals).toFixed(0, Decimal.ROUND_DOWN),
     );
@@ -640,8 +644,13 @@ export default class CpmmModule extends ModuleBase {
       expirationTime: undefined,
     };
     if (!_inputAmountWithoutFee.isZero()) {
+      const lpAmountData = lpToAmount(liquidity, baseReserve, quoteReserve, lpAmount);
+      this.logDebug("lpAmountData:", {
+        amountA: lpAmountData.amountA.toString(),
+        amountB: lpAmountData.amountB.toString(),
+      });
       anotherAmountFee = getTransferAmountFeeV2(
-        lpToAmount(liquidity, baseReserve, quoteReserve, lpAmount)[baseIn ? "amountB" : "amountA"],
+        lpAmountData[baseIn ? "amountB" : "amountA"],
         poolInfo[baseIn ? "mintB" : "mintA"].extensions.feeConfig,
         epochInfo,
         true,
@@ -681,6 +690,7 @@ function lpToAmount(lp: BN, poolAmountA: BN, poolAmountB: BN, supply: BN): { amo
   if (!amountA.isZero() && !lp.mul(poolAmountA).mod(supply).isZero()) amountA = amountA.add(new BN(1));
   let amountB = lp.mul(poolAmountB).div(supply);
   if (!amountB.isZero() && !lp.mul(poolAmountB).mod(supply).isZero()) amountB = amountB.add(new BN(1));
+
   return {
     amountA,
     amountB,

package/src/raydium/cpmm/type.ts

@@ -129,6 +129,8 @@ export interface CpmmSwapParams<T = TxVersion.LEGACY> {
 
 export interface ComputePairAmountParams {
   poolInfo: ApiV3PoolInfoStandardItemCpmm;
+  baseReserve: BN;
+  quoteReserve: BN;
   amount: string | Decimal;
   slippage: Percent;
   epochInfo: EpochInfo;