@opendatalabs/vana-sdk 0.1.0-alpha.7ee7635 → 0.1.0-alpha.80df35f

package/dist/controllers/permissions.js

@@ -18,9 +18,10 @@ import { validateGrant } from "../utils/grantValidation";
 import { withSignatureCache } from "../utils/signatureCache";
 import { formatSignatureForContract } from "../utils/signatureFormatter";
 import { toViemTypedDataDefinition } from "../utils/typedDataConverter";
-class PermissionsController {
+import { BaseController } from "./base";
+class PermissionsController extends BaseController {
   constructor(context) {
-    this.context = context;
+    super(context);
   }
   /**
    * Grants permission for an application to access user data with gasless transactions.
@@ -57,6 +58,7 @@ class PermissionsController {
    * ```
    */
   async grant(params) {
+    this.assertWallet();
     const { typedData, signature } = await this.createAndSign(params);
     const result = await this.submitSignedGrantWithEvents(typedData, signature);
     return result;
@@ -87,6 +89,7 @@ class PermissionsController {
    * ```
    */
   async submitPermissionGrant(params) {
+    this.assertWallet();
     const { typedData, signature } = await this.createAndSign(params);
     return await this.submitSignedGrant(typedData, signature);
   }
@@ -116,6 +119,7 @@ class PermissionsController {
    * ```
    */
   async prepareGrant(params) {
+    this.assertWallet();
     try {
       const grantFile = createGrantFile(params);
       validateGrant(grantFile);
@@ -156,7 +160,7 @@ class PermissionsController {
    */
   async confirmGrantInternal(params, grantFile) {
     try {
-      let grantUrl = params.grantUrl;
+      let { grantUrl } = params;
       console.debug("\u{1F50D} Debug - Grant URL from params:", grantUrl);
       if (!grantUrl) {
         if (!this.context.relayerCallbacks?.storeGrantFile && !this.context.storageManager) {
@@ -246,10 +250,11 @@ class PermissionsController {
    * ```
    */
   async createAndSign(params) {
+    this.assertWallet();
     try {
       const grantFile = createGrantFile(params);
       validateGrant(grantFile);
-      let grantUrl = params.grantUrl;
+      let { grantUrl } = params;
       console.debug("\u{1F50D} Debug - Grant URL from params:", grantUrl);
       if (!grantUrl) {
         if (!this.context.relayerCallbacks?.storeGrantFile && !this.context.storageManager) {
@@ -337,7 +342,7 @@ class PermissionsController {
         "\u{1F50D} Debug - submitSignedGrant called with typed data:",
         JSON.stringify(
           typedData,
-          (key, value) => typeof value === "bigint" ? value.toString() : value,
+          (_key, value) => typeof value === "bigint" ? value.toString() : value,
           2
         )
       );
@@ -346,7 +351,7 @@ class PermissionsController {
           typedData,
           signature
         );
-        const account = this.context.walletClient.account || await this.getUserAddress();
+        const account = this.context.walletClient?.account ?? this.context.userAddress;
         const { tx } = await import("../utils/transactionHelpers");
         return tx({
           hash,
@@ -398,11 +403,11 @@ class PermissionsController {
         trustServerInput,
         signature
       );
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
-        from: typeof account === "string" ? account : account.address,
+        from: account,
         contract: "DataPortabilityServers",
         fn: "trustServerWithSignature"
       });
@@ -463,7 +468,7 @@ class PermissionsController {
         addAndTrustServerInput,
         signature
       );
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -483,7 +488,7 @@ class PermissionsController {
   }
   /**
    * Internal method to submit a signed grant and wait for events.
-   * 
+   *
    * @internal
    * @param typedData - The EIP-712 typed data for the permission grant
    * @param signature - The user's signature authorizing the transaction
@@ -497,7 +502,9 @@ class PermissionsController {
     const result = await this.context.waitForTransactionEvents(txResult);
     const event = result.expectedEvents.PermissionAdded;
     if (!event) {
-      throw new BlockchainError("PermissionAdded event not found in transaction");
+      throw new BlockchainError(
+        "PermissionAdded event not found in transaction"
+      );
     }
     const receipt = await this.context.publicClient.getTransactionReceipt({
       hash: result.hash
@@ -514,7 +521,7 @@ class PermissionsController {
   }
   /**
    * Internal method for confirm grant with events.
-   * 
+   *
    * @internal
    * @param params - The permission grant parameters
    * @param grantFile - The pre-created grant file object
@@ -528,7 +535,9 @@ class PermissionsController {
     const result = await this.context.waitForTransactionEvents(txResult);
     const event = result.expectedEvents.PermissionAdded;
     if (!event) {
-      throw new BlockchainError("PermissionAdded event not found in transaction");
+      throw new BlockchainError(
+        "PermissionAdded event not found in transaction"
+      );
     }
     const receipt = await this.context.publicClient.getTransactionReceipt({
       hash: result.hash
@@ -543,34 +552,6 @@ class PermissionsController {
       fileIds: event.fileIds
     };
   }
-  /**
-   * Internal method to submit a signed revoke and wait for events.
-   * 
-   * @internal
-   * @param typedData - The EIP-712 typed data for the permission revoke
-   * @param signature - The user's signature authorizing the transaction  
-   * @returns Promise resolving to PermissionRevokeResult with parsed events
-   */
-  async submitSignedRevokeWithEvents(typedData, signature) {
-    const txResult = await this.submitSignedRevoke(typedData, signature);
-    if (!this.context.waitForTransactionEvents) {
-      throw new BlockchainError("waitForTransactionEvents not configured");
-    }
-    const result = await this.context.waitForTransactionEvents(txResult);
-    const event = result.expectedEvents.PermissionRevoked;
-    if (!event) {
-      throw new BlockchainError("PermissionRevoked event not found in transaction");
-    }
-    const receipt = await this.context.publicClient.getTransactionReceipt({
-      hash: result.hash
-    });
-    return {
-      transactionHash: result.hash,
-      blockNumber: receipt.blockNumber,
-      gasUsed: receipt.gasUsed,
-      permissionId: event.permissionId
-    };
-  }
   /**
    * Submits an already-signed permission revoke transaction to the blockchain.
    *
@@ -601,9 +582,12 @@ class PermissionsController {
           signature
         );
       } else {
-        hash = await this.submitDirectRevokeTransaction(typedData, signature);
+        hash = await this.submitDirectRevokeTransaction(
+          typedData,
+          signature
+        );
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -651,9 +635,12 @@ class PermissionsController {
           signature
         );
       } else {
-        hash = await this.submitSignedUntrustTransaction(typedData, signature);
+        hash = await this.submitSignedUntrustTransaction(
+          typedData,
+          signature
+        );
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -684,7 +671,8 @@ class PermissionsController {
    * @throws {BlockchainError} When contract submission fails
    */
   async submitDirectTransaction(typedData, signature) {
-    const chainId = await this.context.walletClient.getChainId();
+    this.assertWallet();
+    const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
       chainId,
       "DataPortabilityPermissions"
@@ -704,17 +692,17 @@ class PermissionsController {
     console.debug("\u{1F50D} Debug - Grant field value:", typedData.message.grant);
     console.debug(
       "\u{1F50D} Debug - Grant field length:",
-      typedData.message.grant?.length || 0
+      typedData.message.grant?.length ?? 0
     );
     const formattedSignature = formatSignatureForContract(signature);
-    const account = this.context.walletClient.account || await this.getUserAddress();
+    const account = this.context.walletClient?.account ?? this.context.userAddress;
     const txHash = await this.context.walletClient.writeContract({
       address: DataPortabilityPermissionsAddress,
       abi: DataPortabilityPermissionsAbi,
       functionName: "addPermission",
       args: [permissionInput, formattedSignature],
       account,
-      chain: this.context.walletClient.chain || null
+      chain: this.context.walletClient?.chain ?? null
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -749,6 +737,7 @@ class PermissionsController {
    * ```
    */
   async revoke(params) {
+    this.assertWallet();
     const txResult = await this.submitPermissionRevoke(params);
     if (!this.context.waitForTransactionEvents) {
       throw new BlockchainError("waitForTransactionEvents not configured");
@@ -756,7 +745,9 @@ class PermissionsController {
     const result = await this.context.waitForTransactionEvents(txResult);
     const event = result.expectedEvents.PermissionRevoked;
     if (!event) {
-      throw new BlockchainError("PermissionRevoked event not found in transaction");
+      throw new BlockchainError(
+        "PermissionRevoked event not found in transaction"
+      );
     }
     const receipt = await this.context.publicClient.getTransactionReceipt({
       hash: result.hash
@@ -788,11 +779,12 @@ class PermissionsController {
    * ```
    */
   async submitPermissionRevoke(params) {
+    this.assertWallet();
     try {
-      if (!this.context.walletClient.chain?.id) {
+      if (!this.context.walletClient?.chain?.id) {
         throw new BlockchainError("Chain ID not available");
       }
-      const chainId = await this.context.walletClient.getChainId();
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityPermissionsAddress = getContractAddress(
         chainId,
         "DataPortabilityPermissions"
@@ -800,14 +792,14 @@ class PermissionsController {
       const DataPortabilityPermissionsAbi = getAbi(
         "DataPortabilityPermissions"
       );
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const txHash = await this.context.walletClient.writeContract({
         address: DataPortabilityPermissionsAddress,
         abi: DataPortabilityPermissionsAbi,
         functionName: "revokePermission",
         args: [params.permissionId],
         account,
-        chain: this.context.walletClient.chain || null
+        chain: this.context.walletClient?.chain ?? null
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -855,8 +847,9 @@ class PermissionsController {
    * ```
    */
   async submitRevokeWithSignature(params) {
+    this.assertWallet();
     try {
-      if (!this.context.walletClient.chain?.id) {
+      if (!this.context.walletClient?.chain?.id) {
         throw new BlockchainError("Chain ID not available");
       }
       const nonce = await this.getPermissionsUserNonce();
@@ -883,9 +876,12 @@ class PermissionsController {
           signature
         );
       } else {
-        hash = await this.submitDirectRevokeTransaction(typedData, signature);
+        hash = await this.submitDirectRevokeTransaction(
+          typedData,
+          signature
+        );
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -900,64 +896,6 @@ class PermissionsController {
       );
     }
   }
-  /**
-   * @deprecated Use getPermissionsUserNonce() for permission operations or getServersUserNonce() for server operations
-   *
-   * Retrieves the user's current nonce from the DataPortabilityServers contract.
-   * This method is deprecated in favor of more specific nonce methods.
-   *
-   * The nonce is used to prevent replay attacks in signed transactions and must
-   * be incremented with each transaction to maintain security.
-   *
-   * @returns Promise resolving to the user's current nonce value as a bigint
-   * @throws {Error} When wallet account is not available
-   * @throws {Error} When chain ID is not available
-   * @throws {NonceError} When reading nonce from contract fails
-   * @private
-   * @example
-   * ```typescript
-   * // Deprecated - use specific methods instead
-   * const nonce = await this.getUserNonce();
-   *
-   * // Use these instead:
-   * const permissionsNonce = await this.getPermissionsUserNonce();
-   * const serversNonce = await this.getServersUserNonce();
-   * ```
-   */
-  /**
-   * @deprecated Use getPermissionsUserNonce() for permission operations or getServersUserNonce() for server operations
-   *
-   * Retrieves the user's current nonce from the DataPortabilityServers contract.
-   *
-   * @remarks
-   * This method is deprecated in favor of more specific nonce methods that target
-   * the appropriate contract for the operation being performed.
-   *
-   * @returns Promise resolving to the user's current nonce as a bigint
-   * @throws {NonceError} When retrieving the nonce fails
-   */
-  async getUserNonce() {
-    try {
-      const userAddress = await this.getUserAddress();
-      const chainId = await this.context.walletClient.getChainId();
-      const DataPortabilityServersAddress = getContractAddress(
-        chainId,
-        "DataPortabilityServers"
-      );
-      const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
-      const nonce = await this.context.publicClient.readContract({
-        address: DataPortabilityServersAddress,
-        abi: DataPortabilityServersAbi,
-        functionName: "userNonce",
-        args: [userAddress]
-      });
-      return nonce;
-    } catch (error) {
-      throw new NonceError(
-        `Failed to retrieve user nonce: ${error instanceof Error ? error.message : "Unknown error"}`
-      );
-    }
-  }
   /**
    * Retrieves the user's current nonce from the DataPortabilityServers contract.
    * This nonce is used for server-related operations (AddAndTrustServer, TrustServer, UntrustServer).
@@ -984,8 +922,8 @@ class PermissionsController {
    */
   async getServersUserNonce() {
     try {
-      const userAddress = await this.getUserAddress();
-      const chainId = await this.context.walletClient.getChainId();
+      const userAddress = this.context.userAddress;
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
         "DataPortabilityServers"
@@ -1030,8 +968,8 @@ class PermissionsController {
    */
   async getPermissionsUserNonce() {
     try {
-      const userAddress = await this.getUserAddress();
-      const chainId = await this.context.walletClient.getChainId();
+      const userAddress = this.context.userAddress;
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityPermissionsAddress = getContractAddress(
         chainId,
         "DataPortabilityPermissions"
@@ -1070,7 +1008,7 @@ class PermissionsController {
       "\u{1F50D} Debug - Composing permission message with grantUrl:",
       params.grantUrl
     );
-    const chainId = await this.context.walletClient.getChainId();
+    const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityGranteesAddress = getContractAddress(
       chainId,
       "DataPortabilityGrantees"
@@ -1179,7 +1117,7 @@ class PermissionsController {
    * @returns Promise resolving to the EIP-712 domain configuration
    */
   async getPermissionDomain() {
-    const chainId = await this.context.walletClient.getChainId();
+    const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
       chainId,
       "DataPortabilityPermissions"
@@ -1198,8 +1136,9 @@ class PermissionsController {
    * @returns Promise resolving to the cryptographic signature
    */
   async signTypedData(typedData) {
+    this.assertWallet();
     try {
-      const walletAddress = this.context.walletClient.account?.address || await this.getUserAddress();
+      const walletAddress = this.context.walletClient.account?.address ?? this.context.userAddress;
       return await withSignatureCache(
         this.context.platform.cache,
         walletAddress,
@@ -1208,9 +1147,9 @@ class PermissionsController {
           const viemCompatibleTypedData = toViemTypedDataDefinition(typedData);
           return await this.context.walletClient.signTypedData({
             ...viemCompatibleTypedData,
-            // Non-null assertion is safe here because getUserAddress() above ensures account exists
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            account: this.context.walletClient.account
+            // Use the account if available, otherwise use the wallet address
+            // This follows the same pattern used throughout this file
+            account: this.context.walletClient.account ?? walletAddress
           });
         }
       );
@@ -1225,17 +1164,10 @@ class PermissionsController {
     }
   }
   /**
-   * Gets the user's address from the wallet client.
+   * Gets the user's address from the context.
    *
-   * @returns Promise resolving to the user's wallet address
+   * @returns The user's address
    */
-  async getUserAddress() {
-    const addresses = await this.context.walletClient.getAddresses();
-    if (addresses.length === 0) {
-      throw new BlockchainError("No addresses available in wallet client");
-    }
-    return addresses[0];
-  }
   /**
    * Gets on-chain permission grant data without expensive off-chain resolution.
    *
@@ -1274,8 +1206,8 @@ class PermissionsController {
   async getUserPermissionGrantsOnChain(options = {}) {
     const { limit = 50, subgraphUrl } = options;
     try {
-      const userAddress = await this.getUserAddress();
-      const graphqlEndpoint = subgraphUrl || this.context.subgraphUrl;
+      const userAddress = this.context.userAddress;
+      const graphqlEndpoint = subgraphUrl ?? this.context.subgraphUrl;
       if (!graphqlEndpoint) {
         throw new BlockchainError(
           "subgraphUrl is required. Please provide a valid subgraph endpoint or configure it in Vana constructor."
@@ -1327,7 +1259,7 @@ class PermissionsController {
         );
       }
       const userData = result.data?.user;
-      if (!userData || !userData.permissions?.length) {
+      if (!userData?.permissions?.length) {
         return [];
       }
       const onChainGrants = userData.permissions.slice(0, limit).map(
@@ -1338,8 +1270,8 @@ class PermissionsController {
           nonce: BigInt(permission.nonce),
           startBlock: BigInt(permission.startBlock),
           addedAtBlock: BigInt(permission.addedAtBlock),
-          addedAtTimestamp: BigInt(permission.addedAtTimestamp || "0"),
-          transactionHash: permission.transactionHash || "",
+          addedAtTimestamp: BigInt(permission.addedAtTimestamp ?? "0"),
+          transactionHash: permission.transactionHash ?? "",
           grantor: userAddress,
           grantee: permission.grantee,
           active: !permission.endBlock || BigInt(permission.endBlock) === 0n
@@ -1360,26 +1292,6 @@ class PermissionsController {
       );
     }
   }
-  /**
-   * Normalizes grant ID to hex format.
-   * Handles conversion from permission ID (bigint/number/string) to proper hex hash format.
-   *
-   * @param grantId - Permission ID or grant hash in various formats
-   * @returns Normalized hex hash
-   */
-  normalizeGrantId(grantId) {
-    if (typeof grantId === "string" && grantId.startsWith("0x") && grantId.length === 66) {
-      return grantId;
-    }
-    try {
-      const bigIntId = BigInt(grantId);
-      return `0x${bigIntId.toString(16).padStart(64, "0")}`;
-    } catch {
-      throw new Error(
-        `Invalid grant ID format: ${grantId}. Must be a permission ID (number/bigint/string) or a 32-byte hex hash.`
-      );
-    }
-  }
   /**
    * Registers a new server and immediately trusts it in the DataPortabilityServers contract.
    *
@@ -1388,7 +1300,6 @@ class PermissionsController {
    * Trusted servers can handle data export and portability requests from the user.
    *
    * @param params - Parameters for adding and trusting the server
-   * @param params.owner - Ethereum address that will own this server registration
    * @param params.serverAddress - Ethereum address of the server
    * @param params.serverUrl - HTTPS URL where the server can be reached
    * @param params.publicKey - Server's public key for encryption (hex string)
@@ -1415,6 +1326,7 @@ class PermissionsController {
    * ```
    */
   async addAndTrustServer(params) {
+    this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
@@ -1422,7 +1334,7 @@ class PermissionsController {
         "DataPortabilityServers"
       );
       const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const userAddress = typeof account === "string" ? account : account.address;
       const normalizedUserAddress = getAddress(userAddress);
       const normalizedServerAddress = getAddress(params.serverAddress);
@@ -1439,7 +1351,7 @@ class PermissionsController {
           }
         ],
         account,
-        chain: this.context.walletClient.chain || null
+        chain: this.context.walletClient?.chain ?? null
       });
       const { tx } = await import("../utils/transactionHelpers");
       const txResult = tx({
@@ -1454,9 +1366,13 @@ class PermissionsController {
       const result = await this.context.waitForTransactionEvents(txResult);
       const event = result.expectedEvents.ServerTrusted;
       if (!event) {
-        throw new BlockchainError("ServerTrusted event not found in transaction");
+        throw new BlockchainError(
+          "ServerTrusted event not found in transaction"
+        );
       }
-      const receipt = await this.context.publicClient.getTransactionReceipt({ hash: txHash });
+      const receipt = await this.context.publicClient.getTransactionReceipt({
+        hash: txHash
+      });
       return {
         transactionHash: txHash,
         blockNumber: receipt.blockNumber,
@@ -1487,6 +1403,7 @@ class PermissionsController {
    * @deprecated Use addAndTrustServer instead
    */
   async submitTrustServer(params) {
+    this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
@@ -1494,14 +1411,14 @@ class PermissionsController {
         "DataPortabilityServers"
       );
       const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const txHash = await this.context.walletClient.writeContract({
         address: DataPortabilityServersAddress,
         abi: DataPortabilityServersAbi,
         functionName: "trustServer",
         args: [BigInt(params.serverId)],
         account,
-        chain: this.context.walletClient.chain || null
+        chain: this.context.walletClient?.chain ?? null
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -1527,6 +1444,7 @@ class PermissionsController {
    * @returns Promise resolving to TransactionResult with ServerTrustResult event data
    */
   async submitAddAndTrustServerWithSignature(params) {
+    this.assertWallet();
     try {
       const nonce = await this.getServersUserNonce();
       const serverAddress = getAddress(params.serverAddress);
@@ -1561,7 +1479,7 @@ class PermissionsController {
           signature
         );
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -1598,6 +1516,7 @@ class PermissionsController {
    * @throws {BlockchainError} When trust operation fails for any other reason
    */
   async submitTrustServerWithSignature(params) {
+    this.assertWallet();
     try {
       const nonce = await this.getServersUserNonce();
       const trustServerInput = {
@@ -1618,7 +1537,7 @@ class PermissionsController {
           signature
         );
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -1657,6 +1576,7 @@ class PermissionsController {
    * @throws {BlockchainError} When contract submission fails
    */
   async submitDirectUntrustTransaction(params) {
+    this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
@@ -1664,14 +1584,14 @@ class PermissionsController {
         "DataPortabilityServers"
       );
       const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const txHash = await this.context.walletClient.writeContract({
         address: DataPortabilityServersAddress,
         abi: DataPortabilityServersAbi,
         functionName: "untrustServer",
         args: [BigInt(params.serverId)],
         account,
-        chain: this.context.walletClient.chain || null
+        chain: this.context.walletClient?.chain ?? null
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -1719,6 +1639,7 @@ class PermissionsController {
    * ```
    */
   async submitUntrustServer(params) {
+    this.assertWallet();
     const nonce = await this.getServersUserNonce();
     const untrustServerInput = {
       nonce,
@@ -1739,6 +1660,7 @@ class PermissionsController {
    * @throws {BlockchainError} When untrust transaction fails
    */
   async submitUntrustServerWithSignature(params) {
+    this.assertWallet();
     try {
       const nonce = await this.getServersUserNonce();
       const untrustServerInput = {
@@ -1756,7 +1678,7 @@ class PermissionsController {
       } else {
         hash = await this.submitSignedUntrustTransaction(typedData, signature);
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -1801,8 +1723,8 @@ class PermissionsController {
    */
   async getTrustedServers(userAddress) {
     try {
-      const user = userAddress || await this.getUserAddress();
-      const chainId = await this.context.walletClient.getChainId();
+      const user = userAddress ?? this.context.userAddress;
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
         "DataPortabilityServers"
@@ -1831,8 +1753,8 @@ class PermissionsController {
    */
   async getTrustedServersCount(userAddress) {
     try {
-      const user = userAddress || await this.getUserAddress();
-      const chainId = await this.context.walletClient.getChainId();
+      const user = userAddress ?? this.context.userAddress;
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
         "DataPortabilityServers"
@@ -1861,10 +1783,10 @@ class PermissionsController {
    */
   async getTrustedServersPaginated(options = {}) {
     try {
-      const user = options.userAddress || await this.getUserAddress();
-      const limit = options.limit || 50;
-      const offset = options.offset || 0;
-      const chainId = await this.context.walletClient.getChainId();
+      const user = options.userAddress ?? this.context.userAddress;
+      const limit = options.limit ?? 50;
+      const offset = options.offset ?? 0;
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
         "DataPortabilityServers"
@@ -2010,7 +1932,7 @@ class PermissionsController {
       };
     }
     try {
-      const chainId = await this.context.walletClient.getChainId();
+      const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
         "DataPortabilityServers"
@@ -2085,7 +2007,7 @@ class PermissionsController {
    */
   async checkServerTrustStatus(serverId, userAddress) {
     try {
-      const user = userAddress || await this.getUserAddress();
+      const user = userAddress ?? this.context.userAddress;
       const trustedServers = await this.getTrustedServers(user);
       const trustIndex = trustedServers.findIndex(
         (server) => server === serverId
@@ -2175,7 +2097,7 @@ class PermissionsController {
    * @returns Promise resolving to the EIP-712 domain configuration
    */
   async getServersDomain() {
-    const chainId = await this.context.walletClient.getChainId();
+    const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityServersAddress = getContractAddress(
       chainId,
       "DataPortabilityServers"
@@ -2195,6 +2117,7 @@ class PermissionsController {
    * @returns Promise resolving to the transaction hash
    */
   async submitAddAndTrustServerTransaction(addAndTrustServerInput, signature) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = getContractAddress(
       chainId,
@@ -2226,8 +2149,8 @@ class PermissionsController {
         },
         formattedSignature
       ],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return txHash;
   }
@@ -2239,6 +2162,7 @@ class PermissionsController {
    * @returns Promise resolving to the transaction hash
    */
   async submitTrustServerTransaction(trustServerInput, signature) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = getContractAddress(
       chainId,
@@ -2257,8 +2181,8 @@ class PermissionsController {
         },
         formattedSignature
       ],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return txHash;
   }
@@ -2270,6 +2194,7 @@ class PermissionsController {
    * @returns Promise resolving to the transaction hash
    */
   async submitDirectRevokeTransaction(typedData, signature) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
       chainId,
@@ -2281,10 +2206,9 @@ class PermissionsController {
       address: DataPortabilityPermissionsAddress,
       abi: DataPortabilityPermissionsAbi,
       functionName: "revokePermissionWithSignature",
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       args: [typedData.message, formattedSignature],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return txHash;
   }
@@ -2296,6 +2220,7 @@ class PermissionsController {
    * @returns Promise resolving to the transaction hash
    */
   async submitSignedUntrustTransaction(typedData, signature) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = getContractAddress(
       chainId,
@@ -2303,14 +2228,17 @@ class PermissionsController {
     );
     const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
     const formattedSignature = formatSignatureForContract(signature);
+    const contractMessage = {
+      nonce: typedData.message.nonce,
+      serverId: BigInt(typedData.message.serverId)
+    };
     const txHash = await this.context.walletClient.writeContract({
       address: DataPortabilityServersAddress,
       abi: DataPortabilityServersAbi,
       functionName: "untrustServerWithSignature",
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      args: [typedData.message, formattedSignature],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      args: [contractMessage, formattedSignature],
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return txHash;
   }
@@ -2343,6 +2271,7 @@ class PermissionsController {
    * ```
    */
   async submitRegisterGrantee(params) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityGranteesAddress = getContractAddress(
       chainId,
@@ -2351,14 +2280,14 @@ class PermissionsController {
     const DataPortabilityGranteesAbi = getAbi("DataPortabilityGrantees");
     const ownerAddress = getAddress(params.owner);
     const granteeAddress = getAddress(params.granteeAddress);
-    const account = this.context.walletClient.account || await this.getUserAddress();
+    const account = this.context.walletClient?.account ?? this.context.userAddress;
     const txHash = await this.context.walletClient.writeContract({
       address: DataPortabilityGranteesAddress,
       abi: DataPortabilityGranteesAbi,
       functionName: "registerGrantee",
       args: [ownerAddress, granteeAddress, params.publicKey],
       account,
-      chain: this.context.walletClient.chain || null
+      chain: this.context.walletClient?.chain ?? null
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -2384,6 +2313,7 @@ class PermissionsController {
    * ```
    */
   async submitRegisterGranteeWithSignature(params) {
+    this.assertWallet();
     const nonce = await this.getServersUserNonce();
     const owner = getAddress(params.owner);
     const granteeAddress = getAddress(params.granteeAddress);
@@ -2399,7 +2329,7 @@ class PermissionsController {
       typedData,
       signature
     );
-    const account = this.context.walletClient.account || await this.getUserAddress();
+    const account = this.context.walletClient?.account ?? this.context.userAddress;
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
       hash,
@@ -2425,7 +2355,7 @@ class PermissionsController {
       typedData,
       signature
     );
-    const account = this.context.walletClient.account || await this.getUserAddress();
+    const account = this.context.walletClient?.account ?? this.context.userAddress;
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
       hash,
@@ -2479,8 +2409,8 @@ class PermissionsController {
       functionName: "granteesCount"
     });
     const total = Number(totalCount);
-    const limit = options.limit || 50;
-    const offset = options.offset || 0;
+    const limit = options.limit ?? 50;
+    const offset = options.offset ?? 0;
     const grantees = [];
     const endIndex = Math.min(offset + limit, total);
     for (let i = offset; i < endIndex; i++) {
@@ -2628,7 +2558,7 @@ class PermissionsController {
    * @private
    */
   async buildRegisterGranteeTypedData(input) {
-    const chainId = await this.context.walletClient.getChainId();
+    const chainId = await this.context.publicClient.getChainId();
     const verifyingContract = getContractAddress(
       chainId,
       "DataPortabilityGrantees"
@@ -2661,6 +2591,7 @@ class PermissionsController {
    * @private
    */
   async submitSignedRegisterGranteeTransaction(typedData, _signature) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityGranteesAddress = getContractAddress(
       chainId,
@@ -2676,8 +2607,8 @@ class PermissionsController {
         typedData.message.granteeAddress,
         typedData.message.publicKey
       ],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return txHash;
   }
@@ -2692,7 +2623,7 @@ class PermissionsController {
    */
   async getUserServerIds(userAddress) {
     try {
-      const targetAddress = userAddress || await this.getUserAddress();
+      const targetAddress = userAddress ?? this.context.userAddress;
       const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
@@ -2750,7 +2681,7 @@ class PermissionsController {
    */
   async getUserServerCount(userAddress) {
     try {
-      const targetAddress = userAddress || await this.getUserAddress();
+      const targetAddress = userAddress ?? this.context.userAddress;
       const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
@@ -2779,7 +2710,7 @@ class PermissionsController {
    */
   async getUserTrustedServers(userAddress) {
     try {
-      const targetAddress = userAddress || await this.getUserAddress();
+      const targetAddress = userAddress ?? this.context.userAddress;
       const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
         chainId,
@@ -2896,7 +2827,7 @@ class PermissionsController {
    */
   async getUserPermissionIds(userAddress) {
     try {
-      const targetAddress = userAddress || await this.getUserAddress();
+      const targetAddress = userAddress ?? this.context.userAddress;
       const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityPermissionsAddress = getContractAddress(
         chainId,
@@ -2958,7 +2889,7 @@ class PermissionsController {
    */
   async getUserPermissionCount(userAddress) {
     try {
-      const targetAddress = userAddress || await this.getUserAddress();
+      const targetAddress = userAddress ?? this.context.userAddress;
       const chainId = await this.context.publicClient.getChainId();
       const DataPortabilityPermissionsAddress = getContractAddress(
         chainId,
@@ -3403,6 +3334,7 @@ class PermissionsController {
    * @returns Promise resolving to transaction hash
    */
   async submitUpdateServer(serverId, url) {
+    this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
       const DataPortabilityServersAddress = getContractAddress(
@@ -3410,13 +3342,13 @@ class PermissionsController {
         "DataPortabilityServers"
       );
       const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const hash = await this.context.walletClient.writeContract({
         address: DataPortabilityServersAddress,
         abi: DataPortabilityServersAbi,
         functionName: "updateServer",
         args: [serverId, url],
-        chain: this.context.walletClient.chain,
+        chain: this.context.walletClient?.chain,
         account
       });
       const { tx } = await import("../utils/transactionHelpers");
@@ -3575,6 +3507,7 @@ class PermissionsController {
    * @throws {NetworkError} When network communication fails
    */
   async submitAddPermission(params) {
+    this.assertWallet();
     try {
       const nonce = await this.getPermissionsUserNonce();
       const addPermissionInput = {
@@ -3613,6 +3546,7 @@ class PermissionsController {
    * @throws {NetworkError} When network communication fails
    */
   async submitSignedAddPermission(typedData, signature) {
+    this.assertWallet();
     try {
       let hash;
       if (this.context.relayerCallbacks?.submitAddPermission) {
@@ -3626,7 +3560,7 @@ class PermissionsController {
           signature
         );
       }
-      const account = this.context.walletClient.account || await this.getUserAddress();
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
         hash,
@@ -3662,7 +3596,7 @@ class PermissionsController {
    * @param params.serverAddress - Server wallet address for decryption permissions
    * @param params.serverUrl - Server endpoint URL
    * @param params.serverPublicKey - Server's public key for encryption.
-   *   Obtain via `vana.server.getIdentity(userAddress).public_key`.
+   *   Obtain via `vana.server.getIdentity(userAddress).publicKey`.
    * @param params.filePermissions - Nested array of permissions for each file
    * @returns TransactionResult with immediate hash access and optional event data
    * @throws {Error} When schemaIds array length doesn't match fileUrls array length
@@ -3684,7 +3618,7 @@ class PermissionsController {
    *   schemaIds: [123], // LinkedIn profile schema ID
    *   serverAddress: "0x742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb",
    *   serverUrl: "https://server.example.com",
-   *   serverPublicKey: serverInfo.public_key,
+   *   serverPublicKey: serverInfo.publicKey,
    *   filePermissions: [[{
    *     account: "0x742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb",
    *     key: encryptedKey
@@ -3695,6 +3629,7 @@ class PermissionsController {
    * ```
    */
   async submitAddServerFilesAndPermissions(params) {
+    this.assertWallet();
     try {
       if (params.schemaIds.length !== params.fileUrls.length) {
         throw new Error(
@@ -3759,6 +3694,7 @@ class PermissionsController {
    * ```
    */
   async submitSignedAddServerFilesAndPermissions(typedData, signature) {
+    this.assertWallet();
     try {
       console.debug("\u{1F50D} submitSignedAddServerFilesAndPermissions Debug Info:", {
         hasRelayerCallbacks: !!this.context.relayerCallbacks,
@@ -3773,7 +3709,7 @@ class PermissionsController {
           typedData,
           signature
         );
-        const account = this.context.walletClient.account || await this.getUserAddress();
+        const account = this.context.walletClient?.account ?? this.context.userAddress;
         const { tx } = await import("../utils/transactionHelpers");
         return tx({
           hash,
@@ -3789,11 +3725,11 @@ class PermissionsController {
           typedData,
           signature
         );
-        const account = this.context.walletClient.account || await this.getUserAddress();
+        const account = this.context.userAddress;
         const { tx } = await import("../utils/transactionHelpers");
         return tx({
           hash,
-          from: typeof account === "string" ? account : account.address,
+          from: account,
           contract: "DataPortabilityPermissions",
           fn: "addServerFilesAndPermissions"
         });
@@ -3815,6 +3751,7 @@ class PermissionsController {
    * @returns Promise resolving to transaction hash
    */
   async submitRevokePermission(permissionId) {
+    this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
       const DataPortabilityPermissionsAddress = getContractAddress(
@@ -3824,7 +3761,7 @@ class PermissionsController {
       const DataPortabilityPermissionsAbi = getAbi(
         "DataPortabilityPermissions"
       );
-      const account = this.context.walletClient.account;
+      const { account } = this.context.walletClient;
       if (!account) {
         throw new Error("No wallet account connected");
       }
@@ -3833,7 +3770,7 @@ class PermissionsController {
         abi: DataPortabilityPermissionsAbi,
         functionName: "revokePermission",
         args: [permissionId],
-        chain: this.context.walletClient.chain,
+        chain: this.context.walletClient?.chain,
         account
       });
       const { tx } = await import("../utils/transactionHelpers");
@@ -3858,6 +3795,7 @@ class PermissionsController {
    * @returns Promise resolving to the transaction hash
    */
   async submitDirectAddPermissionTransaction(typedData, signature) {
+    this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
       chainId,
@@ -3868,7 +3806,7 @@ class PermissionsController {
       nonce: typedData.message.nonce,
       granteeId: typedData.message.granteeId,
       grant: typedData.message.grant,
-      fileIds: typedData.message.fileIds || []
+      fileIds: typedData.message.fileIds ?? []
     };
     const formattedSignature = formatSignatureForContract(signature);
     const hash = await this.context.walletClient.writeContract({
@@ -3876,8 +3814,8 @@ class PermissionsController {
       abi: DataPortabilityPermissionsAbi,
       functionName: "addPermission",
       args: [permissionInput, formattedSignature],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return hash;
   }
@@ -3889,7 +3827,8 @@ class PermissionsController {
    * @returns Promise resolving to the transaction hash
    */
   async submitDirectAddServerFilesAndPermissionsTransaction(typedData, signature) {
-    const chainId = await this.context.walletClient.getChainId();
+    this.assertWallet();
+    const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
       chainId,
       "DataPortabilityPermissions"
@@ -3913,8 +3852,8 @@ class PermissionsController {
       functionName: "addServerFilesAndPermissions",
       // @ts-expect-error - Viem's type inference for nested Permission[][] arrays is incompatible with our Permission type
       args: [serverFilesAndPermissionInput, formattedSignature],
-      account: this.context.walletClient.account || await this.getUserAddress(),
-      chain: this.context.walletClient.chain || null
+      account: this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null
     });
     return hash;
   }