diff --git a/core/lib/basic_types/src/prover_dal.rs b/core/lib/basic_types/src/prover_dal.rs index 29d36cc91f8f..edaad3798e82 100644 --- a/core/lib/basic_types/src/prover_dal.rs +++ b/core/lib/basic_types/src/prover_dal.rs @@ -5,9 +5,7 @@ use chrono::{DateTime, Duration, NaiveDateTime, NaiveTime, Utc}; use strum::{Display, EnumString}; use crate::{ - basic_fri_types::{AggregationRound, Eip4844Blobs}, - protocol_version::ProtocolVersionId, - L1BatchNumber, + basic_fri_types::AggregationRound, protocol_version::ProtocolVersionId, L1BatchNumber, }; #[derive(Debug, Clone)] @@ -255,7 +253,6 @@ pub struct ProverJobFriInfo { pub created_at: NaiveDateTime, pub updated_at: NaiveDateTime, pub time_taken: Option, - pub is_blob_cleaned: Option, pub depth: u32, pub is_node_final_proof: bool, pub proof_blob_url: Option, @@ -266,7 +263,6 @@ pub struct ProverJobFriInfo { #[derive(Debug, Clone)] pub struct BasicWitnessGeneratorJobInfo { pub l1_batch_number: L1BatchNumber, - pub merkle_tree_paths_blob_url: Option, pub witness_inputs_blob_url: Option, pub attempts: u32, pub status: WitnessJobStatus, @@ -275,10 +271,8 @@ pub struct BasicWitnessGeneratorJobInfo { pub updated_at: NaiveDateTime, pub processing_started_at: Option, pub time_taken: Option, - pub is_blob_cleaned: Option, pub protocol_version: Option, pub picked_by: Option, - pub eip_4844_blobs: Option, } #[derive(Debug, Clone)] @@ -294,7 +288,6 @@ pub struct LeafWitnessGeneratorJobInfo { pub updated_at: NaiveDateTime, pub processing_started_at: Option, pub time_taken: Option, - pub is_blob_cleaned: Option, pub number_of_basic_circuits: Option, pub protocol_version: Option, pub picked_by: Option, diff --git a/prover/crates/bin/prover_fri_gateway/src/proof_gen_data_fetcher.rs b/prover/crates/bin/prover_fri_gateway/src/proof_gen_data_fetcher.rs index e1add827e890..809df8ae8225 100644 --- a/prover/crates/bin/prover_fri_gateway/src/proof_gen_data_fetcher.rs +++ b/prover/crates/bin/prover_fri_gateway/src/proof_gen_data_fetcher.rs @@ -32,10 +32,6 @@ impl ProofGenDataFetcher { impl ProofGenDataFetcher { async fn save_proof_gen_data(&self, data: ProofGenerationData) { let store = &*self.0.blob_store; - let merkle_paths = store - .put(data.l1_batch_number, &data.witness_input_data.merkle_paths) - .await - .expect("Failed to save proof generation data to GCS"); let witness_inputs = store .put(data.l1_batch_number, &data.witness_input_data) .await @@ -49,13 +45,7 @@ impl ProofGenDataFetcher { connection .fri_witness_generator_dal() - .save_witness_inputs( - data.l1_batch_number, - &merkle_paths, - &witness_inputs, - data.protocol_version, - data.witness_input_data.eip_4844_blobs, - ) + .save_witness_inputs(data.l1_batch_number, &witness_inputs, data.protocol_version) .await; } } diff --git a/prover/crates/lib/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json b/prover/crates/lib/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json index e24d2c979a35..b5f056e1ecd9 100644 --- a/prover/crates/lib/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json +++ b/prover/crates/lib/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json @@ -60,26 +60,21 @@ }, { "ordinal": 11, - "name": "is_blob_cleaned", - "type_info": "Bool" - }, - { - "ordinal": 12, "name": "number_of_basic_circuits", "type_info": "Int4" }, { - "ordinal": 13, + "ordinal": 12, "name": "protocol_version", "type_info": "Int4" }, { - "ordinal": 14, + "ordinal": 13, "name": "picked_by", "type_info": "Text" }, { - "ordinal": 15, + "ordinal": 14, "name": "protocol_version_patch", "type_info": "Int4" } @@ -104,7 +99,6 @@ true, true, true, - true, false ] }, diff --git a/prover/crates/lib/prover_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json b/prover/crates/lib/prover_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json new file mode 100644 index 000000000000..cf5fe8117b14 --- /dev/null +++ b/prover/crates/lib/prover_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json @@ -0,0 +1,17 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO\n witness_inputs_fri (\n l1_batch_number,\n witness_inputs_blob_url,\n protocol_version,\n status,\n created_at,\n updated_at,\n protocol_version_patch\n )\n VALUES\n ($1, $2, $3, 'queued', NOW(), NOW(), $4)\n ON CONFLICT (l1_batch_number) DO NOTHING\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Text", + "Int4", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276" +} diff --git a/prover/crates/lib/prover_dal/.sqlx/query-adaa3126792aac4e3afb805068f01ab8ae3f32526d9b5eadcfe52d139f7d6e66.json b/prover/crates/lib/prover_dal/.sqlx/query-adaa3126792aac4e3afb805068f01ab8ae3f32526d9b5eadcfe52d139f7d6e66.json deleted file mode 100644 index 1af0943a3dd8..000000000000 --- a/prover/crates/lib/prover_dal/.sqlx/query-adaa3126792aac4e3afb805068f01ab8ae3f32526d9b5eadcfe52d139f7d6e66.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO\n witness_inputs_fri (\n l1_batch_number,\n merkle_tree_paths_blob_url,\n witness_inputs_blob_url,\n protocol_version,\n eip_4844_blobs,\n status,\n created_at,\n updated_at,\n protocol_version_patch\n )\n VALUES\n ($1, $2, $3, $4, $5, 'queued', NOW(), NOW(), $6)\n ON CONFLICT (l1_batch_number) DO NOTHING\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8", - "Text", - "Text", - "Int4", - "Bytea", - "Int4" - ] - }, - "nullable": [] - }, - "hash": "adaa3126792aac4e3afb805068f01ab8ae3f32526d9b5eadcfe52d139f7d6e66" -} diff --git a/prover/crates/lib/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json b/prover/crates/lib/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json index 007525bceaef..25a49e191f6e 100644 --- a/prover/crates/lib/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json +++ b/prover/crates/lib/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json @@ -70,36 +70,31 @@ }, { "ordinal": 13, - "name": "is_blob_cleaned", - "type_info": "Bool" - }, - { - "ordinal": 14, "name": "depth", "type_info": "Int4" }, { - "ordinal": 15, + "ordinal": 14, "name": "is_node_final_proof", "type_info": "Bool" }, { - "ordinal": 16, + "ordinal": 15, "name": "proof_blob_url", "type_info": "Text" }, { - "ordinal": 17, + "ordinal": 16, "name": "protocol_version", "type_info": "Int4" }, { - "ordinal": 18, + "ordinal": 17, "name": "picked_by", "type_info": "Text" }, { - "ordinal": 19, + "ordinal": 18, "name": "protocol_version_patch", "type_info": "Int4" } @@ -124,7 +119,6 @@ false, false, true, - true, false, false, true, diff --git a/prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json b/prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json index a90da33a3333..2c94853eacff 100644 --- a/prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json +++ b/prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json @@ -60,26 +60,21 @@ }, { "ordinal": 11, - "name": "is_blob_cleaned", - "type_info": "Bool" - }, - { - "ordinal": 12, "name": "number_of_basic_circuits", "type_info": "Int4" }, { - "ordinal": 13, + "ordinal": 12, "name": "protocol_version", "type_info": "Int4" }, { - "ordinal": 14, + "ordinal": 13, "name": "picked_by", "type_info": "Text" }, { - "ordinal": 15, + "ordinal": 14, "name": "protocol_version_patch", "type_info": "Int4" } @@ -106,7 +101,6 @@ true, true, true, - true, false ] }, diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json b/prover/crates/lib/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json index 79f12689194f..7786dc04a2e7 100644 --- a/prover/crates/lib/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json +++ b/prover/crates/lib/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json @@ -10,71 +10,56 @@ }, { "ordinal": 1, - "name": "merkle_tree_paths_blob_url", - "type_info": "Text" - }, - { - "ordinal": 2, "name": "attempts", "type_info": "Int2" }, { - "ordinal": 3, + "ordinal": 2, "name": "status", "type_info": "Text" }, { - "ordinal": 4, + "ordinal": 3, "name": "error", "type_info": "Text" }, { - "ordinal": 5, + "ordinal": 4, "name": "created_at", "type_info": "Timestamp" }, { - "ordinal": 6, + "ordinal": 5, "name": "updated_at", "type_info": "Timestamp" }, { - "ordinal": 7, + "ordinal": 6, "name": "processing_started_at", "type_info": "Timestamp" }, { - "ordinal": 8, + "ordinal": 7, "name": "time_taken", "type_info": "Time" }, { - "ordinal": 9, - "name": "is_blob_cleaned", - "type_info": "Bool" - }, - { - "ordinal": 10, + "ordinal": 8, "name": "protocol_version", "type_info": "Int4" }, { - "ordinal": 11, + "ordinal": 9, "name": "picked_by", "type_info": "Text" }, { - "ordinal": 12, - "name": "eip_4844_blobs", - "type_info": "Bytea" - }, - { - "ordinal": 13, + "ordinal": 10, "name": "protocol_version_patch", "type_info": "Int4" }, { - "ordinal": 14, + "ordinal": 11, "name": "witness_inputs_blob_url", "type_info": "Text" } @@ -86,7 +71,6 @@ }, "nullable": [ false, - true, false, false, true, @@ -96,8 +80,6 @@ true, true, true, - true, - true, false, true ] diff --git a/prover/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.down.sql b/prover/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.down.sql new file mode 100644 index 000000000000..aa57b5f643d8 --- /dev/null +++ b/prover/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.down.sql @@ -0,0 +1,6 @@ +ALTER TABLE witness_inputs_fri ADD COLUMN IF NOT EXISTS merkle_tree_paths_blob_url TEXT; +ALTER TABLE witness_inputs_fri ADD COLUMN IF NOT EXISTS eip_4844_blobs TEXT; +ALTER TABLE witness_inputs_fri ADD COLUMN IF NOT EXISTS is_blob_cleaned BOOLEAN; +ALTER TABLE leaf_aggregation_witness_jobs_fri ADD COLUMN IF NOT EXISTS is_blob_cleaned BOOLEAN; +ALTER TABLE prover_jobs_fri ADD COLUMN IF NOT EXISTS is_blob_cleaned BOOLEAN; +ALTER TABLE prover_jobs_fri_archive ADD COLUMN IF NOT EXISTS is_blob_cleaned BOOLEAN; diff --git a/prover/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.up.sql b/prover/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.up.sql new file mode 100644 index 000000000000..62b32871167f --- /dev/null +++ b/prover/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.up.sql @@ -0,0 +1,6 @@ +ALTER TABLE witness_inputs_fri DROP COLUMN IF EXISTS merkle_tree_paths_blob_url; +ALTER TABLE witness_inputs_fri DROP COLUMN IF EXISTS eip_4844_blobs; +ALTER TABLE witness_inputs_fri DROP COLUMN IF EXISTS is_blob_cleaned; +ALTER TABLE leaf_aggregation_witness_jobs_fri DROP COLUMN IF EXISTS is_blob_cleaned; +ALTER TABLE prover_jobs_fri DROP COLUMN IF EXISTS is_blob_cleaned; +ALTER TABLE prover_jobs_fri_archive DROP COLUMN IF EXISTS is_blob_cleaned; diff --git a/prover/crates/lib/prover_dal/src/fri_prover_dal.rs b/prover/crates/lib/prover_dal/src/fri_prover_dal.rs index 419cb635ac53..f6efc6afa6ad 100644 --- a/prover/crates/lib/prover_dal/src/fri_prover_dal.rs +++ b/prover/crates/lib/prover_dal/src/fri_prover_dal.rs @@ -669,7 +669,6 @@ impl FriProverDal<'_, '_> { created_at: row.created_at, updated_at: row.updated_at, time_taken: row.time_taken, - is_blob_cleaned: row.is_blob_cleaned, depth: row.depth as u32, is_node_final_proof: row.is_node_final_proof, proof_blob_url: row.proof_blob_url.clone(), diff --git a/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs b/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs index d56d18550e50..bc9cde72fde2 100644 --- a/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs +++ b/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs @@ -4,7 +4,7 @@ use std::{collections::HashMap, str::FromStr, time::Duration}; use sqlx::{types::chrono::NaiveDateTime, Row}; use zksync_basic_types::{ - basic_fri_types::{AggregationRound, Eip4844Blobs}, + basic_fri_types::AggregationRound, protocol_version::{ProtocolSemanticVersion, ProtocolVersionId, VersionPatch}, prover_dal::{ BasicWitnessGeneratorJobInfo, JobCountStatistics, LeafAggregationJobMetadata, @@ -43,35 +43,28 @@ impl FriWitnessGeneratorDal<'_, '_> { pub async fn save_witness_inputs( &mut self, block_number: L1BatchNumber, - merkle_paths_blob_url: &str, witness_inputs_blob_url: &str, protocol_version: ProtocolSemanticVersion, - eip_4844_blobs: Eip4844Blobs, ) { - let blobs_raw = eip_4844_blobs.encode(); sqlx::query!( r#" INSERT INTO witness_inputs_fri ( l1_batch_number, - merkle_tree_paths_blob_url, witness_inputs_blob_url, protocol_version, - eip_4844_blobs, status, created_at, updated_at, protocol_version_patch ) VALUES - ($1, $2, $3, $4, $5, 'queued', NOW(), NOW(), $6) + ($1, $2, $3, 'queued', NOW(), NOW(), $4) ON CONFLICT (l1_batch_number) DO NOTHING "#, i64::from(block_number.0), - merkle_paths_blob_url, witness_inputs_blob_url, protocol_version.minor as i32, - blobs_raw, protocol_version.patch.0 as i32, ) .fetch_optional(self.storage.conn()) @@ -1464,7 +1457,6 @@ impl FriWitnessGeneratorDal<'_, '_> { .unwrap() .map(|row| BasicWitnessGeneratorJobInfo { l1_batch_number, - merkle_tree_paths_blob_url: row.merkle_tree_paths_blob_url, witness_inputs_blob_url: row.witness_inputs_blob_url, attempts: row.attempts as u32, status: row.status.parse::().unwrap(), @@ -1473,15 +1465,8 @@ impl FriWitnessGeneratorDal<'_, '_> { updated_at: row.updated_at, processing_started_at: row.processing_started_at, time_taken: row.time_taken, - is_blob_cleaned: row.is_blob_cleaned, protocol_version: row.protocol_version, picked_by: row.picked_by, - eip_4844_blobs: row - .eip_4844_blobs - .as_deref() - .map(Eip4844Blobs::decode) - .transpose() - .unwrap(), }) } @@ -1516,7 +1501,6 @@ impl FriWitnessGeneratorDal<'_, '_> { updated_at: row.updated_at, processing_started_at: row.processing_started_at, time_taken: row.time_taken, - is_blob_cleaned: row.is_blob_cleaned, protocol_version: row.protocol_version, picked_by: row.picked_by.clone(), number_of_basic_circuits: row.number_of_basic_circuits,