@opendatalabs/vana-sdk 0.1.0-alpha.6b821f9 → 0.1.0-alpha.71a61ac

package/dist/index.browser.d.ts

@@ -634,8 +634,6 @@ interface ServerInfo {
  * @category Permissions
  */
 interface AddAndTrustServerParams {
-    /** Server owner address */
-    owner: Address;
     /** Server address */
     serverAddress: Address;
     /** Server URL */
@@ -670,8 +668,6 @@ interface UntrustServerParams {
 interface AddAndTrustServerInput {
     /** User nonce */
     nonce: bigint;
-    /** Server owner address */
-    owner: Address;
     /** Server address */
     serverAddress: Address;
     /** Server URL */
@@ -712,13 +708,13 @@ interface AddAndTrustServerTypedData {
     domain: PermissionGrantDomain;
     /** EIP-712 types */
     types: {
-        AddAndTrustServer: Array<{
+        AddServer: Array<{
             name: string;
             type: string;
         }>;
     };
     /** Primary type */
-    primaryType: "AddAndTrustServer";
+    primaryType: "AddServer";
     /** Message to sign */
     message: AddAndTrustServerInput;
 }
@@ -30031,7 +30027,10 @@ declare class PermissionsController {
      */
     submitRevokeWithSignature(params: RevokePermissionParams): Promise<Hash>;
     /**
+     * @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.
@@ -30043,8 +30042,12 @@ declare class PermissionsController {
      * @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();
      * ```
      */
     private getUserNonce;
@@ -30052,16 +30055,32 @@ declare class PermissionsController {
      * 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.getServersUserNonce();
+     * console.log(`Current servers nonce: ${nonce}`);
+     * ```
+     */
+    private getServersUserNonce;
+    /**
+     * 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.getServerNonce();
-     * console.log(`Current server nonce: ${nonce}`);
+     * const nonce = await this.getPermissionsUserNonce();
+     * console.log(`Current permissions nonce: ${nonce}`);
      * ```
      */
-    private getServerNonce;
+    private getPermissionsUserNonce;
     /**
      * Composes the EIP-712 typed data for PermissionGrant (new simplified format).
      *

package/dist/index.browser.js

@@ -36250,7 +36250,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
@@ -36343,7 +36343,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
@@ -36485,7 +36485,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
@@ -36499,7 +36498,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
       );
     }
@@ -36704,7 +36703,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
@@ -36737,7 +36736,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.
@@ -36749,8 +36751,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() {
@@ -36779,16 +36785,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();
@@ -36810,6 +36817,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).
    *
@@ -37171,12 +37216,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,
@@ -37239,10 +37285,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
@@ -37252,7 +37297,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,
@@ -37304,7 +37348,7 @@ var PermissionsController = class {
    */
   async submitTrustServerWithSignature(params) {
     try {
-      const nonce = await this.getServerNonce();
+      const nonce = await this.getServersUserNonce();
       const trustServerInput = {
         nonce,
         serverId: params.serverId
@@ -37399,7 +37443,7 @@ var PermissionsController = class {
    * ```
    */
   async submitUntrustServer(params) {
-    const nonce = await this.getUserNonce();
+    const nonce = await this.getServersUserNonce();
     const untrustServerInput = {
       nonce,
       serverId: params.serverId
@@ -37420,7 +37464,7 @@ var PermissionsController = class {
    */
   async submitUntrustServerWithSignature(params) {
     try {
-      const nonce = await this.getServerNonce();
+      const nonce = await this.getServersUserNonce();
       const untrustServerInput = {
         nonce,
         serverId: params.serverId
@@ -37728,18 +37772,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
     };
   }
@@ -37820,7 +37864,6 @@ var PermissionsController = class {
       contractAddress: DataPortabilityServersAddress,
       input: {
         nonce: addAndTrustServerInput.nonce.toString(),
-        owner: addAndTrustServerInput.owner,
         serverAddress: addAndTrustServerInput.serverAddress,
         publicKey: addAndTrustServerInput.publicKey,
         serverUrl: addAndTrustServerInput.serverUrl
@@ -37834,7 +37877,6 @@ var PermissionsController = class {
       args: [
         {
           nonce: addAndTrustServerInput.nonce,
-          owner: addAndTrustServerInput.owner,
           serverAddress: addAndTrustServerInput.serverAddress,
           publicKey: addAndTrustServerInput.publicKey,
           serverUrl: addAndTrustServerInput.serverUrl
@@ -37987,7 +38029,7 @@ var PermissionsController = class {
    * ```
    */
   async submitRegisterGranteeWithSignature(params) {
-    const nonce = await this.getUserNonce();
+    const nonce = await this.getServersUserNonce();
     const registerGranteeInput = {
       nonce,
       owner: params.owner,
@@ -39144,7 +39186,7 @@ var PermissionsController = class {
    */
   async submitAddPermission(params) {
     try {
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       const addPermissionInput = {
         nonce,
         granteeId: params.granteeId,
@@ -39198,7 +39240,7 @@ var PermissionsController = class {
    */
   async submitAddServerFilesAndPermissions(params) {
     try {
-      const nonce = await this.getUserNonce();
+      const nonce = await this.getPermissionsUserNonce();
       const serverFilesAndPermissionInput = {
         nonce,
         granteeId: params.granteeId,