@raydium-io/raydium-sdk-v2 0.0.38-alpha → 0.0.39-alpha

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

@@ -1,6 +1,6 @@
 import '@solana/web3.js';
 import '../../type-15746482.js';
-export { j as default } from '../../raydium-34e76972.js';
+export { j as default } from '../../raydium-2631faa2.js';
 import 'bn.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-6d046773.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

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

@@ -15,5 +15,5 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-6d046773.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';

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

@@ -14,7 +14,7 @@ import '../../marshmallow/index.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../common/logger.js';
 import '../../module/currency.js';
-import '../../type-6d046773.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';
 
 declare function route1Instruction(programId: PublicKey, poolInfoA: ApiV3PoolInfoItem, poolKeyA: PoolKeys, poolKeyB: PoolKeys, userSourceToken: PublicKey, userRouteToken: PublicKey, userPdaAccount: PublicKey, ownerWallet: PublicKey, inputMint: PublicKey, amountIn: BN__default, amountOut: BN__default, tickArrayA?: PublicKey[]): TransactionInstruction;

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

@@ -1,5 +1,5 @@
 import '@solana/web3.js';
-export { i as default } from '../../raydium-34e76972.js';
+export { i as default } from '../../raydium-2631faa2.js';
 import './type.js';
 import '../../type-15746482.js';
 import '../../api/api.js';
@@ -21,7 +21,7 @@ import '../../module/currency.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-6d046773.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

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

@@ -2,7 +2,7 @@ import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from
 import BN__default from 'bn.js';
 import { bK as TransferAmountFee, c6 as Price, c5 as Percent, c1 as TokenAmount, n as ApiV3PoolInfoItem, w as PoolKeys } from '../../type-15746482.js';
 import { Token } from '../../module/token.js';
-import { c as ClmmPoolInfo } from '../../type-6d046773.js';
+import { c as ClmmPoolInfo } from '../../type-08d7cf11.js';
 import '@solana/spl-token';
 import '../../solana/type.js';
 import '../../common/txTool/txType.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-34e76972.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-2631faa2.js';
 import '@solana/web3.js';
 import '../../api/api.js';
 import 'axios';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-6d046773.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

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-34e76972.js';
+export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-2631faa2.js';
 import '../../marshmallow/buffer-layout.js';
 import '../../api/api.js';
 import 'axios';
@@ -20,7 +20,7 @@ import '../../api/url.js';
 import '../account/types.js';
 import '../account/layout.js';
 import '../liquidity/type.js';
-import '../../type-6d046773.js';
+import '../../type-08d7cf11.js';
 import '../clmm/layout.js';
 import '../cpmm/type.js';
 import '../cpmm/curve/calculator.js';

package/lib/{raydium-34e76972.d.ts → raydium-2631faa2.d.ts}

@@ -10,7 +10,7 @@ import { TxVersion } from './common/txTool/txType.js';
 import BN__default from 'bn.js';
 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-6d046773.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-08d7cf11.js';
 import { ClmmPositionLayout, PositionInfoLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
 import { CpmmConfigInfoInterface, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
 import { CpmmPoolInfoLayout } from './raydium/cpmm/layout.js';
@@ -299,11 +299,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/package.json

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

@@ -97,6 +97,10 @@ export default class LiquidityModule extends ModuleBase {
       baseIn ? poolInfo.mintB.symbol : poolInfo.mintA.symbol,
       "slippage:",
       `${slippage.toSignificant()}%`,
+      "baseReserve",
+      baseReserve.toString(),
+      "quoteReserve",
+      quoteReserve.toString(),
     );
 
     // input is fixed
@@ -112,12 +116,11 @@ export default class LiquidityModule extends ModuleBase {
           : divCeil(inputAmount.mul(baseReserve), quoteReserve);
     }
 
-    const liquidity = divCeil(
-      inputAmount.mul(lpAmount),
-      new BN(input === "base" ? poolInfo.mintAmountA : poolInfo.mintAmountB).mul(
-        new BN(10).pow(new BN(poolInfo[input === "base" ? "mintA" : "mintB"].decimals)),
-      ),
-    );
+    this.logDebug("amountRaw:", amountRaw.toString(), "lpAmount:", lpAmount.toString());
+
+    const liquidity = divCeil(inputAmount.mul(lpAmount), input === "base" ? baseReserve : quoteReserve);
+
+    this.logDebug("liquidity:", liquidity.toString());
 
     const _slippage = new Percent(new BN(1)).add(slippage);
     const slippageAdjustedAmount = _slippage.mul(amountRaw).quotient;