resolve conflicts

matter-labs · Jul 22, 2024 · ceb5b7a · ceb5b7a
1 parent 3090df0
commit ceb5b7a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/...ver_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json b/...ver_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json
diff --git a/...ver_dal/.sqlx/query-adaa3126792aac4e3afb805068f01ab8ae3f32526d9b5eadcfe52d139f7d6e66.json b/...ver_dal/.sqlx/query-adaa3126792aac4e3afb805068f01ab8ae3f32526d9b5eadcfe52d139f7d6e66.json
diff --git a/...crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.down.sql b/...crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.down.sql
@@ -0,0 +1,3 @@
+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;
diff --git a/...r/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.up.sql b/...r/crates/lib/prover_dal/migrations/20240722102219_remove_unused_columns_after_bwip.up.sql
@@ -0,0 +1,3 @@
+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;