@magmaprotocol/magma-clmm-sdk 0.5.88 → 0.5.90

package/dist/index.d.ts

@@ -454,6 +454,7 @@ type ClmmConfig = {
 };
 type DlmmConfig = {
     factory: SuiObjectIdType;
+    rewarder_global_vault: SuiObjectIdType;
 };
 /**
  * Represents an event to create a liquidity mining partner.
@@ -1725,6 +1726,7 @@ type EventBin = {
     real_bin_id: number;
 };
 type EventPositionLiquidity = {
+    position_id: string;
     shares: number | string;
     liquidity: number | string;
     x_equivalent: number | string;
@@ -3783,13 +3785,6 @@ declare class DlmmModule implements IModule {
     createPairAddLiquidity(params: DlmmCreatePairAddLiquidityParams): Promise<Transaction>;
     swap(params: DLMMSwapParams): Promise<Transaction>;
     fetchBins(params: FetchBinsParams): Promise<EventBin[]>;
-    /**
-     * Gets a list of positions for the given account address.
-     * @param accountAddress The account address to get positions for.
-     * @param assignPoolIds An array of pool IDs to filter the positions by.
-     * @returns array of Position objects.
-     */
-    getUserPositionById(positionId: string, showDisplay?: boolean): Promise<DlmmPositionInfo>;
     /**
      * Gets a list of positions for the given account address.
      * @param accountAddress The account address to get positions for.
@@ -3800,10 +3795,16 @@ declare class DlmmModule implements IModule {
     private buildPosition;
     private getPoolCoins;
     private buildPositionType;
-    getPositionLiquidity(params: GetPositionLiquidityParams): Promise<EventPositionLiquidity>;
+    getPositionLiquidity(params: GetPositionLiquidityParams[]): Promise<EventPositionLiquidity[]>;
+    private _getPositionLiquidity;
+    private _parsePositionLiquidity;
     getPairLiquidity(params: GetPairLiquidityParams): Promise<EventPairLiquidity>;
-    getEarnedFees(params: DlmmCollectFeeParams): Promise<DlmmEventEarnedFees>;
-    getEarnedRewards(params: DlmmRewardsParams): Promise<DlmmEventEarnedRewards>;
+    getEarnedFees(params: DlmmCollectFeeParams[]): Promise<DlmmEventEarnedFees[]>;
+    private _getEarnedFees;
+    private _parseEarnedFees;
+    getEarnedRewards(params: DlmmRewardsParams[]): Promise<DlmmEventEarnedRewards[]>;
+    private _getEarnedRewards;
+    private _parseEarnedRewards;
     getPairRewarders(params: GetPairRewarderParams[]): Promise<Map<string, string[]>>;
     private _getPairRewarders;
     private _parsePairRewarders;

package/dist/index.js

@@ -10978,6 +10978,7 @@ var DlmmModule = class {
     const args = [
       tx.object(params.pair),
       tx.object(dlmmConfig.factory),
+      tx.object(dlmm_pool.config.rewarder_global_vault),
       tx.object(params.positionId),
       primaryCoinAInputs.targetCoin,
       primaryCoinBInputs.targetCoin,
@@ -11047,7 +11048,7 @@ var DlmmModule = class {
     let tx = new import_transactions12.Transaction();
     tx = await this.collectFees(params);
     if (params.rewards_token.length > 0) {
-      tx = await this.collectReward(params);
+      tx = await this.collectReward(params, tx);
     }
     return tx;
   }
@@ -11196,65 +11197,68 @@ var DlmmModule = class {
     });
     return res.sort((a, b) => a.real_bin_id - b.real_bin_id);
   }
-  /**
-   * Gets a list of positions for the given account address.
-   * @param accountAddress 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 position;
-    const ownerRes = await this._sdk.fullClient.getObject({
-      id: positionId,
-      options: { showContent: true, showType: true, showDisplay, showOwner: true }
-    });
-    const type = extractStructTagFromType(ownerRes.data.type);
-    if (type.full_address === this.buildPositionType()) {
-      position = this.buildPosition(ownerRes);
-    } else {
-      throw new ClmmpoolsError(`Dlmm Position not exists. Get Position error:${ownerRes.error}`, "InvalidPositionObject" /* InvalidPositionObject */);
-    }
-    const poolMap = /* @__PURE__ */ new Set();
-    poolMap.add(position.pool);
-    const pool = (await this.getPoolInfo(Array.from(poolMap)))[0];
-    const _params = [];
-    _params.push({
-      pool_id: pool.pool_id,
-      coin_a: pool.coin_a,
-      coin_b: pool.coin_b
-    });
-    const pool_reward_coins = await this.getPairRewarders(_params);
-    const positionLiquidity = await this.getPositionLiquidity({
-      pair: position.pool,
-      positionId: position.pos_object_id,
-      coinTypeA: pool.coin_a,
-      coinTypeB: pool.coin_b
-    });
-    const rewards_token = pool_reward_coins.get(position.pool) || [];
-    let positionRewards = { position_id: position.pos_object_id, reward: [], amount: [] };
-    if (rewards_token.length > 0) {
-      positionRewards = await this.getEarnedRewards({
-        pool_id: position.pool,
-        position_id: position.pos_object_id,
-        coin_a: pool.coin_a,
-        coin_b: pool.coin_b,
-        rewards_token: pool_reward_coins.get(position.pool) || []
-      });
-    }
-    const positionFees = await this.getEarnedFees({
-      pool_id: position.pool,
-      position_id: position.pos_object_id,
-      coin_a: pool.coin_a,
-      coin_b: pool.coin_b
-    });
-    return {
-      position,
-      liquidity: positionLiquidity,
-      rewards: positionRewards,
-      fees: positionFees,
-      contractPool: pool
-    };
-  }
+  // /**
+  //  * Gets a list of positions for the given account address.
+  //  * @param accountAddress 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: string, showDisplay = true): Promise<DlmmPositionInfo> {
+  //   let position
+  //   const ownerRes: any = await this._sdk.fullClient.getObject({
+  //     id: positionId,
+  //     options: { showContent: true, showType: true, showDisplay, showOwner: true },
+  //   })
+  //   const type = extractStructTagFromType(ownerRes.data.type)
+  //   if (type.full_address === this.buildPositionType()) {
+  //     position = this.buildPosition(ownerRes)
+  //   } else {
+  //     throw new ClmmpoolsError(`Dlmm Position not exists. Get Position error:${ownerRes.error}`, PositionErrorCode.InvalidPositionObject)
+  //   }
+  //   const poolMap = new Set<string>()
+  //   poolMap.add(position.pool)
+  //   const pool = (await this.getPoolInfo(Array.from(poolMap)))[0]
+  //   const _params: GetPairRewarderParams[] = []
+  //   _params.push({
+  //     pool_id: pool.pool_id,
+  //     coin_a: pool.coin_a,
+  //     coin_b: pool.coin_b,
+  //   })
+  //   const pool_reward_coins = await this.getPairRewarders(_params)
+  //   // 1. Get Liquidity
+  //   // 2. Get rewards
+  //   // 3. Get fees
+  //   const positionLiquidity = await this.getPositionLiquidity({
+  //     pair: position.pool,
+  //     positionId: position.pos_object_id,
+  //     coinTypeA: pool!.coin_a,
+  //     coinTypeB: pool!.coin_b,
+  //   })
+  //   const rewards_token = pool_reward_coins.get(position.pool) || []
+  //   let positionRewards: DlmmEventEarnedRewards = { position_id: position.pos_object_id, reward: [], amount: [] }
+  //   if (rewards_token.length > 0) {
+  //     positionRewards = await this.getEarnedRewards({
+  //       pool_id: position.pool,
+  //       position_id: position.pos_object_id,
+  //       coin_a: pool!.coin_a,
+  //       coin_b: pool!.coin_b,
+  //       rewards_token: pool_reward_coins.get(position.pool) || [],
+  //     })
+  //   }
+  //   const positionFees = await this.getEarnedFees({
+  //     pool_id: position.pool,
+  //     position_id: position.pos_object_id,
+  //     coin_a: pool!.coin_a,
+  //     coin_b: pool!.coin_b,
+  //   })
+  //   return {
+  //     position,
+  //     liquidity: positionLiquidity,
+  //     rewards: positionRewards,
+  //     fees: positionFees,
+  //     contractPool: pool,
+  //   }
+  // }
   /**
    * Gets a list of positions for the given account address.
    * @param accountAddress The account address to get positions for.
@@ -11298,19 +11302,20 @@ var DlmmModule = class {
       });
     }
     const pool_reward_coins = await this.getPairRewarders(_params);
-    const out = [];
+    const positionLiquidityParams = [];
+    const dlmmRewardsParams = [];
+    const dlmmCollectFeeParams = [];
     for (const item of allPosition) {
       const pool = poolList.find((pool2) => pool2.pool_id === item.pool);
-      const positionLiquidity = await this.getPositionLiquidity({
+      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) || [];
-      let positionRewards = { position_id: item.pos_object_id, reward: [], amount: [] };
       if (rewards_token.length > 0) {
-        positionRewards = await this.getEarnedRewards({
+        dlmmRewardsParams.push({
           pool_id: item.pool,
           position_id: item.pos_object_id,
           coin_a: pool.coin_a,
@@ -11318,16 +11323,27 @@ var DlmmModule = class {
           rewards_token: pool_reward_coins.get(item.pool) || []
         });
       }
-      const positionFees = await this.getEarnedFees({
+      dlmmCollectFeeParams.push({
         pool_id: item.pool,
         position_id: item.pos_object_id,
         coin_a: pool.coin_a,
         coin_b: pool.coin_b
       });
+    }
+    const positionsLiquidity = await this.getPositionLiquidity(positionLiquidityParams);
+    const positionsRewards = await this.getEarnedRewards(dlmmRewardsParams);
+    const positionsFees = await this.getEarnedFees(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);
       out.push({
-        position: item,
+        position: allPosition[i],
         liquidity: positionLiquidity,
-        rewards: positionRewards,
+        rewards: positionRewards || { position_id: item.pos_object_id, reward: [], amount: [] },
         fees: positionFees,
         contractPool: pool
       });
@@ -11366,8 +11382,15 @@ var DlmmModule = class {
     return `${this._sdk.sdkOptions.dlmm_pool.package_id}::dlmm_position::Position`;
   }
   async getPositionLiquidity(params) {
-    const tx = new import_transactions12.Transaction();
-    const { integrate, simulationAccount } = this.sdk.sdkOptions;
+    let tx = new import_transactions12.Transaction();
+    for (const param of params) {
+      tx = await this._getPositionLiquidity(param, tx);
+    }
+    return this._parsePositionLiquidity(tx);
+  }
+  async _getPositionLiquidity(params, tx) {
+    tx = tx || new import_transactions12.Transaction();
+    const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coinTypeA, params.coinTypeB];
     const args = [tx.object(params.pair), tx.object(params.positionId)];
     tx.moveCall({
@@ -11375,6 +11398,10 @@ var DlmmModule = class {
       arguments: args,
       typeArguments
     });
+    return tx;
+  }
+  async _parsePositionLiquidity(tx) {
+    const { simulationAccount } = this.sdk.sdkOptions;
     const simulateRes = await this.sdk.fullClient.devInspectTransactionBlock({
       transactionBlock: tx,
       sender: simulationAccount.address
@@ -11382,26 +11409,20 @@ var DlmmModule = class {
     if (simulateRes.error != null) {
       throw new Error(`fetchBins error code: ${simulateRes.error ?? "unknown error"}`);
     }
-    const out = {
-      shares: 0,
-      liquidity: 0,
-      x_equivalent: 0,
-      y_equivalent: 0,
-      bin_real_ids: [],
-      bin_x_eq: [],
-      bin_y_eq: [],
-      bin_liquidity: []
-    };
+    const out = [];
     simulateRes.events?.forEach((item) => {
       if (extractStructTagFromType(item.type).name === `EventPositionLiquidity`) {
-        out.shares = item.parsedJson.shares;
-        out.liquidity = item.parsedJson.liquidity;
-        out.x_equivalent = item.parsedJson.x_equivalent;
-        out.y_equivalent = item.parsedJson.y_equivalent;
-        out.bin_real_ids = item.parsedJson.bin_ids.map((id) => (0, import_calc_dlmm3.get_real_id)(id));
-        out.bin_x_eq = item.parsedJson.bin_x_eq;
-        out.bin_y_eq = item.parsedJson.bin_y_eq;
-        out.bin_liquidity = item.parsedJson.bin_liquidity;
+        out.push({
+          position_id: item.parsedJson.position_id,
+          shares: item.parsedJson.shares,
+          liquidity: item.parsedJson.liquidity,
+          x_equivalent: item.parsedJson.x_equivalent,
+          y_equivalent: item.parsedJson.y_equivalent,
+          bin_real_ids: item.parsedJson.bin_ids.map((id) => (0, import_calc_dlmm3.get_real_id)(id)),
+          bin_x_eq: item.parsedJson.bin_x_eq,
+          bin_y_eq: item.parsedJson.bin_y_eq,
+          bin_liquidity: item.parsedJson.bin_liquidity
+        });
       }
     });
     return out;
@@ -11446,8 +11467,15 @@ var DlmmModule = class {
     return out;
   }
   async getEarnedFees(params) {
-    const tx = new import_transactions12.Transaction();
-    const { integrate, simulationAccount } = this.sdk.sdkOptions;
+    let tx = new import_transactions12.Transaction();
+    for (const param of params) {
+      tx = await this._getEarnedFees(param, tx);
+    }
+    return this._parseEarnedFees(tx);
+  }
+  async _getEarnedFees(params, tx) {
+    tx = tx || new import_transactions12.Transaction();
+    const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coin_a, params.coin_b];
     const args = [tx.object(params.pool_id), tx.object(params.position_id)];
     tx.moveCall({
@@ -11455,34 +11483,41 @@ var DlmmModule = class {
       arguments: args,
       typeArguments
     });
+    return tx;
+  }
+  async _parseEarnedFees(tx) {
+    const { simulationAccount } = this.sdk.sdkOptions;
     const simulateRes = await this.sdk.fullClient.devInspectTransactionBlock({
       transactionBlock: tx,
       sender: simulationAccount.address
     });
-    const out = {
-      position_id: "",
-      x: "",
-      y: "",
-      fee_x: 0,
-      fee_y: 0
-    };
+    const out = [];
     if (simulateRes.error != null) {
       throw new Error(`fetchPairRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
       if (extractStructTagFromType(item.type).name === `EventEarnedFees`) {
-        out.position_id = item.parsedJson.position_id;
-        out.x = item.parsedJson.x.name;
-        out.y = item.parsedJson.y.name;
-        out.fee_x = item.parsedJson.fee_x;
-        out.fee_y = item.parsedJson.fee_y;
+        out.push({
+          position_id: item.parsedJson.position_id,
+          x: item.parsedJson.x.name,
+          y: item.parsedJson.y.name,
+          fee_x: item.parsedJson.fee_x,
+          fee_y: item.parsedJson.fee_y
+        });
       }
     });
     return out;
   }
   async getEarnedRewards(params) {
-    const tx = new import_transactions12.Transaction();
-    const { integrate, simulationAccount } = this.sdk.sdkOptions;
+    let tx = new import_transactions12.Transaction();
+    for (const param of params) {
+      tx = await this._getEarnedRewards(param, tx);
+    }
+    return this._parseEarnedRewards(tx);
+  }
+  async _getEarnedRewards(params, tx) {
+    tx = tx || new import_transactions12.Transaction();
+    const { integrate } = this.sdk.sdkOptions;
     const typeArguments = [params.coin_a, params.coin_b, ...params.rewards_token];
     const args = [tx.object(params.pool_id), tx.object(params.position_id), tx.object(CLOCK_ADDRESS)];
     let target = `${integrate.published_at}::${DlmmScript}::earned_rewards`;
@@ -11494,34 +11529,40 @@ var DlmmModule = class {
       arguments: args,
       typeArguments
     });
+    return tx;
+  }
+  async _parseEarnedRewards(tx) {
+    const { simulationAccount } = this.sdk.sdkOptions;
     const simulateRes = await this.sdk.fullClient.devInspectTransactionBlock({
       transactionBlock: tx,
       sender: simulationAccount.address
     });
-    const out = {
-      position_id: "",
-      reward: [],
-      amount: []
-    };
+    const res = [];
     if (simulateRes.error != null) {
       throw new Error(`getEarnedRewards error code: ${simulateRes.error ?? "unknown error"}`);
     }
     simulateRes.events?.forEach((item) => {
       if (extractStructTagFromType(item.type).name === `EventEarnedRewards`) {
-        out.position_id = item.parsedJson.position_id;
-        out.reward = [item.parsedJson.reward.name];
-        out.amount = [item.parsedJson.amount];
+        res.push({
+          position_id: item.parsedJson.position_id,
+          reward: [item.parsedJson.reward.name],
+          amount: [item.parsedJson.amount]
+        });
       } else if (extractStructTagFromType(item.type).name === `EventEarnedRewards2`) {
-        out.position_id = item.parsedJson.position_id;
-        out.reward = [item.parsedJson.reward1.name, item.parsedJson.reward2.name];
-        out.amount = [item.parsedJson.amount1, item.parsedJson.amount2];
+        res.push({
+          position_id: item.parsedJson.position_id,
+          reward: [item.parsedJson.reward1.name, item.parsedJson.reward2.name],
+          amount: [item.parsedJson.amount1, item.parsedJson.amount2]
+        });
       } else if (extractStructTagFromType(item.type).name === `EventEarnedRewards3`) {
-        out.position_id = item.parsedJson.position_id;
-        out.reward = [item.parsedJson.reward1.name, item.parsedJson.reward2.name, item.parsedJson.reward3.name];
-        out.amount = [item.parsedJson.amount1, item.parsedJson.amount2, item.parsedJson.amount3];
+        res.push({
+          position_id: item.parsedJson.position_id,
+          reward: [item.parsedJson.reward1.name, item.parsedJson.reward2.name, item.parsedJson.reward3.name],
+          amount: [item.parsedJson.amount1, item.parsedJson.amount2, item.parsedJson.amount3]
+        });
       }
     });
-    return out;
+    return res;
   }
   // return pool_id => reward_tokens
   async getPairRewarders(params) {
@@ -11904,7 +11945,8 @@ var SDKConfig = {
     minter_id: "0x4fa5766cd83b33b215b139fec27ac344040f3bbd84fcbee7b61fc671aadc51fa"
   },
   dlmmConfig: {
-    factory: ""
+    factory: "",
+    rewarder_global_vault: ""
   },
   gaugeConfig: {}
 };
@@ -11990,7 +12032,8 @@ var SDKConfig2 = {
     minter_id: "0x89435d6b2a510ba50ca23303f10e91ec058f138a88f69a43fe03cd22edb214c5"
   },
   dlmmConfig: {
-    factory: ""
+    factory: "",
+    rewarder_global_vault: ""
   }
 };
 var clmmTestnet = {