@morpho-org/bundler-sdk-viem 3.1.0 → 3.1.2

package/lib/BundlerAction.js

@@ -906,15 +906,7 @@ var BundlerAction;
                 data: (0, viem_1.encodeFunctionData)({
                     abi: abis_js_1.generalAdapter1Abi,
                     functionName: "morphoFlashLoan",
-                    args: [
-                        asset,
-                        amount,
-                        (0, viem_1.encodeFunctionData)({
-                            abi: abis_js_1.bundler3Abi,
-                            functionName: "reenter",
-                            args: [callbackCalls],
-                        }),
-                    ],
+                    args: [asset, amount, reenterData],
                 }),
                 value: 0n,
                 skipRevert,

package/lib/operations.js

@@ -596,33 +596,41 @@ const populateBundle = (inputOperations, data, options) => {
     return { operations, steps };
 };
 exports.populateBundle = populateBundle;
+class VirtualHolding extends blue_sdk_1.Holding {
+    required = 0n;
+    get balance() {
+        return this._balance;
+    }
+    set balance(value) {
+        if (value < 0n) {
+            this.required += -value;
+            this._balance = 0n;
+        }
+        else
+            this._balance = value;
+    }
+}
 const simulateRequiredTokenAmounts = (operations, data) => {
     const { bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(data.chainId);
     const virtualBundlerData = (0, simulation_sdk_1.produceImmutable)(data, (draft) => {
-        Object.values(draft.holdings[generalAdapter1] ?? {}).forEach((bundlerTokenData) => {
-            if (bundlerTokenData == null)
+        const bundlerHoldings = draft.holdings[generalAdapter1];
+        if (bundlerHoldings == null)
+            return;
+        (0, morpho_ts_1.entries)(bundlerHoldings).map(([token, holding]) => {
+            if (holding == null)
                 return;
-            // Virtual balance to calculate the amount required.
-            bundlerTokenData.balance += blue_sdk_1.MathLib.MAX_UINT_160;
+            bundlerHoldings[token] = new VirtualHolding(holding);
         });
     });
+    // Simulate the operations to calculate the required token amounts.
     const steps = (0, simulation_sdk_1.simulateOperations)(operations, virtualBundlerData);
-    const bundlerTokenDiffs = (0, morpho_ts_1.keys)(virtualBundlerData.holdings[generalAdapter1]).map((token) => ({
+    return (0, morpho_ts_1.entries)((0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {})
+        .map(([token, holding]) => ({
         token,
-        required: steps
-            .map((step) => 
-        // When recursively simulated, this will cause tokens to be required at the highest recursion level.
-        // For example: supplyCollateral(x, supplyCollateral(y, borrow(z)))   [provided x, y, z < MAX_UINT_160]
-        //              |                   |                   |=> MAX_UINT_160 - (3 * MAX_UINT_160 + z) < 0
-        //              |                   |=> MAX_UINT_160 - (2 * MAX_UINT_160 - y) < 0
-        //              |=> MAX_UINT_160 - (MAX_UINT_160 - y - x) > 0
-        blue_sdk_1.MathLib.MAX_UINT_160 -
-            (step.holdings[generalAdapter1]?.[token]?.balance ?? 0n))
-            .sort((0, morpho_ts_1.bigIntComparator)((required) => required, 
-        // Take the highest required amount among all operations.
-        "desc"))[0],
-    }));
-    return bundlerTokenDiffs.filter(({ required }) => required > 0n);
+        // Safe cast because the holding was transformed to a VirtualHolding.
+        required: holding.required,
+    }))
+        .filter(({ required }) => required > 0n);
 };
 exports.simulateRequiredTokenAmounts = simulateRequiredTokenAmounts;
 const getSimulatedBundlerOperation = (operation, { slippage } = {}) => {

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.1.0",
+  "version": "3.1.2",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -19,10 +19,10 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk": "^3.0.1",
-    "@morpho-org/simulation-sdk": "^3.0.0",
-    "@morpho-org/morpho-ts": "^2.3.0",
-    "@morpho-org/blue-sdk-viem": "^3.0.0"
+    "@morpho-org/blue-sdk": "^3.0.6",
+    "@morpho-org/blue-sdk-viem": "^3.0.0",
+    "@morpho-org/simulation-sdk": "^3.0.1",
+    "@morpho-org/morpho-ts": "^2.3.0"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -34,12 +34,12 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^3.0.1",
+    "@morpho-org/blue-sdk": "^3.0.6",
     "@morpho-org/blue-sdk-viem": "^3.0.0",
-    "@morpho-org/morpho-test": "^2.3.0",
     "@morpho-org/morpho-ts": "^2.3.0",
-    "@morpho-org/simulation-sdk": "^3.0.0",
-    "@morpho-org/simulation-sdk-wagmi": "^3.0.0",
+    "@morpho-org/morpho-test": "^2.3.0",
+    "@morpho-org/simulation-sdk": "^3.0.1",
+    "@morpho-org/simulation-sdk-wagmi": "^3.0.1",
     "@morpho-org/test-wagmi": "^2.0.4",
     "@morpho-org/test": "^2.1.3"
   },