@zyfai/sdk 0.1.19 → 0.1.20

package/dist/index.js

@@ -436,12 +436,98 @@ var import_pimlico = require("permissionless/clients/pimlico");
 var import_accounts = require("permissionless/accounts");
 var import_viem3 = require("viem");
 var import_account_abstraction = require("viem/account-abstraction");
+var import_actions = require("permissionless/actions");
+var import_account_abstraction2 = require("viem/account-abstraction");
 var SAFE_7579_ADDRESS = "0x7579EE8307284F293B1927136486880611F20002";
 var ERC7579_LAUNCHPAD_ADDRESS = "0x7579011aB74c46090561ea277Ba79D510c6C00ff";
 var ACCOUNT_SALTS = {
   staging: "zyfai-staging",
   production: "zyfai"
 };
+var MODULE_TYPE_IDS = {
+  validator: 1n,
+  executor: 2n,
+  fallback: 3n,
+  hook: 4n
+};
+var SMART_SESSIONS_FALLBACK = {
+  module: "0x12cae64c42f362e7d5a847c2d33388373f629177",
+  address: "0x12cae64c42f362e7d5a847c2d33388373f629177",
+  type: "fallback",
+  selector: (0, import_viem3.encodeAbiParameters)(
+    [{ name: "functionSignature", type: "bytes4" }],
+    ["0x84b0196e"]
+  ),
+  initData: "0x84b0196e00000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000"
+};
+var INTENT_EXECUTOR = {
+  address: "0x00000000005aD9ce1f5035FD62CA96CEf16AdAAF",
+  type: "executor",
+  initData: "0x"
+};
+var PROXY_EXECUTOR = {
+  address: "0xF659d30D4EB88B06A909F20839D8959Bd77d8790",
+  type: "executor",
+  initData: "0x"
+};
+var getModulesToInstall = (chainId) => {
+  const smartSessions = (0, import_module_sdk.getSmartSessionsValidator)({});
+  const accountLockerHook = (0, import_module_sdk.getAccountLockerHook)({ isOmniMode: true });
+  const accountLockerSourceExecutor = (0, import_module_sdk.getAccountLockerSourceExecutor)();
+  const accountLockerTargetExecutor = (0, import_module_sdk.getAccountLockerTargetExecutor)();
+  if (chainId === 9745) {
+    return [
+      smartSessions,
+      SMART_SESSIONS_FALLBACK,
+      INTENT_EXECUTOR,
+      PROXY_EXECUTOR
+    ];
+  }
+  return [
+    smartSessions,
+    {
+      ...accountLockerHook,
+      type: "executor"
+    },
+    accountLockerSourceExecutor,
+    accountLockerTargetExecutor,
+    SMART_SESSIONS_FALLBACK,
+    INTENT_EXECUTOR,
+    PROXY_EXECUTOR
+  ];
+};
+var getInstallModuleCallData = (module2) => {
+  return (0, import_viem3.encodeFunctionData)({
+    abi: [
+      {
+        type: "function",
+        name: "installModule",
+        inputs: [
+          {
+            type: "uint256",
+            name: "moduleTypeId"
+          },
+          {
+            type: "address",
+            name: "module"
+          },
+          {
+            type: "bytes",
+            name: "initData"
+          }
+        ],
+        outputs: [],
+        stateMutability: "nonpayable"
+      }
+    ],
+    functionName: "installModule",
+    args: [
+      MODULE_TYPE_IDS[module2.type],
+      module2.address,
+      module2.initData || "0x"
+    ]
+  });
+};
 var getSafeAccount = async (config) => {
   const {
     owner,
@@ -592,7 +678,7 @@ var getSmartAccountClient = async (config) => {
 };
 var deploySafeAccount = async (config) => {
   try {
-    const { owner, publicClient } = config;
+    const { owner, publicClient, chainId } = config;
     if (!owner || !owner.account) {
       throw new Error(
         "Wallet not connected. Please connect your wallet first."
@@ -606,24 +692,61 @@ var deploySafeAccount = async (config) => {
         isDeployed: true
       };
     }
+    const modulesToInstall = getModulesToInstall(chainId);
+    const installCalls = modulesToInstall.map((module2) => ({
+      to: safeAddress,
+      data: getInstallModuleCallData(module2)
+    }));
     const smartAccountClient = await getSmartAccountClient(config);
-    const userOpHash = await smartAccountClient.sendUserOperation({
-      calls: [
-        {
-          to: safeAddress,
-          value: BigInt(0),
-          data: "0x"
-        }
-      ]
+    const safeAccount = await getSafeAccount(config);
+    const ownableValidator = (0, import_module_sdk.getOwnableValidator)({
+      owners: [owner.account.address],
+      threshold: 1
     });
-    const receipt = await smartAccountClient.waitForUserOperationReceipt({
-      hash: userOpHash
+    const nonce = await (0, import_actions.getAccountNonce)(publicClient, {
+      address: safeAddress,
+      entryPointAddress: import_account_abstraction.entryPoint07Address,
+      key: BigInt(
+        (0, import_viem3.pad)(ownableValidator.address, {
+          dir: "right",
+          size: 24
+        }) || 0
+      )
     });
-    return {
-      safeAddress,
-      txHash: receipt.receipt.transactionHash,
-      isDeployed: true
-    };
+    const userOperation = await smartAccountClient.prepareUserOperation({
+      account: safeAccount,
+      calls: installCalls,
+      nonce
+    });
+    const userOpHashToSign = (0, import_account_abstraction2.getUserOperationHash)({
+      chainId,
+      entryPointAddress: import_account_abstraction.entryPoint07Address,
+      entryPointVersion: "0.7",
+      userOperation
+    });
+    if (!owner.account) {
+      throw new Error("Owner account is required for signing");
+    }
+    userOperation.signature = await owner.signMessage({
+      account: owner.account,
+      message: { raw: userOpHashToSign }
+    });
+    const userOpHash = await smartAccountClient.sendUserOperation(
+      userOperation
+    );
+    try {
+      const transaction = await smartAccountClient.waitForUserOperationReceipt({
+        hash: userOpHash
+      });
+      return {
+        safeAddress,
+        txHash: transaction.receipt.transactionHash,
+        isDeployed: true
+      };
+    } catch (error) {
+      console.error("Transaction failed:", error);
+      throw new Error("Failed to execute transaction");
+    }
   } catch (error) {
     throw new Error(
       `Failed to deploy Safe account: ${error.message}`
@@ -1109,7 +1232,8 @@ var ZyfaiSDK = class {
         chain: chainConfig.chain,
         publicClient: chainConfig.publicClient,
         bundlerUrl,
-        environment: this.environment
+        environment: this.environment,
+        chainId
       });
       try {
         await this.updateUserProfile({

package/dist/index.mjs

@@ -401,7 +401,11 @@ import {
   getAccount,
   getEnableSessionDetails,
   getPermissionId,
-  getSessionNonce
+  getSessionNonce,
+  getSmartSessionsValidator,
+  getAccountLockerHook,
+  getAccountLockerSourceExecutor,
+  getAccountLockerTargetExecutor
 } from "@rhinestone/module-sdk";
 import { createSmartAccountClient } from "permissionless";
 import { erc7579Actions } from "permissionless/actions/erc7579";
@@ -410,18 +414,107 @@ import { toSafeSmartAccount } from "permissionless/accounts";
 import {
   http as http2,
   getAddress,
+  encodeFunctionData,
   fromHex,
-  toHex
+  toHex,
+  encodeAbiParameters,
+  pad
 } from "viem";
 import {
   entryPoint07Address
 } from "viem/account-abstraction";
+import { getAccountNonce } from "permissionless/actions";
+import { getUserOperationHash } from "viem/account-abstraction";
 var SAFE_7579_ADDRESS = "0x7579EE8307284F293B1927136486880611F20002";
 var ERC7579_LAUNCHPAD_ADDRESS = "0x7579011aB74c46090561ea277Ba79D510c6C00ff";
 var ACCOUNT_SALTS = {
   staging: "zyfai-staging",
   production: "zyfai"
 };
+var MODULE_TYPE_IDS = {
+  validator: 1n,
+  executor: 2n,
+  fallback: 3n,
+  hook: 4n
+};
+var SMART_SESSIONS_FALLBACK = {
+  module: "0x12cae64c42f362e7d5a847c2d33388373f629177",
+  address: "0x12cae64c42f362e7d5a847c2d33388373f629177",
+  type: "fallback",
+  selector: encodeAbiParameters(
+    [{ name: "functionSignature", type: "bytes4" }],
+    ["0x84b0196e"]
+  ),
+  initData: "0x84b0196e00000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000"
+};
+var INTENT_EXECUTOR = {
+  address: "0x00000000005aD9ce1f5035FD62CA96CEf16AdAAF",
+  type: "executor",
+  initData: "0x"
+};
+var PROXY_EXECUTOR = {
+  address: "0xF659d30D4EB88B06A909F20839D8959Bd77d8790",
+  type: "executor",
+  initData: "0x"
+};
+var getModulesToInstall = (chainId) => {
+  const smartSessions = getSmartSessionsValidator({});
+  const accountLockerHook = getAccountLockerHook({ isOmniMode: true });
+  const accountLockerSourceExecutor = getAccountLockerSourceExecutor();
+  const accountLockerTargetExecutor = getAccountLockerTargetExecutor();
+  if (chainId === 9745) {
+    return [
+      smartSessions,
+      SMART_SESSIONS_FALLBACK,
+      INTENT_EXECUTOR,
+      PROXY_EXECUTOR
+    ];
+  }
+  return [
+    smartSessions,
+    {
+      ...accountLockerHook,
+      type: "executor"
+    },
+    accountLockerSourceExecutor,
+    accountLockerTargetExecutor,
+    SMART_SESSIONS_FALLBACK,
+    INTENT_EXECUTOR,
+    PROXY_EXECUTOR
+  ];
+};
+var getInstallModuleCallData = (module) => {
+  return encodeFunctionData({
+    abi: [
+      {
+        type: "function",
+        name: "installModule",
+        inputs: [
+          {
+            type: "uint256",
+            name: "moduleTypeId"
+          },
+          {
+            type: "address",
+            name: "module"
+          },
+          {
+            type: "bytes",
+            name: "initData"
+          }
+        ],
+        outputs: [],
+        stateMutability: "nonpayable"
+      }
+    ],
+    functionName: "installModule",
+    args: [
+      MODULE_TYPE_IDS[module.type],
+      module.address,
+      module.initData || "0x"
+    ]
+  });
+};
 var getSafeAccount = async (config) => {
   const {
     owner,
@@ -572,7 +665,7 @@ var getSmartAccountClient = async (config) => {
 };
 var deploySafeAccount = async (config) => {
   try {
-    const { owner, publicClient } = config;
+    const { owner, publicClient, chainId } = config;
     if (!owner || !owner.account) {
       throw new Error(
         "Wallet not connected. Please connect your wallet first."
@@ -586,24 +679,61 @@ var deploySafeAccount = async (config) => {
         isDeployed: true
       };
     }
+    const modulesToInstall = getModulesToInstall(chainId);
+    const installCalls = modulesToInstall.map((module) => ({
+      to: safeAddress,
+      data: getInstallModuleCallData(module)
+    }));
     const smartAccountClient = await getSmartAccountClient(config);
-    const userOpHash = await smartAccountClient.sendUserOperation({
-      calls: [
-        {
-          to: safeAddress,
-          value: BigInt(0),
-          data: "0x"
-        }
-      ]
+    const safeAccount = await getSafeAccount(config);
+    const ownableValidator = getOwnableValidator({
+      owners: [owner.account.address],
+      threshold: 1
     });
-    const receipt = await smartAccountClient.waitForUserOperationReceipt({
-      hash: userOpHash
+    const nonce = await getAccountNonce(publicClient, {
+      address: safeAddress,
+      entryPointAddress: entryPoint07Address,
+      key: BigInt(
+        pad(ownableValidator.address, {
+          dir: "right",
+          size: 24
+        }) || 0
+      )
     });
-    return {
-      safeAddress,
-      txHash: receipt.receipt.transactionHash,
-      isDeployed: true
-    };
+    const userOperation = await smartAccountClient.prepareUserOperation({
+      account: safeAccount,
+      calls: installCalls,
+      nonce
+    });
+    const userOpHashToSign = getUserOperationHash({
+      chainId,
+      entryPointAddress: entryPoint07Address,
+      entryPointVersion: "0.7",
+      userOperation
+    });
+    if (!owner.account) {
+      throw new Error("Owner account is required for signing");
+    }
+    userOperation.signature = await owner.signMessage({
+      account: owner.account,
+      message: { raw: userOpHashToSign }
+    });
+    const userOpHash = await smartAccountClient.sendUserOperation(
+      userOperation
+    );
+    try {
+      const transaction = await smartAccountClient.waitForUserOperationReceipt({
+        hash: userOpHash
+      });
+      return {
+        safeAddress,
+        txHash: transaction.receipt.transactionHash,
+        isDeployed: true
+      };
+    } catch (error) {
+      console.error("Transaction failed:", error);
+      throw new Error("Failed to execute transaction");
+    }
   } catch (error) {
     throw new Error(
       `Failed to deploy Safe account: ${error.message}`
@@ -1089,7 +1219,8 @@ var ZyfaiSDK = class {
         chain: chainConfig.chain,
         publicClient: chainConfig.publicClient,
         bundlerUrl,
-        environment: this.environment
+        environment: this.environment,
+        chainId
       });
       try {
         await this.updateUserProfile({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zyfai/sdk",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "TypeScript SDK for ZyFAI Yield Optimization Engine - Deploy Safe smart wallets, manage session keys, and interact with DeFi protocols",
   "main": "dist/index.js",
   "module": "dist/index.mjs",