fixes for encoding

Author: QuantumExplorer

dash/src/blockdata/transaction/mod.rs

@@ -913,6 +913,8 @@ mod tests {
     use crate::blockdata::constants::WITNESS_SCALE_FACTOR;
     use crate::consensus::encode::{deserialize, serialize};
     use crate::internal_macros::hex;
+    use crate::network::message::{NetworkMessage, RawNetworkMessage};
+    use crate::network::message_sml::MnListDiff;
 
     #[test]
     fn test_is_coinbase() {
@@ -1255,6 +1257,18 @@ mod tests {
         assert_eq!(data.len(), 20);
         assert_eq!(&data, &pk_data.as_slice());
     }
+
+    #[test]
+    fn deserialize_serialize_coinbase_transaction_in_dml() {
+        let block_hex = include_str!("../../../tests/data/test_DML_diffs/DML_0_2221605.hex");
+        let data = hex::decode(block_hex).expect("decode hex");
+        let mn_list_diff: RawNetworkMessage = deserialize(&data).expect("deserialize MnListDiff");
+        if let NetworkMessage::MnListDiff(diff) = mn_list_diff.payload {
+            let serialized = serialize(&diff.coinbase_tx);
+            let deserialized: Transaction =
+                deserialize(serialized.as_slice()).expect("expected to deserialize");
+        }
+    }
 }
 
 #[cfg(all(test, feature = "unstable"))]

dash/src/blockdata/transaction/special_transaction/quorum_commitment.rs

@@ -217,8 +217,10 @@ mod tests {
     use hashes::Hash;
 
     use crate::bls_sig_utils::{BLSPublicKey, BLSSignature};
-    use crate::consensus::Encodable;
+    use crate::consensus::{Encodable, deserialize, serialize};
     use crate::hash_types::{QuorumHash, QuorumVVecHash};
+    use crate::network::message::{NetworkMessage, RawNetworkMessage};
+    use crate::network::message_sml::MnListDiff;
     use crate::sml::llmq_type::LLMQType;
     use crate::transaction::special_transaction::quorum_commitment::{
         QuorumCommitmentPayload, QuorumEntry,
@@ -271,4 +273,18 @@ mod tests {
             assert_eq!(actual, want);
         }
     }
+
+    #[test]
+    fn deserialize_serialize_mn_list_diff() {
+        let block_hex = include_str!("../../../../tests/data/test_DML_diffs/DML_0_2221605.hex");
+        let data = hex::decode(block_hex).expect("decode hex");
+        let mn_list_diff: RawNetworkMessage = deserialize(&data).expect("deserialize MnListDiff");
+        if let NetworkMessage::MnListDiff(diff) = mn_list_diff.payload {
+            let quorum = diff.new_quorums.first().expect("expected a quorum");
+            let serialized = serialize(&quorum);
+            let deserialized: QuorumEntry =
+                deserialize(serialized.as_slice()).expect("expected to deserialize");
+            assert_eq!(quorum, &deserialized);
+        }
+    }
 }

dash/src/network/message_sml.rs

@@ -145,8 +145,9 @@ mod tests {
 
     use assert_matches::assert_matches;
 
-    use crate::consensus::deserialize;
+    use crate::consensus::{deserialize, serialize};
     use crate::network::message::{NetworkMessage, RawNetworkMessage};
+    use crate::network::message_sml::MnListDiff;
 
     fn read_binary_file(filename: &str) -> io::Result<Vec<u8>> {
         let mut file = File::open(filename)?;
@@ -163,4 +164,16 @@ mod tests {
 
         assert_matches!(mn_list_diff, RawNetworkMessage { magic, payload: NetworkMessage::MnListDiff(_) } if magic == 3177909439);
     }
+
+    #[test]
+    fn deserialize_serialize_mn_list_diff() {
+        let block_hex = include_str!("../../tests/data/test_DML_diffs/DML_0_2221605.hex");
+        let data = hex::decode(block_hex).expect("decode hex");
+        let mn_list_diff: RawNetworkMessage = deserialize(&data).expect("deserialize MnListDiff");
+        if let NetworkMessage::MnListDiff(diff) = mn_list_diff.payload {
+            let serialized = serialize(&diff);
+            let deserialized: MnListDiff =
+                deserialize(serialized.as_slice()).expect("expected to deserialize");
+        }
+    }
 }

dash/src/sml/masternode_list_entry/mod.rs

@@ -28,12 +28,12 @@ impl Encodable for MasternodeType {
         match self {
             MasternodeType::Regular => {
                 // Write variant tag 0 for Regular
-                len += 0u8.consensus_encode(writer)?;
+                len += 0u16.consensus_encode(writer)?;
             }
             MasternodeType::HighPerformance { platform_http_port, platform_node_id } => {
                 // Write variant tag 1 for HighPerformance,
                 // then the u16 port and the PubkeyHash
-                len += 1u8.consensus_encode(writer)?;
+                len += 1u16.consensus_encode(writer)?;
                 len += platform_http_port.consensus_encode(writer)?;
                 len += platform_node_id.consensus_encode(writer)?;
             }
@@ -105,12 +105,18 @@ impl Encodable for MasternodeListEntry {
         let mut len = 0;
         len += self.version.consensus_encode(writer)?;
         len += self.pro_reg_tx_hash.consensus_encode(writer)?;
-        len += self.confirmed_hash.unwrap_or_default().consensus_encode(writer)?;
+        if let Some(confirmed_hash) = self.confirmed_hash {
+            len += confirmed_hash.consensus_encode(writer)?;
+        } else {
+            len += [0; 32].consensus_encode(writer)?;
+        }
         len += self.service_address.consensus_encode(writer)?;
         len += self.operator_public_key.consensus_encode(writer)?;
         len += self.key_id_voting.consensus_encode(writer)?;
         len += self.is_valid.consensus_encode(writer)?;
-        len += self.mn_type.consensus_encode(writer)?;
+        if self.version >= 2 {
+            len += self.mn_type.consensus_encode(writer)?;
+        }
         Ok(len)
     }
 }