@defisaver/positions-sdk 0.0.144 → 0.0.146

package/README.md

@@ -1,63 +1,63 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)

package/cjs/aaveV3/index.js

@@ -17,14 +17,13 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const utils_1 = require("../services/utils");
-const aave_1 = require("../types/aave");
 const common_1 = require("../types/common");
 const staking_1 = require("../staking");
 const multicall_1 = require("../multicall");
 const assets_1 = require("../assets");
 const moneymarket_1 = require("../moneymarket");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
-const aave_2 = require("../markets/aave");
+const aave_1 = require("../markets/aave");
 const test = (web3, network) => {
     const contract = (0, contracts_1.AaveV3ViewContract)(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();
@@ -74,94 +73,7 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 };
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
 // eslint-disable-next-line no-bitwise
-const isEnabledOnBitmap = (bitmap, assetId) => (((bitmap >> assetId) & 1) !== 0);
-// @DEV: hardcode emodes till they add new emodes structs to all chains
-const getAllEmodesHardcoded = (network, selectedMarket) => {
-    switch (network) {
-        case common_1.NetworkNumber.Eth:
-            {
-                switch (selectedMarket) {
-                    case aave_1.AaveVersions.AaveV3:
-                        return [
-                            {
-                                ltv: 9300,
-                                liquidationThreshold: 9500,
-                                liquidationBonus: 10100,
-                                collateralBitmap: '2952790659',
-                                label: 'ETH correlated',
-                                borrowableBitmap: '2952790659',
-                            },
-                        ];
-                    case aave_1.AaveVersions.AaveV3Lido:
-                        return [
-                            {
-                                ltv: 9350,
-                                liquidationThreshold: 9550,
-                                liquidationBonus: 10100,
-                                collateralBitmap: '3',
-                                label: 'ETH correlated',
-                                borrowableBitmap: '3',
-                            },
-                        ];
-                    case aave_1.AaveVersions.AaveV3Etherfi:
-                        return [];
-                    default:
-                        throw new Error('Emode not implemented for this market');
-                }
-            }
-        case common_1.NetworkNumber.Arb:
-            return [
-                {
-                    ltv: 9300,
-                    liquidationThreshold: 9500,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '4261',
-                    label: 'Stablecoins',
-                    borrowableBitmap: '4261',
-                },
-                {
-                    ltv: 9300,
-                    liquidationThreshold: 9500,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '33040',
-                    label: 'ETH correlated',
-                    borrowableBitmap: '33040',
-                },
-            ];
-        case common_1.NetworkNumber.Opt:
-            return [
-                {
-                    ltv: 9000,
-                    liquidationThreshold: 9300,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '8357',
-                    label: 'Stablecoins',
-                    borrowableBitmap: '8357',
-                },
-                {
-                    ltv: 9300,
-                    liquidationThreshold: 9500,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '4624',
-                    label: 'ETH correlated',
-                    borrowableBitmap: '4624',
-                },
-            ];
-        case common_1.NetworkNumber.Base:
-            return [
-                {
-                    ltv: 9000,
-                    liquidationThreshold: 9300,
-                    liquidationBonus: 10200,
-                    collateralBitmap: '43',
-                    label: 'ETH correlated',
-                    borrowableBitmap: '43',
-                },
-            ];
-        default:
-            throw new Error('Emode not implemented for this network');
-    }
-};
+const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
@@ -203,8 +115,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, multiRes] = yield Promise.all([
             loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
-            // loanInfoContract.methods.getAllEmodes(marketAddress).call(),
-            getAllEmodesHardcoded(network, market.value),
+            loanInfoContract.methods.getAllEmodes(marketAddress).call(),
             loanInfoContract.methods.isBorrowAllowed(marketAddress).call(),
             isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : (0, multicall_1.multicall)(multicallCallsObject, web3, network),
         ]);
@@ -227,9 +138,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         }
         const [{ 0: ghoDiscountedPerDiscountToken }, { 0: discountRate }, { 0: minDiscountTokenBalance }, { 0: minGhoBalanceForDiscount }, { 0: facilitatorsList },] = multiRes;
         let rewardInfo = null;
