@defisaver/positions-sdk 0.0.182 → 0.0.183

package/cjs/aaveV3/index.js

@@ -104,7 +104,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 params: [],
             },
             {
-                target: (0, tokens_1.getAssetInfo)('GHO').address,
+                target: (0, tokens_1.getAssetInfo)('GHO', network).address,
                 abiItem: (0, utils_1.getAbiItem)(GhoTokenAbi, 'getFacilitatorsList'),
                 params: [],
             },
@@ -148,7 +148,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
-            const nativeAsset = symbol === 'GHO';
+            const nativeAsset = symbol === 'GHO' && network === common_1.NetworkNumber.Eth;
             // eslint-disable-next-line guard-for-in
             for (const eModeIndex in eModeCategoriesData) {
                 if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId)))
@@ -423,7 +423,7 @@ const getAaveV3AccountData = (web3, network, address, extractedState) => __await
         }
         if (!usedAssets[asset])
             usedAssets[asset] = {};
-        const nativeAsset = asset === 'GHO';
+        const nativeAsset = asset === 'GHO' && network === common_1.NetworkNumber.Eth;
         let discountRateOnBorrow = '0';
         const borrowed = new decimal_js_1.default(borrowedStable).add(borrowedVariable).toString();
         if (nativeAsset && new decimal_js_1.default(borrowed).gt(0) && new decimal_js_1.default(stkAaveBalance).gt(0)) {

package/cjs/config/contracts.d.ts

@@ -2280,6 +2280,9 @@ export namespace GHO {
         "1": {
             address: string;
         };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_15 as networks };
 }

package/cjs/config/contracts.js

@@ -312,6 +312,9 @@ module.exports = {
         "networks": {
             "1": {
                 "address": "0x40d16fc0246ad3160ccc09b8d0d3a2cd28ae6c2f"
+            },
+            "42161": {
+                "address": "0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33"
             }
         }
     },

package/cjs/helpers/aaveHelpers/index.js

@@ -115,7 +115,6 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         usedAssets,
         assetsData,
         isMorpho: (0, exports.isMorphoAave)({ selectedMarket }),
-        network,
     });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/staking/staking.d.ts

@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../types/common';
+import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const getStETHApy: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getCbETHApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getREthApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
@@ -8,11 +8,10 @@ export declare const getSsrApy: () => Promise<string>;
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => "0" | Promise<any> | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
-export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho, network, }: {
+export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;
     isMorpho?: boolean | undefined;
-    network?: NetworkNumber | undefined;
 }) => {
     netApy: string;
     totalInterestUsd: string;

package/cjs/staking/staking.js

@@ -170,7 +170,7 @@ const calculateInterestEarned = (principal, interest, type, apy = false) => {
     return (+principal * (Math.pow(((1 + (+interest / 100) / constants_1.BLOCKS_IN_A_YEAR)), (constants_1.BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
 exports.calculateInterestEarned = calculateInterestEarned;
-const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false, network = 1, }) => {
+const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);
         const assetData = assetsData[usedAsset.symbol];
@@ -193,7 +193,7 @@ const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false, network = 1
             acc.borrowedUsd = new decimal_js_1.default(acc.borrowedUsd).add(amount).toString();
             const rate = isMorpho
                 ? usedAsset.borrowRate === '0' ? assetData.borrowRateP2P : usedAsset.borrowRate
-                : (usedAsset.symbol === 'GHO' && network === common_1.NetworkNumber.Eth)
+                : (usedAsset.symbol === 'GHO' && assetsData.nativeAsset)
                     ? usedAsset.discountedBorrowRate
                     : ((usedAsset === null || usedAsset === void 0 ? void 0 : usedAsset.interestMode) === '1' ? usedAsset.stableBorrowRate : assetData.borrowRate);
             const borrowInterest = (0, exports.calculateInterestEarned)(amount, rate, 'year', true);

package/esm/aaveV3/index.js

@@ -16,7 +16,7 @@ import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
 import { getAssetsBalances } from '../assets';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode, } from '../helpers/aaveHelpers';
+import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 export const test = (web3, network) => {
     const contract = AaveV3ViewContract(web3, 1);
@@ -95,7 +95,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 params: [],
             },
             {
-                target: getAssetInfo('GHO').address,
+                target: getAssetInfo('GHO', network).address,
                 abiItem: getAbiItem(GhoTokenAbi, 'getFacilitatorsList'),
                 params: [],
             },
@@ -139,7 +139,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
-            const nativeAsset = symbol === 'GHO';
+            const nativeAsset = symbol === 'GHO' && network === NetworkNumber.Eth;
             // eslint-disable-next-line guard-for-in
             for (const eModeIndex in eModeCategoriesData) {
                 if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId)))
@@ -412,7 +412,7 @@ export const getAaveV3AccountData = (web3, network, address, extractedState) =>
         }
         if (!usedAssets[asset])
             usedAssets[asset] = {};
-        const nativeAsset = asset === 'GHO';
+        const nativeAsset = asset === 'GHO' && network === NetworkNumber.Eth;
         let discountRateOnBorrow = '0';
         const borrowed = new Dec(borrowedStable).add(borrowedVariable).toString();
         if (nativeAsset && new Dec(borrowed).gt(0) && new Dec(stkAaveBalance).gt(0)) {

package/esm/config/contracts.d.ts

@@ -2280,6 +2280,9 @@ export namespace GHO {
         "1": {
             address: string;
         };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_15 as networks };
 }

