@magmaprotocol/magma-clmm-sdk 0.5.6 → 0.5.8

package/dist/index.mjs

@@ -2520,7 +2520,8 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeA,
           allCoins,
-          false
+          false,
+          true
         );
         primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
           newTx,
@@ -2529,7 +2530,8 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeB,
           allCoins,
-          false
+          false,
+          true
         );
       } else {
         params.amount_b = Number(fixAmount);
@@ -2540,7 +2542,8 @@ var _TransactionUtil = class {
           params.slippage,
           params.coinTypeA,
           allCoins,
-          false
+          false,
+          true
         );
         primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
           newTx,
@@ -2549,10 +2552,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;
       }
     }
@@ -2579,7 +2583,8 @@ var _TransactionUtil = class {
         params.slippage,
         params.coinTypeA,
         allCoinAsset,
-        false
+        false,
+        true
       );
       primaryCoinBInputs = _TransactionUtil.buildAddLiquidityFixTokenCoinInput(
         tx,
@@ -2588,7 +2593,8 @@ var _TransactionUtil = class {
         params.slippage,
         params.coinTypeB,
         allCoinAsset,
-        false
+        false,
+        true
       );
     } else {
       primaryCoinAInputs = {
@@ -2670,14 +2676,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
@@ -2772,11 +2779,6 @@ var _TransactionUtil = class {
       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))).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),
@@ -3014,7 +3016,7 @@ var _TransactionUtil = class {
     tx.setSender(sdk.senderAddress);
     tx.setGasBudget(1e8);
     const { integrate } = sdk.sdkOptions;
-    const { voting_escrow_id, magma_token, voter_id } = getPackagerConfigs(sdk.sdkOptions.magma_config);
+    const { distribution_cfg, voting_escrow_id, magma_token, voter_id } = getPackagerConfigs(sdk.sdkOptions.magma_config);
     const typeArguments = [magma_token];
     const functionName = "vote";
     const pools = tx.pure.vector("id", params.pools);
@@ -3022,7 +3024,15 @@ var _TransactionUtil = class {
       elements: params.weights.map((weight) => tx.pure.u64(weight)),
       type: "u64"
     });
