impermax-sdk 2.1.337 → 2.1.338

package/lib/offchain/account/offchainAccount.js

@@ -41,7 +41,6 @@ class OffchainAccount {
         return this.vaults[vaultAddress];
     }
     async getUserData() {
-        console.log("Getting user data in offchainAccount.ts");
         return this.offchain.getUserData(this.accountAddress);
     }
     async getVaultsUserData() {

package/lib/offchain/initializer/user/index.d.ts

@@ -1,2 +1,2 @@
-export * from './vaults';
-export * from './lendingPools';
+export * from './userVault';
+export * from './userLendingPool';

package/lib/offchain/initializer/user/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./vaults"), exports);
-__exportStar(require("./lendingPools"), exports);
+__exportStar(require("./userVault"), exports);
+__exportStar(require("./userLendingPool"), exports);

package/lib/offchain/initializer/user/userLendingPool/index.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchUserData = exports.initializeUserData = exports.getUserData = void 0;
+const subgraphs_1 = require("../../../../config/subgraphs");
+const types_1 = require("../../../../config/types");
+const offchainTypes_1 = require("../../../offchainTypes");
+const positionsV2_1 = require("./positionsV2");
+const positionsV3_1 = require("./positionsV3");
+/*--------------------------------------------------------------------------*
+ *                                Getters                                   *
+ *--------------------------------------------------------------------------*/
+async function getUserData(account) {
+    if (!(account in this.usersData))
+        this.usersData[account] = this.initializeUserData(account);
+    return this.usersData[account];
+}
+exports.getUserData = getUserData;
+/*--------------------------------------------------------------------------*
+ *                            Initializers                                  *
+ *--------------------------------------------------------------------------*/
+// For supply positions v2/v3 remains unchanged.
+// For collateralPositions/borrowPositions we separate into:
+//   - `initializeV2Positions` for V2
+//   - `initializeV3Positions` for V3
+async function initializeUserData(account) {
+    const result = {};
+    const userData = await this.fetchUserData(account);
+    if (!userData)
+        return null;
+    for (const factory in userData) {
+        const userDataOfFactory = userData[factory];
+        result[factory] = {
+            positions: {},
+            collateralPositions: {},
+            supplyPositions: {},
+            borrowPositions: {},
+        };
+        // Get collateral/borrow positions for V2/V3
+        if ((0, offchainTypes_1.isV3Factory)(factory)) {
+            // TODO: V3 pair filter (nftlp)
+            const v3Data = await (0, positionsV3_1.initializeV3Positions)(this, factory, userDataOfFactory);
+            result[factory].positions = v3Data.positions;
+        }
+        else {
+            // Pass filtered pairs
+            const v2Data = await (0, positionsV2_1.initializeV2Positions)(this, factory, userDataOfFactory, []);
+            result[factory].collateralPositions = v2Data.collateralPositions;
+            result[factory].borrowPositions = v2Data.borrowPositions;
+        }
+        // Supply positions is same for v2 and v3
+        for (const supplyPosition of userDataOfFactory.supplyPositions) {
+            const lendingPoolId = supplyPosition.borrowable.lendingPool.id;
+            // Don't include supply positions if lending pool is not in pair list
+            // if (pairs.length > 0 && !pairs.includes(lendingPoolId)) continue
+            const underlyingId = supplyPosition.borrowable.underlying.id;
+            const lendingPool = await this.getLendingPool(factory, lendingPoolId);
+            if (!lendingPool) {
+                console.error("Can't resolve supplyPosition because lendingPool is null. Lending pool:", lendingPoolId, this.network);
+                continue;
+            }
+            const borrowableA = lendingPool.getBorrowableA();
+            const addressA = await borrowableA.getUnderlyingAddress();
+            const poolTokenType = underlyingId === addressA
+                ? types_1.PoolTokenType.BorrowableA
+                : types_1.PoolTokenType.BorrowableB;
+            if (!(lendingPoolId in result[factory].supplyPositions)) {
+                result[factory].supplyPositions[lendingPoolId] = {};
+            }
+            result[factory].supplyPositions[lendingPoolId][poolTokenType] = supplyPosition;
+        }
+    }
+    return result;
+}
+exports.initializeUserData = initializeUserData;
+/*--------------------------------------------------------------------------*
+ *                               Fetchers                                   *
+ *--------------------------------------------------------------------------*/
+// User Data
+async function fetchUserData(account) {
+    const positions = {};
+    for (const factory in subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network]) {
+        const subgraphs = subgraphs_1.IMPERMAX_SUBGRAPH_URL[this.network][factory];
+        // Decides for v3 query internally
+        const result = await this.getEndpointManager().fetch(subgraphs, this.network, (queryBuilder) => queryBuilder.userQuery(account, this.network, factory));
+        if (!result || !result.data?.user)
+            continue;
+        const user = result.data.user;
+        positions[factory] = {
+            positions: user.positions,
+            supplyPositions: user.supplyPositions,
+            collateralPositions: user.collateralPositions,
+            borrowPositions: user.borrowPositions, // Undefined if V3
+        };
+    }
+    return positions;
+}
+exports.fetchUserData = fetchUserData;

