@morpho-org/bundler-sdk-viem 3.4.0-next.1 → 4.0.1

package/lib/actions.js

@@ -135,8 +135,8 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
             // the signature can be used independently.
             if (spender !== generalAdapter1)
                 throw new errors_js_1.BundlerErrors.UnexpectedSignature(spender);
+            const isDai = dai != null && operation.address === dai;
             if (supportsSignature) {
-                const isDai = dai != null && operation.address === dai;
                 const action = isDai
                     ? {
                         type: "permitDai",
@@ -211,10 +211,9 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
                 break;
             }
             // Simple permit is not supported, fallback to standard approval.
-            // Ignore zero permits used to reset allowances at the end of a bundle
+            // Ignore DAI-specific zero permits used to reset allowances at the end of a bundle
             // when the signer does not support signatures, as they cannot be bundled.
-            // Currently only used by DAI-specific permit which does not support specific amounts.
-            if (amount > 0n)
+            if (amount > 0n || !isDai)
                 requirements.txs.push(...encodeErc20Approval(operation.address, spender, amount, dataBefore));
             break;
         }

package/lib/operations.js

@@ -45,7 +45,6 @@ const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasS
     // Try using simple permit.
     const useSimplePermit = erc2612Nonce != null &&
         (data.tryGetVault(address) != null || // MetaMorpho vaults implement EIP-2612.
-            data.tryGetVaultV2(address) != null || // Vaults V2 implement EIP-2612.
             hasSimplePermit);
     const useSimpleTransfer = permit2 == null ||
         // Token is permissioned and Permit2 may not be authorized so Permit2 cannot be used.
@@ -181,12 +180,10 @@ const populateSubBundle = (inputOperation, data, options = {}) => {
                     if (isErc20Wrapper)
                         break;
                 case "MetaMorpho_Deposit":
-                case "MetaMorpho_Withdraw": {
+                case "MetaMorpho_Withdraw":
                     // Only if sender is owner otherwise the owner would be lost.
                     if (draft.args.owner === sender)
                         draft.args.owner = generalAdapter1;
-                    break;
-                }
             }
             // Redirect operation targets.
             switch (draft.type) {
@@ -492,15 +489,9 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     let steps = (0, exports.simulateBundlerOperations)(operations, startData);
     // Redirect MetaMorpho deposits.
     operations.forEach((operation, index) => {
-        switch (operation.type) {
-            case "MetaMorpho_Deposit": {
-                if (operation.args.owner !== generalAdapter1)
-                    return;
-                break;
-            }
-            default:
-                return;
-        }
+        if (operation.type !== "MetaMorpho_Deposit" ||
+            operation.args.owner !== generalAdapter1)
+            return;
         const token = operation.address;
         // shares are not defined when depositing assets, so we rely on simulation steps.
         const shares = steps[index + 1].getHolding(generalAdapter1, token).balance -
@@ -510,10 +501,9 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             .some((step) => step.getHolding(generalAdapter1, token).balance < shares))
             // If the bundler's balance is at least once lower than assets, the bundler does need these assets.
             return;
-        if (operation.type === "MetaMorpho_Deposit")
-            operation.args.owner = receiver;
+        operation.args.owner = receiver;
     });
-    // Redirect borrows, withdrawals, MetaMorpho withdrawals & Vault V2 withdrawals.
+    // Redirect borrows, withdrawals & MetaMorpho withdrawals.
     operations.forEach((operation, index) => {
         let token;
         switch (operation.type) {
@@ -544,15 +534,9 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     });
     // Simplify Erc20_Transfer(sender = bundler, to = bundler) + MetaMorpho_Withdraw(owner = bundler) = MetaMorpho_Withdraw(owner = from).
     operations.forEach((operation, index) => {
-        switch (operation.type) {
-            case "MetaMorpho_Withdraw": {
-                if (operation.args.owner !== generalAdapter1)
-                    return;
-                break;
-            }
-            default:
-                return;
-        }
+        if (operation.type !== "MetaMorpho_Withdraw" ||
+            operation.args.owner !== generalAdapter1)
+            return;
         // shares are not defined when using assets, so we rely on simulation steps.
         const shares = steps[index].getHolding(generalAdapter1, operation.address).balance -
             steps[index + 1].getHolding(generalAdapter1, operation.address).balance;
@@ -565,8 +549,7 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             return;
         const inputTransfer = operations[inputTransferIndex];
         inputTransfer.args.amount -= shares;
-        if (operation.type === "MetaMorpho_Withdraw")
-            operation.args.owner = inputTransfer.args.from;
+        operation.args.owner = inputTransfer.args.from;
     });
     // Filter out useless input transfers.
     operations = operations.filter((operation, index) => {

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.4.0-next.1",
+  "version": "4.0.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -19,9 +19,9 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk": "^4.13.0",
-    "@morpho-org/morpho-ts": "^2.4.2",
-    "@morpho-org/blue-sdk-viem": "^3.3.0-next.1",
+    "@morpho-org/blue-sdk": "^5.2.0",
+    "@morpho-org/blue-sdk-viem": "^4.0.0",
+    "@morpho-org/morpho-ts": "^2.4.3",
     "@morpho-org/simulation-sdk": "^3.1.3"
   },
   "devDependencies": {
@@ -32,16 +32,16 @@
     "@types/lodash": "^4.17.12",
     "lodash": "^4.17.21",
     "typescript": "^5.7.2",
-    "viem": "^2.33.3",
+    "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^4.13.0",
-    "@morpho-org/blue-sdk-viem": "^3.3.0-next.1",
-    "@morpho-org/morpho-ts": "^2.4.2",
-    "@morpho-org/simulation-sdk": "^3.1.3",
     "@morpho-org/morpho-test": "^2.4.0",
+    "@morpho-org/blue-sdk": "^5.2.0",
+    "@morpho-org/blue-sdk-viem": "^4.0.0",
+    "@morpho-org/morpho-ts": "^2.4.3",
+    "@morpho-org/simulation-sdk": "^3.1.3",
     "@morpho-org/simulation-sdk-wagmi": "^3.0.3",
-    "@morpho-org/test": "^2.6.1-next.1",
-    "@morpho-org/test-wagmi": "^2.0.4"
+    "@morpho-org/test-wagmi": "^2.0.4",
+    "@morpho-org/test": "^2.6.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",