fix order of db commits (#902)

crates/fullnode/src/runner.rs

@@ -458,14 +458,14 @@ where
 
         self.storage_manager.finalize_l2(l2_height)?;
 
+        self.ledger_db
+            .commit_soft_batch(soft_batch_receipt, self.include_tx_body)?;
+
         self.ledger_db.extend_l2_range_of_l1_slot(
             SlotNumber(current_l1_block.header().height()),
             BatchNumber(l2_height),
         )?;
 
-        self.ledger_db
-            .commit_soft_batch(soft_batch_receipt, self.include_tx_body)?;
-
         self.state_root = next_state_root;
         self.batch_hash = soft_batch.hash;
 

crates/prover/src/runner.rs

@@ -346,6 +346,8 @@ where
         self.storage_manager
             .save_change_set_l2(l2_height, slot_result.change_set)?;
 
+        self.storage_manager.finalize_l2(l2_height)?;
+
         let batch_receipt = data_to_commit.batch_receipts()[0].clone();
 
         let soft_batch_receipt = SoftBatchReceipt::<_, _, Da::Spec> {
@@ -379,8 +381,6 @@ where
             l2_height, self.state_root
         );
 
-        self.storage_manager.finalize_l2(l2_height)?;
-
         Ok(())
     }
 

crates/sequencer/src/sequencer.rs

@@ -510,23 +510,23 @@ where
                     timestamp: signed_soft_batch.timestamp(),
                 };
 
+                self.storage_manager
+                    .save_change_set_l2(l2_height, slot_result.change_set)?;
+
                 // TODO: this will only work for mock da
                 // when https://github.com/Sovereign-Labs/sovereign-sdk/issues/1218
                 // is merged, rpc will access up to date storage then we won't need to finalize rigth away.
                 // however we need much better DA + finalization logic here
-                self.storage_manager
-                    .save_change_set_l2(l2_height, slot_result.change_set)?;
-
                 self.storage_manager.finalize_l2(l2_height)?;
 
+                self.ledger_db.commit_soft_batch(soft_batch_receipt, true)?;
+
                 // connect L1 and L2 height
                 self.ledger_db.extend_l2_range_of_l1_slot(
                     SlotNumber(da_block.header().height()),
                     BatchNumber(l2_height),
                 )?;
 
-                self.ledger_db.commit_soft_batch(soft_batch_receipt, true)?;
-
                 let l1_height = da_block.header().height();
                 info!(
                     "New block #{}, DA #{}, Tx count: #{}",