@magmaprotocol/magma-clmm-sdk 0.4.3 → 0.5.1

package/dist/index.mjs

@@ -983,11 +983,7 @@ var ClmmPoolUtil = class {
       coinB = new decimal_default(0);
     } else if (curSqrtPrice.lt(upperSqrtPrice)) {
       coinA = MathUtil.toX64_Decimal(liq).mul(upperPriceStr.sub(curSqrtPriceStr)).div(curSqrtPriceStr.mul(upperPriceStr));
-      const a = curSqrtPriceStr.sub(lowerPriceStr);
-      const b = liq.mul(a);
-      const c = MathUtil.fromX64_Decimal(b);
-      coinB = c;
-      console.log("########## a, b, c", a, b, c);
+      coinB = MathUtil.fromX64_Decimal(liq.mul(curSqrtPriceStr.sub(lowerPriceStr)));
     } else {
       coinA = new decimal_default(0);
       coinB = MathUtil.fromX64_Decimal(liq.mul(upperPriceStr.sub(lowerPriceStr)));
@@ -1036,8 +1032,8 @@ var ClmmPoolUtil = class {
       liquidity = estimateLiquidityForCoinB(curSqrtPrice, lowerSqrtPrice, coinAmount);
     }
     const coinAmounts = ClmmPoolUtil.getCoinAmountFromLiquidity(liquidity, curSqrtPrice, lowerSqrtPrice, upperSqrtPrice, roundUp);
-    const tokenLimitA = roundUp ? d(coinAmounts.coinA.toString()).mul(1 + slippage).toString() : d(coinAmounts.coinA.toString()).mul(1 - slippage).toString();
-    const tokenLimitB = roundUp ? d(coinAmounts.coinB.toString()).mul(1 + slippage).toString() : d(coinAmounts.coinB.toString()).mul(1 - slippage).toString();
+    const tokenLimitA = iscoinA ? d(coinAmounts.coinA.toString()).mul(1 + slippage).toString() : d(coinAmounts.coinA.toString()).mul(1 - slippage).toString();
+    const tokenLimitB = iscoinA ? d(coinAmounts.coinB.toString()).mul(1 + slippage).toString() : d(coinAmounts.coinB.toString()).mul(1 - slippage).toString();
     return {
       coinAmountA: coinAmounts.coinA,
       coinAmountB: coinAmounts.coinB,
@@ -2618,6 +2614,62 @@ var _TransactionUtil = class {
     );
     return tx;
   }
+  /**
+   * build add liquidity with protection transaction
+   * @param params
+   * @param packageId
+   * @returns
+   */
+  static async buildAddLiquidityWithProtectionFixToken(sdk, allCoinAsset, params, tx, inputCoinA, inputCoinB) {
+    if (sdk.senderAddress.length === 0) {
+      throw Error("this config sdk senderAddress is empty");
+    }
+    tx = tx || new Transaction();
+    let primaryCoinAInputs;
+    let primaryCoinBInputs;
+    if (inputCoinA == null || inputCoinB == null) {
+      primaryCoinAInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
+        tx,
+        !params.fix_amount_a,
+        params.amount_a,
+        params.slippage,
+        params.coinTypeA,
+        allCoinAsset,
+        false
+      );
+      primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
+        tx,
+        params.fix_amount_a,
+        params.amount_b,
+        params.slippage,
+        params.coinTypeB,
+        allCoinAsset,
+        false
+      );
+    } else {
+      primaryCoinAInputs = {
+        targetCoin: inputCoinA,
+        remainCoins: [],
+        isMintZeroCoin: false,
+        tragetCoinAmount: "0"
+      };
+      primaryCoinBInputs = {
+        targetCoin: inputCoinB,
+        remainCoins: [],
+        isMintZeroCoin: false,
+        tragetCoinAmount: "0"
+      };
+    }
+    tx = _TransactionUtil.buildAddLiquidityWithProtectionFixTokenArgs(
+      tx,
+      sdk,
+      allCoinAsset,
+      params,
+      primaryCoinAInputs,
+      primaryCoinBInputs
+    );
+    return tx;
+  }
   static buildAddLiquidityFixTokenCoinInput(tx, need_interval_amount, amount, slippage, coinType, allCoinAsset, buildVector = true) {
     return need_interval_amount ? _TransactionUtil.buildCoinForAmountInterval(
       tx,
@@ -2693,6 +2745,67 @@ var _TransactionUtil = class {
     });
     return tx;
   }
