@morpho-org/bundler-sdk-viem 3.0.0-next.6 → 3.0.0-next.8

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

@@ -1,5 +1,5 @@
 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 { getCurrent, simulateOperation, } from "@morpho-org/simulation-sdk";
 import { blueAbi, getAuthorizationTypedData, getDaiPermitTypedData, getPermit2PermitTypedData, getPermitTypedData, } from "@morpho-org/blue-sdk-viem";
@@ -389,7 +389,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Supply": {
-            const { id, assets = 0n, shares = 0n, onBehalf, slippage = 0n, } = operation.args;
+            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({
@@ -406,7 +406,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Withdraw": {
-            const { id, assets = 0n, shares = 0n, receiver, slippage = 0n, } = operation.args;
+            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({
@@ -416,7 +416,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Borrow": {
-            const { id, assets = 0n, shares = 0n, receiver, slippage = 0n, } = operation.args;
+            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({
@@ -426,7 +426,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Blue_Repay": {
-            const { id, assets = 0n, shares = 0n, onBehalf, slippage = 0n, } = operation.args;
+            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({
@@ -471,7 +471,7 @@ 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.toAssets(MathLib.wToRay(MathLib.WAD + slippage));
             if (shares === 0n)
@@ -487,7 +487,7 @@ 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.toAssets(MathLib.wToRay(MathLib.WAD - slippage));
             if (assets > 0n)

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.6",
+  "version": "3.0.0-next.8",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -21,8 +21,8 @@
   "peerDependencies": {
     "viem": "^2.0.0",
     "@morpho-org/blue-sdk": "^2.3.2",
-    "@morpho-org/morpho-ts": "^2.1.0",
     "@morpho-org/blue-sdk-viem": "^2.2.2",
+    "@morpho-org/morpho-ts": "^2.2.0",
     "@morpho-org/simulation-sdk": "^2.1.4"
   },
   "devDependencies": {
@@ -37,12 +37,12 @@
     "vitest": "^3.0.5",
     "@morpho-org/blue-sdk": "^2.3.2",
     "@morpho-org/blue-sdk-viem": "^2.2.2",
-    "@morpho-org/morpho-test": "^2.3.0-next.1",
+    "@morpho-org/morpho-ts": "^2.2.0",
+    "@morpho-org/morpho-test": "^2.2.1",
     "@morpho-org/simulation-sdk": "^2.1.4",
-    "@morpho-org/morpho-ts": "^2.1.0",
     "@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.0.6"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",