@magmaprotocol/magma-clmm-sdk 0.5.110 → 0.5.112

package/dist/index.mjs

@@ -10539,8 +10539,7 @@ 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.object(CLOCK_ADDRESS)
+      tx.pure.u32(storage_id)
     ];
     tx.moveCall({
       target: `${integrate.published_at}::${AlmmScript}::create_pair`,
@@ -10818,20 +10817,13 @@ var AlmmModule = class {
   async burnPosition(params) {
     const tx = new Transaction12();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, clmm_pool, almm_pool } = this.sdk.sdkOptions;
+    const { integrate, clmm_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(almmConfig.factory), tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
+    let args = [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(almmConfig.factory),
-        tx.object(params.pool_id),
-        tx.object(clmmConfigs.global_vault_id),
-        tx.object(params.position_id),
-        tx.object(CLOCK_ADDRESS)
-      ];
+      args = [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({
@@ -10844,21 +10836,13 @@ var AlmmModule = class {
   async shrinkPosition(params) {
     const tx = new Transaction12();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, clmm_pool, almm_pool } = this.sdk.sdkOptions;
+    const { integrate, clmm_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(almmConfig.factory),
-      tx.object(params.pool_id),
-      tx.object(params.position_id),
-      tx.pure.u64(params.delta_percentage),
-      tx.object(CLOCK_ADDRESS)
-    ];
+    let args = [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),
@@ -10895,12 +10879,10 @@ var AlmmModule = class {
   async collectReward(params, transaction) {
     const tx = transaction || new Transaction12();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, clmm_pool, almm_pool } = this.sdk.sdkOptions;
+    const { integrate, clmm_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),
@@ -10920,10 +10902,9 @@ var AlmmModule = class {
   async collectFees(params, transaction) {
     const tx = transaction || new Transaction12();
     tx.setSender(this.sdk.senderAddress);
-    const { integrate, almm_pool } = this.sdk.sdkOptions;
-    const almmConfig = getPackagerConfigs(almm_pool);
+    const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coin_a, params.coin_b];
-    const args = [tx.object(almmConfig.factory), tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
+    const args = [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,
@@ -10973,9 +10954,8 @@ var AlmmModule = class {
   async swap(params) {
     const tx = new Transaction12();
     tx.setSender(this.sdk.senderAddress);
-    const { clmm_pool, almm_pool, integrate } = this.sdk.sdkOptions;
+    const { clmm_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(
@@ -10995,7 +10975,6 @@ var AlmmModule = class {
       true
     );
     const args = [
-      tx.object(almmConfig.factory),
       tx.object(params.pair),
       tx.object(global_config_id),
       primaryCoinInputA.targetCoin,
@@ -11104,6 +11083,29 @@ var AlmmModule = class {
   //     contractPool: pool,
   //   }
   // }
+  /**
+   * Gets a list of positions for the given account address.
+   * @param positionId 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 allPosition = [];
+    const ownerRes = await this._sdk.fullClient.getObject({
+      id: positionId,
+      options: { showContent: true, showType: true, showDisplay, showOwner: true }
+    });
+    for (const item of ownerRes.data) {
+      const type = extractStructTagFromType(item.data.type);
+      if (type.full_address === this.buildPositionType()) {
+        const position = this.buildPosition(item);
+        const cacheKey = `${position.pos_object_id}_getPositionList`;
+        this.updateCache(cacheKey, position, cacheTime24h);
+        allPosition.push(position);
+      }
+    }
+    return await this.getUserPositionInfo(allPosition);
+  }
   /**
    * Gets a list of positions for the given account address.
    * @param accountAddress The account address to get positions for.
@@ -11124,7 +11126,7 @@ var AlmmModule = class {
         const cacheKey = `${position.pos_object_id}_getPositionList`;
         this.updateCache(cacheKey, position, cacheTime24h);
         if (hasAssignPoolIds) {
-          if (assignPoolIds.includes(position.pos_object_id)) {
+          if (assignPoolIds.includes(position.pool)) {
             allPosition.push(position);
           }
         } else {
@@ -11132,6 +11134,9 @@ var AlmmModule = class {
         }
       }
     }
+    return this.getUserPositionInfo(allPosition);
+  }
+  async getUserPositionInfo(allPosition) {
     const poolMap = /* @__PURE__ */ new Set();
     for (const item of allPosition) {
       poolMap.add(item.pool);