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

package/cjs/helpers/morphoBlueHelpers/index.d.ts

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

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -117,6 +117,7 @@ const MARKET_QUERY = `
   query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
       marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
         reallocatableLiquidityAssets
+        targetBorrowUtilization
         loanAsset {
           address
           decimals
@@ -124,6 +125,8 @@ const MARKET_QUERY = `
         }
         state {
           liquidityAssets
+          borrowAssets
+          supplyAssets
         }
         publicAllocatorSharedLiquidity {
           assets
@@ -177,7 +180,7 @@ const getReallocatableLiquidity = (marketId, network = common_1.NetworkNumber.Et
     return marketData.reallocatableLiquidityAssets;
 });
 exports.getReallocatableLiquidity = getReallocatableLiquidity;
-const getReallocation = (marketId, liquidityToAllocate, network = common_1.NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+const getReallocation = (marketId, amountToBorrow, 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',
@@ -191,8 +194,20 @@ const getReallocation = (marketId, liquidityToAllocate, network = common_1.Netwo
     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 newTotalBorrowAssets = new decimal_js_1.default(marketData.state.borrowAssets).add(amountToBorrow).toString();
+    const leftToBorrow = new decimal_js_1.default(marketData.state.supplyAssets).sub(marketData.state.borrowAssets).toString();
+    const newUtil = new decimal_js_1.default(newTotalBorrowAssets).div(marketData.state.supplyAssets).toString();
+    const newUtilScaled = new decimal_js_1.default(newUtil).mul(1e18).toString();
+    if (new decimal_js_1.default(newUtilScaled).lt(marketData.targetBorrowUtilization))
+        return { vaults: [], withdrawals: [] };
+    let liquidityToAllocate = new decimal_js_1.default(newTotalBorrowAssets).div(marketData.targetBorrowUtilization).mul(1e18).sub(marketData.state.supplyAssets)
+        .toFixed(0)
+        .toString();
+    if (new decimal_js_1.default(marketData.reallocatableLiquidityAssets).lt(liquidityToAllocate)) {
+        liquidityToAllocate = new decimal_js_1.default(amountToBorrow).sub(leftToBorrow).toString();
+        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();
@@ -221,6 +236,7 @@ const getReallocation = (marketId, liquidityToAllocate, network = common_1.Netwo
                     item.allocationMarket.lltv,
                 ],
                 amountToTake.toString(),
+                item.allocationMarket.uniqueKey,
             ];
             if (!withdrawalsPerVault[vaultAddress]) {
                 withdrawalsPerVault[vaultAddress] = [];
@@ -229,7 +245,7 @@ const getReallocation = (marketId, liquidityToAllocate, network = common_1.Netwo
         }
     }
     const vaults = Object.keys(withdrawalsPerVault);
-    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress]);
+    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
     return {
         vaults,
         withdrawals,

package/cjs/types/morphoBlue.d.ts

@@ -152,13 +152,20 @@ export interface MorphoBlueAllocationMarket {
     };
     irmAddress: string;
     lltv: string;
+    uniqueKey: 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/esm/helpers/morphoBlueHelpers/index.d.ts

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

package/esm/helpers/morphoBlueHelpers/index.js

@@ -107,6 +107,7 @@ const MARKET_QUERY = `
   query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
       marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
         reallocatableLiquidityAssets
+        targetBorrowUtilization
         loanAsset {
           address
           decimals
@@ -114,6 +115,8 @@ const MARKET_QUERY = `
         }
         state {
           liquidityAssets
+          borrowAssets
+          supplyAssets
         }
         publicAllocatorSharedLiquidity {
           assets
@@ -166,7 +169,7 @@ export const getReallocatableLiquidity = (marketId, network = NetworkNumber.Eth)
         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* () {
+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',
@@ -180,8 +183,20 @@ export const getReallocation = (marketId, liquidityToAllocate, network = Network
     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 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();
@@ -210,6 +225,7 @@ export const getReallocation = (marketId, liquidityToAllocate, network = Network
                     item.allocationMarket.lltv,
                 ],
                 amountToTake.toString(),
+                item.allocationMarket.uniqueKey,
             ];
             if (!withdrawalsPerVault[vaultAddress]) {
                 withdrawalsPerVault[vaultAddress] = [];
@@ -218,7 +234,7 @@ export const getReallocation = (marketId, liquidityToAllocate, network = Network
         }
     }
     const vaults = Object.keys(withdrawalsPerVault);
-    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress]);
+    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
     return {
         vaults,
         withdrawals,

package/esm/types/morphoBlue.d.ts

@@ -152,13 +152,20 @@ export interface MorphoBlueAllocationMarket {
     };
     irmAddress: string;
     lltv: string;
+    uniqueKey: 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,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.183-dev-allocator",
+  "version": "0.0.183-dev-allocator-3",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/helpers/morphoBlueHelpers/index.ts

@@ -123,6 +123,7 @@ const MARKET_QUERY = `
   query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
       marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
         reallocatableLiquidityAssets
+        targetBorrowUtilization
         loanAsset {
           address
           decimals
@@ -130,6 +131,8 @@ const MARKET_QUERY = `
         }
         state {
           liquidityAssets
+          borrowAssets
+          supplyAssets
         }
         publicAllocatorSharedLiquidity {
           assets
@@ -185,7 +188,7 @@ export const getReallocatableLiquidity = async (marketId: string, network: Netwo
   return marketData.reallocatableLiquidityAssets;
 };
 
-export const getReallocation = async (marketId: string, liquidityToAllocate: string, network: NetworkNumber = NetworkNumber.Eth) => {
+export const getReallocation = async (marketId: string, amountToBorrow: string, network: NetworkNumber = NetworkNumber.Eth) => {
   const response = await fetch(API_URL, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
@@ -200,7 +203,22 @@ export const getReallocation = async (marketId: string, liquidityToAllocate: str
 
   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 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: Record<string, string>, item: MorphoBluePublicAllocatorItem) => {
@@ -215,7 +233,7 @@ export const getReallocation = async (marketId: string, liquidityToAllocate: str
     ([, a]: [string, string], [, b]: [string, string]) => new Dec(b || '0').sub(a || '0').toNumber(),
   );
 
-  const withdrawalsPerVault: Record<string, [string[], string][]> = {};
+  const withdrawalsPerVault: Record<string, [string[], string, string][]> = {};
   let totalReallocated = '0';
   for (const [vaultAddress] of sortedVaults) {
     if (new Dec(totalReallocated).gte(liquidityToAllocate)) break;
@@ -229,7 +247,7 @@ export const getReallocation = async (marketId: string, liquidityToAllocate: str
       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] = [
+      const withdrawal: [string[], string, string] = [
         [
           item.allocationMarket.loanAsset.address,
           item.allocationMarket.collateralAsset?.address,
@@ -238,6 +256,7 @@ export const getReallocation = async (marketId: string, liquidityToAllocate: str
           item.allocationMarket.lltv,
         ],
         amountToTake.toString(),
+        item.allocationMarket.uniqueKey,
       ];
       if (!withdrawalsPerVault[vaultAddress]) {
         withdrawalsPerVault[vaultAddress] = [];
@@ -248,7 +267,9 @@ export const getReallocation = async (marketId: string, liquidityToAllocate: str
 
   const vaults = Object.keys(withdrawalsPerVault);
   const withdrawals = vaults.map(
-    (vaultAddress) => withdrawalsPerVault[vaultAddress],
+    (vaultAddress) => withdrawalsPerVault[vaultAddress].sort(
+      (a, b) => a[2].localeCompare(b[2]),
+    ).map(w => [w[0], w[1]]),
   );
   return {
     vaults,

package/src/types/morphoBlue.ts

@@ -163,6 +163,7 @@ export interface MorphoBlueAllocationMarket {
   oracle: { address: string },
   irmAddress: string,
   lltv: string,
+  uniqueKey: string,
 }
 
 export interface MorphoBluePublicAllocatorItem {
@@ -171,7 +172,14 @@ export interface MorphoBluePublicAllocatorItem {
   allocationMarket: MorphoBlueAllocationMarket,
 }
 
+export interface MorphoBlueAllocatorMarketState {
+  borrowAssets: string,
+  supplyAssets: string,
+}
+
 export interface MorphoBlueRealloactionMarketData {
   reallocatableLiquidityAssets: string,
+  targetBorrowUtilization: string,
   publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[],
+  state: MorphoBlueAllocatorMarketState,
 }