impermax-sdk 2.1.70 → 2.1.72

package/lib/offchain/account/offchainAccount.js

@@ -69,7 +69,13 @@ class OffchainAccount {
             if (userData === null)
                 return result;
             for (const factory in userData) {
-                result[factory] = Object.keys(userData[factory].collateralPositions);
+                result[factory] = [];
+                const collateralPositions = userData[factory].collateralPositions;
+                // 1-to-many relationship between lending pool and borrow positions
+                for (const lendingPool in collateralPositions) {
+                    const positions = collateralPositions[lendingPool];
+                    positions.forEach(() => result[factory].push(lendingPool));
+                }
             }
             return result;
         });

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -128,6 +128,8 @@ class OffchainLendingPool {
             const rewards = [];
             const stakedTotalSupply = parseFloat(lendingPoolData.pair.stakedTotalSupply);
             const underlyingLPPrice = yield this.getUnderlyingLPPrice(true);
+            if (!lendingPoolData.pair.rewards)
+                return rewards;
             for (const reward of lendingPoolData.pair.rewards) {
                 const multiplier = farm === farms_1.Farms.traderJoeV2 ? 0.5 : 1;
                 const periodFinish = parseInt(reward.periodFinish);

package/lib/offchain/offchainInitializer.js

@@ -601,9 +601,14 @@ function initializeUserData(account) {
                 borrowPositions: {},
             };
             const rawUserData = userData[factory];
+            // 1 collateral can have one or many positions (1 for v2, many for v3)
             for (const collateralPosition of rawUserData.collateralPositions) {
                 const resultOfFactory = result[factory];
-                resultOfFactory.collateralPositions[collateralPosition.collateral.lendingPool.id] = collateralPosition;
+                const lendingPoolId = collateralPosition.collateral.lendingPool.id;
+                if (!resultOfFactory.collateralPositions[lendingPoolId]) {
+                    resultOfFactory.collateralPositions[lendingPoolId] = [];
+                }
+                resultOfFactory.collateralPositions[lendingPoolId].push(collateralPosition);
             }
             for (const supplyPositions of rawUserData.supplyPositions) {
                 const uniswapV2PairAddress = supplyPositions.borrowable.lendingPool.id;

package/lib/offchain/offchainPriceHelper.js

@@ -164,8 +164,10 @@ class OffchainPriceHelper {
                     const lendingPool = lendingPoolsData[factory][id];
                     this.addPriceIfMissing(offchainTokenPrice, lendingPool.borrowable0.underlying);
                     this.addPriceIfMissing(offchainTokenPrice, lendingPool.borrowable1.underlying);
-                    for (const reward of lendingPool.pair.rewards) {
-                        this.addPriceIfMissing(offchainTokenPrice, reward.rewardsToken);
+                    if (lendingPool.pair.rewards) {
+                        for (const reward of lendingPool.pair.rewards) {
+                            this.addPriceIfMissing(offchainTokenPrice, reward.rewardsToken);
+                        }
                     }
                 }
             }

package/lib/offchain/offchainTypes.d.ts

@@ -123,7 +123,7 @@ export interface RawUserData {
     borrowPositions: BorrowPosition[];
 }
 export interface UserData {
-    collateralPositions: AddressIndex<CollateralPosition>;
+    collateralPositions: AddressIndex<CollateralPosition[]>;
     supplyPositions: AddressIndex<{
         [key in PoolTokenType]?: SupplyPosition;
     }>;

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

@@ -34,17 +34,6 @@ class PonderQueryBuilder {
       name
       decimals
       derivedUSD
-    }`;
-        const distributorStr = `{ 
-      id 
-    }`;
-        const farmingPoolStr = `{
-      epochAmount
-      epochBegin
-      segmentLength
-      vestingBegin
-      sharePercentage
-      distributor ${distributorStr}
     }`;
         const borrowableStr = `{
       id
@@ -60,7 +49,6 @@ class PonderQueryBuilder {
       accrualTimestamp 
       exchangeRate 
       borrowTracker
-      farmingPool ${farmingPoolStr}
     }`;
         const collateralStr = `{
       id
@@ -74,14 +62,6 @@ class PonderQueryBuilder {
       dexFactory
       token1Price
       token0Price
-      rewards {
-        items { 
-          id
-          rewardRate
-          rewardsToken ${tokenStr}
-          periodFinish
-        }
-      }
     }`;
         const id_in_string = (addressesFilter === null || addressesFilter === void 0 ? void 0 : addressesFilter.length) > 0 ? `id_in: ["${addressesFilter.join('","').toLowerCase()}"]` : "";
         return (0, graphql_tag_1.default) `{

package/package.json

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