@zyfai/sdk 0.1.19 → 0.1.21

package/README.md

@@ -342,14 +342,16 @@ console.log("User ID:", result.userId);
 
 ### 4. Deposit Funds
 
-Transfer tokens to your Safe smart wallet:
+Transfer tokens to your Safe smart wallet. Token address is automatically selected based on chain:
+
+- **Base (8453) and Arbitrum (42161)**: USDC
+- **Plasma (9745)**: USDT
 
 ```typescript
 // Deposit 100 USDC (6 decimals) to Safe on Base
 const result = await sdk.depositFunds(
   userAddress,
   8453, // Chain ID
-  "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", // USDC on Base
   "100000000" // Amount: 100 USDC = 100 * 10^6
 );
 
@@ -359,8 +361,11 @@ if (result.success) {
 }
 ```
 
-**Note:** Amount must be in least decimal units. For USDC (6 decimals): 1 USDC = 1000000
-The SDK automatically authenticates via SIWE before logging the deposit with ZyFAI's API, so no extra steps are required on your end once the transfer confirms.
+**Note:**
+
+- Amount must be in least decimal units. For USDC (6 decimals): 1 USDC = 1000000
+- Token address is automatically selected based on chain (USDC for Base/Arbitrum, USDT for Plasma)
+- The SDK automatically authenticates via SIWE before logging the deposit with ZyFAI's API, so no extra steps are required on your end once the transfer confirms
 
 ### 5. Withdraw Funds
 

package/dist/index.d.mts

@@ -388,6 +388,8 @@ interface ChainConfig {
     rpcUrl: string;
     publicClient: PublicClient;
 }
+declare const DEFAULT_TOKEN_ADDRESSES: Record<SupportedChainId, string>;
+declare const getDefaultTokenAddress: (chainId: SupportedChainId) => string;
 /**
  * Get chain configuration for a given chain ID
  */