-    const args = [tx.object(voter_id), tx.object(voting_escrow_id), tx.object(params.lockId), pools, weights, tx.object(CLOCK_ADDRESS)];
+    const args = [
+      tx.object(distribution_cfg),
+      tx.object(voter_id),
+      tx.object(voting_escrow_id),
+      tx.object(params.lockId),
+      pools,
+      weights,
+      tx.object(CLOCK_ADDRESS)
+    ];
     tx.moveCall({
       target: `${integrate.published_at}::${Voter}::${functionName}`,
       typeArguments,
@@ -3084,10 +3094,16 @@ var _TransactionUtil = class {
     const tx = new Transaction();
     tx.setSender(sdk.senderAddress);
     const { integrate } = sdk.sdkOptions;
-    const { voting_escrow_id, magma_token, voter_id } = getPackagerConfigs(sdk.sdkOptions.magma_config);
+    const { distribution_cfg, voting_escrow_id, magma_token, voter_id } = getPackagerConfigs(sdk.sdkOptions.magma_config);
     const typeArguments = [magma_token];
     const functionName = "poke";
-    const args = [tx.object(voter_id), tx.object(voting_escrow_id), tx.object(params.lockId), tx.object(CLOCK_ADDRESS)];
+    const args = [
+      tx.object(distribution_cfg),
+      tx.object(voter_id),
+      tx.object(voting_escrow_id),
+      tx.object(params.lockId),
+      tx.object(CLOCK_ADDRESS)
+    ];
     tx.moveCall({
       target: `${integrate.published_at}::${Voter}::${functionName}`,
       typeArguments,
@@ -3331,17 +3347,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);
@@ -3353,18 +3369,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 {
@@ -3384,17 +3423,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;
@@ -3411,13 +3457,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;
@@ -3433,17 +3485,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(
@@ -3451,7 +3503,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) {
@@ -5419,8 +5471,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,
@@ -7250,6 +7302,62 @@ var LockModule = class {
     }
     return locksInfo;
   }
+  async aLockInfo(lockId) {
+    const aLockSummary = await this.aLockSummary(lockId);
+    const lockObj = await this._sdk.fullClient.getObject({
+      id: lockId,
+      options: {
+        showContent: true,
+        showDisplay: true,
+        showOwner: true,
+        showPreviousTransaction: true,
+        showStorageRebate: true,
+        showType: true
+      }
+    });
+    const { magma_token } = getPackagerConfigs(this.sdk.sdkOptions.magma_config);
+    const poolIncentiveTokens = await this.getVotingBribeRewardTokens(lockId);
+    const incentiveTokens = [];
+    poolIncentiveTokens.forEach((value, key) => {
+      incentiveTokens.push(...value);
+    });
+    const poolIncentiveRewards = await this.getPoolIncentiveRewrads(incentiveTokens, lockId);
+    const votingRewards = /* @__PURE__ */ new Map();
+    poolIncentiveRewards.forEach((value, coin) => {
+      value.forEach((amount, pool) => {
+        if (!votingRewards.has(pool)) {
+          votingRewards.set(pool, []);
+        }
+        votingRewards.get(pool)?.push({
+          kind: "incentiveCoin" /* Incentive */,
+          token_addr: coin,
+          amount: amount.toString()
+        });
+      });
+    });
+    if (lockObj.error != null || lockObj.data?.content?.dataType !== "moveObject") {
+      throw new ClmmpoolsError(
+        `getPool error code: ${lockObj.error?.code ?? "unknown error"}, please check config and object id`,
+        "InvalidLockObject" /* InvalidLockObject */
+      );
+    }
+    const fields = getObjectFields(lockObj);
+    const lockInfo = {
+      lock_id: lockId,
+      amount: fields.amount,
+      start: fields.start,
+      end: fields.end,
+      permanent: fields.permanent,
+      rebase_amount: {
+        kind: "rebaseCoin" /* RebaseCoin */,
+        token_addr: magma_token,
+        amount: aLockSummary.reward_distributor_claimable
+      },
+      voting_power: aLockSummary.voting_power,
+      voting_rewards: votingRewards
+    };
+    return lockInfo;
+  }
   async aLockSummary(lock_id) {
     const tx = new Transaction9();
     const { integrate, simulationAccount } = this.sdk.sdkOptions;
@@ -8600,6 +8708,7 @@ var ConfigModule = class {
       voter_id: "",
       minter_id: "",
       reward_distributor_id: "",
+      distribution_cfg: "",
       magma_token: "",
       voting_escrow_id: ""
     };
@@ -9153,11 +9262,12 @@ var SDKConfig = {
     launchpad_pools_handle: "0x5e194a8efcf653830daf85a85b52e3ae8f65dc39481d54b2382acda25068375c",
     clmm_pools_handle: "0x37f60eb2d9d227949b95da8fea810db3c32d1e1fa8ed87434fc51664f87d83cb",
     global_config_id: "0x4f32c00706e7bdbce532acdcfc0afd91b14defd5ffc9e2723a0ce7ed84f5d380",
-    voter_id: "0x2e2fae39d85e991e1adad756f6723bb1aebc33140b8b16897a41171640389f88",
-    voting_escrow_id: "0x8c300ccc0cb221feb76d0ed0820ff0873477ab1ada266129d594d539c5cd2f11",
-    reward_distributor_id: "0x289c10f62e998a2ee58a982262732af7e329b7b689f4c81b0e16de7c6589669c",
-    magma_token: "0x4201f44d506036666a1d9166f7a3450a80c73c551a582684cf39f2dbb3d56461::magma_token::MAGMA_TOKEN",
-    minter_id: "0xfaf1c9b59192a3f910f28d46325dbfb3ffcc92df43d11663f3820fec8faf540b"
+    voter_id: "0xe8e0c266602404caa463f85bee4ccf6000c8c2566204a3949400a06857295ceb",
+    voting_escrow_id: "0x143aab8c7c13c58a94d99ae281b4226f1877abc21bc01b9d75b58a7217fc3b2c",
+    reward_distributor_id: "0x93bf24d3db08f93a02ba90abc7095f8d8086e5a1f72bac8bd866df21defe83ab",
+    distribution_cfg: "0x94e23846c975e2faf89a61bfc2b10ad64decab9069eb1f9fc39752b010868c74",
+    magma_token: "0x3abcdefce1a0ec1252237b69efc6dc3881325d543fceaad2e2f360a02d2f5bd9::magma_token::MAGMA_TOKEN",
+    minter_id: "0x92877b638c3febf8576d0d7caebf9a2c43753b2e441669fb434e709458ece345"
   }
 };
 var clmmMainnet = {
@@ -9176,12 +9286,12 @@ var clmmMainnet = {
     config: SDKConfig.clmmConfig
   },
   distribution: {
-    package_id: "0x4201f44d506036666a1d9166f7a3450a80c73c551a582684cf39f2dbb3d56461",
-    published_at: "0x5c008a2e0aee9a034b19e32bbc119cf6e7b1a0ce1316b2199cde1704d9f64f3c"
+    package_id: "0x3abcdefce1a0ec1252237b69efc6dc3881325d543fceaad2e2f360a02d2f5bd9",
+    published_at: "0x3abcdefce1a0ec1252237b69efc6dc3881325d543fceaad2e2f360a02d2f5bd9"
   },
   integrate: {
-    package_id: "0x01268a2afbaf91538f0b9041269fe2780273eb83b642abd4fcacad7b660a3711",
-    published_at: "0x01268a2afbaf91538f0b9041269fe2780273eb83b642abd4fcacad7b660a3711"
+    package_id: "0x6e3ae31a16362c563c0fef5293348d262646882a10c307f20f6be8577960f1ef",
+    published_at: "0x6e3ae31a16362c563c0fef5293348d262646882a10c307f20f6be8577960f1ef"
   },
   deepbook: {
     package_id: "0x000000000000000000000000000000000000000000000000000000000000dee9",
@@ -9225,6 +9335,7 @@ var SDKConfig2 = {
     voter_id: "0x59571991a5c7041c4376d980061af5c7a6d8345006d6b5167bd1f00fc17b8ddb",
     voting_escrow_id: "0x9081c8044719135da4ff2d52907fcd40c19e2a40750cbba4c1d6a59610ae1446",
     reward_distributor_id: "0xdf213d8e0ca49c8f4a508e7d3b3a6983c4aafd639f7c99479fc75fb4451d752e",
+    distribution_cfg: "0x94e23846c975e2faf89a61bfc2b10ad64decab9069eb1f9fc39752b010868c74",
     magma_token: "0x45ac2371c33ca0df8dc784d62c8ce5126d42edd8c56820396524dff2ae0619b1::magma_token::MAGMA_TOKEN",
     minter_id: "0x89435d6b2a510ba50ca23303f10e91ec058f138a88f69a43fe03cd22edb214c5"
   }