@defisaver/positions-sdk 0.0.181 → 0.0.183-dev-allocator

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)))
@@ -198,6 +198,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.supplyIncentives.push({
                     apy: _market.incentiveSupplyApy || '0',
                     token: _market.symbol,
+                    incentiveKind: 'staking',
                 });
             }
             if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
@@ -209,6 +210,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.borrowIncentives.push({
                     apy: _market.incentiveBorrowApy,
                     token: _market.incentiveBorrowToken,
+                    incentiveKind: 'reward',
                 });
             }
             if (!rewardForMarket)
@@ -238,6 +240,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.supplyIncentives.push({
                         token: supplyRewardData.rewardTokenSymbol,
                         apy: rewardApy,
+                        incentiveKind: 'reward',
                     });
                 }
             });
@@ -265,6 +268,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.borrowIncentives.push({
                         token: borrowRewardData.rewardTokenSymbol,
                         apy: rewardApy,
+                        incentiveKind: 'reward',
                     });
                 }
             });
@@ -419,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/helpers/morphoBlueHelpers/index.d.ts

@@ -12,3 +12,8 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMar
     borrowRate: string;
     supplyRate: string;
 }>;
+export declare const getReallocatableLiquidity: (marketId: string, network?: NetworkNumber) => Promise<string>;
+export declare const getReallocation: (marketId: string, liquidityToAllocate: string, network?: NetworkNumber) => Promise<{
+    vaults: string[];
+    withdrawals: [string[], string][][];
+}>;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -12,13 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApyAfterValuesEstimation = exports.getBorrowRate = exports.getSupplyRate = exports.getMorphoBlueAggregatedPositionData = void 0;
+exports.getReallocation = exports.getReallocatableLiquidity = exports.getApyAfterValuesEstimation = exports.getBorrowRate = exports.getSupplyRate = exports.getMorphoBlueAggregatedPositionData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
+const common_1 = require("../../types/common");
 const constants_1 = require("../../constants");
 const contracts_1 = require("../../contracts");
+const utils_1 = require("../../services/utils");
 const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     var _a, _b, _c, _d, _e, _f;
     const payload = {};