+  static buildAddLiquidityWithProtectionFixTokenArgs(tx, sdk, allCoinAsset, params, primaryCoinAInputs, primaryCoinBInputs) {
+    const typeArguments = [params.coinTypeA, params.coinTypeB];
+    const functionName = params.is_open ? "open_position_with_liquidity_by_fix_coin_with_protection" : "add_liquidity_by_fix_coin_with_protection";
+    const { clmm_pool, integrate } = sdk.sdkOptions;
+    if (!params.is_open) {
+      tx = _TransactionUtil.createCollectRewarderAndFeeParams(
+        sdk,
+        tx,
+        params,
+        allCoinAsset,
+        primaryCoinAInputs.remainCoins,
+        primaryCoinBInputs.remainCoins
+      );
+    }
+    const clmmConfig = getPackagerConfigs(clmm_pool);
+    let min_amount_a, max_amount_a, min_amount_b, max_amount_b;
+    if (params.fix_amount_a) {
+      max_amount_a = params.amount_a;
+      min_amount_a = params.amount_a;
+      max_amount_b = params.amount_b;
+      min_amount_b = new Decimal4(params.amount_b).div(new Decimal4(1).plus(new Decimal4(params.slippage))).mul(new Decimal4(1).minus(new Decimal4(params.slippage))).toNumber();
+    } else {
+      max_amount_b = params.amount_b;
+      min_amount_b = params.amount_b;
+      max_amount_a = params.amount_a;
+      min_amount_a = new Decimal4(params.amount_a).div(new Decimal4(1).plus(new Decimal4(params.slippage))).mul(new Decimal4(1).minus(new Decimal4(params.slippage))).toNumber();
+    }
+    const args = params.is_open ? [
+      tx.object(clmmConfig.global_config_id),
+      tx.object(params.pool_id),
+      tx.pure.u32(Number(asUintN(BigInt(params.tick_lower)).toString())),
+      tx.pure.u32(Number(asUintN(BigInt(params.tick_upper)).toString())),
+      primaryCoinAInputs.targetCoin,
+      primaryCoinBInputs.targetCoin,
+      tx.pure.u64(max_amount_a),
+      tx.pure.u64(max_amount_b),
+      tx.pure.u64(min_amount_a),
+      tx.pure.u64(min_amount_b),
+      tx.pure.bool(params.fix_amount_a),
+      tx.object(CLOCK_ADDRESS)
+    ] : [
+      tx.object(clmmConfig.global_config_id),
+      tx.object(params.pool_id),
+      tx.object(params.pos_id),
+      primaryCoinAInputs.targetCoin,
+      primaryCoinBInputs.targetCoin,
+      tx.pure.u64(max_amount_a),
+      tx.pure.u64(max_amount_b),
+      tx.pure.u64(min_amount_a),
+      tx.pure.u64(min_amount_b),
+      tx.pure.bool(params.fix_amount_a),
+      tx.object(CLOCK_ADDRESS),
+      tx.object(CLOCK_ADDRESS)
+    ];
+    tx.moveCall({
+      target: `${integrate.published_at}::${ClmmIntegratePoolV2Module}::${functionName}`,
+      typeArguments,
+      arguments: args
+    });
+    return tx;
+  }
   // -------------------------------------------swap--------------------------------------------------//
   /**
    * build add liquidity transaction
@@ -5251,6 +5364,36 @@ var PositionModule = class {
     }
     return TransactionUtil.buildAddLiquidityFixToken(this._sdk, allCoinAsset, params, tx, inputCoinA, inputCoinB);
   }
+  /**
+   * create add liquidity transaction payload with fix token
+   * @param {AddLiquidityFixTokenParams} params
+   * @param gasEstimateArg : When the fix input amount is SUI, gasEstimateArg can control whether to recalculate the number of SUI to prevent insufficient gas.
+   * If this parameter is not passed, gas estimation is not performed
+   * @returns {Promise<TransactionBlock>}
+   */
+  async createAddLiquidityFixTokenWithProtectionPayload(params, gasEstimateArg, tx, inputCoinA, inputCoinB) {
+    if (!checkInvalidSuiAddress(this._sdk.senderAddress)) {
+      throw new ClmmpoolsError("this config sdk senderAddress is not set right", "InvalidSendAddress" /* InvalidSendAddress */);
+    }
+    const allCoinAsset = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
+    if (gasEstimateArg) {
+      const { isAdjustCoinA, isAdjustCoinB } = findAdjustCoin(params);
+      params = params;
+      if (params.fix_amount_a && isAdjustCoinA || !params.fix_amount_a && isAdjustCoinB) {
+        tx = await TransactionUtil.buildAddLiquidityFixTokenForGas(
+          this._sdk,
+          allCoinAsset,
+          params,
+          gasEstimateArg,
+          tx,
+          inputCoinA,
+          inputCoinB
+        );
+        return tx;
+      }
+    }
+    return TransactionUtil.buildAddLiquidityWithProtectionFixToken(this._sdk, allCoinAsset, params, tx, inputCoinA, inputCoinB);
+  }
   /**
    * create add liquidity transaction payload
    * @param {AddLiquidityParams} params