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

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

@@ -15,5 +15,5 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMar
 export declare const getReallocatableLiquidity: (marketId: string, network?: NetworkNumber) => Promise<string>;
 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

@@ -236,6 +236,7 @@ const getReallocation = (marketId, amountToBorrow, network = common_1.NetworkNum
                     item.allocationMarket.lltv,
                 ],
                 amountToTake.toString(),
+                item.allocationMarket.uniqueKey,
             ];
             if (!withdrawalsPerVault[vaultAddress]) {
                 withdrawalsPerVault[vaultAddress] = [];
@@ -244,7 +245,7 @@ const getReallocation = (marketId, amountToBorrow, network = common_1.NetworkNum
         }
     }
     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,6 +152,7 @@ export interface MorphoBlueAllocationMarket {
     };
     irmAddress: string;
     lltv: string;
+    uniqueKey: string;
 }
 export interface MorphoBluePublicAllocatorItem {
     vault: MorphoBlueVault;

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

@@ -15,5 +15,5 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMar
 export declare const getReallocatableLiquidity: (marketId: string, network?: NetworkNumber) => Promise<string>;
 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

@@ -225,6 +225,7 @@ export const getReallocation = (marketId, amountToBorrow, network = NetworkNumbe
                     item.allocationMarket.lltv,
                 ],
                 amountToTake.toString(),
+                item.allocationMarket.uniqueKey,
             ];
             if (!withdrawalsPerVault[vaultAddress]) {
                 withdrawalsPerVault[vaultAddress] = [];
@@ -233,7 +234,7 @@ export const getReallocation = (marketId, amountToBorrow, network = NetworkNumbe
         }
     }
     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,6 +152,7 @@ export interface MorphoBlueAllocationMarket {
     };
     irmAddress: string;
     lltv: string;
+    uniqueKey: string;
 }
 export interface MorphoBluePublicAllocatorItem {
     vault: MorphoBlueVault;

package/package.json

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

package/src/helpers/morphoBlueHelpers/index.ts

@@ -233,7 +233,7 @@ export const getReallocation = async (marketId: string, amountToBorrow: string,
     ([, 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;
@@ -247,7 +247,7 @@ export const getReallocation = async (marketId: string, amountToBorrow: string,
       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,
@@ -256,6 +256,7 @@ export const getReallocation = async (marketId: string, amountToBorrow: string,
           item.allocationMarket.lltv,
         ],
         amountToTake.toString(),
+        item.allocationMarket.uniqueKey,
       ];
       if (!withdrawalsPerVault[vaultAddress]) {
         withdrawalsPerVault[vaultAddress] = [];
@@ -266,7 +267,9 @@ export const getReallocation = async (marketId: string, amountToBorrow: string,
 
   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 {