@opendatalabs/vana-sdk 0.1.0-alpha.2b6935d → 0.1.0-alpha.2e77fcc

package/dist/controllers/permissions.js

@@ -57,10 +57,14 @@ class PermissionsController extends BaseController {
    * await vana.permissions.revoke({ permissionId: result.permissionId });
    * ```
    */
-  async grant(params) {
+  async grant(params, options) {
     this.assertWallet();
     const { typedData, signature } = await this.createAndSign(params);
-    const result = await this.submitSignedGrantWithEvents(typedData, signature);
+    const result = await this.submitSignedGrantWithEvents(
+      typedData,
+      signature,
+      options
+    );
     return result;
   }
   /**
@@ -88,10 +92,10 @@ class PermissionsController extends BaseController {
    * console.log(`Permission ID: ${eventData.permissionId}`);
    * ```
    */
-  async submitPermissionGrant(params) {
+  async submitPermissionGrant(params, options) {
     this.assertWallet();
     const { typedData, signature } = await this.createAndSign(params);
-    return await this.submitSignedGrant(typedData, signature);
+    return await this.submitSignedGrant(typedData, signature, options);
   }
   /**
    * Prepares a permission grant with preview before signing.
@@ -118,7 +122,7 @@ class PermissionsController extends BaseController {
    * const transactionHash = await confirm();
    * ```
    */
-  async prepareGrant(params) {
+  async prepareGrant(params, options) {
     this.assertWallet();
     try {
       const grantFile = createGrantFile(params);
@@ -126,7 +130,11 @@ class PermissionsController extends BaseController {
       return {
         preview: grantFile,
         confirm: async () => {
-          return await this.confirmGrantInternalWithEvents(params, grantFile);
+          return await this.confirmGrantInternalWithEvents(
+            params,
+            grantFile,
+            options
+          );
         }
       };
     } catch (error) {
@@ -158,7 +166,7 @@ class PermissionsController extends BaseController {
    * @throws {NetworkError} When IPFS upload fails
    * @throws {SignatureError} When user rejects the signature
    */
-  async confirmGrantInternal(params, grantFile) {
+  async confirmGrantInternal(params, grantFile, options) {
     try {
       let { grantUrl } = params;
       console.debug("\u{1F50D} Debug - Grant URL from params:", grantUrl);
@@ -219,7 +227,7 @@ class PermissionsController extends BaseController {
         nonce
       });
       const signature = await this.signTypedData(typedData);
-      return await this.submitSignedGrant(typedData, signature);
+      return await this.submitSignedGrant(typedData, signature, options);
     } catch (error) {
       if (error instanceof Error) {
         if (error instanceof RelayerError || error instanceof UserRejectedRequestError || error instanceof SerializationError || error instanceof SignatureError || error instanceof NetworkError || error instanceof NonceError) {
@@ -364,7 +372,7 @@ class PermissionsController extends BaseController {
    * );
    * ```
    */
-  async submitSignedGrant(typedData, signature) {
+  async submitSignedGrant(typedData, signature, options) {
     try {
       console.debug(
         "\u{1F50D} Debug - submitSignedGrant called with typed data:",
@@ -382,26 +390,40 @@ class PermissionsController extends BaseController {
           signature,
           expectedUserAddress: this.context.userAddress
         });
-        let hash;
-        if (response.type === "signed") {
-          hash = response.hash;
-        } else if (response.type === "error") {
+        if (response.type === "error") {
           throw new Error(`Relayer error: ${response.error}`);
+        }
+        let finalHash;
+        if (response.type === "submitted") {
+          finalHash = response.hash;
+        } else if (response.type === "pending") {
+          const pollResult = await this.pollRelayerForConfirmation(
+            response.operationId
+          );
+          finalHash = pollResult.hash;
+        } else if (response.type === "confirmed") {
+          finalHash = response.hash;
+        } else if (response.type === "signed") {
+          finalHash = response.hash;
         } else {
           throw new Error(
-            "Invalid response from relayer: expected signed transaction"
+            "Invalid response from relayer: unexpected response type"
           );
         }
         const account = this.context.walletClient?.account ?? this.context.userAddress;
         const { tx } = await import("../utils/transactionHelpers");
         return tx({
-          hash,
+          hash: finalHash,
           from: typeof account === "string" ? account : account.address,
           contract: "DataPortabilityPermissions",
           fn: "addPermission"
         });
       } else {
-        return await this.submitDirectTransaction(typedData, signature);
+        return await this.submitDirectTransaction(
+          typedData,
+          signature,
+          options
+        );
       }
     } catch (error) {
       if (error instanceof RelayerError || error instanceof NetworkError || error instanceof UserRejectedRequestError || error instanceof SignatureError || error instanceof NonceError) {
@@ -434,7 +456,7 @@ class PermissionsController extends BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedTrustServer(typedData, signature) {
+  async submitSignedTrustServer(typedData, signature, options) {
     try {
       const trustServerInput = {
         nonce: BigInt(typedData.message.nonce),
@@ -442,7 +464,8 @@ class PermissionsController extends BaseController {
       };
       const hash = await this.submitTrustServerTransaction(
         trustServerInput,
-        signature
+        signature,
+        options
       );
       const account = this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
@@ -497,7 +520,7 @@ class PermissionsController extends BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedAddAndTrustServer(typedData, signature) {
+  async submitSignedAddAndTrustServer(typedData, signature, _options) {
     try {
       const addAndTrustServerInput = {
         nonce: BigInt(typedData.message.nonce),
@@ -535,8 +558,12 @@ class PermissionsController extends BaseController {
    * @param signature - The user's signature authorizing the transaction
    * @returns Promise resolving to PermissionGrantResult with parsed events
    */
-  async submitSignedGrantWithEvents(typedData, signature) {
-    const txResult = await this.submitSignedGrant(typedData, signature);
+  async submitSignedGrantWithEvents(typedData, signature, options) {
+    const txResult = await this.submitSignedGrant(
+      typedData,
+      signature,
+      options
+    );
     if (!this.context.waitForTransactionEvents) {
       throw new BlockchainError("waitForTransactionEvents not configured");
     }
@@ -568,8 +595,12 @@ class PermissionsController extends BaseController {
    * @param grantFile - The pre-created grant file object
    * @returns Promise resolving to PermissionGrantResult with parsed events
    */
-  async confirmGrantInternalWithEvents(params, grantFile) {
-    const txResult = await this.confirmGrantInternal(params, grantFile);
+  async confirmGrantInternalWithEvents(params, grantFile, options) {
+    const txResult = await this.confirmGrantInternal(
+      params,
+      grantFile,
+      options
+    );
     if (!this.context.waitForTransactionEvents) {
       throw new BlockchainError("waitForTransactionEvents not configured");
     }
@@ -593,6 +624,39 @@ class PermissionsController extends BaseController {
       fileIds: event.fileIds
     };
   }
+  /**
+   * Polls the relayer for confirmation of a pending operation.
+   *
+   * @param operationId - The operation ID to poll
+   * @returns Promise resolving to the confirmed hash
+   * @throws {Error} When the operation fails or times out
+   * @internal
+   */
+  async pollRelayerForConfirmation(operationId, options = {}) {
+    const timeout = options.timeout ?? 3e4;
+    let interval = options.pollingInterval ?? 1e3;
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeout) {
+      if (!this.context.relayer) {
+        throw new Error("Relayer not configured for polling");
+      }
+      const statusResponse = await this.context.relayer({
+        type: "status_check",
+        operationId
+      });
+      if (statusResponse.type === "confirmed") {
+        return { hash: statusResponse.hash };
+      }
+      if (statusResponse.type === "error") {
+        throw new Error(
+          `Operation ${operationId} failed: ${statusResponse.error}`
+        );
+      }
+      await new Promise((resolve) => setTimeout(resolve, interval));
+      interval = Math.min(interval * 1.5, 5e3);
+    }
+    throw new Error(`Operation ${operationId} timed out after ${timeout}ms`);
+  }
   /**
    * Submits an already-signed permission revoke transaction to the blockchain.
    *
@@ -614,7 +678,7 @@ class PermissionsController extends BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedRevoke(typedData, signature) {
+  async submitSignedRevoke(typedData, signature, _options) {
     try {
       let hash;
       if (this.context.relayer) {
@@ -625,13 +689,23 @@ class PermissionsController extends BaseController {
           signature,
           expectedUserAddress: this.context.userAddress
         });
-        if (response.type === "signed") {
-          hash = response.hash;
-        } else if (response.type === "error") {
+        if (response.type === "error") {
           throw new Error(`Relayer error: ${response.error}`);
+        }
+        if (response.type === "submitted") {
+          hash = response.hash;
+        } else if (response.type === "pending") {
+          const pollResult = await this.pollRelayerForConfirmation(
+            response.operationId
+          );
+          hash = pollResult.hash;
+        } else if (response.type === "confirmed") {
+          hash = response.hash;
+        } else if (response.type === "signed") {
+          hash = response.hash;
         } else {
           throw new Error(
-            "Invalid response from relayer: expected signed transaction"
+            "Invalid response from relayer: unexpected response type"
           );
         }
       } else {
@@ -679,7 +753,7 @@ class PermissionsController extends BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedUntrustServer(typedData, signature) {
+  async submitSignedUntrustServer(typedData, signature, _options) {
     try {
       let hash;
       if (this.context.relayer) {
@@ -735,7 +809,7 @@ class PermissionsController extends BaseController {
    * @returns Promise resolving to the transaction hash
    * @throws {BlockchainError} When contract submission fails
    */
-  async submitDirectTransaction(typedData, signature) {
+  async submitDirectTransaction(typedData, signature, options) {
     this.assertWallet();
     const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
@@ -767,7 +841,8 @@ class PermissionsController extends BaseController {
       functionName: "addPermission",
       args: [permissionInput, formattedSignature],
       account,
-      chain: this.context.walletClient?.chain ?? null
+      chain: this.context.walletClient?.chain ?? null,
+      ...this.spreadTransactionOptions(options)
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -831,6 +906,7 @@ class PermissionsController extends BaseController {
    * Use this when you want to handle transaction confirmation and event parsing separately.
    *
    * @param params - Parameters for revoking the permission
+   * @param options - Optional transaction options for gas parameters and timeout
    * @returns Promise resolving to the transaction hash when successfully submitted
    * @throws {BlockchainError} When revocation transaction fails
    * @throws {UserRejectedRequestError} When user rejects the transaction
@@ -843,7 +919,7 @@ class PermissionsController extends BaseController {
    * console.log(`Revocation submitted: ${txHash}`);
    * ```
    */
-  async submitPermissionRevoke(params) {
+  async submitPermissionRevoke(params, options) {
     this.assertWallet();
     try {
       if (!this.context.walletClient?.chain?.id) {
@@ -864,7 +940,18 @@ class PermissionsController extends BaseController {
         functionName: "revokePermission",
         args: [params.permissionId],
         account,
-        chain: this.context.walletClient?.chain ?? null
+        chain: this.context.walletClient?.chain ?? null,
+        ...options?.gas && { gas: options.gas },
+        ...options?.nonce && { nonce: options.nonce },
+        // Use EIP-1559 if available, otherwise fall back to legacy gasPrice
+        ...options?.maxFeePerGas || options?.maxPriorityFeePerGas ? {
+          ...options.maxFeePerGas && {
+            maxFeePerGas: options.maxFeePerGas
+          },
+          ...options.maxPriorityFeePerGas && {
+            maxPriorityFeePerGas: options.maxPriorityFeePerGas
+          }
+        } : options?.gasPrice && { gasPrice: options.gasPrice }
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -1674,7 +1761,7 @@ class PermissionsController extends BaseController {
    * @returns Promise resolving to TransactionResult for transaction tracking
    * @throws {BlockchainError} When contract submission fails
    */
-  async submitDirectUntrustTransaction(params) {
+  async submitDirectUntrustTransaction(params, options) {
     this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
@@ -1690,7 +1777,18 @@ class PermissionsController extends BaseController {
         functionName: "untrustServer",
         args: [BigInt(params.serverId)],
         account,
-        chain: this.context.walletClient?.chain ?? null
+        chain: this.context.walletClient?.chain ?? null,
+        ...options?.gas && { gas: options.gas },
+        ...options?.nonce && { nonce: options.nonce },
+        // Use EIP-1559 if available, otherwise fall back to legacy gasPrice
+        ...options?.maxFeePerGas || options?.maxPriorityFeePerGas ? {
+          ...options.maxFeePerGas && {
+            maxFeePerGas: options.maxFeePerGas
+          },
+          ...options.maxPriorityFeePerGas && {
+            maxPriorityFeePerGas: options.maxPriorityFeePerGas
+          }
+        } : options?.gasPrice && { gasPrice: options.gasPrice }
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -1717,6 +1815,7 @@ class PermissionsController extends BaseController {
    *
    * @param params - Parameters for untrusting the server
    * @param params.serverId - The numeric ID of the server to untrust
+   * @param options - Optional transaction options for gas parameters and timeout
    * @returns Promise resolving to transaction hash
    * @throws {Error} When wallet account is not available
    * @throws {NonceError} When retrieving user nonce fails
@@ -1737,14 +1836,17 @@ class PermissionsController extends BaseController {
    * console.log('Still trusting servers:', trustedServers);
    * ```
    */
-  async submitUntrustServer(params) {
+  async submitUntrustServer(params, options) {
     this.assertWallet();
     const nonce = await this.getServersUserNonce();
     const untrustServerInput = {
       nonce,
       serverId: params.serverId
     };
-    return await this.submitDirectUntrustTransaction(untrustServerInput);
+    return await this.submitDirectUntrustTransaction(
+      untrustServerInput,
+      options
+    );
   }
   /**
    * Untrusts a server using a signature (gasless transaction).
@@ -2271,7 +2373,7 @@ class PermissionsController extends BaseController {
    * @param signature - The cryptographic signature for the transaction
    * @returns Promise resolving to the transaction hash
    */
-  async submitTrustServerTransaction(trustServerInput, signature) {
+  async submitTrustServerTransaction(trustServerInput, signature, options) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = getContractAddress(
@@ -2292,7 +2394,8 @@ class PermissionsController extends BaseController {
         formattedSignature
       ],
       account: this.context.walletClient?.account ?? this.context.userAddress,
-      chain: this.context.walletClient?.chain ?? null
+      chain: this.context.walletClient?.chain ?? null,
+      ...this.spreadTransactionOptions(options)
     });
     return txHash;
   }
@@ -2329,7 +2432,7 @@ class PermissionsController extends BaseController {
    * @param signature - The cryptographic signature authorizing the untrust
    * @returns Promise resolving to the transaction hash
    */
-  async submitSignedUntrustTransaction(typedData, signature) {
+  async submitSignedUntrustTransaction(typedData, signature, _options) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = getContractAddress(
@@ -2365,6 +2468,7 @@ class PermissionsController extends BaseController {
    * @param params.owner - The Ethereum address that will own this grantee registration
    * @param params.granteeAddress - The Ethereum address of the grantee (application)
    * @param params.publicKey - The public key used for data encryption/decryption (hex string)
+   * @param options - Optional transaction options for gas parameters and timeout
    * @returns Promise resolving to the transaction hash
    * @throws {BlockchainError} When the grantee registration transaction fails
    * @throws {UserRejectedRequestError} When user rejects the transaction
@@ -2380,7 +2484,7 @@ class PermissionsController extends BaseController {
    * console.log(`Grantee registered in transaction: ${txHash}`);
    * ```
    */
-  async submitRegisterGrantee(params) {
+  async submitRegisterGrantee(params, options) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityGranteesAddress = getContractAddress(
@@ -2397,7 +2501,8 @@ class PermissionsController extends BaseController {
       functionName: "registerGrantee",
       args: [ownerAddress, granteeAddress, params.publicKey],
       account,
-      chain: this.context.walletClient?.chain ?? null
+      chain: this.context.walletClient?.chain ?? null,
+      ...this.spreadTransactionOptions(options)
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -3315,9 +3420,10 @@ class PermissionsController extends BaseController {
    *
    * @param serverId - Server ID to update
    * @param url - New URL for the server
+   * @param options - Optional transaction options for gas parameters and timeout
    * @returns Promise resolving to transaction hash
    */
-  async submitUpdateServer(serverId, url) {
+  async submitUpdateServer(serverId, url, options) {
     this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
@@ -3333,7 +3439,18 @@ class PermissionsController extends BaseController {
         functionName: "updateServer",
         args: [serverId, url],
         chain: this.context.walletClient?.chain,
-        account
+        account,
+        ...options?.gas && { gas: options.gas },
+        ...options?.nonce && { nonce: options.nonce },
+        // Use EIP-1559 if available, otherwise fall back to legacy gasPrice
+        ...options?.maxFeePerGas || options?.maxPriorityFeePerGas ? {
+          ...options.maxFeePerGas && {
+            maxFeePerGas: options.maxFeePerGas
+          },
+          ...options.maxPriorityFeePerGas && {
+            maxPriorityFeePerGas: options.maxPriorityFeePerGas
+          }
+        } : options?.gasPrice && { gasPrice: options.gasPrice }
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -3529,7 +3646,7 @@ class PermissionsController extends BaseController {
    * @throws {BlockchainError} When permission addition fails
    * @throws {NetworkError} When network communication fails
    */
-  async submitSignedAddPermission(typedData, signature) {
+  async submitSignedAddPermission(typedData, signature, options) {
     this.assertWallet();
     try {
       let hash;
@@ -3552,7 +3669,8 @@ class PermissionsController extends BaseController {
       } else {
         hash = await this.submitDirectAddPermissionTransaction(
           typedData,
-          signature
+          signature,
+          options
         );
       }
       const account = this.context.walletClient?.account ?? this.context.userAddress;
@@ -3593,6 +3711,9 @@ class PermissionsController extends BaseController {
    * @param params.serverPublicKey - Server's public key for encryption.
    *   Obtain via `vana.server.getIdentity(userAddress).publicKey`.
    * @param params.filePermissions - Nested array of permissions for each file
+   * @param options - Optional transaction options for gas parameters and timeout.
+   *   Note: These options are only applied for direct blockchain transactions.
+   *   When using relayer callbacks (gasless transactions), these options are ignored.
    * @returns TransactionResult with immediate hash access and optional event data
    * @throws {Error} When schemaIds array length doesn't match fileUrls array length
    * @throws {SchemaValidationError} When file data doesn't match the specified schema.
@@ -3606,6 +3727,7 @@ class PermissionsController extends BaseController {
    *
    * @example
    * ```typescript
+   * // Submit with custom gas parameters and timeout
    * const result = await vana.permissions.submitAddServerFilesAndPermissions({
    *   granteeId: BigInt(1),
    *   grant: "ipfs://QmXxx...",
@@ -3618,12 +3740,19 @@ class PermissionsController extends BaseController {
    *     account: "0x742d35Cc6634C0532925a3b844Bc9e7595f0b0Bb",
    *     key: encryptedKey
    *   }]]
+   * }, {
+   *   maxFeePerGas: 100n * 10n ** 9n, // 100 gwei
+   *   maxPriorityFeePerGas: 2n * 10n ** 9n, // 2 gwei tip
    * });
-   * const events = await result.waitForEvents();
-   * console.log(`Permission ID: ${events.permissionId}`);
+   *
+   * // Wait for confirmation with custom timeout
+   * const receipt = await vana.waitForTransactionReceipt(result, {
+   *   timeout: 180000 // 3 minutes
+   * });
+   * console.log(`Transaction confirmed: ${receipt.transactionHash}`);
    * ```
    */
-  async submitAddServerFilesAndPermissions(params) {
+  async submitAddServerFilesAndPermissions(params, options) {
     this.assertWallet();
     try {
       if (params.schemaIds.length !== params.fileUrls.length) {
@@ -3649,7 +3778,8 @@ class PermissionsController extends BaseController {
       const signature = await this.signTypedData(typedData);
       return await this.submitSignedAddServerFilesAndPermissions(
         typedData,
-        signature
+        signature,
+        options
       );
     } catch (error) {
       if (error instanceof RelayerError || error instanceof UserRejectedRequestError || error instanceof SerializationError || error instanceof SignatureError || error instanceof NetworkError || error instanceof NonceError) {
@@ -3670,6 +3800,9 @@ class PermissionsController extends BaseController {
    *
    * @param typedData - The EIP-712 typed data for AddServerFilesAndPermissions
    * @param signature - The user's signature
+   * @param options - Optional transaction options for gas parameters and timeout.
+   *   Note: These options are only applied for direct blockchain transactions.
+   *   When using relayer callbacks (gasless transactions), these options are ignored.
    * @returns TransactionResult with immediate hash access and optional event data
    * @throws {RelayerError} When gasless transaction submission fails
    * @throws {BlockchainError} When server files and permissions addition fails
@@ -3688,7 +3821,7 @@ class PermissionsController extends BaseController {
    * console.log(`Permission created with ID: ${permissionId}`);
    * ```
    */
-  async submitSignedAddServerFilesAndPermissions(typedData, signature) {
+  async submitSignedAddServerFilesAndPermissions(typedData, signature, options) {
     this.assertWallet();
     try {
       let hash;
@@ -3717,7 +3850,8 @@ class PermissionsController extends BaseController {
         );
         hash = await this.submitDirectAddServerFilesAndPermissionsTransaction(
           typedData,
-          signature
+          signature,
+          options
         );
       }
       const account = this.context.walletClient?.account ?? this.context.userAddress;
@@ -3742,9 +3876,10 @@ class PermissionsController extends BaseController {
    * Submit permission revocation with signature to the blockchain
    *
    * @param permissionId - Permission ID to revoke
+   * @param options - Optional transaction options for gas parameters and timeout
    * @returns Promise resolving to transaction hash
    */
-  async submitRevokePermission(permissionId) {
+  async submitRevokePermission(permissionId, options) {
     this.assertWallet();
     try {
       const chainId = await this.context.walletClient.getChainId();
@@ -3765,7 +3900,18 @@ class PermissionsController extends BaseController {
         functionName: "revokePermission",
         args: [permissionId],
         chain: this.context.walletClient?.chain,
-        account
+        account,
+        ...options?.gas && { gas: options.gas },
+        ...options?.nonce && { nonce: options.nonce },
+        // Use EIP-1559 if available, otherwise fall back to legacy gasPrice
+        ...options?.maxFeePerGas || options?.maxPriorityFeePerGas ? {
+          ...options.maxFeePerGas && {
+            maxFeePerGas: options.maxFeePerGas
+          },
+          ...options.maxPriorityFeePerGas && {
+            maxPriorityFeePerGas: options.maxPriorityFeePerGas
+          }
+        } : options?.gasPrice && { gasPrice: options.gasPrice }
       });
       const { tx } = await import("../utils/transactionHelpers");
       return tx({
@@ -3788,7 +3934,7 @@ class PermissionsController extends BaseController {
    * @param signature - The cryptographic signature authorizing the transaction
    * @returns Promise resolving to the transaction hash
    */
-  async submitDirectAddPermissionTransaction(typedData, signature) {
+  async submitDirectAddPermissionTransaction(typedData, signature, options) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
@@ -3809,7 +3955,8 @@ class PermissionsController extends BaseController {
       functionName: "addPermission",
       args: [permissionInput, formattedSignature],
       account: this.context.walletClient?.account ?? this.context.userAddress,
-      chain: this.context.walletClient?.chain ?? null
+      chain: this.context.walletClient?.chain ?? null,
+      ...this.spreadTransactionOptions(options)
     });
     return hash;
   }
@@ -3820,7 +3967,7 @@ class PermissionsController extends BaseController {
    * @param signature - The cryptographic signature authorizing the transaction
    * @returns Promise resolving to the transaction hash
    */
-  async submitDirectAddServerFilesAndPermissionsTransaction(typedData, signature) {
+  async submitDirectAddServerFilesAndPermissionsTransaction(typedData, signature, options) {
     this.assertWallet();
     const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityPermissionsAddress = getContractAddress(
@@ -3844,10 +3991,11 @@ class PermissionsController extends BaseController {
       address: DataPortabilityPermissionsAddress,
       abi: DataPortabilityPermissionsAbi,
       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.userAddress,
-      chain: this.context.walletClient?.chain ?? null
+      account: this.context.walletClient?.account ?? this.context.userAddress,
+      chain: this.context.walletClient?.chain ?? null,
+      ...options?.value && { value: options.value },
+      ...this.spreadTransactionOptions(options)
     });
     return hash;
   }