impermax-sdk 2.1.141 → 2.1.143

package/lib/config/subgraphs.js

@@ -27,12 +27,15 @@ exports.IMPERMAX_SUBGRAPH_URL = {
     [types_1.Networks.Arbitrum]: {
         [types_1.Factory.V2V1_1]: [
             "https://gateway.thegraph.com/api/1350441d268f171aeb0934412dfadf3b/subgraphs/id/3PMyaq269mDMwhJ7E285RYD1r43x996b6xZmJSCGvtkm",
+            "https://arbitrum-factory-production.up.railway.app/"
         ],
         [types_1.Factory.V2V2]: [
             "https://gateway.thegraph.com/api/1350441d268f171aeb0934412dfadf3b/subgraphs/id/BkMRb8mR5zgCbjFSgau6s27pnANhR6k64RGVKUbWaZdY",
+            "https://arbitrum-factory-production.up.railway.app/"
         ],
         [types_1.Factory.SOLV2]: [
             "https://gateway.thegraph.com/api/1350441d268f171aeb0934412dfadf3b/subgraphs/id/AdLbcSfG6JnpZ7RDdHNHq3bJ21waGnRi7AJ5x3YFGYFo",
+            "https://arbitrum-factory-production.up.railway.app/"
         ],
     },
     [types_1.Networks.Avalanche]: {

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,67 +14,46 @@ class OffchainAccountNftlpUniswapV3 extends offchainAccountNftlp_1.default {
         this.getNftlp = () => this.getLendingPool().getLendingPool().getNftlp();
     }
     // Returns all positions by token ID
-    getTokenPositions() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const positions = (_a = (yield this.getLendingPool().getLendingPoolPosition())) === null || _a === void 0 ? void 0 : _a.positions;
-            return positions;
-        });
+    async getTokenPositions() {
+        const positions = (await this.getLendingPool().getLendingPoolPosition())?.positions;
+        return positions;
     }
     // Returns single position data
-    getPositionData(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const positions = yield this.getTokenPositions();
-            return positions[tokenId].nftlp;
-        });
+    async getPositionData(tokenId) {
+        const positions = await this.getTokenPositions();
+        return positions[tokenId].nftlp;
     }
     // Mirrored from Onchain
-    getFee(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.getPositionData(tokenId)).fee / 10000;
-        });
+    async getFee(tokenId) {
+        return (await this.getPositionData(tokenId)).fee / 10000;
     }
-    getTickLower(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.getPositionData(tokenId)).tickLower;
-        });
+    async getTickLower(tokenId) {
+        return (await this.getPositionData(tokenId)).tickLower;
     }
-    getTickUpper(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.getPositionData(tokenId)).tickUpper;
-        });
+    async getTickUpper(tokenId) {
+        return (await this.getPositionData(tokenId)).tickUpper;
     }
-    getPriceA(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getNftlp().tickToPrice(yield this.getTickLower(tokenId));
-        });
+    async getPriceA(tokenId) {
+        return this.getNftlp().tickToPrice(await this.getTickLower(tokenId));
     }
-    getPriceB(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getNftlp().tickToPrice(yield this.getTickUpper(tokenId));
-        });
+    async getPriceB(tokenId) {
+        return this.getNftlp().tickToPrice(await this.getTickUpper(tokenId));
     }
-    getLiquidity(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const decimalsA = yield this.getNftlp().getLendingPool().getBorrowableA().getDecimals();
-            const decimalsB = yield this.getNftlp().getLendingPool().getBorrowableB().getDecimals();
-            const liquidity = (yield this.getPositionData(tokenId)).liquidity;
-            return (0, uniswapV3General_1.formatUniV3Liquidity)(liquidity, decimalsA, decimalsB);
-        });
+    async getLiquidity(tokenId) {
+        const decimalsA = await this.getNftlp().getLendingPool().getBorrowableA().getDecimals();
+        const decimalsB = await this.getNftlp().getLendingPool().getBorrowableB().getDecimals();
+        const liquidity = (await this.getPositionData(tokenId)).liquidity;
+        return (0, uniswapV3General_1.formatUniV3Liquidity)(liquidity, decimalsA, decimalsB);
     }
