Merge branch 'mainnet' into feat/query-trait

Author: iamalwaysuncomfortable

sdk/src/network-client.ts

@@ -21,6 +21,19 @@ interface AleoNetworkClientOptions {
     headers?: { [key: string]: string };
 }
 
+/**
+ * Options for submitting a proving request.
+ *
+ * @property provingRequest {ProvingRequest | string} The proving request being submitted to the network.
+ * @property url {string} The URL of the delegated proving service.
+ * @property apiKey {string} The API key to use for authentication.
+ */
+interface DelegatedProvingParams {
+    provingRequest: ProvingRequest | string;
+    url?: string;
+    apiKey?: string;
+}
+
 /**
  * Client library that encapsulates REST calls to publicly exposed endpoints of Aleo nodes. The methods provided in this
  * allow users to query public information from the Aleo blockchain and submit transactions to the network.
@@ -1618,38 +1631,39 @@ class AleoNetworkClient {
     /**
      * Submit a `ProvingRequest` to a remote proving service for delegated proving. If the broadcast flag of the `ProvingRequest` is set to `true` the remote service will attempt to broadcast the result `Transaction` on behalf of the requestor.
      *
-     * @param {ProvingRequest | string} provingRequest - The `ProvingRequest` (generated by the ProgramManager) to submit.
-     * @param {string} url - (Optional) The url of the proving service.
+     * @param {DelegatedProvingParams} options - The optional parameters required to submit a proving request.
      * @returns {Promise<ProvingResponse>} The ProvingResponse containing the transaction result and the result of the broadcast if the `broadcast` flag was set to `true`.
      */
-    async submitProvingRequest(provingRequest: ProvingRequest | string, url?: string): Promise<ProvingResponse> {
-        const prover_uri = url ? url : this.host;
-        const provingRequestString =
-            provingRequest instanceof ProvingRequest
-                ? provingRequest.toString()
-                : provingRequest;
+    async submitProvingRequest(options: DelegatedProvingParams): Promise<ProvingResponse> {
+        const proverUri = options.url ?? this.host;
+        const provingRequestString = options.provingRequest instanceof ProvingRequest
+            ? options.provingRequest.toString()
+            : options.provingRequest;
+
+        // Build headers with proper auth fallback
+        const headers: Record<string, string> = {
+          ...this.headers,
+          "X-ALEO-METHOD": "submitProvingRequest",
+          "Content-Type": "application/json"
+        };
+
+        // Add auth header based on what's available
+        if (options.apiKey) {
+          headers["X-Provable-API-Key"] = options.apiKey;
+        }
+
         try {
             const response = await retryWithBackoff(() =>
-                post(prover_uri + "/prove", {
-                    body: provingRequestString,
-                    headers: Object.assign({}, {...this.headers, "X-ALEO-METHOD": "submitProvingRequest"}, {
-                        "Content-Type": "application/json",
-                    }),
-                }),
-            );
-
-            try {
-                const text = await response.text();
-                return parseJSON(text);
-            } catch (error: any) {
-                throw new Error(
-                    `Error posting proving request. Aleo network response: ${error.message}`,
-                );
-            }
-        } catch (error: any) {
-            throw new Error(
-                `Error posting proving request: No response received: ${error.message}`,
+                post(`${proverUri}/prove`, {
+                body: provingRequestString,
+                 headers
+                })
             );
+            const responseText = await response.text();
+            return parseJSON(responseText);
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+            throw new Error(`Failed to submit proving request: ${errorMessage}`);
         }
     }