@defisaver/positions-sdk 0.0.182 → 0.0.183-dev-allocator-2

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,140 @@ 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
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        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, amountToBorrow, 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');
+    const newTotalBorrowAssets = new Dec(marketData.state.borrowAssets).add(amountToBorrow).toString();
+    const leftToBorrow = new Dec(marketData.state.supplyAssets).sub(marketData.state.borrowAssets).toString();
+    const newUtil = new Dec(newTotalBorrowAssets).div(marketData.state.supplyAssets).toString();
+    const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
+    if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization))
+        return { vaults: [], withdrawals: [] };
+    let liquidityToAllocate = new Dec(newTotalBorrowAssets).div(marketData.targetBorrowUtilization).mul(1e18).sub(marketData.state.supplyAssets)
+        .toFixed(0)
+        .toString();
+    if (new Dec(marketData.reallocatableLiquidityAssets).lt(liquidityToAllocate)) {
+        liquidityToAllocate = new Dec(amountToBorrow).sub(leftToBorrow).toString();
+        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/morphoBlue.d.ts

@@ -137,3 +137,34 @@ 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 MorphoBlueAllocatorMarketState {
+    borrowAssets: string;
+    supplyAssets: string;
+}
+export interface MorphoBlueRealloactionMarketData {
+    reallocatableLiquidityAssets: string;
+    targetBorrowUtilization: string;
+    publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[];
+    state: MorphoBlueAllocatorMarketState;
+}

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.182",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
-    "lint": "eslint src/ --fix",
-    "lint-check": "eslint src/",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "test-single": "mocha ./tests/$npm_config_name.ts",
-    "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
-    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.5.50",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@types/chai": "^5.0.0",
-    "@types/mocha": "^10.0.9",
-    "@types/web3": "^1.0.20",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.31.0",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.2",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.183-dev-allocator-2",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run lint && npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.json --watch",
+    "lint": "eslint src/ --fix",
+    "lint-check": "eslint src/",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && npm run test",
+    "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.5.50",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "decimal.js": "^10.4.3"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "@types/chai": "^5.0.0",
+    "@types/mocha": "^10.0.9",
+    "@types/web3": "^1.0.20",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.31.0",
+    "mocha": "^10.2.0",
+    "ts-node": "^10.9.2",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}