@magmaprotocol/magma-clmm-sdk 0.5.63 → 0.5.65

package/dist/index.mjs

@@ -10506,8 +10506,7 @@ var GaugeModule = class {
 
 // src/modules/dlmm.ts
 import { Transaction as Transaction12 } from "@mysten/sui/transactions";
-import { get_real_id, get_real_id_from_price_x128 as get_real_id_from_price_x1282, get_storage_id_from_real_id } from "@magmaprotocol/calc_dlmm";
-import Decimal10 from "decimal.js";
+import { get_real_id, get_storage_id_from_real_id } from "@magmaprotocol/calc_dlmm";
 var DlmmModule = class {
   _sdk;
   _cache = {};
@@ -10532,7 +10531,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;
@@ -10578,18 +10579,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 Decimal10(price);
-    const tenDec = new Decimal10(10);
-    const twoDec = new Decimal10(2);
-    const price_x128 = priceDec.mul(tenDec.pow(tokenBDecimal)).div(tenDec.pow(tokenADecimal)).mul(twoDec.pow(128));
-    const active_id = get_real_id_from_price_x1282(price_x128.toFixed(0).toString(), bin_step);
-    return 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 = get_storage_id_from_real_id(BinMath.getBinIdFromPrice(params.priceTokenBPerTokenA, params.bin_step, params.coinADecimal, params.coinBDecimal));
     const tx = new Transaction12();
     tx.setSender(this.sdk.senderAddress);
     const { clmm_pool, dlmm_pool, integrate } = this.sdk.sdkOptions;
@@ -10778,8 +10770,16 @@ var DlmmModule = class {
     });
     return tx;
   }
-  async collectReward(params) {
-    const tx = new Transaction12();
+  async collectFeeAndReward(params) {
+    let tx = new Transaction12();
+    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 Transaction12();
     tx.setSender(this.sdk.senderAddress);
     const { integrate, clmm_pool } = this.sdk.sdkOptions;
     const clmmConfigs = getPackagerConfigs(clmm_pool);
@@ -10801,8 +10801,8 @@ var DlmmModule = class {
     });
     return tx;
   }
-  async collectFees(params) {
-    const tx = new Transaction12();
+  async collectFees(params, transaction) {
+    const tx = transaction || new Transaction12();
     tx.setSender(this.sdk.senderAddress);
     const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coin_a, params.coin_b];
@@ -10911,7 +10911,7 @@ var DlmmModule = class {
     });
     const type = extractStructTagFromType(ownerRes.data.type);
     if (type.full_address === this.buildPositionType()) {
-      position = this.buildPosition(ownerRes.data);
+      position = this.buildPosition(ownerRes);
     } else {
       throw new ClmmpoolsError(`Dlmm Position not exists. Get Position error:${ownerRes.error}`, "InvalidPositionObject" /* InvalidPositionObject */);
     }