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

package/lib/actions.d.ts

@@ -5,7 +5,6 @@ import type { Action, ActionBundle, BundlerOperation, TransactionRequirement } f
 export declare const APPROVE_ONLY_ONCE_TOKENS: Partial<Record<ChainId, Address[]>>;
 export declare const encodeOperation: (operation: BundlerOperation, dataBefore: MaybeDraft<SimulationState>, supportsSignature?: boolean, index?: number) => {
     dataAfter: MaybeDraft<SimulationState>;
-    value: bigint;
     actions: Action[];
     requirements: {
         signatures: import("./types/actions.js").SignatureRequirement[];

package/lib/actions.js

@@ -1,11 +1,10 @@
 import { encodeFunctionData, erc20Abi, maxUint256, verifyTypedData, zeroAddress, } from "viem";
-import { ChainId, MathLib, NATIVE_ADDRESS, convexWrapperTokens, erc20WrapperTokens, getChainAddresses, } from "@morpho-org/blue-sdk";
+import { ChainId, MathLib, NATIVE_ADDRESS, convexWrapperTokens, erc20WrapperTokens, getChainAddresses, getUnwrappedToken, } from "@morpho-org/blue-sdk";
 import { Time, getValue } from "@morpho-org/morpho-ts";
 import { simulateOperation, } from "@morpho-org/simulation-sdk";
 import { blueAbi, getAuthorizationTypedData, getDaiPermitTypedData, getPermit2PermitTypedData, getPermitTypedData, } from "@morpho-org/blue-sdk-viem";
 import { signTypedData } from "viem/actions";
 import BundlerAction from "./BundlerAction.js";
-import { baseBundlerAbi } from "./abis.js";
 export const APPROVE_ONLY_ONCE_TOKENS = {
     [ChainId.EthMainnet]: [
         "0xdAC17F958D2ee523a2206206994597C13D831ec7", // USDT
@@ -19,14 +18,14 @@ const MAX_TOKEN_APPROVALS = {
 };
 const encodeErc20Approval = (token, sender, spender, amount, data) => {
     const { chainId } = data;
-    const { morpho, bundler, permit2 } = getChainAddresses(chainId);
+    const { morpho, bundler3: { generalAdapter1 }, permit2, } = getChainAddresses(chainId);
     amount = MathLib.min(amount, MAX_TOKEN_APPROVALS[chainId]?.[token] ?? maxUint256);
     const txRequirements = [];
     if (APPROVE_ONLY_ONCE_TOKENS[chainId]?.includes(token)) {
         const contract = spender === morpho
             ? "morpho"
-            : spender === bundler
-                ? "bundler"
+            : spender === generalAdapter1
+                ? "bundler3.generalAdapter1"
                 : spender === permit2
                     ? "permit2"
                     : undefined;
@@ -66,8 +65,7 @@ const encodeErc20Approval = (token, sender, spender, amount, data) => {
 export const encodeOperation = (operation, dataBefore, supportsSignature = true, index = 0) => {
     const { chainId } = dataBefore;
     const deadline = Time.timestamp() + Time.s.from.h(24n);
-    const { morpho, bundler, permit2, publicAllocator, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
-    let value = 0n;
+    const { morpho, bundler3: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
     const actions = [];
     const requirements = {
         signatures: [],
@@ -101,7 +99,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 const ownerData = dataBefore.getUser(owner);
                 const authorization = {
                     authorizer: owner,
-                    authorized: bundler,
+                    authorized: generalAdapter1,
                     isAuthorized: true,
                     deadline,
                     nonce: ownerData.morphoNonce,
@@ -114,10 +112,11 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 requirements.signatures.push({
                     action,
                     async sign(client, account = client.account) {
-                        if (action.args[1] != null)
-                            return action.args[1];
+                        let signature = action.args[1];
+                        if (signature != null)
+                            return signature;
                         const typedData = getAuthorizationTypedData(authorization, chainId);
-                        const signature = await signTypedData(client, {
+                        signature = await signTypedData(client, {
                             ...typedData,
                             account,
                         });
@@ -134,13 +133,13 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             // Signatures are not supported, fallback to standard approval.
             requirements.txs.push({
                 type: "morphoSetAuthorization",
-                args: [bundler, true],
+                args: [generalAdapter1, true],
                 tx: {
                     to: morpho,
                     data: encodeFunctionData({
                         abi: blueAbi,
                         functionName: "setAuthorization",
-                        args: [bundler, true],
+                        args: [generalAdapter1, true],
                     }),
                 },
             });
@@ -166,20 +165,20 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 const action = address === dai
                     ? {
                         type: "permitDai",
-                        args: [nonce, deadline, true, null],
+                        args: [sender, nonce, deadline, true, null, spender],
                     }
                     : {
                         type: "permit",
-                        args: [address, amount, deadline, null],
+                        args: [sender, address, amount, deadline, null, spender],
                     };
                 actions.push(action);
                 const tokenData = dataBefore.getToken(address);
                 requirements.signatures.push({
                     action,
                     async sign(client, account = client.account) {
-                        if (action.args[3] != null)
-                            return action.args[3]; // action is already signed
-                        let signature;
+                        let signature = action.args[4];
+                        if (signature != null)
+                            return signature; // action is already signed
                         if (address === dai) {
                             const typedData = getDaiPermitTypedData({
                                 owner: sender,
@@ -217,7 +216,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 signature,
                             });
                         }
-                        return (action.args[3] = signature);
+                        return (action.args[4] = signature);
                     },
                 });
                 break;
@@ -235,6 +234,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 const action = {
                     type: "approve2",
                     args: [
+                        sender,
                         {
                             details: {
                                 token: address,
@@ -242,7 +242,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 nonce: Number(nonce),
                                 expiration: Number(expiration),
                             },
-                            spender: bundler,
+                            spender: bundler3,
                             sigDeadline: deadline,
                         },
                         null,
@@ -252,9 +252,10 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 requirements.signatures.push({
                     action,
                     async sign(client, account = client.account) {
-                        const { details, spender, sigDeadline } = action.args[0];
-                        if (action.args[1] != null)
-                            return action.args[1]; // action is already signed
+                        const { details, spender, sigDeadline } = action.args[1];
+                        let signature = action.args[2];
+                        if (signature != null)
+                            return signature; // action is already signed
                         const typedData = getPermit2PermitTypedData({
                             spender,
                             allowance: details.amount,
@@ -263,7 +264,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                             deadline: sigDeadline,
                             expiration: details.expiration,
                         }, chainId);
-                        const signature = await signTypedData(client, {
+                        signature = await signTypedData(client, {
                             ...typedData,
                             account,
                         });
@@ -272,87 +273,52 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                             address: sender, // Verify against the permit's owner.
                             signature,
                         });
-                        return (action.args[1] = signature);
+                        return (action.args[2] = signature);
                     },
                 });
                 break;
             }
             // Signatures are not supported, fallback to standard approval.
-            requirements.txs.push(...encodeErc20Approval(address, sender, bundler, amount, dataBefore));
+            requirements.txs.push(...encodeErc20Approval(address, sender, generalAdapter1, amount, dataBefore));
             break;
         }
         case "Erc20_Transfer": {
             const { amount, from, to } = operation.args;
-            // Output transfer from the bundler.
-            if (from === bundler) {
-                if (address === NATIVE_ADDRESS) {
-                    actions.push({
-                        type: "nativeTransfer",
-                        args: [to, amount],
-                    });
-                    break;
-                }
+            if (address === NATIVE_ADDRESS) {
                 actions.push({
-                    type: "erc20Transfer",
-                    args: [address, to, amount],
+                    type: "nativeTransfer",
+                    args: [from, to, amount],
                 });
                 break;
             }
-            // Input transfer to the bundler.
-            if (to === bundler) {
-                // Native token transfer is added to the call value (thus batched at the start of the bundle).
-                if (address === NATIVE_ADDRESS) {
-                    value += amount;
-                    break;
-                }
+            // Output transfer from the bundler.
+            if (from === generalAdapter1) {
                 actions.push({
-                    type: "erc20TransferFrom",
-                    args: [address, amount],
+                    type: "erc20Transfer",
+                    args: [address, to, amount],
                 });
                 break;
             }
-            // Any other transfer is ignored.
+            actions.push({
+                type: "erc20TransferFrom",
+                args: [address, amount, to],
+            });
             break;
         }
         case "Erc20_Transfer2": {
             const { amount, from, to } = operation.args;
-            // Output transfer2 from the bundler is treated like a standard output transfer.
-            if (from === bundler) {
-                if (address === NATIVE_ADDRESS) {
-                    actions.push({
-                        type: "nativeTransfer",
-                        args: [to, amount],
-                    });
-                    break;
-                }
-                actions.push({
-                    type: "erc20Transfer",
-                    args: [address, to, amount],
-                });
-                break;
-            }
-            // Input transfer2 to the bundler.
-            if (to === bundler) {
-                // Native token transfer is added to the call value (thus batched at the start of the bundle).
-                if (address === NATIVE_ADDRESS) {
-                    value += amount;
-                    break;
-                }
-                if (supportsSignature) {
-                    actions.push({
-                        type: "transferFrom2",
-                        args: [address, amount],
-                    });
-                    break;
-                }
-                // Signatures are not supported, fallback to standard transfer.
+            if (supportsSignature) {
                 actions.push({
-                    type: "erc20TransferFrom",
-                    args: [address, amount],
+                    type: "transferFrom2",
+                    args: [address, from, amount, to],
                 });
                 break;
             }
-            // Any other transfer is ignored.
+            // Signatures are not supported, fallback to standard transfer.
+            actions.push({
+                type: "erc20TransferFrom",
+                args: [address, amount, to],
+            });
             break;
         }
         case "Erc20_Wrap": {
@@ -375,15 +341,18 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case stEth: {
                     actions.push({
                         type: "stakeEth",
-                        args: [amount, 0n, zeroAddress],
+                        args: [amount, MathLib.MAX_UINT_256, zeroAddress],
                     });
                     break;
                 }
                 default: {
                     if (erc20WrapperTokens[chainId].has(address)) {
+                        const underlying = getUnwrappedToken(address, chainId);
+                        if (underlying == null)
+                            throw Error(`unknown wrapped token: ${address}`);
                         actions.push({
                             type: "erc20WrapperDepositFor",
-                            args: [address, amount],
+                            args: [address, underlying, amount],
                         });
                         break;
                     }
@@ -423,21 +392,17 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Supply": {
-            const { id, assets = 0n, shares = 0n, onBehalf } = operation.args;
-            const { params } = dataBefore.getMarket(id);
-            // Already takes slippage into account.
-            const slippageAmount = shares === 0n
-                ? dataAfter.getPosition(onBehalf, id).supplyShares -
-                    dataBefore.getPosition(onBehalf, id).supplyShares
-                : dataAfter.getHolding(sender, params.loanToken).balance -
-                    dataBefore.getHolding(sender, params.loanToken).balance;
+            const { id, assets = 0n, shares = 0n, onBehalf, slippage = 0n, } = operation.args;
+            const { params, totalSupplyAssets, totalSupplyShares } = dataBefore.getMarket(id);
+            const maxSharePrice = (totalSupplyAssets * MathLib.wToRay(MathLib.WAD + slippage)) /
+                totalSupplyShares;
             actions.push({
                 type: "morphoSupply",
                 args: [
                     params,
                     assets,
                     shares,
-                    slippageAmount,
+                    maxSharePrice,
                     onBehalf,
                     callbackBundle?.actions ?? [],
                 ],
@@ -445,51 +410,39 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Withdraw": {
-            const { id, assets = 0n, shares = 0n, onBehalf, receiver, } = operation.args;
-            const { params } = dataBefore.getMarket(id);
-            // Already takes slippage into account.
-            const slippageAmount = shares === 0n
-                ? dataBefore.getPosition(onBehalf, id).supplyShares -
-                    dataAfter.getPosition(onBehalf, id).supplyShares
-                : dataBefore.getHolding(sender, params.loanToken).balance -
-                    dataAfter.getHolding(sender, params.loanToken).balance;
+            const { id, assets = 0n, shares = 0n, receiver, slippage = 0n, } = operation.args;
+            const { params, totalSupplyAssets, totalSupplyShares } = dataBefore.getMarket(id);
+            const minSharePrice = (totalSupplyAssets * MathLib.wToRay(MathLib.WAD - slippage)) /
+                totalSupplyShares;
             actions.push({
                 type: "morphoWithdraw",
-                args: [params, assets, shares, slippageAmount, receiver],
+                args: [params, assets, shares, minSharePrice, receiver],
             });
             break;
         }
         case "Blue_Borrow": {
-            const { id, assets = 0n, shares = 0n, onBehalf, receiver, } = operation.args;
-            const { params } = dataBefore.getMarket(id);
-            // Already takes slippage into account.
-            const slippageAmount = shares === 0n
-                ? dataAfter.getPosition(onBehalf, id).borrowShares -
-                    dataBefore.getPosition(onBehalf, id).borrowShares
-                : dataAfter.getHolding(sender, params.loanToken).balance -
-                    dataBefore.getHolding(sender, params.loanToken).balance;
+            const { id, assets = 0n, shares = 0n, receiver, slippage = 0n, } = operation.args;
+            const { params, totalBorrowAssets, totalBorrowShares } = dataBefore.getMarket(id);
+            const minSharePrice = (totalBorrowAssets * MathLib.wToRay(MathLib.WAD - slippage)) /
+                totalBorrowShares;
             actions.push({
                 type: "morphoBorrow",
-                args: [params, assets, shares, slippageAmount, receiver],
+                args: [params, assets, shares, minSharePrice, receiver],
             });
             break;
         }
         case "Blue_Repay": {
-            const { id, assets = 0n, shares = 0n, onBehalf } = operation.args;
-            const { params } = dataBefore.getMarket(id);
-            // Already takes slippage into account.
-            const slippageAmount = shares === 0n
-                ? dataBefore.getPosition(onBehalf, id).borrowShares -
-                    dataAfter.getPosition(onBehalf, id).borrowShares
-                : dataBefore.getHolding(sender, params.loanToken).balance -
-                    dataAfter.getHolding(sender, params.loanToken).balance;
+            const { id, assets = 0n, shares = 0n, onBehalf, slippage = 0n, } = operation.args;
+            const { params, totalBorrowAssets, totalBorrowShares } = dataBefore.getMarket(id);
+            const maxSharePrice = (totalBorrowAssets * MathLib.wToRay(MathLib.WAD + slippage)) /
+                totalBorrowShares;
             actions.push({
                 type: "morphoRepay",
                 args: [
                     params,
                     assets,
                     shares,
-                    slippageAmount,
+                    maxSharePrice,
                     onBehalf,
                     callbackBundle?.actions ?? [],
                 ],
@@ -500,9 +453,12 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             const { id, assets, onBehalf } = operation.args;
             const { params } = dataBefore.getMarket(id);
             if (convexWrapperTokens[chainId].has(params.collateralToken)) {
+                const underlying = getUnwrappedToken(address, chainId);
+                if (underlying == null)
+                    throw Error(`unknown wrapped token: ${address}`);
                 actions.push({
                     type: "erc20WrapperDepositFor",
-                    args: [params.collateralToken, assets],
+                    args: [params.collateralToken, underlying, assets],
                 });
                 break;
             }
@@ -522,61 +478,46 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "MetaMorpho_Deposit": {
-            const { assets = 0n, shares = 0n, owner } = operation.args;
-            if (shares === 0n) {
-                // Already takes slippage into account.
-                const expectedShares = dataAfter.getHolding(owner, address).balance -
-                    dataBefore.getHolding(owner, address).balance;
+            const { assets = 0n, shares = 0n, owner, slippage = 0n } = operation.args;
+            const vault = dataBefore.getVault(address);
+            const maxSharePrice = (vault.totalAssets * MathLib.wToRay(MathLib.WAD + slippage)) /
+                vault.totalSupply;
+            if (shares === 0n)
                 actions.push({
                     type: "erc4626Deposit",
-                    args: [address, assets, expectedShares, owner],
+                    args: [address, assets, maxSharePrice, owner],
                 });
-            }
-            else {
-                const vaultConfig = dataBefore.getVault(address);
-                // Already takes slippage into account.
-                const expectedAssets = dataBefore.getHolding(sender, vaultConfig.asset).balance -
-                    dataAfter.getHolding(sender, vaultConfig.asset).balance;
+            else
                 actions.push({
                     type: "erc4626Mint",
-                    args: [address, shares, expectedAssets, owner],
+                    args: [address, shares, maxSharePrice, owner],
                 });
-            }
             break;
         }
         case "MetaMorpho_Withdraw": {
-            const { assets = 0n, shares = 0n, owner, receiver } = operation.args;
-            if (assets > 0n) {
-                // Already takes slippage into account.
-                const expectedShares = dataBefore.getHolding(owner, address).balance -
-                    dataAfter.getHolding(owner, address).balance;
+            const { assets = 0n, shares = 0n, owner, receiver, slippage = 0n, } = operation.args;
+            const vault = dataBefore.getVault(address);
+            const minSharePrice = (vault.totalAssets * MathLib.wToRay(MathLib.WAD - slippage)) /
+                vault.totalSupply;
+            if (assets > 0n)
                 actions.push({
                     type: "erc4626Withdraw",
-                    args: [address, assets, expectedShares, receiver, owner],
+                    args: [address, assets, minSharePrice, receiver, owner],
                 });
-            }
-            else {
-                const vaultConfig = dataBefore.getVault(address);
-                // Already takes slippage into account.
-                const expectedAssets = dataAfter.getHolding(receiver, vaultConfig.asset).balance -
-                    dataBefore.getHolding(receiver, vaultConfig.asset).balance;
+            else
                 actions.push({
                     type: "erc4626Redeem",
-                    args: [address, shares, expectedAssets, receiver, owner],
+                    args: [address, shares, minSharePrice, receiver, owner],
                 });
-            }
             break;
         }
         case "MetaMorpho_PublicReallocate": {
             const { withdrawals, supplyMarketId } = operation.args;
-            if (publicAllocator == null)
-                throw Error(`unknown public allocator on chain ${chainId}`);
             const { fee } = dataBefore.getVault(address).publicAllocatorConfig;
             // Value is already accrued via another native input transfer.
             actions.push({
                 type: "reallocateTo",
                 args: [
-                    publicAllocator,
                     address,
                     fee,
                     withdrawals.map(({ id, assets }) => ({
@@ -591,15 +532,12 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     }
     return {
         dataAfter,
-        value,
         actions,
         requirements,
     };
 };
 export function encodeBundle(operations, startData, supportsSignature = true) {
     const { chainId } = startData;
-    const { bundler } = getChainAddresses(chainId);
-    let value = 0n;
     const actions = [];
     const requirements = {
         signatures: [],
@@ -609,7 +547,6 @@ export function encodeBundle(operations, startData, supportsSignature = true) {
     for (let index = 0; index < operations.length; ++index) {
         const bundle = encodeOperation(operations[index], steps[index], supportsSignature, index);
         steps.push(bundle.dataAfter);
-        value += bundle.value;
         actions.push(...bundle.actions);
         requirements.signatures.push(...bundle.requirements.signatures);
         requirements.txs.push(...bundle.requirements.txs);
@@ -618,14 +555,6 @@ export function encodeBundle(operations, startData, supportsSignature = true) {
         steps,
         actions,
         requirements,
-        tx: () => ({
-            to: bundler,
-            value,
-            data: encodeFunctionData({
-                abi: baseBundlerAbi,
-                functionName: "multicall",
-                args: [actions.map(BundlerAction.encode)],
-            }),
-        }),
+        tx: () => BundlerAction.encodeBundle(chainId, actions),
     };
 }

package/lib/errors.d.ts

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

package/lib/errors.js

@@ -21,4 +21,10 @@ export var BundlerErrors;
         }
     }
     BundlerErrors.MissingSignature = MissingSignature;
+    class UnexpectedAction extends Error {
+        constructor(type, chainId) {
+            super(`unexpected action "${type}" on chain "${chainId}"`);
+        }
+    }
+    BundlerErrors.UnexpectedAction = UnexpectedAction;
 })(BundlerErrors || (BundlerErrors = {}));