@magmaprotocol/magma-clmm-sdk 0.5.56 → 0.5.58

package/dist/index.d.ts

@@ -1847,6 +1847,7 @@ type DlmmPositionInfo = {
     liquidity: EventPositionLiquidity;
     rewards: DlmmEventEarnedRewards;
     fees: DlmmEventEarnedFees;
+    contractPool: DlmmPoolInfo | undefined;
 };
 
 type BigNumber = Decimal.Value | number | string;
@@ -3716,6 +3717,7 @@ declare class GaugeModule implements IModule {
 
 declare class DlmmModule implements IModule {
     protected _sdk: MagmaClmmSDK;
+    private readonly _cache;
     constructor(sdk: MagmaClmmSDK);
     get sdk(): MagmaClmmSDK;
     getPoolInfo(pools: string[]): Promise<DlmmPoolInfo[]>;
@@ -3734,7 +3736,13 @@ declare class DlmmModule implements IModule {
     createPairAddLiquidity(params: DlmmCreatePairAddLiquidityParams): Promise<Transaction>;
     swap(params: DLMMSwapParams): Promise<Transaction>;
     fetchBins(params: FetchBinsParams): Promise<EventBin[]>;
-    getUserPositions(who: string, showDisplay?: boolean): Promise<DlmmPositionInfo[]>;
+    /**
+     * 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.
+     */
+    getUserPositions(accountAddress: string, assignPoolIds?: string[], showDisplay?: boolean): Promise<DlmmPositionInfo[]>;
     private buildPosition;
     private getPoolCoins;
     private buildPositionType;
@@ -3745,6 +3753,22 @@ declare class DlmmModule implements IModule {
     getPairRewarders(params: GetPairRewarderParams[]): Promise<Map<string, string[]>>;
     private _getPairRewarders;
     private _parsePairRewarders;
+    /**
+     * Updates the cache for the given key.
+     *
+     * @param key The key of the cache entry to update.
+     * @param data The data to store in the cache.
+     * @param time The time in minutes after which the cache entry should expire.
+     */
+    updateCache(key: string, data: SuiResource, time?: number): void;
+    /**
+     * Gets the cache entry for the given key.
+     *
+     * @param key The key of the cache entry to get.
+     * @param forceRefresh Whether to force a refresh of the cache entry.
+     * @returns The cache entry for the given key, or undefined if the cache entry does not exist or is expired.
+     */
+    getCache<T>(key: string, forceRefresh?: boolean): T | undefined;
 }
 
 /**

package/dist/index.js

@@ -10728,6 +10728,7 @@ var import_calc_dlmm3 = require("@magmaprotocol/calc_dlmm");
 var import_decimal13 = __toESM(require("decimal.js"));
 var DlmmModule = class {
   _sdk;
+  _cache = {};
   constructor(sdk) {
     this._sdk = sdk;
   }
@@ -11114,20 +11115,32 @@ var DlmmModule = class {
     });
     return res;
   }
-  async getUserPositions(who, showDisplay = true) {
-    const ownerRes = await this._sdk.fullClient.getOwnedObjectsByPage(who, {
+  /**
+   * 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 getUserPositions(accountAddress, assignPoolIds = [], showDisplay = true) {
+    const allPosition = [];
+    const ownerRes = await this._sdk.fullClient.getOwnedObjectsByPage(accountAddress, {
       options: { showType: true, showContent: true, showDisplay, showOwner: true },
       filter: { Package: this._sdk.sdkOptions.dlmm_pool.package_id }
     });
-    const positions = [];
+    const hasAssignPoolIds = assignPoolIds.length > 0;
     const pools = [];
     for (const item of ownerRes.data) {
       const type = extractStructTagFromType(item.data.type);
       if (type.full_address === this.buildPositionType()) {
         const position = this.buildPosition(item);
-        positions.push(position);
-        if (!pools.includes(position.pool)) {
-          pools.push(position.pool);
+        const cacheKey = `${position.pos_object_id}_getPositionList`;
+        this.updateCache(cacheKey, position, cacheTime24h);
+        if (hasAssignPoolIds) {
+          if (assignPoolIds.includes(position.pool)) {
+            allPosition.push(position);
+          }
+        } else {
+          allPosition.push(position);
         }
       }
     }
@@ -11140,9 +11153,16 @@ var DlmmModule = class {
         coin_b: value[1]
       });
     }
+    const poolMap = /* @__PURE__ */ new Set();
+    for (const item of allPosition) {
+      poolMap.add(item.pool);
+    }
+    const poolList = await this.getPoolInfo(Array.from(poolMap));
+    this.updateCache(`${DlmmScript}_positionList_poolList`, poolList, cacheTime24h);
     const pool_reward_coins = await this.getPairRewarders(_params);
     const out = [];
-    for (const item of positions) {
+    for (const item of allPosition) {
+      const pool = poolList.find((pool2) => pool2.pool_id === item.pool);
       const coins = pool_coins.get(item.pool) || ["", ""];
       const positionLiquidity = await this.getPositionLiquidity({
         pair: item.pool,
@@ -11151,7 +11171,7 @@ var DlmmModule = class {
         coinTypeB: coins[1]
       });
       const rewards_token = pool_reward_coins.get(item.pool) || [];
-      let positionRewards = { position_id: item.pool, reward: [], amount: [] };
+      let positionRewards = { position_id: item.pos_object_id, reward: [], amount: [] };
       if (rewards_token.length > 0) {
         positionRewards = await this.getEarnedRewards({
           pool_id: item.pool,
@@ -11171,7 +11191,8 @@ var DlmmModule = class {
         position: item,
         liquidity: positionLiquidity,
         rewards: positionRewards,
-        fees: positionFees
+        fees: positionFees,
+        contractPool: pool
       });
     }
     return out;
@@ -11410,6 +11431,41 @@ var DlmmModule = class {
     });
     return out;
   }
+  /**
+   * Updates the cache for the given key.
+   *
+   * @param key The key of the cache entry to update.
+   * @param data The data to store in the cache.
+   * @param time The time in minutes after which the cache entry should expire.
+   */
+  updateCache(key, data, time = cacheTime5min) {
+    let cacheData = this._cache[key];
+    if (cacheData) {
+      cacheData.overdueTime = getFutureTime(time);
+      cacheData.value = data;
+    } else {
+      cacheData = new CachedContent(data, getFutureTime(time));
+    }
+    this._cache[key] = cacheData;
+  }
+  /**
+   * Gets the cache entry for the given key.
+   *
+   * @param key The key of the cache entry to get.
+   * @param forceRefresh Whether to force a refresh of the cache entry.
+   * @returns The cache entry for the given key, or undefined if the cache entry does not exist or is expired.
+   */
+  getCache(key, forceRefresh = false) {
+    const cacheData = this._cache[key];
+    const isValid = cacheData?.isValid();
+    if (!forceRefresh && isValid) {
+      return cacheData.value;
+    }
+    if (!isValid) {
+      delete this._cache[key];
+    }
+    return void 0;
+  }
 };
 
 // src/sdk.ts