-        // @DEV: Temporarily disable incentives for Arbitrum and Optimism
-        // const networksWithIncentives = [NetworkNumber.Arb, NetworkNumber.Opt];
-        const networksWithIncentives = [];
+        const networksWithIncentives = [common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt];
         if (networksWithIncentives.includes(network)) {
             rewardInfo = yield aaveIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
             rewardInfo = rewardInfo.reduce((all, _market) => {
@@ -374,7 +283,7 @@ const getAaveV3AccountBalances = (web3, network, block, addressMapping, address)
         return balances;
     }
     const loanInfoContract = (0, contracts_1.AaveV3ViewContract)(web3, network, block);
-    const market = (0, aave_2.AAVE_V3)(network);
+    const market = (0, aave_1.AAVE_V3)(network);
     const marketAddress = market.providerAddress;
     // @ts-ignore
     const protocolDataProviderContract = (0, contracts_1.createContractWrapper)(web3, network, market.protocolData, market.protocolDataAddress);
@@ -510,7 +419,7 @@ const getAaveV3AccountData = (web3, network, address, extractedState) => __await
 exports.getAaveV3AccountData = getAaveV3AccountData;
 const getAaveV3FullPositionData = (web3, network, address, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getAaveV3MarketData(web3, network, market, mainnetWeb3);
-    const positionData = yield (0, exports.getAaveV3AccountData)(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
+    const positionData = yield (0, exports.getAaveV3AccountData)(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });
     return positionData;
 });
 exports.getAaveV3FullPositionData = getAaveV3FullPositionData;

package/cjs/config/contracts.js

@@ -266,16 +266,16 @@ module.exports = {
         "abi": [{ "inputs": [{ "internalType": "contract IPoolAddressesProvider", "name": "provider", "type": "address" }], "name": "getReservesIncentivesData", "outputs": [{ "components": [{ "internalType": "address", "name": "underlyingAsset", "type": "address" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "uint256", "name": "emissionPerSecond", "type": "uint256" }, { "internalType": "uint256", "name": "incentivesLastUpdateTimestamp", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesIndex", "type": "uint256" }, { "internalType": "uint256", "name": "emissionEndTimestamp", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "precision", "type": "uint8" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.RewardInfo[]", "name": "rewardsTokenInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.IncentiveData", "name": "aIncentiveData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "uint256", "name": "emissionPerSecond", "type": "uint256" }, { "internalType": "uint256", "name": "incentivesLastUpdateTimestamp", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesIndex", "type": "uint256" }, { "internalType": "uint256", "name": "emissionEndTimestamp", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "precision", "type": "uint8" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.RewardInfo[]", "name": "rewardsTokenInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.IncentiveData", "name": "vIncentiveData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "uint256", "name": "emissionPerSecond", "type": "uint256" }, { "internalType": "uint256", "name": "incentivesLastUpdateTimestamp", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesIndex", "type": "uint256" }, { "internalType": "uint256", "name": "emissionEndTimestamp", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "precision", "type": "uint8" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.RewardInfo[]", "name": "rewardsTokenInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.IncentiveData", "name": "sIncentiveData", "type": "tuple" }], "internalType": "struct IUiIncentiveDataProviderV3.AggregatedReserveIncentiveData[]", "name": "", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "contract IPoolAddressesProvider", "name": "provider", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "getUserReservesIncentivesData", "outputs": [{ "components": [{ "internalType": "address", "name": "underlyingAsset", "type": "address" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "uint256", "name": "userUnclaimedRewards", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesUserIndex", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.UserRewardInfo[]", "name": "userRewardsInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.UserIncentiveData", "name": "aTokenIncentivesUserData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "uint256", "name": "userUnclaimedRewards", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesUserIndex", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.UserRewardInfo[]", "name": "userRewardsInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.UserIncentiveData", "name": "vTokenIncentivesUserData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "uint256", "name": "userUnclaimedRewards", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesUserIndex", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.UserRewardInfo[]", "name": "userRewardsInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.UserIncentiveData", "name": "sTokenIncentivesUserData", "type": "tuple" }], "internalType": "struct IUiIncentiveDataProviderV3.UserReserveIncentiveData[]", "name": "", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }],
         "networks": {
             "1": {
-                "address": "0x162A7AC02f547ad796CA549f757e2b8d1D9b10a6"
+                "address": "0x5a40cDe2b76Da2beD545efB3ae15708eE56aAF9c"
             },
             "10": {
-                "address": "0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7"
+                "address": "0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3"
             },
             "8453": {
-                "address": "0xEdD3b4737C1a0011626631a977b91Cf3E944982d"
+                "address": "0x5c5228aC8BC1528482514aF3e27E692495148717"
             },
             "42161": {
-                "address": "0xDA67AF3403555Ce0AE3ffC22fDb7354458277358"
+                "address": "0xE92cd6164CE7DC68e740765BC1f2a091B6CBc3e4"
             }
         }
     },

package/cjs/markets/aave/index.js

@@ -119,6 +119,8 @@ const MORPHO_AAVE_V3_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     providerAddress: (0, contracts_1.getConfigContractAddress)('AaveV3PoolAddressesProvider', networkId),
     protocolData: 'AaveV3ProtocolDataProvider',
     protocolDataAddress: (0, contracts_1.getConfigContractAddress)('AaveV3ProtocolDataProvider', networkId),
+    aaveLendingPool: 'AaveV3LendingPool',
+    aaveLendingPoolAddress: (0, contracts_1.getConfigContractAddress)('AaveV3LendingPool', networkId),
     lendingPool: 'MorphoAaveV3ProxyEthMarket',
     lendingPoolAddress: (0, contracts_1.getConfigContractAddress)('MorphoAaveV3ProxyEthMarket', 1),
     // icon: SvgAdapter(protocolIcons.morpho),

package/cjs/morphoAaveV3/index.js

@@ -80,6 +80,7 @@ const computeMorphoMarketData = (loanInfo, morphoMarketData, aaveIndexes) => {
 const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     // @ts-ignore
     const lendingPoolContract = (0, contracts_1.createContractWrapper)(web3, network, selectedMarket.lendingPool, selectedMarket.lendingPoolAddress);
+    const aaveLendingPoolContract = (0, contracts_1.createContractWrapper)(web3, network, selectedMarket.aaveLendingPool, selectedMarket.aaveLendingPoolAddress);
     const _addresses = selectedMarket.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address);
     const splitStart = Math.floor(_addresses.length / 2);
     const loanInfoCallsToSkip = 2; // skipping getFullTokensInfo calls at the start of multicallArray
@@ -102,9 +103,9 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
                 params: [underlyingAddress],
             },
             {
-                target: selectedMarket.protocolDataAddress,
+                target: aaveLendingPoolContract.options.address,
                 // @ts-ignore
-                abiItem: (0, utils_1.getAbiItem)((0, contracts_1.getConfigContractAbi)(selectedMarket.protocolData), 'getReserveData'),
+                abiItem: (0, utils_1.getAbiItem)((0, contracts_1.getConfigContractAbi)(selectedMarket.aaveLendingPool), 'getReserveData'),
                 params: [underlyingAddress],
             }]))).flat(),
     ];
