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

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
@@ -65,7 +66,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, bundler3: { generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
+    const { morpho, bundler3: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
     const actions = [];
     const requirements = new ActionBundleRequirements();
     let callbackBundle;
@@ -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 = {
@@ -158,6 +162,10 @@ 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
                     ? {
@@ -168,7 +176,6 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                             deadline,
                             true,
                             null,
-                            spender,
                             operation.skipRevert,
                         ],
                     }
@@ -180,7 +187,6 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                             amount,
                             deadline,
                             null,
-                            spender,
                             operation.skipRevert,
                         ],
                     };
@@ -310,7 +316,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             if (from === generalAdapter1) {
                 actions.push({
                     type: "erc20Transfer",
-                    args: [address, to, amount, undefined, operation.skipRevert],
+                    args: [address, to, amount, generalAdapter1, operation.skipRevert],
                 });
                 break;
             }
@@ -342,14 +348,14 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case wNative: {
                     actions.push({
                         type: "wrapNative",
-                        args: [amount, undefined, operation.skipRevert],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case wstEth: {
                     actions.push({
                         type: "wrapStEth",
-                        args: [amount, undefined, operation.skipRevert],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
@@ -360,7 +366,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                             amount,
                             MathLib.MAX_UINT_256,
                             zeroAddress,
-                            undefined,
+                            generalAdapter1,
                             operation.skipRevert,
                         ],
                     });
@@ -390,14 +396,14 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 case wNative: {
                     actions.push({
                         type: "unwrapNative",
-                        args: [amount, undefined, operation.skipRevert],
+                        args: [amount, generalAdapter1, operation.skipRevert],
                     });
                     break;
                 }
                 case wstEth: {
                     actions.push({
                         type: "unwrapStEth",
-                        args: [amount, undefined, operation.skipRevert],
+                        args: [amount, generalAdapter1, 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

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

package/lib/types/actions.d.ts

@@ -32,13 +32,13 @@ export interface ActionArgs {
         asset: Address,
         recipient: Address,
         amount: bigint,
-        adapter?: Address,
+        adapter: Address,
         skipRevert?: boolean
     ];
     erc20TransferFrom: [
         asset: Address,
         amount: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     erc20WrapperDepositFor: [
@@ -59,7 +59,6 @@ export interface ActionArgs {
         amount: bigint,
         deadline: bigint,
         signature: Hex | null,
-        spender?: Address,
         skipRevert?: boolean
     ];
     permitDai: [
@@ -68,7 +67,6 @@ export interface ActionArgs {
         expiry: bigint,
         allowed: boolean,
         signature: Hex | null,
-        spender?: Address,
         skipRevert?: boolean
     ];
     approve2: [
@@ -80,7 +78,7 @@ export interface ActionArgs {
     transferFrom2: [
         asset: Address,
         amount: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     erc4626Mint: [
@@ -114,13 +112,7 @@ export interface ActionArgs {
         skipRevert?: boolean
     ];
     morphoSetAuthorizationWithSig: [
-        authorization: {
-            authorizer: Address;
-            authorized: Address;
-            isAuthorized: boolean;
-            nonce: bigint;
-            deadline: bigint;
-        },
+        authorization: Authorization,
         signature: Hex | null,
         skipRevert?: boolean
     ];
@@ -186,17 +178,17 @@ export interface ActionArgs {
         proof: Hex[],
         skipRevert?: boolean
     ];
-    wrapNative: [amount: bigint, recipient?: Address, skipRevert?: boolean];
-    unwrapNative: [amount: bigint, recipient?: Address, skipRevert?: boolean];
+    wrapNative: [amount: bigint, recipient: Address, skipRevert?: boolean];
+    unwrapNative: [amount: bigint, recipient: Address, skipRevert?: boolean];
     stakeEth: [
         amount: bigint,
         minShares: bigint,
         referral: Address,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
-    wrapStEth: [amount: bigint, recipient?: Address, skipRevert?: boolean];
-    unwrapStEth: [amount: bigint, recipient?: Address, skipRevert?: boolean];
+    wrapStEth: [amount: bigint, recipient: Address, skipRevert?: boolean];
+    unwrapStEth: [amount: bigint, recipient: Address, skipRevert?: boolean];
     aaveV2Repay: [
         asset: Address,
         amount: bigint,
@@ -207,7 +199,7 @@ export interface ActionArgs {
     aaveV2Withdraw: [
         asset: Address,
         amount: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     aaveV3Repay: [
@@ -220,7 +212,7 @@ export interface ActionArgs {
     aaveV3Withdraw: [
         asset: Address,
         amount: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     aaveV3OptimizerRepay: [
@@ -233,13 +225,13 @@ export interface ActionArgs {
         underlying: Address,
         amount: bigint,
         maxIterations: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     aaveV3OptimizerWithdrawCollateral: [
         underlying: Address,
         amount: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     aaveV3OptimizerApproveManagerWithSig: [
@@ -249,7 +241,6 @@ export interface ActionArgs {
         nonce: bigint,
         deadline: bigint,
         signature: Hex | null,
-        manager?: Address,
         skipRevert?: boolean
     ];
     compoundV2Repay: [
@@ -263,7 +254,7 @@ export interface ActionArgs {
         cToken: Address,
         amount: bigint,
         isEth: boolean,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     compoundV3Repay: [
@@ -276,7 +267,7 @@ export interface ActionArgs {
         instance: Address,
         asset: Address,
         amount: bigint,
-        recipient?: Address,
+        recipient: Address,
         skipRevert?: boolean
     ];
     compoundV3AllowBySig: [
@@ -286,7 +277,6 @@ export interface ActionArgs {
         nonce: bigint,
         expiry: bigint,
         signature: Hex | null,
-        manager?: Address,
         skipRevert?: boolean
     ];
 }

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.16",
+  "version": "3.0.0-next.18",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -20,8 +20,8 @@
   ],
   "peerDependencies": {
     "viem": "^2.0.0",
-    "@morpho-org/blue-sdk-viem": "^2.2.2",
     "@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"
   },
@@ -38,11 +38,11 @@
     "@morpho-org/blue-sdk": "^2.3.2",
     "@morpho-org/morpho-test": "^2.2.1",
     "@morpho-org/morpho-ts": "^2.2.0",
-    "@morpho-org/simulation-sdk": "^2.1.4",
     "@morpho-org/blue-sdk-viem": "^2.2.2",
-    "@morpho-org/test": "^2.1.1",
+    "@morpho-org/simulation-sdk": "^2.1.4",
     "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
-    "@morpho-org/test-wagmi": "^2.0.4"
+    "@morpho-org/test-wagmi": "^2.0.4",
+    "@morpho-org/test": "^2.1.2-next.0"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",