@morpho-org/bundler-sdk-viem 2.1.4-next.0 → 2.2.0

package/lib/operations.js

@@ -209,12 +209,24 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
         }) > supplyTargetUtilization) {
             // Liquidity is insufficient: trigger a public reallocation and try to have a resulting utilization as low as possible, above the target.
             // Solve: newTotalBorrowAssets / (newTotalSupplyAssets + reallocatedAssets) = supplyTargetUtilization
-            // Worst case is: there is not enough withdrawals available to fill reallocatedAssets, so utilization is above supplyTargetUtilization.
+            // We first try to find public reallocations that respect every markets targets.
+            // If this is not enough, the first market to be pushed above target is the supply market. Then we fully withdraw from every market.
             let requiredAssets = supplyTargetUtilization === 0n
                 ? MathLib.MAX_UINT_160
                 : MathLib.wDivDown(newTotalBorrowAssets, supplyTargetUtilization) -
                     newTotalSupplyAssets;
-            const { withdrawals } = data.getMarketPublicReallocations(market.id, publicAllocatorOptions);
+            let { withdrawals, data: simulationStatePostFriendlyReallocation } = data.getMarketPublicReallocations(market.id, publicAllocatorOptions);
+            const marketPostFriendlyReallocation = simulationStatePostFriendlyReallocation.getMarket(market.id);
+            if (marketPostFriendlyReallocation.totalBorrowAssets + borrowedAssets >
+                marketPostFriendlyReallocation.totalSupplyAssets - withdrawnAssets) {
+                // If the "friendly" reallocations are not enough, we fully withdraw from every market.
+                requiredAssets = newTotalBorrowAssets - newTotalSupplyAssets;
+                ({ withdrawals } = data.getMarketPublicReallocations(market.id, {
+                    ...publicAllocatorOptions,
+                    defaultMaxWithdrawalUtilization: MathLib.WAD,
+                    maxWithdrawalUtilization: {},
+                }));
+            }
             for (const { vault, ...withdrawal } of withdrawals) {
                 const vaultReallocations = (reallocations[vault] ??= []);
                 if (withdrawal.assets > requiredAssets) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/bundler-sdk-viem",
   "description": "Viem-based extension of `@morpho-org/simulation-sdk` that exports utilities to transform simple interactions on Morpho (such as `Blue_Borrow`) and Morpho Vaults (such as `MetaMorpho_Deposit`) into the required bundles (with ERC20 approvals, transfers, etc) to submit to the bundler onchain.",
-  "version": "2.1.4-next.0",
+  "version": "2.2.0",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -20,10 +20,10 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk-viem": "^2.2.2-next.1",
-    "@morpho-org/blue-sdk": "^2.3.1-next.1",
-    "@morpho-org/morpho-ts": "^2.0.2-next.1",
-    "@morpho-org/simulation-sdk": "^2.1.3-next.1"
+    "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/simulation-sdk": "^2.1.3",
+    "@morpho-org/blue-sdk": "^2.3.1",
+    "@morpho-org/morpho-ts": "^2.1.0"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -35,14 +35,14 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^2.3.1-next.1",
-    "@morpho-org/blue-sdk-viem": "^2.2.2-next.1",
-    "@morpho-org/morpho-test": "^2.2.1-next.1",
-    "@morpho-org/morpho-ts": "^2.0.2-next.1",
-    "@morpho-org/simulation-sdk": "^2.1.3-next.1",
-    "@morpho-org/test": "^2.0.6-next.1",
-    "@morpho-org/simulation-sdk-wagmi": "^2.0.5-next.1",
-    "@morpho-org/test-wagmi": "^2.0.4-next.1"
+    "@morpho-org/blue-sdk": "^2.3.1",
+    "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/morpho-test": "^2.2.1",
+    "@morpho-org/morpho-ts": "^2.1.0",
+    "@morpho-org/simulation-sdk": "^2.1.3",
+    "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
+    "@morpho-org/test": "^2.0.6",
+    "@morpho-org/test-wagmi": "^2.0.4"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",