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

package/dist/controllers/permissions.cjs

@@ -186,17 +186,31 @@ class PermissionsController extends import_base.BaseController {
       let { grantUrl } = params;
       console.debug("\u{1F50D} Debug - Grant URL from params:", grantUrl);
       if (!grantUrl) {
-        if (!this.context.relayerCallbacks?.storeGrantFile && !this.context.storageManager) {
+        const canStoreViaRelayer = this.context.relayer !== void 0;
+        if (!canStoreViaRelayer && !this.context.storageManager) {
           if (this.context.validateStorageRequired) {
             this.context.validateStorageRequired();
           } else {
             throw new Error(
-              "No storage available. Provide a grantUrl, configure relayerCallbacks.storeGrantFile, or storageManager."
+              "No storage available. Provide a grantUrl, configure relayer, or storageManager."
             );
           }
         }
-        if (this.context.relayerCallbacks?.storeGrantFile) {
-          grantUrl = await this.context.relayerCallbacks.storeGrantFile(grantFile);
+        if (canStoreViaRelayer && this.context.relayer) {
+          const request = {
+            type: "direct",
+            operation: "storeGrantFile",
+            params: grantFile
+          };
+          const response = await this.context.relayer(request);
+          if (response.type === "error") {
+            throw new Error(response.error);
+          }
+          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");
+          }
         } else if (this.context.storageManager) {
           const blob = new Blob([JSON.stringify(grantFile)], {
             type: "application/json"
@@ -280,17 +294,31 @@ class PermissionsController extends import_base.BaseController {
       let { grantUrl } = params;
       console.debug("\u{1F50D} Debug - Grant URL from params:", grantUrl);
       if (!grantUrl) {
-        if (!this.context.relayerCallbacks?.storeGrantFile && !this.context.storageManager) {
+        const canStoreViaRelayer = this.context.relayer !== void 0;
+        if (!canStoreViaRelayer && !this.context.storageManager) {
           if (this.context.validateStorageRequired) {
             this.context.validateStorageRequired();
           } else {
             throw new Error(
-              "No storage available. Provide a grantUrl, configure relayerCallbacks.storeGrantFile, or storageManager."
+              "No storage available. Provide a grantUrl, configure relayer, or storageManager."
             );
           }
         }
-        if (this.context.relayerCallbacks?.storeGrantFile) {
-          grantUrl = await this.context.relayerCallbacks.storeGrantFile(grantFile);
+        if (canStoreViaRelayer && this.context.relayer) {
+          const request = {
+            type: "direct",
+            operation: "storeGrantFile",
+            params: grantFile
+          };
+          const response = await this.context.relayer(request);
+          if (response.type === "error") {
+            throw new Error(response.error);
+          }
+          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");
+          }
         } else if (this.context.storageManager) {
           const blob = new Blob([JSON.stringify(grantFile)], {
             type: "application/json"
@@ -369,11 +397,24 @@ class PermissionsController extends import_base.BaseController {
           2
         )
       );
-      if (this.context.relayerCallbacks?.submitPermissionGrant) {
-        const hash = await this.context.relayerCallbacks.submitPermissionGrant(
+      if (this.context.relayer) {
+        const response = await this.context.relayer({
+          type: "signed",
+          operation: "submitAddPermission",
           typedData,
-          signature
-        );
+          signature,
+          expectedUserAddress: this.context.userAddress
+        });
+        let hash;
+        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: expected signed transaction"
+          );
+        }
         const account = this.context.walletClient?.account ?? this.context.userAddress;
         const { tx } = await import("../utils/transactionHelpers");
         return tx({
@@ -599,11 +640,23 @@ class PermissionsController extends import_base.BaseController {
   async submitSignedRevoke(typedData, signature) {
     try {
       let hash;
-      if (this.context.relayerCallbacks?.submitPermissionRevoke) {
-        hash = await this.context.relayerCallbacks.submitPermissionRevoke(
+      if (this.context.relayer) {
+        const response = await this.context.relayer({
+          type: "signed",
+          operation: "submitPermissionRevoke",
           typedData,
-          signature
-        );
+          signature,
+          expectedUserAddress: this.context.userAddress
+        });
+        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: expected signed transaction"
+          );
+        }
       } else {
         hash = await this.submitDirectRevokeTransaction(
           typedData,
@@ -652,11 +705,23 @@ class PermissionsController extends import_base.BaseController {
   async submitSignedUntrustServer(typedData, signature) {
     try {
       let hash;
-      if (this.context.relayerCallbacks?.submitUntrustServer) {
-        hash = await this.context.relayerCallbacks.submitUntrustServer(
+      if (this.context.relayer) {
+        const response = await this.context.relayer({
+          type: "signed",
+          operation: "submitUntrustServer",
           typedData,
-          signature
-        );
+          signature,
+          expectedUserAddress: this.context.userAddress
+        });
+        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: expected signed transaction"
+          );
+        }
       } else {
         hash = await this.submitSignedUntrustTransaction(
           typedData,
@@ -905,11 +970,23 @@ class PermissionsController extends import_base.BaseController {
       };
       const signature = await this.signTypedData(typedData);
       let hash;
-      if (this.context.relayerCallbacks?.submitPermissionRevoke) {
-        hash = await this.context.relayerCallbacks.submitPermissionRevoke(
+      if (this.context.relayer) {
+        const response = await this.context.relayer({
+          type: "signed",
+          operation: "submitPermissionRevoke",
           typedData,
-          signature
-        );
+          signature,
+          expectedUserAddress: this.context.userAddress
+        });
+        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: expected signed transaction"
+          );
+        }
       } else {
         hash = await this.submitDirectRevokeTransaction(
           typedData,
@@ -1503,11 +1580,22 @@ class PermissionsController extends import_base.BaseController {
       const signature = await this.signTypedData(typedData);
       console.debug("\u{1F50D} Generated signature:", signature);
       let hash;
-      if (this.context.relayerCallbacks?.submitAddAndTrustServer) {
-        hash = await this.context.relayerCallbacks.submitAddAndTrustServer(
+      if (this.context.relayer) {
+        const request = {
+          type: "signed",
+          operation: "submitAddAndTrustServer",
           typedData,
           signature
-        );
+        };
+        const response = await this.context.relayer(request);
+        if (response.type === "error") {
+          throw new import_errors.RelayerError(response.error);
+        }
+        if (response.type === "signed") {
+          hash = response.hash;
+        } else {
+          throw new Error("Unexpected response type from relayer");
+        }
       } else {
         hash = await this.submitAddAndTrustServerTransaction(
           addAndTrustServerInput,
@@ -1561,11 +1649,22 @@ class PermissionsController extends import_base.BaseController {
       const typedData = await this.composeTrustServerMessage(trustServerInput);
       const signature = await this.signTypedData(typedData);
       let hash;
-      if (this.context.relayerCallbacks?.submitTrustServer) {
-        hash = await this.context.relayerCallbacks.submitTrustServer(
+      if (this.context.relayer) {
+        const request = {
+          type: "signed",
+          operation: "submitTrustServer",
           typedData,
           signature
-        );
+        };
+        const response = await this.context.relayer(request);
+        if (response.type === "error") {
+          throw new import_errors.RelayerError(response.error);
+        }
+        if (response.type === "signed") {
+          hash = response.hash;
+        } else {
+          throw new Error("Unexpected response type from relayer");
+        }
       } else {
         hash = await this.submitTrustServerTransaction(
           trustServerInput,
@@ -1720,11 +1819,22 @@ class PermissionsController extends import_base.BaseController {
       const typedData = await this.composeUntrustServerMessage(untrustServerInput);
       const signature = await this.signTypedData(typedData);
       let hash;
-      if (this.context.relayerCallbacks?.submitUntrustServer) {
-        hash = await this.context.relayerCallbacks.submitUntrustServer(
+      if (this.context.relayer) {
+        const request = {
+          type: "signed",
+          operation: "submitUntrustServer",
           typedData,
           signature
-        );
+        };
+        const response = await this.context.relayer(request);
+        if (response.type === "error") {
+          throw new import_errors.RelayerError(response.error);
+        }
+        if (response.type === "signed") {
+          hash = response.hash;
+        } else {
+          throw new Error("Unexpected response type from relayer");
+        }
       } else {
         hash = await this.submitSignedUntrustTransaction(typedData, signature);
       }
@@ -2357,73 +2467,9 @@ class PermissionsController extends import_base.BaseController {
       fn: "registerGrantee"
     });
   }
-  /**
-   * Registers a grantee with a signature (gasless transaction)
-   *
-   * @param params - Parameters for registering the grantee
-   * @returns Promise resolving to the transaction hash
-   *
-   * @example
-   * ```typescript
-   * const txHash = await vana.permissions.registerGranteeWithSignature({
-   *   owner: "0x742d35Cc6558Fd4D9e9E0E888F0462ef6919Bd36",
-   *   granteeAddress: "0xApp1234567890123456789012345678901234567890",
-   *   publicKey: "0x1234567890abcdef..."
-   * });
-   * ```
-   */
-  async submitRegisterGranteeWithSignature(params) {
-    this.assertWallet();
-    const nonce = await this.getServersUserNonce();
-    const owner = (0, import_viem.getAddress)(params.owner);
-    const granteeAddress = (0, import_viem.getAddress)(params.granteeAddress);
-    const registerGranteeInput = {
-      nonce,
-      owner,
-      granteeAddress,
-      publicKey: params.publicKey
-    };
-    const typedData = await this.buildRegisterGranteeTypedData(registerGranteeInput);
-    const signature = await this.signTypedData(typedData);
-    const hash = await this.submitSignedRegisterGranteeTransaction(
-      typedData,
-      signature
-    );
-    const account = this.context.walletClient?.account ?? this.context.userAddress;
-    const { tx } = await import("../utils/transactionHelpers");
-    return tx({
-      hash,
-      from: typeof account === "string" ? account : account.address,
-      contract: "DataPortabilityGrantees",
-      fn: "registerGrantee"
-    });
-  }
-  /**
-   * Submits a signed register grantee transaction via relayer
-   *
-   * @param typedData - The EIP-712 typed data for register grantee
-   * @param signature - The cryptographic signature
-   * @returns Promise resolving to the transaction hash
-   *
-   * @example
-   * ```typescript
-   * const result = await vana.permissions.submitSignedRegisterGrantee(typedData, signature);
-   * ```
-   */
-  async submitSignedRegisterGrantee(typedData, signature) {
-    const hash = await this.submitSignedRegisterGranteeTransaction(
-      typedData,
-      signature
-    );
-    const account = this.context.walletClient?.account ?? this.context.userAddress;
-    const { tx } = await import("../utils/transactionHelpers");
-    return tx({
-      hash,
-      from: typeof account === "string" ? account : account.address,
-      contract: "DataPortabilityGrantees",
-      fn: "registerGrantee"
-    });
-  }
+  // TODO: When DataPortabilityGrantees contract adds registerGranteeWithSignature function,
+  // implement submitRegisterGranteeWithSignature and submitSignedRegisterGrantee methods
+  // to support gasless transactions via relayer
   /**
    * Retrieves all registered grantees from the DataPortabilityGrantees contract.
    *
@@ -2610,68 +2656,6 @@ class PermissionsController extends import_base.BaseController {
       return null;
     }
   }
-  /**
-   * Builds EIP-712 typed data for grantee registration
-   *
-   * @param input - The register grantee input
-   * @returns Promise resolving to the typed data structure
-   * @private
-   */
-  async buildRegisterGranteeTypedData(input) {
-    const chainId = await this.context.publicClient.getChainId();
-    const verifyingContract = (0, import_addresses.getContractAddress)(
-      chainId,
-      "DataPortabilityGrantees"
-    );
-    return {
-      domain: {
-        name: "DataPortabilityGrantees",
-        version: "1",
-        chainId,
-        verifyingContract
-      },
-      types: {
-        RegisterGrantee: [
-          { name: "nonce", type: "uint256" },
-          { name: "owner", type: "address" },
-          { name: "granteeAddress", type: "address" },
-          { name: "publicKey", type: "string" }
-        ]
-      },
-      primaryType: "RegisterGrantee",
-      message: input
-    };
-  }
-  /**
-   * Submits a register grantee transaction with signature.
-   *
-   * @param typedData - The EIP-712 typed data structure for the registration
-   * @param _signature - The cryptographic signature authorizing the registration (currently unused)
-   * @returns Promise resolving to the transaction hash
-   * @private
-   */
-  async submitSignedRegisterGranteeTransaction(typedData, _signature) {
-    this.assertWallet();
-    const chainId = await this.context.walletClient.getChainId();
-    const DataPortabilityGranteesAddress = (0, import_addresses.getContractAddress)(
-      chainId,
-      "DataPortabilityGrantees"
-    );
-    const DataPortabilityGranteesAbi = (0, import_abi.getAbi)("DataPortabilityGrantees");
-    const txHash = await this.context.walletClient.writeContract({
-      address: DataPortabilityGranteesAddress,
-      abi: DataPortabilityGranteesAbi,
-      functionName: "registerGrantee",
-      args: [
-        typedData.message.owner,
-        typedData.message.granteeAddress,
-        typedData.message.publicKey
-      ],
-      account: this.context.walletClient?.account ?? this.context.userAddress,
-      chain: this.context.walletClient?.chain ?? null
-    });
-    return txHash;
-  }
   // ===========================
   // DATA PORTABILITY SERVERS HELPER METHODS
   // ===========================
@@ -3621,11 +3605,22 @@ class PermissionsController extends import_base.BaseController {
     this.assertWallet();
     try {
       let hash;
-      if (this.context.relayerCallbacks?.submitAddPermission) {
-        hash = await this.context.relayerCallbacks.submitAddPermission(
+      if (this.context.relayer) {
+        const request = {
+          type: "signed",
+          operation: "submitAddPermission",
           typedData,
           signature
-        );
+        };
+        const response = await this.context.relayer(request);
+        if (response.type === "error") {
+          throw new import_errors.RelayerError(response.error);
+        }
+        if (response.type === "signed") {
+          hash = response.hash;
+        } else {
+          throw new Error("Unexpected response type from relayer");
+        }
       } else {
         hash = await this.submitDirectAddPermissionTransaction(
           typedData,
@@ -3783,45 +3778,44 @@ class PermissionsController extends import_base.BaseController {
   async submitSignedAddServerFilesAndPermissions(typedData, signature, options) {
     this.assertWallet();
     try {
-      console.debug("\u{1F50D} submitSignedAddServerFilesAndPermissions Debug Info:", {
-        hasRelayerCallbacks: !!this.context.relayerCallbacks,
-        hasSubmitMethod: !!this.context.relayerCallbacks?.submitAddServerFilesAndPermissions,
-        availableRelayerMethods: this.context.relayerCallbacks ? Object.keys(this.context.relayerCallbacks) : []
-      });
-      if (this.context.relayerCallbacks?.submitAddServerFilesAndPermissions) {
+      let hash;
+      if (this.context.relayer) {
         console.debug(
           "\u{1F680} Using relayer for submitAddServerFilesAndPermissions"
         );
-        const hash = await this.context.relayerCallbacks.submitAddServerFilesAndPermissions(
+        const request = {
+          type: "signed",
+          operation: "submitAddServerFilesAndPermissions",
           typedData,
           signature
-        );
-        const account = this.context.walletClient?.account ?? this.context.userAddress;
-        const { tx } = await import("../utils/transactionHelpers");
-        return tx({
-          hash,
-          from: typeof account === "string" ? account : account.address,
-          contract: "DataPortabilityPermissions",
-          fn: "addServerFilesAndPermissions"
-        });
+        };
+        const response = await this.context.relayer(request);
+        if (response.type === "error") {
+          throw new import_errors.RelayerError(response.error);
+        }
+        if (response.type === "signed") {
+          hash = response.hash;
+        } else {
+          throw new Error("Unexpected response type from relayer");
+        }
       } else {
         console.debug(
           "\u{1F4DD} Using direct transaction for submitAddServerFilesAndPermissions"
         );
-        const hash = await this.submitDirectAddServerFilesAndPermissionsTransaction(
+        hash = await this.submitDirectAddServerFilesAndPermissionsTransaction(
           typedData,
           signature,
           options
         );
-        const account = this.context.userAddress;
-        const { tx } = await import("../utils/transactionHelpers");
-        return tx({
-          hash,
-          from: account,
-          contract: "DataPortabilityPermissions",
-          fn: "addServerFilesAndPermissions"
-        });
       }
+      const account = this.context.walletClient?.account ?? this.context.userAddress;
+      const { tx } = await import("../utils/transactionHelpers");
+      return tx({
+        hash,
+        from: typeof account === "string" ? account : account.address,
+        contract: "DataPortabilityPermissions",
+        fn: "addServerFilesAndPermissions"
+      });
     } 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) {
         throw error;
@@ -3952,7 +3946,7 @@ class PermissionsController extends import_base.BaseController {
       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,
+      account: this.context.walletClient?.account ?? this.context.userAddress,
       chain: this.context.walletClient?.chain ?? null,
       ...options?.gasLimit && { gas: options.gasLimit },
       ...options?.nonce && { nonce: options.nonce },