package/esm/config/contracts.js

@@ -311,6 +311,9 @@ module.exports = {
         "networks": {
             "1": {
                 "address": "0x40d16fc0246ad3160ccc09b8d0d3a2cd28ae6c2f"
+            },
+            "42161": {
+                "address": "0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33"
             }
         }
     },

package/esm/helpers/aaveHelpers/index.js

@@ -98,7 +98,6 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         usedAssets,
         assetsData,
         isMorpho: isMorphoAave({ selectedMarket }),
-        network,
     });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/esm/staking/staking.d.ts

@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../types/common';
+import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const getStETHApy: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getCbETHApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getREthApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
@@ -8,11 +8,10 @@ export declare const getSsrApy: () => Promise<string>;
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => "0" | Promise<any> | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
-export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho, network, }: {
+export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;
     isMorpho?: boolean | undefined;
-    network?: NetworkNumber | undefined;
 }) => {
     netApy: string;
     totalInterestUsd: string;

package/esm/staking/staking.js

@@ -157,7 +157,7 @@ export const calculateInterestEarned = (principal, interest, type, apy = false)
     }
     return (+principal * (Math.pow(((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)), (BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
-export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false, network = 1, }) => {
+export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);
         const assetData = assetsData[usedAsset.symbol];
@@ -180,7 +180,7 @@ export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false, netw
             acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
             const rate = isMorpho
                 ? usedAsset.borrowRate === '0' ? assetData.borrowRateP2P : usedAsset.borrowRate
-                : (usedAsset.symbol === 'GHO' && network === NetworkNumber.Eth)
+                : (usedAsset.symbol === 'GHO' && assetsData.nativeAsset)
                     ? usedAsset.discountedBorrowRate
                     : ((usedAsset === null || usedAsset === void 0 ? void 0 : usedAsset.interestMode) === '1' ? usedAsset.stableBorrowRate : assetData.borrowRate);
             const borrowInterest = calculateInterestEarned(amount, rate, 'year', true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.182",
+  "version": "0.0.183",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -34,11 +34,7 @@ import { multicall } from '../multicall';
 import { IUiIncentiveDataProviderV3 } from '../types/contracts/generated/AaveUiIncentiveDataProviderV3';
 import { getAssetsBalances } from '../assets';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import {
-  aaveAnyGetAggregatedPositionData,
-  aaveV3IsInIsolationMode,
-  aaveV3IsInSiloedMode,
-} from '../helpers/aaveHelpers';
+import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 
 export const test = (web3: Web3, network: NetworkNumber) => {
@@ -137,7 +133,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       params: [],
     },
     {
-      target: getAssetInfo('GHO').address,
+      target: getAssetInfo('GHO', network).address,
       abiItem: getAbiItem(GhoTokenAbi, 'getFacilitatorsList'),
       params: [],
     },
@@ -191,7 +187,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
   const assetsData: AaveV3AssetData[] = await Promise.all(loanInfo
     .map(async (tokenMarket, i) => {
       const symbol = market.assets[i];
-      const nativeAsset = symbol === 'GHO';
+      const nativeAsset = symbol === 'GHO' && network === NetworkNumber.Eth;
 
       // eslint-disable-next-line guard-for-in
       for (const eModeIndex in eModeCategoriesData) {
@@ -547,7 +543,7 @@ export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, a
       interestMode = 'both';
     }
     if (!usedAssets[asset]) usedAssets[asset] = {} as AaveV3UsedAsset;
-    const nativeAsset = asset === 'GHO';
+    const nativeAsset = asset === 'GHO' && network === NetworkNumber.Eth;
 
     let discountRateOnBorrow = '0';
     const borrowed = new Dec(borrowedStable).add(borrowedVariable).toString();

package/src/config/contracts.js

@@ -312,6 +312,9 @@ module.exports = {
     "networks": {
       "1": {
         "address": "0x40d16fc0246ad3160ccc09b8d0d3a2cd28ae6c2f"
+      },
+      "42161": {
+        "address": "0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33"
       }
     }
   },

package/src/helpers/aaveHelpers/index.ts

@@ -129,7 +129,6 @@ export const aaveAnyGetAggregatedPositionData = ({
     usedAssets,
     assetsData,
     isMorpho: isMorphoAave({ selectedMarket }),
-    network,
   });
   payload.netApy = netApy;
   payload.incentiveUsd = incentiveUsd;

package/src/staking/staking.ts

@@ -151,9 +151,7 @@ export const calculateInterestEarned = (principal: string, interest: string, typ
   return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
 };
 
-export const calculateNetApy = ({
-  usedAssets, assetsData, isMorpho = false, network = 1,
-}: { usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean, network?: NetworkNumber }) => {
+export const calculateNetApy = ({ usedAssets, assetsData, isMorpho = false }: { usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean }) => {
   const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
     const acc = { ..._acc };
     const assetData = assetsData[usedAsset.symbol];
@@ -178,7 +176,7 @@ export const calculateNetApy = ({
       acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
       const rate = isMorpho
         ? usedAsset.borrowRate === '0' ? assetData.borrowRateP2P : usedAsset.borrowRate
-        : (usedAsset.symbol === 'GHO' && network === NetworkNumber.Eth)
+        : (usedAsset.symbol === 'GHO' && assetsData.nativeAsset)
           ? usedAsset.discountedBorrowRate
           : (usedAsset?.interestMode === '1' ? usedAsset.stableBorrowRate : assetData.borrowRate);
       const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);