@magmaprotocol/magma-clmm-sdk 0.5.92 → 0.5.94

package/dist/index.mjs

@@ -11089,44 +11089,103 @@ var DlmmModule = class {
       });
     }
     const pool_reward_coins = await this.getPairRewarders(_params);
-    const positionLiquidityParams = [];
-    const dlmmRewardsParams = [];
-    const dlmmCollectFeeParams = [];
+    const positionsLiquidityRes = [];
+    const positionsRewardsRes = [];
+    const positionsFeesRes = [];
     for (const item of allPosition) {
       const pool = poolList.find((pool2) => pool2.pool_id === item.pool);
-      positionLiquidityParams.push({
-        pair: item.pool,
-        positionId: item.pos_object_id,
-        coinTypeA: pool.coin_a,
-        coinTypeB: pool.coin_b
-      });
-      const rewards_token = pool_reward_coins.get(item.pool) || [];
-      if (rewards_token.length > 0) {
-        dlmmRewardsParams.push({
+      const tx = new Transaction12();
+      this._getPositionLiquidity(
+        {
+          pair: item.pool,
+          positionId: item.pos_object_id,
+          coinTypeA: pool.coin_a,
+          coinTypeB: pool.coin_b
+        },
+        tx
+      );
+      if (pool_reward_coins.has(item.pool) && pool_reward_coins.get(item.pool)?.length !== 0) {
+        this._getEarnedRewards(
+          {
+            pool_id: item.pool,
+            position_id: item.pos_object_id,
+            coin_a: pool.coin_a,
+            coin_b: pool.coin_b,
+            rewards_token: pool_reward_coins.get(item.pool) || []
+          },
+          tx
+        );
+      }
+      this._getEarnedFees(
+        {
           pool_id: item.pool,
           position_id: item.pos_object_id,
           coin_a: pool.coin_a,
-          coin_b: pool.coin_b,
-          rewards_token: pool_reward_coins.get(item.pool) || []
-        });
-      }
-      dlmmCollectFeeParams.push({
-        pool_id: item.pool,
-        position_id: item.pos_object_id,
-        coin_a: pool.coin_a,
-        coin_b: pool.coin_b
+          coin_b: pool.coin_b
+        },
+        tx
+      );
+      const { simulationAccount } = this.sdk.sdkOptions;
+      const simulateRes = await this.sdk.fullClient.devInspectTransactionBlock({
+        transactionBlock: tx,
+        sender: simulationAccount.address
+      });
+      if (simulateRes.error != null) {
+        throw new Error(`fetchPositionLiquidity error code: ${simulateRes.error ?? "unknown error"}`);
+      }
+      simulateRes.events?.forEach((item2) => {
+        if (extractStructTagFromType(item2.type).name === `EventPositionLiquidity`) {
+          positionsLiquidityRes.push({
+            position_id: item2.parsedJson.position_id,
+            shares: item2.parsedJson.shares,
+            liquidity: item2.parsedJson.liquidity,
+            x_equivalent: item2.parsedJson.x_equivalent,
+            y_equivalent: item2.parsedJson.y_equivalent,
+            bin_real_ids: item2.parsedJson.bin_ids.map((id) => get_real_id(id)),
+            bin_x_eq: item2.parsedJson.bin_x_eq,
+            bin_y_eq: item2.parsedJson.bin_y_eq,
+            bin_liquidity: item2.parsedJson.bin_liquidity
+          });
+        }
+        if (extractStructTagFromType(item2.type).name === `EventEarnedFees`) {
+          positionsFeesRes.push({
+            position_id: item2.parsedJson.position_id,
+            x: item2.parsedJson.x.name,
+            y: item2.parsedJson.y.name,
+            fee_x: item2.parsedJson.fee_x,
+            fee_y: item2.parsedJson.fee_y
+          });
+        }
+        if (extractStructTagFromType(item2.type).name === `EventEarnedRewards`) {
+          positionsRewardsRes.push({
+            position_id: item2.parsedJson.position_id,
+            reward: [item2.parsedJson.reward.name],
+            amount: [item2.parsedJson.amount]
+          });
+        }
+        if (extractStructTagFromType(item2.type).name === `EventEarnedRewards2`) {
+          positionsRewardsRes.push({
+            position_id: item2.parsedJson.position_id,
+            reward: [item2.parsedJson.reward1.name, item2.parsedJson.reward2.name],
+            amount: [item2.parsedJson.amount1, item2.parsedJson.amount2]
+          });
+        }
+        if (extractStructTagFromType(item2.type).name === `EventEarnedRewards3`) {
+          positionsRewardsRes.push({
+            position_id: item2.parsedJson.position_id,
+            reward: [item2.parsedJson.reward1.name, item2.parsedJson.reward2.name, item2.parsedJson.reward3.name],
+            amount: [item2.parsedJson.amount1, item2.parsedJson.amount2, item2.parsedJson.amount3]
+          });
+        }
       });
     }
-    const positionsLiquidity = await this.getPositionsLiquidityLimit(positionLiquidityParams);
-    const positionsRewards = await this.getEarnedRewards(dlmmRewardsParams);
-    const positionsFees = await this.getEarnedFeesLimit(dlmmCollectFeeParams);
     const out = [];
     for (let i = 0; i < allPosition.length; i++) {
       const item = allPosition[i];
       const pool = poolList.find((pool2) => pool2.pool_id === item.pool);
-      const positionLiquidity = positionsLiquidity.find((liquidity) => liquidity.position_id === item.pos_object_id);
-      const positionRewards = positionsRewards.find((rewards) => rewards.position_id === item.pos_object_id);
-      const positionFees = positionsFees.find((fees) => fees.position_id === item.pos_object_id);
+      const positionLiquidity = positionsLiquidityRes.find((liquidity) => liquidity.position_id === item.pos_object_id);
+      const positionRewards = positionsRewardsRes.find((rewards) => rewards.position_id === item.pos_object_id);
+      const positionFees = positionsFeesRes.find((fees) => fees.position_id === item.pos_object_id);
       out.push({
         position: allPosition[i],
         liquidity: positionLiquidity,
@@ -11282,7 +11341,6 @@ var DlmmModule = class {
     return out;
   }
   async getEarnedFees(params) {
-    console.log("############ params: ", params);
     let tx = new Transaction12();
     for (const param of params) {
       tx = await this._getEarnedFees(param, tx);
@@ -11327,7 +11385,9 @@ var DlmmModule = class {
   async getEarnedRewards(params) {
     let tx = new Transaction12();
     for (const param of params) {
-      tx = await this._getEarnedRewards(param, tx);
+      if (param.rewards_token.length !== 0) {
+        tx = await this._getEarnedRewards(param, tx);
+      }
     }
     return this._parseEarnedRewards(tx);
   }
@@ -11799,6 +11859,7 @@ var clmmMainnet = {
   integrate: {
     package_id: "0x2e704d8afc1d6d7f154dee337cc14c153f6f9ce1708213e5dc04a32afe0e45f1",
     published_at: "0x2e704d8afc1d6d7f154dee337cc14c153f6f9ce1708213e5dc04a32afe0e45f1"
+    // published_at: '0xc9f008794e70543443bb49bc9719120a6d43bb2cf6b522ec924f495a36b7e69e',
   },
   deepbook: {
     package_id: "0x000000000000000000000000000000000000000000000000000000000000dee9",