@morpho-org/bundler-sdk-viem 3.0.0-next.9 → 3.0.0

package/lib/actions.js

@@ -5,6 +5,7 @@ import { getCurrent, simulateOperation, } from "@morpho-org/simulation-sdk";
 import { blueAbi, getAuthorizationTypedData, getDaiPermitTypedData, getPermit2PermitTypedData, getPermitTypedData, } from "@morpho-org/blue-sdk-viem";
 import { signTypedData } from "viem/actions";
 import { ActionBundle, ActionBundleRequirements } from "./ActionBundle.js";
+import { BundlerErrors } from "./errors.js";
 export const APPROVE_ONLY_ONCE_TOKENS = {
     [ChainId.EthMainnet]: [
         "0xdAC17F958D2ee523a2206206994597C13D831ec7", // USDT
@@ -92,6 +93,9 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     switch (operation.type) {
         case "Blue_SetAuthorization": {
             const { owner, isAuthorized, authorized } = operation.args;
+            // Never authorize bundler3 otherwise the signature can be used independently.
+            if (authorized === bundler3)
+                throw new BundlerErrors.UnexpectedSignature(authorized);
             if (supportsSignature) {
                 const ownerData = dataBefore.getUser(owner);
                 const authorization = {
@@ -103,7 +107,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 };
                 const action = {
                     type: "morphoSetAuthorizationWithSig",
-                    args: [authorization, null],
+                    args: [authorization, null, operation.skipRevert],
                 };
                 actions.push(action);
                 requirements.signatures.push({
@@ -158,15 +162,33 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             if (address === NATIVE_ADDRESS)
                 break;
             const { amount, spender, nonce } = operation.args;
+            // Never permit any other address than the GeneralAdapter1 otherwise
+            // the signature can be used independently.
+            if (spender !== generalAdapter1)
+                throw new BundlerErrors.UnexpectedSignature(spender);
             if (supportsSignature) {
                 const action = address === dai
                     ? {
                         type: "permitDai",
-                        args: [sender, nonce, deadline, true, null, spender],
+                        args: [
+                            sender,
+                            nonce,
+                            deadline,
+                            true,
+                            null,
+                            operation.skipRevert,
+                        ],
                     }
                     : {
                         type: "permit",
-                        args: [sender, address, amount, deadline, null, spender],
+                        args: [
+                            sender,
+                            address,
+                            amount,
+                            deadline,
+                            null,
+                            operation.skipRevert,
+                        ],
                     };
                 actions.push(action);
                 const tokenData = dataBefore.getToken(address);
@@ -239,22 +261,24 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 nonce: Number(nonce),
                                 expiration: Number(expiration),
                             },
-                            spender: bundler3,
                             sigDeadline: deadline,
                         },
                         null,
+                        operation.skipRevert,
                     ],
                 };
                 actions.push(action);
                 requirements.signatures.push({
                     action,
                     async sign(client, account = client.account) {
-                        const { details, spender, sigDeadline } = action.args[1];
+                        const { details, sigDeadline } = action.args[1];
                         let signature = action.args[2];
                         if (signature != null)
                             return signature; // action is already signed
                         const typedData = getPermit2PermitTypedData({
-                            spender,
+                            // Never permit any other address than the GeneralAdapter1 otherwise
+                            // the signature can be used independently.
+                            spender: generalAdapter1,
                             allowance: details.amount,
                             erc20: details.token,
                             nonce: details.nonce,
@@ -284,7 +308,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             if (address === NATIVE_ADDRESS) {
                 actions.push({
                     type: "nativeTransfer",
-                    args: [from, to, amount],
+                    args: [from, to, amount, operation.skipRevert],
                 });
                 break;
             }
@@ -292,29 +316,29 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             if (from === generalAdapter1) {
                 actions.push({
                     type: "erc20Transfer",
-                    args: [address, to, amount],
+                    args: [address, to, amount, generalAdapter1, operation.skipRevert],
                 });
                 break;
             }
             actions.push({
                 type: "erc20TransferFrom",
-                args: [address, amount, to],
+                args: [address, amount, to, operation.skipRevert],
             });
             break;
         }
         case "Erc20_Transfer2": {
-            const { amount, from, to } = operation.args;
+            const { amount, to } = operation.args;
             if (supportsSignature) {
                 actions.push({
                     type: "transferFrom2",
-                    args: [address, from, amount, to],
+                    args: [address, amount, to, operation.skipRevert],
                 });
                 break;
             }
             // Signatures are not supported, fallback to standard transfer.
             actions.push({
                 type: "erc20TransferFrom",
-                args: [address, amount, to],
+                args: [address, amount, to, operation.skipRevert],
             });
             break;
         }
@@ -324,21 +348,27 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case wNative: {
                     actions.push({
                         type: "wrapNative",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case wstEth: {
                     actions.push({
                         type: "wrapStEth",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case stEth: {
                     actions.push({
                         type: "stakeEth",
-                        args: [amount, MathLib.MAX_UINT_256, zeroAddress],
+                        args: [
+                            amount,
+                            MathLib.MAX_UINT_256,
+                            zeroAddress,
+                            generalAdapter1,
+                            operation.skipRevert,
+                        ],
                     });
                     break;
                 }
@@ -349,7 +379,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                             throw Error(`unknown wrapped token: ${address}`);
                         actions.push({
                             type: "erc20WrapperDepositFor",
-                            args: [address, underlying, amount],
+                            args: [address, underlying, amount, operation.skipRevert],
                         });
                         break;
                     }
@@ -366,14 +396,14 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case wNative: {
                     actions.push({
                         type: "unwrapNative",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case wstEth: {
                     actions.push({
                         type: "unwrapStEth",
-                        args: [amount],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
@@ -382,7 +412,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                         throw Error(`unexpected token unwrap: ${address}`);
                     actions.push({
                         type: "erc20WrapperWithdrawTo",
-                        args: [address, receiver, amount],
+                        args: [address, receiver, amount, operation.skipRevert],
                     });
                 }
             }
@@ -390,7 +420,10 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Supply": {
             const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
             const maxSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoSupply",
@@ -401,33 +434,57 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     maxSharePrice,
                     onBehalf,
                     callbackBundle?.actions ?? [],
+                    operation.skipRevert,
                 ],
             });
             break;
         }
         case "Blue_Withdraw": {
             const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
             const minSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD - slippage));
             actions.push({
                 type: "morphoWithdraw",
-                args: [market.params, assets, shares, minSharePrice, receiver],
+                args: [
+                    market.params,
+                    assets,
+                    shares,
+                    minSharePrice,
+                    receiver,
+                    operation.skipRevert,
+                ],
             });
             break;
         }
         case "Blue_Borrow": {
             const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
             const minSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD - slippage));
             actions.push({
                 type: "morphoBorrow",
-                args: [market.params, assets, shares, minSharePrice, receiver],
+                args: [
+                    market.params,
+                    assets,
+                    shares,
+                    minSharePrice,
+                    receiver,
+                    operation.skipRevert,
+                ],
             });
             break;
         }
         case "Blue_Repay": {
             const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            // Accrue interest to calculate the expected share price.
+            const market = dataBefore
+                .getMarket(id)
+                .accrueInterest(dataBefore.block.timestamp);
             const maxSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoRepay",
@@ -438,6 +495,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     maxSharePrice,
                     onBehalf,
                     callbackBundle?.actions ?? [],
+                    operation.skipRevert,
                 ],
             });
             break;
@@ -451,13 +509,24 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     throw Error(`unknown wrapped token: ${address}`);
                 actions.push({
                     type: "erc20WrapperDepositFor",
-                    args: [params.collateralToken, underlying, assets],
+                    args: [
+                        params.collateralToken,
+                        underlying,
+                        assets,
+                        operation.skipRevert,
+                    ],
                 });
                 break;
             }
             actions.push({
                 type: "morphoSupplyCollateral",
-                args: [params, assets, onBehalf, callbackBundle?.actions ?? []],
+                args: [
+                    params,
+                    assets,
+                    onBehalf,
+                    callbackBundle?.actions ?? [],
+                    operation.skipRevert,
+                ],
             });
             break;
         }
@@ -466,39 +535,59 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             const { params } = dataBefore.getMarket(id);
             actions.push({
                 type: "morphoWithdrawCollateral",
-                args: [params, assets, receiver],
+                args: [params, assets, receiver, operation.skipRevert],
             });
             break;
         }
         case "MetaMorpho_Deposit": {
             const { assets = 0n, shares = 0n, owner, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const vault = dataBefore.getVault(address);
+            // Accrue interest to calculate the expected share price.
+            const vault = dataBefore
+                .getAccrualVault(address)
+                .accrueInterest(dataBefore.block.timestamp);
             const maxSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD + slippage));
             if (shares === 0n)
                 actions.push({
                     type: "erc4626Deposit",
-                    args: [address, assets, maxSharePrice, owner],
+                    args: [address, assets, maxSharePrice, owner, operation.skipRevert],
                 });
             else
                 actions.push({
                     type: "erc4626Mint",
-                    args: [address, shares, maxSharePrice, owner],
+                    args: [address, shares, maxSharePrice, owner, operation.skipRevert],
                 });
             break;
         }
         case "MetaMorpho_Withdraw": {
             const { assets = 0n, shares = 0n, owner, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const vault = dataBefore.getVault(address);
+            // Accrue interest to calculate the expected share price.
+            const vault = dataBefore
+                .getAccrualVault(address)
+                .accrueInterest(dataBefore.block.timestamp);
             const minSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD - slippage));
             if (assets > 0n)
                 actions.push({
                     type: "erc4626Withdraw",
-                    args: [address, assets, minSharePrice, receiver, owner],
+                    args: [
+                        address,
+                        assets,
+                        minSharePrice,
+                        receiver,
+                        owner,
+                        operation.skipRevert,
+                    ],
                 });
             else
                 actions.push({
                     type: "erc4626Redeem",
-                    args: [address, shares, minSharePrice, receiver, owner],
+                    args: [
+                        address,
+                        shares,
+                        minSharePrice,
+                        receiver,
+                        owner,
+                        operation.skipRevert,
+                    ],
                 });
             break;
         }
@@ -516,6 +605,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                         amount: assets,
                     })),
                     dataBefore.getMarket(supplyMarketId).params,
