fix(host): remove fulfill_sp1_params

Author: keroro520

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

@@ -9,7 +9,7 @@ use raiko_tasks::TaskStatus;
 use serde_json::Value;
 use utoipa::OpenApi;
 
-use crate::server::utils::{draw_for_zk_any_request, fulfill_sp1_params, is_zk_any_request};
+use crate::server::utils::{draw_for_zk_any_request, is_zk_any_request};
 use crate::{
     interfaces::HostResult,
     metrics::{inc_current_req, inc_guest_req_count, inc_host_req_count},
@@ -39,16 +39,9 @@ pub mod report;
 /// - sgx - uses the sgx environment to construct a block and produce proof of execution
 /// - sp1 - uses the sp1 prover
 /// - risc0 - uses the risc0 prover
-async fn proof_handler(
-    State(actor): State<Actor>,
-    Json(mut req): Json<Value>,
-) -> HostResult<Status> {
+async fn proof_handler(State(actor): State<Actor>, Json(req): Json<Value>) -> HostResult<Status> {
     inc_current_req();
 
-    if is_zk_any_request(&req) {
-        fulfill_sp1_params(&mut req);
-    }
-
     // Override the existing proof request config from the config file and command line
     // options with the request from the client.
     let mut config = actor.default_request_config().clone();

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

@@ -4,9 +4,7 @@ use crate::{
         api::v3::{ProofResponse, Status},
         handler::prove_many,
         prove_aggregation,
-        utils::{
-            draw_for_zk_any_batch_request, fulfill_sp1_params, is_zk_any_request, to_v3_status,
-        },
+        utils::{draw_for_zk_any_batch_request, is_zk_any_request, to_v3_status},
     },
 };
 use axum::{extract::State, routing::post, Json, Router};
@@ -41,17 +39,13 @@ use utoipa::OpenApi;
 /// - risc0 - uses the risc0 prover
 async fn batch_handler(
     State(actor): State<Actor>,
-    Json(mut batch_request_opt): Json<Value>,
+    Json(batch_request_opt): Json<Value>,
 ) -> HostResult<Status> {
     tracing::debug!(
         "Received batch request: {}",
         serde_json::to_string(&batch_request_opt)?
     );
 
-    if is_zk_any_request(&batch_request_opt) {
-        fulfill_sp1_params(&mut batch_request_opt);
-    }
-
     let batch_request = {
         // Override the existing proof request config from the config file and command line
         // options with the request from the client, and convert to a BatchProofRequest.

host/src/server/utils.rs

@@ -125,24 +125,3 @@ pub async fn draw_for_zk_any_batch_request(
         get_task_data(&l1_network, l1_inclusion_block_number, actor.chain_specs()).await?;
     Ok(actor.draw(&blockhash))
 }
-
-pub fn fulfill_sp1_params(req: &mut Value) {
-    let aggregate = req["aggregate"].as_bool().unwrap_or(false);
-    let sp1_recursion = if aggregate {
-        serde_json::Value::String("compressed".to_string())
-    } else {
-        serde_json::Value::String("plonk".to_string())
-    };
-
-    let sp1_opts = req["sp1"].as_object_mut();
-    match sp1_opts {
-        None => {
-            let mut sp1_opts = serde_json::Map::new();
-            sp1_opts.insert("recursion".to_string(), sp1_recursion);
-            req["sp1"] = serde_json::Value::Object(sp1_opts);
-        }
-        Some(sp1_opts) => {
-            sp1_opts.insert("recursion".to_string(), sp1_recursion);
-        }
-    }
-}