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

package/lib/ActionBundle.d.ts

@@ -0,0 +1,35 @@
+import type { SimulationResult } from "@morpho-org/simulation-sdk";
+import type { Account, Address, Chain, Client, Hex, Transport } from "viem";
+import type { Action, SignatureRequirement, TransactionRequirement } from "./types/index.js";
+export declare class ActionBundleRequirements<TR extends {
+    tx: {
+        to: Address;
+        data: Hex;
+    };
+} = TransactionRequirement, SR extends SignatureRequirement = SignatureRequirement> {
+    readonly txs: TR[];
+    readonly signatures: SR[];
+    constructor(txs?: TR[], signatures?: SR[]);
+    sign(client: Client<Transport, Chain | undefined, Account>): Promise<Hex[]>;
+    sign(client: Client, account: Account): Promise<Hex[]>;
+}
+export declare class ActionBundle<TR extends {
+    tx: {
+        to: Address;
+        data: Hex;
+    };
+} = TransactionRequirement, SR extends SignatureRequirement = SignatureRequirement> {
+    readonly steps: SimulationResult;
+    readonly actions: Action[];
+    readonly requirements: ActionBundleRequirements<TR, SR>;
+    constructor(steps: SimulationResult, actions?: Action[], requirements?: ActionBundleRequirements<TR, SR>);
+    tx(): {
+        to: `0x${string}`;
+        value: bigint;
+        data: `0x${string}`;
+    };
+    txs(): {
+        to: Address;
+        data: Hex;
+    }[];
+}

package/lib/ActionBundle.js

@@ -0,0 +1,28 @@
+import { BundlerAction } from "./BundlerAction.js";
+export class ActionBundleRequirements {
+    txs;
+    signatures;
+    constructor(txs = [], signatures = []) {
+        this.txs = txs;
+        this.signatures = signatures;
+    }
+    sign(client, account = client.account) {
+        return Promise.all(this.signatures.map((requirement) => requirement.sign(client, account)));
+    }
+}
+export class ActionBundle {
+    steps;
+    actions;
+    requirements;
+    constructor(steps, actions = [], requirements = new ActionBundleRequirements()) {
+        this.steps = steps;
+        this.actions = actions;
+        this.requirements = requirements;
+    }
+    tx() {
+        return BundlerAction.encodeBundle(this.steps[0].chainId, this.actions);
+    }
+    txs() {
+        return this.requirements.txs.map(({ tx }) => tx).concat([this.tx()]);
+    }
+}

package/lib/BundlerAction.d.ts

