include in purge, versioning

ledger/src/blockstore/blockstore_purge.rs

@@ -211,6 +211,10 @@ impl Blockstore {
             & self
                 .db
                 .delete_range_cf::<cf::BlockHeight>(&mut write_batch, from_slot, to_slot)
+                .is_ok()
+            & self
+                .db
+                .delete_range_cf::<cf::OptimisticSlots>(&mut write_batch, from_slot, to_slot)
                 .is_ok();
         let mut w_active_transaction_status_index =
             self.active_transaction_status_index.write().unwrap();
@@ -328,6 +332,10 @@ impl Blockstore {
             && self
                 .block_height_cf
                 .compact_range(from_slot, to_slot)
+                .unwrap_or(false)
+            && self
+                .optimistic_slots_cf
+                .compact_range(from_slot, to_slot)
                 .unwrap_or(false);
         compact_timer.stop();
         if !result {

ledger/src/blockstore_db.rs

@@ -997,7 +997,7 @@ impl ColumnName for columns::OptimisticSlots {
     const NAME: &'static str = OPTIMISTIC_SLOTS_CF;
 }
 impl TypedColumn for columns::OptimisticSlots {
-    type Type = blockstore_meta::OptimisticSlotMeta;
+    type Type = blockstore_meta::OptimisticSlotMetaVersioned;
 }
 
 #[derive(Debug)]

ledger/src/blockstore_meta.rs

@@ -331,11 +331,33 @@ pub struct ProgramCost {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
-pub struct OptimisticSlotMeta {
+pub struct OptimisticSlotMetaV0 {
     pub hash: Hash,
     pub timestamp: UnixTimestamp,
 }
 
+#[derive(Deserialize, Serialize, Debug, PartialEq)]
+pub enum OptimisticSlotMetaVersioned {
+    V0(OptimisticSlotMetaV0),
+}
+
+impl OptimisticSlotMetaVersioned {
+    pub fn new(hash: Hash, timestamp: UnixTimestamp) -> Self {
+        OptimisticSlotMetaVersioned::V0(OptimisticSlotMetaV0 { hash, timestamp })
+    }
+
+    pub fn hash(&self) -> Hash {
+        match self {
+            OptimisticSlotMetaVersioned::V0(meta) => meta.hash,
+        }
+    }
+
+    pub fn timestamp(&self) -> UnixTimestamp {
+        match self {
+            OptimisticSlotMetaVersioned::V0(meta) => meta.timestamp,
+        }
+    }
+}
 #[cfg(test)]
 mod test {
     use {