package/package.json

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

package/lib/offchain/initializer/user/lendingPools/index.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchUserData = exports.initializeUserData = exports.getUserData = void 0;
-// import { initializeV2Positions } from "./positionsV2";
-// import { initializeV3Positions } from "./positionsV3";
-/*--------------------------------------------------------------------------*
- *                                Getters                                   *
- *--------------------------------------------------------------------------*/
-async function getUserData(account) {
-    console.log("Account: ", account);
-    return null;
-}
-exports.getUserData = getUserData;
-/*--------------------------------------------------------------------------*
- *                            Initializers                                  *
- *--------------------------------------------------------------------------*/
-// For supply positions v2/v3 remains unchanged.
-// For collateralPositions/borrowPositions we separate into:
-//   - `initializeV2Positions` for V2
-//   - `initializeV3Positions` for V3
-async function initializeUserData(account) {
-    return null;
-    // const result: FactoryIndex<UserData> = {};
-    // const userData = await this.fetchUserData(account);
-    // if (!userData) return null;
-    // for (const factory in userData) {
-    //   const userDataOfFactory = userData[factory];
-    //   result[factory] = {
-    //     positions: {},
-    //     collateralPositions: {},
-    //     supplyPositions: {},
-    //     borrowPositions: {},
-    //   };
-    //   // Get collateral/borrow positions for V2/V3
-    //   if (isV3Factory(factory)) {
-    //     // TODO: V3 pair filter (nftlp)
-    //     const v3Data = await initializeV3Positions(this, factory as Factory, userDataOfFactory);
-    //     result[factory].positions = v3Data.positions;
-    //   } else {
-    //     // Pass filtered pairs
-    //     const v2Data = await initializeV2Positions(this, factory as Factory, userDataOfFactory, []);
-    //     result[factory].collateralPositions = v2Data.collateralPositions;
-    //     result[factory].borrowPositions = v2Data.borrowPositions;
-    //   }
-    //   // Supply positions is same for v2 and v3
-    //   for (const supplyPosition of userDataOfFactory.supplyPositions) {
-    //     const lendingPoolId = supplyPosition.borrowable.lendingPool.id;
-    //     // Don't include supply positions if lending pool is not in pair list
-    //     // if (pairs.length > 0 && !pairs.includes(lendingPoolId)) continue
-    //     const underlyingId = supplyPosition.borrowable.underlying.id;
-    //     const lendingPool = await this.getLendingPool(factory as Factory, lendingPoolId);
-    //     if (!lendingPool) {
-    //       console.error("Can't resolve supplyPosition because lendingPool is null. Lending pool:", lendingPoolId, this.network);
-    //       continue;
-    //     }
-    //     const borrowableA = lendingPool.getBorrowableA();
-    //     const addressA = await borrowableA.getUnderlyingAddress();
-    //     const poolTokenType = underlyingId === addressA
-    //       ? PoolTokenType.BorrowableA
-    //       : PoolTokenType.BorrowableB;
-    //     if (!(lendingPoolId in result[factory].supplyPositions)) {
-    //       result[factory].supplyPositions[lendingPoolId] = {};
-    //     }
-    //     result[factory].supplyPositions[lendingPoolId][poolTokenType] = supplyPosition;
-    //   }
-    // }
-    // return result;
-}
-exports.initializeUserData = initializeUserData;
-/*--------------------------------------------------------------------------*
- *                               Fetchers                                   *
- *--------------------------------------------------------------------------*/
-// User Data
-async function fetchUserData(account) {
-    return 0;
-    // const positions: FactoryIndex<RawUserData> = {};
-    // for (const factory in IMPERMAX_SUBGRAPH_URL[this.network]) {
-    //   const subgraphs = IMPERMAX_SUBGRAPH_URL[this.network][factory] as string[];
-    //   // Decides for v3 query internally
-    //   const result = await this.getEndpointManager().fetch(
-    //     subgraphs,
-    //     this.network,
-    //     (queryBuilder) => queryBuilder.userQuery(account, this.network, factory as Factory),
-    //   );
-    //   if (!result || !result.data?.user) continue;
-    //   const user = result.data.user;
-    //   positions[factory as Factory] = { 
-    //     positions: user.positions, // Undefined if v2
-    //     supplyPositions: user.supplyPositions,
-    //     collateralPositions: user.collateralPositions, // Undefined if V3
-    //     borrowPositions: user.borrowPositions, // Undefined if V3
-    //   }
-    // }
-    // return positions;
-}
-exports.fetchUserData = fetchUserData;