@morpho-org/bundler-sdk-viem 3.0.0-next.12 → 3.0.0-next.14

package/lib/BundlerAction.d.ts

@@ -88,7 +88,7 @@ export declare namespace BundlerAction {
      * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
      * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function transferFrom2(chainId: ChainId, asset: Address, owner: Address, amount: bigint, recipient?: Address, skipRevert?: boolean): BundlerCall[];
+    function transferFrom2(chainId: ChainId, asset: Address, amount: bigint, recipient?: Address, skipRevert?: boolean): BundlerCall[];
     /**
      * Encodes a call to the Adapter to wrap ERC20 tokens via the provided ERC20Wrapper.
      * @param chainId The chain id for which to encode the call.

package/lib/BundlerAction.js

@@ -379,7 +379,7 @@ export var BundlerAction;
      * @param skipRevert Whether to allow the permit to revert without making the whole bundle revert. Defaults to true.
      */
     function approve2(chainId, owner, permitSingle, signature, skipRevert = true) {
-        const { permit2 } = getChainAddresses(chainId);
+        const { permit2, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         if (permit2 == null)
             throw new BundlerErrors.UnexpectedAction("approve2", chainId);
         return [
@@ -388,7 +388,16 @@ export var BundlerAction;
                 data: encodeFunctionData({
                     abi: permit2Abi,
                     functionName: "permit",
-                    args: [owner, permitSingle, signature],
+                    args: [
+                        owner,
+                        {
+                            ...permitSingle,
+                            // Never permit any other address than the GeneralAdapter1 otherwise
+                            // the signature can be extracted and used independently.
+                            spender: generalAdapter1,
+                        },
+                        signature,
+                    ],
                 }),
                 value: 0n,
                 skipRevert,
@@ -406,19 +415,16 @@ export var BundlerAction;
      * @param recipient The recipient of ERC20 tokens. Defaults to the chain's bundler3 general adapter.
      * @param skipRevert Whether to allow the transfer to revert without making the whole bundler revert. Defaults to false.
      */
-    function transferFrom2(chainId, asset, owner, amount, recipient, skipRevert = false) {
-        const { permit2, bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
-        if (permit2 == null)
-            throw new BundlerErrors.UnexpectedAction("transferFrom2", chainId);
+    function transferFrom2(chainId, asset, amount, recipient, skipRevert = false) {
+        const { bundler3: { generalAdapter1 }, } = getChainAddresses(chainId);
         recipient ??= generalAdapter1;
         return [
             {
-                to: permit2,
+                to: generalAdapter1,
                 data: encodeFunctionData({
-                    abi: permit2Abi,
-                    functionName: "transferFrom",
-                    // TODO: batch all permit2 transfers via transferFrom(AllowanceTransferDetails[] calldata)
-                    args: [owner, recipient, amount, asset],
+                    abi: generalAdapter1Abi,
+                    functionName: "permit2TransferFrom",
+                    args: [asset, recipient, amount],
                 }),
                 value: 0n,
                 skipRevert,

package/lib/actions.js

@@ -65,7 +65,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: { bundler3, generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
+    const { morpho, bundler3: { generalAdapter1 }, permit2, wNative, dai, wstEth, stEth, } = getChainAddresses(chainId);
     const actions = [];
     const requirements = new ActionBundleRequirements();
     let callbackBundle;
@@ -255,7 +255,6 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                                 nonce: Number(nonce),
                                 expiration: Number(expiration),
                             },
-                            spender: bundler3,
                             sigDeadline: deadline,
                         },
                         null,
@@ -266,12 +265,14 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
                 requirements.signatures.push({
                     action,
                     async sign(client, account = client.account) {
-                        const { details, spender, sigDeadline } = action.args[1];
+                        const { details, sigDeadline } = action.args[1];
                         let signature = action.args[2];
                         if (signature != null)
                             return signature; // action is already signed
                         const typedData = getPermit2PermitTypedData({
-                            spender,
+                            // Never permit any other address than the GeneralAdapter1 otherwise
+                            // the signature can be used independently.
+                            spender: generalAdapter1,
                             allowance: details.amount,
                             erc20: details.token,
                             nonce: details.nonce,
@@ -320,11 +321,11 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
             break;
         }
         case "Erc20_Transfer2": {
-            const { amount, from, to } = operation.args;
+            const { amount, to } = operation.args;
             if (supportsSignature) {
                 actions.push({
                     type: "transferFrom2",
-                    args: [address, from, amount, to, operation.skipRevert],
+                    args: [address, amount, to, operation.skipRevert],
                 });
                 break;
             }
@@ -413,7 +414,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Supply": {
             const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            const market = dataAfter.getMarket(id);
             const maxSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoSupply",
@@ -431,7 +432,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Withdraw": {
             const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            const market = dataAfter.getMarket(id);
             const minSharePrice = market.toSupplyAssets(MathLib.wToRay(MathLib.WAD - slippage));
             actions.push({
                 type: "morphoWithdraw",
@@ -448,7 +449,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Borrow": {
             const { id, assets = 0n, shares = 0n, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            const market = dataAfter.getMarket(id);
             const minSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD - slippage));
             actions.push({
                 type: "morphoBorrow",
@@ -465,7 +466,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "Blue_Repay": {
             const { id, assets = 0n, shares = 0n, onBehalf, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const market = dataBefore.getMarket(id);
+            const market = dataAfter.getMarket(id);
             const maxSharePrice = market.toBorrowAssets(MathLib.wToRay(MathLib.WAD + slippage));
             actions.push({
                 type: "morphoRepay",
@@ -522,7 +523,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "MetaMorpho_Deposit": {
             const { assets = 0n, shares = 0n, owner, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const vault = dataBefore.getVault(address);
+            const vault = dataAfter.getVault(address);
             const maxSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD + slippage));
             if (shares === 0n)
                 actions.push({
@@ -538,7 +539,7 @@ export const encodeOperation = (operation, dataBefore, supportsSignature = true,
         }
         case "MetaMorpho_Withdraw": {
             const { assets = 0n, shares = 0n, owner, receiver, slippage = DEFAULT_SLIPPAGE_TOLERANCE, } = operation.args;
-            const vault = dataBefore.getVault(address);
+            const vault = dataAfter.getVault(address);
             const minSharePrice = vault.toAssets(MathLib.wToRay(MathLib.WAD - slippage));
             if (assets > 0n)
                 actions.push({

package/lib/operations.js

@@ -8,7 +8,7 @@ import { BundlerErrors } from "./errors.js";
  */
 export const DEFAULT_SUPPLY_TARGET_UTILIZATION = 905000000000000000n;
 export const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasSimplePermit = false } = {}) => {
-    const { bundler3: { bundler3, generalAdapter1 }, permit2, } = getChainAddresses(data.chainId);
+    const { bundler3: { generalAdapter1 }, permit2, } = getChainAddresses(data.chainId);
     // If native token, it is expected to be sent along as call value.
     if (address === NATIVE_ADDRESS)
         return [
@@ -105,7 +105,7 @@ export const populateInputTransfer = ({ address, args: { amount, from } }, data,
             });
         operations.push({
             type: "Erc20_Transfer2",
-            sender: bundler3,
+            sender: generalAdapter1,
             address,
             args: {
                 amount,

package/lib/types/actions.d.ts

@@ -19,7 +19,6 @@ export interface Permit2PermitSingleDetails {
 }
 export interface Permit2PermitSingle {
     details: Permit2PermitSingleDetails;
-    spender: Address;
     sigDeadline: bigint;
 }
 export interface ActionArgs {
@@ -80,7 +79,6 @@ export interface ActionArgs {
     ];
     transferFrom2: [
         asset: Address,
-        owner: Address,
         amount: bigint,
         recipient?: 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.12",
+  "version": "3.0.0-next.14",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -21,9 +21,9 @@
   "peerDependencies": {
     "viem": "^2.0.0",
     "@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"
+    "@morpho-org/blue-sdk-viem": "^3.0.0-next.6",
+    "@morpho-org/simulation-sdk": "^2.1.4",
+    "@morpho-org/morpho-ts": "^2.2.0"
   },
   "devDependencies": {
     "@tanstack/query-core": "^5.62.16",
@@ -35,13 +35,13 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
+    "@morpho-org/blue-sdk-viem": "^3.0.0-next.6",
     "@morpho-org/blue-sdk": "^2.3.2",
-    "@morpho-org/blue-sdk-viem": "^2.2.2",
-    "@morpho-org/morpho-ts": "^2.2.0",
     "@morpho-org/morpho-test": "^2.2.1",
+    "@morpho-org/morpho-ts": "^2.2.0",
     "@morpho-org/simulation-sdk": "^2.1.4",
     "@morpho-org/simulation-sdk-wagmi": "^2.0.5",
-    "@morpho-org/test": "^2.1.0",
+    "@morpho-org/test": "^2.1.1",
     "@morpho-org/test-wagmi": "^2.0.4"
   },
   "scripts": {