@morpho-org/bundler-sdk-viem 3.2.1 → 3.2.2

package/lib/actions.js

@@ -10,38 +10,10 @@ const blue_sdk_viem_1 = require("@morpho-org/blue-sdk-viem");
 const actions_1 = require("viem/actions");
 const ActionBundle_js_1 = require("./ActionBundle.js");
 const errors_js_1 = require("./errors.js");
-const encodeErc20Approval = (token, sender, spender, amount, data) => {
+const encodeErc20Approval = (token, spender, amount, data) => {
     const { chainId } = data;
-    const { morpho, bundler3: { generalAdapter1 }, permit2, } = (0, blue_sdk_1.getChainAddresses)(chainId);
     amount = blue_sdk_1.MathLib.min(amount, simulation_sdk_1.MAX_TOKEN_APPROVALS[chainId]?.[token] ?? viem_1.maxUint256);
     const txRequirements = [];
-    if (simulation_sdk_1.APPROVE_ONLY_ONCE_TOKENS[chainId]?.includes(token)) {
-        const contract = spender === morpho
-            ? "morpho"
-            : spender === generalAdapter1
-                ? "bundler3.generalAdapter1"
-                : spender === permit2
-                    ? "permit2"
-                    : undefined;
-        const currentAllowance = contract != null
-            ? data.getHolding(sender, token).erc20Allowances[contract]
-            : data.vaults[spender]?.asset === token
-                ? data.getVaultUser(spender, sender).allowance
-                : 0n;
-        if (currentAllowance !== 0n)
-            txRequirements.push({
-                type: "erc20Approve",
-                args: [token, spender, 0n],
-                tx: {
-                    to: token,
-                    data: (0, viem_1.encodeFunctionData)({
-                        abi: viem_1.erc20Abi,
-                        functionName: "approve",
-                        args: [spender, 0n],
-                    }),
-                },
-            });
-    }
     txRequirements.push({
         type: "erc20Approve",
         args: [token, spender, amount],
@@ -150,7 +122,7 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
             // Signatures are not supported, skip Permit2 approval.
             if (!supportsSignature && spender === permit2)
                 break;
-            requirements.txs.push(...encodeErc20Approval(operation.address, sender, spender, amount, dataBefore));
+            requirements.txs.push(...encodeErc20Approval(operation.address, spender, amount, dataBefore));
             break;
         }
         case "Erc20_Permit": {
@@ -238,7 +210,7 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
                 break;
             }
             // Simple permit is not supported, fallback to standard approval.
-            requirements.txs.push(...encodeErc20Approval(operation.address, sender, spender, amount, dataBefore));
+            requirements.txs.push(...encodeErc20Approval(operation.address, spender, amount, dataBefore));
             break;
         }
         case "Erc20_Permit2": {
@@ -297,7 +269,7 @@ const encodeOperation = (operation, dataBefore, supportsSignature = true, index
                 break;
             }
             // Signatures are not supported, fallback to standard approval.
-            requirements.txs.push(...encodeErc20Approval(operation.address, sender, generalAdapter1, amount, dataBefore));
+            requirements.txs.push(...encodeErc20Approval(operation.address, generalAdapter1, amount, dataBefore));
             break;
         }
         case "Erc20_Transfer": {

package/lib/operations.js

@@ -61,7 +61,18 @@ const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasS
                 nonce: erc2612Nonce,
             },
         });
-    else if (useSimpleTransfer)
+    else if (useSimpleTransfer) {
+        if (simulation_sdk_1.APPROVE_ONLY_ONCE_TOKENS[data.chainId]?.includes(address) &&
+            erc20Allowances["bundler3.generalAdapter1"] > 0n)
+            operations.push({
+                type: "Erc20_Approve",
+                sender: from,
+                address,
+                args: {
+                    amount: 0n,
+                    spender: generalAdapter1,
+                },
+            });
         operations.push({
             type: "Erc20_Approve",
             sender: from,
@@ -71,6 +82,7 @@ const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasS
                 spender: generalAdapter1,
             },
         });
+    }
     if (useSimplePermit || useSimpleTransfer)
         operations.push({
             type: "Erc20_Transfer",
@@ -84,7 +96,18 @@ const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasS
         });
     // Simple permit is not supported: fallback to Permit2.
     else {
-        if (erc20Allowances.permit2 < amount)
+        if (erc20Allowances.permit2 < amount) {
+            if (simulation_sdk_1.APPROVE_ONLY_ONCE_TOKENS[data.chainId]?.includes(address) &&
+                erc20Allowances.permit2 > 0n)
+                operations.push({
+                    type: "Erc20_Approve",
+                    sender: from,
+                    address,
+                    args: {
+                        amount: 0n,
+                        spender: permit2,
+                    },
+                });
             operations.push({
                 type: "Erc20_Approve",
                 sender: from,
@@ -94,6 +117,7 @@ const populateInputTransfer = ({ address, args: { amount, from } }, data, { hasS
                     spender: permit2,
                 },
             });
+        }
         if (permit2BundlerAllowance.amount < amount ||
             permit2BundlerAllowance.expiration < data.block.timestamp)
             operations.push({

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.2.1",
+  "version": "3.2.2",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -39,8 +39,8 @@
     "@morpho-org/morpho-test": "^2.3.0",
     "@morpho-org/morpho-ts": "^2.4.0",
     "@morpho-org/simulation-sdk": "^3.1.1",
-    "@morpho-org/test-wagmi": "^2.0.4",
     "@morpho-org/simulation-sdk-wagmi": "^3.0.2",
+    "@morpho-org/test-wagmi": "^2.0.4",
     "@morpho-org/test": "^2.1.4"
   },
   "scripts": {