@morpho-org/bundler-sdk-viem 2.0.0-next.25 → 2.0.0-next.26

package/lib/operations.d.ts

@@ -45,6 +45,10 @@ export declare const populateBundle: (inputOperations: InputBundlerOperation[],
     operations: BundlerOperation[];
     steps: SimulationResult;
 };
+export declare const simulateRequiredTokenAmounts: (operations: Operation[], data: MaybeDraft<SimulationState>) => {
+    token: `0x${string}`;
+    required: bigint;
+}[];
 export declare const getSimulatedBundlerOperation: (operation: BundlerOperation, { slippage }?: {
     slippage?: bigint;
 }) => Operation;

package/lib/operations.js

@@ -1,6 +1,6 @@
 import { DEFAULT_SLIPPAGE_TOLERANCE, DEFAULT_SUPPLY_TARGET_UTILIZATION, MarketUtils, MathLib, NATIVE_ADDRESS, erc20WrapperTokens, getChainAddresses, getUnwrappedToken, permissionedBackedTokens, permissionedWrapperTokens, } from "@morpho-org/blue-sdk";
-import { entries, getLast, getValue, keys } from "@morpho-org/morpho-ts";
-import { handleOperation, handleOperations, produceImmutable, simulateOperation, } from "@morpho-org/simulation-sdk";
+import { bigIntComparator, entries, getLast, getValue, keys, } from "@morpho-org/morpho-ts";
+import { handleOperation, handleOperations, produceImmutable, simulateOperation, simulateOperations, } from "@morpho-org/simulation-sdk";
 import { maxUint256 } from "viem";
 import { BundlerErrors } from "./errors.js";
 export const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasSimplePermit = false } = {}) => {
@@ -268,7 +268,7 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
         },
     };
     // Operations with callbacks are populated recursively as a side-effect of the simulation, within the callback itself.
-    let { requiredTokenAmounts } = data.simulateWithUnlimitedBalances(operations.concat([simulatedOperation]), [bundler]);
+    let requiredTokenAmounts = simulateRequiredTokenAmounts(operations.concat([simulatedOperation]), data);
     const allOperations = operations.concat([
         mainOperation,
     ]);
@@ -283,9 +283,9 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
         return allOperations;
     }
     const requirementOperations = getRequirementOperations?.(requiredTokenAmounts) ?? [];
-    ({ requiredTokenAmounts } = data.simulateWithUnlimitedBalances(requirementOperations
+    requiredTokenAmounts = simulateRequiredTokenAmounts(requirementOperations
         .concat(allOperations)
-        .map((operation) => getSimulatedBundlerOperation(operation)), [bundler]));
+        .map((operation) => getSimulatedBundlerOperation(operation)), data);
     // Append required input transfers.
     requiredTokenAmounts.forEach(({ token, required }) => {
         requirementOperations.push(...populateInputTransfer({
@@ -562,6 +562,32 @@ export const populateBundle = (inputOperations, data, options) => {
     });
     return { operations, steps };
 };
+export const simulateRequiredTokenAmounts = (operations, data) => {
+    const { bundler } = getChainAddresses(data.chainId);
+    const virtualBundlerData = produceImmutable(data, (draft) => {
+        Object.values(draft.holdings[bundler] ?? {}).forEach((bundlerTokenData) => {
+            // Virtual balance to calculate the amount required.
+            bundlerTokenData.balance += MathLib.MAX_UINT_160;
+        });
+    });
+    const steps = simulateOperations(operations, virtualBundlerData);
+    const bundlerTokenDiffs = keys(virtualBundlerData.holdings[bundler]).map((token) => ({
+        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
+        MathLib.MAX_UINT_160 -
+            (step.holdings[bundler]?.[token]?.balance ?? 0n))
+            .sort(bigIntComparator((required) => required, 
+        // Take the highest required amount among all operations.
+        "desc"))[0],
+    }));
+    return bundlerTokenDiffs.filter(({ required }) => required > 0n);
+};
 export const getSimulatedBundlerOperation = (operation, { slippage } = {}) => {
     const callback = getValue(operation.args, "callback");
     const simulatedOperation = {

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.0.0-next.25",
+  "version": "2.0.0-next.26",
   "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.0.0-next.24",
-    "@morpho-org/simulation-sdk": "^2.0.0-next.20",
-    "@morpho-org/blue-sdk-viem": "^2.0.0-next.22",
-    "@morpho-org/morpho-ts": "^2.0.0-next.12"
+    "@morpho-org/simulation-sdk": "^2.0.0-next.22",
+    "@morpho-org/morpho-ts": "^2.0.0-next.12",
+    "@morpho-org/blue-sdk-viem": "^2.0.0-next.22"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.59.13",
@@ -39,10 +39,10 @@
     "@morpho-org/blue-sdk-viem": "^2.0.0-next.22",
     "@morpho-org/morpho-ts": "^2.0.0-next.12",
     "@morpho-org/morpho-test": "^2.0.0-next.14",
-    "@morpho-org/simulation-sdk": "^2.0.0-next.20",
+    "@morpho-org/simulation-sdk": "^2.0.0-next.22",
+    "@morpho-org/simulation-sdk-wagmi": "^2.0.0-next.21",
     "@morpho-org/test": "^2.0.0-next.20",
-    "@morpho-org/test-wagmi": "^2.0.0-next.20",
-    "@morpho-org/simulation-sdk-wagmi": "^2.0.0-next.21"
+    "@morpho-org/test-wagmi": "^2.0.0-next.20"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",