@opendatalabs/vana-sdk 0.1.0-alpha.f35bb9c → 0.1.0-alpha.f48b66e

package/dist/controllers/permissions.d.ts

@@ -1,7 +1,7 @@
 import type { Address, Hash } from "viem";
-import type { GrantPermissionParams, RevokePermissionParams, PermissionGrantTypedData, GenericTypedData, OnChainPermissionGrant, GetUserPermissionsOptions, AddAndTrustServerParams, TrustServerParams, UntrustServerParams, AddAndTrustServerTypedData, TrustServerTypedData, TrustedServerInfo, PaginatedTrustedServers, TrustedServerQueryOptions, BatchServerInfoResult, ServerTrustStatus, GrantFile, Grantee, GranteeInfo, RegisterGranteeParams, GranteeQueryOptions, PaginatedGrantees, ServerInfo, ServerFilesAndPermissionParams, ServerFilesAndPermissionTypedData, TransactionOptions } from "../types/index";
+import type { TransactionOptions, TransactionResult } from "../types/operations";
+import type { GrantPermissionParams, RevokePermissionParams, PermissionGrantTypedData, GenericTypedData, OnChainPermissionGrant, GetUserPermissionsOptions, AddAndTrustServerParams, TrustServerParams, UntrustServerParams, AddAndTrustServerTypedData, TrustServerTypedData, TrustedServerInfo, PaginatedTrustedServers, TrustedServerQueryOptions, BatchServerInfoResult, ServerTrustStatus, GrantFile, Grantee, GranteeInfo, RegisterGranteeParams, GranteeQueryOptions, PaginatedGrantees, ServerInfo, ServerFilesAndPermissionParams, ServerFilesAndPermissionTypedData } from "../types/index";
 import type { PermissionGrantResult, PermissionRevokeResult, ServerTrustResult } from "../types/transactionResults";
-import type { TransactionResult } from "../types/operations";
 import type { PermissionInfo } from "../types/permissions";
 /**
  * Provides shared configuration and services for all SDK controllers.
@@ -101,7 +101,7 @@ export declare class PermissionsController extends BaseController {
      * await vana.permissions.revoke({ permissionId: result.permissionId });
      * ```
      */
-    grant(params: GrantPermissionParams): Promise<PermissionGrantResult>;
+    grant(params: GrantPermissionParams, options?: TransactionOptions): Promise<PermissionGrantResult>;
     /**
      * Submits a permission grant transaction and returns a handle for flexible result access.
      *
@@ -127,7 +127,7 @@ export declare class PermissionsController extends BaseController {
      * console.log(`Permission ID: ${eventData.permissionId}`);
      * ```
      */
