more fixes

Author: QuantumExplorer

dash/Cargo.toml

@@ -19,7 +19,7 @@ edition = "2021"
 
 # Please don't forget to add relevant features to docs.rs below
 [features]
-default = [ "std", "secp-recovery" ]
+default = [ "std", "secp-recovery", "bincode", "quorum_validation" ]
 base64 = [ "base64-compat" ]
 rand-std = ["secp256k1/rand"]
 rand = ["secp256k1/rand"]
@@ -80,7 +80,6 @@ secp256k1 = { features = [ "recovery", "rand", "hashes" ], version="0.30.0" }
 bip39 = "2.0.0"
 bincode_test = {package = "bincode", version= "1.3.3" }
 assert_matches = "1.5.0"
-bincode = { version= "2.0.0-rc.3"}
 
 [[example]]
 name = "bip32"

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

@@ -25,8 +25,8 @@ use crate::bls_sig_utils::BLSSignature;
 use crate::consensus::encode::{compact_size_len, read_compact_size, write_compact_size};
 use crate::consensus::{Decodable, Encodable, encode};
 use crate::hash_types::{MerkleRootMasternodeList, MerkleRootQuorums};
+use crate::io;
 use crate::io::{Error, ErrorKind};
-use crate::{VarInt, io};
 
 /// A Coinbase payload. This is contained as the payload of a coinbase special transaction.
 /// The Coinbase payload is described in DIP4.

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

@@ -17,8 +17,6 @@
 //! It is defined in DIP6 [dip-0006.md](https://github.com/dashpay/dips/blob/master/dip-0006.md).
 //!
 
-use std::io::{Read, Write};
-
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 

dash/src/bls_sig_utils.rs

@@ -27,6 +27,7 @@ use internals::impl_array_newtype;
 use crate::core::fmt;
 use crate::internal_macros::impl_bytes_newtype;
 use crate::prelude::String;
+#[cfg(feature = "bls")]
 use crate::sml::quorum_validation_error::QuorumValidationError;
 
 /// A BLS Public key is 48 bytes in the scheme used for Dash Core

dash/src/consensus/serde.rs

@@ -14,7 +14,7 @@ use serde::de::{SeqAccess, Unexpected, Visitor};
 use serde::ser::SerializeSeq;
 use serde::{Deserializer, Serializer};
 
-use super::encode::{Error as ConsensusError, Error};
+use super::encode::Error as ConsensusError;
 use super::{Decodable, Encodable};
 use crate::alloc::string::ToString;
 use crate::io;

dash/src/dip9.rs