@@ -9,7 +9,7 @@ export interface BundlerCall {
     callbackHash: Hex;
 }
 /**
- * Namespace to easily encode calls to the Bundler contract, using ethers.
+ * Namespace to easily encode calls to the Bundler contract, using viem.
  */
 export declare namespace BundlerAction {
     function encodeBundle(chainId: ChainId, actions: Action[]): {
@@ -33,7 +33,7 @@ export declare namespace BundlerAction {
      * @param recipient The address to send tokens to.
      * @param amount The amount of tokens to send.
      */
-    function erc20Transfer(chainId: ChainId, asset: Address, recipient: Address, amount: bigint): BundlerCall[];
+    function erc20Transfer(chainId: ChainId, asset: Address, recipient: Address, amount: bigint, adapter?: Address): BundlerCall[];
     /**
      * Encodes a call to the Adapter to transfer ERC20 tokens from the sender to the Bundler.
      * @param chainId The chain id for which to encode the call.
@@ -340,7 +340,7 @@ export declare namespace BundlerAction {
      * @param manager The address of the manager to approve. Defaults to the chain's bundler3 AaveV3OptimizerMigrationAdapter.
      * @param skipRevert Whether to allow the signature to revert without making the whole multicall revert.
      */
-    function aaveV3OptimizerApproveManagerWithSig(chainId: ChainId, owner: Address, isApproved: boolean, nonce: bigint, deadline: bigint, signature: Hex, manager?: Address, skipRevert?: boolean): BundlerCall[];
+    function aaveV3OptimizerApproveManagerWithSig(chainId: ChainId, aaveV3Optimizer: Address, owner: Address, isApproved: boolean, nonce: bigint, deadline: bigint, signature: Hex, manager?: Address, skipRevert?: boolean): BundlerCall[];
     /**
      * Encodes a call to the Adapter to repay a debt on CompoundV2.
      * @param chainId The chain id for which to encode the call.
@@ -348,7 +348,7 @@ export declare namespace BundlerAction {
      * @param amount The amount of debt to repay.
      * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
      */
-    function compoundV2Repay(chainId: ChainId, cToken: Address, amount: bigint, recipient?: Address): BundlerCall[];
+    function compoundV2Repay(chainId: ChainId, cToken: Address, amount: bigint, isEth: boolean, onBehalf: Address): BundlerCall[];
     /**
      * Encodes a call to the Adapter to withdraw collateral from CompoundV2.
      * @param chainId The chain id for which to encode the call.
@@ -356,7 +356,7 @@ export declare namespace BundlerAction {
      * @param amount The amount to withdraw.
      * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
      */
-    function compoundV2Redeem(chainId: ChainId, cToken: Address, amount: bigint, recipient?: Address): BundlerCall[];
+    function compoundV2Redeem(chainId: ChainId, cToken: Address, amount: bigint, isEth: boolean, recipient?: Address): BundlerCall[];
     /**
      * Encodes a call to the Adapter to repay a debt on CompoundV3.
      * @param chainId The chain id for which to encode the call.
@@ -388,4 +388,3 @@ export declare namespace BundlerAction {
      */
     function compoundV3AllowBySig(chainId: ChainId, instance: Address, owner: Address, isAllowed: boolean, nonce: bigint, expiry: bigint, signature: Hex, manager?: Address, skipRevert?: boolean): BundlerCall[];
 }
-export default BundlerAction;

package/lib/BundlerAction.js

@@ -1,18 +1,17 @@
 import { aaveV2MigrationAdapterAbi, aaveV3MigrationAdapterAbi, aaveV3OptimizerMigrationAdapterAbi, bundler3Abi, compoundV2MigrationAdapterAbi, compoundV3MigrationAdapterAbi, coreAdapterAbi, erc20WrapperAdapterAbi, ethereumGeneralAdapter1Abi, generalAdapter1Abi, universalRewardsDistributorAbi, } from "./abis.js";
 import { getChainAddresses, } from "@morpho-org/blue-sdk";
 import { blueAbi, erc2612Abi, permit2Abi, publicAllocatorAbi, } from "@morpho-org/blue-sdk-viem";
-import { encodeAbiParameters, encodeFunctionData, keccak256, maxUint256, parseSignature, toFunctionSelector, zeroHash, } from "viem";
+import { encodeAbiParameters, encodeFunctionData, keccak256, maxUint256, parseSignature, zeroHash, } from "viem";
 import { BundlerErrors } from "./errors.js";
-const reenterSelectorHash = keccak256(toFunctionSelector(bundler3Abi.find((item) => item.type === "function" && item.name === "reenter")));
+const reenterAbiInputs = bundler3Abi.find((item) => item.name === "reenter").inputs;
 /**
- * Namespace to easily encode calls to the Bundler contract, using ethers.
+ * Namespace to easily encode calls to the Bundler contract, using viem.
  */
 export var BundlerAction;
 (function (BundlerAction) {
     function encodeBundle(chainId, actions) {
         const { bundler3: { bundler3, generalAdapter1 }, } = getChainAddresses(chainId);
         let value = 0n;
-        let generalAdapter1Value = 0n;
         for (const { type, args } of actions) {
             if (type !== "nativeTransfer")
                 continue;
@@ -21,18 +20,8 @@ export var BundlerAction;
                 owner !== generalAdapter1 &&
                 (recipient === bundler3 || recipient === generalAdapter1))
                 value += amount;
-            if (owner !== generalAdapter1 && recipient === generalAdapter1)
-                generalAdapter1Value += amount;
         }
         const encodedActions = actions.flatMap(BundlerAction.encode.bind(null, chainId));
-        if (generalAdapter1Value > 0n)
-            encodedActions.unshift({
-                to: generalAdapter1,
-                value: generalAdapter1Value,
-                data: "0x",
-                skipRevert: false,
-                callbackHash: zeroHash,
-            });
         return {
             to: bundler3,
             value,
@@ -178,10 +167,10 @@ export var BundlerAction;
                 return BundlerAction.aaveV3OptimizerWithdrawCollateral(chainId, ...args);
             }
             case "aaveV3OptimizerApproveManagerWithSig": {
-                const [owner, isApproved, nonce, deadline, signature, manager, skipRevert,] = args;
+                const [aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert,] = args;
                 if (signature == null)
                     throw new BundlerErrors.MissingSignature();
-                return BundlerAction.aaveV3OptimizerApproveManagerWithSig(chainId, owner, isApproved, nonce, deadline, signature, manager, skipRevert);
+                return BundlerAction.aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert);
             }
             /* CompoundV2 */
             case "compoundV2Repay": {
@@ -251,11 +240,12 @@ export var BundlerAction;
      * @param recipient The address to send tokens to.
      * @param amount The amount of tokens to send.
      */
-    function erc20Transfer(chainId, asset, recipient, amount) {
+    function erc20Transfer(chainId, asset, recipient, amount, adapter) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
+        adapter ??= generalAdapter1;
         return [
             {
-                to: generalAdapter1,
+                to: adapter,
                 data: encodeFunctionData({
                     abi: coreAdapterAbi,
                     functionName: "erc20Transfer",
@@ -672,7 +662,7 @@ export var BundlerAction;
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
-            ? encodeAbiParameters(bundler3Abi.find((item) => item.name === "reenter").inputs, [callbackCalls])
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
             : "0x";
         return [
             {
@@ -701,7 +691,7 @@ export var BundlerAction;
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
-            ? encodeAbiParameters(bundler3Abi.find((item) => item.name === "reenter").inputs, [callbackCalls])
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
             : "0x";
         return [
             {
@@ -758,7 +748,7 @@ export var BundlerAction;
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         const reenter = callbackCalls.length > 0;
         const reenterData = reenter
-            ? encodeAbiParameters(bundler3Abi.find((item) => item.name === "reenter").inputs, [callbackCalls])
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
             : "0x";
         return [
             {
@@ -834,6 +824,10 @@ export var BundlerAction;
      */
     function morphoFlashLoan(chainId, asset, amount, callbackCalls) {
         const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
+        const reenter = callbackCalls.length > 0;
+        const reenterData = reenter
+            ? encodeAbiParameters(reenterAbiInputs, [callbackCalls])
+            : "0x";
         return [
             {
                 to: generalAdapter1,
@@ -852,7 +846,7 @@ export var BundlerAction;
                 }),
                 value: 0n,
                 skipRevert: false,
-                callbackHash: keccak256(`${generalAdapter1}${reenterSelectorHash}`),
+                callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }
@@ -867,6 +861,8 @@ export var BundlerAction;
      */
     function publicAllocatorReallocateTo(chainId, vault, fee, withdrawals, supplyMarketParams) {
         const { publicAllocator } = getChainAddresses(chainId);
+        if (publicAllocator == null)
+            throw new BundlerErrors.UnexpectedAction("reallocateTo", chainId);
         return [
             {
                 to: publicAllocator,
@@ -1239,9 +1235,9 @@ export var BundlerAction;
      * @param manager The address of the manager to approve. Defaults to the chain's bundler3 AaveV3OptimizerMigrationAdapter.
      * @param skipRevert Whether to allow the signature to revert without making the whole multicall revert.
      */
-    function aaveV3OptimizerApproveManagerWithSig(chainId, owner, isApproved, nonce, deadline, signature, manager, skipRevert = true) {
-        const { aaveV3Optimizer, bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
-        if (aaveV3Optimizer == null || aaveV3OptimizerMigrationAdapter == null)
+    function aaveV3OptimizerApproveManagerWithSig(chainId, aaveV3Optimizer, owner, isApproved, nonce, deadline, signature, manager, skipRevert = true) {
+        const { bundler3: { aaveV3OptimizerMigrationAdapter }, } = getChainAddresses(chainId);
+        if (aaveV3OptimizerMigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("aaveV3OptimizerApproveManagerWithSig", chainId);
         manager ??= aaveV3OptimizerMigrationAdapter;
         const { r, s, yParity } = parseSignature(signature);
@@ -1299,12 +1295,10 @@ export var BundlerAction;
      * @param amount The amount of debt to repay.
      * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
      */
-    function compoundV2Repay(chainId, cToken, amount, recipient) {
-        const { cEth, bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
-        if (cEth == null || compoundV2MigrationAdapter == null)
+    function compoundV2Repay(chainId, cToken, amount, isEth, onBehalf) {
+        const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
+        if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
-        const isEth = cToken === cEth;
-        recipient ??= compoundV2MigrationAdapter;
         return [
             {
                 to: compoundV2MigrationAdapter,
@@ -1312,12 +1306,12 @@ export var BundlerAction;
                     ? encodeFunctionData({
                         abi: compoundV2MigrationAdapterAbi,
                         functionName: "compoundV2RepayEth",
-                        args: [amount, recipient],
+                        args: [amount, onBehalf],
                     })
                     : encodeFunctionData({
                         abi: compoundV2MigrationAdapterAbi,
                         functionName: "compoundV2RepayErc20",
-                        args: [cToken, amount, recipient],
+                        args: [cToken, amount, onBehalf],
                     }),
                 value: isEth ? amount : 0n,
                 skipRevert: false,
@@ -1333,11 +1327,10 @@ export var BundlerAction;
      * @param amount The amount to withdraw.
      * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
      */
-    function compoundV2Redeem(chainId, cToken, amount, recipient) {
-        const { cEth, bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
-        if (cEth == null || compoundV2MigrationAdapter == null)
+    function compoundV2Redeem(chainId, cToken, amount, isEth, recipient) {
+        const { bundler3: { compoundV2MigrationAdapter }, } = getChainAddresses(chainId);
+        if (compoundV2MigrationAdapter == null)
             throw new BundlerErrors.UnexpectedAction("compoundV2Repay", chainId);
-        const isEth = cToken === cEth;
         recipient ??= compoundV2MigrationAdapter;
         return [
             {
@@ -1466,4 +1459,3 @@ export var BundlerAction;
     }
     BundlerAction.compoundV3AllowBySig = compoundV3AllowBySig;
 })(BundlerAction || (BundlerAction = {}));
-export default BundlerAction;

package/lib/actions.d.ts

@@ -1,14 +1,12 @@
 import { type Address } from "viem";
-import { ChainId } from "@morpho-org/blue-sdk";
 import { type MaybeDraft, type SimulationState } from "@morpho-org/simulation-sdk";
-import type { Action, ActionBundle, BundlerOperation, TransactionRequirement } from "./types/index.js";
-export declare const APPROVE_ONLY_ONCE_TOKENS: Partial<Record<ChainId, Address[]>>;
+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[];
-    requirements: {
-        signatures: import("./types/actions.js").SignatureRequirement[];
-        txs: TransactionRequirement[];
-    };
+    requirements: ActionBundleRequirements<TransactionRequirement, import("./types/actions.js").SignatureRequirement>;
 };
-export declare function encodeBundle(operations: BundlerOperation[], startData: MaybeDraft<SimulationState>, supportsSignature?: boolean): ActionBundle;
+export declare function encodeBundle(operations: BundlerOperation[], startData: MaybeDraft<SimulationState>, supportsSignature?: boolean): ActionBundle<TransactionRequirement, import("./types/actions.js").SignatureRequirement>;

package/lib/actions.js

@@ -1,17 +1,17 @@
 import { encodeFunctionData, erc20Abi, maxUint256, verifyTypedData, zeroAddress, } from "viem";
-import { ChainId, MathLib, NATIVE_ADDRESS, convexWrapperTokens, erc20WrapperTokens, getChainAddresses, getUnwrappedToken, } from "@morpho-org/blue-sdk";
+import { ChainId, DEFAULT_SLIPPAGE_TOLERANCE, 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 { 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 BundlerAction from "./BundlerAction.js";
+import { ActionBundle, ActionBundleRequirements } from "./ActionBundle.js";
 export const APPROVE_ONLY_ONCE_TOKENS = {
     [ChainId.EthMainnet]: [
         "0xdAC17F958D2ee523a2206206994597C13D831ec7", // USDT
         "0xD533a949740bb3306d119CC777fa900bA034cd52", // CRV
     ],
 };
-const MAX_TOKEN_APPROVALS = {
+export const MAX_TOKEN_APPROVALS = {
     [ChainId.EthMainnet]: {
         "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": MathLib.maxUint(96), // UNI --> see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L154
     },
@@ -67,10 +67,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     const deadline = Time.timestamp() + Time.s.from.h(24n);
     const { morpho, bundler3: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
     const actions = [];
-    const requirements = {
-        signatures: [],
-        txs: [],
-    };
+    const requirements = new ActionBundleRequirements();
     let callbackBundle;
     const callback = getValue(operation.args, "callback");
     const simulatedOperation = {
@@ -79,7 +76,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             ...operation.args,
             ...(callback && {
                 callback: (dataBefore) => {
-                    callbackBundle = encodeBundle(callback, dataBefore, supportsSignature);
+                    callbackBundle = encodeBundle(callback, getCurrent(dataBefore), supportsSignature);
                     return callback;
                 },
             }),
@@ -94,13 +91,13 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     const { sender, address } = operation;
     switch (operation.type) {
         case "Blue_SetAuthorization": {
-            const { owner } = operation.args;
+            const { owner, isAuthorized, authorized } = operation.args;
             if (supportsSignature) {
                 const ownerData = dataBefore.getUser(owner);
                 const authorization = {
                     authorizer: owner,
-                    authorized: generalAdapter1,
-                    isAuthorized: true,
+                    authorized,
+                    isAuthorized,
                     deadline,
                     nonce: ownerData.morphoNonce,
                 };
@@ -133,13 +130,13 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             // Signatures are not supported, fallback to standard approval.
             requirements.txs.push({
                 type: "morphoSetAuthorization",
-                args: [generalAdapter1, true],
+                args: [authorized, isAuthorized],
                 tx: {
                     to: morpho,
                     data: encodeFunctionData({
                         abi: blueAbi,
                         functionName: "setAuthorization",
-                        args: [generalAdapter1, true],
+                        args: [authorized, isAuthorized],
                     }),
                 },
             });
@@ -346,7 +343,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     break;
                 }
                 default: {
-                    if (erc20WrapperTokens[chainId].has(address)) {
+                    if (erc20WrapperTokens[chainId]?.has(address)) {
                         const underlying = getUnwrappedToken(address, chainId);
                         if (underlying == null)
                             throw Error(`unknown wrapped token: ${address}`);
@@ -357,7 +354,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                         break;
                     }
                     // Convex token wrapping is executed onchain along with supplyCollateral, via depositFor.
-                    if (!convexWrapperTokens[chainId].has(address))
+                    if (!convexWrapperTokens[chainId]?.has(address))
                         throw Error(`unexpected token wrap: ${address}`);
                 }
             }
@@ -381,7 +378,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                     break;
                 }
                 default: {
-                    if (!erc20WrapperTokens[chainId].has(address))
+                    if (!erc20WrapperTokens[chainId]?.has(address))
                         throw Error(`unexpected token unwrap: ${address}`);
                     actions.push({
                         type: "erc20WrapperWithdrawTo",
@@ -392,14 +389,13 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Supply": {
-            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;
+            const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            const market = dataBefore.getMarket(id);
+            const maxSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoSupply",
                 args: [
-                    params,
+                    market.params,
                     assets,
                     shares,
                     maxSharePrice,
@@ -410,36 +406,33 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Withdraw": {
-            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;
+            const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            const market = dataBefore.getMarket(id);
+            const minSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD - slippage));
             actions.push({
                 type: "morphoWithdraw",
-                args: [params, assets, shares, minSharePrice, receiver],
+                args: [market.params, assets, shares, minSharePrice, receiver],
             });
             break;
         }
         case "Blue_Borrow": {
-            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;
+            const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            const market = dataBefore.getMarket(id);
+            const minSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD - slippage));
             actions.push({
                 type: "morphoBorrow",
-                args: [params, assets, shares, minSharePrice, receiver],
+                args: [market.params, assets, shares, minSharePrice, receiver],
             });
             break;
         }
         case "Blue_Repay": {
-            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;
+            const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
+            const market = dataBefore.getMarket(id);
+            const maxSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoRepay",
                 args: [
-                    params,
+                    market.params,
                     assets,
                     shares,
                     maxSharePrice,
@@ -452,7 +445,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         case "Blue_SupplyCollateral": {
             const { id, assets, onBehalf } = operation.args;
             const { params } = dataBefore.getMarket(id);
-            if (convexWrapperTokens[chainId].has(params.collateralToken)) {
+            if (convexWrapperTokens[chainId]?.has(params.collateralToken)) {
                 const underlying = getUnwrappedToken(address, chainId);
                 if (underlying == null)
                     throw Error(`unknown wrapped token: ${address}`);
@@ -478,10 +471,9 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "MetaMorpho_Deposit": {
-            const { assets = 0n, shares = 0n, owner, slippage = 0n } = operation.args;
+            const { assets = 0n, shares = 0n, owner, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
             const vault = dataBefore.getVault(address);
-            const maxSharePrice = (vault.totalAssets * MathLib.wToRay(MathLib.WAD + slippage)) /
-                vault.totalSupply;
+            const maxSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD + slippage));
             if (shares === 0n)
                 actions.push({
                     type: "erc4626Deposit",
@@ -495,10 +487,9 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "MetaMorpho_Withdraw": {
-            const { assets = 0n, shares = 0n, owner, receiver, slippage = 0n, } = operation.args;
+            const { assets = 0n, shares = 0n, owner, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
             const vault = dataBefore.getVault(address);
-            const minSharePrice = (vault.totalAssets * MathLib.wToRay(MathLib.WAD - slippage)) /
-                vault.totalSupply;
+            const minSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD - slippage));
             if (assets > 0n)
                 actions.push({
                     type: "erc4626Withdraw",
@@ -537,24 +528,13 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
     };
 };
 export function encodeBundle(operations, startData, supportsSignature = true) {
-    const { chainId } = startData;
-    const actions = [];
-    const requirements = {
-        signatures: [],
-        txs: [],
-    };
-    const steps = [startData];
+    const bundle = new ActionBundle([startData]);
     for (let index = 0; index < operations.length; ++index) {
-        const bundle = encodeOperation(operations[index], steps[index], supportsSignature, index);
-        steps.push(bundle.dataAfter);
-        actions.push(...bundle.actions);
-        requirements.signatures.push(...bundle.requirements.signatures);
-        requirements.txs.push(...bundle.requirements.txs);
+        const { dataAfter, actions, requirements } = encodeOperation(operations[index], bundle.steps[index], supportsSignature, index);
+        bundle.steps.push(dataAfter);
+        bundle.actions.push(...actions);
+        bundle.requirements.signatures.push(...requirements.signatures);
+        bundle.requirements.txs.push(...requirements.txs);
     }
-    return {
-        steps,
-        actions,
-        requirements,
-        tx: () => BundlerAction.encodeBundle(chainId, actions),
-    };
+    return bundle;
 }

package/lib/bundle.d.ts

@@ -0,0 +1,12 @@
+import type { SimulationState } from "@morpho-org/simulation-sdk";
+import type { Address } from "viem";
+import { type BundlingOptions } from "./operations.js";
+import type { InputBundlerOperation } from "./types/index.js";
+export declare const setupBundle: (inputOperations: InputBundlerOperation[], startData: SimulationState, receiver: Address, { supportsSignature, unwrapTokens, unwrapSlippage, ...options }?: BundlingOptions & {
+    supportsSignature?: boolean;
+    unwrapTokens?: Set<Address>;
+    unwrapSlippage?: bigint;
+}) => {
+    operations: import("./types/operations.js").BundlerOperation[];
+    bundle: import("./ActionBundle.js").ActionBundle<import("./types/actions.js").TransactionRequirement, import("./types/actions.js").SignatureRequirement>;
+};

package/lib/bundle.js

@@ -0,0 +1,11 @@
+import { encodeBundle } from "./actions.js";
+import { finalizeBundle, populateBundle, } from "./operations.js";
+export const setupBundle = (inputOperations, startData, receiver, { supportsSignature, unwrapTokens, unwrapSlippage, ...options } = {}) => {
+    let { operations } = populateBundle(inputOperations, startData, options);
+    operations = finalizeBundle(operations, startData, receiver, unwrapTokens, unwrapSlippage);
+    const bundle = encodeBundle(operations, startData, supportsSignature);
+    return {
+        operations,
+        bundle,
+    };
+};

package/lib/index.d.ts

@@ -2,3 +2,7 @@ export * from "./actions.js";
 export * from "./operations.js";
 export * from "./errors.js";
 export * from "./types/index.js";
+export * from "./BundlerAction.js";
+export * from "./bundle.js";
+export * from "./ActionBundle.js";
+export * from "./abis.js";

package/lib/index.js

@@ -2,3 +2,7 @@ export * from "./actions.js";
 export * from "./operations.js";
 export * from "./errors.js";
 export * from "./types/index.js";
+export * from "./BundlerAction.js";
+export * from "./bundle.js";
+export * from "./ActionBundle.js";
+export * from "./abis.js";

package/lib/operations.js

@@ -45,8 +45,8 @@ export const populateInputTransfer = ({ address, args: { amount, from } }, data,
             hasSimplePermit);
     const useSimpleTransfer = permit2 == null ||
         // Token is permissioned and Permit2 may not be authorized so Permit2 cannot be used.
-        permissionedWrapperTokens[data.chainId].has(address) ||
-        permissionedBackedTokens[data.chainId].has(address);
+        !!permissionedWrapperTokens[data.chainId]?.has(address) ||
+        !!permissionedBackedTokens[data.chainId]?.has(address);
     if (useSimplePermit)
         operations.push({
             type: "Erc20_Permit",
@@ -138,7 +138,7 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
         ? data.getWrappedToken(inputOperation.address)
         : undefined;
     const isErc20Wrapper = !!wrappedToken &&
-        erc20WrapperTokens[data.chainId].has(wrappedToken.address);
+        !!erc20WrapperTokens[data.chainId]?.has(wrappedToken.address);
     // Transform input operation to act on behalf of the sender, via the bundler.
     const mainOperation = produceImmutable(inputOperation, (draft) => {
         draft.sender = generalAdapter1;
@@ -179,7 +179,8 @@ export const populateSubBundle = (inputOperation, data, options = {}) => {
             address: morpho,
             args: {
                 owner: sender,
-                isBundlerAuthorized: true,
+                isAuthorized: true,
+                authorized: generalAdapter1,
             },
         });
     // Reallocate liquidity if necessary.
@@ -394,7 +395,7 @@ export const finalizeBundle = (operations, startData, receiver, unwrapTokens = n
                 const { address, sender, args: { amount, from, to }, } = operation;
                 if (from !== generalAdapter1 &&
                     to === generalAdapter1 &&
-                    !erc20WrapperTokens[startData.chainId].has(address)) {
+                    !erc20WrapperTokens[startData.chainId]?.has(address)) {
                     const duplicateTransfer = inputTransfers.find((transfer) => transfer.address === address &&
                         transfer.sender === sender &&
                         transfer.args.from === from);

package/lib/types/actions.d.ts

@@ -1,6 +1,5 @@
 import type { Account, Chain, Client, Hex, TransactionRequest, Transport } from "viem";
 import type { Address, InputMarketParams } from "@morpho-org/blue-sdk";
-import type { SimulationResult } from "@morpho-org/simulation-sdk";
 export interface Authorization {
     authorizer: Address;
     authorized: Address;
@@ -25,7 +24,12 @@ export interface Permit2PermitSingle {
 }
 export interface ActionArgs {
     nativeTransfer: [owner: Address, recipient: Address, amount: bigint];
-    erc20Transfer: [asset: Address, recipient: Address, amount: bigint];
+    erc20Transfer: [
+        asset: Address,
+        recipient: Address,
+        amount: bigint,
+        adapter?: Address
+    ];
     erc20TransferFrom: [asset: Address, amount: bigint, recipient?: Address];
     erc20WrapperDepositFor: [
         wrapper: Address,
@@ -196,6 +200,7 @@ export interface ActionArgs {
         recipient?: Address
     ];
     aaveV3OptimizerApproveManagerWithSig: [
+        aaveV3Optimizer: Address,
         owner: Address,
         isApproved: boolean,
         nonce: bigint,
@@ -204,8 +209,18 @@ export interface ActionArgs {
         manager?: Address,
         skipRevert?: boolean
     ];
-    compoundV2Repay: [cToken: Address, amount: bigint, onBehalf: Address];
-    compoundV2Redeem: [cToken: Address, amount: bigint, recipient?: Address];
+    compoundV2Repay: [
+        cToken: Address,
+        amount: bigint,
+        isEth: boolean,
+        onBehalf: Address
+    ];
+    compoundV2Redeem: [
+        cToken: Address,
+        amount: bigint,
+        isEth: boolean,
+        recipient?: Address
+    ];
     compoundV3Repay: [instance: Address, amount: bigint, onBehalf: Address];
     compoundV3WithdrawFrom: [
         instance: Address,
@@ -256,15 +271,3 @@ export interface SignatureRequirement {
     action: Action;
     sign: SignatureRequirementFunction;
 }
-export interface ActionBundle {
-    steps: SimulationResult;
-    actions: Action[];
-    requirements: {
-        signatures: SignatureRequirement[];
-        txs: TransactionRequirement[];
-    };
-    tx: () => TransactionRequest & {
-        to: Address;
-        data: Hex;
-    };
-}

package/lib/types/operations.d.ts

@@ -21,7 +21,7 @@ export type CallbackBundlerOperations = {
     [OperationType in CallbackBundlerOperationType]: WithOperationArgs<OperationType, BundlerOperationArgs>;
 };
 export type CallbackBundlerOperation = CallbackBundlerOperations[CallbackBundlerOperationType];
-export declare const BLUE_INPUT_OPERATIONS: readonly ["Blue_Borrow", "Blue_Repay", "Blue_Supply", "Blue_SupplyCollateral", "Blue_Withdraw", "Blue_WithdrawCollateral"];
+export declare const BLUE_INPUT_OPERATIONS: readonly ["Blue_Borrow", "Blue_Repay", "Blue_Supply", "Blue_SupplyCollateral", "Blue_Withdraw", "Blue_WithdrawCollateral", "Blue_SetAuthorization"];
 export type BlueInputBundlerOperationType = (typeof BLUE_INPUT_OPERATIONS)[number];
 export interface BlueInputBundlerOperationArgs extends Omit<OperationArgs, (typeof CALLBACK_OPERATIONS)[number]> {
     Blue_SupplyCollateral: Omit<BlueOperationArgs["Blue_SupplyCollateral"], "callback"> & {

package/lib/types/operations.js

@@ -24,6 +24,7 @@ export const BLUE_INPUT_OPERATIONS = [
     "Blue_SupplyCollateral",
     "Blue_Withdraw",
     "Blue_WithdrawCollateral",
+    "Blue_SetAuthorization",
 ];
 export const METAMORPHO_INPUT_OPERATIONS = [
     "MetaMorpho_Deposit",

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.0.0-next.1",
+  "version": "3.0.0-next.10",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -20,10 +20,10 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk-viem": "^3.0.0-next.1",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.1",
-    "@morpho-org/blue-sdk": "^3.0.0-next.3",
-    "@morpho-org/morpho-ts": "^2.1.0"
+    "@morpho-org/blue-sdk": "^2.3.2",
+    "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/morpho-ts": "^2.2.0",
+    "@morpho-org/simulation-sdk": "^2.1.4"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -35,14 +35,14 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/blue-sdk": "^3.0.0-next.3",
-    "@morpho-org/blue-sdk-viem": "^3.0.0-next.1",
+    "@morpho-org/blue-sdk": "^2.3.2",
+    "@morpho-org/blue-sdk-viem": "^2.2.2",
     "@morpho-org/morpho-test": "^2.2.1",
-    "@morpho-org/morpho-ts": "^2.1.0",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.1",
+    "@morpho-org/morpho-ts": "^2.2.0",
+    "@morpho-org/simulation-sdk": "^2.1.4",
     "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
-    "@morpho-org/test": "^2.0.6",
-    "@morpho-org/test-wagmi": "^2.0.4"
+    "@morpho-org/test-wagmi": "^2.0.4",
+    "@morpho-org/test": "^2.1.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",