@@ -140,7 +141,7 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
     const assetsData = yield Promise.all(loanInfo.map((info, i) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         const morphoMarketData = Object.assign(Object.assign({}, multicallResponse[(2 * i) + loanInfoCallsToSkip][0]), { scaledMorphoBorrowOnPool: scaledBalanceResponse.value[2 * i][0], scaledMorphoSupplyOnPool: scaledBalanceResponse.value[(2 * i) + 1][0] });
-        const marketData = computeMorphoMarketData(info, morphoMarketData, multicallResponse[(2 * i) + (loanInfoCallsToSkip + 1)]);
+        const marketData = computeMorphoMarketData(info, morphoMarketData, multicallResponse[(2 * i) + (loanInfoCallsToSkip + 1)][0]);
         const { symbol, address } = (0, tokens_1.getAssetInfoByAddress)((0, utils_1.wethToEthByAddress)(marketData.underlyingTokenAddress));
         const data = {
             symbol,

package/cjs/types/aave.d.ts

@@ -234,5 +234,8 @@ export interface AaveHelperCommon {
     network?: NetworkNumber;
 }
 export type MorphoAaveV2MarketInfo = Omit<AaveMarketInfo, 'provider' | 'lendingPool' | 'protocolData' | 'protocolDataAddress'>;
-export type MorphoAaveV3MarketInfo = Omit<AaveMarketInfo, 'provider'>;
+export type MorphoAaveV3MarketInfo = Omit<AaveMarketInfo, 'provider'> & {
+    aaveLendingPool: 'AaveV3LendingPool';
+    aaveLendingPoolAddress: string;
+};
 export type MorphoAaveMarketInfo = MorphoAaveV2MarketInfo | MorphoAaveV3MarketInfo;

package/esm/aaveV3/index.js

@@ -11,7 +11,6 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
-import { AaveVersions, } from '../types/aave';
 import { NetworkNumber, } from '../types/common';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
@@ -65,94 +64,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     return categoriesMapping;
 };
 // eslint-disable-next-line no-bitwise
-const isEnabledOnBitmap = (bitmap, assetId) => (((bitmap >> assetId) & 1) !== 0);
-// @DEV: hardcode emodes till they add new emodes structs to all chains
-const getAllEmodesHardcoded = (network, selectedMarket) => {
-    switch (network) {
-        case NetworkNumber.Eth:
-            {
-                switch (selectedMarket) {
-                    case AaveVersions.AaveV3:
-                        return [
-                            {
-                                ltv: 9300,
-                                liquidationThreshold: 9500,
-                                liquidationBonus: 10100,
-                                collateralBitmap: '2952790659',
-                                label: 'ETH correlated',
-                                borrowableBitmap: '2952790659',
-                            },
-                        ];
-                    case AaveVersions.AaveV3Lido:
-                        return [
-                            {
-                                ltv: 9350,
-                                liquidationThreshold: 9550,
-                                liquidationBonus: 10100,
-                                collateralBitmap: '3',
-                                label: 'ETH correlated',
-                                borrowableBitmap: '3',
-                            },
-                        ];
-                    case AaveVersions.AaveV3Etherfi:
-                        return [];
-                    default:
-                        throw new Error('Emode not implemented for this market');
-                }
-            }
-        case NetworkNumber.Arb:
-            return [
-                {
-                    ltv: 9300,
-                    liquidationThreshold: 9500,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '4261',
-                    label: 'Stablecoins',
-                    borrowableBitmap: '4261',
-                },
-                {
-                    ltv: 9300,
-                    liquidationThreshold: 9500,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '33040',
-                    label: 'ETH correlated',
-                    borrowableBitmap: '33040',
-                },
-            ];
-        case NetworkNumber.Opt:
-            return [
-                {
-                    ltv: 9000,
-                    liquidationThreshold: 9300,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '8357',
-                    label: 'Stablecoins',
-                    borrowableBitmap: '8357',
-                },
-                {
-                    ltv: 9300,
-                    liquidationThreshold: 9500,
-                    liquidationBonus: 10100,
-                    collateralBitmap: '4624',
-                    label: 'ETH correlated',
-                    borrowableBitmap: '4624',
-                },
-            ];
-        case NetworkNumber.Base:
-            return [
-                {
-                    ltv: 9000,
-                    liquidationThreshold: 9300,
-                    liquidationBonus: 10200,
-                    collateralBitmap: '43',
-                    label: 'ETH correlated',
-                    borrowableBitmap: '43',
-                },
-            ];
-        default:
-            throw new Error('Emode not implemented for this network');
-    }
-};
+const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
@@ -194,8 +106,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, multiRes] = yield Promise.all([
             loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
-            // loanInfoContract.methods.getAllEmodes(marketAddress).call(),
-            getAllEmodesHardcoded(network, market.value),
+            loanInfoContract.methods.getAllEmodes(marketAddress).call(),
             loanInfoContract.methods.isBorrowAllowed(marketAddress).call(),
             isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : multicall(multicallCallsObject, web3, network),
         ]);
@@ -218,9 +129,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         }
         const [{ 0: ghoDiscountedPerDiscountToken }, { 0: discountRate }, { 0: minDiscountTokenBalance }, { 0: minGhoBalanceForDiscount }, { 0: facilitatorsList },] = multiRes;
         let rewardInfo = null;
