@morpho-org/consumer-sdk 0.1.0 → 0.1.2

package/lib/actions/requirements/encode/encodeErc20Permit.d.ts

@@ -1,4 +1,4 @@
-import { type Address } from "@morpho-org/blue-sdk";
+import type { Address } from "@morpho-org/blue-sdk";
 import { type Requirement } from "../../../types";
 interface EncodeErc20PermitParams {
     token: Address;

package/lib/actions/requirements/encode/encodeErc20Permit.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeErc20Permit = void 0;
-const blue_sdk_1 = require("@morpho-org/blue-sdk");
 const blue_sdk_viem_1 = require("@morpho-org/blue-sdk-viem");
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
 const viem_1 = require("viem");
@@ -28,47 +27,24 @@ const encodeErc20Permit = (params) => {
             if (client.account.address !== userAddress) {
                 throw new types_1.AddressMismatchError(client.account.address, userAddress);
             }
-            const { dai } = (0, blue_sdk_1.getChainAddresses)(chainId);
-            const isDai = dai != null && token === dai;
-            let signature;
-            if (isDai) {
-                const typedData = (0, blue_sdk_viem_1.getDaiPermitTypedData)({
-                    owner: userAddress,
-                    spender,
-                    allowance: amount,
-                    nonce,
-                    deadline,
-                }, chainId);
-                signature = await (0, actions_1.signTypedData)(client, {
-                    ...typedData,
-                    account: client.account,
-                });
-                await (0, viem_1.verifyTypedData)({
-                    ...typedData,
-                    address: userAddress,
-                    signature,
-                });
-            }
-            else {
-                const tokenData = await (0, blue_sdk_viem_1.fetchToken)(token, client);
-                const typedData = (0, blue_sdk_viem_1.getPermitTypedData)({
-                    erc20: tokenData,
-                    owner: userAddress,
-                    spender,
-                    allowance: amount,
-                    nonce,
-                    deadline,
-                }, chainId);
-                signature = await (0, actions_1.signTypedData)(client, {
-                    ...typedData,
-                    account: client.account,
-                });
-                await (0, viem_1.verifyTypedData)({
-                    ...typedData,
-                    address: userAddress, // Verify against the permit's owner.
-                    signature,
-                });
-            }
+            const tokenData = await (0, blue_sdk_viem_1.fetchToken)(token, client);
+            const typedData = (0, blue_sdk_viem_1.getPermitTypedData)({
+                erc20: tokenData,
+                owner: userAddress,
+                spender,
+                allowance: amount,
+                nonce,
+                deadline,
+            }, chainId);
+            const signature = await (0, actions_1.signTypedData)(client, {
+                ...typedData,
+                account: client.account,
+            });
+            await (0, viem_1.verifyTypedData)({
+                ...typedData,
+                address: userAddress, // Verify against the permit's owner.
+                signature,
+            });
             return (0, morpho_ts_1.deepFreeze)({
                 args: {
                     owner: userAddress,

package/lib/actions/requirements/encode/encodeErc20Permit2.d.ts

@@ -2,7 +2,6 @@ import { type Address } from "@morpho-org/blue-sdk";
 import { type Requirement } from "../../../types";
 interface EncodeErc20Permit2Params {
     token: Address;
-    spender: Address;
     amount: bigint;
     chainId: number;
     nonce: bigint;

package/lib/actions/requirements/encode/encodeErc20Permit2.js

@@ -8,13 +8,14 @@ const viem_1 = require("viem");
 const actions_1 = require("viem/actions");
 const types_1 = require("../../../types");
 const encodeErc20Permit2 = (params) => {
-    const { token, spender, amount, chainId, nonce, expiration = blue_sdk_1.MathLib.MAX_UINT_48, } = params;
+    const { token, amount, chainId, nonce, expiration = blue_sdk_1.MathLib.MAX_UINT_48, } = params;
     const now = morpho_ts_1.Time.timestamp();
     const deadline = now + morpho_ts_1.Time.s.from.h(2n);
+    const { bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
     const action = {
         type: "permit2",
         args: {
-            spender,
+            spender: generalAdapter1,
             amount,
             deadline,
             expiration,
@@ -29,7 +30,6 @@ const encodeErc20Permit2 = (params) => {
             if (client.account.address !== userAddress) {
                 throw new types_1.AddressMismatchError(client.account.address, userAddress);
             }
-            const { bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
             const typedData = (0, blue_sdk_viem_1.getPermit2PermitTypedData)({
                 // Never permit any other address than the GeneralAdapter1 otherwise
                 // the signature can be used independently.

package/lib/actions/requirements/getRequirements.js

@@ -30,10 +30,10 @@ const getRequirements = async (viemClient, params) => {
     if (viemClient.chain?.id !== chainId) {
         throw new types_1.ChainIdMismatchError(viemClient.chain?.id, chainId);
     }
-    const { permit2, bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
+    const { permit2, dai, bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
     const { erc20Allowances, erc2612Nonce, permit2BundlerAllowance } = await (0, blue_sdk_viem_1.fetchHolding)(from, address, viemClient);
     if (supportSignature) {
-        const supportSimplePermit = (0, morpho_ts_1.isDefined)(erc2612Nonce);
+        const supportSimplePermit = (0, morpho_ts_1.isDefined)(erc2612Nonce) && address !== dai;
         if (supportSimplePermit) {
             return (0, getRequirementsPermit_1.getRequirementsPermit)({
                 address,
@@ -49,6 +49,7 @@ const getRequirements = async (viemClient, params) => {
                 chainId,
                 permit2,
                 args: { amount },
+                allowancesGeneralAdapter: erc20Allowances["bundler3.generalAdapter1"],
                 allowancesPermit2: erc20Allowances.permit2,
                 allowanceGeneralAdapterPermit2: permit2BundlerAllowance.amount,
                 allowanceGeneralAdapterExpiration: permit2BundlerAllowance.expiration,

package/lib/actions/requirements/getRequirementsAction.js

@@ -6,7 +6,7 @@ const blue_sdk_1 = require("@morpho-org/blue-sdk");
  * Get the actions required to transfer the asset based on the requirement signature.
  */
 const getRequirementsAction = ({ chainId, requirementSignature, }) => {
-    const { dai, bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
+    const { bundler3: { generalAdapter1 }, } = (0, blue_sdk_1.getChainAddresses)(chainId);
     if (requirementSignature.action.type === "permit2") {
         if (!("expiration" in requirementSignature.args)) {
             throw new Error("Expiration is not defined");
@@ -40,31 +40,6 @@ const getRequirementsAction = ({ chainId, requirementSignature, }) => {
             },
         ];
     }
-    const isDai = dai != null && requirementSignature.args.asset === dai;
-    if (isDai) {
-        return [
-            {
-                type: "permitDai",
-                args: [
-                    requirementSignature.args.owner,
-                    requirementSignature.args.nonce,
-                    requirementSignature.args.deadline,
-                    requirementSignature.args.amount > 0n,
-                    requirementSignature.args.signature,
-                    false,
-                ],
-            },
-            {
-                type: "erc20TransferFrom",
-                args: [
-                    requirementSignature.args.asset,
-                    requirementSignature.args.amount,
-                    generalAdapter1,
-                    false,
-                ],
-            },
-        ];
-    }
     return [
         {
             type: "permit",

package/lib/actions/requirements/getRequirementsPermit2.d.ts

@@ -15,6 +15,7 @@ import type { ERC20ApprovalAction, Requirement, Transaction } from "../../types"
  * @param params.permit2 - Permit2 contract address.
  * @param params.args - Object with:
  * @param params.args.amount - Required token amount.
+ * @param params.allowancesGeneralAdapter - Allowance for general adapter from permit2 contract.
  * @param params.allowancesPermit2 - Allowance for permit2.
  * @param params.allowanceGeneralAdapterPermit2 - Allowance for general adapter from permit2 contract.
  * @param params.allowanceGeneralAdapterExpiration - Expiration for general adapter from permit2 contract.
@@ -29,6 +30,7 @@ export declare const getRequirementsPermit2: (params: {
         amount: bigint;
     };
     allowancesPermit2: bigint;
+    allowancesGeneralAdapter: bigint;
     allowanceGeneralAdapterPermit2: bigint;
     allowanceGeneralAdapterExpiration: bigint;
     nonce: bigint;

package/lib/actions/requirements/getRequirementsPermit2.js

@@ -20,6 +20,7 @@ const getRequirementsApproval_1 = require("./getRequirementsApproval");
  * @param params.permit2 - Permit2 contract address.
  * @param params.args - Object with:
  * @param params.args.amount - Required token amount.
+ * @param params.allowancesGeneralAdapter - Allowance for general adapter from permit2 contract.
  * @param params.allowancesPermit2 - Allowance for permit2.
  * @param params.allowanceGeneralAdapterPermit2 - Allowance for general adapter from permit2 contract.
  * @param params.allowanceGeneralAdapterExpiration - Expiration for general adapter from permit2 contract.
@@ -27,7 +28,10 @@ const getRequirementsApproval_1 = require("./getRequirementsApproval");
  * @returns An array of approval transaction or requirement signatures objects.
  */
 const getRequirementsPermit2 = (params) => {
-    const { address, chainId, permit2, args: { amount }, allowancesPermit2, allowanceGeneralAdapterPermit2, allowanceGeneralAdapterExpiration, nonce, } = params;
+    const { address, chainId, permit2, args: { amount }, allowancesPermit2, allowancesGeneralAdapter, allowanceGeneralAdapterPermit2, allowanceGeneralAdapterExpiration, nonce, } = params;
+    if (allowancesGeneralAdapter >= amount) {
+        return [];
+    }
     const requirements = [];
     const approvalRequirements = (0, getRequirementsApproval_1.getRequirementsApproval)({
         address,
@@ -44,7 +48,6 @@ const getRequirementsPermit2 = (params) => {
         allowanceGeneralAdapterExpiration < morpho_ts_1.Time.timestamp() + morpho_ts_1.Time.s.from.h(4n)) {
         requirements.push((0, encodeErc20Permit2_1.encodeErc20Permit2)({
             token: address,
-            spender: permit2,
             amount,
             chainId,
             nonce,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/consumer-sdk",
   "description": "Abstraction layer for Morpho's complexity.",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Foulks-Plb <https://x.com/FoulkPlb>"
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@biomejs/biome": "2.3.3",
     "@changesets/cli": "^2.29.8",
-    "@morpho-org/test": "2.6.3",
+    "@morpho-org/test": "2.6.5",
     "@types/node": "^24.9.1",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "3.2.4",
@@ -34,11 +34,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@morpho-org/blue-sdk": "5.7.0",
-    "@morpho-org/blue-sdk-viem": "4.1.2",
-    "@morpho-org/bundler-sdk-viem": "4.1.2",
-    "@morpho-org/morpho-ts": "^2.4.5",
-    "@morpho-org/simulation-sdk": "3.2.2",
+    "@morpho-org/blue-sdk": "^5.9.1",
+    "@morpho-org/blue-sdk-viem": "^4.1.4",
+    "@morpho-org/bundler-sdk-viem": "^4.1.3",
+    "@morpho-org/morpho-ts": "^2.4.6",
+    "@morpho-org/simulation-sdk": "^3.2.3",
     "zod": "^4.1.12"
   },
   "scripts": {