quorum info message

Author: QuantumExplorer

dash/src/consensus/encode.rs

@@ -46,7 +46,7 @@ use crate::hash_types::{
     BlockHash, FilterHash, FilterHeader, MerkleRootMasternodeList, TxMerkleNode,
 };
 use crate::io::{self, Cursor, Read};
-use crate::network::message_sml::{DeletedQuorum, MnListDiff};
+use crate::network::message_sml::{DeletedQuorum, MnListDiff, QuorumCLSigObject};
 #[cfg(feature = "std")]
 use crate::network::{
     address::{AddrV2Message, Address},
@@ -680,21 +680,23 @@ impl_vec!(Transaction);
 impl_vec!(TxOut);
 impl_vec!(TxIn);
 impl_vec!(Vec<u8>);
+impl_vec!(u16);
+impl_vec!(u32);
 impl_vec!(u64);
 impl_vec!(TapLeafHash);
 impl_vec!(VarInt);
 impl_vec!(ShortId);
 impl_vec!(OutPoint);
 impl_vec!(PrefilledTransaction);
 impl_vec!(QuorumEntry);
+impl_vec!(QuorumCLSigObject);
 impl_vec!(DeletedQuorum);
 impl_vec!(BLSSignature);
 impl_vec!(ProTxHash);
 impl_vec!(MerkleRootMasternodeList);
 impl_vec!(MasternodeListEntry);
 impl_vec!(MnListDiff);
 impl_vec!(QuorumSnapshot);
-impl_vec!(u32);
 
 #[cfg(feature = "std")]
 impl_vec!(Inventory);

dash/src/network/message_qrinfo.rs

@@ -4,6 +4,7 @@ use crate::consensus::{encode, Decodable, Encodable};
 use crate::consensus::encode::{read_compact_size, read_fixed_bitset, write_fixed_bitset};
 use crate::internal_macros::impl_consensus_encoding;
 use crate::network::message_sml::MnListDiff;
+use crate::transaction::special_transaction::quorum_commitment::QuorumEntry;
 
 /// The `getqrinfo` message requests a `qrinfo` message that provides the information
 /// required to verify quorum details for quorums formed using the quorum rotation process.
@@ -48,8 +49,8 @@ pub struct QRInfo {
     pub quorum_snapshot_and_mn_list_diff_at_h_minus_4c: Option<(QuorumSnapshot, MnListDiff)>,
 
     // lastQuorumHashPerIndex:
-    // A compact size uint (the count) followed by that many 32-byte hashes.
-    pub last_commitment_per_index: Vec<BlockHash>,
+    // A compact size uint (the count) followed by quorum entries.
+    pub last_commitment_per_index: Vec<QuorumEntry>,
 
     // quorumSnapshotList:
     // A compact size uint count followed by that many CQuorumSnapshot entries.
@@ -216,4 +217,31 @@ impl Decodable for MnSkipListMode {
             _ => Err(encode::Error::ParseFailed("Invalid MnSkipListMode")),
         }
     }
-}
+}
+
+#[cfg(test)]
+mod tests {
+    use std::fs::File;
+    use std::io::{self, Read};
+
+    use assert_matches::assert_matches;
+
+    use crate::consensus::deserialize;
+    use crate::network::message::{NetworkMessage, RawNetworkMessage};
+
+    fn read_binary_file(filename: &str) -> io::Result<Vec<u8>> {
+        let mut file = File::open(filename)?;
+        let mut buffer = Vec::new();
+        file.read_to_end(&mut buffer)?;
+        Ok(buffer)
+    }
+
+    #[test]
+    fn deserialize_qr_info() {
+        let block_hex = include_str!("../../tests/data/test_DML_diffs/QR_INFO_0_2224359.hex");
+        let data = hex::decode(block_hex).expect("decode hex");
+        let qr_info: RawNetworkMessage = deserialize(&data).expect("deserialize QR_INFO");
+
+        assert_matches!(qr_info, RawNetworkMessage { magic, payload: NetworkMessage::QRInfo(_) } if magic == 3177909439);
+    }
+}

dash/src/network/message_sml.rs

