@@ -7,7 +7,7 @@ use axum::{
77 routing:: { get, post} ,
88 Json , Router ,
99} ;
10- use log:: info;
10+ use log:: { error , info} ;
1111use op_succinct_client_utils:: {
1212 boot:: { hash_rollup_config, BootInfoStruct } ,
1313 types:: u32_to_u8,
@@ -121,7 +121,13 @@ async fn request_span_proof(
121121 Json ( payload) : Json < SpanProofRequest > ,
122122) -> Result < ( StatusCode , Json < ProofResponse > ) , AppError > {
123123 info ! ( "Received span proof request: {:?}" , payload) ;
124- let fetcher = OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await ?;
124+ let fetcher = match OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await {
125+ Ok ( f) => f,
126+ Err ( e) => {
127+ error ! ( "Failed to create data fetcher: {}" , e) ;
128+ return Err ( AppError ( e) ) ;
129+ }
130+ } ;
125131
126132 let host_cli = match fetcher
127133 . get_host_cli_args (
@@ -134,7 +140,7 @@ async fn request_span_proof(
134140 {
135141 Ok ( cli) => cli,
136142 Err ( e) => {
137- log :: error!( "Failed to get host CLI args: {}" , e) ;
143+ error ! ( "Failed to get host CLI args: {}" , e) ;
138144 return Err ( AppError ( anyhow:: anyhow!(
139145 "Failed to get host CLI args: {}" ,
140146 e
@@ -147,15 +153,15 @@ async fn request_span_proof(
147153 // host, and return an ID that the client can poll on to check if the proof was submitted.
148154 let mut witnessgen_executor = WitnessGenExecutor :: new ( WITNESSGEN_TIMEOUT , RunContext :: Docker ) ;
149155 if let Err ( e) = witnessgen_executor. spawn_witnessgen ( & host_cli) . await {
150- log :: error!( "Failed to spawn witness generation: {}" , e) ;
156+ error ! ( "Failed to spawn witness generation: {}" , e) ;
151157 return Err ( AppError ( anyhow:: anyhow!(
152158 "Failed to spawn witness generation: {}" ,
153159 e
154160 ) ) ) ;
155161 }
156162 // Log any errors from running the witness generation process.
157163 if let Err ( e) = witnessgen_executor. flush ( ) . await {
158- log :: error!( "Failed to generate witness: {}" , e) ;
164+ error ! ( "Failed to generate witness: {}" , e) ;
159165 return Err ( AppError ( anyhow:: anyhow!(
160166 "Failed to generate witness: {}" ,
161167 e
@@ -165,7 +171,7 @@ async fn request_span_proof(
165171 let sp1_stdin = match get_proof_stdin ( & host_cli) {
166172 Ok ( stdin) => stdin,
167173 Err ( e) => {
168- log :: error!( "Failed to get proof stdin: {}" , e) ;
174+ error ! ( "Failed to get proof stdin: {}" , e) ;
169175 return Err ( AppError ( anyhow:: anyhow!(
170176 "Failed to get proof stdin: {}" ,
171177 e
@@ -176,7 +182,7 @@ async fn request_span_proof(
176182 let private_key = match env:: var ( "SP1_PRIVATE_KEY" ) {
177183 Ok ( private_key) => private_key,
178184 Err ( e) => {
179- log :: error!( "Failed to get SP1 private key: {}" , e) ;
185+ error ! ( "Failed to get SP1 private key: {}" , e) ;
180186 return Err ( AppError ( anyhow:: anyhow!(
181187 "Failed to get SP1 private key: {}" ,
182188 e
@@ -186,7 +192,7 @@ async fn request_span_proof(
186192 let rpc_url = match env:: var ( "PROVER_NETWORK_RPC" ) {
187193 Ok ( rpc_url) => rpc_url,
188194 Err ( e) => {
189- log :: error!( "Failed to get PROVER_NETWORK_RPC: {}" , e) ;
195+ error ! ( "Failed to get PROVER_NETWORK_RPC: {}" , e) ;
190196 return Err ( AppError ( anyhow:: anyhow!(
191197 "Failed to get PROVER_NETWORK_RPC: {}" ,
192198 e
@@ -205,7 +211,7 @@ async fn request_span_proof(
205211 {
206212 Ok ( vk_hash) => vk_hash,
207213 Err ( e) => {
208- log :: error!( "Failed to register program: {}" , e) ;
214+ error ! ( "Failed to register program: {}" , e) ;
209215 return Err ( AppError ( anyhow:: anyhow!(
210216 "Failed to register program: {}" ,
211217 e
@@ -224,7 +230,7 @@ async fn request_span_proof(
224230 {
225231 Ok ( proof_id) => proof_id,
226232 Err ( e) => {
227- log :: error!( "Failed to request proof: {}" , e) ;
233+ error ! ( "Failed to request proof: {}" , e) ;
228234 return Err ( AppError ( anyhow:: anyhow!( "Failed to request proof: {}" , e) ) ) ;
229235 }
230236 } ;
@@ -263,14 +269,18 @@ async fn request_agg_proof(
263269 ) ?;
264270 let l1_head: [ u8 ; 32 ] = l1_head_bytes. try_into ( ) . unwrap ( ) ;
265271
266- let fetcher = OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await ?;
267- let res = fetcher
272+ let fetcher = match OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await {
273+ Ok ( f) => f,
274+ Err ( e) => return Err ( AppError ( anyhow:: anyhow!( "Failed to create fetcher: {}" , e) ) ) ,
275+ } ;
276+
277+ let headers = match fetcher
268278 . get_header_preimages ( & boot_infos, l1_head. into ( ) )
269- . await ;
270- let headers = match res {
271- Ok ( headers ) => headers ,
279+ . await
280+ {
281+ Ok ( h ) => h ,
272282 Err ( e) => {
273- log :: error!( "Failed to get header preimages: {}" , e) ;
283+ error ! ( "Failed to get header preimages: {}" , e) ;
274284 return Err ( AppError ( anyhow:: anyhow!(
275285 "Failed to get header preimages: {}" ,
276286 e
@@ -286,42 +296,39 @@ async fn request_agg_proof(
286296
287297 let stdin =
288298 match get_agg_proof_stdin ( proofs, boot_infos, headers, & state. range_vk , l1_head. into ( ) ) {
289- Ok ( stdin ) => stdin ,
299+ Ok ( s ) => s ,
290300 Err ( e) => {
291- log :: error!( "Failed to get agg proof stdin: {}" , e) ;
301+ error ! ( "Failed to get agg proof stdin: {}" , e) ;
292302 return Err ( AppError ( anyhow:: anyhow!(
293303 "Failed to get agg proof stdin: {}" ,
294304 e
295305 ) ) ) ;
296306 }
297307 } ;
298308
299- let res = prover. register_program ( & state. agg_vk , AGG_ELF ) . await ;
300- let vk_hash = match res {
309+ let vk_hash = match prover. register_program ( & state. agg_vk , AGG_ELF ) . await {
301310 Ok ( vk_hash) => vk_hash,
302311 Err ( e) => {
303- log :: error!( "Failed to register program: {}" , e) ;
312+ error ! ( "Failed to register program: {}" , e) ;
304313 return Err ( AppError ( anyhow:: anyhow!(
305314 "Failed to register program: {}" ,
306315 e
307316 ) ) ) ;
308317 }
309318 } ;
310- let res = prover
319+ let proof_id = match prover
311320 . request_proof (
312321 & vk_hash,
313322 & stdin,
314323 ProofMode :: Groth16 ,
315324 1_000_000_000_000 ,
316325 None ,
317326 )
318- . await ;
319-
320- // Check if error, otherwise get proof ID.
321- let proof_id = match res {
322- Ok ( proof_id) => proof_id,
327+ . await
328+ {
329+ Ok ( id) => id,
323330 Err ( e) => {
324- log :: error!( "Failed to request proof: {}" , e) ;
331+ error ! ( "Failed to request proof: {}" , e) ;
325332 return Err ( AppError ( anyhow:: anyhow!( "Failed to request proof: {}" , e) ) ) ;
326333 }
327334 } ;
@@ -335,33 +342,54 @@ async fn request_mock_span_proof(
335342 Json ( payload) : Json < SpanProofRequest > ,
336343) -> Result < ( StatusCode , Json < ProofStatus > ) , AppError > {
337344 info ! ( "Received mock span proof request: {:?}" , payload) ;
338- let fetcher = OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await ?;
345+ let fetcher = match OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await {
346+ Ok ( f) => f,
347+ Err ( e) => {
348+ error ! ( "Failed to create data fetcher: {}" , e) ;
349+ return Err ( AppError ( e) ) ;
350+ }
351+ } ;
339352
340- let host_cli = fetcher
353+ let host_cli = match fetcher
341354 . get_host_cli_args (
342355 payload. start ,
343356 payload. end ,
344357 ProgramType :: Multi ,
345358 CacheMode :: DeleteCache ,
346359 )
347- . await ?;
360+ . await
361+ {
362+ Ok ( cli) => cli,
363+ Err ( e) => {
364+ error ! ( "Failed to get host CLI args: {}" , e) ;
365+ return Err ( AppError ( e) ) ;
366+ }
367+ } ;
348368
349369 // Start the server and native client with a timeout.
350370 // Note: Ideally, the server should call out to a separate process that executes the native
351371 // host, and return an ID that the client can poll on to check if the proof was submitted.
352372 let mut witnessgen_executor = WitnessGenExecutor :: new ( WITNESSGEN_TIMEOUT , RunContext :: Docker ) ;
353- witnessgen_executor. spawn_witnessgen ( & host_cli) . await ?;
373+ if let Err ( e) = witnessgen_executor. spawn_witnessgen ( & host_cli) . await {
374+ error ! ( "Failed to spawn witness generator: {}" , e) ;
375+ return Err ( AppError ( e) ) ;
376+ }
354377 // Log any errors from running the witness generation process.
355- let res = witnessgen_executor. flush ( ) . await ;
356- if let Err ( e) = res {
357- log:: error!( "Failed to generate witness: {}" , e) ;
378+ if let Err ( e) = witnessgen_executor. flush ( ) . await {
379+ error ! ( "Failed to generate witness: {}" , e) ;
358380 return Err ( AppError ( anyhow:: anyhow!(
359381 "Failed to generate witness: {}" ,
360382 e
361383 ) ) ) ;
362384 }
363385
364- let sp1_stdin = get_proof_stdin ( & host_cli) ?;
386+ let sp1_stdin = match get_proof_stdin ( & host_cli) {
387+ Ok ( stdin) => stdin,
388+ Err ( e) => {
389+ error ! ( "Failed to get proof stdin: {}" , e) ;
390+ return Err ( AppError ( e) ) ;
391+ }
392+ } ;
365393
366394 let prover = ProverClient :: mock ( ) ;
367395 let proof = prover
@@ -404,30 +432,62 @@ async fn request_mock_agg_proof(
404432 . map ( |proof| proof. proof . clone ( ) )
405433 . collect ( ) ;
406434
407- let l1_head_bytes = hex:: decode (
435+ let l1_head_bytes = match hex:: decode (
408436 payload
409437 . head
410438 . strip_prefix ( "0x" )
411439 . expect ( "Invalid L1 head, no 0x prefix." ) ,
412- ) ?;
440+ ) {
441+ Ok ( bytes) => bytes,
442+ Err ( e) => {
443+ error ! ( "Failed to decode L1 head: {}" , e) ;
444+ return Err ( AppError ( anyhow:: anyhow!( "Failed to decode L1 head: {}" , e) ) ) ;
445+ }
446+ } ;
413447 let l1_head: [ u8 ; 32 ] = l1_head_bytes. try_into ( ) . unwrap ( ) ;
414448
415- let fetcher = OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await ?;
416- let headers = fetcher
449+ let fetcher = match OPSuccinctDataFetcher :: new_with_rollup_config ( RunContext :: Docker ) . await {
450+ Ok ( f) => f,
451+ Err ( e) => {
452+ error ! ( "Failed to create data fetcher: {}" , e) ;
453+ return Err ( AppError ( e) ) ;
454+ }
455+ } ;
456+ let headers = match fetcher
417457 . get_header_preimages ( & boot_infos, l1_head. into ( ) )
418- . await ?;
458+ . await
459+ {
460+ Ok ( h) => h,
461+ Err ( e) => {
462+ error ! ( "Failed to get header preimages: {}" , e) ;
463+ return Err ( AppError ( e) ) ;
464+ }
465+ } ;
419466
420467 let prover = ProverClient :: mock ( ) ;
421468
422469 let stdin =
423- get_agg_proof_stdin ( proofs, boot_infos, headers, & state. range_vk , l1_head. into ( ) ) . unwrap ( ) ;
470+ match get_agg_proof_stdin ( proofs, boot_infos, headers, & state. range_vk , l1_head. into ( ) ) {
471+ Ok ( s) => s,
472+ Err ( e) => {
473+ error ! ( "Failed to get aggregation proof stdin: {}" , e) ;
474+ return Err ( AppError ( e) ) ;
475+ }
476+ } ;
424477
425478 // Simulate the mock proof. proof.bytes() returns an empty byte array for mock proofs.
426- let proof = prover
479+ let proof = match prover
427480 . prove ( & state. agg_pk , stdin)
428481 . set_skip_deferred_proof_verification ( true )
429482 . groth16 ( )
430- . run ( ) ?;
483+ . run ( )
484+ {
485+ Ok ( p) => p,
486+ Err ( e) => {
487+ error ! ( "Failed to generate proof: {}" , e) ;
488+ return Err ( AppError ( e) ) ;
489+ }
490+ } ;
431491
432492 Ok ( (
433493 StatusCode :: OK ,
0 commit comments