@morpho-org/bundler-sdk-viem 3.2.5 → 3.2.6

package/lib/operations.js

@@ -570,7 +570,6 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     });
     // Simulate without slippage to skim the bundler of all possible surplus of shares & assets.
     steps = (0, exports.simulateBundlerOperations)(operations, startData, { slippage: 0n });
-    const lastStep = (0, morpho_ts_1.getLast)(steps);
     const daiPermit = dai != null
         ? operations.find(
         // There should exist only one dai permit operation in the bundle thanks to the first optimization step.
@@ -588,7 +587,7 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
         });
     // Unwrap requested remaining wrapped tokens.
     const unwraps = [];
-    const endBundlerTokenData = lastStep.holdings[generalAdapter1] ?? {};
+    let endBundlerTokenData = (0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {};
     unwrapTokens.forEach((wrappedToken) => {
         const remaining = endBundlerTokenData[wrappedToken]?.balance ?? 0n;
         if (remaining <= 5n)
@@ -607,30 +606,47 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
             },
         });
     });
-    if (unwraps.length > 0)
+    if (unwraps.length > 0) {
         steps = (0, exports.simulateBundlerOperations)(operations.concat(unwraps), startData, {
             slippage: 0n,
         });
+        endBundlerTokenData = (0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {};
+    }
     // Skim any token expected to be left on the bundler.
     const skims = [];
-    {
-        const startBundlerTokenData = steps[0].holdings[generalAdapter1] ?? {};
-        const endBundlerTokenData = (0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {};
-        skims.push(...(0, morpho_ts_1.entries)(endBundlerTokenData)
-            .filter(([token, holding]) => holding != null &&
-            holding.balance - (startBundlerTokenData[token]?.balance ?? 0n) >
-                5n)
-            .map(([address]) => ({
-            type: "Erc20_Transfer",
-            address,
-            sender: generalAdapter1,
-            args: {
-                amount: viem_1.maxUint256,
-                from: generalAdapter1,
-                to: receiver,
-            },
-        })));
-    }
+    const startBundlerTokenData = steps[0].holdings[generalAdapter1] ?? {};
+    const uniqueSkimTokens = new Set((0, morpho_ts_1.entries)(endBundlerTokenData)
+        .filter(([token, holding]) => holding != null &&
+        holding.balance - (startBundlerTokenData[token]?.balance ?? 0n) > 5n)
+        .map(([address]) => address));
+    const pushCustomSkim = (operation) => {
+        // Paraswap does not guarantee that the amount effectively bought (resp. sold) corresponds to
+        // the requested amount to buy (resp. sell), so we force skim the possible surplus of bought (resp. sold) token.
+        switch (operation.type) {
+            case "Paraswap_Buy":
+            case "Paraswap_Sell":
+                uniqueSkimTokens.add(operation.address);
+                break;
+            case "Blue_Paraswap_BuyDebt":
+                uniqueSkimTokens.add(startData.getMarket(operation.args.id).params.loanToken);
+                break;
+            default:
+                break;
+        }
+        if ("callback" in operation.args)
+            operation.args.callback?.forEach(pushCustomSkim);
+    };
+    operations.forEach(pushCustomSkim);
+    skims.push(...Array.from(uniqueSkimTokens, (address) => ({
+        type: "Erc20_Transfer",
+        address,
+        sender: generalAdapter1,
+        args: {
+            amount: viem_1.maxUint256,
+            from: generalAdapter1,
+            to: receiver,
+        },
+    })));
     return operations.concat(unwraps, skims);
 };
 exports.finalizeBundle = finalizeBundle;

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.2.5",
+  "version": "3.2.6",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -19,10 +19,10 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk": "^4.4.0",
-    "@morpho-org/simulation-sdk": "^3.1.2",
+    "@morpho-org/morpho-ts": "^2.4.1",
     "@morpho-org/blue-sdk-viem": "^3.1.1",
-    "@morpho-org/morpho-ts": "^2.4.1"
+    "@morpho-org/blue-sdk": "^4.4.0",
+    "@morpho-org/simulation-sdk": "^3.1.2"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -34,13 +34,13 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk-viem": "^3.1.1",
     "@morpho-org/morpho-test": "^2.3.0",
     "@morpho-org/blue-sdk": "^4.4.0",
     "@morpho-org/morpho-ts": "^2.4.1",
+    "@morpho-org/blue-sdk-viem": "^3.1.1",
     "@morpho-org/simulation-sdk": "^3.1.2",
-    "@morpho-org/test": "^2.1.4",
     "@morpho-org/simulation-sdk-wagmi": "^3.0.2",
+    "@morpho-org/test": "^2.1.4",
     "@morpho-org/test-wagmi": "^2.0.4"
   },
   "scripts": {