@@ -553,9 +555,12 @@ declare class ZyfaiSDK {
      * Deposit funds from EOA to Safe smart wallet
      * Transfers tokens from the connected wallet to the user's Safe and logs the deposit
      *
+     * Token is automatically selected based on chain:
+     * - Base (8453) and Arbitrum (42161): USDC
+     * - Plasma (9745): USDT
+     *
      * @param userAddress - User's address (owner of the Safe)
      * @param chainId - Target chain ID
-     * @param tokenAddress - Token contract address to deposit
      * @param amount - Amount in least decimal units (e.g., "100000000" for 100 USDC with 6 decimals)
      * @returns Deposit response with transaction hash
      *
@@ -565,12 +570,11 @@ declare class ZyfaiSDK {
      * const result = await sdk.depositFunds(
      *   "0xUser...",
      *   8453,
-     *   "0xaf88d065e77c8cc2239327c5edb3a432268e5831", // USDC
      *   "100000000" // 100 USDC = 100 * 10^6
      * );
      * ```
      */
-    depositFunds(userAddress: string, chainId: SupportedChainId, tokenAddress: string, amount: string): Promise<DepositResponse>;
+    depositFunds(userAddress: string, chainId: SupportedChainId, amount: string): Promise<DepositResponse>;
     /**
      * Withdraw funds from Safe smart wallet
      * Initiates a withdrawal request to the ZyFAI API
@@ -857,4 +861,4 @@ declare class ZyfaiSDK {
     getRebalanceFrequency(walletAddress: string): Promise<RebalanceFrequencyResponse>;
 }
 
-export { type ActionData, type ActiveWallet, type ActiveWalletsResponse, type AddWalletToSdkResponse, type Address, type ChainConfig, type ChainPortfolio, type DailyApyEntry, type DailyApyHistoryResponse, type DailyEarning, type DailyEarningsResponse, type DebankPortfolioResponse, type DeploySafeResponse, type DepositResponse, type ERC7739Context, type ERC7739Data, type Environment, type FirstTopupResponse, type Hex, type HistoryEntry, type HistoryPosition, type HistoryResponse, type OnchainEarnings, type OnchainEarningsResponse, type OpportunitiesResponse, type Opportunity, type PolicyData, type Pool, type PortfolioToken, type Position, type PositionSlot, type PositionsResponse, type Protocol, type ProtocolsResponse, type RebalanceFrequencyResponse, type RebalanceInfo, type RebalanceInfoResponse, type SDKConfig, type Session, type SessionKeyResponse, type SmartWalletByEOAResponse, type SmartWalletResponse, type SupportedChainId, type TVLResponse, type UserDetails, type UserDetailsResponse, type VolumeResponse, type WithdrawResponse, ZyfaiSDK, getChainConfig, getSupportedChainIds, isSupportedChain };
+export { type ActionData, type ActiveWallet, type ActiveWalletsResponse, type AddWalletToSdkResponse, type Address, type ChainConfig, type ChainPortfolio, DEFAULT_TOKEN_ADDRESSES, type DailyApyEntry, type DailyApyHistoryResponse, type DailyEarning, type DailyEarningsResponse, type DebankPortfolioResponse, type DeploySafeResponse, type DepositResponse, type ERC7739Context, type ERC7739Data, type Environment, type FirstTopupResponse, type Hex, type HistoryEntry, type HistoryPosition, type HistoryResponse, type OnchainEarnings, type OnchainEarningsResponse, type OpportunitiesResponse, type Opportunity, type PolicyData, type Pool, type PortfolioToken, type Position, type PositionSlot, type PositionsResponse, type Protocol, type ProtocolsResponse, type RebalanceFrequencyResponse, type RebalanceInfo, type RebalanceInfoResponse, type SDKConfig, type Session, type SessionKeyResponse, type SmartWalletByEOAResponse, type SmartWalletResponse, type SupportedChainId, type TVLResponse, type UserDetails, type UserDetailsResponse, type VolumeResponse, type WithdrawResponse, ZyfaiSDK, getChainConfig, getDefaultTokenAddress, getSupportedChainIds, isSupportedChain };

package/dist/index.d.ts

@@ -388,6 +388,8 @@ interface ChainConfig {
     rpcUrl: string;
     publicClient: PublicClient;
 }
+declare const DEFAULT_TOKEN_ADDRESSES: Record<SupportedChainId, string>;
+declare const getDefaultTokenAddress: (chainId: SupportedChainId) => string;
 /**
  * Get chain configuration for a given chain ID
  */
@@ -553,9 +555,12 @@ declare class ZyfaiSDK {
      * Deposit funds from EOA to Safe smart wallet
      * Transfers tokens from the connected wallet to the user's Safe and logs the deposit
      *
+     * Token is automatically selected based on chain:
+     * - Base (8453) and Arbitrum (42161): USDC
+     * - Plasma (9745): USDT
+     *
      * @param userAddress - User's address (owner of the Safe)
      * @param chainId - Target chain ID
-     * @param tokenAddress - Token contract address to deposit
      * @param amount - Amount in least decimal units (e.g., "100000000" for 100 USDC with 6 decimals)
      * @returns Deposit response with transaction hash
      *
@@ -565,12 +570,11 @@ declare class ZyfaiSDK {
      * const result = await sdk.depositFunds(
      *   "0xUser...",
      *   8453,
-     *   "0xaf88d065e77c8cc2239327c5edb3a432268e5831", // USDC
      *   "100000000" // 100 USDC = 100 * 10^6
      * );
      * ```
      */
-    depositFunds(userAddress: string, chainId: SupportedChainId, tokenAddress: string, amount: string): Promise<DepositResponse>;
+    depositFunds(userAddress: string, chainId: SupportedChainId, amount: string): Promise<DepositResponse>;
     /**
      * Withdraw funds from Safe smart wallet
      * Initiates a withdrawal request to the ZyFAI API
@@ -857,4 +861,4 @@ declare class ZyfaiSDK {
     getRebalanceFrequency(walletAddress: string): Promise<RebalanceFrequencyResponse>;
 }
 
-export { type ActionData, type ActiveWallet, type ActiveWalletsResponse, type AddWalletToSdkResponse, type Address, type ChainConfig, type ChainPortfolio, type DailyApyEntry, type DailyApyHistoryResponse, type DailyEarning, type DailyEarningsResponse, type DebankPortfolioResponse, type DeploySafeResponse, type DepositResponse, type ERC7739Context, type ERC7739Data, type Environment, type FirstTopupResponse, type Hex, type HistoryEntry, type HistoryPosition, type HistoryResponse, type OnchainEarnings, type OnchainEarningsResponse, type OpportunitiesResponse, type Opportunity, type PolicyData, type Pool, type PortfolioToken, type Position, type PositionSlot, type PositionsResponse, type Protocol, type ProtocolsResponse, type RebalanceFrequencyResponse, type RebalanceInfo, type RebalanceInfoResponse, type SDKConfig, type Session, type SessionKeyResponse, type SmartWalletByEOAResponse, type SmartWalletResponse, type SupportedChainId, type TVLResponse, type UserDetails, type UserDetailsResponse, type VolumeResponse, type WithdrawResponse, ZyfaiSDK, getChainConfig, getSupportedChainIds, isSupportedChain };
+export { type ActionData, type ActiveWallet, type ActiveWalletsResponse, type AddWalletToSdkResponse, type Address, type ChainConfig, type ChainPortfolio, DEFAULT_TOKEN_ADDRESSES, type DailyApyEntry, type DailyApyHistoryResponse, type DailyEarning, type DailyEarningsResponse, type DebankPortfolioResponse, type DeploySafeResponse, type DepositResponse, type ERC7739Context, type ERC7739Data, type Environment, type FirstTopupResponse, type Hex, type HistoryEntry, type HistoryPosition, type HistoryResponse, type OnchainEarnings, type OnchainEarningsResponse, type OpportunitiesResponse, type Opportunity, type PolicyData, type Pool, type PortfolioToken, type Position, type PositionSlot, type PositionsResponse, type Protocol, type ProtocolsResponse, type RebalanceFrequencyResponse, type RebalanceInfo, type RebalanceInfoResponse, type SDKConfig, type Session, type SessionKeyResponse, type SmartWalletByEOAResponse, type SmartWalletResponse, type SupportedChainId, type TVLResponse, type UserDetails, type UserDetailsResponse, type VolumeResponse, type WithdrawResponse, ZyfaiSDK, getChainConfig, getDefaultTokenAddress, getSupportedChainIds, isSupportedChain };

package/dist/index.js

@@ -30,8 +30,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  DEFAULT_TOKEN_ADDRESSES: () => DEFAULT_TOKEN_ADDRESSES,
   ZyfaiSDK: () => ZyfaiSDK,
   getChainConfig: () => getChainConfig,
+  getDefaultTokenAddress: () => getDefaultTokenAddress,
   getSupportedChainIds: () => getSupportedChainIds,
   isSupportedChain: () => isSupportedChain
 });
@@ -382,6 +384,23 @@ var plasma = (0, import_viem2.defineChain)({
     }
   }
 });
+var DEFAULT_TOKEN_ADDRESSES = {
+  8453: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+  // USDC on Base
+  42161: "0xaf88d065e77c8cc2239327c5edb3a432268e5831",
+  // USDC on Arbitrum
+  9745: "0xB8CE59FC3717ada4C02eaDF9682A9e934F625ebb"
+  // USDT on Plasma
+};
+var getDefaultTokenAddress = (chainId) => {
+  const address = DEFAULT_TOKEN_ADDRESSES[chainId];
+  if (!address || address === "0x0000000000000000000000000000000000000000") {
+    throw new Error(
+      `Default token address not configured for chain ${chainId}. Please provide tokenAddress explicitly.`
+    );
+  }
+  return address;
+};
 var DEFAULT_RPC_URLS = {
   8453: "https://mainnet.base.org",
   42161: "https://arb1.arbitrum.io/rpc",
@@ -436,12 +455,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 +697,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 +711,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 +1251,8 @@ var ZyfaiSDK = class {
         chain: chainConfig.chain,
         publicClient: chainConfig.publicClient,
         bundlerUrl,
-        environment: this.environment
+        environment: this.environment,
+        chainId
       });
       try {
         await this.updateUserProfile({
@@ -1348,9 +1491,12 @@ var ZyfaiSDK = class {
    * Deposit funds from EOA to Safe smart wallet
    * Transfers tokens from the connected wallet to the user's Safe and logs the deposit
    *
+   * Token is automatically selected based on chain:
+   * - Base (8453) and Arbitrum (42161): USDC
+   * - Plasma (9745): USDT
+   *
    * @param userAddress - User's address (owner of the Safe)
    * @param chainId - Target chain ID
-   * @param tokenAddress - Token contract address to deposit
    * @param amount - Amount in least decimal units (e.g., "100000000" for 100 USDC with 6 decimals)
    * @returns Deposit response with transaction hash
    *
@@ -1360,12 +1506,11 @@ var ZyfaiSDK = class {
    * const result = await sdk.depositFunds(
    *   "0xUser...",
    *   8453,
-   *   "0xaf88d065e77c8cc2239327c5edb3a432268e5831", // USDC
    *   "100000000" // 100 USDC = 100 * 10^6
    * );
    * ```
    */
-  async depositFunds(userAddress, chainId, tokenAddress, amount) {
+  async depositFunds(userAddress, chainId, amount) {
     try {
       if (!userAddress) {
         throw new Error("User address is required");
@@ -1373,12 +1518,10 @@ var ZyfaiSDK = class {
       if (!isSupportedChain(chainId)) {
         throw new Error(`Unsupported chain ID: ${chainId}`);
       }
-      if (!tokenAddress) {
-        throw new Error("Token address is required");
-      }
       if (!amount || isNaN(Number(amount)) || Number(amount) <= 0) {
         throw new Error("Valid amount is required");
       }
+      const token = getDefaultTokenAddress(chainId);
       const walletClient = this.getWalletClient();
       const chainConfig = getChainConfig(chainId);
       const safeAddress = await getDeterministicSafeAddress({
@@ -1399,7 +1542,7 @@ var ZyfaiSDK = class {
       }
       const amountBigInt = BigInt(amount);
       const txHash = await walletClient.writeContract({
-        address: tokenAddress,
+        address: token,
         abi: ERC20_ABI,
         functionName: "transfer",
         args: [safeAddress, amountBigInt],
@@ -2218,8 +2361,10 @@ var ZyfaiSDK = class {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DEFAULT_TOKEN_ADDRESSES,
   ZyfaiSDK,
   getChainConfig,
+  getDefaultTokenAddress,
   getSupportedChainIds,
   isSupportedChain
 });

package/dist/index.mjs

@@ -348,6 +348,23 @@ var plasma = defineChain({
     }
   }
 });
+var DEFAULT_TOKEN_ADDRESSES = {
+  8453: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+  // USDC on Base
+  42161: "0xaf88d065e77c8cc2239327c5edb3a432268e5831",
+  // USDC on Arbitrum
+  9745: "0xB8CE59FC3717ada4C02eaDF9682A9e934F625ebb"
+  // USDT on Plasma
+};
+var getDefaultTokenAddress = (chainId) => {
+  const address = DEFAULT_TOKEN_ADDRESSES[chainId];
+  if (!address || address === "0x0000000000000000000000000000000000000000") {
+    throw new Error(
+      `Default token address not configured for chain ${chainId}. Please provide tokenAddress explicitly.`
+    );
+  }
+  return address;
+};
 var DEFAULT_RPC_URLS = {
   8453: "https://mainnet.base.org",
   42161: "https://arb1.arbitrum.io/rpc",
@@ -401,7 +418,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 +431,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 +682,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 +696,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 +1236,8 @@ var ZyfaiSDK = class {
         chain: chainConfig.chain,
         publicClient: chainConfig.publicClient,
         bundlerUrl,
-        environment: this.environment
+        environment: this.environment,
+        chainId
       });
       try {
         await this.updateUserProfile({
@@ -1328,9 +1476,12 @@ var ZyfaiSDK = class {
    * Deposit funds from EOA to Safe smart wallet
    * Transfers tokens from the connected wallet to the user's Safe and logs the deposit
    *
+   * Token is automatically selected based on chain:
+   * - Base (8453) and Arbitrum (42161): USDC
+   * - Plasma (9745): USDT
+   *
    * @param userAddress - User's address (owner of the Safe)
    * @param chainId - Target chain ID
-   * @param tokenAddress - Token contract address to deposit
    * @param amount - Amount in least decimal units (e.g., "100000000" for 100 USDC with 6 decimals)
    * @returns Deposit response with transaction hash
    *
@@ -1340,12 +1491,11 @@ var ZyfaiSDK = class {
    * const result = await sdk.depositFunds(
    *   "0xUser...",
    *   8453,
-   *   "0xaf88d065e77c8cc2239327c5edb3a432268e5831", // USDC
    *   "100000000" // 100 USDC = 100 * 10^6
    * );
    * ```
    */
-  async depositFunds(userAddress, chainId, tokenAddress, amount) {
+  async depositFunds(userAddress, chainId, amount) {
     try {
       if (!userAddress) {
         throw new Error("User address is required");
@@ -1353,12 +1503,10 @@ var ZyfaiSDK = class {
       if (!isSupportedChain(chainId)) {
         throw new Error(`Unsupported chain ID: ${chainId}`);
       }
-      if (!tokenAddress) {
-        throw new Error("Token address is required");
-      }
       if (!amount || isNaN(Number(amount)) || Number(amount) <= 0) {
         throw new Error("Valid amount is required");
       }
+      const token = getDefaultTokenAddress(chainId);
       const walletClient = this.getWalletClient();
       const chainConfig = getChainConfig(chainId);
       const safeAddress = await getDeterministicSafeAddress({
@@ -1379,7 +1527,7 @@ var ZyfaiSDK = class {
       }
       const amountBigInt = BigInt(amount);
       const txHash = await walletClient.writeContract({
-        address: tokenAddress,
+        address: token,
         abi: ERC20_ABI,
         functionName: "transfer",
         args: [safeAddress, amountBigInt],
@@ -2197,8 +2345,10 @@ var ZyfaiSDK = class {
   }
 };
 export {
+  DEFAULT_TOKEN_ADDRESSES,
   ZyfaiSDK,
   getChainConfig,
+  getDefaultTokenAddress,
   getSupportedChainIds,
   isSupportedChain
 };

package/package.json

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