@@ -110,3 +112,127 @@ const getApyAfterValuesEstimation = (selectedMarket, action, amount, asset, web3
     return { borrowRate, supplyRate };
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
+const API_URL = 'https://blue-api.morpho.org/graphql';
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
+`;
+const getReallocatableLiquidity = (marketId, network = common_1.NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const response = yield fetch(API_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: MARKET_QUERY,
+            variables: { uniqueKey: marketId, chainId: network },
+        }),
+    });
+    const data = yield response.json();
+    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+    if (!marketData)
+        throw new Error('Market data not found');
+    return marketData.reallocatableLiquidityAssets;
+});
+exports.getReallocatableLiquidity = getReallocatableLiquidity;
+const getReallocation = (marketId, liquidityToAllocate, network = common_1.NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b, _c, _d;
+    const response = yield fetch(API_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: MARKET_QUERY,
+            variables: { uniqueKey: marketId, chainId: network },
+        }),
+    });
+    const data = yield response.json();
+    const marketData = (_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.marketByUniqueKey;
+    if (!marketData)
+        throw new Error('Market data not found');
+    if (new decimal_js_1.default(marketData.reallocatableLiquidityAssets).lt(liquidityToAllocate))
+        throw new Error('Not enough liquidity available to allocate');
+    const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
+        const vaultAddress = item.vault.address;
+        acc[vaultAddress] = new decimal_js_1.default(acc[vaultAddress] || '0').add(item.assets).toString();
+        return acc;
+    }, {});
+    const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new decimal_js_1.default(b || '0').sub(a || '0').toNumber());
+    const withdrawalsPerVault = {};
+    let totalReallocated = '0';
+    for (const [vaultAddress] of sortedVaults) {
+        if (new decimal_js_1.default(totalReallocated).gte(liquidityToAllocate))
+            break;
+        const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => (0, utils_1.compareAddresses)(item.vault.address, vaultAddress));
+        for (const item of vaultAllocations) {
+            if (new decimal_js_1.default(totalReallocated).gte(liquidityToAllocate))
+                break;
+            const itemAmount = item.assets;
+            const leftToAllocate = new decimal_js_1.default(liquidityToAllocate).sub(totalReallocated).toString();
+            const amountToTake = new decimal_js_1.default(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+            totalReallocated = new decimal_js_1.default(totalReallocated).add(amountToTake).toString();
+            const withdrawal = [
+                [
+                    item.allocationMarket.loanAsset.address,
+                    (_c = item.allocationMarket.collateralAsset) === null || _c === void 0 ? void 0 : _c.address,
+                    (_d = item.allocationMarket.oracle) === null || _d === void 0 ? void 0 : _d.address,
+                    item.allocationMarket.irmAddress,
+                    item.allocationMarket.lltv,
+                ],
+                amountToTake.toString(),
+            ];
+            if (!withdrawalsPerVault[vaultAddress]) {
+                withdrawalsPerVault[vaultAddress] = [];
+            }
+            withdrawalsPerVault[vaultAddress].push(withdrawal);
+        }
+    }
+    const vaults = Object.keys(withdrawalsPerVault);
+    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress]);
+    return {
+        vaults,
+        withdrawals,
+    };
+});
+exports.getReallocation = getReallocation;

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/cjs/types/aave.d.ts

@@ -76,6 +76,7 @@ export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 export interface IncentiveData {
     token: string;
     apy: string;
+    incentiveKind?: 'staking' | 'reward';
 }
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;

package/cjs/types/morphoBlue.d.ts

@@ -137,3 +137,28 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
 }
+export interface MorphoBlueVault {
+    address: string;
+}
+export interface MorphoBlueAllocationMarket {
+    loanAsset: {
+        address: string;
+    };
+    collateralAsset: {
+        address: string;
+    };
+    oracle: {
+        address: string;
+    };
+    irmAddress: string;
+    lltv: string;
+}
+export interface MorphoBluePublicAllocatorItem {
+    vault: MorphoBlueVault;
+    assets: string;
+    allocationMarket: MorphoBlueAllocationMarket;
+}
+export interface MorphoBlueRealloactionMarketData {
+    reallocatableLiquidityAssets: string;
+    publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[];
+}

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)))
@@ -189,6 +189,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.supplyIncentives.push({
                     apy: _market.incentiveSupplyApy || '0',
                     token: _market.symbol,
+                    incentiveKind: 'staking',
                 });
             }
             if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
@@ -200,6 +201,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 _market.borrowIncentives.push({
                     apy: _market.incentiveBorrowApy,
                     token: _market.incentiveBorrowToken,
+                    incentiveKind: 'reward',
                 });
             }
             if (!rewardForMarket)
@@ -229,6 +231,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.supplyIncentives.push({
                         token: supplyRewardData.rewardTokenSymbol,
                         apy: rewardApy,
+                        incentiveKind: 'reward',
                     });
                 }
             });
@@ -256,6 +259,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     _market.borrowIncentives.push({
                         token: borrowRewardData.rewardTokenSymbol,
                         apy: rewardApy,
+                        incentiveKind: 'reward',
                     });
                 }
             });
@@ -408,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/helpers/morphoBlueHelpers/index.d.ts

@@ -12,3 +12,8 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMar
     borrowRate: string;
     supplyRate: string;
 }>;
+export declare const getReallocatableLiquidity: (marketId: string, network?: NetworkNumber) => Promise<string>;
+export declare const getReallocation: (marketId: string, liquidityToAllocate: string, network?: NetworkNumber) => Promise<{
+    vaults: string[];
+    withdrawals: [string[], string][][];
+}>;

package/esm/helpers/morphoBlueHelpers/index.js

@@ -11,8 +11,10 @@ import Dec from 'decimal.js';
 import { assetAmountInWei } from '@defisaver/tokens';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
+import { NetworkNumber } from '../../types/common';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContract } from '../../contracts';
+import { compareAddresses } from '../../services/utils';
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     var _a, _b, _c, _d, _e, _f;
     const payload = {};
@@ -100,3 +102,125 @@ export const getApyAfterValuesEstimation = (selectedMarket, action, amount, asse
     const supplyRate = getSupplyRate(data.market.totalSupplyAssets, data.market.totalBorrowAssets, data.borrowRate, data.market.fee);
     return { borrowRate, supplyRate };
 });
+const API_URL = 'https://blue-api.morpho.org/graphql';
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
+`;
+export const getReallocatableLiquidity = (marketId, network = NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const response = yield fetch(API_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: MARKET_QUERY,
+            variables: { uniqueKey: marketId, chainId: network },
+        }),
+    });
+    const data = yield response.json();
+    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+    if (!marketData)
+        throw new Error('Market data not found');
+    return marketData.reallocatableLiquidityAssets;
+});
+export const getReallocation = (marketId, liquidityToAllocate, network = NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b, _c, _d;
+    const response = yield fetch(API_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: MARKET_QUERY,
+            variables: { uniqueKey: marketId, chainId: network },
+        }),
+    });
+    const data = yield response.json();
+    const marketData = (_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.marketByUniqueKey;
+    if (!marketData)
+        throw new Error('Market data not found');
+    if (new Dec(marketData.reallocatableLiquidityAssets).lt(liquidityToAllocate))
+        throw new Error('Not enough liquidity available to allocate');
+    const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
+        const vaultAddress = item.vault.address;
+        acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
+        return acc;
+    }, {});
+    const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new Dec(b || '0').sub(a || '0').toNumber());
+    const withdrawalsPerVault = {};
+    let totalReallocated = '0';
+    for (const [vaultAddress] of sortedVaults) {
+        if (new Dec(totalReallocated).gte(liquidityToAllocate))
+            break;
+        const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => compareAddresses(item.vault.address, vaultAddress));
+        for (const item of vaultAllocations) {
+            if (new Dec(totalReallocated).gte(liquidityToAllocate))
+                break;
+            const itemAmount = item.assets;
+            const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
+            const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+            totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
+            const withdrawal = [
+                [
+                    item.allocationMarket.loanAsset.address,
+                    (_c = item.allocationMarket.collateralAsset) === null || _c === void 0 ? void 0 : _c.address,
+                    (_d = item.allocationMarket.oracle) === null || _d === void 0 ? void 0 : _d.address,
+                    item.allocationMarket.irmAddress,
+                    item.allocationMarket.lltv,
+                ],
+                amountToTake.toString(),
+            ];
+            if (!withdrawalsPerVault[vaultAddress]) {
+                withdrawalsPerVault[vaultAddress] = [];
+            }
+            withdrawalsPerVault[vaultAddress].push(withdrawal);
+        }
+    }
+    const vaults = Object.keys(withdrawalsPerVault);
+    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress]);
+    return {
+        vaults,
+        withdrawals,
+    };
+});

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/esm/types/aave.d.ts

