fix(vm): Save empty bootloader memory for batches with ancient vms

Signed-off-by: Danil <deniallugo@gmail.com>
matter-labs · Feb 1, 2024 · 6d39baa · 6d39baa
1 parent c301359
commit 6d39baa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/...116162becce06841476128f864b6028129df.json → ...75f8b667e3b38bdaca60863f1ce6ecc5ca65.json b/...116162becce06841476128f864b6028129df.json → ...75f8b667e3b38bdaca60863f1ce6ecc5ca65.json
diff --git a/...d95fc47eb6bedc32f4d824aac9b2b6f96faf.json → ...428c6c4b5ce38b38db2dedf9b374269de7ff.json b/...d95fc47eb6bedc32f4d824aac9b2b6f96faf.json → ...428c6c4b5ce38b38db2dedf9b374269de7ff.json
diff --git a/core/lib/dal/src/blocks_dal.rs b/core/lib/dal/src/blocks_dal.rs
@@ -2218,7 +2218,7 @@ impl BlocksDal<'_, '_> {
                 )
             WHERE
                 l1_batch_number IS NULL
-                AND fee_account_address = '\x0000000000000000000000000000000000000000'::bytea
+                AND fee_account_address = 'x0000000000000000000000000000000000000000'::bytea
             "#
         )
         .execute(self.storage.conn())
@@ -2258,7 +2258,7 @@ impl BlocksDal<'_, '_> {
             WHERE
                 l1_batches.number = miniblocks.l1_batch_number
                 AND miniblocks.number BETWEEN $1 AND $2
-                AND miniblocks.fee_account_address = '\x0000000000000000000000000000000000000000'::bytea
+                AND miniblocks.fee_account_address = 'x0000000000000000000000000000000000000000'::bytea
             "#,
             numbers.start().0 as i64,
             numbers.end().0 as i64

diff --git a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs b/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
@@ -154,11 +154,15 @@ impl UpdatesManager {
             .final_execution_state
             .deduplicated_events_logs;
 
+        let final_bootloader_memory = finished_batch
+            .final_bootloader_memory
+            .clone()
+            .unwrap_or_default();
         transaction
             .blocks_dal()
             .insert_l1_batch(
                 &l1_batch,
-                finished_batch.final_bootloader_memory.as_ref().unwrap(),
+                &final_bootloader_memory,
                 self.pending_l1_gas_count(),
                 &events_queue,
                 &finished_batch.final_execution_state.storage_refunds,