+                    operation.skipRevert,
                 ],
             });
             break;

package/lib/errors.d.ts

@@ -1,4 +1,5 @@
 import type { SimulationResult } from "@morpho-org/simulation-sdk";
+import type { Address } from "viem";
 import type { ActionType, InputBundlerOperation } from "./types/index.js";
 export declare namespace BundlerErrors {
     class Bundle extends Error {
@@ -14,4 +15,7 @@ export declare namespace BundlerErrors {
     class UnexpectedAction extends Error {
         constructor(type: ActionType, chainId: number);
     }
+    class UnexpectedSignature extends Error {
+        constructor(spender: Address);
+    }
 }

package/lib/errors.js

@@ -27,4 +27,10 @@ export var BundlerErrors;
         }
     }
     BundlerErrors.UnexpectedAction = UnexpectedAction;
+    class UnexpectedSignature extends Error {
+        constructor(spender) {
+            super(`unexpected signature consumer "${spender}"`);
+        }
+    }
+    BundlerErrors.UnexpectedSignature = UnexpectedSignature;
 })(BundlerErrors || (BundlerErrors = {}));

package/lib/operations.js

@@ -8,7 +8,7 @@ import { BundlerErrors } from "./errors.js";
  */
 export const DEFAULT_SUPPLY_TARGET_UTILIZATION = 905000000000000000n;
 export const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasSimplePermit = false } = {}) => {
-    const { bundler3: { bundler3, generalAdapter1 }, permit2, } = getChainAddresses(data.chainId);
+    const { bundler3: { generalAdapter1 }, permit2, } = getChainAddresses(data.chainId);
     // If native token, it is expected to be sent along as call value.
     if (address === NATIVE_ADDRESS)
         return [
@@ -105,7 +105,7 @@ export const populateInputTransfer = ({ address, args: { amount, from } }, data,
             });
         operations.push({
             type: "Erc20_Transfer2",
-            sender: bundler3,
+            sender: generalAdapter1,
             address,
             args: {
                 amount,
@@ -216,29 +216,32 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
                 ? MathLib.MAX_UINT_160
                 : MathLib.wDivDown(newTotalBorrowAssets, supplyTargetUtilization) -
                     newTotalSupplyAssets;
-            let { withdrawals, data: simulationStatePostFriendlyReallocation } = data.getMarketPublicReallocations(market.id, publicAllocatorOptions);
-            const marketPostFriendlyReallocation = simulationStatePostFriendlyReallocation.getMarket(market.id);
-            if (marketPostFriendlyReallocation.totalBorrowAssets + borrowedAssets >
-                marketPostFriendlyReallocation.totalSupplyAssets - withdrawnAssets) {
+            const { withdrawals, data: friendlyReallocationData } = data.getMarketPublicReallocations(market.id, publicAllocatorOptions);
+            const friendlyReallocationMarket = friendlyReallocationData.getMarket(market.id);
+            if (friendlyReallocationMarket.totalBorrowAssets + borrowedAssets >
+                friendlyReallocationMarket.totalSupplyAssets - withdrawnAssets) {
                 // If the "friendly" reallocations are not enough, we fully withdraw from every market.
                 requiredAssets = newTotalBorrowAssets - newTotalSupplyAssets;
-                ({ withdrawals } = data.getMarketPublicReallocations(market.id, {
+                withdrawals.push(...friendlyReallocationData.getMarketPublicReallocations(market.id, {
                     ...publicAllocatorOptions,
                     defaultMaxWithdrawalUtilization: MathLib.WAD,
                     maxWithdrawalUtilization: {},
-                }));
+                }).withdrawals);
             }
             for (const { vault, ...withdrawal } of withdrawals) {
                 const vaultReallocations = (reallocations[vault] ??= []);
-                if (withdrawal.assets > requiredAssets) {
+                const vaultMarketReallocation = vaultReallocations.find((item) => item.id === withdrawal.id);
+                const reallocatedAssets = MathLib.min(withdrawal.assets, requiredAssets);
+                if (vaultMarketReallocation != null)
+                    vaultMarketReallocation.assets += reallocatedAssets;
+                else
                     vaultReallocations.push({
                         ...withdrawal,
-                        assets: requiredAssets,
+                        assets: reallocatedAssets,
                     });
+                requiredAssets -= reallocatedAssets;
+                if (requiredAssets === 0n)
                     break;
-                }
-                requiredAssets -= withdrawal.assets;
-                vaultReallocations.push(withdrawal);
             }
             // TODO: we know there are no unwrap native in the middle
             // of the bundle so we are certain we need to add an input transfer.