impermax-sdk 2.1.23 → 2.1.24

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

@@ -42,6 +42,8 @@ class OffchainAccountLendingPool {
             if (!userData)
                 return undefined;
             const userDataOfFactory = userData[this.lendingPool.getFactory()];
+            if (!userDataOfFactory)
+                return undefined;
             const pairAddress = this.lendingPool.getPairAddress();
             const supplyPositions = userDataOfFactory.supplyPositions[pairAddress];
             return {

package/lib/offchain/queries/apis/ponder/index.d.ts

@@ -4,6 +4,7 @@ export declare class PonderQueryBuilder implements IQueryBuilder {
     blockQuery(): import("graphql").DocumentNode;
     getBlockNumber(response: any, network: Networks): number;
     lendingPoolsV3Query(factory: Factory, addressesFilter: Address[], network: Networks): import("graphql").DocumentNode;
+    userQueryV3(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[], network: Networks): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;

package/lib/offchain/queries/apis/ponder/index.js

@@ -102,6 +102,52 @@ class PonderQueryBuilder {
       }
     }`;
     }
+    // WARN: Removed balance from collateralPositions
+    userQueryV3(account, network, factory) {
+        return (0, graphql_tag_1.default) `{
+      user(id: "${account.toLowerCase()}") {
+        collateralPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
+          items { 
+            collateral {
+              lendingPool {
+                id
+              }
+            }
+          }
+        }
+        supplyPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
+          items { 
+            balance
+            borrowable {
+              underlying {
+                id
+              }
+              lendingPool {
+                id
+              }
+            }
+          }
+        }
+        borrowPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {
+          items { 
+            borrowBalance
+            borrowIndex
+            borrowable {
+              underlying {
+                id
+              }
+              lendingPool {
+                id
+              }
+            }
+          }
+        }
+      }
+      _meta {
+        status
+      }
+    }`;
+    }
     /*-----------------------------*
      *   2. Lending pools
      *-----------------------------*/
@@ -197,6 +243,8 @@ class PonderQueryBuilder {
     }`;
     }
     userQuery(account, network, factory) {
+        if (factory === types_1.Factory.V3)
+            return this.userQueryV3(account, network, factory);
         return (0, graphql_tag_1.default) `{
       user(id: "${account.toLowerCase()}") {
         collateralPositions(limit:1000, where: { factoryId: "${impermax_factories_1.IMPERMAX_FACTORY[network][factory]}"}) {

package/lib/offchain/queries/apis/thegraph/index.d.ts

@@ -4,6 +4,7 @@ export declare class TheGraphQueryBuilder implements IQueryBuilder {
     blockQuery(timestamp: number): import("graphql").DocumentNode;
     getBlockNumber(response: any, network: Networks): number;
     lendingPoolsV3Query(factory: Factory, addressesFilter: Address[]): import("graphql").DocumentNode;
+    userQueryV3(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[]): import("graphql").DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): import("graphql").DocumentNode;
     tvlQuery(): import("graphql").DocumentNode;

package/lib/offchain/queries/apis/thegraph/index.js

@@ -32,11 +32,17 @@ class TheGraphQueryBuilder {
         return ((_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a._meta) === null || _b === void 0 ? void 0 : _b.block) === null || _c === void 0 ? void 0 : _c.number) || 0;
     }
     /*-----------------------------*
-     *   2. Lending pools
+     *   2. Lending pools V3
      *-----------------------------*/
     lendingPoolsV3Query(factory, addressesFilter) {
         return (0, graphql_tag_1.default) `{}`;
     }
+    userQueryV3(account, network, factory) {
+        return (0, graphql_tag_1.default) `{}`;
+    }
+    /*-----------------------------*
+     *   2. Lending pools
+     *-----------------------------*/
     lendingPoolsQuery(factory, addressesFilter) {
         if (factory == types_1.Factory.V3)
             return this.lendingPoolsV3Query(factory, addressesFilter);
@@ -128,6 +134,8 @@ class TheGraphQueryBuilder {
     }`;
     }
     userQuery(account, network, factory) {
+        if (factory === types_1.Factory.V3)
+            return this.userQueryV3(account, network, factory);
         // Shh
         network;
         factory;

package/lib/offchain/queries/interfaces/query-builder.d.ts

@@ -4,6 +4,7 @@ export interface IQueryBuilder {
     blockQuery(timestamp: number): DocumentNode;
     getBlockNumber: (response: any, network: Networks) => number;
     lendingPoolsV3Query(factory: Factory, addressesFilter: Address[], network: Networks): DocumentNode;
+    userQueryV3(account: Address, network: Networks, factory: Factory): DocumentNode;
     lendingPoolsQuery(factory: Factory, addressesFilter: Address[] | undefined, network: Networks): DocumentNode;
     userQuery(account: Address, network: Networks, factory: Factory): DocumentNode;
     tvlQuery(): DocumentNode;

package/lib/onchain/impermaxFactory/onchainImpermaxFactoryV3.js

@@ -70,7 +70,7 @@ class OnchainImpermaxFactoryV3 extends onchainImpermaxFactory_1.default {
                     if (!routers_1.ROUTER_V3[this.onchain.network][types_1.Extension[extension]])
                         continue;
                     const router = this.getRouterExtension(types_1.Extension[extension]);
-                    const factoryAddress = router.methods.factory().call();
+                    const factoryAddress = yield router.methods.factory().call();
                     this.cache.factoryContract = this.onchain.getContractHelper().newFactoryV3(factoryAddress);
                     break;
                 }

package/package.json

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