test(sdk): increase test coverage of masternode voting

packages/dapi-grpc/Cargo.toml

@@ -42,7 +42,9 @@ tonic = { version = "0.11", features = [
 serde = { version = "1.0.197", optional = true, features = ["derive"] }
 serde_bytes = { version = "0.11.12", optional = true }
 serde_json = { version = "1.0", optional = true }
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.0.0-dev.1", default-features = false }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.12", tag = "v0.14.0-dev.12", default-features = false, features = [
+  "grpc",
+] }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 

packages/rs-drive-abci/Cargo.toml

@@ -55,7 +55,7 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features =
   "tracing-log",
 ], optional = false }
 atty = { version = "0.2.14", optional = false }
-tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.0.0-dev.1", features = [
+tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.12", tag = "v0.14.0-dev.12", features = [
   "grpc",
 ] }
 lazy_static = "1.4.0"

packages/rs-drive-proof-verifier/Cargo.toml

@@ -32,7 +32,7 @@ dpp = { path = "../rs-dpp", features = [
 bincode = { version = "2.0.0-rc.3", features = ["serde"], optional = true }
 platform-serialization-derive = { path = "../rs-platform-serialization-derive", optional = true }
 platform-serialization = { path = "../rs-platform-serialization", optional = true }
-tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "1.0.0-dev.1", features = [
+tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.12", tag = "v0.14.0-dev.12", features = [
   "crypto",
 ], default-features = false }
 tracing = { version = "0.1.37" }

packages/rs-drive-proof-verifier/src/proof.rs

@@ -1460,7 +1460,7 @@ impl FromProof<platform::GetVotePollsByEndDateRequest> for VotePollsGroupedByTim
         let mtd = response.metadata().or(Err(Error::EmptyResponseMetadata))?;
 
         let (root_hash, vote_polls) = drive_query
-            .verify_vote_polls_by_end_date_proof::<BTreeMap<_, _>>(
+            .verify_vote_polls_by_end_date_proof::<Vec<(_, _)>>(
                 &proof.grovedb_proof,
                 platform_version,
             )
@@ -1470,7 +1470,7 @@ impl FromProof<platform::GetVotePollsByEndDateRequest> for VotePollsGroupedByTim
 
         verify_tenderdash_proof(proof, mtd, &root_hash, provider)?;
 
-        let response = VotePollsGroupedByTimestamp(vote_polls);
+        let response = VotePollsGroupedByTimestamp(vote_polls).sorted(drive_query.order_ascending);
 
         Ok((response.into_option(), mtd.clone()))
     }
@@ -1655,7 +1655,7 @@ define_length!(Contenders, |x: &Contenders| x.contenders.len());
 define_length!(Voters, |x: &Voters| x.0.len());
 define_length!(
     VotePollsGroupedByTimestamp,
-    |x: &VotePollsGroupedByTimestamp| x.0.values().map(|v| v.len()).sum()
+    |x: &VotePollsGroupedByTimestamp| x.0.iter().map(|v| v.1.len()).sum()
 );
 trait IntoOption
 where

packages/rs-drive-proof-verifier/src/types.rs

@@ -26,6 +26,7 @@ use dpp::{
 };
 use drive::grovedb::Element;
 use std::collections::{BTreeMap, BTreeSet};
+
 #[cfg(feature = "mocks")]
 use {
     bincode::{Decode, Encode},
@@ -293,19 +294,35 @@ impl From<&PrefundedSpecializedBalance> for Credits {
     derive(Encode, Decode, PlatformSerialize, PlatformDeserialize),
     platform_serialize(unversioned)
 )]
-pub struct VotePollsGroupedByTimestamp(pub BTreeMap<TimestampMillis, Vec<VotePoll>>);
+pub struct VotePollsGroupedByTimestamp(pub Vec<(TimestampMillis, Vec<VotePoll>)>);
+impl VotePollsGroupedByTimestamp {
+    /// Sort the vote polls by timestamp.
+    pub fn sorted(mut self, ascending: bool) -> Self {
+        self.0.sort_by(|a, b| {
+            if ascending {
+                a.0.cmp(&b.0)
+            } else {
+                b.0.cmp(&a.0)
+            }
+        });
+
+        self
+    }
+}
 
 /// Insert items into the map, appending them to the existing values for the same key.
 impl FromIterator<(u64, Vec<VotePoll>)> for VotePollsGroupedByTimestamp {
     fn from_iter<T: IntoIterator<Item = (u64, Vec<VotePoll>)>>(iter: T) -> Self {
-        let mut map = BTreeMap::new();
-
-        for (timestamp, vote_poll) in iter {
-            let entry = map.entry(timestamp).or_insert_with(Vec::new);
-            entry.extend(vote_poll);
-        }
-
-        Self(map)
+        // collect all vote polls for the same timestamp into a single vector
+        let data = iter
+            .into_iter()
+            .fold(BTreeMap::new(), |mut acc, (timestamp, vote_poll)| {
+                let entry: &mut Vec<VotePoll> = acc.entry(timestamp).or_default();
+                entry.extend(vote_poll);
+                acc
+            });
+
+        Self(data.into_iter().collect())
     }
 }
 
@@ -329,7 +346,7 @@ impl FromIterator<(u64, Option<VotePoll>)> for VotePollsGroupedByTimestamp {
 
 impl IntoIterator for VotePollsGroupedByTimestamp {
     type Item = (u64, Vec<VotePoll>);
-    type IntoIter = std::collections::btree_map::IntoIter<u64, Vec<VotePoll>>;
+    type IntoIter = std::vec::IntoIter<(u64, Vec<VotePoll>)>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.0.into_iter()

packages/rs-sdk/Cargo.toml

@@ -36,6 +36,7 @@ dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0
 lru = { version = "0.12.3", optional = true }
 bip37-bloom-filter = { git = "https://github.com/dashpay/rs-bip37-bloom-filter", branch = "develop" }
 pollster = { version = "0.3.0" }
+sha2 = "0.10.8"
 
 [dev-dependencies]
 tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
@@ -52,6 +53,7 @@ tokio-test = { version = "0.4.4" }
 clap = { version = "4.5.4", features = ["derive"] }
 sanitize-filename = { version = "0.5.0" }
 chrono = { version = "0.4.38" }
+test-case = { version = "3.3.1" }
 
 [features]
 default = ["mocks", "offline-testing"]

packages/rs-sdk/scripts/generate_test_vectors.sh

@@ -23,6 +23,6 @@ pushd "$CARGO_DIR"
 cargo test -p dash-sdk \
     --no-default-features \
     --features generate-test-vectors \
-    "$1"
+    "$@"
 
 popd

packages/rs-sdk/src/platform/query.rs

@@ -520,3 +520,27 @@ impl Query<GetContestedResourceIdentityVotesRequest> for VoteQuery {
         .into())
     }
 }
+
+impl Query<GetContestedResourceIdentityVotesRequest> for LimitQuery<VoteQuery> {
+    fn query(self, prove: bool) -> Result<GetContestedResourceIdentityVotesRequest, Error> {
+        if !prove {
+            unimplemented!("queries without proofs are not supported yet");
+        }
+        use proto::get_contested_resource_identity_votes_request::{
+            get_contested_resource_identity_votes_request_v0::StartAtVotePollIdInfo, Version,
+        };
+
+        Ok(match self.query.query(prove)?.version {
+            None => return Err(Error::Protocol(dpp::ProtocolError::NoProtocolVersionError)),
+            Some(Version::V0(v0)) => GetContestedResourceIdentityVotesRequestV0 {
+                limit: self.limit,
+                start_at_vote_poll_id_info: self.start_info.map(|v| StartAtVotePollIdInfo {
+                    start_at_poll_identifier: v.start_key.to_vec(),
+                    start_poll_identifier_included: v.start_included,
+                }),
+                ..v0
+            },
+        }
+        .into())
+    }
+}

packages/rs-sdk/src/platform/transition/vote.rs

@@ -5,6 +5,8 @@ use crate::platform::transition::put_settings::PutSettings;
 use crate::platform::Fetch;
 use crate::{Error, Sdk};
 use dapi_grpc::platform::VersionedGrpcResponse;
+use dpp::identifier::MasternodeIdentifiers;
+use dpp::identity::hash::IdentityPublicKeyHashMethodsV0;
 use dpp::identity::signer::Signer;
 use dpp::identity::IdentityPublicKey;
 use dpp::prelude::Identifier;
@@ -50,8 +52,10 @@ impl<S: Signer> PutVote<S> for Vote {
         signer: &S,
         settings: Option<PutSettings>,
     ) -> Result<(), Error> {
+        let voting_identity_id = get_voting_identity_id(voter_pro_tx_hash, voting_public_key)?;
+
         let new_masternode_voting_nonce = sdk
-            .get_identity_nonce(voter_pro_tx_hash, true, settings)
+            .get_identity_nonce(voting_identity_id, true, settings)
             .await?;
 
         let settings = settings.unwrap_or_default();
@@ -80,8 +84,10 @@ impl<S: Signer> PutVote<S> for Vote {
         signer: &S,
         settings: Option<PutSettings>,
     ) -> Result<Vote, Error> {
+        let voting_identity_id = get_voting_identity_id(voter_pro_tx_hash, voting_public_key)?;
+
         let new_masternode_voting_nonce = sdk
-            .get_identity_nonce(voter_pro_tx_hash, true, settings)
+            .get_identity_nonce(voting_identity_id, true, settings)
             .await?;
 
         let settings = settings.unwrap_or_default();
@@ -147,3 +153,15 @@ impl<S: Signer> PutVote<S> for Vote {
         }
     }
 }
+
+fn get_voting_identity_id(
+    voter_pro_tx_hash: Identifier,
+    voting_public_key: &IdentityPublicKey,
+) -> Result<Identifier, Error> {
+    let pub_key_hash = voting_public_key.public_key_hash()?;
+
+    Ok(Identifier::create_voter_identifier(
+        voter_pro_tx_hash.as_bytes(),
+        &pub_key_hash,
+    ))
+}

packages/rs-sdk/tests/.env.example

@@ -4,6 +4,9 @@ DASH_SDK_PLATFORM_HOST="127.0.0.1"
 DASH_SDK_PLATFORM_PORT=2443
 DASH_SDK_PLATFORM_SSL=false
 
+# ProTxHash of masternode that has at least 1 vote casted for DPNS name `testname`
+DASH_SDK_MASTERNODE_OWNER_PRO_REG_TX_HASH="6ac88f64622d9bc0cb79ad0f69657aa9488b213157d20ae0ca371fa5f04fb222"
+
 DASH_SDK_CORE_PORT=20002
 DASH_SDK_CORE_USER="someuser"
 DASH_SDK_CORE_PASSWORD="verysecretpassword"

packages/rs-sdk/tests/fetch/common.rs

@@ -1,4 +1,12 @@
+use dash_sdk::{mock::Mockable, platform::Query, Sdk};
 use dpp::{data_contract::DataContractFactory, prelude::Identifier};
+use hex::ToHex;
+use rs_dapi_client::transport::TransportRequest;
+
+use super::config::Config;
+
+/// Test DPNS name for testing of the Sdk; at least 3 identities should request this name to be reserved
+pub(crate) const TEST_DPNS_NAME: &str = "testname";
 
 /// Create a mock document type for testing of mock API
 pub fn mock_document_type() -> dpp::data_contract::document_type::DocumentType {
@@ -80,3 +88,24 @@ pub fn setup_logs() {
         .try_init()
         .ok();
 }
+
+/// Configure test case generated with [::test_case] crate.
+///
+/// This function is intended to use with multiple test cases in a single function.
+/// As a test case shares function body, we need to generate unique name for each of them to isolate generated
+/// test vectors. It is done by hashing query and using it as a suffix for test case name.
+///
+/// ## Returns
+///
+/// Returns unique name of test case (generated from `name_prefix` and hash of query) and configured SDK.
+pub(crate) async fn setup_sdk_for_test_case<T: TransportRequest + Mockable, Q: Query<T>>(
+    cfg: Config,
+    query: Q,
+    name_prefix: &str,
+) -> (String, Sdk) {
+    let key = rs_dapi_client::mock::Key::new(&query.query(true).expect("valid query"));
+    let test_case_id = format!("{}_{}", name_prefix, key.encode_hex::<String>());
+
+    // create new sdk to ensure that test cases don't interfere with each other
+    (test_case_id.clone(), cfg.setup_api(&test_case_id).await)
+}