refactor: move l1_batch_number into SubmitAirbenderProofRequest body

Include l1_batch_number in the JSON request body instead of as a URL
path parameter. Route changes from /airbender/submit_proofs/{batch}
to /airbender/submit_proofs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: deniallugo-claude

core/lib/airbender_prover_interface/src/api.rs

@@ -28,6 +28,7 @@ pub enum SubmitAirbenderProofResponse {
 #[serde_as]
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct SubmitAirbenderProofRequest {
+    pub l1_batch_number: u32,
     #[serde_as(as = "Hex")]
     pub proof: Vec<u8>,
 }

core/lib/airbender_prover_interface/tests/job_serialization.rs

@@ -5,11 +5,13 @@ use zksync_airbender_prover_interface::api::SubmitAirbenderProofRequest;
 #[test]
 fn test_airbender_proof_request_serialization() {
     let airbender_proof_str = r#"{
+        "l1_batch_number": 42,
         "proof": "0A0B0C0D0E"
     }"#;
     let airbender_proof_result =
         serde_json::from_str::<SubmitAirbenderProofRequest>(airbender_proof_str).unwrap();
     let airbender_proof_expected = SubmitAirbenderProofRequest {
+        l1_batch_number: 42,
         proof: vec![10, 11, 12, 13, 14],
     };
     assert_eq!(airbender_proof_result, airbender_proof_expected);

core/node/airbender_proof_data_handler/src/airbender_request_processor.rs

@@ -268,10 +268,9 @@ impl AirbenderRequestProcessor {
 
     pub(crate) async fn submit_proof(
         &self,
-        Path(l1_batch_number): Path<u32>,
         Json(proof): Json<SubmitAirbenderProofRequest>,
     ) -> Result<Json<SubmitAirbenderProofResponse>, AirbenderProcessorError> {
-        let l1_batch_number = L1BatchNumber(l1_batch_number);
+        let l1_batch_number = L1BatchNumber(proof.l1_batch_number);
 
         let proof_for_gcs = L1BatchAirbenderProofForL1 { proof: proof.proof };
         let proof_blob_url = self

core/node/airbender_proof_data_handler/src/lib.rs

@@ -63,56 +63,52 @@ fn create_proof_processing_router(
     let present_batches_processor = processor.clone();
     let submit_processor = processor.clone();
 
-    let router =
-        Router::new()
-            .route(
-                "/airbender/proof_inputs",
-                post(move || async move {
-                    let result = get_processor.get_proof_generation_data().await;
+    let router = Router::new()
+        .route(
+            "/airbender/proof_inputs",
+            post(move || async move {
+                let result = get_processor.get_proof_generation_data().await;
 
-                    match result {
-                        Ok(Some(data)) => (StatusCode::OK, data).into_response(),
-                        Ok(None) => StatusCode::NO_CONTENT.into_response(),
-                        Err(e) => e.into_response(),
-                    }
-                }),
-            )
-            .route(
-                "/airbender/proof_inputs_no_lock/{batch}",
-                get(move |batch: Path<u32>| async move {
-                    let result = get_no_lock_processor
-                        .get_proof_generation_data_no_lock(batch)
-                        .await;
+                match result {
+                    Ok(Some(data)) => (StatusCode::OK, data).into_response(),
+                    Ok(None) => StatusCode::NO_CONTENT.into_response(),
+                    Err(e) => e.into_response(),
+                }
+            }),
+        )
+        .route(
+            "/airbender/proof_inputs_no_lock/{batch}",
+            get(move |batch: Path<u32>| async move {
+                let result = get_no_lock_processor
+                    .get_proof_generation_data_no_lock(batch)
+                    .await;
 
-                    match result {
-                        Ok(Some(data)) => (StatusCode::OK, data).into_response(),
-                        Ok(None) => StatusCode::NOT_FOUND.into_response(),
-                        Err(e) => e.into_response(),
-                    }
-                }),
-            )
-            .route(
-                "/airbender/present_batches",
-                get(move || async move {
-                    let result = present_batches_processor.get_present_batches().await;
+                match result {
+                    Ok(Some(data)) => (StatusCode::OK, data).into_response(),
+                    Ok(None) => StatusCode::NOT_FOUND.into_response(),
+                    Err(e) => e.into_response(),
+                }
+            }),
+        )
+        .route(
+            "/airbender/present_batches",
+            get(move || async move {
+                let result = present_batches_processor.get_present_batches().await;
 
-                    match result {
-                        Ok(data) => (StatusCode::OK, data).into_response(),
-                        Err(e) => e.into_response(),
-                    }
-                }),
-            )
-            .route(
-                "/airbender/submit_proofs/{l1_batch_number}",
-                post(
-                    move |l1_batch_number: Path<u32>,
-                          payload: Json<SubmitAirbenderProofRequest>| async move {
-                        submit_processor
-                            .submit_proof(l1_batch_number, payload)
-                            .await
-                    },
-                ),
-            );
+                match result {
+                    Ok(data) => (StatusCode::OK, data).into_response(),
+                    Err(e) => e.into_response(),
+                }
+            }),
+        )
+        .route(
+            "/airbender/submit_proofs",
+            post(
+                move |payload: Json<SubmitAirbenderProofRequest>| async move {
+                    submit_processor.submit_proof(payload).await
+                },
+            ),
+        );
 
     router
         .layer(tower_http::compression::CompressionLayer::new())

core/node/airbender_proof_data_handler/src/tests.rs

@@ -172,9 +172,10 @@ async fn submit_airbender_proof() {
     mock_airbender_batch_status(db_conn_pool.clone(), batch_number).await;
 
     let airbender_proof_request = SubmitAirbenderProofRequest {
+        l1_batch_number: batch_number.0,
         proof: vec![0x0A, 0x0B, 0x0C, 0x0D, 0x0E],
     };
-    let uri = format!("/airbender/submit_proofs/{}", batch_number.0);
+    let uri = "/airbender/submit_proofs".to_string();
     let app = create_proof_processing_router(
         MockObjectStore::arc(),
         db_conn_pool.clone(),