@morpho-org/bundler-sdk-viem 3.0.0-next.17 → 3.0.0-next.18

package/lib/operations.js

@@ -216,29 +216,32 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
                 ? MathLib.MAX_UINT_160
                 : MathLib.wDivDown(newTotalBorrowAssets, supplyTargetUtilization) -
                     newTotalSupplyAssets;
-            let { withdrawals, data: simulationStatePostFriendlyReallocation } = data.getMarketPublicReallocations(market.id, publicAllocatorOptions);
-            const marketPostFriendlyReallocation = simulationStatePostFriendlyReallocation.getMarket(market.id);
-            if (marketPostFriendlyReallocation.totalBorrowAssets + borrowedAssets >
-                marketPostFriendlyReallocation.totalSupplyAssets - withdrawnAssets) {
+            const { withdrawals, data: friendlyReallocationData } = data.getMarketPublicReallocations(market.id, publicAllocatorOptions);
+            const friendlyReallocationMarket = friendlyReallocationData.getMarket(market.id);
+            if (friendlyReallocationMarket.totalBorrowAssets + borrowedAssets >
+                friendlyReallocationMarket.totalSupplyAssets - withdrawnAssets) {
                 // If the "friendly" reallocations are not enough, we fully withdraw from every market.
                 requiredAssets = newTotalBorrowAssets - newTotalSupplyAssets;
-                ({ withdrawals } = data.getMarketPublicReallocations(market.id, {
+                withdrawals.push(...friendlyReallocationData.getMarketPublicReallocations(market.id, {
                     ...publicAllocatorOptions,
                     defaultMaxWithdrawalUtilization: MathLib.WAD,
                     maxWithdrawalUtilization: {},
-                }));
+                }).withdrawals);
             }
             for (const { vault, ...withdrawal } of withdrawals) {
                 const vaultReallocations = (reallocations[vault] ??= []);
-                if (withdrawal.assets > requiredAssets) {
+                const vaultMarketReallocation = vaultReallocations.find((item) => item.id === withdrawal.id);
+                const reallocatedAssets = MathLib.min(withdrawal.assets, requiredAssets);
+                if (vaultMarketReallocation != null)
+                    vaultMarketReallocation.assets += reallocatedAssets;
+                else
                     vaultReallocations.push({
                         ...withdrawal,
-                        assets: requiredAssets,
+                        assets: reallocatedAssets,
                     });
+                requiredAssets -= reallocatedAssets;
+                if (requiredAssets === 0n)
                     break;
-                }
-                requiredAssets -= withdrawal.assets;
-                vaultReallocations.push(withdrawal);
             }
             // TODO: we know there are no unwrap native in the middle
             // of the bundle so we are certain we need to add an input transfer.

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": "3.0.0-next.17",
+  "version": "3.0.0-next.18",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -21,9 +21,9 @@
   "peerDependencies": {
     "viem": "^2.0.0",
     "@morpho-org/blue-sdk": "^2.3.2",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.6",
     "@morpho-org/blue-sdk-viem": "^2.2.2",
-    "@morpho-org/morpho-ts": "^2.2.0"
+    "@morpho-org/morpho-ts": "^2.2.0",
+    "@morpho-org/simulation-sdk": "^2.1.4"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -38,11 +38,11 @@
     "@morpho-org/blue-sdk": "^2.3.2",
     "@morpho-org/morpho-test": "^2.2.1",
     "@morpho-org/morpho-ts": "^2.2.0",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.6",
     "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/simulation-sdk": "^2.1.4",
     "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
-    "@morpho-org/test": "^2.1.1",
-    "@morpho-org/test-wagmi": "^2.0.4"
+    "@morpho-org/test-wagmi": "^2.0.4",
+    "@morpho-org/test": "^2.1.2-next.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",