@@ -1,3 +1,4 @@
+use std::io;
 use hashes::sha256::Hash;
 
 use crate::bls_sig_utils::BLSSignature;
@@ -6,6 +7,7 @@ use crate::internal_macros::impl_consensus_encoding;
 use crate::sml::masternode_list_entry::MasternodeListEntry;
 use crate::transaction::special_transaction::quorum_commitment::QuorumEntry;
 use crate::{BlockHash, ProTxHash, QuorumHash, Transaction};
+use crate::consensus::{encode, Decodable, Encodable};
 use crate::sml::llmq_type::LLMQType;
 
 /// The `getmnlistd` message requests a `mnlistdiff` message that provides either:
@@ -54,24 +56,68 @@ pub struct MnListDiff {
     /// The list of LLMQ commitments for the LLMQs which were added since `base_block_hash`
     pub new_quorums: Vec<QuorumEntry>,
     /// ChainLock signature used to calculate members per quorum indexes (in `new_quorums`)
-    pub quorums_chainlock_signatures: Vec<BLSSignature>,
+    pub quorums_chainlock_signatures: Vec<QuorumCLSigObject>,
 }
 
-impl_consensus_encoding!(
-    MnListDiff,
-    version,
-    base_block_hash,
-    block_hash,
-    total_transactions,
-    merkle_hashes,
-    merkle_flags,
-    coinbase_tx,
-    deleted_masternodes,
-    new_masternodes,
-    deleted_quorums,
-    new_quorums,
-    quorums_chainlock_signatures
-);
+impl Encodable for MnListDiff {
+    fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
+        let mut len = 0;
+        len += self.version.consensus_encode(w)?;
+        len += self.base_block_hash.consensus_encode(w)?;
+        len += self.block_hash.consensus_encode(w)?;
+        len += self.total_transactions.consensus_encode(w)?;
+        len += self.merkle_hashes.consensus_encode(w)?;
+        len += self.merkle_flags.consensus_encode(w)?;
+        len += self.coinbase_tx.consensus_encode(w)?;
+        len += self.deleted_masternodes.consensus_encode(w)?;
+        len += self.new_masternodes.consensus_encode(w)?;
+        len += self.deleted_quorums.consensus_encode(w)?;
+        len += self.new_quorums.consensus_encode(w)?;
+        len += self.quorums_chainlock_signatures.consensus_encode(w)?;
+        Ok(len)
+    }
+}
+
+impl Decodable for MnListDiff {
+    fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
+        let version = u16::consensus_decode(r)?;
+        let base_block_hash = BlockHash::consensus_decode(r)?;
+        let block_hash = BlockHash::consensus_decode(r)?;
+        let total_transactions = u32::consensus_decode(r)?;
+        let merkle_hashes = Vec::<MerkleRootMasternodeList>::consensus_decode(r)?;
+        let merkle_flags = Vec::<u8>::consensus_decode(r)?;
+        let coinbase_tx = Transaction::consensus_decode(r)?;
+        let deleted_masternodes = Vec::<ProTxHash>::consensus_decode(r)?;
+        let new_masternodes = Vec::<MasternodeListEntry>::consensus_decode(r)?;
+        let deleted_quorums = Vec::<DeletedQuorum>::consensus_decode(r)?;
+        let new_quorums = Vec::<QuorumEntry>::consensus_decode(r)?;
+        let quorums_chainlock_signatures = Vec::<QuorumCLSigObject>::consensus_decode(r)?;
+        // println!("{}", quorums_chainlock_signatures.iter().map(hex::encode).collect::<Vec<_>>().join("\n"));
+
+        Ok(MnListDiff {
+            version,
+            base_block_hash,
+            block_hash,
+            total_transactions,
+            merkle_hashes,
+            merkle_flags,
+            coinbase_tx,
+            deleted_masternodes,
+            new_masternodes,
+            deleted_quorums,
+            new_quorums,
+            quorums_chainlock_signatures,
+        })
+    }
+}
+
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub struct QuorumCLSigObject {
+    signature: BLSSignature,
+    index_set: Vec<u16>,
+}
+
+impl_consensus_encoding!(QuorumCLSigObject, signature, index_set);
 
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct DeletedQuorum {