@morpho-org/bundler-sdk-viem 3.2.0-next.1 → 3.2.0-next.3

package/lib/actions.d.ts

@@ -1,9 +1,6 @@
-import { type Address } from "viem";
 import { type MaybeDraft, type SimulationState } from "@morpho-org/simulation-sdk";
 import { ActionBundle, ActionBundleRequirements } from "./ActionBundle.js";
 import type { Action, BundlerOperation, TransactionRequirement } from "./types/index.js";
-export declare const APPROVE_ONLY_ONCE_TOKENS: Partial<Record<number, Address[]>>;
-export declare const MAX_TOKEN_APPROVALS: Partial<Record<number, Record<Address, bigint>>>;
 export declare const encodeOperation: (operation: BundlerOperation, dataBefore: MaybeDraft<SimulationState>, supportsSignature?: boolean, index?: number) => {
     dataAfter: MaybeDraft<SimulationState>;
     actions: Action[];

package/lib/actions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeOperation = exports.MAX_TOKEN_APPROVALS = exports.APPROVE_ONLY_ONCE_TOKENS = void 0;
+exports.encodeOperation = void 0;
 exports.encodeBundle = encodeBundle;
 const viem_1 = require("viem");
 const blue_sdk_1 = require("@morpho-org/blue-sdk");
@@ -10,23 +10,12 @@ const blue_sdk_viem_1 = require("@morpho-org/blue-sdk-viem");
 const actions_1 = require("viem/actions");
 const ActionBundle_js_1 = require("./ActionBundle.js");
 const errors_js_1 = require("./errors.js");
-exports.APPROVE_ONLY_ONCE_TOKENS = {
-    [blue_sdk_1.ChainId.EthMainnet]: [
-        "0xdAC17F958D2ee523a2206206994597C13D831ec7", // USDT
-        "0xD533a949740bb3306d119CC777fa900bA034cd52", // CRV
-    ],
-};
-exports.MAX_TOKEN_APPROVALS = {
-    [blue_sdk_1.ChainId.EthMainnet]: {
-        "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": blue_sdk_1.MathLib.maxUint(96), // UNI --> see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L154
-    },
-};
 const encodeErc20Approval = (token, sender, spender, amount, data) => {
     const { chainId } = data;
     const { morpho, bundler3: { generalAdapter1 }, permit2, } = (0, blue_sdk_1.getChainAddresses)(chainId);
-    amount = blue_sdk_1.MathLib.min(amount, exports.MAX_TOKEN_APPROVALS[chainId]?.[token] ?? viem_1.maxUint256);
+    amount = blue_sdk_1.MathLib.min(amount, simulation_sdk_1.MAX_TOKEN_APPROVALS[chainId]?.[token] ?? viem_1.maxUint256);
     const txRequirements = [];
-    if (exports.APPROVE_ONLY_ONCE_TOKENS[chainId]?.includes(token)) {
+    if (simulation_sdk_1.APPROVE_ONLY_ONCE_TOKENS[chainId]?.includes(token)) {
         const contract = spender === morpho
             ? "morpho"
             : spender === generalAdapter1
@@ -69,7 +58,6 @@ const encodeErc20Approval = (token, sender, spender, amount, data) => {
 };
 const encodeOperation = (operation, dataBefore, supportsSignature = true, index = 0) => {
     const { chainId } = dataBefore;
-    const deadline = morpho_ts_1.Time.timestamp() + morpho_ts_1.Time.s.from.h(24n);
     const { morpho, bundler3: { bundler3, generalAdapter1, paraswapAdapter }, permit2, wNative, dai, wstEth, stEth, } = (0, blue_sdk_1.getChainAddresses)(chainId);
     const actions = [];
     const requirements = new ActionBundle_js_1.ActionBundleRequirements();
@@ -100,7 +88,7 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
     const { sender } = operation;
     switch (operation.type) {
         case "Blue_SetAuthorization": {
-            const { owner, isAuthorized, authorized } = operation.args;
+            const { owner, isAuthorized, authorized, deadline = dataBefore.block.timestamp + morpho_ts_1.Time.s.from.h(2n), } = operation.args;
             // Never authorize bundler3 otherwise the signature can be used independently.
             if (authorized === bundler3)
                 throw new errors_js_1.BundlerErrors.UnexpectedSignature(authorized);
@@ -169,7 +157,7 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
             // Native token cannot be permitted.
             if (operation.address === blue_sdk_1.NATIVE_ADDRESS)
                 break;
-            const { amount, spender, nonce } = operation.args;
+            const { amount, spender, nonce, deadline = dataBefore.block.timestamp + morpho_ts_1.Time.s.from.h(2n), } = operation.args;
             // Never permit any other address than the GeneralAdapter1 otherwise
             // the signature can be used independently.
             if (spender !== generalAdapter1)
@@ -179,7 +167,14 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
                 const action = isDai
                     ? {
                         type: "permitDai",
-                        args: [sender, nonce, deadline, true, null, operation.skipRevert],
+                        args: [
+                            sender,
+                            nonce,
+                            deadline,
+                            amount > 0n,
+                            null,
+                            operation.skipRevert,
+                        ],
                     }
                     : {
                         type: "permit",
@@ -250,7 +245,7 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
             // Native token cannot be permitted.
             if (operation.address === blue_sdk_1.NATIVE_ADDRESS)
                 break;
-            const { amount, expiration, nonce } = operation.args;
+            const { amount, expiration, nonce, deadline = dataBefore.block.timestamp + morpho_ts_1.Time.s.from.h(2n), } = operation.args;
             if (supportsSignature) {
                 const action = {
                     type: "approve2",

package/lib/operations.js

@@ -358,7 +358,7 @@ const finalizeBundle = (operations, startData, receiver, unwrapTokens = new Set(
     const nbOperations = operations.length;
     if (nbOperations === 0)
         return operations;
-    const { bundler3: { bundler3, generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(startData.chainId);
+    const { bundler3: { bundler3, generalAdapter1 }, dai, } = (0, blue_sdk_1.getChainAddresses)(startData.chainId);
     if ((0, viem_1.isAddressEqual)(receiver, bundler3) ||
         (0, viem_1.isAddressEqual)(receiver, generalAdapter1))
         throw Error(`receiver is bundler`);
@@ -541,9 +541,25 @@ 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.
+        (operation) => operation.type === "Erc20_Permit" && operation.address === dai)
+        : undefined;
+    // If the bundle approves dai, reset the dai allowance at the end of the bundle.
+    if (daiPermit != null)
+        operations.push({
+            ...daiPermit,
+            args: {
+                amount: 0n,
+                spender: daiPermit.args.spender,
+                nonce: daiPermit.args.nonce + 1n,
+            },
+        });
     // Unwrap requested remaining wrapped tokens.
     const unwraps = [];
-    const endBundlerTokenData = (0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {};
+    const endBundlerTokenData = lastStep.holdings[generalAdapter1] ?? {};
     unwrapTokens.forEach((wrappedToken) => {
         const remaining = endBundlerTokenData[wrappedToken]?.balance ?? 0n;
         if (remaining <= 5n)
@@ -635,13 +651,11 @@ const simulateRequiredTokenAmounts = (operations, data) => {
     });
     // Simulate the operations to calculate the required token amounts.
     const steps = (0, simulation_sdk_1.simulateOperations)(operations, virtualBundlerData);
-    return (0, morpho_ts_1.entries)((0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {})
-        .map(([token, holding]) => ({
-        token,
+    return ((0, morpho_ts_1.entries)((0, morpho_ts_1.getLast)(steps).holdings[generalAdapter1] ?? {})
         // Safe cast because the holding was transformed to a VirtualHolding.
-        required: holding.required,
-    }))
-        .filter(({ required }) => required > 0n);
+        .filter((entry) => entry[1] != null)
+        .map(([token, { required }]) => ({ token, 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.2.0-next.1",
+  "version": "3.2.0-next.3",
   "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.6",
-    "@morpho-org/blue-sdk-viem": "^3.0.0",
-    "@morpho-org/simulation-sdk": "^3.0.1",
-    "@morpho-org/morpho-ts": "^2.3.0"
+    "@morpho-org/blue-sdk": "^4.0.0-next.3",
+    "@morpho-org/blue-sdk-viem": "^3.1.1",
+    "@morpho-org/morpho-ts": "^2.3.0",
+    "@morpho-org/simulation-sdk": "^3.1.0-next.2"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -34,11 +34,11 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk-viem": "^3.0.0",
+    "@morpho-org/blue-sdk-viem": "^3.1.1",
+    "@morpho-org/blue-sdk": "^4.0.0-next.3",
     "@morpho-org/morpho-test": "^2.3.0",
     "@morpho-org/morpho-ts": "^2.3.0",
-    "@morpho-org/simulation-sdk": "^3.0.1",
-    "@morpho-org/blue-sdk": "^3.0.6",
+    "@morpho-org/simulation-sdk": "^3.1.0-next.2",
     "@morpho-org/simulation-sdk-wagmi": "^3.0.1",
     "@morpho-org/test": "^2.1.3",
     "@morpho-org/test-wagmi": "^2.0.4"