-        // @DEV: Temporarily disable incentives for Arbitrum and Optimism
-        // const networksWithIncentives = [NetworkNumber.Arb, NetworkNumber.Opt];
-        const networksWithIncentives = [];
+        const networksWithIncentives = [NetworkNumber.Arb, NetworkNumber.Opt];
         if (networksWithIncentives.includes(network)) {
             rewardInfo = yield aaveIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
             rewardInfo = rewardInfo.reduce((all, _market) => {
@@ -498,6 +407,6 @@ export const getAaveV3AccountData = (web3, network, address, extractedState) =>
 });
 export const getAaveV3FullPositionData = (web3, network, address, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getAaveV3MarketData(web3, network, market, mainnetWeb3);
-    const positionData = yield getAaveV3AccountData(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
+    const positionData = yield getAaveV3AccountData(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });
     return positionData;
 });

package/esm/config/contracts.js

@@ -265,16 +265,16 @@ module.exports = {
         "abi": [{ "inputs": [{ "internalType": "contract IPoolAddressesProvider", "name": "provider", "type": "address" }], "name": "getReservesIncentivesData", "outputs": [{ "components": [{ "internalType": "address", "name": "underlyingAsset", "type": "address" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "uint256", "name": "emissionPerSecond", "type": "uint256" }, { "internalType": "uint256", "name": "incentivesLastUpdateTimestamp", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesIndex", "type": "uint256" }, { "internalType": "uint256", "name": "emissionEndTimestamp", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "precision", "type": "uint8" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.RewardInfo[]", "name": "rewardsTokenInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.IncentiveData", "name": "aIncentiveData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "uint256", "name": "emissionPerSecond", "type": "uint256" }, { "internalType": "uint256", "name": "incentivesLastUpdateTimestamp", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesIndex", "type": "uint256" }, { "internalType": "uint256", "name": "emissionEndTimestamp", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "precision", "type": "uint8" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.RewardInfo[]", "name": "rewardsTokenInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.IncentiveData", "name": "vIncentiveData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "uint256", "name": "emissionPerSecond", "type": "uint256" }, { "internalType": "uint256", "name": "incentivesLastUpdateTimestamp", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesIndex", "type": "uint256" }, { "internalType": "uint256", "name": "emissionEndTimestamp", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "precision", "type": "uint8" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.RewardInfo[]", "name": "rewardsTokenInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.IncentiveData", "name": "sIncentiveData", "type": "tuple" }], "internalType": "struct IUiIncentiveDataProviderV3.AggregatedReserveIncentiveData[]", "name": "", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "contract IPoolAddressesProvider", "name": "provider", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "getUserReservesIncentivesData", "outputs": [{ "components": [{ "internalType": "address", "name": "underlyingAsset", "type": "address" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "uint256", "name": "userUnclaimedRewards", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesUserIndex", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.UserRewardInfo[]", "name": "userRewardsInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.UserIncentiveData", "name": "aTokenIncentivesUserData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "uint256", "name": "userUnclaimedRewards", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesUserIndex", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.UserRewardInfo[]", "name": "userRewardsInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.UserIncentiveData", "name": "vTokenIncentivesUserData", "type": "tuple" }, { "components": [{ "internalType": "address", "name": "tokenAddress", "type": "address" }, { "internalType": "address", "name": "incentiveControllerAddress", "type": "address" }, { "components": [{ "internalType": "string", "name": "rewardTokenSymbol", "type": "string" }, { "internalType": "address", "name": "rewardOracleAddress", "type": "address" }, { "internalType": "address", "name": "rewardTokenAddress", "type": "address" }, { "internalType": "uint256", "name": "userUnclaimedRewards", "type": "uint256" }, { "internalType": "uint256", "name": "tokenIncentivesUserIndex", "type": "uint256" }, { "internalType": "int256", "name": "rewardPriceFeed", "type": "int256" }, { "internalType": "uint8", "name": "priceFeedDecimals", "type": "uint8" }, { "internalType": "uint8", "name": "rewardTokenDecimals", "type": "uint8" }], "internalType": "struct IUiIncentiveDataProviderV3.UserRewardInfo[]", "name": "userRewardsInformation", "type": "tuple[]" }], "internalType": "struct IUiIncentiveDataProviderV3.UserIncentiveData", "name": "sTokenIncentivesUserData", "type": "tuple" }], "internalType": "struct IUiIncentiveDataProviderV3.UserReserveIncentiveData[]", "name": "", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }],
         "networks": {
             "1": {
-                "address": "0x162A7AC02f547ad796CA549f757e2b8d1D9b10a6"
+                "address": "0x5a40cDe2b76Da2beD545efB3ae15708eE56aAF9c"
             },
             "10": {
-                "address": "0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7"
+                "address": "0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3"
             },
             "8453": {
-                "address": "0xEdD3b4737C1a0011626631a977b91Cf3E944982d"
+                "address": "0x5c5228aC8BC1528482514aF3e27E692495148717"
             },
             "42161": {
-                "address": "0xDA67AF3403555Ce0AE3ffC22fDb7354458277358"
+                "address": "0xE92cd6164CE7DC68e740765BC1f2a091B6CBc3e4"
             }
         }
     },

package/esm/markets/aave/index.js

@@ -108,6 +108,8 @@ export const MORPHO_AAVE_V3_ETH = (networkId = NetworkNumber.Eth) => ({
     providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId),
     protocolData: 'AaveV3ProtocolDataProvider',
     protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
+    aaveLendingPool: 'AaveV3LendingPool',
+    aaveLendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
     lendingPool: 'MorphoAaveV3ProxyEthMarket',
     lendingPoolAddress: getConfigContractAddress('MorphoAaveV3ProxyEthMarket', 1),
     // icon: SvgAdapter(protocolIcons.morpho),

package/esm/morphoAaveV3/index.js

@@ -74,6 +74,7 @@ const computeMorphoMarketData = (loanInfo, morphoMarketData, aaveIndexes) => {
 export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     // @ts-ignore
     const lendingPoolContract = createContractWrapper(web3, network, selectedMarket.lendingPool, selectedMarket.lendingPoolAddress);
+    const aaveLendingPoolContract = createContractWrapper(web3, network, selectedMarket.aaveLendingPool, selectedMarket.aaveLendingPoolAddress);
     const _addresses = selectedMarket.assets.map((a) => getAssetInfo(ethToWeth(a)).address);
     const splitStart = Math.floor(_addresses.length / 2);
     const loanInfoCallsToSkip = 2; // skipping getFullTokensInfo calls at the start of multicallArray
@@ -96,9 +97,9 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
                 params: [underlyingAddress],
             },
             {
-                target: selectedMarket.protocolDataAddress,
+                target: aaveLendingPoolContract.options.address,
                 // @ts-ignore
-                abiItem: getAbiItem(getConfigContractAbi(selectedMarket.protocolData), 'getReserveData'),
+                abiItem: getAbiItem(getConfigContractAbi(selectedMarket.aaveLendingPool), 'getReserveData'),
                 params: [underlyingAddress],
             }]))).flat(),
     ];
@@ -134,7 +135,7 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
     const assetsData = yield Promise.all(loanInfo.map((info, i) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         const morphoMarketData = Object.assign(Object.assign({}, multicallResponse[(2 * i) + loanInfoCallsToSkip][0]), { scaledMorphoBorrowOnPool: scaledBalanceResponse.value[2 * i][0], scaledMorphoSupplyOnPool: scaledBalanceResponse.value[(2 * i) + 1][0] });
-        const marketData = computeMorphoMarketData(info, morphoMarketData, multicallResponse[(2 * i) + (loanInfoCallsToSkip + 1)]);
+        const marketData = computeMorphoMarketData(info, morphoMarketData, multicallResponse[(2 * i) + (loanInfoCallsToSkip + 1)][0]);
         const { symbol, address } = getAssetInfoByAddress(wethToEthByAddress(marketData.underlyingTokenAddress));
         const data = {
             symbol,

package/esm/types/aave.d.ts

@@ -234,5 +234,8 @@ export interface AaveHelperCommon {
     network?: NetworkNumber;
 }
 export type MorphoAaveV2MarketInfo = Omit<AaveMarketInfo, 'provider' | 'lendingPool' | 'protocolData' | 'protocolDataAddress'>;
-export type MorphoAaveV3MarketInfo = Omit<AaveMarketInfo, 'provider'>;
+export type MorphoAaveV3MarketInfo = Omit<AaveMarketInfo, 'provider'> & {
+    aaveLendingPool: 'AaveV3LendingPool';
+    aaveLendingPoolAddress: string;
+};
 export type MorphoAaveMarketInfo = MorphoAaveV2MarketInfo | MorphoAaveV3MarketInfo;