-    createPositionObject(tokenId, lockStateChange = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new uniswapV3_1.default(yield this.getLiquidity(tokenId), yield this.getLendingPool().getBorrowableA().getBorrowedAmount(tokenId), yield this.getLendingPool().getBorrowableB().getBorrowedAmount(tokenId), yield this.getNftlp().getMarketPrice(), yield this.getNftlp().getOraclePrice(), yield this.getPriceA(tokenId), yield this.getPriceB(tokenId), yield this.getLendingPool().getSafetyMargin(), yield this.getLendingPool().getLiquidationPenalty(), lockStateChange);
-        });
+    async createPositionObject(tokenId, lockStateChange = true) {
+        return new uniswapV3_1.default(await this.getLiquidity(tokenId), await this.getLendingPool().getBorrowableA().getBorrowedAmount(tokenId), await this.getLendingPool().getBorrowableB().getBorrowedAmount(tokenId), await this.getNftlp().getMarketPrice(), await this.getNftlp().getOraclePrice(), await this.getPriceA(tokenId), await this.getPriceB(tokenId), await this.getLendingPool().getSafetyMargin(), await this.getLendingPool().getLiquidationPenalty(), lockStateChange);
     }
-    getPositionObject(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.cache.positionsObject)
-                this.cache.positionsObject = {};
-            if (!this.cache.positionsObject[tokenId])
-                this.cache.positionsObject[tokenId] = this.createPositionObject(tokenId);
-            return this.cache.positionsObject[tokenId];
-        });
+    async getPositionObject(tokenId) {
+        if (!this.cache.positionsObject)
+            this.cache.positionsObject = {};
+        if (!this.cache.positionsObject[tokenId])
+            this.cache.positionsObject[tokenId] = this.createPositionObject(tokenId);
+        return this.cache.positionsObject[tokenId];
     }
 }
 exports.default = OffchainAccountNftlpUniswapV3;

package/lib/offchain/account/lendingPool/offchainAccountBorrowable.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -26,91 +17,74 @@ class OffchainAccountBorrowable extends offchainAccountPoolToken_1.default {
      *                          Supply Positions                                *
      *--------------------------------------------------------------------------*/
     // Lending position //
-    getSupplyPosition() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lendingPoolPosition = yield this.lendingPool.getLendingPoolPosition();
-            if (!lendingPoolPosition)
-                return undefined;
-            return lendingPoolPosition[`borrowable${this.borrowable}`];
-        });
+    async getSupplyPosition() {
+        const lendingPoolPosition = await this.lendingPool.getLendingPoolPosition();
+        if (!lendingPoolPosition)
+            return undefined;
+        return lendingPoolPosition[`borrowable${this.borrowable}`];
     }
-    getAmount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const supplyPosition = yield this.getSupplyPosition();
-            if (!supplyPosition)
-                return 0;
-            const exchangeRate = yield this.poolToken.getCurrentExchangeRate();
-            const supplyBalance = parseFloat(supplyPosition.balance);
-            return supplyBalance * exchangeRate;
-        });
+    async getAmount() {
+        const supplyPosition = await this.getSupplyPosition();
+        if (!supplyPosition)
+            return 0;
+        const exchangeRate = await this.poolToken.getCurrentExchangeRate();
+        const supplyBalance = parseFloat(supplyPosition.balance);
+        return supplyBalance * exchangeRate;
     }
-    getValue() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tokenPrice = yield this.poolToken.getTokenPriceAccurate();
-            const borrowedAmount = yield this.getAmount();
-            return borrowedAmount * tokenPrice;
-        });
+    async getValue() {
+        const tokenPrice = await this.poolToken.getTokenPriceAccurate();
+        const borrowedAmount = await this.getAmount();
+        return borrowedAmount * tokenPrice;
     }
     // Earnings //
     // WARN: Not all networks support cumulativeEarnings for now, see the `userQuery` in
     //       queries/apis/thegraph/index.ts. atm only available on Blast
