@magmaprotocol/magma-clmm-sdk 0.5.5 → 0.5.7

package/dist/index.d.ts

@@ -3722,7 +3722,7 @@ declare class TransactionUtil {
      * @returns
      */
     static buildAddLiquidityWithProtectionFixToken(sdk: MagmaClmmSDK, allCoinAsset: CoinAsset[], params: AddLiquidityFixTokenParams, tx?: Transaction, inputCoinA?: TransactionObjectArgument, inputCoinB?: TransactionObjectArgument): Promise<Transaction>;
-    static buildAddLiquidityFixTokenCoinInput(tx: Transaction, need_interval_amount: boolean, amount: number | string, slippage: number, coinType: string, allCoinAsset: CoinAsset[], buildVector?: boolean): BuildCoinResult;
+    static buildAddLiquidityFixTokenCoinInput(tx: Transaction, need_interval_amount: boolean, amount: number | string, slippage: number, coinType: string, allCoinAsset: CoinAsset[], buildVector?: boolean, fixAmount?: boolean): BuildCoinResult;
     /**
      * fix add liquidity fix token for coin amount
      * @param params
@@ -3823,11 +3823,14 @@ declare class TransactionUtil {
         swapTicks: Array<TickData>;
         currentPool: Pool;
     }): Promise<SwapParams>;
-    static syncBuildCoinInputForAmount(sdk: MagmaClmmSDK, tx: Transaction, amount: bigint, coinType: string, buildVector?: boolean): Promise<TransactionObjectArgument | undefined>;
+    static syncBuildCoinInputForAmount(sdk: MagmaClmmSDK, tx: Transaction, amount: bigint, coinType: string, buildVector?: boolean, fixAmount?: boolean): Promise<TransactionObjectArgument | undefined>;
     static buildCoinForAmount(tx: Transaction, allCoins: CoinAsset[], amount: bigint, coinType: string, buildVector?: boolean, fixAmount?: boolean): BuildCoinResult;
+    private static buildVectorCoin;
+    private static buildOneCoin;
+    private static buildSpitTargeCoin;
     private static buildCoin;
     private static buildZeroValueCoin;
-    static buildCoinForAmountInterval(tx: Transaction, allCoins: CoinAsset[], amounts: CoinInputInterval, coinType: string, buildVector?: boolean): BuildCoinResult;
+    static buildCoinForAmountInterval(tx: Transaction, allCoins: CoinAsset[], amounts: CoinInputInterval, coinType: string, buildVector?: boolean, fixAmount?: boolean): BuildCoinResult;
     static callMintZeroValueCoin: (txb: Transaction, coinType: string) => _mysten_sui_transactions.TransactionResult;
     static buildRouterSwapTransaction(sdk: MagmaClmmSDK, params: SwapWithRouterParams, byAmountIn: boolean, allCoinAsset: CoinAsset[], recipient?: string): Promise<Transaction>;
     static buildRouterBasePathTx(sdk: MagmaClmmSDK, params: SwapWithRouterParams, byAmountIn: boolean, allCoinAsset: CoinAsset[], tx: Transaction, recipient?: string): Promise<Transaction>;

package/dist/index.js

@@ -1235,8 +1235,8 @@ var ClmmPoolUtil = class {
       liquidity = estimateLiquidityForCoinB(curSqrtPrice, lowerSqrtPrice, coinAmount);
     }
     const coinAmounts = ClmmPoolUtil.getCoinAmountFromLiquidity(liquidity, curSqrtPrice, lowerSqrtPrice, upperSqrtPrice, roundUp);
-    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();
+    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();
     return {
       coinAmountA: coinAmounts.coinA,
       coinAmountB: coinAmounts.coinB,
@@ -2723,7 +2723,8 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeA,
           allCoins,
-          false
+          false,
+          true
         );
         primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
           newTx,
@@ -2732,7 +2733,8 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeB,
           allCoins,
-          false
+          false,
+          true
         );
       } else {
         params.amount_b = Number(fixAmount);
@@ -2743,7 +2745,8 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeA,
           allCoins,
-          false
+          false,
+          true
         );
         primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
           newTx,
@@ -2752,10 +2755,11 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeB,
           allCoins,
-          false
+          false,
+          true
         );
         params = _TransactionUtil.fixAddLiquidityFixTokenParams(params, gasEstimateArg.slippage, gasEstimateArg.curSqrtPrice);
-        tx = await _TransactionUtil.buildAddLiquidityFixTokenArgs(newTx, sdk, allCoins, params, primaryCoinAInputs, primaryCoinBInputs);
+        tx = _TransactionUtil.buildAddLiquidityFixTokenArgs(newTx, sdk, allCoins, params, primaryCoinAInputs, primaryCoinBInputs);
         return tx;
       }
     }
@@ -2782,7 +2786,8 @@ var _TransactionUtil = class {
         params.slippage,
         params.coinTypeA,
         allCoinAsset,
-        false
+        false,
+        true
       );
       primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
         tx,
@@ -2791,7 +2796,8 @@ var _TransactionUtil = class {
         params.slippage,
         params.coinTypeB,
         allCoinAsset,
-        false
+        false,
+        true
       );
     } else {
       primaryCoinAInputs = {
@@ -2873,14 +2879,15 @@ var _TransactionUtil = class {
     );
     return tx;
   }
-  static buildAddLiquidityFixTokenCoinInput(tx, need_interval_amount, amount, slippage, coinType, allCoinAsset, buildVector = true) {
+  static buildAddLiquidityFixTokenCoinInput(tx, need_interval_amount, amount, slippage, coinType, allCoinAsset, buildVector = true, fixAmount = true) {
     return need_interval_amount ? _TransactionUtil.buildCoinForAmountInterval(
       tx,
       allCoinAsset,
       { amountSecond: BigInt(reverSlippageAmount(amount, slippage)), amountFirst: BigInt(amount) },
       coinType,
-      buildVector
-    ) : _TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(amount), coinType, false, true);
+      buildVector,
+      fixAmount
+    ) : _TransactionUtil.buildCoinForAmount(tx, allCoinAsset, BigInt(amount), coinType, buildVector, fixAmount);
   }
   /**
    * fix add liquidity fix token for coin amount
@@ -2975,11 +2982,6 @@ var _TransactionUtil = class {
       max_amount_a = params.amount_a;
       min_amount_a = new import_decimal7.default(params.amount_a).div(new import_decimal7.default(1).plus(new import_decimal7.default(params.slippage))).mul(new import_decimal7.default(1).minus(new import_decimal7.default(params.slippage))).toDecimalPlaces(0).toNumber();
     }
-    console.log("min_amount_a", min_amount_a);
-    console.log("max_amount_a", max_amount_a);
-    console.log("min_amount_b", min_amount_b);
-    console.log("max_amount_b", max_amount_b);
-    console.log("params.fix_amount_a", params.fix_amount_a);
     const args = params.is_open ? [
       tx.object(clmmConfig.global_config_id),
       tx.object(params.pool_id),
@@ -3534,17 +3536,17 @@ var _TransactionUtil = class {
     }
     return params;
   }
-  static async syncBuildCoinInputForAmount(sdk, tx, amount, coinType, buildVector = true) {
+  static async syncBuildCoinInputForAmount(sdk, tx, amount, coinType, buildVector = true, fixAmount = true) {
     if (sdk.senderAddress.length === 0) {
       throw Error("this config sdk senderAddress is empty");
     }
     const allCoins = await sdk.getOwnerCoinAssets(sdk.senderAddress, coinType);
-    const primaryCoinInput = _TransactionUtil.buildCoinForAmount(tx, allCoins, amount, coinType, buildVector).targetCoin;
+    const primaryCoinInput = _TransactionUtil.buildCoinForAmount(tx, allCoins, amount, coinType, buildVector, fixAmount).targetCoin;
     return primaryCoinInput;
   }
-  static buildCoinForAmount(tx, allCoins, amount, coinType, buildVector = true, fixAmount = false) {
+  static buildCoinForAmount(tx, allCoins, amount, coinType, buildVector = true, fixAmount = true) {
     const coinAssets = CoinAssist.getCoinAssets(coinType, allCoins);
-    if (amount === BigInt(0) && coinAssets.length === 0) {
+    if (amount === BigInt(0)) {
       return _TransactionUtil.buildZeroValueCoin(allCoins, tx, coinType, buildVector);
     }
     const amountTotal = CoinAssist.calculateTotalBalance(coinAssets);
@@ -3556,18 +3558,41 @@ var _TransactionUtil = class {
     }
     return _TransactionUtil.buildCoin(tx, allCoins, coinAssets, amount, coinType, buildVector, fixAmount);
   }
-  static buildCoin(tx, allCoins, coinAssets, amount, coinType, buildVector = true, fixAmount = false) {
+  static buildVectorCoin(tx, allCoins, coinAssets, amount, coinType, fixAmount = true) {
+    if (CoinAssist.isSuiCoin(coinType)) {
+      const amountCoin = tx.splitCoins(tx.gas, [tx.pure.u64(amount)]);
+      return {
+        targetCoin: tx.makeMoveVec({ elements: [amountCoin] }),
+        remainCoins: allCoins,
+        tragetCoinAmount: amount.toString(),
+        isMintZeroCoin: false,
+        originalSplitedCoin: tx.gas
+      };
+    }
+    const { targetCoin, originalSplitedCoin, tragetCoinAmount, selectedCoinsResult, coinObjectIds } = this.buildSpitTargeCoin(
+      tx,
+      amount,
+      coinAssets,
+      fixAmount
+    );
+    if (fixAmount) {
+      return {
+        targetCoin: tx.makeMoveVec({ elements: [targetCoin] }),
+        remainCoins: selectedCoinsResult.remainCoins,
+        originalSplitedCoin,
+        tragetCoinAmount,
+        isMintZeroCoin: false
+      };
+    }
+    return {
+      targetCoin: tx.makeMoveVec({ elements: coinObjectIds.map((id) => tx.object(id)) }),
+      remainCoins: selectedCoinsResult.remainCoins,
+      tragetCoinAmount: selectedCoinsResult.amountArray.reduce((a, b) => Number(a) + Number(b), 0).toString(),
+      isMintZeroCoin: false
+    };
+  }
+  static buildOneCoin(tx, coinAssets, amount, coinType, fixAmount = true) {
     if (CoinAssist.isSuiCoin(coinType)) {
-      if (buildVector) {
-        const amountCoin2 = tx.splitCoins(tx.gas, [tx.pure.u64(amount)]);
-        return {
-          targetCoin: tx.makeMoveVec({ elements: [amountCoin2] }),
-          remainCoins: allCoins,
-          tragetCoinAmount: amount.toString(),
-          isMintZeroCoin: false,
-          originalSplitedCoin: tx.gas
-        };
-      }
       if (amount === 0n && coinAssets.length > 1) {
         const selectedCoinsResult3 = CoinAssist.selectCoinObjectIdGreaterThanOrEqual(coinAssets, amount);
         return {
@@ -3587,17 +3612,24 @@ var _TransactionUtil = class {
         originalSplitedCoin: tx.gas
       };
     }
+    const { targetCoin, originalSplitedCoin, tragetCoinAmount, selectedCoinsResult } = this.buildSpitTargeCoin(
+      tx,
+      amount,
+      coinAssets,
+      fixAmount
+    );
+    return {
+      targetCoin,
+      remainCoins: selectedCoinsResult.remainCoins,
+      originalSplitedCoin,
+      tragetCoinAmount,
+      isMintZeroCoin: false
+    };
+  }
+  static buildSpitTargeCoin(tx, amount, coinAssets, fixAmount) {
     const selectedCoinsResult = CoinAssist.selectCoinObjectIdGreaterThanOrEqual(coinAssets, amount);
     const totalSelectedCoinAmount = selectedCoinsResult.amountArray.reduce((a, b) => Number(a) + Number(b), 0).toString();
     const coinObjectIds = selectedCoinsResult.objectArray;
-    if (buildVector) {
-      return {
-        targetCoin: tx.makeMoveVec({ elements: coinObjectIds.map((id) => tx.object(id)) }),
-        remainCoins: selectedCoinsResult.remainCoins,
-        tragetCoinAmount: selectedCoinsResult.amountArray.reduce((a, b) => Number(a) + Number(b), 0).toString(),
-        isMintZeroCoin: false
-      };
-    }
     const [primaryCoinA, ...mergeCoinAs] = coinObjectIds;
     const primaryCoinAObject = tx.object(primaryCoinA);
     let targetCoin = primaryCoinAObject;
@@ -3614,13 +3646,19 @@ var _TransactionUtil = class {
       originalSplitedCoin = primaryCoinAObject;
     }
     return {
-      targetCoin,
-      remainCoins: selectedCoinsResult.remainCoins,
       originalSplitedCoin,
+      targetCoin,
       tragetCoinAmount,
-      isMintZeroCoin: false
+      selectedCoinsResult,
+      coinObjectIds
     };
   }
+  static buildCoin(tx, allCoins, coinAssets, amount, coinType, buildVector = true, fixAmount = true) {
+    if (buildVector) {
+      return this.buildVectorCoin(tx, allCoins, coinAssets, amount, coinType, fixAmount);
+    }
+    return this.buildOneCoin(tx, coinAssets, amount, coinType, fixAmount);
+  }
   static buildZeroValueCoin(allCoins, tx, coinType, buildVector = true) {
     const zeroCoin = _TransactionUtil.callMintZeroValueCoin(tx, coinType);
     let targetCoin;
@@ -3636,17 +3674,17 @@ var _TransactionUtil = class {
       tragetCoinAmount: "0"
     };
   }
-  static buildCoinForAmountInterval(tx, allCoins, amounts, coinType, buildVector = true) {
+  static buildCoinForAmountInterval(tx, allCoins, amounts, coinType, buildVector = true, fixAmount = true) {
     const coinAssets = CoinAssist.getCoinAssets(coinType, allCoins);
     if (amounts.amountFirst === BigInt(0)) {
       if (coinAssets.length > 0) {
-        return _TransactionUtil.buildCoin(tx, [...allCoins], [...coinAssets], amounts.amountFirst, coinType, buildVector);
+        return _TransactionUtil.buildCoin(tx, [...allCoins], [...coinAssets], amounts.amountFirst, coinType, buildVector, fixAmount);
       }
       return _TransactionUtil.buildZeroValueCoin(allCoins, tx, coinType, buildVector);
     }
     const amountTotal = CoinAssist.calculateTotalBalance(coinAssets);
     if (amountTotal >= amounts.amountFirst) {
-      return _TransactionUtil.buildCoin(tx, [...allCoins], [...coinAssets], amounts.amountFirst, coinType, buildVector);
+      return _TransactionUtil.buildCoin(tx, [...allCoins], [...coinAssets], amounts.amountFirst, coinType, buildVector, fixAmount);
     }
     if (amountTotal < amounts.amountSecond) {
       throw new ClmmpoolsError(
@@ -3654,7 +3692,7 @@ var _TransactionUtil = class {
         "InsufficientBalance" /* InsufficientBalance */
       );
     }
-    return _TransactionUtil.buildCoin(tx, [...allCoins], [...coinAssets], amounts.amountSecond, coinType, buildVector);
+    return _TransactionUtil.buildCoin(tx, [...allCoins], [...coinAssets], amounts.amountSecond, coinType, buildVector, fixAmount);
   }
   // ------------------------------------------router-v1-------------------------------------------------//
   static async buildRouterSwapTransaction(sdk, params, byAmountIn, allCoinAsset, recipient) {
@@ -5622,8 +5660,8 @@ var PositionModule = class {
     let primaryCoinBInputs;
     if (inputCoinA == null || inputCoinB == null) {
       const allCoinAsset = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
-      primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, max_amount_a, params.coinTypeA, false);
-      primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, max_amount_b, params.coinTypeB, false);
+      primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, max_amount_a, params.coinTypeA, false, true);
+      primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoinAsset, max_amount_b, params.coinTypeB, false, true);
     } else {
       primaryCoinAInputs = {
         targetCoin: inputCoinA,