@morpho-org/bundler-sdk-viem 5.0.0 → 5.0.1

package/lib/cjs/BundlerAction.js

@@ -19,9 +19,10 @@ var BundlerAction;
             if (type !== "nativeTransfer")
                 continue;
             const [owner, recipient, amount] = args;
-            if (owner !== bundler3 &&
-                owner !== generalAdapter1 &&
-                (recipient === bundler3 || recipient === generalAdapter1))
+            if (!(0, viem_1.isAddressEqual)(owner, bundler3) &&
+                !(0, viem_1.isAddressEqual)(owner, generalAdapter1) &&
+                ((0, viem_1.isAddressEqual)(recipient, bundler3) ||
+                    (0, viem_1.isAddressEqual)(recipient, generalAdapter1)))
                 value += amount;
         }
         const encodedActions = actions.flatMap(BundlerAction.encode.bind(null, chainId));
@@ -229,9 +230,9 @@ var BundlerAction;
     // biome-ignore lint/complexity/useMaxParams: TODO refactor to ≤2 params
     function nativeTransfer(chainId, owner, recipient, amount, skipRevert = false) {
         const { bundler3: { bundler3, generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
-        if (recipient === bundler3)
+        if ((0, viem_1.isAddressEqual)(recipient, bundler3))
             return [];
-        if (owner === generalAdapter1)
+        if ((0, viem_1.isAddressEqual)(owner, generalAdapter1))
             return [
                 {
                     to: generalAdapter1,
@@ -725,7 +726,7 @@ var BundlerAction;
     function morphoSetAuthorizationWithSig(chainId, authorization, signature, skipRevert = true) {
         const { morpho, bundler3: { bundler3 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
         const { r, s, yParity } = (0, viem_1.parseSignature)(signature);
-        if (authorization.authorized === bundler3)
+        if ((0, viem_1.isAddressEqual)(authorization.authorized, bundler3))
             throw new errors_js_1.BundlerErrors.UnexpectedSignature(authorization.authorized);
         return [
             {

package/lib/esm/BundlerAction.js

@@ -1,6 +1,6 @@
 import { ChainId, getChainAddresses, } from "@morpho-org/blue-sdk";
 import { blueAbi, erc2612Abi, permit2Abi, publicAllocatorAbi, } from "@morpho-org/blue-sdk-viem";
-import { encodeAbiParameters, encodeFunctionData, keccak256, maxUint256, parseSignature, zeroHash, } from "viem";
+import { encodeAbiParameters, encodeFunctionData, isAddressEqual, keccak256, maxUint256, parseSignature, zeroHash, } from "viem";
 import { aaveV2MigrationAdapterAbi, aaveV3MigrationAdapterAbi, aaveV3OptimizerMigrationAdapterAbi, bundler3Abi, compoundV2MigrationAdapterAbi, compoundV3MigrationAdapterAbi, coreAdapterAbi, erc20WrapperAdapterAbi, ethereumGeneralAdapter1Abi, generalAdapter1Abi, paraswapAdapterAbi, universalRewardsDistributorAbi, } from "./abis.js";
 import { BundlerErrors } from "./errors.js";
 const reenterAbiInputs = bundler3Abi.find((item) => item.name === "reenter").inputs;
@@ -16,9 +16,10 @@ export var BundlerAction;
             if (type !== "nativeTransfer")
                 continue;
             const [owner, recipient, amount] = args;
-            if (owner !== bundler3 &&
-                owner !== generalAdapter1 &&
-                (recipient === bundler3 || recipient === generalAdapter1))
+            if (!isAddressEqual(owner, bundler3) &&
+                !isAddressEqual(owner, generalAdapter1) &&
+                (isAddressEqual(recipient, bundler3) ||
+                    isAddressEqual(recipient, generalAdapter1)))
                 value += amount;
         }
         const encodedActions = actions.flatMap(BundlerAction.encode.bind(null, chainId));
@@ -226,9 +227,9 @@ export var BundlerAction;
     // biome-ignore lint/complexity/useMaxParams: TODO refactor to ≤2 params
     function nativeTransfer(chainId, owner, recipient, amount, skipRevert = false) {
         const { bundler3: { bundler3, generalAdapter1 }, } = getChainAddresses(chainId);
-        if (recipient === bundler3)
+        if (isAddressEqual(recipient, bundler3))
             return [];
-        if (owner === generalAdapter1)
+        if (isAddressEqual(owner, generalAdapter1))
             return [
                 {
                     to: generalAdapter1,
@@ -722,7 +723,7 @@ export var BundlerAction;
     function morphoSetAuthorizationWithSig(chainId, authorization, signature, skipRevert = true) {
         const { morpho, bundler3: { bundler3 }, } = getChainAddresses(chainId);
         const { r, s, yParity } = parseSignature(signature);
-        if (authorization.authorized === bundler3)
+        if (isAddressEqual(authorization.authorized, bundler3))
             throw new BundlerErrors.UnexpectedSignature(authorization.authorized);
         return [
             {

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": "5.0.0",
+  "version": "5.0.1",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -19,11 +19,11 @@
     "lib"
   ],
   "peerDependencies": {
-    "viem": "^2.0.0",
     "@morpho-org/blue-sdk": "^6.0.0",
     "@morpho-org/blue-sdk-viem": "^5.0.0",
     "@morpho-org/morpho-ts": "^2.5.1",
-    "@morpho-org/simulation-sdk": "^4.0.0"
+    "@morpho-org/simulation-sdk": "^4.0.0",
+    "viem": "^2.0.0"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.100.10",
@@ -38,11 +38,11 @@
     "@morpho-org/blue-sdk": "^6.0.0",
     "@morpho-org/blue-sdk-viem": "^5.0.0",
     "@morpho-org/morpho-test": "^4.0.0",
-    "@morpho-org/morpho-ts": "^2.5.1",
-    "@morpho-org/simulation-sdk": "^4.0.0",
-    "@morpho-org/simulation-sdk-wagmi": "^5.0.0",
+    "@morpho-org/morpho-ts": "^2.5.2",
+    "@morpho-org/simulation-sdk": "^4.0.1",
+    "@morpho-org/simulation-sdk-wagmi": "^5.0.1",
     "@morpho-org/test": "^2.8.0",
-    "@morpho-org/test-wagmi": "^3.0.0"
+    "@morpho-org/test-wagmi": "^3.0.1"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",