From 0fbb0c5a01c65c3dd86989496606d96024c71b55 Mon Sep 17 00:00:00 2001 From: thephez Date: Wed, 20 Aug 2025 09:33:47 -0400 Subject: [PATCH 1/8] fix(wasm-sdk): remove unused imports and variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove 65 compiler warnings from wasm-sdk package by: - Removing unused imports across query and state transition modules - Prefixing unused variables with underscore - Fixing ambiguous glob re-export in lib.rs - Prefixing unused constants with underscore 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- packages/wasm-sdk/src/dpns.rs | 1 - packages/wasm-sdk/src/lib.rs | 7 +++++-- packages/wasm-sdk/src/queries/data_contract.rs | 2 +- packages/wasm-sdk/src/queries/document.rs | 7 +++---- packages/wasm-sdk/src/queries/dpns.rs | 5 ++--- packages/wasm-sdk/src/queries/epoch.rs | 7 +++---- packages/wasm-sdk/src/queries/group.rs | 5 ++--- packages/wasm-sdk/src/queries/identity.rs | 9 +++------ packages/wasm-sdk/src/queries/protocol.rs | 3 +-- packages/wasm-sdk/src/queries/system.rs | 9 ++++----- packages/wasm-sdk/src/queries/token.rs | 13 ++++++------- packages/wasm-sdk/src/queries/voting.rs | 14 +++++++------- packages/wasm-sdk/src/sdk.rs | 3 +-- .../src/state_transitions/documents/mod.rs | 6 +++--- .../wasm-sdk/src/state_transitions/identity/mod.rs | 1 - .../wasm-sdk/src/state_transitions/tokens/mod.rs | 7 ++----- packages/wasm-sdk/src/wallet/dip14.rs | 10 +++++----- packages/wasm-sdk/src/wallet/key_derivation.rs | 9 ++++----- 18 files changed, 52 insertions(+), 66 deletions(-) diff --git a/packages/wasm-sdk/src/dpns.rs b/packages/wasm-sdk/src/dpns.rs index 2e96eeb35da..0993a2ae6ef 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 d87777048c4..a6e0186fa8a 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 5bf023abed6..95d402fdd26 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 84bcd9064d9..d87dd4eda75 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 39ef08d67c3..703479341c9 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 5242096ad1e..82d8c89f518 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 b29e92012c7..8c88f0e8220 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 58761e4dd67..06fb24f4730 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,13 @@ pub async fn get_identities_contract_keys( sdk: &WasmSdk, identities_ids: Vec, contract_id: &str, - document_type_name: Option, + _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, diff --git a/packages/wasm-sdk/src/queries/protocol.rs b/packages/wasm-sdk/src/queries/protocol.rs index 93304e460f4..428dc8c4c24 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 e34d781fd7b..2aa625ef0c0 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; #[derive(Serialize, Deserialize, Debug)] @@ -384,7 +383,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 @@ -417,7 +416,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( @@ -454,9 +453,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 d89ed15eae1..91c795c01e9 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,9 @@ 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 +708,7 @@ 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 +771,7 @@ 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 4910e8cf5ed..8feced2e395 100644 --- a/packages/wasm-sdk/src/queries/voting.rs +++ b/packages/wasm-sdk/src/queries/voting.rs @@ -266,7 +266,7 @@ pub async fn get_contested_resources_with_proof_info( _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 +348,13 @@ pub async fn get_contested_resource_vote_state_with_proof_info( document_type_name: &str, index_name: &str, index_values: Vec, - result_type: &str, + _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( @@ -463,7 +463,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 +571,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 +634,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 +703,7 @@ pub async fn get_contested_resource_vote_state( document_type_name: &str, index_name: &str, index_values: Vec, - result_type: &str, + _result_type: &str, allow_include_locked_and_abstaining_vote_tally: Option, start_at_identifier_info: Option, count: Option, diff --git a/packages/wasm-sdk/src/sdk.rs b/packages/wasm-sdk/src/sdk.rs index a25ce468f57..f08df767666 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/documents/mod.rs b/packages/wasm-sdk/src/state_transitions/documents/mod.rs index 7bde0a1459a..1a509021be8 100644 --- a/packages/wasm-sdk/src/state_transitions/documents/mod.rs +++ b/packages/wasm-sdk/src/state_transitions/documents/mod.rs @@ -1040,7 +1040,7 @@ impl WasmSdk { buyer_id: String, price: u64, private_key_wif: String, - key_id: u32, + _key_id: u32, ) -> Result { let sdk = self.inner_clone(); @@ -1186,7 +1186,7 @@ impl WasmSdk { owner_id: String, price: u64, private_key_wif: String, - key_id: u32, + _key_id: u32, ) -> Result { let sdk = self.inner_clone(); @@ -1273,7 +1273,7 @@ impl WasmSdk { .map_err(|e| JsValue::from_str(&format!("Failed to fetch nonce: {}", e)))?; // Generate entropy for the state transition - let entropy_bytes = { + let _entropy_bytes = { let mut entropy = [0u8; 32]; if let Some(window) = web_sys::window() { if let Ok(crypto) = window.crypto() { diff --git a/packages/wasm-sdk/src/state_transitions/identity/mod.rs b/packages/wasm-sdk/src/state_transitions/identity/mod.rs index 995d43e94be..3f04efbf519 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 e5b1509c518..2fcc69735d0 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 1c47adf6b80..3b875b02375 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 1946e175afb..bfc0f60ffe1 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")) } From 742635612312c6ae80f797494912da36d8105951 Mon Sep 17 00:00:00 2001 From: thephez Date: Wed, 3 Sep 2025 17:51:07 -0400 Subject: [PATCH 2/8] refactor(wasm-sdk): remove unused documentTypeName parameter from getIdentitiesContractKeys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The documentTypeName parameter was unused in the implementation but still defined in the API. This removes it from: - Rust function signatures - API definitions JSON - Documentation examples - HTML interface calls 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- packages/wasm-sdk/AI_REFERENCE.md | 1 - packages/wasm-sdk/api-definitions.json | 6 ------ packages/wasm-sdk/docs.html | 7 +------ packages/wasm-sdk/docs_manifest.json | 2 +- packages/wasm-sdk/index.html | 2 -- packages/wasm-sdk/src/queries/identity.rs | 2 -- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/wasm-sdk/AI_REFERENCE.md b/packages/wasm-sdk/AI_REFERENCE.md index 1cd9c81ee39..6f384c7c0a2 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) diff --git a/packages/wasm-sdk/api-definitions.json b/packages/wasm-sdk/api-definitions.json index bac7fa53fe3..ad9c5b5f762 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", diff --git a/packages/wasm-sdk/docs.html b/packages/wasm-sdk/docs.html index ed15f0376ed..cd3abaef97f 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');
diff --git a/packages/wasm-sdk/docs_manifest.json b/packages/wasm-sdk/docs_manifest.json index d117fc66601..0179e725533 100644 --- a/packages/wasm-sdk/docs_manifest.json +++ b/packages/wasm-sdk/docs_manifest.json @@ -1,5 +1,5 @@ { - "generated_at": "2025-09-02T17:31:30.731295+00:00", + "generated_at": "2025-09-03T21:48:17.677576+00:00", "queries": { "getIdentity": { "category": "identity", diff --git a/packages/wasm-sdk/index.html b/packages/wasm-sdk/index.html index d01c288e0c3..9b9a48f6990 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 diff --git a/packages/wasm-sdk/src/queries/identity.rs b/packages/wasm-sdk/src/queries/identity.rs index 06fb24f4730..2a50dc79a73 100644 --- a/packages/wasm-sdk/src/queries/identity.rs +++ b/packages/wasm-sdk/src/queries/identity.rs @@ -689,7 +689,6 @@ 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; @@ -1293,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; From 366047dba15fbd7cdcb5c76cce85764632674449 Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 4 Sep 2025 09:04:09 -0400 Subject: [PATCH 3/8] fix: remove domain from getIdentitiesContractKeys test-data --- packages/wasm-sdk/test/ui-automation/fixtures/test-data.js | 1 - 1 file changed, 1 deletion(-) 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 11c228de0bc..ac316a6682a 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 } ] From a6c1ef50566c6af4329e49e1432f276e2e3f1ddd Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 4 Sep 2025 09:27:48 -0400 Subject: [PATCH 4/8] docs(wasm-sdk): add TODO comments for unused result_type parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add documentation for unused _result_type parameters in voting queries: - Document proper protobuf enum mapping for future implementation - Explain current incorrect logic using allow_include_locked_and_abstaining_vote_tally - Add GitHub issue placeholder for tracking implementation 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- packages/wasm-sdk/src/queries/voting.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/wasm-sdk/src/queries/voting.rs b/packages/wasm-sdk/src/queries/voting.rs index 8feced2e395..f26d32640e5 100644 --- a/packages/wasm-sdk/src/queries/voting.rs +++ b/packages/wasm-sdk/src/queries/voting.rs @@ -348,6 +348,12 @@ pub async fn get_contested_resource_vote_state_with_proof_info( document_type_name: &str, index_name: &str, index_values: Vec, + // 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, @@ -408,6 +414,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, @@ -703,6 +711,12 @@ pub async fn get_contested_resource_vote_state( document_type_name: &str, index_name: &str, index_values: Vec, + // 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, @@ -761,6 +775,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, From fbbdf046be94d3ff45a01dd8d3f7fd1494f51e1c Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 4 Sep 2025 09:39:12 -0400 Subject: [PATCH 5/8] fix(wasm-sdk): remove unused parameters from get_contested_resources functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unused _result_type and _allow_include_locked_and_abstaining_vote_tally parameters from both get_contested_resources and get_contested_resources_with_proof_info functions as these fields do not exist in the GetContestedResourcesRequest protobuf. This fixes build warnings and aligns function signatures with the actual protobuf schema. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- packages/wasm-sdk/src/queries/voting.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/wasm-sdk/src/queries/voting.rs b/packages/wasm-sdk/src/queries/voting.rs index f26d32640e5..6246779f282 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,8 +257,6 @@ 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, From c5e4c97e55003dc93ea55677930e99034f7030c6 Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 4 Sep 2025 09:42:13 -0400 Subject: [PATCH 6/8] docs(wasm-sdk): update documentation for get_contested_resources parameter removal Update API documentation, examples, and definitions to reflect the removal of unused _result_type and _allow_include_locked_and_abstaining_vote_tally parameters from get_contested_resources functions. --- packages/wasm-sdk/AI_REFERENCE.md | 4 +--- packages/wasm-sdk/api-definitions.json | 12 ------------ packages/wasm-sdk/docs.html | 12 +----------- packages/wasm-sdk/docs_manifest.json | 2 +- packages/wasm-sdk/index.html | 4 ---- 5 files changed, 3 insertions(+), 31 deletions(-) diff --git a/packages/wasm-sdk/AI_REFERENCE.md b/packages/wasm-sdk/AI_REFERENCE.md index 6f384c7c0a2..3f6ac67fa68 100644 --- a/packages/wasm-sdk/AI_REFERENCE.md +++ b/packages/wasm-sdk/AI_REFERENCE.md @@ -356,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 @@ -365,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 ad9c5b5f762..5fb98c8e9a9 100644 --- a/packages/wasm-sdk/api-definitions.json +++ b/packages/wasm-sdk/api-definitions.json @@ -529,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 cd3abaef97f..910afb66bd2 100644 --- a/packages/wasm-sdk/docs.html +++ b/packages/wasm-sdk/docs.html @@ -1144,16 +1144,6 @@
Parameters:
text (required) -
- Result Type - text - (required) -
-
- Allow Include Locked and Abstaining Vote Tally - checkbox - (optional) -
Start At Value text @@ -1179,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 0179e725533..2d8c69f70ff 100644 --- a/packages/wasm-sdk/docs_manifest.json +++ b/packages/wasm-sdk/docs_manifest.json @@ -1,5 +1,5 @@ { - "generated_at": "2025-09-03T21:48:17.677576+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 9b9a48f6990..91759582d03 100644 --- a/packages/wasm-sdk/index.html +++ b/packages/wasm-sdk/index.html @@ -2774,8 +2774,6 @@

Results

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

Results

values.documentTypeName, values.dataContractId, values.indexName, - values.resultType, - values.allowIncludeLockedAndAbstainingVoteTally, startAtValue, values.limit, values.offset, From 887ccb1a3fe92d9bd9e75056fa98881651c4a5bd Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 4 Sep 2025 09:47:46 -0400 Subject: [PATCH 7/8] chore: whitespace cleanup --- packages/wasm-sdk/src/queries/token.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/wasm-sdk/src/queries/token.rs b/packages/wasm-sdk/src/queries/token.rs index 91c795c01e9..a754b5a4240 100644 --- a/packages/wasm-sdk/src/queries/token.rs +++ b/packages/wasm-sdk/src/queries/token.rs @@ -526,9 +526,6 @@ pub async fn get_token_perpetual_distribution_last_claim( token_id: &str, ) -> Result { - - - // Parse IDs let identity_identifier = Identifier::from_string( identity_id, @@ -709,7 +706,6 @@ pub async fn get_identities_token_balances_with_proof_info( ) -> Result { use dash_sdk::platform::tokens::identity_token_balances::IdentitiesTokenBalancesQuery; - // Parse token ID let token_identifier = Identifier::from_string( token_id, @@ -772,7 +768,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 { - // Parse token IDs let tokens: Result, _> = token_ids .iter() From 167655463c1dac7c97fb7140c5f5f47a9bece3e6 Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 4 Sep 2025 10:25:41 -0400 Subject: [PATCH 8/8] test: remove extra fields from getContestedResources test data --- packages/wasm-sdk/test/ui-automation/fixtures/test-data.js | 2 -- 1 file changed, 2 deletions(-) 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 ac316a6682a..1aa7a0adda9 100644 --- a/packages/wasm-sdk/test/ui-automation/fixtures/test-data.js +++ b/packages/wasm-sdk/test/ui-automation/fixtures/test-data.js @@ -401,8 +401,6 @@ const testData = { documentTypeName: "domain", dataContractId: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec", indexName: "parentNameAndLabel", - resultType: "documents", - allowIncludeLockedAndAbstainingVoteTally: false, limit: 10, offset: 0, orderAscending: true