impermax-sdk 2.1.366 → 2.1.367

package/lib/offchain/account/lendingPool/nftlp/offchainAccountNftlpUniswapV3.js

@@ -82,7 +82,7 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
         try {
             const account = this.getLendingPool().getAccount().getAccountAddress();
             const positionFees = await this.getLendingPool().getLendingPool().getOffchain().getUniswapV3NewlyEarnedFees(account, positionId);
-            this.cache.newlyEarnedFees[tokenId] = { amountX: Number(positionFees.newlyEarnedFees0), amountY: Number(positionFees.newlyEarnedFees1) };
+            this.cache.newlyEarnedFees[tokenId] = { amountX: Number(positionFees?.newlyEarnedFees0), amountY: Number(positionFees?.newlyEarnedFees1) };
             return this.cache.newlyEarnedFees[tokenId];
         }
         catch (err) {

package/lib/offchain/initializer/privateApi/userApi/fees/uniswapV3Fees.d.ts

@@ -2,4 +2,4 @@ import { AddressIndex, Address } from "../../../../../config/types";
 import Offchain from "../../../../../offchain";
 import { NewlyEarnedFees } from "../../../../offchainTypes";
 export declare function fetchUniswapV3NewlyEarnedFees(this: Offchain, account: Address): Promise<AddressIndex<NewlyEarnedFees>>;
-export declare function getUniswapV3NewlyEarnedFees(this: Offchain, account: Address, positionId: string): Promise<NewlyEarnedFees>;
+export declare function getUniswapV3NewlyEarnedFees(this: Offchain, account: Address, positionId: string): Promise<NewlyEarnedFees | undefined>;

package/lib/offchain/initializer/privateApi/userApi/fees/uniswapV3Fees.js

@@ -36,10 +36,12 @@ exports.fetchUniswapV3NewlyEarnedFees = fetchUniswapV3NewlyEarnedFees;
  *                                Getters                                   *
  *--------------------------------------------------------------------------*/
 async function getUniswapV3NewlyEarnedFees(account, positionId) {
-    if (!this.userNewlyEarnedFeesData[types_1.Extension.UniswapV3]) {
-        this.userNewlyEarnedFeesData[types_1.Extension.UniswapV3] = this.fetchUniswapV3NewlyEarnedFees(account);
+    if (!this.userNewlyEarnedFeesData[account])
+        this.userNewlyEarnedFeesData[account] = {};
+    if (!this.userNewlyEarnedFeesData[account][types_1.Extension.UniswapV3]) {
+        this.userNewlyEarnedFeesData[account][types_1.Extension.UniswapV3] = this.fetchUniswapV3NewlyEarnedFees(account);
     }
-    const feesData = await this.userNewlyEarnedFeesData[types_1.Extension.UniswapV3];
-    return feesData[positionId];
+    const feesData = await this.userNewlyEarnedFeesData[account][types_1.Extension.UniswapV3];
+    return feesData?.[positionId];
 }
 exports.getUniswapV3NewlyEarnedFees = getUniswapV3NewlyEarnedFees;

package/lib/offchain/offchain.d.ts

@@ -55,7 +55,9 @@ export default class Offchain {
         [key in Extension]?: Promise<AddressIndex<NftlpStats>>;
     };
     protected userNewlyEarnedFeesData: {
-        [key in Extension]?: Promise<AddressIndex<NewlyEarnedFees>>;
+        [address: Address]: {
+            [key in Extension]?: Promise<AddressIndex<NewlyEarnedFees>>;
+        };
     };
     constructor(offchainMultichain: OffchainMultichain, network: Networks);
     cleanCache(): void;

package/lib/offchain/offchain.js

@@ -45,7 +45,6 @@ class Offchain {
         this.extensionChartsData = {};
         this.extensionStatsData = {};
         // ------ User API --------
-        // TODO: Proper positionIndex type
         this.userNewlyEarnedFeesData = {};
         this.getSolidexHelper = () => this.solidexHelper;
         this.getConfigManager = () => this.configManager;

package/lib/offchain/staking/offchainStakingModule.d.ts

@@ -4,13 +4,14 @@ import Offchain from "../offchain";
 export default class OffchainStakingModule {
     private readonly offchain;
     protected xIbexData: Promise<XIbexData> | null;
+    protected xibex: Address;
     protected ibex: Address;
     cleanCache(): void;
     constructor(offchain: Offchain);
     getOffchain: () => Offchain;
     getIbexAddress: () => string;
     getXIbexData: () => Promise<XIbexData>;
-    getXIbexAddress(): Promise<Address>;
+    getXIbexAddress: () => string;
     getXIbexTotalSupply(): Promise<number>;
     getXIbexDailyAPR(): Promise<number>;
     getXIbexAPY(): Promise<number>;

package/lib/offchain/staking/offchainStakingModule.js

@@ -6,25 +6,21 @@ class OffchainStakingModule {
         this.xIbexData = null;
     }
     constructor(offchain) {
+        this.xIbexData = null;
         this.getOffchain = () => this.offchain;
         this.getIbexAddress = () => this.ibex;
         this.getXIbexData = () => this.offchain.getXIbexData();
+        this.getXIbexAddress = () => this.xibex;
         // Check if available, only arbitrum atm
-        const ibex = ibexes_1.XIBEX[offchain.network];
-        if (!ibex)
+        const ibex = ibexes_1.IBEX[offchain.network];
+        const xibex = ibexes_1.XIBEX[offchain.network];
+        if (!ibex || !xibex)
             throw new Error(`Staking module is not available on ${offchain.network}`);
+        this.ibex = ibex;
+        this.xibex = xibex;
         this.offchain = offchain;
-        this.xIbexData = null;
-        this.ibex = ibexes_1.IBEX[offchain.network];
     }
     // Data
-    // Views
-    async getXIbexAddress() {
-        const xIbexData = await this.getXIbexData();
-        if (!xIbexData)
-            return "";
-        return xIbexData.id;
-    }
     async getXIbexTotalSupply() {
         const xIbexData = await this.getXIbexData();
         if (!xIbexData)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impermax-sdk",
-  "version": "2.1.366",
+  "version": "2.1.367",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",