feat(Prover CLI): status batch --verbose

core/lib/basic_types/Cargo.toml

@@ -19,6 +19,7 @@ serde_json.workspace = true
 chrono.workspace = true
 strum = { workspace = true, features = ["derive"] }
 num_enum.workspace = true
+sqlx = { workspace = true, feature= ["derive"]}
 anyhow.workspace = true
 url = { workspace = true, features = ["serde"] }
 

core/lib/basic_types/src/prover_dal.rs

@@ -99,13 +99,13 @@ pub struct JobPosition {
     pub sequence_number: usize,
 }
 
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, PartialEq, Clone)]
 pub struct ProverJobStatusFailed {
     pub started_at: DateTime<Utc>,
     pub error: String,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub struct ProverJobStatusSuccessful {
     pub started_at: DateTime<Utc>,
     pub time_taken: Duration,
@@ -120,7 +120,7 @@ impl Default for ProverJobStatusSuccessful {
     }
 }
 
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, PartialEq, Clone)]
 pub struct ProverJobStatusInProgress {
     pub started_at: DateTime<Utc>,
 }
@@ -146,7 +146,7 @@ pub struct WitnessJobStatusFailed {
     pub error: String,
 }
 
-#[derive(Debug, strum::Display, strum::EnumString, strum::AsRefStr, PartialEq)]
+#[derive(Debug, strum::Display, strum::EnumString, strum::AsRefStr, PartialEq, Clone)]
 pub enum ProverJobStatus {
     #[strum(serialize = "queued")]
     Queued,
@@ -238,6 +238,7 @@ impl FromStr for GpuProverInstanceStatus {
     }
 }
 
+#[derive(Debug, Clone)]
 pub struct ProverJobFriInfo {
     pub id: u32,
     pub l1_batch_number: L1BatchNumber,
@@ -260,6 +261,7 @@ pub struct ProverJobFriInfo {
     pub picked_by: Option<String>,
 }
 
+#[derive(Debug, Clone)]
 pub struct BasicWitnessGeneratorJobInfo {
     pub l1_batch_number: L1BatchNumber,
     pub merkle_tree_paths_blob_url: Option<String>,
@@ -276,6 +278,7 @@ pub struct BasicWitnessGeneratorJobInfo {
     pub eip_4844_blobs: Option<Eip4844Blobs>,
 }
 
+#[derive(Debug, Clone)]
 pub struct LeafWitnessGeneratorJobInfo {
     pub id: u32,
     pub l1_batch_number: L1BatchNumber,
@@ -294,6 +297,7 @@ pub struct LeafWitnessGeneratorJobInfo {
     pub picked_by: Option<String>,
 }
 
+#[derive(Debug, Clone)]
 pub struct NodeWitnessGeneratorJobInfo {
     pub id: u32,
     pub l1_batch_number: L1BatchNumber,
@@ -312,6 +316,22 @@ pub struct NodeWitnessGeneratorJobInfo {
     pub picked_by: Option<String>,
 }
 
+#[derive(Debug, Clone)]
+pub struct RecursionTipWitnessGeneratorJobInfo {
+    pub l1_batch_number: L1BatchNumber,
+    pub status: WitnessJobStatus,
+    pub attempts: u32,
+    pub processing_started_at: Option<NaiveDateTime>,
+    pub time_taken: Option<NaiveTime>,
+    pub error: Option<String>,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub number_of_final_node_jobs: Option<i32>,
+    pub protocol_version: Option<i32>,
+    pub picked_by: Option<String>,
+}
+
+#[derive(Debug, Clone)]
 pub struct SchedulerWitnessGeneratorJobInfo {
     pub l1_batch_number: L1BatchNumber,
     pub scheduler_partial_input_blob_url: String,
@@ -326,7 +346,7 @@ pub struct SchedulerWitnessGeneratorJobInfo {
     pub picked_by: Option<String>,
 }
 
-#[derive(Debug, EnumString, Display)]
+#[derive(Debug, EnumString, Display, Clone)]
 pub enum ProofCompressionJobStatus {
     #[strum(serialize = "queued")]
     Queued,
@@ -342,6 +362,7 @@ pub enum ProofCompressionJobStatus {
     Skipped,
 }
 
+#[derive(Debug, Clone)]
 pub struct ProofCompressionJobInfo {
     pub l1_batch_number: L1BatchNumber,
     pub attempts: u32,
@@ -355,3 +376,15 @@ pub struct ProofCompressionJobInfo {
     pub time_taken: Option<NaiveTime>,
     pub picked_by: Option<String>,
 }
+
+// This function corrects circuit IDs for the node witness generator.
+//
+// - Circuit IDs in the node witness generator are 2 higher than in other rounds.
+// - The `EIP4844Repack` circuit (ID 255) is an exception and is set to 18.
+pub fn correct_circuit_id(circuit_id: i16, aggregation_round: AggregationRound) -> u32 {
+    match (circuit_id, aggregation_round) {
+        (18, AggregationRound::NodeAggregation) => 255,
+        (circuit_id, AggregationRound::NodeAggregation) => (circuit_id as u32) - 2,
+        _ => circuit_id as u32,
+    }
+}

prover/prover_cli/Cargo.toml

@@ -32,3 +32,4 @@ zksync_dal.workspace = true
 strum.workspace = true
 colored.workspace = true
 sqlx.workspace = true
+circuit_definitions.workspace = true