-    getEarnings() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const supplyPosition = yield this.getSupplyPosition();
-            if (!supplyPosition)
-                return 0;
-            const exchangeRate = yield this.poolToken.getCurrentExchangeRate();
-            if (!supplyPosition.cumulativeEarnings)
-                return 0;
-            const cumulativeEarnings = parseFloat(supplyPosition.cumulativeEarnings);
-            const lastExchangeRate = parseFloat(supplyPosition.lastExchangeRate);
-            const tokenBalance = parseFloat(supplyPosition.balance);
-            const newEarnings = (exchangeRate - lastExchangeRate) * tokenBalance;
-            return cumulativeEarnings + newEarnings;
-        });
+    async getEarnings() {
+        const supplyPosition = await this.getSupplyPosition();
+        if (!supplyPosition)
+            return 0;
+        const exchangeRate = await this.poolToken.getCurrentExchangeRate();
+        if (!supplyPosition.cumulativeEarnings)
+            return 0;
+        const cumulativeEarnings = parseFloat(supplyPosition.cumulativeEarnings);
+        const lastExchangeRate = parseFloat(supplyPosition.lastExchangeRate);
+        const tokenBalance = parseFloat(supplyPosition.balance);
+        const newEarnings = (exchangeRate - lastExchangeRate) * tokenBalance;
+        return cumulativeEarnings + newEarnings;
     }
-    getEarningsUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tokenPrice = yield this.poolToken.getTokenPriceAccurate();
-            const earnings = yield this.getEarnings();
-            return earnings * tokenPrice;
-        });
+    async getEarningsUSD() {
+        const tokenPrice = await this.poolToken.getTokenPriceAccurate();
+        const earnings = await this.getEarnings();
+        return earnings * tokenPrice;
     }
     /*--------------------------------------------------------------------------*
      *                          Borrow Positions                                *
      *--------------------------------------------------------------------------*/
-    getBorrowPosition(tokenId) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            const lendingPoolPosition = yield this.lendingPool.getLendingPoolPosition();
-            // For V2 borrow positions
-            if (tokenId === undefined)
-                return (_a = lendingPoolPosition === null || lendingPoolPosition === void 0 ? void 0 : lendingPoolPosition.borrowPositions) === null || _a === void 0 ? void 0 : _a[`borrowable${this.borrowable}`];
-            // For V3 borrow positions with tokenId
-            // Find the corresponding borrow position for this borrowable using underlying address
-            const borrowPositions = (_c = (_b = lendingPoolPosition === null || lendingPoolPosition === void 0 ? void 0 : lendingPoolPosition.positions) === null || _b === void 0 ? void 0 : _b[tokenId]) === null || _c === void 0 ? void 0 : _c.borrowPositions;
-            const borrowableId = yield this.getPoolToken().getUnderlyingAddress();
-            return borrowPositions === null || borrowPositions === void 0 ? void 0 : borrowPositions.find(i => i.borrowable.underlying.id === borrowableId);
-        });
+    async getBorrowPosition(tokenId) {
+        const lendingPoolPosition = await this.lendingPool.getLendingPoolPosition();
+        // For V2 borrow positions
+        if (tokenId === undefined)
+            return lendingPoolPosition?.borrowPositions?.[`borrowable${this.borrowable}`];
+        // For V3 borrow positions with tokenId
+        // Find the corresponding borrow position for this borrowable using underlying address
+        const borrowPositions = lendingPoolPosition?.positions?.[tokenId]?.borrowPositions;
+        const borrowableId = await this.getPoolToken().getUnderlyingAddress();
+        return borrowPositions?.find(i => i.borrowable.underlying.id === borrowableId);
     }
     // Borrowing position
-    getBorrowedAmount(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const borrowPosition = yield this.getBorrowPosition(tokenId);
-            const borrowIndex = yield this.poolToken.getBorrowIndex();
-            if (!borrowPosition)
-                return 0;
-            const borrowBalance = parseFloat(borrowPosition.borrowBalance);
-            const userBorrowIndex = parseFloat(borrowPosition.borrowIndex);
-            return borrowBalance * borrowIndex / userBorrowIndex;
-        });
+    async getBorrowedAmount(tokenId) {
+        const borrowPosition = await this.getBorrowPosition(tokenId);
+        const borrowIndex = await this.poolToken.getBorrowIndex();
+        if (!borrowPosition)
+            return 0;
+        const borrowBalance = parseFloat(borrowPosition.borrowBalance);
+        const userBorrowIndex = parseFloat(borrowPosition.borrowIndex);
+        return borrowBalance * borrowIndex / userBorrowIndex;
     }
