feat(host): fill batch_id into response of batch-request

Author: keroro520

host/src/server/api/v2/mod.rs

@@ -69,6 +69,8 @@ pub enum Status {
     Ok {
         #[serde(with = "raiko_lib::proof_type::lowercase")]
         proof_type: ProofType,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        batch_id: Option<u64>,
         data: ProofResponse,
     },
     Error {

host/src/server/api/v2/proof/mod.rs

@@ -61,6 +61,7 @@ async fn proof_handler(
             None => {
                 return Ok(Status::Ok {
                     proof_type: ProofType::Native,
+                    batch_id: None,
                     data: ProofResponse::Status {
                         status: TaskStatus::ZKAnyNotDrawn,
                     },
@@ -126,10 +127,10 @@ async fn proof_handler(
             .into();
 
             let result = crate::server::prove(&actor, request_key, request_entity).await;
-            Ok(to_v2_status(proof_type, result))
+            Ok(to_v2_status(proof_type, None, result))
         }
-        Ok(_) => Ok(to_v2_status(proof_type, result)),
-        Err(_) => Ok(to_v2_status(proof_type, result)),
+        Ok(_) => Ok(to_v2_status(proof_type, None, result)),
+        Err(_) => Ok(to_v2_status(proof_type, None, result)),
     }
 }
 

host/src/server/api/v3/proof/aggregate/mod.rs

@@ -67,7 +67,7 @@ async fn aggregation_handler(
     .into();
 
     let result = crate::server::prove(&actor, agg_request_key, agg_request_entity).await;
-    Ok(to_v3_status(proof_type, result))
+    Ok(to_v3_status(proof_type, None, result))
 }
 
 #[derive(OpenApi)]

host/src/server/api/v3/proof/batch.rs

@@ -11,7 +11,7 @@ use crate::{
 };
 use axum::{extract::State, routing::post, Json, Router};
 use raiko_core::{
-    interfaces::{BatchMetadata, BatchProofRequest, BatchProofRequestOpt},
+    interfaces::{BatchMetadata, BatchProofRequest, BatchProofRequestOpt, RaikoError},
     merge,
 };
 use raiko_lib::{proof_type::ProofType, prover::Proof};
@@ -58,13 +58,27 @@ async fn batch_handler(
         let mut opts = serde_json::to_value(actor.default_request_config())?;
         merge(&mut opts, &batch_request_opt);
 
+        let first_batch_id = {
+            let batches = opts["batches"]
+                .as_array()
+                .ok_or(RaikoError::InvalidRequestConfig(
+                    "Missing batches".to_string(),
+                ))?;
+            let first_batch = batches.first().ok_or(RaikoError::InvalidRequestConfig(
+                "batches is empty".to_string(),
+            ))?;
+            let first_batch_id = first_batch["batch_id"].as_u64().expect("checked above");
+            first_batch_id
+        };
+
         // For zk_any request, draw zk proof type based on the block hash.
         if is_zk_any_request(&opts) {
             match draw_for_zk_any_batch_request(&actor, &opts).await? {
                 Some(proof_type) => opts["proof_type"] = serde_json::to_value(proof_type).unwrap(),
                 None => {
                     return Ok(Status::Ok {
                         proof_type: ProofType::Native,
+                        batch_id: Some(first_batch_id),
                         data: ProofResponse::Status {
                             status: TaskStatus::ZKAnyNotDrawn,
                         },
@@ -207,7 +221,11 @@ async fn batch_handler(
         }
     };
     tracing::debug!("Batch proof result: {}", serde_json::to_string(&result)?);
-    Ok(to_v3_status(batch_request.proof_type, result))
+    Ok(to_v3_status(
+        batch_request.proof_type,
+        Some(batch_request.batches.first().unwrap().batch_id),
+        result,
+    ))
 }
 
 #[derive(OpenApi)]

host/src/server/api/v3/proof/mod.rs

@@ -115,7 +115,7 @@ async fn proof_handler(
         sub_request_entities,
     )
     .await;
-    Ok(to_v3_status(proof_type, result))
+    Ok(to_v3_status(proof_type, None, result))
 }
 
 #[derive(OpenApi)]

host/src/server/utils.rs

@@ -9,10 +9,15 @@ use raiko_reqpool::Status;
 use raiko_tasks::TaskStatus;
 use serde_json::Value;
 
-pub fn to_v2_status(proof_type: ProofType, result: Result<Status, String>) -> v2::Status {
+pub fn to_v2_status(
+    proof_type: ProofType,
+    batch_id: Option<u64>,
+    result: Result<Status, String>,
+) -> v2::Status {
     match result {
         Ok(status) => v2::Status::Ok {
             proof_type,
+            batch_id,
             data: {
                 match status {
                     Status::Registered => v2::ProofResponse::Status {
@@ -57,8 +62,12 @@ pub fn to_v2_cancel_status(result: Result<Status, String>) -> v2::CancelStatus {
 }
 
 // TODO: remove the staled interface
-pub fn to_v3_status(proof_type: ProofType, result: Result<Status, String>) -> v3::Status {
-    to_v2_status(proof_type, result)
+pub fn to_v3_status(
+    proof_type: ProofType,
+    batch_id: Option<u64>,
+    result: Result<Status, String>,
+) -> v3::Status {
+    to_v2_status(proof_type, batch_id, result)
 }
 
 pub fn to_v3_cancel_status(result: Result<Status, String>) -> v3::CancelStatus {