@@ -63,13 +63,13 @@ impl<const N: usize> From<IndexConstPath<N>> for DerivationPath {
 
 impl<const N: usize> IndexConstPath<N> {
     pub fn append_path(&self, derivation_path: DerivationPath) -> DerivationPath {
-        let mut root_derivation_path = DerivationPath::from(self.indexes.as_ref());
+        let root_derivation_path = DerivationPath::from(self.indexes.as_ref());
         root_derivation_path.extend(derivation_path);
         root_derivation_path
     }
 
     pub fn append(&self, child_number: ChildNumber) -> DerivationPath {
-        let mut root_derivation_path = DerivationPath::from(self.indexes.as_ref());
+        let root_derivation_path = DerivationPath::from(self.indexes.as_ref());
         root_derivation_path.extend(&[child_number]);
         root_derivation_path
     }

dash/src/sml/masternode_list/masternode_helpers.rs

@@ -5,7 +5,6 @@ use hashes::Hash;
 
 use crate::ProTxHash;
 use crate::sml::masternode_list::MasternodeList;
-use crate::sml::masternode_list_entry::MasternodeListEntry;
 use crate::sml::masternode_list_entry::qualified_masternode_list_entry::QualifiedMasternodeListEntry;
 
 impl MasternodeList {

dash/src/sml/masternode_list/merkle_roots.rs

@@ -1,7 +1,7 @@
 use hashes::{Hash, sha256d};
 
 use crate::Transaction;
-use crate::hash_types::{MerkleRootMasternodeList, MerkleRootQuorums, QuorumCommitmentHash};
+use crate::hash_types::{MerkleRootMasternodeList, MerkleRootQuorums};
 use crate::sml::masternode_list::MasternodeList;
 use crate::transaction::special_transaction::TransactionPayload;
 

dash/src/sml/masternode_list_engine/mod.rs

@@ -15,7 +15,6 @@ use crate::network::message_qrinfo::{QRInfo, QuorumSnapshot};
 use crate::network::message_sml::MnListDiff;
 use crate::prelude::CoreBlockHeight;
 use crate::sml::error::SmlError;
-use crate::sml::error::SmlError::CorruptedCodeExecution;
 use crate::sml::llmq_type::LLMQType;
 use crate::sml::masternode_list::MasternodeList;
 use crate::sml::masternode_list::from_diff::TryIntoWithBlockHashLookup;
@@ -355,34 +354,41 @@ impl MasternodeListEngine {
             Some(diff_end_height) => diff_end_height,
         };
 
-        let mut masternode_list =
-            base_masternode_list.apply_diff(masternode_list_diff.clone(), diff_end_height)?;
-
         #[cfg(feature = "quorum_validation")]
-        if verify_quorums {
-            // We only need to verify new quorums
-            for new_quorum in &masternode_list_diff.new_quorums {
-                let quorum = masternode_list
-                    .quorum_entry_of_type_for_quorum_hash_mut(
-                        new_quorum.llmq_type,
-                        new_quorum.quorum_hash,
-                    )
-                    .ok_or(CorruptedCodeExecution(
-                        "masternode list after diff does not contain new quorum".to_string(),
-                    ))?;
-                self.validate_and_update_quorum_status(quorum);
+        {
+            let mut masternode_list =
+                base_masternode_list.apply_diff(masternode_list_diff.clone(), diff_end_height)?;
+            if verify_quorums {
+                // We only need to verify new quorums
+                for new_quorum in &masternode_list_diff.new_quorums {
+                    let quorum = masternode_list
+                        .quorum_entry_of_type_for_quorum_hash_mut(
+                            new_quorum.llmq_type,
+                            new_quorum.quorum_hash,
+                        )
+                        .ok_or(SmlError::CorruptedCodeExecution(
+                            "masternode list after diff does not contain new quorum".to_string(),
+                        ))?;
+                    self.validate_and_update_quorum_status(quorum);
+                }
             }
+            self.masternode_lists.insert(diff_end_height, masternode_list);
         }
+
         #[cfg(not(feature = "quorum_validation"))]
-        if verify_quorums {
-            return Err(SmlError::FeatureNotTurnedOn(
-                "quorum validation feature is not turned on".to_string(),
-            ));
+        {
+            let masternode_list =
+                base_masternode_list.apply_diff(masternode_list_diff.clone(), diff_end_height)?;
+            if verify_quorums {
+                return Err(SmlError::FeatureNotTurnedOn(
+                    "quorum validation feature is not turned on".to_string(),
+                ));
+            }
+            self.masternode_lists.insert(diff_end_height, masternode_list);
         }
 
         self.block_hashes.insert(diff_end_height, block_hash);
         self.block_heights.insert(block_hash, diff_end_height);
-        self.masternode_lists.insert(diff_end_height, masternode_list);
 
         Ok(())
     }
@@ -441,6 +447,8 @@ impl MasternodeListEngine {
 #[cfg(test)]
 mod tests {
 
+    use bincode::Decode;
+
     use crate::sml::llmq_entry_verification::LLMQEntryVerificationStatus;
     use crate::sml::llmq_type::LLMQType;
     use crate::sml::llmq_type::LLMQType::{Llmqtype50_60, Llmqtype400_60, Llmqtype400_85};

dash/src/sml/masternode_list_entry/mod.rs

@@ -9,7 +9,7 @@ use std::net::SocketAddr;
 use crate::bls_sig_utils::BLSPublicKey;
 use crate::consensus::encode::Error;
 use crate::consensus::{Decodable, Encodable};
-use crate::hash_types::{ConfirmedHash, Sha256dHash};
+use crate::hash_types::ConfirmedHash;
 use crate::internal_macros::impl_consensus_encoding;
 use crate::{ProTxHash, PubkeyHash};