feat: merkle path endpoint

Author: MarcosNicolau

aggregation_mode/Cargo.lock

@@ -30,4 +30,17 @@ impl Db {
 
         Ok(count)
     }
+
+    pub async fn get_merkle_path_by_proof_id(
+        &self,
+        proof_id: &str,
+    ) -> Result<Option<Vec<u8>>, sqlx::Error> {
+        sqlx::query_scalar::<_, Option<Vec<u8>>>(
+            "SELECT merkle_path FROM proofs WHERE proof_id = $1",
+        )
+        .bind(proof_id)
+        .fetch_optional(&self.pool)
+        .await
+        .map(|res| res.flatten())
+    }
 }

aggregation_mode/batcher/src/db.rs

@@ -0,0 +1,14 @@
+pub(super) fn format_merkle_path(bytes: &[u8]) -> Result<Vec<String>, String> {
+    if bytes.is_empty() {
+        return Ok(vec![]);
+    }
+
+    if bytes.len() % 32 != 0 {
+        return Err("merkle path length is not a multiple of 32 bytes".into());
+    }
+
+    Ok(bytes
+        .chunks(32)
+        .map(|chunk| format!("0x{}", hex::encode(chunk)))
+        .collect())
+}

aggregation_mode/batcher/src/server/helpers.rs

@@ -1,9 +1,13 @@
 use actix_web::{
-    web::{self, Data},
+    web::{self, Data, Query},
     App, HttpRequest, HttpResponse, HttpServer, Responder,
 };
+use serde::Deserialize;
 
-use super::types::AppResponse;
+use super::{
+    helpers::format_merkle_path,
+    types::{AppResponse, ProofMerkleQuery},
+};
 
 use crate::{config::Config, db::Db};
 
@@ -27,10 +31,7 @@ impl BatcherServer {
             App::new()
                 .app_data(Data::new(state.clone()))
                 .route("/nonce/{address}", web::get().to(Self::get_nonce))
-                .route(
-                    "/proof/merkle/:receipt",
-                    web::get().to(Self::get_proof_merkle_path),
-                )
+                .route("/proof/merkle", web::get().to(Self::get_proof_merkle_path))
                 .route("/proof", web::post().to(Self::post_proof))
         })
         .bind(("127.0.0.1", port))?
@@ -70,8 +71,57 @@ impl BatcherServer {
         HttpResponse::Ok()
     }
 
-    // TODO: get the proof merkle path for the receipt id (proof commitment)
-    async fn get_proof_merkle_path(req: HttpRequest) -> impl Responder {
-        HttpResponse::Ok()
+    async fn get_proof_merkle_path(
+        req: HttpRequest,
+        params: web::Query<ProofMerkleQuery>,
+    ) -> impl Responder {
+        let Some(state) = req.app_data::<Data<BatcherServer>>() else {
+            return HttpResponse::InternalServerError()
+                .json(AppResponse::new_unsucessfull("Internal server error", 500));
+        };
+
+        let state = state.get_ref();
+
+        // TODO: maybe also accept proof commitment in query param
+        let Some(id) = params.id.clone() else {
+            return HttpResponse::BadRequest().json(AppResponse::new_unsucessfull(
+                "Provide proof `id` query param",
+                400,
+            ));
+        };
+
+        if id.is_empty() {
+            return HttpResponse::BadRequest().json(AppResponse::new_unsucessfull(
+                "Proof id cannot be empty",
+                400,
+            ));
+        }
+
+        let db_result = state.db.get_merkle_path_by_proof_id(&id).await;
+        let merkle_path = match db_result {
+            Ok(Some(merkle_path)) => merkle_path,
+            Ok(None) => {
+                return HttpResponse::NotFound().json(AppResponse::new_unsucessfull(
+                    "Proof merkle path not found",
+                    404,
+                ))
+            }
+            Err(_) => {
+                return HttpResponse::InternalServerError()
+                    .json(AppResponse::new_unsucessfull("Internal server error", 500))
+            }
+        };
+
+        match format_merkle_path(&merkle_path) {
+            Ok(merkle_path) => {
+                HttpResponse::Ok().json(AppResponse::new_sucessfull(serde_json::json!({
+                    "merkle_path": merkle_path
+                })))
+            }
+            Err(_) => {
+                return HttpResponse::InternalServerError()
+                    .json(AppResponse::new_unsucessfull("Internal server error", 500))
+            }
+        }
     }
 }

aggregation_mode/batcher/src/server/http.rs

@@ -1,2 +1,3 @@
+mod helpers;
 pub mod http;
 mod types;

aggregation_mode/batcher/src/server/mod.rs

@@ -25,3 +25,8 @@ impl AppResponse {
         }
     }
 }
+
+#[derive(Deserialize, Clone)]
+pub(super) struct ProofMerkleQuery {
+    pub id: Option<String>,
+}