@@ -76,6 +76,7 @@ export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 export interface IncentiveData {
     token: string;
     apy: string;
+    incentiveKind?: 'staking' | 'reward';
 }
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;

package/esm/types/morphoBlue.d.ts

@@ -137,3 +137,28 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
 }
+export interface MorphoBlueVault {
+    address: string;
+}
+export interface MorphoBlueAllocationMarket {
+    loanAsset: {
+        address: string;
+    };
+    collateralAsset: {
+        address: string;
+    };
+    oracle: {
+        address: string;
+    };
+    irmAddress: string;
+    lltv: string;
+}
+export interface MorphoBluePublicAllocatorItem {
+    vault: MorphoBlueVault;
+    assets: string;
+    allocationMarket: MorphoBlueAllocationMarket;
+}
+export interface MorphoBlueRealloactionMarketData {
+    reallocatableLiquidityAssets: string;
+    publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.181",
+  "version": "0.0.183-dev-allocator",
   "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) {
@@ -290,6 +286,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       _market.supplyIncentives.push({
         apy: _market.incentiveSupplyApy || '0',
         token: _market.symbol,
+        incentiveKind: 'staking',
       });
     }
 
@@ -302,6 +299,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
       _market.borrowIncentives.push({
         apy: _market.incentiveBorrowApy,
         token: _market.incentiveBorrowToken!!,
+        incentiveKind: 'reward',
       });
     }
 
@@ -330,6 +328,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         _market.supplyIncentives.push({
           token: supplyRewardData.rewardTokenSymbol,
           apy: rewardApy,
+          incentiveKind: 'reward',
         });
       }
     });
@@ -356,6 +355,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         _market.borrowIncentives.push({
           token: borrowRewardData.rewardTokenSymbol,
           apy: rewardApy,
+          incentiveKind: 'reward',
         });
       }
     });
@@ -543,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/helpers/morphoBlueHelpers/index.ts

@@ -1,15 +1,18 @@
 import Dec from 'decimal.js';
-import { assetAmountInWei } from '@defisaver/tokens';
+import { assetAmountInWei, getAssetInfoByAddress } from '@defisaver/tokens';
 import Web3 from 'web3';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../../types/common';
 import {
   MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo,
+  MorphoBluePublicAllocatorItem,
+  MorphoBlueRealloactionMarketData,
 } from '../../types';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContract } from '../../contracts';
 import { MarketParamsStruct } from '../../types/contracts/generated/MorphoBlueView';
