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

package/lib/actions.js

@@ -66,7 +66,7 @@ const encodeErc20Approval = (token, sender, spender, amount, data) => {
 export const encodeOperation = (operation, dataBefore, supportsSignature = true, index = 0) => {
     const { chainId } = dataBefore;
     const deadline = Time.timestamp() + Time.s.from.h(24n);
-    const { morpho, bundler, publicAllocator, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
+    const { morpho, bundler, permit2, publicAllocator, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
     let value = 0n;
     const actions = [];
     const requirements = {
@@ -230,7 +230,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             // Native token cannot be permitted.
             if (address === NATIVE_ADDRESS)
                 break;
-            const { amount, spender, expiration, nonce } = operation.args;
+            const { amount, expiration, nonce } = operation.args;
             if (supportsSignature) {
                 const action = {
                     type: "approve2",
@@ -242,7 +242,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 nonce: Number(nonce),
                                 expiration: Number(expiration),
                             },
-                            spender,
+                            spender: bundler,
                             sigDeadline: deadline,
                         },
                         null,
@@ -278,7 +278,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 break;
             }
             // Signatures are not supported, fallback to standard approval.
-            requirements.txs.push(...encodeErc20Approval(address, sender, spender, amount, dataBefore));
+            requirements.txs.push(...encodeErc20Approval(address, sender, bundler, amount, dataBefore));
             break;
         }
         case "Erc20_Transfer": {

package/lib/operations.js

@@ -23,7 +23,7 @@ export const populateInputTransfer = ({ address, args: { amount, from } }, data,
                 },
             },
         ];
-    const { erc20Allowances, permit2Allowances, erc2612Nonce } = data.getHolding(from, address);
+    const { erc20Allowances, permit2BundlerAllowance, erc2612Nonce } = data.getHolding(from, address);
     // ERC20 allowance to the bundler is enough, consume it.
     if (erc20Allowances.bundler >= amount)
         return [
@@ -90,17 +90,16 @@ export const populateInputTransfer = ({ address, args: { amount, from } }, data,
                     spender: permit2,
                 },
             });
-        if (permit2Allowances.bundler.amount < amount ||
-            permit2Allowances.bundler.expiration < data.block.timestamp)
+        if (permit2BundlerAllowance.amount < amount ||
+            permit2BundlerAllowance.expiration < data.block.timestamp)
             operations.push({
                 type: "Erc20_Permit2",
                 sender: from,
                 address,
                 args: {
                     amount,
-                    spender: bundler,
                     expiration: MathLib.MAX_UINT_48, // Always approve indefinitely.
-                    nonce: permit2Allowances.bundler.nonce,
+                    nonce: permit2BundlerAllowance.nonce,
                 },
             });
         operations.push({
@@ -209,12 +208,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) {
@@ -362,8 +373,7 @@ export const finalizeBundle = (operations, startData, receiver, unwrapTokens = n
             }
             case "Erc20_Permit2": {
                 const duplicatePermit2 = permit2s.find((permit2) => permit2.address === operation.address &&
-                    permit2.sender === operation.sender &&
-                    permit2.args.spender === operation.args.spender);
+                    permit2.sender === operation.sender);
                 if (duplicatePermit2 == null) {
                     const lastPermit2 = permit2s.findLast((permit2) => permit2.address === operation.address &&
                         permit2.sender === operation.sender);

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",
+  "version": "2.2.1-next.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": "^2.3.1",
-    "@morpho-org/blue-sdk-viem": "^2.2.2",
-    "@morpho-org/morpho-ts": "^2.0.2",
-    "@morpho-org/simulation-sdk": "^2.1.3"
+    "@morpho-org/blue-sdk": "^2.3.2-next.0",
+    "@morpho-org/morpho-ts": "^2.1.0",
+    "@morpho-org/simulation-sdk": "^2.1.4-next.0",
+    "@morpho-org/blue-sdk-viem": "^2.2.3-next.0"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -35,13 +35,13 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^2.3.1",
-    "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/blue-sdk": "^2.3.2-next.0",
+    "@morpho-org/blue-sdk-viem": "^2.2.3-next.0",
     "@morpho-org/morpho-test": "^2.2.1",
-    "@morpho-org/morpho-ts": "^2.0.2",
-    "@morpho-org/simulation-sdk": "^2.1.3",
-    "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
+    "@morpho-org/simulation-sdk": "^2.1.4-next.0",
+    "@morpho-org/morpho-ts": "^2.1.0",
     "@morpho-org/test": "^2.0.6",
+    "@morpho-org/simulation-sdk-wagmi": "^2.0.6-next.0",
     "@morpho-org/test-wagmi": "^2.0.4"
   },
   "scripts": {