diff --git a/packages/wasm-sdk/AI_REFERENCE.md b/packages/wasm-sdk/AI_REFERENCE.md index 23531a9e08..b440499aa2 100644 --- a/packages/wasm-sdk/AI_REFERENCE.md +++ b/packages/wasm-sdk/AI_REFERENCE.md @@ -72,7 +72,6 @@ const result = await sdk.getIdentityKeys("identityId"); Parameters: - `identitiesIds` (array, required) - Identity IDs - `contractId` (text, required) - Contract ID -- `documentTypeName` (text, optional) - Document Type (optional) - `purposes` (multiselect, optional) - Key Purposes - Options: `0` (Authentication), `1` (Encryption), `2` (Decryption), `3` (Transfer), `5` (Voting) @@ -357,8 +356,6 @@ Parameters: - `documentTypeName` (text, required) - Document Type - `dataContractId` (text, required) - Data Contract ID - `indexName` (text, required) - Index Name -- `resultType` (text, required) - Result Type -- `allowIncludeLockedAndAbstainingVoteTally` (checkbox, optional) - Allow Include Locked and Abstaining Vote Tally - `startAtValue` (text, optional) - Start At Value - `limit` (number, optional) - Limit - `offset` (number, optional) - Offset @@ -366,7 +363,7 @@ Parameters: Example: ```javascript -const result = await sdk.getContestedResources("documentTypeName", "dataContractId", "indexName", "resultType"); +const result = await sdk.getContestedResources("documentTypeName", "dataContractId", "indexName"); ``` **Get Contested Resource Vote State** - `getContestedResourceVoteState` diff --git a/packages/wasm-sdk/api-definitions.json b/packages/wasm-sdk/api-definitions.json index 0953ed5407..1cbb330454 100644 --- a/packages/wasm-sdk/api-definitions.json +++ b/packages/wasm-sdk/api-definitions.json @@ -92,12 +92,6 @@ "label": "Contract ID", "required": true }, - { - "name": "documentTypeName", - "type": "text", - "label": "Document Type (optional)", - "required": false - }, { "name": "purposes", "type": "multiselect", @@ -535,18 +529,6 @@ "label": "Index Name", "required": true }, - { - "name": "resultType", - "type": "text", - "label": "Result Type", - "required": true - }, - { - "name": "allowIncludeLockedAndAbstainingVoteTally", - "type": "checkbox", - "label": "Allow Include Locked and Abstaining Vote Tally", - "required": false - }, { "name": "startAtValue", "type": "text", diff --git a/packages/wasm-sdk/docs.html b/packages/wasm-sdk/docs.html index d2a533b941..ba0dbec39a 100644 --- a/packages/wasm-sdk/docs.html +++ b/packages/wasm-sdk/docs.html @@ -607,11 +607,6 @@
Parameters:
text (required) -
- Document Type (optional) - text - (optional) -
Key Purposes multiselect @@ -622,7 +617,7 @@
Parameters:
Example
-
return await window.wasmFunctions.get_identities_contract_keys(sdk, ['5DbLwAxGBzUzo81VewMUwn4b5P4bpv9FNFybi25XB5Bk'], 'GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec', 'domain');
+
return await window.wasmFunctions.get_identities_contract_keys(sdk, ['5DbLwAxGBzUzo81VewMUwn4b5P4bpv9FNFybi25XB5Bk'], 'GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec');
@@ -1149,16 +1144,6 @@
Parameters:
text (required) -
- Result Type - text - (required) -
-
- Allow Include Locked and Abstaining Vote Tally - checkbox - (optional) -
Start At Value text @@ -1184,7 +1169,7 @@
Parameters:
Example
-
return await window.wasmFunctions.get_contested_resources(sdk, 'domain', 'GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec', 'parentNameAndLabel', 'documents', null, null, 10, 0, true);
+
return await window.wasmFunctions.get_contested_resources(sdk, 'domain', 'GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec', 'parentNameAndLabel', null, 10, 0, true);
diff --git a/packages/wasm-sdk/docs_manifest.json b/packages/wasm-sdk/docs_manifest.json index 80368c557e..2d8c69f70f 100644 --- a/packages/wasm-sdk/docs_manifest.json +++ b/packages/wasm-sdk/docs_manifest.json @@ -1,5 +1,5 @@ { - "generated_at": "2025-09-03T20:55:56.075308+00:00", + "generated_at": "2025-09-04T13:38:48.983658+00:00", "queries": { "getIdentity": { "category": "identity", diff --git a/packages/wasm-sdk/index.html b/packages/wasm-sdk/index.html index 94d5cfb543..87d83aab1b 100644 --- a/packages/wasm-sdk/index.html +++ b/packages/wasm-sdk/index.html @@ -2241,7 +2241,6 @@

Results

sdk, values.identitiesIds, values.contractId, - values.documentTypeName || undefined, purposes ); // Result is already a JS object from serde_wasm_bindgen @@ -2250,7 +2249,6 @@

Results

sdk, values.identitiesIds, values.contractId, - values.documentTypeName || undefined, purposes ); // Result is already a JS object from serde_wasm_bindgen @@ -2776,8 +2774,6 @@

Results

values.documentTypeName, values.dataContractId, values.indexName, - values.resultType, - values.allowIncludeLockedAndAbstainingVoteTally, startAtValue, values.limit, values.offset, @@ -2789,8 +2785,6 @@

Results

values.documentTypeName, values.dataContractId, values.indexName, - values.resultType, - values.allowIncludeLockedAndAbstainingVoteTally, startAtValue, values.limit, values.offset, diff --git a/packages/wasm-sdk/src/dpns.rs b/packages/wasm-sdk/src/dpns.rs index 2e96eeb35d..0993a2ae6e 100644 --- a/packages/wasm-sdk/src/dpns.rs +++ b/packages/wasm-sdk/src/dpns.rs @@ -8,7 +8,6 @@ use dash_sdk::dpp::document::{Document, DocumentV0Getters}; use dash_sdk::dpp::identity::accessors::IdentityGettersV0; use dash_sdk::dpp::prelude::Identifier; use simple_signer::SingleKeySigner; -use std::sync::Mutex; #[derive(Serialize, Deserialize)] #[serde(rename_all = "camelCase")] diff --git a/packages/wasm-sdk/src/lib.rs b/packages/wasm-sdk/src/lib.rs index d87777048c..a6e0186fa8 100644 --- a/packages/wasm-sdk/src/lib.rs +++ b/packages/wasm-sdk/src/lib.rs @@ -12,8 +12,11 @@ pub mod wallet; // Re-export commonly used items pub use sdk::{WasmSdk, WasmSdkBuilder}; -pub use queries::*; -pub use state_transitions::*; +pub use queries::{ + data_contract::*, document::*, dpns::*, epoch::*, group::*, protocol::*, system::*, token::*, voting::*, + identity as query_identity +}; +pub use state_transitions::identity as state_transition_identity; pub use dpns::*; pub use wallet::*; diff --git a/packages/wasm-sdk/src/queries/data_contract.rs b/packages/wasm-sdk/src/queries/data_contract.rs index 5bf023abed..95d402fdd2 100644 --- a/packages/wasm-sdk/src/queries/data_contract.rs +++ b/packages/wasm-sdk/src/queries/data_contract.rs @@ -1,6 +1,6 @@ use crate::dpp::DataContractWasm; use crate::sdk::WasmSdk; -use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; +use crate::queries::ProofMetadataResponse; use dash_sdk::platform::{DataContract, Fetch, FetchMany, Identifier}; use dash_sdk::platform::query::LimitQuery; use drive_proof_verifier::types::{DataContractHistory, DataContracts}; diff --git a/packages/wasm-sdk/src/queries/document.rs b/packages/wasm-sdk/src/queries/document.rs index 84bcd9064d..d87dd4eda7 100644 --- a/packages/wasm-sdk/src/queries/document.rs +++ b/packages/wasm-sdk/src/queries/document.rs @@ -1,10 +1,9 @@ use crate::sdk::WasmSdk; -use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; +use crate::queries::ProofMetadataResponse; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue, JsCast}; use serde::{Serialize, Deserialize}; use dash_sdk::platform::Fetch; -use drive_proof_verifier::types::Documents; use dash_sdk::dpp::prelude::Identifier; use dash_sdk::dpp::document::Document; use dash_sdk::dpp::document::DocumentV0Getters; @@ -326,7 +325,7 @@ pub async fn get_documents_with_proof_info( ) -> Result { use dash_sdk::platform::documents::document_query::DocumentQuery; use dash_sdk::platform::FetchMany; - use drive_proof_verifier::types::Documents; + // Parse data contract ID let contract_id = Identifier::from_string( @@ -670,7 +669,7 @@ pub async fn get_dpns_usernames_with_proof_info( ) -> Result { use dash_sdk::platform::documents::document_query::DocumentQuery; use dash_sdk::platform::FetchMany; - use drive_proof_verifier::types::Documents; + // DPNS contract ID on testnet const DPNS_CONTRACT_ID: &str = "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec"; diff --git a/packages/wasm-sdk/src/queries/dpns.rs b/packages/wasm-sdk/src/queries/dpns.rs index 39ef08d67c..703479341c 100644 --- a/packages/wasm-sdk/src/queries/dpns.rs +++ b/packages/wasm-sdk/src/queries/dpns.rs @@ -1,10 +1,9 @@ use crate::sdk::WasmSdk; -use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; +use crate::queries::ProofMetadataResponse; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; -use dash_sdk::platform::{Fetch, FetchMany, Document}; +use dash_sdk::platform::{FetchMany, Document}; use dash_sdk::dpp::platform_value::string_encoding::Encoding; use dash_sdk::dpp::document::DocumentV0Getters; diff --git a/packages/wasm-sdk/src/queries/epoch.rs b/packages/wasm-sdk/src/queries/epoch.rs index 5242096ad1..82d8c89f51 100644 --- a/packages/wasm-sdk/src/queries/epoch.rs +++ b/packages/wasm-sdk/src/queries/epoch.rs @@ -1,9 +1,8 @@ use crate::sdk::WasmSdk; -use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; +use crate::queries::ProofMetadataResponse; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; use dash_sdk::platform::{FetchMany, LimitQuery}; use dash_sdk::platform::fetch_current_no_parameters::FetchCurrent; use dash_sdk::dpp::block::extended_epoch_info::ExtendedEpochInfo; @@ -166,7 +165,7 @@ pub async fn get_evonodes_proposed_epoch_blocks_by_ids( epoch: u16, ids: Vec, ) -> Result { - use drive_proof_verifier::types::{ProposerBlockCountById, ProposerBlockCounts}; + use drive_proof_verifier::types::ProposerBlockCountById; // Parse the ProTxHash strings let pro_tx_hashes: Vec = ids @@ -346,7 +345,7 @@ pub async fn get_finalized_epoch_infos_with_proof_info( ascending: Option, ) -> Result { use dash_sdk::platform::types::finalized_epoch::FinalizedEpochQuery; - use drive_proof_verifier::types::FinalizedEpochInfos; + if start_epoch.is_none() { return Err(JsError::new("start_epoch is required for finalized epoch queries")); diff --git a/packages/wasm-sdk/src/queries/group.rs b/packages/wasm-sdk/src/queries/group.rs index b29e92012c..8c88f0e822 100644 --- a/packages/wasm-sdk/src/queries/group.rs +++ b/packages/wasm-sdk/src/queries/group.rs @@ -2,7 +2,6 @@ use crate::sdk::WasmSdk; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; use dash_sdk::platform::{Fetch, FetchMany, Identifier}; use dash_sdk::dpp::data_contract::group::Group; @@ -528,7 +527,7 @@ pub async fn get_group_info_with_proof_info( data_contract_id: &str, group_contract_position: u32, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse data contract ID let contract_id = Identifier::from_string( @@ -568,7 +567,7 @@ pub async fn get_group_infos_with_proof_info( start_at_info: JsValue, count: Option, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse contract ID let contract_id = Identifier::from_string( diff --git a/packages/wasm-sdk/src/queries/identity.rs b/packages/wasm-sdk/src/queries/identity.rs index 58761e4dd6..2a50dc79a7 100644 --- a/packages/wasm-sdk/src/queries/identity.rs +++ b/packages/wasm-sdk/src/queries/identity.rs @@ -1,18 +1,15 @@ use crate::dpp::IdentityWasm; use crate::sdk::WasmSdk; use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; -use dash_sdk::platform::{Fetch, FetchMany, FetchUnproved, Identifier, Identity}; +use dash_sdk::platform::{Fetch, FetchMany, Identifier, Identity}; use dash_sdk::dpp::identity::identity_public_key::IdentityPublicKey; use dash_sdk::dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; use js_sys::Array; use rs_dapi_client::IntoInner; -use std::collections::BTreeMap; use drive_proof_verifier::types::{IdentityPublicKeys, IndexMap}; -use dash_sdk::dpp::identity::KeyID; // Proof info functions are now included below @@ -692,13 +689,12 @@ pub async fn get_identities_contract_keys( sdk: &WasmSdk, identities_ids: Vec, contract_id: &str, - document_type_name: Option, purposes: Option>, ) -> Result { use dash_sdk::dpp::identity::Purpose; // Convert string IDs to Identifiers - let identity_ids: Vec = identities_ids + let _identity_ids: Vec = identities_ids .iter() .map(|id| Identifier::from_string( id, @@ -1296,7 +1292,6 @@ pub async fn get_identities_contract_keys_with_proof_info( sdk: &WasmSdk, identities_ids: Vec, contract_id: &str, - _document_type_name: Option, purposes: Option>, ) -> Result { use dash_sdk::dpp::identity::Purpose; diff --git a/packages/wasm-sdk/src/queries/protocol.rs b/packages/wasm-sdk/src/queries/protocol.rs index 93304e460f..428dc8c4c2 100644 --- a/packages/wasm-sdk/src/queries/protocol.rs +++ b/packages/wasm-sdk/src/queries/protocol.rs @@ -2,7 +2,6 @@ use crate::sdk::WasmSdk; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; #[derive(Serialize, Deserialize, Debug)] #[serde(rename_all = "camelCase")] @@ -108,7 +107,7 @@ pub async fn get_protocol_version_upgrade_vote_status( pub async fn get_protocol_version_upgrade_state_with_proof_info(sdk: &WasmSdk) -> Result { use dash_sdk::platform::FetchMany; use drive_proof_verifier::types::ProtocolVersionVoteCount; - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; let (upgrade_result, metadata, proof): (drive_proof_verifier::types::ProtocolVersionUpgrades, _, _) = ProtocolVersionVoteCount::fetch_many_with_metadata_and_proof(sdk.as_ref(), (), None) .await diff --git a/packages/wasm-sdk/src/queries/system.rs b/packages/wasm-sdk/src/queries/system.rs index 90d0d8999d..e264d484ff 100644 --- a/packages/wasm-sdk/src/queries/system.rs +++ b/packages/wasm-sdk/src/queries/system.rs @@ -2,7 +2,6 @@ use crate::sdk::WasmSdk; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; use dash_sdk::dpp::core_types::validator_set::v0::ValidatorSetV0Getters; // Response structures for the gRPC getStatus endpoint @@ -596,7 +595,7 @@ pub async fn get_path_elements( pub async fn get_total_credits_in_platform_with_proof_info(sdk: &WasmSdk) -> Result { use dash_sdk::platform::Fetch; use drive_proof_verifier::types::{TotalCreditsInPlatform as TotalCreditsQuery, NoParamQuery}; - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; let (total_credits_result, metadata, proof) = TotalCreditsQuery::fetch_with_metadata_and_proof(sdk.as_ref(), NoParamQuery {}, None) .await @@ -629,7 +628,7 @@ pub async fn get_prefunded_specialized_balance_with_proof_info( ) -> Result { use dash_sdk::platform::{Identifier, Fetch}; use drive_proof_verifier::types::PrefundedSpecializedBalance as PrefundedBalance; - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse identity ID let identity_identifier = Identifier::from_string( @@ -666,9 +665,9 @@ pub async fn get_path_elements_with_proof_info( keys: Vec, ) -> Result { use dash_sdk::platform::FetchMany; - use drive_proof_verifier::types::{KeysInPath, Elements}; + use drive_proof_verifier::types::KeysInPath; use dash_sdk::drive::grovedb::Element; - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Convert string path to byte vectors // Path elements can be either numeric values (like "96" for Balances) or string keys diff --git a/packages/wasm-sdk/src/queries/token.rs b/packages/wasm-sdk/src/queries/token.rs index d89ed15eae..a754b5a424 100644 --- a/packages/wasm-sdk/src/queries/token.rs +++ b/packages/wasm-sdk/src/queries/token.rs @@ -2,8 +2,7 @@ use crate::sdk::WasmSdk; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen::{JsError, JsValue}; use serde::{Serialize, Deserialize}; -use serde::ser::Serialize as _; -use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; +use crate::queries::ProofMetadataResponse; use dash_sdk::platform::{Identifier, FetchMany}; use dash_sdk::dpp::balances::credits::TokenAmount; use dash_sdk::dpp::tokens::status::TokenStatus; @@ -526,9 +525,6 @@ pub async fn get_token_perpetual_distribution_last_claim( identity_id: &str, token_id: &str, ) -> Result { - use dash_sdk::platform::query::TokenLastClaimQuery; - use dash_sdk::dpp::data_contract::associated_token::token_perpetual_distribution::reward_distribution_moment::RewardDistributionMoment; - use dash_sdk::platform::Fetch; // Parse IDs let identity_identifier = Identifier::from_string( @@ -709,7 +705,6 @@ pub async fn get_identities_token_balances_with_proof_info( token_id: &str, ) -> Result { use dash_sdk::platform::tokens::identity_token_balances::IdentitiesTokenBalancesQuery; - use drive_proof_verifier::types::identity_token_balance::IdentitiesTokenBalances; // Parse token ID let token_identifier = Identifier::from_string( @@ -772,7 +767,6 @@ pub async fn get_identities_token_balances_with_proof_info( #[wasm_bindgen] pub async fn get_token_statuses_with_proof_info(sdk: &WasmSdk, token_ids: Vec) -> Result { - use drive_proof_verifier::types::token_status::TokenStatuses; // Parse token IDs let tokens: Result, _> = token_ids diff --git a/packages/wasm-sdk/src/queries/voting.rs b/packages/wasm-sdk/src/queries/voting.rs index 4910e8cf5e..6246779f28 100644 --- a/packages/wasm-sdk/src/queries/voting.rs +++ b/packages/wasm-sdk/src/queries/voting.rs @@ -30,8 +30,6 @@ pub async fn get_contested_resources( document_type_name: &str, data_contract_id: &str, index_name: &str, - _result_type: &str, - _allow_include_locked_and_abstaining_vote_tally: Option, start_at_value: Option>, limit: Option, _offset: Option, @@ -259,14 +257,12 @@ pub async fn get_contested_resources_with_proof_info( document_type_name: &str, data_contract_id: &str, index_name: &str, - _result_type: &str, - _allow_include_locked_and_abstaining_vote_tally: Option, start_at_value: Option>, limit: Option, _offset: Option, order_ascending: Option, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse contract ID let contract_id = Identifier::from_string( @@ -348,13 +344,19 @@ pub async fn get_contested_resource_vote_state_with_proof_info( document_type_name: &str, index_name: &str, index_values: Vec, - result_type: &str, + // TODO: Implement result_type parameter properly + // Currently unused - should map to protobuf ResultType enum: + // - "documents" -> 0 (DOCUMENTS) + // - "vote_tally" -> 1 (VOTE_TALLY) + // - "documents_and_vote_tally" -> 2 (DOCUMENTS_AND_VOTE_TALLY) + // See: https://github.com/dashpay/platform/issues/2760 + _result_type: &str, allow_include_locked_and_abstaining_vote_tally: Option, start_at_identifier_info: Option, count: Option, _order_ascending: Option, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse contract ID let contract_id = Identifier::from_string( @@ -408,6 +410,8 @@ pub async fn get_contested_resource_vote_state_with_proof_info( document_type_name: document_type_name.to_string(), index_name: index_name.to_string(), index_values: index_values_bytes, + // TODO: This should use the _result_type parameter instead of allow_include_locked_and_abstaining_vote_tally + // Current logic is incorrect - these are independent concerns result_type: if allow_include_locked_and_abstaining_vote_tally.unwrap_or(false) { 0 } else { 1 }, allow_include_locked_and_abstaining_vote_tally: allow_include_locked_and_abstaining_vote_tally.unwrap_or(false), start_at_identifier_info, @@ -463,7 +467,7 @@ pub async fn get_contested_resource_voters_for_identity_with_proof_info( count: Option, order_ascending: Option, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse IDs let contract_id = Identifier::from_string( @@ -571,7 +575,7 @@ pub async fn get_contested_resource_identity_votes_with_proof_info( offset: Option, order_ascending: Option, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Parse identity ID let identity_identifier = Identifier::from_string( @@ -634,7 +638,7 @@ pub async fn get_vote_polls_by_end_date_with_proof_info( offset: Option, order_ascending: Option, ) -> Result { - use crate::queries::{ProofMetadataResponse, ResponseMetadata, ProofInfo}; + use crate::queries::ProofMetadataResponse; // Note: GetVotePollsByEndDateRequestV0 doesn't have start_at_poll_info, only offset @@ -703,7 +707,13 @@ pub async fn get_contested_resource_vote_state( document_type_name: &str, index_name: &str, index_values: Vec, - result_type: &str, + // TODO: Implement result_type parameter properly + // Currently unused - should map to protobuf ResultType enum: + // - "documents" -> 0 (DOCUMENTS) + // - "vote_tally" -> 1 (VOTE_TALLY) + // - "documents_and_vote_tally" -> 2 (DOCUMENTS_AND_VOTE_TALLY) + // See: https://github.com/dashpay/platform/issues/2760 + _result_type: &str, allow_include_locked_and_abstaining_vote_tally: Option, start_at_identifier_info: Option, count: Option, @@ -761,6 +771,8 @@ pub async fn get_contested_resource_vote_state( document_type_name: document_type_name.to_string(), index_name: index_name.to_string(), index_values: index_values_bytes, + // TODO: This should use the _result_type parameter instead of allow_include_locked_and_abstaining_vote_tally + // Current logic is incorrect - these are independent concerns result_type: if allow_include_locked_and_abstaining_vote_tally.unwrap_or(false) { 0 } else { 1 }, allow_include_locked_and_abstaining_vote_tally: allow_include_locked_and_abstaining_vote_tally.unwrap_or(false), start_at_identifier_info, diff --git a/packages/wasm-sdk/src/sdk.rs b/packages/wasm-sdk/src/sdk.rs index a25ce468f5..f08df76766 100644 --- a/packages/wasm-sdk/src/sdk.rs +++ b/packages/wasm-sdk/src/sdk.rs @@ -13,9 +13,8 @@ use dash_sdk::platform::transition::put_identity::PutIdentity; use dash_sdk::platform::{DataContract, Document, DocumentQuery, Fetch, Identifier, Identity}; use dash_sdk::sdk::AddressList; use dash_sdk::{Sdk, SdkBuilder}; -use dapi_grpc::platform::VersionedGrpcResponse; use platform_value::platform_value; -use dash_sdk::dpp::version::{PlatformVersion, PlatformVersionCurrentVersion}; +use dash_sdk::dpp::version::PlatformVersion; use rs_dapi_client::RequestSettings; use std::collections::BTreeMap; use std::fmt::Debug; diff --git a/packages/wasm-sdk/src/state_transitions/identity/mod.rs b/packages/wasm-sdk/src/state_transitions/identity/mod.rs index 995d43e94b..3f04efbf51 100644 --- a/packages/wasm-sdk/src/state_transitions/identity/mod.rs +++ b/packages/wasm-sdk/src/state_transitions/identity/mod.rs @@ -17,7 +17,6 @@ use web_sys; use dash_sdk::platform::transition::put_identity::PutIdentity; use dash_sdk::platform::transition::top_up_identity::TopUpIdentity; use dash_sdk::dpp::prelude::AssetLockProof; -use dash_sdk::dpp::state_transition::proof_result::StateTransitionProofResult; #[wasm_bindgen] impl WasmSdk { diff --git a/packages/wasm-sdk/src/state_transitions/tokens/mod.rs b/packages/wasm-sdk/src/state_transitions/tokens/mod.rs index e5b1509c51..2fcc69735d 100644 --- a/packages/wasm-sdk/src/state_transitions/tokens/mod.rs +++ b/packages/wasm-sdk/src/state_transitions/tokens/mod.rs @@ -4,9 +4,7 @@ use crate::sdk::WasmSdk; use dash_sdk::dpp::balances::credits::TokenAmount; -use dash_sdk::dpp::identity::{IdentityPublicKey, KeyType, Purpose, SecurityLevel}; -use dash_sdk::dpp::identity::identity_public_key::v0::IdentityPublicKeyV0; -use dash_sdk::dpp::platform_value::{Identifier, BinaryData, string_encoding::Encoding}; +use dash_sdk::dpp::platform_value::{Identifier, string_encoding::Encoding}; use dash_sdk::dpp::prelude::UserFeeIncrease; use dash_sdk::dpp::state_transition::batch_transition::BatchTransition; use dash_sdk::dpp::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1; @@ -15,7 +13,6 @@ use dash_sdk::dpp::tokens::calculate_token_id; use dash_sdk::dpp::document::DocumentV0Getters; use dash_sdk::platform::transition::broadcast::BroadcastStateTransition; use dash_sdk::platform::Fetch; -use simple_signer::SingleKeySigner; use serde_wasm_bindgen::to_value; use serde_json; use wasm_bindgen::prelude::*; @@ -909,7 +906,7 @@ impl WasmSdk { .map_err(|e| JsValue::from_str(&format!("Failed to fetch token price: {:?}", e)))?; // Use js_sys to work with JavaScript objects - use js_sys::{Object, Reflect, Array}; + use js_sys::{Reflect, Array}; // Get the prices array from the result let prices_prop = Reflect::get(&prices, &JsValue::from_str("prices")) diff --git a/packages/wasm-sdk/src/wallet/dip14.rs b/packages/wasm-sdk/src/wallet/dip14.rs index 1c47adf6b8..3b875b0237 100644 --- a/packages/wasm-sdk/src/wallet/dip14.rs +++ b/packages/wasm-sdk/src/wallet/dip14.rs @@ -9,7 +9,7 @@ use dashcore::Network; use hmac::{Hmac, Mac}; use sha2::Sha512; use std::convert::TryInto; -use dashcore::hashes::{sha256, ripemd160, Hash}; +use dashcore::hashes::{sha256, Hash}; use hex; type HmacSha512 = Hmac; @@ -50,10 +50,10 @@ pub struct Dip14ExtendedPrivKey { } // DIP14 Version bytes -const DIP14_VERSION_MAINNET_PRIVATE: [u8; 4] = [0x04, 0x9e, 0xdd, 0x93]; // dpms -const DIP14_VERSION_MAINNET_PUBLIC: [u8; 4] = [0x04, 0x9e, 0xdc, 0x93]; // dpmp -const DIP14_VERSION_TESTNET_PRIVATE: [u8; 4] = [0x04, 0xa5, 0x90, 0x8e]; // dpts -const DIP14_VERSION_TESTNET_PUBLIC: [u8; 4] = [0x04, 0xa5, 0x8f, 0x51]; // dptp +const _DIP14_VERSION_MAINNET_PRIVATE: [u8; 4] = [0x04, 0x9e, 0xdd, 0x93]; // dpms +const _DIP14_VERSION_MAINNET_PUBLIC: [u8; 4] = [0x04, 0x9e, 0xdc, 0x93]; // dpmp +const _DIP14_VERSION_TESTNET_PRIVATE: [u8; 4] = [0x04, 0xa5, 0x90, 0x8e]; // dpts +const _DIP14_VERSION_TESTNET_PUBLIC: [u8; 4] = [0x04, 0xa5, 0x8f, 0x51]; // dptp impl Dip14ExtendedPrivKey { /// Create from a standard BIP32 ExtendedPrivKey (for master key) diff --git a/packages/wasm-sdk/src/wallet/key_derivation.rs b/packages/wasm-sdk/src/wallet/key_derivation.rs index 1946e175af..bfc0f60ffe 100644 --- a/packages/wasm-sdk/src/wallet/key_derivation.rs +++ b/packages/wasm-sdk/src/wallet/key_derivation.rs @@ -7,7 +7,6 @@ use serde::{Serialize, Deserialize}; use bip39::{Mnemonic, Language}; use rand::{RngCore, thread_rng}; use std::str::FromStr; -use serde_json; /// Dash coin type for BIP44 (mainnet) pub const DASH_COIN_TYPE: u32 = 5; @@ -196,7 +195,7 @@ pub fn mnemonic_to_seed(mnemonic: &str, passphrase: Option) -> Result, network: &str) -> Result { - use dashcore::hashes::sha256; + use crate::wallet::key_generation::KeyPair; // Get seed from mnemonic @@ -460,8 +459,8 @@ pub fn derivation_path_dip13_testnet(account: u32) -> JsValue { /// Get child public key from extended public key #[wasm_bindgen] pub fn derive_child_public_key( - xpub: &str, - index: u32, + _xpub: &str, + _index: u32, hardened: bool, ) -> Result { if hardened { @@ -474,7 +473,7 @@ pub fn derive_child_public_key( /// Convert extended private key to extended public key #[wasm_bindgen] -pub fn xprv_to_xpub(xprv: &str) -> Result { +pub fn xprv_to_xpub(_xprv: &str) -> Result { // TODO: Implement conversion Err(JsError::new("Extended key conversion not yet implemented")) } diff --git a/packages/wasm-sdk/test/ui-automation/fixtures/test-data.js b/packages/wasm-sdk/test/ui-automation/fixtures/test-data.js index 1ac5ee6c06..7ee00bd15c 100644 --- a/packages/wasm-sdk/test/ui-automation/fixtures/test-data.js +++ b/packages/wasm-sdk/test/ui-automation/fixtures/test-data.js @@ -111,7 +111,6 @@ const testData = { "5RG84o6KsTaZudDqS8ytbaRB8QP4YYQ2uwzb6Hj8cfjX" ], contractId: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec", - documentTypeName: "domain", purposes: ["0", "3"] // Authentication and Transfer } ] @@ -402,8 +401,6 @@ const testData = { documentTypeName: "domain", dataContractId: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec", indexName: "parentNameAndLabel", - resultType: "documents", - allowIncludeLockedAndAbstainingVoteTally: false, limit: 10, offset: 0, orderAscending: true