@magmaprotocol/magma-clmm-sdk 0.5.64 → 0.5.65

package/dist/index.d.ts

@@ -1752,6 +1752,8 @@ type DlmmPoolInfo = {
     base_factor: number;
     base_fee: number;
     active_index: number;
+    coinAmountA: string;
+    coinAmountB: string;
 };
 type DlmmAddLiquidityParams = {
     pool_id: string;
@@ -3722,7 +3724,6 @@ declare class DlmmModule implements IModule {
     get sdk(): MagmaClmmSDK;
     getPoolInfo(pools: string[]): Promise<DlmmPoolInfo[]>;
     fetchPairParams(params: FetchPairParams): Promise<EventPairParams>;
-    price_to_storage_id(price: string, bin_step: number, tokenADecimal: number, tokenBDecimal: number): number;
     createPairPayload(params: CreatePairParams): Promise<Transaction>;
     mintPercent(params: MintPercentParams): Promise<Transaction>;
     createPositionByAmount(params: MintAmountParams): Promise<Transaction>;
@@ -3731,8 +3732,9 @@ declare class DlmmModule implements IModule {
     private _raisePositionByAmountsReward;
     burnPosition(params: DlmmBurnPositionParams): Promise<Transaction>;
     shrinkPosition(params: DlmmShrinkPosition): Promise<Transaction>;
-    collectReward(params: DlmmCollectRewardParams): Promise<Transaction>;
-    collectFees(params: DlmmCollectFeeParams): Promise<Transaction>;
+    collectFeeAndReward(params: DlmmCollectRewardParams & DlmmCollectFeeParams): Promise<Transaction>;
+    collectReward(params: DlmmCollectRewardParams, transaction?: Transaction): Promise<Transaction>;
+    collectFees(params: DlmmCollectFeeParams, transaction?: Transaction): Promise<Transaction>;
     createPairAddLiquidity(params: DlmmCreatePairAddLiquidityParams): Promise<Transaction>;
     swap(params: DLMMSwapParams): Promise<Transaction>;
     fetchBins(params: FetchBinsParams): Promise<EventBin[]>;

package/dist/index.js

@@ -10725,7 +10725,6 @@ var GaugeModule = class {
 // src/modules/dlmm.ts
 var import_transactions12 = require("@mysten/sui/transactions");
 var import_calc_dlmm3 = require("@magmaprotocol/calc_dlmm");
-var import_decimal13 = __toESM(require("decimal.js"));
 var DlmmModule = class {
   _sdk;
   _cache = {};
@@ -10750,7 +10749,9 @@ var DlmmModule = class {
         coin_b: fields.y.fields.name,
         base_factor: fields.params.fields.base_factor,
         base_fee: fields.params.fields.base_factor / 1e4 * (fields.bin_step / 1e4),
-        active_index: fields.params.fields.active_index
+        active_index: fields.params.fields.active_index,
+        coinAmountA: fields.reserve_x,
+        coinAmountB: fields.reserve_y
       });
     });
     return poolList;
@@ -10796,18 +10797,9 @@ var DlmmModule = class {
     });
     return res;
   }
-  // params price: input (b/(10^b_decimal))/(a/(10^a_decimal))
-  price_to_storage_id(price, bin_step, tokenADecimal, tokenBDecimal) {
-    const priceDec = new import_decimal13.default(price);
-    const tenDec = new import_decimal13.default(10);
-    const twoDec = new import_decimal13.default(2);
-    const price_x128 = priceDec.mul(tenDec.pow(tokenBDecimal)).div(tenDec.pow(tokenADecimal)).mul(twoDec.pow(128));
-    const active_id = (0, import_calc_dlmm3.get_real_id_from_price_x128)(price_x128.toFixed(0).toString(), bin_step);
-    return (0, import_calc_dlmm3.get_storage_id_from_real_id)(active_id);
-  }
   // NOTE: x, y should be sorted
   async createPairPayload(params) {
-    const storage_id = this.price_to_storage_id(params.priceTokenBPerTokenA, params.bin_step, params.coinADecimal, params.coinBDecimal);
+    const storage_id = (0, import_calc_dlmm3.get_storage_id_from_real_id)(BinMath.getBinIdFromPrice(params.priceTokenBPerTokenA, params.bin_step, params.coinADecimal, params.coinBDecimal));
     const tx = new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
     const { clmm_pool, dlmm_pool, integrate } = this.sdk.sdkOptions;
@@ -10996,8 +10988,16 @@ var DlmmModule = class {
     });
     return tx;
   }
-  async collectReward(params) {
-    const tx = new import_transactions12.Transaction();
+  async collectFeeAndReward(params) {
+    let tx = new import_transactions12.Transaction();
+    tx = await this.collectFees(params);
+    if (params.rewards_token.length > 0) {
+      tx = await this.collectReward(params);
+    }
+    return tx;
+  }
+  async collectReward(params, transaction) {
+    const tx = transaction || new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
     const { integrate, clmm_pool } = this.sdk.sdkOptions;
     const clmmConfigs = getPackagerConfigs(clmm_pool);
@@ -11019,8 +11019,8 @@ var DlmmModule = class {
     });
     return tx;
   }
-  async collectFees(params) {
-    const tx = new import_transactions12.Transaction();
+  async collectFees(params, transaction) {
+    const tx = transaction || new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
     const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coin_a, params.coin_b];