@magmaprotocol/magma-clmm-sdk 0.5.116 → 0.5.118

package/dist/index.d.ts

@@ -4320,6 +4320,10 @@ declare class TransactionUtil {
      */
     static fixAddLiquidityFixTokenParams(params: AddLiquidityFixTokenParams, slippage: number, curSqrtPrice: BN): AddLiquidityFixTokenParams;
     private static buildAddLiquidityFixTokenArgs;
+    static buildAddLiquidityWithProtectionFixTokenForGas(sdk: MagmaClmmSDK, allCoins: CoinAsset[], params: AddLiquidityFixTokenParams, gasEstimateArg: {
+        slippage: number;
+        curSqrtPrice: BN;
+    }, tx?: Transaction, inputCoinA?: TransactionObjectArgument, inputCoinB?: TransactionObjectArgument): Promise<Transaction>;
     private static buildAddLiquidityWithProtectionFixTokenArgs;
     /**
      * build add liquidity transaction

package/dist/index.js

@@ -3584,6 +3584,72 @@ var _TransactionUtil = class {
     });
     return tx;
   }
+  static async buildAddLiquidityWithProtectionFixTokenForGas(sdk, allCoins, params, gasEstimateArg, tx, inputCoinA, inputCoinB) {
+    tx = await _TransactionUtil.buildAddLiquidityFixToken(sdk, allCoins, params, tx, inputCoinA, inputCoinB);
+    const { isAdjustCoinA } = findAdjustCoin(params);
+    const suiAmount = isAdjustCoinA ? params.amount_a : params.amount_b;
+    const newResult = await _TransactionUtil.adjustTransactionForGas(
+      sdk,
+      CoinAssist.getCoinAssets(isAdjustCoinA ? params.coinTypeA : params.coinTypeB, allCoins),
+      BigInt(suiAmount),
+      tx
+    );
+    const { fixAmount } = newResult;
+    const { newTx } = newResult;
+    if (newTx != null) {
+      let primaryCoinAInputs;
+      let primaryCoinBInputs;
+      if (isAdjustCoinA) {
+        params.amount_a = Number(fixAmount);
+        primaryCoinAInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
+          newTx,
+          !params.fix_amount_a,
+          fixAmount.toString(),
+          params.slippage,
+          params.coinTypeA,
+          allCoins,
+          false,
+          true
+        );
+        primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
+          newTx,
+          params.fix_amount_a,
+          params.amount_b,
+          params.slippage,
+          params.coinTypeB,
+          allCoins,
+          false,
+          true
+        );
+      } else {
+        params.amount_b = Number(fixAmount);
+        primaryCoinAInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
+          newTx,
+          !params.fix_amount_a,
+          params.amount_a,
+          params.slippage,
+          params.coinTypeA,
+          allCoins,
+          false,
+          true
+        );
+        primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
+          newTx,
+          params.fix_amount_a,
+          fixAmount.toString(),
+          params.slippage,
+          params.coinTypeB,
+          allCoins,
+          false,
+          true
+        );
+        params = _TransactionUtil.fixAddLiquidityFixTokenParams(params, gasEstimateArg.slippage, gasEstimateArg.curSqrtPrice);
+        tx = _TransactionUtil.buildAddLiquidityWithProtectionFixTokenArgs(newTx, sdk, allCoins, params, primaryCoinAInputs, primaryCoinBInputs);
+        return tx;
+      }
+    }
+    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";
@@ -6321,7 +6387,7 @@ var PositionModule = class {
       const { isAdjustCoinA, isAdjustCoinB } = findAdjustCoin(params);
       params = params;
       if (params.fix_amount_a && isAdjustCoinA || !params.fix_amount_a && isAdjustCoinB) {
-        tx = await TransactionUtil.buildAddLiquidityFixTokenForGas(
+        tx = await TransactionUtil.buildAddLiquidityWithProtectionFixTokenForGas(
           this._sdk,
           allCoinAsset,
           params,
@@ -10789,7 +10855,8 @@ var AlmmModule = class {
       tx.object(global_config_id),
       tx.pure.u64(params.base_fee),
       tx.pure.u16(params.bin_step),
-      tx.pure.u32(storage_id)
+      tx.pure.u32(storage_id),
+      tx.object(CLOCK_ADDRESS)
     ];
     tx.moveCall({
       target: `${integrate.published_at}::${AlmmScript}::create_pair`,
@@ -11067,13 +11134,20 @@ var AlmmModule = class {
   async burnPosition(params) {
     const tx = new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, clmm_pool } = this.sdk.sdkOptions;
+    const { integrate, clmm_pool, almm_pool } = this.sdk.sdkOptions;
     const clmmConfigs = getPackagerConfigs(clmm_pool);
+    const almmConfig = getPackagerConfigs(almm_pool);
     const typeArguments = [params.coin_a, params.coin_b, ...params.rewards_token];
-    let args = [tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
+    let args = [tx.object(almmConfig.factory), tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
     let target = `${integrate.published_at}::${AlmmScript}::burn_position`;
     if (params.rewards_token.length > 0) {
-      args = [tx.object(params.pool_id), tx.object(clmmConfigs.global_vault_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
+      args = [
+        tx.object(almmConfig.factory),
+        tx.object(params.pool_id),
+        tx.object(clmmConfigs.global_vault_id),
+        tx.object(params.position_id),
+        tx.object(CLOCK_ADDRESS)
+      ];
       target = `${integrate.published_at}::${AlmmScript}::burn_position_reward${params.rewards_token.length}`;
     }
     tx.moveCall({
@@ -11086,13 +11160,21 @@ var AlmmModule = class {
   async shrinkPosition(params) {
     const tx = new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, clmm_pool } = this.sdk.sdkOptions;
+    const { integrate, clmm_pool, almm_pool } = this.sdk.sdkOptions;
     const clmmConfigs = getPackagerConfigs(clmm_pool);
+    const almmConfig = getPackagerConfigs(almm_pool);
     const typeArguments = [params.coin_a, params.coin_b, ...params.rewards_token];
-    let args = [tx.object(params.pool_id), tx.object(params.position_id), tx.pure.u64(params.delta_percentage), tx.object(CLOCK_ADDRESS)];
+    let args = [
+      tx.object(almmConfig.factory),
+      tx.object(params.pool_id),
+      tx.object(params.position_id),
+      tx.pure.u64(params.delta_percentage),
+      tx.object(CLOCK_ADDRESS)
+    ];
     let target = `${integrate.published_at}::${AlmmScript}::shrink_position`;
     if (params.rewards_token.length > 0) {
       args = [
+        tx.object(almmConfig.factory),
         tx.object(params.pool_id),
         tx.object(clmmConfigs.global_vault_id),
         tx.object(params.position_id),
@@ -11129,10 +11211,12 @@ var AlmmModule = class {
   async collectReward(params, transaction) {
     const tx = transaction || new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, clmm_pool } = this.sdk.sdkOptions;
+    const { integrate, clmm_pool, almm_pool } = this.sdk.sdkOptions;
     const clmmConfigs = getPackagerConfigs(clmm_pool);
+    const almmConfig = getPackagerConfigs(almm_pool);
     const typeArguments = [params.coin_a, params.coin_b, ...params.rewards_token];
     const args = [
+      tx.object(almmConfig.factory),
       tx.object(params.pool_id),
       tx.object(clmmConfigs.global_vault_id),
       tx.object(params.position_id),
@@ -11152,9 +11236,10 @@ var AlmmModule = class {
   async collectFees(params, transaction) {
     const tx = transaction || new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate } = this.sdk.sdkOptions;
+    const { integrate, almm_pool } = this.sdk.sdkOptions;
+    const almmConfig = getPackagerConfigs(almm_pool);
     const typeArguments = [params.coin_a, params.coin_b];
-    const args = [tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
+    const args = [tx.object(almmConfig.factory), tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
     const target = `${integrate.published_at}::${AlmmScript}::collect_fees`;
     tx.moveCall({
       target,
@@ -11204,8 +11289,9 @@ var AlmmModule = class {
   async swap(params) {
     const tx = new import_transactions12.Transaction();
     tx.setSender(this.sdk.senderAddress);
-    const { clmm_pool, integrate } = this.sdk.sdkOptions;
+    const { clmm_pool, almm_pool, integrate } = this.sdk.sdkOptions;
     const { global_config_id } = getPackagerConfigs(clmm_pool);
+    const almmConfig = getPackagerConfigs(almm_pool);
     const typeArguments = [params.coinTypeA, params.coinTypeB];
     const allCoinAsset = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
     const primaryCoinInputA = TransactionUtil.buildCoinForAmount(
@@ -11225,6 +11311,7 @@ var AlmmModule = class {
       true
     );
     const args = [
+      tx.object(almmConfig.factory),
       tx.object(params.pair),
       tx.object(global_config_id),
       primaryCoinInputA.targetCoin,