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

package/lib/BundlerAction.d.ts

@@ -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.

package/lib/BundlerAction.js

@@ -178,10 +178,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": {
@@ -867,6 +867,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 +1241,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 +1301,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 +1312,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 +1333,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 [
             {

package/lib/actions.d.ts

@@ -1,8 +1,8 @@
 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[]>>;
+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

@@ -11,7 +11,7 @@ export const APPROVE_ONLY_ONCE_TOKENS = {
         "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
     },
@@ -346,7 +346,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 +357,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 +381,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",
@@ -393,13 +393,12 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         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 market = dataBefore.getMarket(id);
+            const maxSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoSupply",
                 args: [
-                    params,
+                    market.params,
                     assets,
                     shares,
                     maxSharePrice,
@@ -411,35 +410,32 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         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 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 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 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 +448,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}`);
@@ -480,8 +476,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         case "MetaMorpho_Deposit": {
             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;
+            const maxSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD + slippage));
             if (shares === 0n)
                 actions.push({
                     type: "erc4626Deposit",
@@ -497,8 +492,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         case "MetaMorpho_Withdraw": {
             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;
+            const minSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD - slippage));
             if (assets > 0n)
                 actions.push({
                     type: "erc4626Withdraw",

package/lib/index.d.ts

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

package/lib/index.js

@@ -2,3 +2,4 @@ export * from "./actions.js";
 export * from "./operations.js";
 export * from "./errors.js";
 export * from "./types/index.js";
+export * from "./BundlerAction.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;
@@ -394,7 +394,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

@@ -196,6 +196,7 @@ export interface ActionArgs {
         recipient?: Address
     ];
     aaveV3OptimizerApproveManagerWithSig: [
+        aaveV3Optimizer: Address,
         owner: Address,
         isApproved: boolean,
         nonce: bigint,
@@ -204,8 +205,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,

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.3",
   "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": "^3.0.0-next.5",
+    "@morpho-org/blue-sdk-viem": "^3.0.0-next.2",
+    "@morpho-org/simulation-sdk": "^3.0.0-next.2",
+    "@morpho-org/morpho-ts": "^2.2.0-next.0"
   },
   "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/morpho-test": "^2.2.1",
-    "@morpho-org/morpho-ts": "^2.1.0",
-    "@morpho-org/simulation-sdk": "^3.0.0-next.1",
-    "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
+    "@morpho-org/blue-sdk": "^3.0.0-next.5",
+    "@morpho-org/blue-sdk-viem": "^3.0.0-next.2",
+    "@morpho-org/morpho-test": "^2.3.0-next.0",
+    "@morpho-org/simulation-sdk": "^3.0.0-next.2",
+    "@morpho-org/morpho-ts": "^2.2.0-next.0",
     "@morpho-org/test": "^2.0.6",
-    "@morpho-org/test-wagmi": "^2.0.4"
+    "@morpho-org/test-wagmi": "^2.0.4",
+    "@morpho-org/simulation-sdk-wagmi": "^3.0.0-next.1"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",