@opendatalabs/vana-sdk 0.1.0-alpha.dd95ac2 → 0.1.0-alpha.e2e45dd

package/dist/index.node.cjs

@@ -36656,7 +36656,7 @@ var PermissionsController = class {
           throw new Error("Failed to store grant file - no URL returned");
         }
       }
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       console.debug(
         "\u{1F50D} Debug - Final grant URL being passed to compose:",
         grantUrl
@@ -36749,7 +36749,7 @@ var PermissionsController = class {
           throw new Error("Failed to store grant file - no URL returned");
         }
       }
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       console.debug(
         "\u{1F50D} Debug - Final grant URL being passed to compose:",
         grantUrl
@@ -36814,14 +36814,8 @@ var PermissionsController = class {
         )
       );
       if (this.context.relayerCallbacks?.submitPermissionGrant) {
-        const jsonSafeTypedData = JSON.parse(
-          JSON.stringify(
-            typedData,
-            (_key, value) => typeof value === "bigint" ? value.toString() : value
-          )
-        );
         return await this.context.relayerCallbacks.submitPermissionGrant(
-          jsonSafeTypedData,
+          typedData,
           signature
         );
       } else {
@@ -36891,7 +36885,6 @@ var PermissionsController = class {
     try {
       const addAndTrustServerInput = {
         nonce: BigInt(typedData.message.nonce),
-        owner: typedData.message.owner,
         serverAddress: typedData.message.serverAddress,
         serverUrl: typedData.message.serverUrl,
         publicKey: typedData.message.publicKey
@@ -36905,7 +36898,7 @@ var PermissionsController = class {
         throw error;
       }
       throw new BlockchainError(
-        `Add and trust server submission failed: ${error instanceof Error ? error.message : "Unknown error"}`,
+        `Add and trust server submission failed444444: ${error instanceof Error ? error.message : "Unknown error"}`,
         error
       );
     }
@@ -36921,14 +36914,8 @@ var PermissionsController = class {
   async submitSignedRevoke(typedData, signature) {
     try {
       if (this.context.relayerCallbacks?.submitPermissionRevoke) {
-        const jsonSafeTypedData = JSON.parse(
-          JSON.stringify(
-            typedData,
-            (_key, value) => typeof value === "bigint" ? value.toString() : value
-          )
-        );
         return await this.context.relayerCallbacks.submitPermissionRevoke(
-          jsonSafeTypedData,
+          typedData,
           signature
         );
       } else {
@@ -37110,7 +37097,7 @@ var PermissionsController = class {
       if (!this.context.walletClient.chain?.id) {
         throw new BlockchainError("Chain ID not available");
       }
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       const revokePermissionInput = {
         nonce,
         permissionId: params.permissionId
@@ -37143,7 +37130,10 @@ var PermissionsController = class {
     }
   }
   /**
+   * @deprecated Use getPermissionsUserNonce() for permission operations or getServersUserNonce() for server operations
+   *
    * Retrieves the user's current nonce from the DataPortabilityServers contract.
+   * This method is deprecated in favor of more specific nonce methods.
    *
    * The nonce is used to prevent replay attacks in signed transactions and must
    * be incremented with each transaction to maintain security.
@@ -37155,8 +37145,12 @@ var PermissionsController = class {
    * @private
    * @example
    * ```typescript
+   * // Deprecated - use specific methods instead
    * const nonce = await this.getUserNonce();
-   * console.log(`Current nonce: ${nonce}`);
+   *
+   * // Use these instead:
+   * const permissionsNonce = await this.getPermissionsUserNonce();
+   * const serversNonce = await this.getServersUserNonce();
    * ```
    */
   async getUserNonce() {
@@ -37185,16 +37179,17 @@ var PermissionsController = class {
    * Retrieves the user's current nonce from the DataPortabilityServers contract.
    * This nonce is used for server-related operations (AddAndTrustServer, TrustServer, UntrustServer).
    *
-   * @returns Promise resolving to the current nonce
+   * @returns Promise resolving to the current servers nonce
+   * @throws {NonceError} When reading nonce from contract fails
    * @private
    *
    * @example
    * ```typescript
-   * const nonce = await this.getServerNonce();
-   * console.log(`Current server nonce: ${nonce}`);
+   * const nonce = await this.getServersUserNonce();
+   * console.log(`Current servers nonce: ${nonce}`);
    * ```
    */
-  async getServerNonce() {
+  async getServersUserNonce() {
     try {
       const userAddress = await this.getUserAddress();
       const chainId = await this.context.walletClient.getChainId();
@@ -37216,6 +37211,44 @@ var PermissionsController = class {
       );
     }
   }
+  /**
+   * Retrieves the user's current nonce from the DataPortabilityPermissions contract.
+   * This nonce is used for permission-related operations (addPermission, addServerFilesAndPermissions).
+   *
+   * @returns Promise resolving to the current permissions nonce
+   * @throws {NonceError} When reading nonce from contract fails
+   * @private
+   *
+   * @example
+   * ```typescript
+   * const nonce = await this.getPermissionsUserNonce();
+   * console.log(`Current permissions nonce: ${nonce}`);
+   * ```
+   */
+  async getPermissionsUserNonce() {
+    try {
+      const userAddress = await this.getUserAddress();
+      const chainId = await this.context.walletClient.getChainId();
+      const DataPortabilityPermissionsAddress = getContractAddress(
+        chainId,
+        "DataPortabilityPermissions"
+      );
+      const DataPortabilityPermissionsAbi = getAbi(
+        "DataPortabilityPermissions"
+      );
+      const nonce = await this.context.publicClient.readContract({
+        address: DataPortabilityPermissionsAddress,
+        abi: DataPortabilityPermissionsAbi,
+        functionName: "userNonce",
+        args: [userAddress]
+      });
+      return nonce;
+    } catch (error) {
+      throw new NonceError(
+        `Failed to retrieve permissions nonce: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
+    }
+  }
   /**
    * Composes the EIP-712 typed data for PermissionGrant (new simplified format).
    *
@@ -37577,12 +37610,13 @@ var PermissionsController = class {
         "DataPortabilityServers"
       );
       const DataPortabilityServersAbi = getAbi("DataPortabilityServers");
+      const userAddress = this.context.walletClient.account?.address || await this.getUserAddress();
       const txHash = await this.context.walletClient.writeContract({
         address: DataPortabilityServersAddress,
         abi: DataPortabilityServersAbi,
         functionName: "addAndTrustServerOnBehalf",
         args: [
-          params.owner,
+          userAddress,
           {
             serverAddress: params.serverAddress,
             serverUrl: params.serverUrl,
@@ -37645,10 +37679,9 @@ var PermissionsController = class {
    */
   async submitAddAndTrustServerWithSignature(params) {
     try {
-      const nonce = await this.getServerNonce();
+      const nonce = await this.getServersUserNonce();
       const addAndTrustServerInput = {
         nonce,
-        owner: params.owner,
         serverAddress: params.serverAddress,
         publicKey: params.publicKey,
         serverUrl: params.serverUrl
@@ -37658,7 +37691,6 @@ var PermissionsController = class {
       );
       console.debug("\u{1F50D} AddAndTrustServer Debug Info:", {
         nonce: nonce.toString(),
-        owner: params.owner,
         serverAddress: params.serverAddress,
         publicKey: params.publicKey,
         serverUrl: params.serverUrl,
@@ -37710,7 +37742,7 @@ var PermissionsController = class {
    */
   async submitTrustServerWithSignature(params) {
     try {
-      const nonce = await this.getServerNonce();
+      const nonce = await this.getServersUserNonce();
       const trustServerInput = {
         nonce,
         serverId: params.serverId
@@ -37805,7 +37837,7 @@ var PermissionsController = class {
    * ```
    */
   async submitUntrustServer(params) {
-    const nonce = await this.getUserNonce();
+    const nonce = await this.getServersUserNonce();
     const untrustServerInput = {
       nonce,
       serverId: params.serverId
@@ -37826,7 +37858,7 @@ var PermissionsController = class {
    */
   async submitUntrustServerWithSignature(params) {
     try {
-      const nonce = await this.getServerNonce();
+      const nonce = await this.getServersUserNonce();
       const untrustServerInput = {
         nonce,
         serverId: params.serverId
@@ -38134,18 +38166,18 @@ var PermissionsController = class {
    */
   async composeAddAndTrustServerMessage(input) {
     const domain = await this.getServersDomain();
+    console.debug(domain);
     return {
       domain,
       types: {
-        AddAndTrustServer: [
+        AddServer: [
           { name: "nonce", type: "uint256" },
-          { name: "owner", type: "address" },
           { name: "serverAddress", type: "address" },
-          { name: "publicKey", type: "bytes" },
+          { name: "publicKey", type: "string" },
           { name: "serverUrl", type: "string" }
         ]
       },
-      primaryType: "AddAndTrustServer",
+      primaryType: "AddServer",
       message: input
     };
   }
@@ -38226,7 +38258,6 @@ var PermissionsController = class {
       contractAddress: DataPortabilityServersAddress,
       input: {
         nonce: addAndTrustServerInput.nonce.toString(),
-        owner: addAndTrustServerInput.owner,
         serverAddress: addAndTrustServerInput.serverAddress,
         publicKey: addAndTrustServerInput.publicKey,
         serverUrl: addAndTrustServerInput.serverUrl
@@ -38240,7 +38271,6 @@ var PermissionsController = class {
       args: [
         {
           nonce: addAndTrustServerInput.nonce,
-          owner: addAndTrustServerInput.owner,
           serverAddress: addAndTrustServerInput.serverAddress,
           publicKey: addAndTrustServerInput.publicKey,
           serverUrl: addAndTrustServerInput.serverUrl
@@ -38393,7 +38423,7 @@ var PermissionsController = class {
    * ```
    */
   async submitRegisterGranteeWithSignature(params) {
-    const nonce = await this.getUserNonce();
+    const nonce = await this.getServersUserNonce();
     const registerGranteeInput = {
       nonce,
       owner: params.owner,
@@ -39543,14 +39573,18 @@ var PermissionsController = class {
     }
   }
   /**
-   * Submit permission with signature to the blockchain
+   * Submit permission with signature to the blockchain (supports gasless transactions)
    *
    * @param params - Parameters for adding permission
    * @returns Promise resolving to transaction hash
+   * @throws {RelayerError} When gasless transaction submission fails
+   * @throws {SignatureError} When user rejects the signature request
+   * @throws {BlockchainError} When permission addition fails
+   * @throws {NetworkError} When network communication fails
    */
   async submitAddPermission(params) {
     try {
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       const addPermissionInput = {
         nonce,
         granteeId: params.granteeId,
@@ -39563,48 +39597,64 @@ var PermissionsController = class {
       };
       const typedData = await this.composeServerFilesAndPermissionMessage(addPermissionInput);
       const signature = await this.signTypedData(typedData);
-      const chainId = await this.context.walletClient.getChainId();
-      const DataPortabilityPermissionsAddress = getContractAddress(
-        chainId,
-        "DataPortabilityPermissions"
-      );
-      const DataPortabilityPermissionsAbi = getAbi(
-        "DataPortabilityPermissions"
+      return await this.submitSignedAddPermission(typedData, signature);
+    } catch (error) {
+      if (error instanceof RelayerError || error instanceof UserRejectedRequestError || error instanceof SerializationError || error instanceof SignatureError || error instanceof NetworkError || error instanceof NonceError) {
+        throw error;
+      }
+      throw new BlockchainError(
+        `Failed to add permission: ${error instanceof Error ? error.message : "Unknown error"}`,
+        error
       );
-      const hash = await this.context.walletClient.writeContract({
-        address: DataPortabilityPermissionsAddress,
-        abi: DataPortabilityPermissionsAbi,
-        functionName: "addPermission",
-        args: [
-          {
-            nonce: addPermissionInput.nonce,
-            granteeId: addPermissionInput.granteeId,
-            grant: addPermissionInput.grant,
-            fileIds: []
-            // Note: This should be handled differently for addPermission vs addServerFilesAndPermissions
-          },
+    }
+  }
+  /**
+   * Submits an already-signed add permission transaction to the blockchain.
+   * This method supports both relayer-based gasless transactions and direct transactions.
+   *
+   * @param typedData - The EIP-712 typed data for AddPermission
+   * @param signature - The user's signature
+   * @returns Promise resolving to the transaction hash
+   * @throws {RelayerError} When gasless transaction submission fails
+   * @throws {BlockchainError} When permission addition fails
+   * @throws {NetworkError} When network communication fails
+   */
+  async submitSignedAddPermission(typedData, signature) {
+    try {
+      if (this.context.relayerCallbacks?.submitAddPermission) {
+        return await this.context.relayerCallbacks.submitAddPermission(
+          typedData,
           signature
-        ],
-        chain: this.context.walletClient.chain,
-        account: this.context.walletClient.account || null
-      });
-      return hash;
+        );
+      } else {
+        return await this.submitDirectAddPermissionTransaction(
+          typedData,
+          signature
+        );
+      }
     } catch (error) {
+      if (error instanceof RelayerError || error instanceof NetworkError || error instanceof UserRejectedRequestError || error instanceof SignatureError || error instanceof NonceError) {
+        throw error;
+      }
       throw new BlockchainError(
-        `Failed to add permission: ${error instanceof Error ? error.message : "Unknown error"}`,
+        `Add permission submission failed: ${error instanceof Error ? error.message : "Unknown error"}`,
         error
       );
     }
   }
   /**
-   * Submit server files and permissions with signature to the blockchain
+   * Submit server files and permissions with signature to the blockchain (supports gasless transactions)
    *
    * @param params - Parameters for adding server files and permissions
    * @returns Promise resolving to transaction hash
+   * @throws {RelayerError} When gasless transaction submission fails
+   * @throws {SignatureError} When user rejects the signature request
+   * @throws {BlockchainError} When server files and permissions addition fails
+   * @throws {NetworkError} When network communication fails
    */
   async submitAddServerFilesAndPermissions(params) {
     try {
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       const serverFilesAndPermissionInput = {
         nonce,
         granteeId: params.granteeId,
@@ -39619,27 +39669,61 @@ var PermissionsController = class {
         serverFilesAndPermissionInput
       );
       const signature = await this.signTypedData(typedData);
-      const chainId = await this.context.walletClient.getChainId();
-      const DataPortabilityPermissionsAddress = getContractAddress(
-        chainId,
-        "DataPortabilityPermissions"
+      return await this.submitSignedAddServerFilesAndPermissions(
+        typedData,
+        signature
       );
-      const DataPortabilityPermissionsAbi = getAbi(
-        "DataPortabilityPermissions"
+    } catch (error) {
+      if (error instanceof RelayerError || error instanceof UserRejectedRequestError || error instanceof SerializationError || error instanceof SignatureError || error instanceof NetworkError || error instanceof NonceError) {
+        throw error;
+      }
+      throw new BlockchainError(
+        `Failed to add server files and permissions: ${error instanceof Error ? error.message : "Unknown error"}`,
+        error
       );
-      const hash = await this.context.walletClient.writeContract({
-        address: DataPortabilityPermissionsAddress,
-        abi: DataPortabilityPermissionsAbi,
-        functionName: "addServerFilesAndPermissions",
-        // @ts-expect-error - Complex nested array types cause compatibility issues with viem's generated types
-        args: [serverFilesAndPermissionInput, signature],
-        chain: this.context.walletClient.chain,
-        account: this.context.walletClient.account || null
+    }
+  }
+  /**
+   * Submits an already-signed add server files and permissions transaction to the blockchain.
+   * This method supports both relayer-based gasless transactions and direct transactions.
+   *
+   * @param typedData - The EIP-712 typed data for AddServerFilesAndPermissions
+   * @param signature - The user's signature
+   * @returns Promise resolving to the transaction hash
+   * @throws {RelayerError} When gasless transaction submission fails
+   * @throws {BlockchainError} When server files and permissions addition fails
+   * @throws {NetworkError} When network communication fails
+   */
+  async submitSignedAddServerFilesAndPermissions(typedData, signature) {
+    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) : []
       });
-      return hash;
+      if (this.context.relayerCallbacks?.submitAddServerFilesAndPermissions) {
+        console.debug(
+          "\u{1F680} Using relayer for submitAddServerFilesAndPermissions"
+        );
+        return await this.context.relayerCallbacks.submitAddServerFilesAndPermissions(
+          typedData,
+          signature
+        );
+      } else {
+        console.debug(
+          "\u{1F4DD} Using direct transaction for submitAddServerFilesAndPermissions"
+        );
+        return await this.submitDirectAddServerFilesAndPermissionsTransaction(
+          typedData,
+          signature
+        );
+      }
     } catch (error) {
+      if (error instanceof RelayerError || error instanceof NetworkError || error instanceof UserRejectedRequestError || error instanceof SignatureError || error instanceof NonceError) {
+        throw error;
+      }
       throw new BlockchainError(
-        `Failed to add server files and permissions: ${error instanceof Error ? error.message : "Unknown error"}`,
+        `Add server files and permissions submission failed: ${error instanceof Error ? error.message : "Unknown error"}`,
         error
       );
     }
@@ -39676,6 +39760,71 @@ var PermissionsController = class {
       );
     }
   }
+  /**
+   * Submits a signed add permission transaction directly to the blockchain.
+   *
+   * @param typedData - The typed data structure for the permission addition
+   * @param signature - The cryptographic signature authorizing the transaction
+   * @returns Promise resolving to the transaction hash
+   */
+  async submitDirectAddPermissionTransaction(typedData, signature) {
+    const chainId = await this.context.walletClient.getChainId();
+    const DataPortabilityPermissionsAddress = getContractAddress(
+      chainId,
+      "DataPortabilityPermissions"
+    );
+    const DataPortabilityPermissionsAbi = getAbi("DataPortabilityPermissions");
+    const permissionInput = {
+      nonce: typedData.message.nonce,
+      granteeId: typedData.message.granteeId,
+      grant: typedData.message.grant,
+      fileIds: typedData.message.fileIds || []
+    };
+    const hash = await this.context.walletClient.writeContract({
+      address: DataPortabilityPermissionsAddress,
+      abi: DataPortabilityPermissionsAbi,
+      functionName: "addPermission",
+      args: [permissionInput, signature],
+      account: this.context.walletClient.account || await this.getUserAddress(),
+      chain: this.context.walletClient.chain || null
+    });
+    return hash;
+  }
+  /**
+   * Submits a signed add server files and permissions transaction directly to the blockchain.
+   *
+   * @param typedData - The typed data structure for the server files and permissions addition
+   * @param signature - The cryptographic signature authorizing the transaction
+   * @returns Promise resolving to the transaction hash
+   */
+  async submitDirectAddServerFilesAndPermissionsTransaction(typedData, signature) {
+    const chainId = await this.context.walletClient.getChainId();
+    const DataPortabilityPermissionsAddress = getContractAddress(
+      chainId,
+      "DataPortabilityPermissions"
+    );
+    const DataPortabilityPermissionsAbi = getAbi("DataPortabilityPermissions");
+    const serverFilesAndPermissionInput = {
+      nonce: typedData.message.nonce,
+      granteeId: typedData.message.granteeId,
+      grant: typedData.message.grant,
+      fileUrls: typedData.message.fileUrls,
+      serverAddress: typedData.message.serverAddress,
+      serverUrl: typedData.message.serverUrl,
+      serverPublicKey: typedData.message.serverPublicKey,
+      filePermissions: typedData.message.filePermissions
+    };
+    const hash = await this.context.walletClient.writeContract({
+      address: DataPortabilityPermissionsAddress,
+      abi: DataPortabilityPermissionsAbi,
+      functionName: "addServerFilesAndPermissions",
+      // @ts-expect-error - Complex nested array types cause compatibility issues with viem's generated types
+      args: [serverFilesAndPermissionInput, signature],
+      account: this.context.walletClient.account || await this.getUserAddress(),
+      chain: this.context.walletClient.chain || null
+    });
+    return hash;
+  }
 };
 
 // src/controllers/data.ts
@@ -45343,6 +45492,13 @@ var CircuitBreaker = class {
 var import_viem10 = require("viem");
 async function handleRelayerRequest(sdk, payload) {
   const { typedData, signature, expectedUserAddress } = payload;
+  console.debug({
+    domain: typedData.domain,
+    types: typedData.types,
+    primaryType: typedData.primaryType,
+    message: typedData.message,
+    signature
+  });
   const signerAddress = await (0, import_viem10.recoverTypedDataAddress)({
     domain: typedData.domain,
     types: typedData.types,
@@ -45380,7 +45536,7 @@ async function handleRelayerRequest(sdk, payload) {
         typedData,
         signature
       );
-    case "AddAndTrustServer":
+    case "AddServer":
       return await sdk.permissions.submitSignedAddAndTrustServer(
         typedData,
         signature
@@ -45395,6 +45551,11 @@ async function handleRelayerRequest(sdk, payload) {
         typedData,
         signature
       );
+    case "ServerFilesAndPermission":
+      return await sdk.permissions.submitSignedAddServerFilesAndPermissions(
+        typedData,
+        signature
+      );
     default:
       throw new Error(`Unsupported operation type: ${typedData.primaryType}`);
   }