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

package/dist/controllers/permissions.cjs

@@ -80,14 +80,10 @@ class PermissionsController extends import_base.BaseController {
    * await vana.permissions.revoke({ permissionId: result.permissionId });
    * ```
    */
-  async grant(params, options) {
+  async grant(params) {
     this.assertWallet();
     const { typedData, signature } = await this.createAndSign(params);
-    const result = await this.submitSignedGrantWithEvents(
-      typedData,
-      signature,
-      options
-    );
+    const result = await this.submitSignedGrantWithEvents(typedData, signature);
     return result;
   }
   /**
@@ -115,10 +111,10 @@ class PermissionsController extends import_base.BaseController {
    * console.log(`Permission ID: ${eventData.permissionId}`);
    * ```
    */
-  async submitPermissionGrant(params, options) {
+  async submitPermissionGrant(params) {
     this.assertWallet();
     const { typedData, signature } = await this.createAndSign(params);
-    return await this.submitSignedGrant(typedData, signature, options);
+    return await this.submitSignedGrant(typedData, signature);
   }
   /**
    * Prepares a permission grant with preview before signing.
@@ -145,7 +141,7 @@ class PermissionsController extends import_base.BaseController {
    * const transactionHash = await confirm();
    * ```
    */
-  async prepareGrant(params, options) {
+  async prepareGrant(params) {
     this.assertWallet();
     try {
       const grantFile = (0, import_grantFiles.createGrantFile)(params);
@@ -153,11 +149,7 @@ class PermissionsController extends import_base.BaseController {
       return {
         preview: grantFile,
         confirm: async () => {
-          return await this.confirmGrantInternalWithEvents(
-            params,
-            grantFile,
-            options
-          );
+          return await this.confirmGrantInternalWithEvents(params, grantFile);
         }
       };
     } catch (error) {
@@ -189,7 +181,7 @@ class PermissionsController extends import_base.BaseController {
    * @throws {NetworkError} When IPFS upload fails
    * @throws {SignatureError} When user rejects the signature
    */
-  async confirmGrantInternal(params, grantFile, options) {
+  async confirmGrantInternal(params, grantFile) {
     try {
       let { grantUrl } = params;
       console.debug("\u{1F50D} Debug - Grant URL from params:", grantUrl);
@@ -214,7 +206,7 @@ class PermissionsController extends import_base.BaseController {
           if (response.type === "error") {
             throw new Error(response.error);
           }
-          if (response.type === "direct" && typeof response.result === "object" && response.result !== null && "url" in response.result) {
+          if (response.type === "direct" && typeof response.result === "object" && "url" in response.result) {
             grantUrl = response.result.url;
           } else {
             throw new Error("Invalid response from relayer for grant storage");
@@ -250,7 +242,7 @@ class PermissionsController extends import_base.BaseController {
         nonce
       });
       const signature = await this.signTypedData(typedData);
-      return await this.submitSignedGrant(typedData, signature, options);
+      return await this.submitSignedGrant(typedData, signature);
     } catch (error) {
       if (error instanceof Error) {
         if (error instanceof import_errors.RelayerError || error instanceof import_errors.UserRejectedRequestError || error instanceof import_errors.SerializationError || error instanceof import_errors.SignatureError || error instanceof import_errors.NetworkError || error instanceof import_errors.NonceError) {
@@ -322,7 +314,7 @@ class PermissionsController extends import_base.BaseController {
           if (response.type === "error") {
             throw new Error(response.error);
           }
-          if (response.type === "direct" && typeof response.result === "object" && response.result !== null && "url" in response.result) {
+          if (response.type === "direct" && typeof response.result === "object" && "url" in response.result) {
             grantUrl = response.result.url;
           } else {
             throw new Error("Invalid response from relayer for grant storage");
@@ -395,7 +387,7 @@ class PermissionsController extends import_base.BaseController {
    * );
    * ```
    */
-  async submitSignedGrant(typedData, signature, options) {
+  async submitSignedGrant(typedData, signature) {
     try {
       console.debug(
         "\u{1F50D} Debug - submitSignedGrant called with typed data:",
@@ -413,40 +405,26 @@ class PermissionsController extends import_base.BaseController {
           signature,
           expectedUserAddress: this.context.userAddress
         });
-        if (response.type === "error") {
+        let hash;
+        if (response.type === "signed") {
+          hash = response.hash;
+        } else 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: unexpected response type"
+            "Invalid response from relayer: expected signed transaction"
           );
         }
         const account = this.context.walletClient?.account ?? this.context.userAddress;
         const { tx } = await import("../utils/transactionHelpers");
         return tx({
-          hash: finalHash,
+          hash,
           from: typeof account === "string" ? account : account.address,
           contract: "DataPortabilityPermissions",
           fn: "addPermission"
         });
       } else {
-        return await this.submitDirectTransaction(
-          typedData,
-          signature,
-          options
-        );
+        return await this.submitDirectTransaction(typedData, signature);
       }
     } catch (error) {
       if (error instanceof import_errors.RelayerError || error instanceof import_errors.NetworkError || error instanceof import_errors.UserRejectedRequestError || error instanceof import_errors.SignatureError || error instanceof import_errors.NonceError) {
@@ -479,7 +457,7 @@ class PermissionsController extends import_base.BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedTrustServer(typedData, signature, options) {
+  async submitSignedTrustServer(typedData, signature) {
     try {
       const trustServerInput = {
         nonce: BigInt(typedData.message.nonce),
@@ -487,8 +465,7 @@ class PermissionsController extends import_base.BaseController {
       };
       const hash = await this.submitTrustServerTransaction(
         trustServerInput,
-        signature,
-        options
+        signature
       );
       const account = this.context.userAddress;
       const { tx } = await import("../utils/transactionHelpers");
@@ -543,7 +520,7 @@ class PermissionsController extends import_base.BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedAddAndTrustServer(typedData, signature, _options) {
+  async submitSignedAddAndTrustServer(typedData, signature) {
     try {
       const addAndTrustServerInput = {
         nonce: BigInt(typedData.message.nonce),
@@ -581,12 +558,8 @@ class PermissionsController extends import_base.BaseController {
    * @param signature - The user's signature authorizing the transaction
    * @returns Promise resolving to PermissionGrantResult with parsed events
    */
-  async submitSignedGrantWithEvents(typedData, signature, options) {
-    const txResult = await this.submitSignedGrant(
-      typedData,
-      signature,
-      options
-    );
+  async submitSignedGrantWithEvents(typedData, signature) {
+    const txResult = await this.submitSignedGrant(typedData, signature);
     if (!this.context.waitForTransactionEvents) {
       throw new import_errors.BlockchainError("waitForTransactionEvents not configured");
     }
@@ -618,12 +591,8 @@ class PermissionsController extends import_base.BaseController {
    * @param grantFile - The pre-created grant file object
    * @returns Promise resolving to PermissionGrantResult with parsed events
    */
-  async confirmGrantInternalWithEvents(params, grantFile, options) {
-    const txResult = await this.confirmGrantInternal(
-      params,
-      grantFile,
-      options
-    );
+  async confirmGrantInternalWithEvents(params, grantFile) {
+    const txResult = await this.confirmGrantInternal(params, grantFile);
     if (!this.context.waitForTransactionEvents) {
       throw new import_errors.BlockchainError("waitForTransactionEvents not configured");
     }
@@ -647,39 +616,6 @@ class PermissionsController extends import_base.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.
    *
@@ -701,7 +637,7 @@ class PermissionsController extends import_base.BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedRevoke(typedData, signature, _options) {
+  async submitSignedRevoke(typedData, signature) {
     try {
       let hash;
       if (this.context.relayer) {
@@ -712,23 +648,13 @@ class PermissionsController extends import_base.BaseController {
           signature,
           expectedUserAddress: this.context.userAddress
         });
-        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") {
+        if (response.type === "signed") {
           hash = response.hash;
+        } else if (response.type === "error") {
+          throw new Error(`Relayer error: ${response.error}`);
         } else {
           throw new Error(
-            "Invalid response from relayer: unexpected response type"
+            "Invalid response from relayer: expected signed transaction"
           );
         }
       } else {
@@ -776,7 +702,7 @@ class PermissionsController extends import_base.BaseController {
    * const result = await txHandle.waitForEvents();
    * ```
    */
-  async submitSignedUntrustServer(typedData, signature, _options) {
+  async submitSignedUntrustServer(typedData, signature) {
     try {
       let hash;
       if (this.context.relayer) {
@@ -832,7 +758,7 @@ class PermissionsController extends import_base.BaseController {
    * @returns Promise resolving to the transaction hash
    * @throws {BlockchainError} When contract submission fails
    */
-  async submitDirectTransaction(typedData, signature, options) {
+  async submitDirectTransaction(typedData, signature) {
     this.assertWallet();
     const chainId = await this.context.publicClient.getChainId();
     const DataPortabilityPermissionsAddress = (0, import_addresses.getContractAddress)(
@@ -864,8 +790,7 @@ class PermissionsController extends import_base.BaseController {
       functionName: "addPermission",
       args: [permissionInput, formattedSignature],
       account,
-      chain: this.context.walletClient?.chain ?? null,
-      ...this.spreadTransactionOptions(options)
+      chain: this.context.walletClient?.chain ?? null
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -964,7 +889,7 @@ class PermissionsController extends import_base.BaseController {
         args: [params.permissionId],
         account,
         chain: this.context.walletClient?.chain ?? null,
-        ...options?.gas && { gas: options.gas },
+        ...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 ? {
@@ -1801,7 +1726,7 @@ class PermissionsController extends import_base.BaseController {
         args: [BigInt(params.serverId)],
         account,
         chain: this.context.walletClient?.chain ?? null,
-        ...options?.gas && { gas: options.gas },
+        ...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 ? {
@@ -2396,7 +2321,7 @@ class PermissionsController extends import_base.BaseController {
    * @param signature - The cryptographic signature for the transaction
    * @returns Promise resolving to the transaction hash
    */
-  async submitTrustServerTransaction(trustServerInput, signature, options) {
+  async submitTrustServerTransaction(trustServerInput, signature) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = (0, import_addresses.getContractAddress)(
@@ -2417,8 +2342,7 @@ class PermissionsController extends import_base.BaseController {
         formattedSignature
       ],
       account: this.context.walletClient?.account ?? this.context.userAddress,
-      chain: this.context.walletClient?.chain ?? null,
-      ...this.spreadTransactionOptions(options)
+      chain: this.context.walletClient?.chain ?? null
     });
     return txHash;
   }
@@ -2455,7 +2379,7 @@ class PermissionsController extends import_base.BaseController {
    * @param signature - The cryptographic signature authorizing the untrust
    * @returns Promise resolving to the transaction hash
    */
-  async submitSignedUntrustTransaction(typedData, signature, _options) {
+  async submitSignedUntrustTransaction(typedData, signature) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityServersAddress = (0, import_addresses.getContractAddress)(
@@ -2525,7 +2449,15 @@ class PermissionsController extends import_base.BaseController {
       args: [ownerAddress, granteeAddress, params.publicKey],
       account,
       chain: this.context.walletClient?.chain ?? null,
-      ...this.spreadTransactionOptions(options)
+      ...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 }
     });
     const { tx } = await import("../utils/transactionHelpers");
     return tx({
@@ -3463,7 +3395,7 @@ class PermissionsController extends import_base.BaseController {
         args: [serverId, url],
         chain: this.context.walletClient?.chain,
         account,
-        ...options?.gas && { gas: options.gas },
+        ...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 ? {
@@ -3669,7 +3601,7 @@ class PermissionsController extends import_base.BaseController {
    * @throws {BlockchainError} When permission addition fails
    * @throws {NetworkError} When network communication fails
    */
-  async submitSignedAddPermission(typedData, signature, options) {
+  async submitSignedAddPermission(typedData, signature) {
     this.assertWallet();
     try {
       let hash;
@@ -3692,8 +3624,7 @@ class PermissionsController extends import_base.BaseController {
       } else {
         hash = await this.submitDirectAddPermissionTransaction(
           typedData,
-          signature,
-          options
+          signature
         );
       }
       const account = this.context.walletClient?.account ?? this.context.userAddress;
@@ -3924,7 +3855,7 @@ class PermissionsController extends import_base.BaseController {
         args: [permissionId],
         chain: this.context.walletClient?.chain,
         account,
-        ...options?.gas && { gas: options.gas },
+        ...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 ? {
@@ -3957,7 +3888,7 @@ class PermissionsController extends import_base.BaseController {
    * @param signature - The cryptographic signature authorizing the transaction
    * @returns Promise resolving to the transaction hash
    */
-  async submitDirectAddPermissionTransaction(typedData, signature, options) {
+  async submitDirectAddPermissionTransaction(typedData, signature) {
     this.assertWallet();
     const chainId = await this.context.walletClient.getChainId();
     const DataPortabilityPermissionsAddress = (0, import_addresses.getContractAddress)(
@@ -3978,8 +3909,7 @@ class PermissionsController extends import_base.BaseController {
       functionName: "addPermission",
       args: [permissionInput, formattedSignature],
       account: this.context.walletClient?.account ?? this.context.userAddress,
-      chain: this.context.walletClient?.chain ?? null,
-      ...this.spreadTransactionOptions(options)
+      chain: this.context.walletClient?.chain ?? null
     });
     return hash;
   }
@@ -4014,11 +3944,22 @@ class PermissionsController extends import_base.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 },
-      ...this.spreadTransactionOptions(options)
+      // 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 }
     });
     return hash;
   }