Qbft create message spec tests

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "anchor/spec_tests/src/ssv-spec"]
+	path = anchor/spec_tests/src/ssv-spec
+	url = https://github.com/ssvlabs/ssv-spec.git

Cargo.toml

@@ -22,6 +22,7 @@ members = [
     "anchor/processor",
     "anchor/qbft_manager",
     "anchor/signature_collector",
+    "anchor/spec_tests",
     "anchor/subnet_tracker",
     "anchor/validator_store",
 ]

anchor/common/qbft/src/lib.rs

@@ -871,14 +871,21 @@ where
         data_hash: D::Hash,
         round_change_justification: Vec<SignedSSVMessage>,
         prepare_justification: Vec<SignedSSVMessage>,
+        round: Option<Round>,
     ) -> UnsignedWrappedQbftMessage {
         let data = self.get_message_data(&msg_type, data_hash);
 
+        let round = if let Some(round) = round {
+            round
+        } else {
+            data.round.into()
+        };
+
         // Create the QBFT message
         let qbft_message = QbftMessage {
             qbft_message_type: msg_type,
             height: *self.instance_height as u64,
-            round: data.round,
+            round: round.into(),
             identifier: (&self.identifier).into(),
             root: data.root,
             data_round: data.data_round,
@@ -1030,6 +1037,7 @@ where
             value_to_propose,
             round_change_justifications,
             prepare_justifications,
+            None,
         );
 
         (self.send_message)(unsigned_msg);
@@ -1045,7 +1053,7 @@ where
 
         // Construct unsigned prepare
         let unsigned_msg =
-            self.new_unsigned_message(QbftMessageType::Prepare, data_hash, vec![], vec![]);
+            self.new_unsigned_message(QbftMessageType::Prepare, data_hash, vec![], vec![], None);
 
         (self.send_message)(unsigned_msg);
     }
@@ -1054,7 +1062,7 @@ where
     fn send_commit(&mut self, data_hash: D::Hash) {
         // Construct unsigned commit
         let unsigned_msg =
-            self.new_unsigned_message(QbftMessageType::Commit, data_hash, vec![], vec![]);
+            self.new_unsigned_message(QbftMessageType::Commit, data_hash, vec![], vec![], None);
 
         (self.send_message)(unsigned_msg);
     }
@@ -1072,6 +1080,7 @@ where
             data_hash,
             round_change_justifications,
             vec![],
+            None,
         );
 
         // forget that we accpeted a proposal
@@ -1102,4 +1111,23 @@ where
                 }
             })
     }
+
+    // Expose the ability to create new unsigned messages for spec testing
+    //#[cfg(test)]
+    pub fn new_unsigned_message_spec(
+        &self,
+        msg_type: QbftMessageType,
+        data_hash: D::Hash,
+        round_change_justification: Vec<SignedSSVMessage>,
+        prepare_justification: Vec<SignedSSVMessage>,
+        round: Option<Round>,
+    ) -> UnsignedWrappedQbftMessage {
+        self.new_unsigned_message(
+            msg_type,
+            data_hash,
+            round_change_justification,
+            prepare_justification,
+            round,
+        )
+    }
 }

anchor/common/ssv_types/Cargo.toml

@@ -13,8 +13,11 @@ hex = { workspace = true }
 indexmap = { workspace = true }
 openssl = { workspace = true }
 rusqlite = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 sha2 = { workspace = true }
 thiserror = { workspace = true }
 tree_hash = { workspace = true }
 tree_hash_derive = { workspace = true }
 types = { workspace = true }
+zerocopy = "0.8.24"