@magmaprotocol/magma-clmm-sdk 0.5.64 → 0.5.66

package/dist/index.mjs

@@ -10506,7 +10506,12 @@ 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 {
+  get_price_x128_from_real_id as get_price_x128_from_real_id3,
+  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";
 var DlmmModule = class {
   _sdk;
@@ -10532,7 +10537,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 +10585,11 @@ 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;
@@ -10610,6 +10610,64 @@ var DlmmModule = class {
     });
     return tx;
   }
+  async mintByStrategy(params) {
+    const tx = new Transaction12();
+    const slippage = new Decimal10(params.slippage);
+    const lower_slippage = new Decimal10(1).plus(slippage.div(new Decimal10(1e4)));
+    const upper_slippage = new Decimal10(1).plus(slippage.div(new Decimal10(1e4)));
+    tx.setSender(this.sdk.senderAddress);
+    const { dlmm_pool, integrate } = this.sdk.sdkOptions;
+    const dlmmConfig = getPackagerConfigs(dlmm_pool);
+    const typeArguments = [params.coinTypeA, params.coinTypeB];
+    const price = get_price_x128_from_real_id3(params.active_bin, params.bin_step);
+    const min_price = new Decimal10(price).mul(lower_slippage);
+    const max_price = new Decimal10(price).mul(upper_slippage);
+    const active_min = get_storage_id_from_real_id(get_real_id_from_price_x1282(min_price.toDecimalPlaces(0).toString(), params.bin_step));
+    const active_max = get_storage_id_from_real_id(get_real_id_from_price_x1282(max_price.toDecimalPlaces(0).toString(), params.bin_step));
+    const allCoins = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
+    let primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountATotal), params.coinTypeA, false, true);
+    let primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(params.amountBTotal), params.coinTypeB, false, true);
+    let amount_min = 0;
+    let amount_max = 0;
+    if (params.fixCoinA) {
+      amount_min = new Decimal10(params.amountATotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
+      amount_max = new Decimal10(params.amountATotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
+      primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
+    }
+    if (params.fixCoinB) {
+      amount_min = new Decimal10(params.amountBTotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
+      amount_max = new Decimal10(params.amountBTotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
+      primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
+    }
+    if (params.fixCoinA && params.fixCoinB) {
+    } else if (params.fixCoinA) {
+      params.amountBTotal = 0;
+    } else if (params.fixCoinB) {
+      params.amountATotal = 0;
+    }
+    const args = [
+      tx.object(params.pair),
+      tx.object(dlmmConfig.factory),
+      primaryCoinAInputs.targetCoin,
+      primaryCoinBInputs.targetCoin,
+      tx.pure.u64(params.amountATotal),
+      tx.pure.u64(params.amountBTotal),
+      tx.pure.u8(params.strategy),
+      tx.pure.u32(params.min_bin),
+      tx.pure.u32(params.max_bin),
+      tx.pure.u32(active_min),
+      tx.pure.u32(active_max),
+      tx.pure.u64(amount_min),
+      tx.pure.u64(amount_max),
+      tx.object(CLOCK_ADDRESS)
+    ];
+    tx.moveCall({
+      target: `${integrate.published_at}::${DlmmScript}::mint_percent`,
+      typeArguments,
+      arguments: args
+    });
+    return tx;
+  }
   // Create a position by percent
   async mintPercent(params) {
     const tx = new Transaction12();
@@ -10778,8 +10836,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 +10867,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];
@@ -10853,11 +10919,28 @@ var DlmmModule = class {
     const { clmm_pool, integrate } = this.sdk.sdkOptions;
     const { global_config_id } = getPackagerConfigs(clmm_pool);
     const typeArguments = [params.coinTypeA, params.coinTypeB];
+    const allCoinAsset = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
+    const primaryCoinInputA = TransactionUtil.buildCoinForAmount(
+      tx,
+      allCoinAsset,
+      params.swapForY ? BigInt(params.amountIn) : BigInt(0),
+      params.coinTypeA,
+      false,
+      true
+    );
+    const primaryCoinInputB = TransactionUtil.buildCoinForAmount(
+      tx,
+      allCoinAsset,
+      params.swapForY ? BigInt(0) : BigInt(params.amountIn),
+      params.coinTypeB,
+      false,
+      true
+    );
     const args = [
       tx.object(params.pair),
       tx.object(global_config_id),
-      tx.object(params.coinTypeA),
-      tx.object(params.coinTypeB),
+      primaryCoinInputA.targetCoin,
+      primaryCoinInputB.targetCoin,
       tx.pure.u64(params.amountIn),
       tx.pure.u64(params.minAmountOut),
       tx.pure.bool(params.swapForY),
@@ -10898,11 +10981,11 @@ var DlmmModule = class {
     return res;
   }
   /**
-  * Gets a list of positions for the given account address.
-  * @param accountAddress The account address to get positions for.
-  * @param assignPoolIds An array of pool IDs to filter the positions by.
-  * @returns array of Position objects.
-  */
+   * Gets a list of positions for the given account address.
+   * @param accountAddress The account address to get positions for.
+   * @param assignPoolIds An array of pool IDs to filter the positions by.
+   * @returns array of Position objects.
+   */
   async getUserPositionById(positionId, showDisplay = true) {
     let position;
     const ownerRes = await this._sdk.fullClient.getObject({
@@ -11168,7 +11251,7 @@ var DlmmModule = class {
       fee_y: 0
     };
     if (simulateRes.error != null) {
-      throw new Error(`fetchBins error code: ${simulateRes.error ?? "unknown error"}`);
+      throw new Error(`fetchPairRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
       if (extractStructTagFromType(item.type).name === `EventPositionLiquidity`) {