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

package/lib/BundlerAction.js

@@ -1,9 +1,9 @@
 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 viem.
  */
@@ -673,7 +673,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 [
             {
@@ -702,7 +702,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 [
             {
@@ -759,7 +759,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 [
             {
@@ -835,6 +835,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,
@@ -853,7 +857,7 @@ export var BundlerAction;
                 }),
                 value: 0n,
                 skipRevert: false,
-                callbackHash: keccak256(`${generalAdapter1}${reenterSelectorHash}`),
+                callbackHash: reenter ? keccak256(reenterData) : zeroHash,
             },
         ];
     }

package/lib/actions.js

@@ -91,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,
                 };
@@ -130,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],
                     }),
                 },
             });

package/lib/operations.js

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

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