-    getBorrowedValue(tokenId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tokenPrice = yield this.poolToken.getTokenPriceAccurate();
-            const borrowedAmount = yield this.getBorrowedAmount(tokenId);
-            return borrowedAmount * tokenPrice;
-        });
+    async getBorrowedValue(tokenId) {
+        const tokenPrice = await this.poolToken.getTokenPriceAccurate();
+        const borrowedAmount = await this.getBorrowedAmount(tokenId);
+        return borrowedAmount * tokenPrice;
     }
 }
 exports.default = OffchainAccountBorrowable;

package/lib/offchain/account/lendingPool/offchainAccountCollateral.js

@@ -1,24 +1,13 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 class OffchainAccountCollateral {
     constructor() {
         //public abstract cleanCache();
         this.getAccount = () => this.getLendingPool().getAccount();
     }
-    getAmount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // TODO remove this class?
-            return 0;
-        });
+    async getAmount() {
+        // TODO remove this class?
+        return 0;
     }
 }
 exports.default = OffchainAccountCollateral;

package/lib/offchain/account/lendingPool/offchainAccountCollateralV2.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,22 +11,17 @@ class OffchainAccountCollateralV2 extends offchainAccountPoolToken_1.default {
         this.getLendingPool = () => this.lendingPool;
         this.lendingPool = lendingPool;
     }
-    getCollateralPosition() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const lendingPoolPosition = yield this.lendingPool.getLendingPoolPosition();
-            if (!lendingPoolPosition)
-                return undefined;
-            return (_a = lendingPoolPosition[`collateralPosition`]) === null || _a === void 0 ? void 0 : _a[0];
-        });
+    async getCollateralPosition() {
+        const lendingPoolPosition = await this.lendingPool.getLendingPoolPosition();
+        if (!lendingPoolPosition)
+            return undefined;
+        return lendingPoolPosition[`collateralPosition`]?.[0];
     }
-    getAmount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collateralPosition = yield this.getCollateralPosition();
-            if (!collateralPosition)
-                return 0;
-            return parseFloat(collateralPosition.balance);
-        });
+    async getAmount() {
+        const collateralPosition = await this.getCollateralPosition();
+        if (!collateralPosition)
+            return 0;
+        return parseFloat(collateralPosition.balance);
     }
 }
 exports.default = OffchainAccountCollateralV2;

package/lib/offchain/account/lendingPool/offchainAccountCollateralV3.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,10 +22,8 @@ class OffchainAccountCollateralV3 extends offchainAccountCollateral_1.default {
     cleanCache() {
         this.collateralCache = {};
     }
-    getAmount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 1;
-        });
+    async getAmount() {
+        return 1;
     }
 }
 exports.default = OffchainAccountCollateralV3;

package/lib/offchain/account/lendingPool/offchainAccountLendingPool.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../../config/types");
 class OffchainAccountLendingPool {
@@ -21,8 +12,8 @@ class OffchainAccountLendingPool {
         this.getCollateral = () => this.collateral;
         this.getFactory = () => this.lendingPool.getFactory();
         this.getId = () => this.getId();
-        this.getSafetyMargin = () => __awaiter(this, void 0, void 0, function* () { return yield this.lendingPool.getSafetyMargin(); });
-        this.getLiquidationPenalty = () => __awaiter(this, void 0, void 0, function* () { return yield this.lendingPool.getLiquidationPenalty(); });
+        this.getSafetyMargin = async () => await this.lendingPool.getSafetyMargin();
+        this.getLiquidationPenalty = async () => await this.lendingPool.getLiquidationPenalty();
         this.account = account;
         this.lendingPool = lendingPool;
         this.collateral = this.getNewCollateralObject();
@@ -31,20 +22,14 @@ class OffchainAccountLendingPool {
             [types_1.Borrowable.B]: this.getNewBorrowableObject(types_1.Borrowable.B),
         };
     }
-    getLeveragedPositions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [];
-        });
+    async getLeveragedPositions() {
+        return [];
     }
-    getLeveragedPositionsTotalBalanceUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 1;
-        });
+    async getLeveragedPositionsTotalBalanceUSD() {
+        return 1;
     }
-    getLeveragedPositionsNetAPR() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 1;
-        });
+    async getLeveragedPositionsNetAPR() {
+        return 1;
     }
 }
 exports.default = OffchainAccountLendingPool;