+import { compareAddresses } from '../../services/utils';
 
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, marketInfo: MorphoBlueMarketInfo }): MorphoBlueAggregatedPositionData => {
   const payload = {} as MorphoBlueAggregatedPositionData;
@@ -113,4 +116,142 @@ export const getApyAfterValuesEstimation = async (selectedMarket: MorphoBlueMark
   const borrowRate = getBorrowRate(data.borrowRate, data.market.totalBorrowShares);
   const supplyRate = getSupplyRate(data.market.totalSupplyAssets, data.market.totalBorrowAssets, data.borrowRate, data.market.fee);
   return { borrowRate, supplyRate };
+};
+
+const API_URL = 'https://blue-api.morpho.org/graphql';
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
+`;
+
+export const getReallocatableLiquidity = async (marketId: string, network: NetworkNumber = NetworkNumber.Eth): Promise<string> => {
+  const response = await fetch(API_URL, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      query: MARKET_QUERY,
+      variables: { uniqueKey: marketId, chainId: network },
+    }),
+  });
+
+  const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
+  const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
+
+  if (!marketData) throw new Error('Market data not found');
+
+  return marketData.reallocatableLiquidityAssets;
+};
+
+export const getReallocation = async (marketId: string, liquidityToAllocate: string, network: NetworkNumber = NetworkNumber.Eth) => {
+  const response = await fetch(API_URL, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      query: MARKET_QUERY,
+      variables: { uniqueKey: marketId, chainId: network },
+    }),
+  });
+
+  const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
+  const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
+
+  if (!marketData) throw new Error('Market data not found');
+
+  if (new Dec(marketData.reallocatableLiquidityAssets).lt(liquidityToAllocate)) throw new Error('Not enough liquidity available to allocate');
+
+  const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce(
+    (acc: Record<string, string>, item: MorphoBluePublicAllocatorItem) => {
+      const vaultAddress = item.vault.address;
+      acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
+      return acc;
+    },
+    {},
+  );
+
+  const sortedVaults = Object.entries(vaultTotalAssets).sort(
+    ([, a]: [string, string], [, b]: [string, string]) => new Dec(b || '0').sub(a || '0').toNumber(),
+  );
+
+  const withdrawalsPerVault: Record<string, [string[], string][]> = {};
+  let totalReallocated = '0';
+  for (const [vaultAddress] of sortedVaults) {
+    if (new Dec(totalReallocated).gte(liquidityToAllocate)) break;
+
+    const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter(
+      (item: MorphoBluePublicAllocatorItem) => compareAddresses(item.vault.address, vaultAddress),
+    );
+    for (const item of vaultAllocations) {
+      if (new Dec(totalReallocated).gte(liquidityToAllocate)) break;
+      const itemAmount = item.assets;
+      const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
+      const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+      totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
+      const withdrawal: [string[], string] = [
+        [
+          item.allocationMarket.loanAsset.address,
+          item.allocationMarket.collateralAsset?.address,
+          item.allocationMarket.oracle?.address,
+          item.allocationMarket.irmAddress,
+          item.allocationMarket.lltv,
+        ],
+        amountToTake.toString(),
+      ];
+      if (!withdrawalsPerVault[vaultAddress]) {
+        withdrawalsPerVault[vaultAddress] = [];
+      }
+      withdrawalsPerVault[vaultAddress].push(withdrawal);
+    }
+  }
+
+  const vaults = Object.keys(withdrawalsPerVault);
+  const withdrawals = vaults.map(
+    (vaultAddress) => withdrawalsPerVault[vaultAddress],
+  );
+  return {
+    vaults,
+    withdrawals,
+  };
 };

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);

package/src/types/aave.ts

@@ -87,6 +87,7 @@ export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 export interface IncentiveData {
   token: string,
   apy: string,
+  incentiveKind?: 'staking' | 'reward';
 }
 
 export interface AaveV3AssetData extends AaveAssetData {

package/src/types/morphoBlue.ts

@@ -152,3 +152,26 @@ export interface MorphoBluePositionData {
   supplyShares: string,
   borrowShares: string,
 }
+
+export interface MorphoBlueVault {
+  address: string,
+}
+
+export interface MorphoBlueAllocationMarket {
+  loanAsset: { address: string },
+  collateralAsset: { address: string },
+  oracle: { address: string },
+  irmAddress: string,
+  lltv: string,
+}
+
+export interface MorphoBluePublicAllocatorItem {
+  vault: MorphoBlueVault,
+  assets: string,
+  allocationMarket: MorphoBlueAllocationMarket,
+}
+
+export interface MorphoBlueRealloactionMarketData {
+  reallocatableLiquidityAssets: string,
+  publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[],
+}