@zyfai/sdk 0.1.26 → 0.1.27

package/README.md

@@ -28,8 +28,6 @@ pnpm add @zyfai/sdk viem
 ## Prerequisites
 
 1. **API Key**: Single API key for both Execution API (Safe deployment, transactions, session keys) and Data API (earnings, opportunities, analytics)
-2. **Bundler API Key**: Required for Safe deployment. Get it from:
-   - [Pimlico](https://www.pimlico.io/) (Recommended)
 
 **Get your API key from [ZyFAI Dashboard](https://sdk.zyf.ai)**
 
@@ -44,8 +42,7 @@ import { ZyfaiSDK } from "@zyfai/sdk";
 
 // Option 1: Full configuration object
 const sdk = new ZyfaiSDK({
-  apiKey: "your-api-key", // API key for both Execution API and Data API
-  bundlerApiKey: "your-bundler-api-key", // Required for Safe deployment
+  apiKey: "your-api-key",
   environment: "production", // or 'staging' (default: 'production')
 });
 
@@ -55,11 +52,10 @@ const sdk = new ZyfaiSDK("your-api-key");
 
 **Configuration Options:**
 
-| Option          | Required | Description                                                                                          |
-| --------------- | -------- | ---------------------------------------------------------------------------------------------------- |
-| `apiKey`        | Yes      | API key for both Execution API and Data API (Safe deployment, transactions, session keys, analytics) |
-| `bundlerApiKey` | No\*     | Pimlico API key for Safe deployment (\*required for `deploySafe`)                                    |
-| `environment`   | No       | `"production"` or `"staging"` (default: `"production"`)                                              |
+| Option        | Required | Description                                                                                          |
+| ------------- | -------- | ---------------------------------------------------------------------------------------------------- |
+| `apiKey`      | Yes      | API key for both Execution API and Data API (Safe deployment, transactions, session keys, analytics) |
+| `environment` | No       | `"production"` or `"staging"` (default: `"production"`)                                              |
 
 ### Connect Account
 
@@ -124,16 +120,11 @@ const result = await sdk.deploySafe(userAddress, 8453);
 if (result.success) {
   console.log("Safe Address:", result.safeAddress);
   console.log("Status:", result.status); // 'deployed' | 'failed'
-
-  if (result.alreadyDeployed) {
-    console.log("Safe was already deployed - no action needed");
-  } else {
-    console.log("Transaction Hash:", result.txHash);
-  }
+  console.log("Transaction Hash:", result.txHash);
 }
 ```
 
-**Note:** The SDK proactively checks if the Safe is already deployed before attempting deployment. If it exists, it returns `alreadyDeployed: true` without making any transactions.
+**Note:** The SDK proactively checks if the Safe is already deployed before attempting deployment. If it exists, it returns early without making any transactions.
 
 ### 2. Multi-Chain Support
 
@@ -178,8 +169,7 @@ new ZyfaiSDK(config: SDKConfig | string)
   - If an object is provided:
     - `apiKey` (string): Your ZyFAI API key (required)
     - `environment` ('production' | 'staging', optional): API environment (default: 'production')
-    - `bundlerApiKey` (string, optional): Bundler API key for Safe deployment (required for deploySafe)
-    - `rpcUrls` (object, optional): Custom RPC URLs per chain to avoid rate limiting
+    - `rpcUrls` (object, optional): Custom RPC URLs per chain to avoid rate limiting (optional, only needed for local operations like `getSmartWalletAddress`)
       - `8453` (string, optional): Base Mainnet RPC URL
       - `42161` (string, optional): Arbitrum One RPC URL
       - `9745` (string, optional): Plasma Mainnet RPC URL
@@ -193,14 +183,12 @@ const sdk = new ZyfaiSDK("your-api-key");
 // Option 2: Object initialization (full configuration)
 const sdk = new ZyfaiSDK({
   apiKey: "your-api-key",
-  bundlerApiKey: "your-bundler-api-key",
   environment: "production",
 });
 
 // Option 3: With custom RPC URLs (recommended to avoid rate limiting)
 const sdk = new ZyfaiSDK({
   apiKey: "your-api-key",
-  bundlerApiKey: "your-bundler-api-key",
   environment: "production",
   rpcUrls: {
     8453: "https://base-mainnet.g.alchemy.com/v2/YOUR_API_KEY", // Base
@@ -283,7 +271,7 @@ Get the Smart Wallet (Safe) address for a user.
 
 ##### `deploySafe(userAddress: string, chainId: SupportedChainId): Promise<DeploySafeResponse>`
 
-Deploy a Safe smart wallet for a user.
+Deploy a Safe smart wallet for a user. **Deployment is handled by the backend API**, which manages all RPC calls and bundler interactions. This avoids rate limiting issues.
 
 **Parameters:**
 
@@ -298,10 +286,14 @@ Deploy a Safe smart wallet for a user.
   safeAddress: Address;
   txHash: string;
   status: "deployed" | "failed";
-  alreadyDeployed?: boolean; // True if the Safe was already deployed (no new deployment needed)
 }
 ```
 
+**Note:**
+
+- User must be authenticated (automatically done via `connectAccount()`)
+- Backend handles all RPC calls, avoiding rate limiting
+
 ##### `addWalletToSdk(walletAddress: string): Promise<AddWalletToSdkResponse>`
 
 Add a wallet address to the SDK API key's allowedWallets list. This endpoint requires SDK API key authentication (API key starting with "zyfai\_").
@@ -710,7 +702,6 @@ import { ZyfaiSDK } from "@zyfai/sdk";
 async function main() {
   const sdk = new ZyfaiSDK({
     apiKey: process.env.ZYFAI_API_KEY!,
-    bundlerApiKey: process.env.BUNDLER_API_KEY!,
   });
 
   // Connect account (automatically authenticates via SIWE)
@@ -865,9 +856,6 @@ For running the examples, set up the following environment variables:
 # Required: API key (used for both Execution API and Data API)
 ZYFAI_API_KEY=your-api-key
 
-# Required for Safe deployment: Bundler API key (e.g., Pimlico)
-BUNDLER_API_KEY=your-pimlico-api-key
-
 # Required for examples: Private key for signing transactions
 # WARNING: Never commit your private key to version control!
 PRIVATE_KEY=0x...

package/dist/index.d.mts

@@ -14,7 +14,6 @@ interface RpcUrlsConfig {
 interface SDKConfig {
     apiKey: string;
     environment?: Environment;
-    bundlerApiKey?: string;
     rpcUrls?: RpcUrlsConfig;
 }
 interface DeploySafeResponse {
@@ -22,8 +21,6 @@ interface DeploySafeResponse {
     safeAddress: Address;
     txHash: string;
     status: "deployed" | "failed";
-    /** True if the Safe was already deployed (no new deployment needed) */
-    alreadyDeployed?: boolean;
 }
 /** @internal */
 interface UpdateUserProfileRequest {
@@ -414,7 +411,6 @@ declare class ZyfaiSDK {
     private httpClient;
     private signer;
     private walletClient;
-    private bundlerApiKey?;
     private authenticatedUserId;
     private hasActiveSessionKey;
     private environment;

package/dist/index.d.ts

@@ -14,7 +14,6 @@ interface RpcUrlsConfig {
 interface SDKConfig {
     apiKey: string;
     environment?: Environment;
-    bundlerApiKey?: string;
     rpcUrls?: RpcUrlsConfig;
 }
 interface DeploySafeResponse {
@@ -22,8 +21,6 @@ interface DeploySafeResponse {
     safeAddress: Address;
     txHash: string;
     status: "deployed" | "failed";
-    /** True if the Safe was already deployed (no new deployment needed) */
-    alreadyDeployed?: boolean;
 }
 /** @internal */
 interface UpdateUserProfileRequest {
@@ -414,7 +411,6 @@ declare class ZyfaiSDK {
     private httpClient;
     private signer;
     private walletClient;
-    private bundlerApiKey?;
     private authenticatedUserId;
     private hasActiveSessionKey;
     private environment;

package/dist/index.js

@@ -61,6 +61,8 @@ var ENDPOINTS = {
   USER_ME: "/users/me",
   USER_WITHDRAW: "/users/withdraw",
   PARTIAL_WITHDRAW: "/users/partial-withdraw",
+  // Safe Deployment (single endpoint)
+  SAFE_DEPLOY: "/users/safe-deploy",
   // Session Keys
   SESSION_KEYS_CONFIG: "/session-keys/config",
   SESSION_KEYS_ADD: "/session-keys/add",
@@ -433,120 +435,18 @@ var isSupportedChain = (chainId) => {
 var getSupportedChainIds = () => {
   return Object.keys(CHAINS).map(Number);
 };
-var getBundlerUrl = (chainId, bundlerApiKey, bundlerProvider = "pimlico") => {
-  if (!bundlerApiKey) {
-    throw new Error("Bundler API key is required for Safe deployment");
-  }
-  switch (bundlerProvider) {
-    case "pimlico":
-      return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${bundlerApiKey}`;
-    case "custom":
-      return bundlerApiKey;
-    default:
-      throw new Error(`Unsupported bundler provider: ${bundlerProvider}`);
-  }
-};
 
 // src/utils/safe-account.ts
 var import_module_sdk = require("@rhinestone/module-sdk");
-var import_permissionless = require("permissionless");
-var import_erc7579 = require("permissionless/actions/erc7579");
-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,
@@ -579,10 +479,13 @@ var getSafeAccount = async (config) => {
     threshold: 1
   });
   const saltHex = (0, import_viem3.fromHex)((0, import_viem3.toHex)(effectiveSalt), "bigint");
+  const tempOwner = {
+    address: formattedEffectiveAddress,
+    type: "json-rpc"
+  };
   const safeAccount = await (0, import_accounts.toSafeSmartAccount)({
     client: publicClient,
-    owners: [owner.account],
-    // Pass the owner object with address and signMessage capability
+    owners: [tempOwner],
     version: "1.4.1",
     entryPoint: {
       address: import_account_abstraction.entryPoint07Address,
@@ -652,100 +555,41 @@ var getAccountType = async (address, publicClient) => {
     return "Unknown";
   }
 };
-var getSmartAccountClient = async (config) => {
-  const { chain, bundlerUrl } = config;
-  const safeAccount = await getSafeAccount(config);
-  const bundlerClient = (0, import_pimlico.createPimlicoClient)({
-    transport: (0, import_viem3.http)(bundlerUrl),
-    entryPoint: {
-      address: import_account_abstraction.entryPoint07Address,
-      version: "0.7"
-    }
-  });
-  const smartAccountClient = (0, import_permissionless.createSmartAccountClient)({
-    account: safeAccount,
-    chain,
-    bundlerTransport: (0, import_viem3.http)(bundlerUrl),
-    paymaster: bundlerClient,
-    userOperation: {
-      estimateFeesPerGas: async () => {
-        return (await bundlerClient.getUserOperationGasPrice()).fast;
-      }
-    }
-  }).extend((0, import_erc7579.erc7579Actions)());
-  return smartAccountClient;
-};
 var deploySafeAccount = async (config) => {
   try {
-    const { owner, publicClient, chainId } = config;
+    const { owner, httpClient, chainId } = config;
     if (!owner || !owner.account) {
       throw new Error(
         "Wallet not connected. Please connect your wallet first."
       );
     }
-    const safeAddress = await getDeterministicSafeAddress(config);
-    const isDeployed = await isSafeDeployed(safeAddress, publicClient);
-    if (isDeployed) {
-      return {
-        safeAddress,
-        isDeployed: true
-      };
-    }
-    const modulesToInstall = getModulesToInstall(chainId);
-    const installCalls = modulesToInstall.map((module2) => ({
-      to: safeAddress,
-      data: getInstallModuleCallData(module2)
-    }));
-    const smartAccountClient = await getSmartAccountClient(config);
-    const safeAccount = await getSafeAccount(config);
-    const ownableValidator = (0, import_module_sdk.getOwnableValidator)({
-      owners: [owner.account.address],
-      threshold: 1
-    });
-    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
-      )
-    });
-    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");
+    const prepareResponse = await httpClient.post(
+      `${ENDPOINTS.SAFE_DEPLOY}?chainId=${chainId}`
+    );
+    if (!prepareResponse.userOpHashToSign) {
+      throw new Error(
+        "Backend did not return userOpHashToSign. Response: " + JSON.stringify(prepareResponse)
+      );
     }
-    userOperation.signature = await owner.signMessage({
+    const userOpHashToSign = prepareResponse.userOpHashToSign;
+    const userOpSignature = await owner.signMessage({
       account: owner.account,
       message: { raw: userOpHashToSign }
     });
-    const userOpHash = await smartAccountClient.sendUserOperation(
-      userOperation
+    const deployResponse = await httpClient.post(
+      `${ENDPOINTS.SAFE_DEPLOY}?chainId=${chainId}`,
+      { userOpSignature }
     );
-    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");
+    if (!deployResponse.success) {
+      throw new Error(
+        `Safe deployment failed: ${JSON.stringify(deployResponse)}`
+      );
     }
+    return {
+      safeAddress: deployResponse.safeAddress || "0x",
+      txHash: deployResponse.txHash,
+      isDeployed: true
+    };
   } catch (error) {
     throw new Error(
       `Failed to deploy Safe account: ${error.message}`
@@ -799,24 +643,20 @@ var signSessionKey = async (config, sessions, allPublicClients, signingParams) =
 // src/core/ZyfaiSDK.ts
 var import_siwe = require("siwe");
 var ZyfaiSDK = class {
-  // Optional custom RPC URLs per chain
   constructor(config) {
     this.signer = null;
     this.walletClient = null;
     this.authenticatedUserId = null;
-    // If non-null, user is authenticated
     this.hasActiveSessionKey = false;
     this.currentProvider = null;
-    // Store reference to current provider for event handling
     this.currentChainId = null;
     const sdkConfig = typeof config === "string" ? { apiKey: config } : config;
-    const { apiKey, environment, bundlerApiKey, rpcUrls } = sdkConfig;
+    const { apiKey, environment, rpcUrls } = sdkConfig;
     if (!apiKey) {
       throw new Error("API key is required");
     }
     this.environment = environment || "production";
     this.httpClient = new HttpClient(apiKey, this.environment);
-    this.bundlerApiKey = bundlerApiKey;
     this.rpcUrls = rpcUrls;
   }
   /**
@@ -1193,11 +1033,7 @@ var ZyfaiSDK = class {
       if (!isSupportedChain(chainId)) {
         throw new Error(`Unsupported chain ID: ${chainId}`);
       }
-      if (!this.bundlerApiKey) {
-        throw new Error(
-          "Bundler API key is required for Safe deployment. Please provide bundlerApiKey in SDK configuration."
-        );
-      }
+      await this.authenticateUser();
       const walletClient = this.getWalletClient(chainId);
       const chainConfig = getChainConfig(chainId, this.rpcUrls);
       const safeAddress = await getDeterministicSafeAddress({
@@ -1211,45 +1047,34 @@ var ZyfaiSDK = class {
         safeAddress,
         chainConfig.publicClient
       );
+      if (!alreadyDeployed) {
+        const accountType = await getAccountType(
+          userAddress,
+          chainConfig.publicClient
+        );
+        if (accountType !== "EOA") {
+          throw new Error(
+            `Address ${userAddress} is not an EOA. Only EOA addresses can deploy Safe smart wallets.`
+          );
+        }
+      }
       if (alreadyDeployed) {
         return {
           success: true,
           safeAddress,
           txHash: "0x0",
-          status: "deployed",
-          alreadyDeployed: true
+          status: "deployed"
         };
       }
-      const accountType = await getAccountType(
-        userAddress,
-        chainConfig.publicClient
-      );
-      if (accountType !== "EOA") {
-        throw new Error(
-          `Address ${userAddress} is not an EOA. Only EOA addresses can deploy Safe smart wallets.`
-        );
-      }
-      const bundlerUrl = getBundlerUrl(chainId, this.bundlerApiKey);
       const deploymentResult = await deploySafeAccount({
         owner: walletClient,
         safeOwnerAddress: userAddress,
         chain: chainConfig.chain,
         publicClient: chainConfig.publicClient,
-        bundlerUrl,
         environment: this.environment,
-        chainId
+        chainId,
+        httpClient: this.httpClient
       });
-      try {
-        await this.updateUserProfile({
-          smartWallet: deploymentResult.safeAddress,
-          chains: [chainId]
-        });
-      } catch (updateError) {
-        console.warn(
-          "Failed to update user profile after Safe deployment:",
-          updateError.message
-        );
-      }
       try {
         await this.initializeUser(deploymentResult.safeAddress, chainId);
       } catch (initError) {

package/dist/index.mjs

@@ -20,6 +20,8 @@ var ENDPOINTS = {
   USER_ME: "/users/me",
   USER_WITHDRAW: "/users/withdraw",
   PARTIAL_WITHDRAW: "/users/partial-withdraw",
+  // Safe Deployment (single endpoint)
+  SAFE_DEPLOY: "/users/safe-deploy",
   // Session Keys
   SESSION_KEYS_CONFIG: "/session-keys/config",
   SESSION_KEYS_ADD: "/session-keys/add",
@@ -320,7 +322,7 @@ import { privateKeyToAccount } from "viem/accounts";
 import {
   createWalletClient,
   custom,
-  http as http3,
+  http as http2,
   getAddress as getAddress2
 } from "viem";
 
@@ -397,19 +399,6 @@ var isSupportedChain = (chainId) => {
 var getSupportedChainIds = () => {
   return Object.keys(CHAINS).map(Number);
 };
-var getBundlerUrl = (chainId, bundlerApiKey, bundlerProvider = "pimlico") => {
-  if (!bundlerApiKey) {
-    throw new Error("Bundler API key is required for Safe deployment");
-  }
-  switch (bundlerProvider) {
-    case "pimlico":
-      return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${bundlerApiKey}`;
-    case "custom":
-      return bundlerApiKey;
-    default:
-      throw new Error(`Unsupported bundler provider: ${bundlerProvider}`);
-  }
-};
 
 // src/utils/safe-account.ts
 import {
@@ -418,120 +407,23 @@ import {
   getAccount,
   getEnableSessionDetails,
   getPermissionId,
-  getSessionNonce,
-  getSmartSessionsValidator,
-  getAccountLockerHook,
-  getAccountLockerSourceExecutor,
-  getAccountLockerTargetExecutor
+  getSessionNonce
 } from "@rhinestone/module-sdk";
-import { createSmartAccountClient } from "permissionless";
-import { erc7579Actions } from "permissionless/actions/erc7579";
-import { createPimlicoClient } from "permissionless/clients/pimlico";
 import { toSafeSmartAccount } from "permissionless/accounts";
 import {
-  http as http2,
   getAddress,
-  encodeFunctionData,
   fromHex,
-  toHex,
-  encodeAbiParameters,
-  pad
+  toHex
 } 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,
@@ -564,10 +456,13 @@ var getSafeAccount = async (config) => {
     threshold: 1
   });
   const saltHex = fromHex(toHex(effectiveSalt), "bigint");
+  const tempOwner = {
+    address: formattedEffectiveAddress,
+    type: "json-rpc"
+  };
   const safeAccount = await toSafeSmartAccount({
     client: publicClient,
-    owners: [owner.account],
-    // Pass the owner object with address and signMessage capability
+    owners: [tempOwner],
     version: "1.4.1",
     entryPoint: {
       address: entryPoint07Address,
@@ -637,100 +532,41 @@ var getAccountType = async (address, publicClient) => {
     return "Unknown";
   }
 };
-var getSmartAccountClient = async (config) => {
-  const { chain, bundlerUrl } = config;
-  const safeAccount = await getSafeAccount(config);
-  const bundlerClient = createPimlicoClient({
-    transport: http2(bundlerUrl),
-    entryPoint: {
-      address: entryPoint07Address,
-      version: "0.7"
-    }
-  });
-  const smartAccountClient = createSmartAccountClient({
-    account: safeAccount,
-    chain,
-    bundlerTransport: http2(bundlerUrl),
-    paymaster: bundlerClient,
-    userOperation: {
-      estimateFeesPerGas: async () => {
-        return (await bundlerClient.getUserOperationGasPrice()).fast;
-      }
-    }
-  }).extend(erc7579Actions());
-  return smartAccountClient;
-};
 var deploySafeAccount = async (config) => {
   try {
-    const { owner, publicClient, chainId } = config;
+    const { owner, httpClient, chainId } = config;
     if (!owner || !owner.account) {
       throw new Error(
         "Wallet not connected. Please connect your wallet first."
       );
     }
-    const safeAddress = await getDeterministicSafeAddress(config);
-    const isDeployed = await isSafeDeployed(safeAddress, publicClient);
-    if (isDeployed) {
-      return {
-        safeAddress,
-        isDeployed: true
-      };
-    }
-    const modulesToInstall = getModulesToInstall(chainId);
-    const installCalls = modulesToInstall.map((module) => ({
-      to: safeAddress,
-      data: getInstallModuleCallData(module)
-    }));
-    const smartAccountClient = await getSmartAccountClient(config);
-    const safeAccount = await getSafeAccount(config);
-    const ownableValidator = getOwnableValidator({
-      owners: [owner.account.address],
-      threshold: 1
-    });
-    const nonce = await getAccountNonce(publicClient, {
-      address: safeAddress,
-      entryPointAddress: entryPoint07Address,
-      key: BigInt(
-        pad(ownableValidator.address, {
-          dir: "right",
-          size: 24
-        }) || 0
-      )
-    });
-    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");
+    const prepareResponse = await httpClient.post(
+      `${ENDPOINTS.SAFE_DEPLOY}?chainId=${chainId}`
+    );
+    if (!prepareResponse.userOpHashToSign) {
+      throw new Error(
+        "Backend did not return userOpHashToSign. Response: " + JSON.stringify(prepareResponse)
+      );
     }
-    userOperation.signature = await owner.signMessage({
+    const userOpHashToSign = prepareResponse.userOpHashToSign;
+    const userOpSignature = await owner.signMessage({
       account: owner.account,
       message: { raw: userOpHashToSign }
     });
-    const userOpHash = await smartAccountClient.sendUserOperation(
-      userOperation
+    const deployResponse = await httpClient.post(
+      `${ENDPOINTS.SAFE_DEPLOY}?chainId=${chainId}`,
+      { userOpSignature }
     );
-    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");
+    if (!deployResponse.success) {
+      throw new Error(
+        `Safe deployment failed: ${JSON.stringify(deployResponse)}`
+      );
     }
+    return {
+      safeAddress: deployResponse.safeAddress || "0x",
+      txHash: deployResponse.txHash,
+      isDeployed: true
+    };
   } catch (error) {
     throw new Error(
       `Failed to deploy Safe account: ${error.message}`
@@ -784,24 +620,20 @@ var signSessionKey = async (config, sessions, allPublicClients, signingParams) =
 // src/core/ZyfaiSDK.ts
 import { SiweMessage } from "siwe";
 var ZyfaiSDK = class {
-  // Optional custom RPC URLs per chain
   constructor(config) {
     this.signer = null;
     this.walletClient = null;
     this.authenticatedUserId = null;
-    // If non-null, user is authenticated
     this.hasActiveSessionKey = false;
     this.currentProvider = null;
-    // Store reference to current provider for event handling
     this.currentChainId = null;
     const sdkConfig = typeof config === "string" ? { apiKey: config } : config;
-    const { apiKey, environment, bundlerApiKey, rpcUrls } = sdkConfig;
+    const { apiKey, environment, rpcUrls } = sdkConfig;
     if (!apiKey) {
       throw new Error("API key is required");
     }
     this.environment = environment || "production";
     this.httpClient = new HttpClient(apiKey, this.environment);
-    this.bundlerApiKey = bundlerApiKey;
     this.rpcUrls = rpcUrls;
   }
   /**
@@ -1021,7 +853,7 @@ var ZyfaiSDK = class {
       this.walletClient = createWalletClient({
         account: this.signer,
         chain: chainConfig.chain,
-        transport: http3(chainConfig.rpcUrl)
+        transport: http2(chainConfig.rpcUrl)
       });
       connectedAddress = this.signer.address;
       this.currentProvider = null;
@@ -1107,7 +939,7 @@ var ZyfaiSDK = class {
       return createWalletClient({
         account: this.signer,
         chain: targetChainConfig.chain,
-        transport: http3(targetChainConfig.rpcUrl)
+        transport: http2(targetChainConfig.rpcUrl)
       });
     } else {
       if (!this.walletClient) {
@@ -1178,11 +1010,7 @@ var ZyfaiSDK = class {
       if (!isSupportedChain(chainId)) {
         throw new Error(`Unsupported chain ID: ${chainId}`);
       }
-      if (!this.bundlerApiKey) {
-        throw new Error(
-          "Bundler API key is required for Safe deployment. Please provide bundlerApiKey in SDK configuration."
-        );
-      }
+      await this.authenticateUser();
       const walletClient = this.getWalletClient(chainId);
       const chainConfig = getChainConfig(chainId, this.rpcUrls);
       const safeAddress = await getDeterministicSafeAddress({
@@ -1196,45 +1024,34 @@ var ZyfaiSDK = class {
         safeAddress,
         chainConfig.publicClient
       );
+      if (!alreadyDeployed) {
+        const accountType = await getAccountType(
+          userAddress,
+          chainConfig.publicClient
+        );
+        if (accountType !== "EOA") {
+          throw new Error(
+            `Address ${userAddress} is not an EOA. Only EOA addresses can deploy Safe smart wallets.`
+          );
+        }
+      }
       if (alreadyDeployed) {
         return {
           success: true,
           safeAddress,
           txHash: "0x0",
-          status: "deployed",
-          alreadyDeployed: true
+          status: "deployed"
         };
       }
-      const accountType = await getAccountType(
-        userAddress,
-        chainConfig.publicClient
-      );
-      if (accountType !== "EOA") {
-        throw new Error(
-          `Address ${userAddress} is not an EOA. Only EOA addresses can deploy Safe smart wallets.`
-        );
-      }
-      const bundlerUrl = getBundlerUrl(chainId, this.bundlerApiKey);
       const deploymentResult = await deploySafeAccount({
         owner: walletClient,
         safeOwnerAddress: userAddress,
         chain: chainConfig.chain,
         publicClient: chainConfig.publicClient,
-        bundlerUrl,
         environment: this.environment,
-        chainId
+        chainId,
+        httpClient: this.httpClient
       });
-      try {
-        await this.updateUserProfile({
-          smartWallet: deploymentResult.safeAddress,
-          chains: [chainId]
-        });
-      } catch (updateError) {
-        console.warn(
-          "Failed to update user profile after Safe deployment:",
-          updateError.message
-        );
-      }
       try {
         await this.initializeUser(deploymentResult.safeAddress, chainId);
       } catch (initError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zyfai/sdk",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "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",