package/lib/offchain/account/lendingPool/offchainAccountLendingPoolV2.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -35,8 +26,8 @@ class OffchainAccountLendingPoolV2 extends offchainAccountLendingPool_1.default
         this.getAccount = () => this.account;
         this.getFactory = () => this.lendingPool.getFactory();
         this.getId = () => this.getId();
-        this.getSafetyMargin = () => __awaiter(this, void 0, void 0, function* () { return yield this.lendingPool.getSafetyMargin(); });
-        this.getLiquidationPenalty = () => __awaiter(this, void 0, void 0, function* () { return yield this.lendingPool.getLiquidationPenalty(); });
+        this.getSafetyMargin = async () => await this.lendingPool.getSafetyMargin();
+        this.getLiquidationPenalty = async () => await this.lendingPool.getLiquidationPenalty();
         this.account = account;
         this.lendingPool = lendingPool;
         this.collateral = this.getNewCollateralObject();
@@ -48,41 +39,32 @@ class OffchainAccountLendingPoolV2 extends offchainAccountLendingPool_1.default
     /*--------------------------------------------------------------------------*
      *                   User Lending Pool Data (PoolToken)                     *
      *--------------------------------------------------------------------------*/
-    getLendingPoolPosition() {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const userData = yield this.account.getUserData();
-            const userDataOfFactory = userData === null || userData === void 0 ? void 0 : userData[this.lendingPool.getFactory()];
-            if (!userDataOfFactory)
-                return;
-            const pairAddress = this.lendingPool.getPairAddress();
-            const supplyPositions = userDataOfFactory.supplyPositions[pairAddress];
-            const borrowPositions = (_a = userDataOfFactory === null || userDataOfFactory === void 0 ? void 0 : userDataOfFactory.borrowPositions) === null || _a === void 0 ? void 0 : _a[pairAddress];
-            return {
-                borrowable0: supplyPositions === null || supplyPositions === void 0 ? void 0 : supplyPositions[types_1.PoolTokenType.BorrowableA],
-                borrowable1: supplyPositions === null || supplyPositions === void 0 ? void 0 : supplyPositions[types_1.PoolTokenType.BorrowableB],
-                collateralPosition: (_b = userDataOfFactory === null || userDataOfFactory === void 0 ? void 0 : userDataOfFactory.collateralPositions) === null || _b === void 0 ? void 0 : _b[pairAddress],
-                borrowPositions: {
-                    borrowable0: borrowPositions === null || borrowPositions === void 0 ? void 0 : borrowPositions[types_1.PoolTokenType.BorrowableA],
-                    borrowable1: borrowPositions === null || borrowPositions === void 0 ? void 0 : borrowPositions[types_1.PoolTokenType.BorrowableB]
-                },
-            };
-        });
+    async getLendingPoolPosition() {
+        const userData = await this.account.getUserData();
+        const userDataOfFactory = userData?.[this.lendingPool.getFactory()];
+        if (!userDataOfFactory)
+            return;
+        const pairAddress = this.lendingPool.getPairAddress();
+        const supplyPositions = userDataOfFactory.supplyPositions[pairAddress];
+        const borrowPositions = userDataOfFactory?.borrowPositions?.[pairAddress];
+        return {
+            borrowable0: supplyPositions?.[types_1.PoolTokenType.BorrowableA],
+            borrowable1: supplyPositions?.[types_1.PoolTokenType.BorrowableB],
+            collateralPosition: userDataOfFactory?.collateralPositions?.[pairAddress],
+            borrowPositions: {
+                borrowable0: borrowPositions?.[types_1.PoolTokenType.BorrowableA],
+                borrowable1: borrowPositions?.[types_1.PoolTokenType.BorrowableB]
+            },
+        };
     }
-    getLeveragedPositions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [];
-        });
+    async getLeveragedPositions() {
+        return [];
     }
-    getLeveragedPositionsTotalBalanceUSD() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 1;
-        });
+    async getLeveragedPositionsTotalBalanceUSD() {
+        return 1;
     }
-    getLeveragedPositionsNetAPR() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return 1;
-        });
+    async getLeveragedPositionsNetAPR() {
+        return 1;
     }
 }
 exports.default = OffchainAccountLendingPoolV2;