Add version to CertifiedBlock.

Helps with validating the commitment.

Author: twittner

timeboost-builder/src/certifier.rs

@@ -665,7 +665,7 @@ impl Tracker {
     async fn deliver(&self, leader: bool, tx: &Sender<CertifiedBlock<Validated>>) -> Result<bool> {
         if let Some(cert) = self.votes.certificate() {
             if let Some(block) = &self.block {
-                let cb = CertifiedBlock::new(cert.clone(), block.clone(), leader);
+                let cb = CertifiedBlock::v1(cert.clone(), block.clone(), leader);
                 tx.send(cb).await.map_err(|_| EndOfPlay::CertifierDown)?;
                 return Ok(true);
             }

timeboost-builder/src/submit.rs

@@ -252,7 +252,7 @@ mod tests {
                 }
             }
             let l = self.c.leader(*i.round().num() as usize) == self.p;
-            CertifiedBlock::new(a.certificate().cloned().unwrap(), b, l)
+            CertifiedBlock::v1(a.certificate().cloned().unwrap(), b, l)
         }
     }
 

timeboost-types/src/block.rs

@@ -211,9 +211,12 @@ impl Committable for BlockInfo {
 #[cbor(map)]
 pub struct CertifiedBlock<S> {
     #[cbor(n(0))]
-    data: Block,
+    version: u8,
 
     #[cbor(n(1))]
+    data: Block,
+
+    #[cbor(n(2))]
     cert: Certificate<BlockInfo>,
 
     #[cbor(skip)]
@@ -224,15 +227,20 @@ pub struct CertifiedBlock<S> {
 }
 
 impl<S> CertifiedBlock<S> {
-    pub fn new(cert: Certificate<BlockInfo>, data: Block, leader: bool) -> Self {
+    pub fn v1(cert: Certificate<BlockInfo>, data: Block, leader: bool) -> Self {
         Self {
+            version: 1,
             cert,
             data,
             leader,
             _marker: PhantomData,
         }
     }
 
+    pub fn version(&self) -> u8 {
+        self.version
+    }
+
     pub fn committee(&self) -> CommitteeId {
         self.cert.data().round().committee()
     }
@@ -261,6 +269,7 @@ impl CertifiedBlock<Unchecked> {
                 .is_valid_with_threshold_par(c, c.one_honest_threshold())
         {
             Some(CertifiedBlock {
+                version: self.version,
                 data: self.data,
                 cert: self.cert,
                 leader: self.leader,