-    submitPermissionGrant(params: GrantPermissionParams): Promise<TransactionResult<"DataPortabilityPermissions", "addPermission">>;
+    submitPermissionGrant(params: GrantPermissionParams, options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityPermissions", "addPermission">>;
     /**
      * Prepares a permission grant with preview before signing.
      *
@@ -153,7 +153,7 @@ export declare class PermissionsController extends BaseController {
      * const transactionHash = await confirm();
      * ```
      */
-    prepareGrant(params: GrantPermissionParams): Promise<{
+    prepareGrant(params: GrantPermissionParams, options?: TransactionOptions): Promise<{
         preview: GrantFile;
         confirm: () => Promise<PermissionGrantResult>;
     }>;
@@ -225,7 +225,7 @@ export declare class PermissionsController extends BaseController {
      * );
      * ```
      */
-    submitSignedGrant(typedData: PermissionGrantTypedData, signature: Hash): Promise<TransactionResult<"DataPortabilityPermissions", "addPermission">>;
+    submitSignedGrant(typedData: PermissionGrantTypedData, signature: Hash, options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityPermissions", "addPermission">>;
     /**
      * Submits an already-signed trust server transaction to the blockchain.
      *
@@ -247,7 +247,7 @@ export declare class PermissionsController extends BaseController {
      * const result = await txHandle.waitForEvents();
      * ```
      */
-    submitSignedTrustServer(typedData: TrustServerTypedData, signature: Hash): Promise<TransactionResult<"DataPortabilityServers", "trustServerWithSignature">>;
+    submitSignedTrustServer(typedData: TrustServerTypedData, signature: Hash, options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityServers", "trustServerWithSignature">>;
     /**
      * Submits an already-signed add and trust server transaction to the blockchain.
      *
@@ -269,7 +269,7 @@ export declare class PermissionsController extends BaseController {
      * const result = await txHandle.waitForEvents();
      * ```
      */
-    submitSignedAddAndTrustServer(typedData: AddAndTrustServerTypedData, signature: Hash): Promise<TransactionResult<"DataPortabilityServers", "addAndTrustServerWithSignature">>;
+    submitSignedAddAndTrustServer(typedData: AddAndTrustServerTypedData, signature: Hash, _options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityServers", "addAndTrustServerWithSignature">>;
     /**
      * Internal method to submit a signed grant and wait for events.
      *
@@ -288,6 +288,15 @@ export declare class PermissionsController extends BaseController {
      * @returns Promise resolving to PermissionGrantResult with parsed events
      */
     private confirmGrantInternalWithEvents;
+    /**
+     * 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
+     */
+    private pollRelayerForConfirmation;
     /**
      * Submits an already-signed permission revoke transaction to the blockchain.
      *
@@ -309,7 +318,7 @@ export declare class PermissionsController extends BaseController {
      * const result = await txHandle.waitForEvents();
      * ```
      */
-    submitSignedRevoke(typedData: GenericTypedData, signature: Hash): Promise<TransactionResult<"DataPortabilityPermissions", "revokePermissionWithSignature">>;
+    submitSignedRevoke(typedData: GenericTypedData, signature: Hash, _options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityPermissions", "revokePermissionWithSignature">>;
     /**
      * Submits an already-signed untrust server transaction to the blockchain.
      *
@@ -331,7 +340,7 @@ export declare class PermissionsController extends BaseController {
      * const result = await txHandle.waitForEvents();
      * ```
      */
-    submitSignedUntrustServer(typedData: GenericTypedData, signature: Hash): Promise<TransactionResult<"DataPortabilityServers", "untrustServerWithSignature">>;
+    submitSignedUntrustServer(typedData: GenericTypedData, signature: Hash, _options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityServers", "untrustServerWithSignature">>;
     /**
      * Submits a signed transaction directly to the blockchain.
      *
@@ -1183,7 +1192,7 @@ export declare class PermissionsController extends BaseController {
      * @throws {BlockchainError} When permission addition fails
      * @throws {NetworkError} When network communication fails
      */
-    submitSignedAddPermission(typedData: GenericTypedData, signature: Hash): Promise<TransactionResult<"DataPortabilityPermissions", "addPermission">>;
+    submitSignedAddPermission(typedData: GenericTypedData, signature: Hash, options?: TransactionOptions): Promise<TransactionResult<"DataPortabilityPermissions", "addPermission">>;
     /**
      * Submits server files and permissions with signature to the blockchain, supporting schema validation and gasless transactions.
      *

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);
@@ -183,7 +191,7 @@ class PermissionsController extends BaseController {
           if (response.type === "error") {
             throw new Error(response.error);
           }
-          if (response.type === "direct" && typeof response.result === "object" && "url" in response.result) {
+          if (response.type === "direct" && typeof response.result === "object" && response.result !== null && "url" in response.result) {
             grantUrl = response.result.url;
           } else {
             throw new Error("Invalid response from relayer for grant storage");
@@ -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) {
@@ -291,7 +299,7 @@ class PermissionsController extends BaseController {
           if (response.type === "error") {
             throw new Error(response.error);
           }
-          if (response.type === "direct" && typeof response.result === "object" && "url" in response.result) {
+          if (response.type === "direct" && typeof response.result === "object" && response.result !== null && "url" in response.result) {
             grantUrl = response.result.url;
           } else {
             throw new Error("Invalid response from relayer for grant storage");
@@ -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({
@@ -866,7 +941,7 @@ class PermissionsController extends BaseController {
         args: [params.permissionId],
         account,
         chain: this.context.walletClient?.chain ?? null,
-        ...options?.gasLimit && { gas: options.gasLimit },
+        ...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 ? {
@@ -1293,7 +1368,9 @@ class PermissionsController extends BaseController {
    * ```
    */
   async getUserPermissionGrantsOnChain(options = {}) {
-    const { limit = 50, subgraphUrl } = options;
+    const { limit = 50, fetchAll = false, subgraphUrl } = options;
+    const pageSize = fetchAll ? 100 : limit;
+    const maxResults = fetchAll ? 1e4 : limit;
     try {
       const userAddress = this.context.userAddress;
       const graphqlEndpoint = subgraphUrl ?? this.context.subgraphUrl;
@@ -1303,10 +1380,10 @@ class PermissionsController extends BaseController {
         );
       }
       const query = `
-        query GetUserPermissions($userId: ID!) {
+        query GetUserPermissions($userId: ID!, $first: Int!, $skip: Int!) {
           user(id: $userId) {
             id
-            permissions {
+            permissions(first: $first, skip: $skip, orderBy: addedAtBlock, orderDirection: desc) {
               id
               grant
               nonce
@@ -1324,34 +1401,82 @@ class PermissionsController extends BaseController {
           }
         }
       `;
-      const response = await fetch(graphqlEndpoint, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          query,
-          variables: {
-            userId: userAddress.toLowerCase()
+      const allPermissions = [];
+      let currentOffset = 0;
+      if (!fetchAll) {
+        const response = await fetch(graphqlEndpoint, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({
+            query,
+            variables: {
+              userId: userAddress.toLowerCase(),
+              first: limit,
+              skip: 0
+            }
+          })
+        });
+        if (!response.ok) {
+          throw new BlockchainError(
+            `Subgraph request failed: ${response.status} ${response.statusText}`
+          );
+        }
+        const result = await response.json();
+        if (result.errors) {
+          throw new BlockchainError(
+            `Subgraph errors: ${result.errors.map((e) => e.message).join(", ")}`
+          );
+        }
+        const userData = result.data?.user;
+        if (!userData?.permissions?.length) {
+          return [];
+        }
+        allPermissions.push(...userData.permissions);
+      } else {
+        while (allPermissions.length < maxResults) {
+          const currentLimit = Math.min(
+            pageSize,
+            maxResults - allPermissions.length
+          );
+          const response = await fetch(graphqlEndpoint, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              query,
+              variables: {
+                userId: userAddress.toLowerCase(),
+                first: currentLimit,
+                skip: currentOffset
+              }
+            })
+          });
+          if (!response.ok) {
+            throw new BlockchainError(
+              `Subgraph request failed: ${response.status} ${response.statusText}`
+            );
           }
-        })
-      });
-      if (!response.ok) {
-        throw new BlockchainError(
-          `Subgraph request failed: ${response.status} ${response.statusText}`
-        );
-      }
-      const result = await response.json();
-      if (result.errors) {
-        throw new BlockchainError(
-          `Subgraph errors: ${result.errors.map((e) => e.message).join(", ")}`
-        );
-      }
-      const userData = result.data?.user;
-      if (!userData?.permissions?.length) {
-        return [];
+          const result = await response.json();
+          if (result.errors) {
+            throw new BlockchainError(
+              `Subgraph errors: ${result.errors.map((e) => e.message).join(", ")}`
+            );
+          }
+          const userData = result.data?.user;
+          if (!userData?.permissions?.length) {
+            break;
+          }
+          allPermissions.push(...userData.permissions);
+          if (userData.permissions.length < currentLimit) {
+            break;
+          }
+          currentOffset += userData.permissions.length;
+        }
       }
-      const onChainGrants = userData.permissions.slice(0, limit).map(
+      const onChainGrants = allPermissions.map(
         (permission) => ({
           id: BigInt(permission.id),
           grantUrl: permission.grant,
@@ -1703,7 +1828,7 @@ class PermissionsController extends BaseController {
         args: [BigInt(params.serverId)],
         account,
         chain: this.context.walletClient?.chain ?? null,
-        ...options?.gasLimit && { gas: options.gasLimit },
+        ...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 ? {
@@ -2298,7 +2423,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(
@@ -2319,7 +2444,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;
   }
@@ -2356,7 +2482,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(
@@ -2426,15 +2552,7 @@ class PermissionsController extends BaseController {
       args: [ownerAddress, granteeAddress, params.publicKey],
       account,
       chain: this.context.walletClient?.chain ?? null,
-      ...options?.gasLimit && { gas: options.gasLimit },
-      ...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 }
+      ...this.spreadTransactionOptions(options)
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -3372,7 +3490,7 @@ class PermissionsController extends BaseController {
         args: [serverId, url],
         chain: this.context.walletClient?.chain,
         account,
-        ...options?.gasLimit && { gas: options.gasLimit },
+        ...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 ? {
@@ -3578,7 +3696,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;
@@ -3601,7 +3719,8 @@ class PermissionsController extends BaseController {
       } else {
         hash = await this.submitDirectAddPermissionTransaction(
           typedData,
-          signature
+          signature,
+          options
         );
       }
       const account = this.context.walletClient?.account ?? this.context.userAddress;
@@ -3832,7 +3951,7 @@ class PermissionsController extends BaseController {
         args: [permissionId],
         chain: this.context.walletClient?.chain,
         account,
-        ...options?.gasLimit && { gas: options.gasLimit },
+        ...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 ? {
@@ -3865,7 +3984,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(
@@ -3886,7 +4005,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;
   }
@@ -3921,22 +4041,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.walletClient?.account ?? this.context.userAddress,
       chain: this.context.walletClient?.chain ?? null,
-      ...options?.gasLimit && { gas: options.gasLimit },
-      ...options?.nonce && { nonce: options.nonce },
       ...options?.value && { value: options.value },
-      // 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 }
+      ...this.spreadTransactionOptions(options)
     });
     return hash;
   }