From 472f72f8cb47c90c62890764916ab876600b615e Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Fri, 15 Nov 2024 11:26:21 -0800 Subject: [PATCH 1/4] chore: add rust-toolchain.toml files --- dash-sdk-android/src/main/rust/rust-toolchain.toml | 3 +++ dash-sdk-bindings/rust-toolchain.toml | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 dash-sdk-android/src/main/rust/rust-toolchain.toml create mode 100644 dash-sdk-bindings/rust-toolchain.toml diff --git a/dash-sdk-android/src/main/rust/rust-toolchain.toml b/dash-sdk-android/src/main/rust/rust-toolchain.toml new file mode 100644 index 0000000..484302d --- /dev/null +++ b/dash-sdk-android/src/main/rust/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +# Rust version the same as in /README.md +channel = "nightly-2024-06-01" diff --git a/dash-sdk-bindings/rust-toolchain.toml b/dash-sdk-bindings/rust-toolchain.toml new file mode 100644 index 0000000..0ca7a32 --- /dev/null +++ b/dash-sdk-bindings/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +# Rust version the same as in /README.md +channel = "1.80" From 837646030b9e43667437e7a0310dfb7f93d0fdcf Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 19 Nov 2024 13:04:03 -0800 Subject: [PATCH 2/4] feat: update to platform SDK v1.5.1 --- build.gradle | 2 +- dash-sdk-java/src/main/swig/vote.i | 2 +- .../dashj/platform/dpp/voting/Contenders.kt | 13 ++-- .../org/dashj/platform/sdk/platform/Names.kt | 2 + platform-mobile/src/config.rs | 65 ++++++++++++++----- platform-mobile/src/core.rs | 4 +- platform-mobile/src/custom.rs | 2 +- platform-mobile/src/fetch_document.rs | 6 +- platform-mobile/src/put.rs | 16 ++++- platform-mobile/src/voting.rs | 8 +-- 10 files changed, 79 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index ecde539..07bec04 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.version = '1.3.1-SNAPSHOT' + ext.version = '1.5.1-SNAPSHOT' ext.kotlin_version = '1.8.22' ext.dashj_version = '21.1.0' repositories { diff --git a/dash-sdk-java/src/main/swig/vote.i b/dash-sdk-java/src/main/swig/vote.i index 762d5e2..a7e8049 100644 --- a/dash-sdk-java/src/main/swig/vote.i +++ b/dash-sdk-java/src/main/swig/vote.i @@ -114,7 +114,7 @@ END_CLASS(); %ignore drive_proof_verifier_types_ContestedResource::value; START_CLASS(ContestedResource, drive_proof_verifier_types_ContestedResource); platform_value_Value * getValue() { - return $self->value._0; + return $self->_0; } END_CLASS(); diff --git a/dpp/src/main/java/org/dashj/platform/dpp/voting/Contenders.kt b/dpp/src/main/java/org/dashj/platform/dpp/voting/Contenders.kt index a706b23..9638b60 100644 --- a/dpp/src/main/java/org/dashj/platform/dpp/voting/Contenders.kt +++ b/dpp/src/main/java/org/dashj/platform/dpp/voting/Contenders.kt @@ -2,7 +2,7 @@ package org.dashj.platform.dpp.voting import org.dashj.platform.dpp.identifier.Identifier import org.dashj.platform.dpp.identifier.RustIdentifier -import org.dashj.platform.dpp.util.convertPlatformValue +import org.dashj.platform.sdk.PlatformValue import org.dashj.platform.sdk.TupleContestedDocumentVotePollWinnerInfoBlockInfo import java.util.* @@ -82,16 +82,11 @@ class Contenders(val winner: Optional { - convertPlatformValue(contestedResource.value) - } - else -> error("${contestedResource.tag} not supported") - } +private fun convertContestedResource(contestedResource: RustContestedResource): PlatformValue { + return contestedResource.value } -class ContestedResource(val value: Any?) { +class ContestedResource(val value: PlatformValue) { constructor(contestedResource: RustContestedResource) : this( convertContestedResource(contestedResource) ) diff --git a/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt b/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt index f730477..8b98266 100644 --- a/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt +++ b/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt @@ -19,9 +19,11 @@ import org.dashj.platform.dpp.identity.Identity import org.dashj.platform.dpp.identity.IdentityPublicKey import org.dashj.platform.dpp.util.Entropy import org.dashj.platform.dpp.voting.Contenders +import org.dashj.platform.dpp.voting.ContestedDocumentResourceVotePoll import org.dashj.platform.dpp.voting.ResourceVoteChoice import org.dashj.platform.dpp.voting.Vote import org.dashj.platform.dpp.voting.VotePoll +import org.dashj.platform.sdk.PlatformValue import org.dashj.platform.sdk.callbacks.Signer import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/platform-mobile/src/config.rs b/platform-mobile/src/config.rs index 8f1014d..f06af7f 100644 --- a/platform-mobile/src/config.rs +++ b/platform-mobile/src/config.rs @@ -10,6 +10,8 @@ use drive_proof_verifier::ContextProvider; use drive_proof_verifier::error::ContextProviderError; use serde::Deserialize; use std::collections::BTreeMap; +use std::time::Duration; +use rs_dapi_client::Address; use lazy_static::lazy_static; use parking_lot::Mutex; @@ -17,7 +19,7 @@ use dash_sdk::mock::provider::GrpcContextProvider; use dash_sdk::{RequestSettings, Sdk}; use dpp::data_contract::accessors::v0::DataContractV0Getters; use ferment_interfaces::{boxed, unbox_any}; -use http::Uri; +use dash_sdk::sdk::Uri; use tokio::runtime::{Builder, Runtime}; use crate::logs::setup_logs; use crate::provider::{Cache, CallbackContextProvider}; @@ -225,28 +227,35 @@ impl Config { } else { MAINNET_ADDRESS_LIST.as_slice() }; + tracing::info!("white_list {:?}", white_list); + + // Step 1: Create an iterator of formatted URI strings + let uris_as_strings = white_list.iter().map(|host| { + format!("{}://{}:{}", scheme, host, self.platform_port) + }); + tracing::info!("uris_as_strings {:?}", uris_as_strings); + + let mut uris: Vec
= Vec::new(); + for uri_str in uris_as_strings { + match Uri::from_str(&uri_str) { + Ok(uri) => { + uris.push(uri.try_into().unwrap()); + }, + Err(e) => tracing::warn!("error parsing address: {}", e), // Return early if any URI fails to parse + } + } - let uris: Result, http::uri::InvalidUri> = if white_list.is_empty() { - tracing::info!("default address list is empty"); - let address = format!("{}://{}:{}", scheme, self.platform_host, self.platform_port); - vec![http::Uri::from_str(&address)].into_iter().collect() - } else { - white_list.iter().map(|host| { - let uri = format!("{}://{}:{}", scheme, host, self.platform_port); - http::Uri::from_str(&uri) - }).collect() - }; - - uris.map(AddressList::from_iter).expect("valid address list") + let address_list = AddressList::from_iter(uris); + tracing::info!("address_list: {:?}", address_list); + address_list } pub fn new_address_list(&self, address_list: Vec) -> AddressList { tracing::info!("new_address_list: {}", address_list.len()); let scheme = if self.platform_ssl { "https" } else { "http" }; - let uris: Vec = address_list.into_iter().map(|host| { + let uris: Vec
= address_list.into_iter().map(|host| { let uri = format!("{}://{}:{}", scheme, host, self.platform_port); - tracing::info!("new_address: {}", host); - Uri::from_str(&uri).expect("valid address list") + Uri::from_str(&uri).expect("valid address list").try_into().unwrap() }).collect(); AddressList::from_iter(uris) @@ -320,8 +329,20 @@ impl Config { q: u64, d: u64, data_contract_cache: Arc>, + connect_timeout: usize, + timeout: usize, + retries: usize ) -> Arc { let mut context_provider = CallbackContextProvider::new( + context_provider_context, + q, + d, + None, + data_contract_cache.clone(), + NonZeroUsize::new(100).expect("Non Zero") + ).expect("context provider"); + + let context_provider_clone = CallbackContextProvider::new( context_provider_context, q, d, @@ -329,9 +350,19 @@ impl Config { data_contract_cache, NonZeroUsize::new(100).expect("Non Zero") ).expect("context provider"); + let mut sdk = { // Dump all traffic to disk - let builder = dash_sdk::SdkBuilder::new(self.address_list()); + let builder = dash_sdk::SdkBuilder::new(self.address_list()) + .with_settings( + RequestSettings { + connect_timeout: Some(Duration::from_secs(connect_timeout as u64)), + timeout: Some(Duration::from_secs(timeout as u64)), + retries: Some(retries), + ban_failed_address: Some(true), + } + ) + .with_context_provider(context_provider_clone); builder.build().expect("cannot initialize api") }; // not ideal because context provider has a clone of the sdk diff --git a/platform-mobile/src/core.rs b/platform-mobile/src/core.rs index 1a2f607..0b2201f 100644 --- a/platform-mobile/src/core.rs +++ b/platform-mobile/src/core.rs @@ -29,7 +29,7 @@ pub fn get_transaction(txid: [u8; 32], quorum_public_key_callback: u64, data_con ) .await; match tx_info_result { - Ok(tx_info) => Ok(tx_info.transaction), + Ok(tx_info) => Ok(tx_info.inner.transaction), Err(error) => return Err(error.to_string()) } }) @@ -53,7 +53,7 @@ pub fn get_transaction_sdk(rust_sdk: * mut DashSdk, txid: [u8; 32]) -> Result Ok(tx_info.transaction), + Ok(tx_info) => Ok(tx_info.inner.transaction), Err(error) => return Err(error.to_string()) } }) diff --git a/platform-mobile/src/custom.rs b/platform-mobile/src/custom.rs index f8f8bbf..342f08a 100644 --- a/platform-mobile/src/custom.rs +++ b/platform-mobile/src/custom.rs @@ -3,7 +3,7 @@ use dashcore::secp256k1::ThirtyTwoByteHash; #[allow(non_camel_case_types)] #[repr(C)] -#[ferment_macro::register(dashcore::blockdata::transaction::OutPoint)] +#[ferment_macro::register(dashcore::blockdata::transaction::outpoint::OutPoint)] #[derive(Clone)] pub struct OutPoint { pub txid: *mut [u8; 32], diff --git a/platform-mobile/src/fetch_document.rs b/platform-mobile/src/fetch_document.rs index de757cf..7bb94d2 100644 --- a/platform-mobile/src/fetch_document.rs +++ b/platform-mobile/src/fetch_document.rs @@ -22,7 +22,7 @@ use dpp::version::LATEST_PLATFORM_VERSION; use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use crate::provider::Cache; - +use dash_sdk::query_types::IndexMap; #[ferment_macro::export] pub fn document_to_string(document: Document)-> String { document.to_string() @@ -52,7 +52,7 @@ fn fetch_documents_with_retry( ) -> BoxFuture<'static, Result> { // Clone the Arc here to ensure it's owned by the future Box::pin(async move { - match Document::fetch_many_with_settings(&sdk, query.clone(), request_settings).await { + match Document::fetch_many(&sdk, query.clone()).await { Ok(documents) => Ok(documents), Err(error) => { if retries_left > 1 { @@ -125,7 +125,7 @@ pub fn fetch_documents_with_query_and_sdk( let data_contract_cache = unsafe { (*rust_sdk).data_contract_cache.clone() }; match fetch_documents_with_retry(sdk.clone(), data_contract_cache, all_docs_query, settings, extra_retries).await { Ok(docs) => { - let into_vec = |map: BTreeMap>| { + let into_vec = |map: IndexMap>| { map.into_iter() .filter_map(|(_key, value)| value) .collect::>() diff --git a/platform-mobile/src/put.rs b/platform-mobile/src/put.rs index 283b8e3..d5e40c3 100644 --- a/platform-mobile/src/put.rs +++ b/platform-mobile/src/put.rs @@ -16,7 +16,6 @@ use dashcore::key::Secp256k1; use dashcore::secp256k1::{Message, SecretKey}; use dashcore::signer::sign; use dpp::bincode::{Decode, Encode}; -use dashcore::blockdata::transaction::OutPoint; use dpp::dashcore::{InstantLock, Network, PrivateKey, Transaction, Txid}; use dpp::dashcore::bls_sig_utils::BLSSignature; use dpp::dashcore::consensus::Decodable; @@ -55,6 +54,7 @@ use crate::logs::setup_logs; use crate::provider::Cache; use dapi_grpc::platform::v0::{StateTransitionBroadcastError, WaitForStateTransitionResultResponse}; use dapi_grpc::platform::v0::wait_for_state_transition_result_response::{Version, wait_for_state_transition_result_response_v0}; +use dashcore::blockdata::transaction::outpoint::OutPoint; use dash_sdk::platform::transition::top_up_identity::TopUpIdentity; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::state_transition::StateTransition; @@ -238,6 +238,11 @@ impl Signer for CallbackSigner { Err(ProtocolError::InvalidSigningKeyTypeError("something is wrong. signer callback returned 0".to_string())) // Assuming there is a way to convert to ProtocolError } } + + // todo: add a new call back to the client? + fn can_sign_with(&self, identity_public_key: &IdentityPublicKey) -> bool { + true + } } #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)] @@ -287,7 +292,7 @@ pub struct ChainAssetLockProofFFI { /// Core height on which the asset lock transaction was chain locked or higher pub core_chain_locked_height: u32, /// A reference to Asset Lock Special Transaction ID and output index in the payload - pub out_point: OutPoint, + pub out_point: dashcore::blockdata::transaction::outpoint::OutPoint, } #[allow(non_snake_case)] @@ -296,11 +301,16 @@ pub fn ChainAssetLockProofFFI_clone(a: ChainAssetLockProofFFI) -> ChainAssetLock a.clone() } +use dashcore_hashes::Hash as dashcore_hashes_hash; impl From for ChainAssetLockProof { fn from(value: ChainAssetLockProofFFI) -> Self { + let outpoint = dpp::dashcore::OutPoint { + txid: Txid::from_hex(value.out_point.txid.to_hex().as_str()).unwrap(), + vout: value.out_point.vout, + }; ChainAssetLockProof { core_chain_locked_height: value.core_chain_locked_height, - out_point: value.out_point.into(), + out_point: outpoint } } } diff --git a/platform-mobile/src/voting.rs b/platform-mobile/src/voting.rs index b87a6b8..d4b4131 100644 --- a/platform-mobile/src/voting.rs +++ b/platform-mobile/src/voting.rs @@ -233,7 +233,7 @@ pub fn get_vote_contenders( ContestedDocumentVotePollDriveQueryResultType::DocumentsAndVoteTally, }; let settings = unsafe { (*rust_sdk).get_request_settings() }; - match ContenderWithSerializedDocument::fetch_many_with_settings(&sdk, query.clone(), settings).await { + match ContenderWithSerializedDocument::fetch_many(&sdk, query.clone()).await { Ok(contenders) => Ok(contenders), Err(e) => Err(e.to_string()) } @@ -303,7 +303,7 @@ pub fn get_contested_resources( tracing::info!("get_contested_resources: query ContestedResources for {:?}", query); let settings = unsafe { (*rust_sdk).get_request_settings() }; - let contested_resources = ContestedResource::fetch_many_with_settings(&sdk, query, settings).await; + let contested_resources = ContestedResource::fetch_many(&sdk, query).await; match contested_resources { Ok(resources) => Ok(resources), @@ -422,7 +422,7 @@ pub fn get_votepolls( order_ascending: true, }; - match VotePoll::fetch_many_with_settings(&sdk, query.clone(), settings).await { + match VotePoll::fetch_many(&sdk, query.clone()).await { Ok(votes) => { tracing::info!("get_vote_polls: {}", votes.0.len()); Ok(votes) @@ -508,7 +508,7 @@ pub fn get_last_vote_from_masternode( }.unique_id().unwrap(), }; - match ResourceVote::fetch_many_with_settings(&sdk, query.clone(), settings).await { + match ResourceVote::fetch_many(&sdk, query.clone()).await { Ok(votes) => Ok(votes), Err(e) => Err(e.to_string()) } From bb6b490bd7f90050e2eec03f58c9615821131c58 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 19 Nov 2024 13:05:55 -0800 Subject: [PATCH 3/4] feat: allow paging on getContestedResources --- .../java/org/dashj/platform/sdk/VoteTest.java | 5 +- .../dashj/platform/dapiclient/DapiClient.kt | 13 +++- .../org/dashj/platform/sdk/platform/Names.kt | 64 +++++++++++++++++-- .../dashj/org/platform/PlatformExplorer.kt | 23 ++++++- platform-mobile/src/sdk.rs | 5 +- platform-mobile/src/voting.rs | 13 +++- 6 files changed, 110 insertions(+), 13 deletions(-) diff --git a/dash-sdk-java/src/test/java/org/dashj/platform/sdk/VoteTest.java b/dash-sdk-java/src/test/java/org/dashj/platform/sdk/VoteTest.java index 003d500..b5839d9 100644 --- a/dash-sdk-java/src/test/java/org/dashj/platform/sdk/VoteTest.java +++ b/dash-sdk-java/src/test/java/org/dashj/platform/sdk/VoteTest.java @@ -114,7 +114,10 @@ public void getContestedResources() throws Exception { Result result = dashsdk.platformMobileVotingGetContestedResources( sdk, "domain", - new Identifier(dpnsContractId) + new Identifier(dpnsContractId), + 100, + null, + false ); ContestedResources contestedResources = result.unwrap(); assertNotNull(contestedResources); diff --git a/dpp/src/main/java/org/dashj/platform/dapiclient/DapiClient.kt b/dpp/src/main/java/org/dashj/platform/dapiclient/DapiClient.kt index 557c17a..2743ed5 100644 --- a/dpp/src/main/java/org/dashj/platform/dapiclient/DapiClient.kt +++ b/dpp/src/main/java/org/dashj/platform/dapiclient/DapiClient.kt @@ -1076,11 +1076,20 @@ class DapiClient( return Contenders(result.unwrap()) } - fun getContestedResources(dataContractId: Identifier, documentType: String): ContestedResources { + fun getContestedResources( + dataContractId: Identifier, + documentType: String, + limit: Int = 100, + startAt: PlatformValue? = null, + startAtInclude: Boolean = false + ): ContestedResources { val result = dashsdk.platformMobileVotingGetContestedResources( rustSdk, documentType, - dataContractId.toNative() + dataContractId.toNative(), + limit, + startAt, + startAtInclude ) return ContestedResources(result.unwrap()) } diff --git a/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt b/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt index 8b98266..41cf664 100644 --- a/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt +++ b/dpp/src/main/java/org/dashj/platform/sdk/platform/Names.kt @@ -42,6 +42,7 @@ class Names(val platform: Platform) { const val DPNS_PREORDER_DOCUMENT = "dpns.preorder" const val CONTESTED_INDEX = "parentNameAndLabel" const val SALTEDDOMAINHASH_KEY = "saltedDomainHash" + const val MAX_LIMIT = 100 fun isUniqueIdentity(domainDocument: Document): Boolean { val records = domainDocument.data["records"] as Map<*, *> @@ -385,10 +386,9 @@ class Names(val platform: Platform) { ) return if (resources.list.isNotEmpty()) { resources.list.map { - if (it.value is String) { - it.value - } else { - error("${it.value} is not a String") + when (it.value.tag) { + PlatformValue.Tag.Text -> it.value.text + else -> error("${it.value} is not a PlatformValue.Text") } } } else { @@ -396,6 +396,62 @@ class Names(val platform: Platform) { } } + fun getAllContestedNames(): List { + var count = 0 + var startAt: PlatformValue? = null + val startAtInclude = false + val results = arrayListOf() + do { + val resources = platform.client.getContestedResources( + platform.apps[DPNS_DATA_CONTRACT]!!.contractId, + DOMAIN_DOCUMENT, + MAX_LIMIT, + startAt, + startAtInclude + ) + val nextList = if (resources.list.isNotEmpty()) { + resources.list.map { + when (it.value.tag) { + PlatformValue.Tag.Text -> it.value.text + else -> error("${it.value} is not a PlatformValue.Text") + } + } + } else { + listOf() + } + count = nextList.size + results.addAll(nextList) + startAt = resources.list.lastOrNull()?.value + } while(count != 100) + + return results + } + + fun getCurrentlyContestedNames(): List { + val resources = arrayListOf() + getCurrentVotePolls().forEach { + when (it) { + is ContestedDocumentResourceVotePoll -> { + if (it.dataContractId == SystemIds.dpnsDataContractId && + it.indexName == CONTESTED_INDEX && + it.indexValues.get(0) == DEFAULT_PARENT_DOMAIN) { + when (val normalizedLabelValue = it.indexValues[1]) { + is PlatformValue -> { + if (normalizedLabelValue.tag == PlatformValue.Tag.Text) { + resources.add(normalizedLabelValue.text) + } + } + is String -> resources.add(normalizedLabelValue) + else -> error("invalid type") + } + } + } + else -> {} + } + } + return resources + } + fun deserialize(bytes: ByteArray): Document { return platform.documents.deserialize( bytes, diff --git a/examples/src/main/kotlin/dashj/org/platform/PlatformExplorer.kt b/examples/src/main/kotlin/dashj/org/platform/PlatformExplorer.kt index 750bcb2..5de7043 100644 --- a/examples/src/main/kotlin/dashj/org/platform/PlatformExplorer.kt +++ b/examples/src/main/kotlin/dashj/org/platform/PlatformExplorer.kt @@ -470,7 +470,7 @@ object PlatformExplorer { //val result = dashsdk.platformMobilePutPutIdentityCreate(identity, BigInteger.valueOf(signer.signerCallback)) //print(result) } - "9" -> { + "9a" -> { val dpnsContractId = byteArrayOf( 230.toByte(), 104, @@ -511,13 +511,32 @@ object PlatformExplorer { val result = dashsdk.platformMobileVotingGetContestedResources( sdk, "domain", - Identifier(dpnsContractId) + Identifier(dpnsContractId), + 100, + null, + false ) val contestedResources = result.unwrap() val list = contestedResources._0 + println("${list.size} contested resources: ") for (item in list) { println(item.value.text) } + + val result2 = dashsdk.platformMobileVotingGetContestedResources( + sdk, + "domain", + Identifier(dpnsContractId), + 100, + contestedResources._0.lastOrNull()?._0, + false + ) + val contestedResources2 = result2.unwrap() + val list2 = contestedResources2._0 + println("${list2.size} contested resources: ") + for (item in list2) { + println(item.value.text) + } } "11" -> { println("Enter an name:") diff --git a/platform-mobile/src/sdk.rs b/platform-mobile/src/sdk.rs index 3e376b6..0d07339 100644 --- a/platform-mobile/src/sdk.rs +++ b/platform-mobile/src/sdk.rs @@ -149,7 +149,10 @@ pub fn create_dash_sdk_with_context( context_provider_context.clone(), quorum_public_key_callback, data_contract_callback, - data_contract_cache.clone() + data_contract_cache.clone(), + connect_timeout, + timeout, + retries ).await } else { // use Dash Core for quorum public keys diff --git a/platform-mobile/src/voting.rs b/platform-mobile/src/voting.rs index d4b4131..560e04b 100644 --- a/platform-mobile/src/voting.rs +++ b/platform-mobile/src/voting.rs @@ -249,7 +249,10 @@ pub fn get_vote_contenders( pub fn get_contested_resources( rust_sdk: * mut DashSdk, document_type_name: String, - data_contract_id: Identifier + data_contract_id: Identifier, + limit: u16, + start_at: Option, + start_at_include: bool ) -> Result{ let rt = unsafe { (*rust_sdk).get_runtime() }; @@ -288,16 +291,20 @@ pub fn get_contested_resources( Ok(dt) => dt, Err(e) => return Err(e.to_string()) }; + let start_at_value = match start_at { + Some(start_at) => Some((start_at, start_at_include)), + None => None + }; if let Some(contested_index) = document_type.find_contested_index() { let query = VotePollsByDocumentTypeQuery { contract_id: data_contract.id(), document_type_name: document_type.name().to_string(), index_name: contested_index.name.clone(), - start_at_value: None, + start_at_value: start_at_value, start_index_values: vec!["dash".into()], // hardcoded for dpns end_index_values: vec![], - limit: None, + limit: Some(limit), order_ascending: true, }; From 509d33b2295f78e94deed1e648fec8985ca3903e Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 19 Nov 2024 13:06:23 -0800 Subject: [PATCH 4/4] chore: update Cargo.lock files --- dash-sdk-android/src/main/rust/Cargo.lock | 689 +++++++++++---------- dash-sdk-bindings/Cargo.lock | 679 +++++++++++---------- platform-mobile/Cargo.lock | 695 ++++++++++++---------- platform-mobile/Cargo.toml | 1 + 4 files changed, 1106 insertions(+), 958 deletions(-) diff --git a/dash-sdk-android/src/main/rust/Cargo.lock b/dash-sdk-android/src/main/rust/Cargo.lock index f1a6fac..df5bc0e 100644 --- a/dash-sdk-android/src/main/rust/Cargo.lock +++ b/dash-sdk-android/src/main/rust/Cargo.lock @@ -221,18 +221,17 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -241,7 +240,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 0.1.2", + "sync_wrapper", "tower", "tower-layer", "tower-service", @@ -249,30 +248,32 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", ] [[package]] name = "backon" -version = "0.4.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" +checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" dependencies = [ "fastrand", - "futures-core", - "pin-project", + "gloo-timers", "tokio", ] @@ -353,7 +354,7 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.22", + "prettyplease", "proc-macro2", "quote", "regex", @@ -388,6 +389,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + [[package]] name = "bitcoin-private" version = "0.1.0" @@ -403,6 +410,16 @@ dependencies = [ "bitcoin-private", ] +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -494,12 +511,6 @@ dependencies = [ "syn_derive", ] -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - [[package]] name = "bs58" version = "0.5.1" @@ -816,23 +827,23 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "dapi-grpc-macros", "futures-core", "platform-version", - "prost 0.12.6", + "prost 0.13.3", "serde", "serde_bytes", "serde_json", "tenderdash-proto", - "tonic", - "tonic-build 0.9.2", + "tonic 0.12.3", + "tonic-build", ] [[package]] name = "dapi-grpc-macros" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "heck 0.5.0", "quote", @@ -876,16 +887,18 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "arc-swap", "async-trait", + "backon", "bip37-bloom-filter", + "chrono", "ciborium", "dapi-grpc", "dapi-grpc-macros", - "dashcore-rpc", - "derive_more", + "dashcore-rpc 0.15.8", + "derive_more 1.0.0", "dotenvy", "dpp", "drive", @@ -895,7 +908,7 @@ dependencies = [ "ferment-macro", "futures", "hex", - "http 0.2.12", + "http 1.1.0", "lru", "pollster", "rs-dapi-client", @@ -905,6 +918,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", + "zeroize", ] [[package]] @@ -913,7 +927,7 @@ version = "1.0.0" dependencies = [ "cbindgen", "dash-sdk", - "dashcore", + "dashcore 0.30.0", "dpp", "drive", "drive-proof-verifier", @@ -931,27 +945,74 @@ source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac dependencies = [ "anyhow", "bech32", - "dashcore-private", - "dashcore_hashes", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", + "dashcore_hashes 0.12.0", + "hex", + "hex_lit", + "rustversion", + "secp256k1 0.27.0", + "serde", +] + +[[package]] +name = "dashcore" +version = "0.32.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" +dependencies = [ + "anyhow", + "bech32", + "bitflags 2.6.0", + "bls-signatures", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "dashcore_hashes 0.14.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "ed25519-dalek", "hex", "hex_lit", + "lazy_static", "rustversion", - "secp256k1", + "secp256k1 0.30.0", "serde", + "serde_repr", + "strum", ] +[[package]] +name = "dashcore-private" +version = "0.1.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" + [[package]] name = "dashcore-private" version = "0.1.0" source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" +[[package]] +name = "dashcore-private" +version = "0.1.0" +source = "git+https://github.com/dashpay/rust-dashcore#db9ad0df2baded4ca478663013f823491bddcd7c" + [[package]] name = "dashcore-rpc" version = "0.15.2" source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.4#bd6efdb850151f1dcd8e3f38d4796d18c5be518c" dependencies = [ - "dashcore-private", - "dashcore-rpc-json", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", + "dashcore-rpc-json 0.15.2", + "env_logger 0.10.2", + "hex", + "jsonrpc", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "dashcore-rpc" +version = "0.15.8" +source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.8#4d4d5b1488daa7f083d254a1f5acf03b550d5b10" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "dashcore-rpc-json 0.15.8", "env_logger 0.10.2", "hex", "jsonrpc", @@ -966,7 +1027,21 @@ version = "0.15.2" source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.4#bd6efdb850151f1dcd8e3f38d4796d18c5be518c" dependencies = [ "bincode", - "dashcore", + "dashcore 0.30.0", + "hex", + "serde", + "serde_json", + "serde_repr", + "serde_with", +] + +[[package]] +name = "dashcore-rpc-json" +version = "0.15.8" +source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.8#4d4d5b1488daa7f083d254a1f5acf03b550d5b10" +dependencies = [ + "bincode", + "dashcore 0.32.0", "hex", "serde", "serde_json", @@ -979,15 +1054,34 @@ name = "dashcore_hashes" version = "0.12.0" source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" dependencies = [ - "dashcore-private", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", "rs-x11-hash", - "secp256k1", + "secp256k1 0.27.0", "serde", ] +[[package]] +name = "dashcore_hashes" +version = "0.14.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "secp256k1 0.30.0", + "serde", +] + +[[package]] +name = "dashcore_hashes" +version = "0.14.0" +source = "git+https://github.com/dashpay/rust-dashcore#db9ad0df2baded4ca478663013f823491bddcd7c" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore)", + "secp256k1 0.30.0", +] + [[package]] name = "dashpay-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -997,7 +1091,7 @@ dependencies = [ [[package]] name = "data-contracts" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1054,6 +1148,27 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -1083,7 +1198,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dpns-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -1093,35 +1208,33 @@ dependencies = [ [[package]] name = "dpp" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "anyhow", "async-trait", "base64 0.22.1", "bincode", - "bls-signatures", - "bs58 0.4.0", + "bs58", "byteorder", "chrono", "ciborium", - "dashcore", + "dashcore 0.32.0", "data-contracts", - "derive_more", - "ed25519-dalek", - "env_logger 0.9.3", + "derive_more 1.0.0", + "env_logger 0.11.5", "ferment-interfaces", "ferment-macro", "getrandom", "hex", "indexmap 2.6.0", "integer-encoding", - "itertools 0.12.1", + "itertools 0.13.0", "json-schema-compatibility-validator", "jsonschema", "lazy_static", "log", "nohash-hasher", - "num_enum", + "num_enum 0.7.3", "once_cell", "platform-serialization", "platform-serialization-derive", @@ -1142,11 +1255,11 @@ dependencies = [ [[package]] name = "drive" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "byteorder", - "derive_more", + "derive_more 1.0.0", "dpp", "ferment", "ferment-interfaces", @@ -1170,15 +1283,16 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "dapi-grpc", - "derive_more", + "derive_more 1.0.0", "dpp", "drive", "ferment-macro", "hex", + "indexmap 2.6.0", "platform-serialization", "platform-serialization-derive", "serde", @@ -1259,19 +1373,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -1364,7 +1465,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-flags-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -1614,6 +1715,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "grovedb" version = "2.1.0" @@ -1623,7 +1736,7 @@ dependencies = [ "bincode", "bitvec", "blake3", - "derive_more", + "derive_more 0.99.18", "grovedb-costs", "grovedb-merk", "grovedb-path", @@ -1707,25 +1820,6 @@ dependencies = [ "itertools 0.12.1", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -1813,6 +1907,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex-literal" version = "0.4.1" @@ -1892,11 +1995,11 @@ dependencies = [ [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 0.2.12", + "http 1.1.0", "serde", ] @@ -1918,30 +2021,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -1951,10 +2030,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2", "http 1.1.0", "http-body 1.0.1", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -1970,25 +2050,26 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper", "hyper-util", - "rustls 0.23.14", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 0.14.30", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -1999,7 +2080,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "native-tls", "tokio", @@ -2009,16 +2090,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2145,18 +2226,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -2189,7 +2270,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "json-patch", "once_cell", @@ -2308,7 +2389,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -2370,12 +2451,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "multimap" version = "0.10.0" @@ -2533,7 +2608,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive 0.7.3", ] [[package]] @@ -2548,6 +2632,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "object" version = "0.36.5" @@ -2751,8 +2847,9 @@ dependencies = [ "base64 0.13.1", "dapi-grpc", "dash-sdk", - "dashcore", - "dashcore-rpc", + "dashcore 0.30.0", + "dashcore-rpc 0.15.2", + "dashcore_hashes 0.14.0 (git+https://github.com/dashpay/rust-dashcore)", "dashpay-contract", "data-contracts", "dotenvy", @@ -2780,7 +2877,7 @@ dependencies = [ "simple-signer", "syn 2.0.79", "tokio", - "tonic", + "tonic 0.11.0", "tracing", "tracing-logcat", "tracing-subscriber", @@ -2788,7 +2885,7 @@ dependencies = [ [[package]] name = "platform-serialization" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "platform-version", @@ -2796,21 +2893,21 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "proc-macro2", "quote", "syn 2.0.79", - "virtue 0.0.14", + "virtue 0.0.17", ] [[package]] name = "platform-value" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "base64 0.22.1", "bincode", - "bs58 0.5.1", + "bs58", "cbindgen", "ciborium", "ferment", @@ -2831,7 +2928,7 @@ dependencies = [ [[package]] name = "platform-version" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "ferment-interfaces", @@ -2844,7 +2941,7 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "proc-macro2", "quote", @@ -2872,16 +2969,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "prettyplease" version = "0.2.22" @@ -2943,16 +3030,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -2960,47 +3037,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", ] [[package]] -name = "prost-build" -version = "0.11.9" +name = "prost" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap 0.8.3", - "petgraph", - "prettyplease 0.1.25", - "prost 0.11.9", - "prost-types 0.11.9", - "regex", - "syn 1.0.109", - "tempfile", - "which", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" dependencies = [ "bytes", "heck 0.5.0", - "itertools 0.12.1", + "itertools 0.13.0", "log", - "multimap 0.10.0", + "multimap", "once_cell", "petgraph", - "prettyplease 0.2.22", - "prost 0.12.6", - "prost-types 0.12.6", + "prettyplease", + "prost 0.13.3", + "prost-types", "regex", "syn 2.0.79", "tempfile", @@ -3008,25 +3072,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.79", @@ -3034,20 +3085,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.9" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.11.9", -] - -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", + "prost 0.13.3", ] [[package]] @@ -3198,11 +3240,11 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.6", + "h2", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-rustls", "hyper-tls", "hyper-util", @@ -3218,7 +3260,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -3276,7 +3318,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "backon", "chrono", @@ -3365,20 +3407,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.14" @@ -3396,9 +3424,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3481,9 +3509,21 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.12.0", "rand", - "secp256k1-sys", + "secp256k1-sys 0.8.1", + "serde", +] + +[[package]] +name = "secp256k1" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" +dependencies = [ + "bitcoin_hashes 0.14.0", + "rand", + "secp256k1-sys 0.10.1", "serde", ] @@ -3496,6 +3536,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -3670,11 +3719,11 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "base64 0.22.1", "bincode", - "dashcore-rpc", + "dashcore-rpc 0.15.8", "dpp", ] @@ -3742,20 +3791,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -3811,12 +3860,6 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -3880,13 +3923,12 @@ dependencies = [ [[package]] name = "tenderdash-abci" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1%2B1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "bytes", "hex", "lhash", - "prost 0.12.6", "semver", "serde_json", "tenderdash-proto", @@ -3897,33 +3939,33 @@ dependencies = [ [[package]] name = "tenderdash-proto" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1%2B1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "bytes", "chrono", - "derive_more", + "derive_more 1.0.0", "flex-error", "num-derive", "num-traits", - "prost 0.12.6", + "prost 0.13.3", "serde", "subtle-encoding", "tenderdash-proto-compiler", "time", - "tonic", + "tonic 0.12.3", ] [[package]] name = "tenderdash-proto-compiler" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1%2B1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "fs_extra", - "prost-build 0.12.6", + "prost-build", "regex", "tempfile", - "tonic-build 0.11.0", + "tonic-build", "ureq", "walkdir", "zip", @@ -4036,16 +4078,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -4067,24 +4099,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.14", + "rustls", "rustls-pki-types", "tokio", ] @@ -4156,54 +4177,65 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ - "async-stream", "async-trait", - "axum", "base64 0.21.7", "bytes", - "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", - "hyper-timeout", "percent-encoding", "pin-project", "prost 0.12.6", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", "tokio-stream", - "tower", "tower-layer", "tower-service", "tracing", - "webpki-roots", ] [[package]] -name = "tonic-build" -version = "0.9.2" +name = "tonic" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ - "prettyplease 0.1.25", - "proc-macro2", - "prost-build 0.11.9", - "quote", - "syn 1.0.109", + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.3", + "rustls-native-certs", + "rustls-pemfile", + "socket2", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", + "webpki-roots", ] [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ - "prettyplease 0.2.22", + "prettyplease", "proc-macro2", - "prost-build 0.12.6", + "prost-build", + "prost-types", "quote", "syn 2.0.79", ] @@ -4370,7 +4402,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.14", + "rustls", "rustls-pki-types", "url", "webpki-roots", @@ -4436,9 +4468,9 @@ checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" [[package]] name = "virtue" -version = "0.0.14" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b522f715ead3537dc57c9907899a08e461a8f1e87fc8414a4a89bbd9854289ff" +checksum = "7302ac74a033bf17b6e609ceec0f891ca9200d502d31f02dc7908d3d98767c9d" [[package]] name = "walkdir" @@ -4735,9 +4767,9 @@ dependencies = [ [[package]] name = "withdrawals-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ - "num_enum", + "num_enum 0.5.11", "platform-value", "platform-version", "serde", @@ -4781,6 +4813,21 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "serde", + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] [[package]] name = "zip" diff --git a/dash-sdk-bindings/Cargo.lock b/dash-sdk-bindings/Cargo.lock index 75bc7e9..09a390a 100644 --- a/dash-sdk-bindings/Cargo.lock +++ b/dash-sdk-bindings/Cargo.lock @@ -221,18 +221,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -241,7 +240,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 0.1.2", + "sync_wrapper", "tower", "tower-layer", "tower-service", @@ -249,30 +248,32 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", ] [[package]] name = "backon" -version = "0.4.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" +checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" dependencies = [ "fastrand", - "futures-core", - "pin-project", + "gloo-timers", "tokio", ] @@ -353,7 +354,7 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.20", + "prettyplease", "proc-macro2", "quote", "regex", @@ -388,6 +389,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + [[package]] name = "bitcoin-private" version = "0.1.0" @@ -403,6 +410,16 @@ dependencies = [ "bitcoin-private", ] +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -494,12 +511,6 @@ dependencies = [ "syn_derive", ] -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - [[package]] name = "bs58" version = "0.5.1" @@ -813,23 +824,23 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "dapi-grpc-macros", "futures-core", "platform-version", - "prost 0.12.6", + "prost 0.13.3", "serde", "serde_bytes", "serde_json", "tenderdash-proto", - "tonic", - "tonic-build 0.9.2", + "tonic 0.12.3", + "tonic-build", ] [[package]] name = "dapi-grpc-macros" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "heck 0.5.0", "quote", @@ -873,16 +884,18 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "arc-swap", "async-trait", + "backon", "bip37-bloom-filter", + "chrono", "ciborium", "dapi-grpc", "dapi-grpc-macros", - "dashcore-rpc", - "derive_more", + "dashcore-rpc 0.15.8", + "derive_more 1.0.0", "dotenvy", "dpp", "drive", @@ -892,7 +905,7 @@ dependencies = [ "ferment-macro", "futures", "hex", - "http 0.2.12", + "http 1.1.0", "lru", "pollster", "rs-dapi-client", @@ -902,6 +915,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", + "zeroize", ] [[package]] @@ -928,27 +942,74 @@ source = "git+https://github.com/dashpay/rust-dashcore?branch=master#a29315dbe56 dependencies = [ "anyhow", "bech32", - "dashcore-private", - "dashcore_hashes", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", + "dashcore_hashes 0.12.0", "hex", "hex_lit", "rustversion", - "secp256k1", + "secp256k1 0.27.0", "serde", ] +[[package]] +name = "dashcore" +version = "0.32.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" +dependencies = [ + "anyhow", + "bech32", + "bitflags 2.6.0", + "bls-signatures", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "dashcore_hashes 0.14.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "ed25519-dalek", + "hex", + "hex_lit", + "lazy_static", + "rustversion", + "secp256k1 0.30.0", + "serde", + "serde_repr", + "strum", +] + +[[package]] +name = "dashcore-private" +version = "0.1.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" + [[package]] name = "dashcore-private" version = "0.1.0" source = "git+https://github.com/dashpay/rust-dashcore?branch=master#a29315dbe56729be1be963fb6f7b60a22288663f" +[[package]] +name = "dashcore-private" +version = "0.1.0" +source = "git+https://github.com/dashpay/rust-dashcore#db9ad0df2baded4ca478663013f823491bddcd7c" + [[package]] name = "dashcore-rpc" version = "0.15.2" source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.4#bd6efdb850151f1dcd8e3f38d4796d18c5be518c" dependencies = [ - "dashcore-private", - "dashcore-rpc-json", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", + "dashcore-rpc-json 0.15.2", + "env_logger 0.10.2", + "hex", + "jsonrpc", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "dashcore-rpc" +version = "0.15.8" +source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.8#4d4d5b1488daa7f083d254a1f5acf03b550d5b10" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "dashcore-rpc-json 0.15.8", "env_logger 0.10.2", "hex", "jsonrpc", @@ -963,7 +1024,21 @@ version = "0.15.2" source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.4#bd6efdb850151f1dcd8e3f38d4796d18c5be518c" dependencies = [ "bincode", - "dashcore", + "dashcore 0.30.0", + "hex", + "serde", + "serde_json", + "serde_repr", + "serde_with", +] + +[[package]] +name = "dashcore-rpc-json" +version = "0.15.8" +source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.8#4d4d5b1488daa7f083d254a1f5acf03b550d5b10" +dependencies = [ + "bincode", + "dashcore 0.32.0", "hex", "serde", "serde_json", @@ -976,15 +1051,34 @@ name = "dashcore_hashes" version = "0.12.0" source = "git+https://github.com/dashpay/rust-dashcore?branch=master#a29315dbe56729be1be963fb6f7b60a22288663f" dependencies = [ - "dashcore-private", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", "rs-x11-hash", - "secp256k1", + "secp256k1 0.27.0", "serde", ] +[[package]] +name = "dashcore_hashes" +version = "0.14.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "secp256k1 0.30.0", + "serde", +] + +[[package]] +name = "dashcore_hashes" +version = "0.14.0" +source = "git+https://github.com/dashpay/rust-dashcore#db9ad0df2baded4ca478663013f823491bddcd7c" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore)", + "secp256k1 0.30.0", +] + [[package]] name = "dashpay-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -994,7 +1088,7 @@ dependencies = [ [[package]] name = "data-contracts" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1051,6 +1145,27 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -1080,7 +1195,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dpns-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -1090,35 +1205,33 @@ dependencies = [ [[package]] name = "dpp" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "anyhow", "async-trait", "base64 0.22.1", "bincode", - "bls-signatures", - "bs58 0.4.0", + "bs58", "byteorder", "chrono", "ciborium", - "dashcore", + "dashcore 0.32.0", "data-contracts", - "derive_more", - "ed25519-dalek", - "env_logger 0.9.3", + "derive_more 1.0.0", + "env_logger 0.11.5", "ferment-interfaces", "ferment-macro", "getrandom", "hex", "indexmap 2.6.0", "integer-encoding", - "itertools 0.12.1", + "itertools 0.13.0", "json-schema-compatibility-validator", "jsonschema", "lazy_static", "log", "nohash-hasher", - "num_enum", + "num_enum 0.7.3", "once_cell", "platform-serialization", "platform-serialization-derive", @@ -1139,11 +1252,11 @@ dependencies = [ [[package]] name = "drive" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "byteorder", - "derive_more", + "derive_more 1.0.0", "dpp", "ferment", "ferment-interfaces", @@ -1167,15 +1280,16 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "dapi-grpc", - "derive_more", + "derive_more 1.0.0", "dpp", "drive", "ferment-macro", "hex", + "indexmap 2.6.0", "platform-serialization", "platform-serialization-derive", "serde", @@ -1256,19 +1370,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -1361,7 +1462,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "feature-flags-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -1605,6 +1706,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "grovedb" version = "2.1.0" @@ -1614,7 +1727,7 @@ dependencies = [ "bincode", "bitvec", "blake3", - "derive_more", + "derive_more 0.99.18", "grovedb-costs", "grovedb-merk", "grovedb-path", @@ -1698,25 +1811,6 @@ dependencies = [ "itertools 0.12.1", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.5" @@ -1803,6 +1897,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex-literal" version = "0.4.1" @@ -1882,11 +1985,11 @@ dependencies = [ [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 0.2.12", + "http 1.1.0", "serde", ] @@ -1908,30 +2011,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -1941,10 +2020,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2", "http 1.1.0", "http-body 1.0.1", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -1960,25 +2040,26 @@ checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper", "hyper-util", - "rustls 0.23.12", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 0.14.31", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -1989,7 +2070,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "native-tls", "tokio", @@ -2008,7 +2089,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2135,18 +2216,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -2179,7 +2260,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "json-patch", "once_cell", @@ -2298,7 +2379,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -2360,12 +2441,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "multimap" version = "0.10.0" @@ -2523,7 +2598,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive 0.7.3", ] [[package]] @@ -2538,6 +2622,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "object" version = "0.36.3" @@ -2741,8 +2837,9 @@ dependencies = [ "base64 0.13.1", "dapi-grpc", "dash-sdk", - "dashcore", - "dashcore-rpc", + "dashcore 0.30.0", + "dashcore-rpc 0.15.2", + "dashcore_hashes 0.14.0 (git+https://github.com/dashpay/rust-dashcore)", "dashpay-contract", "data-contracts", "dotenvy", @@ -2770,7 +2867,7 @@ dependencies = [ "simple-signer", "syn 2.0.87", "tokio", - "tonic", + "tonic 0.11.0", "tracing", "tracing-logcat", "tracing-subscriber", @@ -2778,7 +2875,7 @@ dependencies = [ [[package]] name = "platform-serialization" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "platform-version", @@ -2786,21 +2883,21 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "proc-macro2", "quote", "syn 2.0.87", - "virtue 0.0.14", + "virtue 0.0.17", ] [[package]] name = "platform-value" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "base64 0.22.1", "bincode", - "bs58 0.5.1", + "bs58", "cbindgen", "ciborium", "ferment", @@ -2821,7 +2918,7 @@ dependencies = [ [[package]] name = "platform-version" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "ferment-interfaces", @@ -2834,7 +2931,7 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "proc-macro2", "quote", @@ -2862,16 +2959,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "prettyplease" version = "0.2.20" @@ -2933,16 +3020,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -2950,47 +3027,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", ] [[package]] -name = "prost-build" -version = "0.11.9" +name = "prost" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap 0.8.3", - "petgraph", - "prettyplease 0.1.25", - "prost 0.11.9", - "prost-types 0.11.9", - "regex", - "syn 1.0.109", - "tempfile", - "which", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" dependencies = [ "bytes", "heck 0.5.0", "itertools 0.12.1", "log", - "multimap 0.10.0", + "multimap", "once_cell", "petgraph", - "prettyplease 0.2.20", - "prost 0.12.6", - "prost-types 0.12.6", + "prettyplease", + "prost 0.13.3", + "prost-types", "regex", "syn 2.0.87", "tempfile", @@ -2998,22 +3062,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.12.1", @@ -3024,20 +3075,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - -[[package]] -name = "prost-types" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.12.6", + "prost 0.13.3", ] [[package]] @@ -3188,11 +3230,11 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.5", + "h2", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-rustls", "hyper-tls", "hyper-util", @@ -3208,7 +3250,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -3266,7 +3308,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "backon", "chrono", @@ -3355,20 +3397,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.12" @@ -3386,9 +3414,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3472,9 +3500,21 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.12.0", "rand", - "secp256k1-sys", + "secp256k1-sys 0.8.1", + "serde", +] + +[[package]] +name = "secp256k1" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" +dependencies = [ + "bitcoin_hashes 0.14.0", + "rand", + "secp256k1-sys 0.10.1", "serde", ] @@ -3487,6 +3527,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -3670,11 +3719,11 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple-signer" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "base64 0.22.1", "bincode", - "dashcore-rpc", + "dashcore-rpc 0.15.8", "dpp", ] @@ -3742,20 +3791,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -3811,12 +3860,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -3877,13 +3920,12 @@ dependencies = [ [[package]] name = "tenderdash-abci" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1+1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "bytes", "hex", "lhash", - "prost 0.12.6", "semver", "serde_json", "tenderdash-proto", @@ -3894,33 +3936,33 @@ dependencies = [ [[package]] name = "tenderdash-proto" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1+1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "bytes", "chrono", - "derive_more", + "derive_more 1.0.0", "flex-error", "num-derive", "num-traits", - "prost 0.12.6", + "prost 0.13.3", "serde", "subtle-encoding", "tenderdash-proto-compiler", "time", - "tonic", + "tonic 0.12.3", ] [[package]] name = "tenderdash-proto-compiler" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1+1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "fs_extra", - "prost-build 0.12.6", + "prost-build", "regex", "tempfile", - "tonic-build 0.11.0", + "tonic-build", "ureq", "walkdir", "zip", @@ -4033,16 +4075,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -4064,24 +4096,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls", "rustls-pki-types", "tokio", ] @@ -4181,54 +4202,65 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ - "async-stream", "async-trait", - "axum", "base64 0.21.7", "bytes", - "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.31", - "hyper-timeout", "percent-encoding", "pin-project", "prost 0.12.6", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", "tokio-stream", - "tower", "tower-layer", "tower-service", "tracing", - "webpki-roots", ] [[package]] -name = "tonic-build" -version = "0.9.2" +name = "tonic" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ - "prettyplease 0.1.25", - "proc-macro2", - "prost-build 0.11.9", - "quote", - "syn 1.0.109", + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.3", + "rustls-native-certs", + "rustls-pemfile", + "socket2", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", + "webpki-roots", ] [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ - "prettyplease 0.2.20", + "prettyplease", "proc-macro2", - "prost-build 0.12.6", + "prost-build", + "prost-types", "quote", "syn 2.0.87", ] @@ -4395,7 +4427,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.12", + "rustls", "rustls-pki-types", "url", "webpki-roots", @@ -4461,9 +4493,9 @@ checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" [[package]] name = "virtue" -version = "0.0.14" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b522f715ead3537dc57c9907899a08e461a8f1e87fc8414a4a89bbd9854289ff" +checksum = "7302ac74a033bf17b6e609ceec0f891ca9200d502d31f02dc7908d3d98767c9d" [[package]] name = "walkdir" @@ -4805,9 +4837,9 @@ dependencies = [ [[package]] name = "withdrawals-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ - "num_enum", + "num_enum 0.5.11", "platform-value", "platform-version", "serde", @@ -4851,6 +4883,21 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "serde", + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] [[package]] name = "zip" diff --git a/platform-mobile/Cargo.lock b/platform-mobile/Cargo.lock index c2ba915..1f61351 100644 --- a/platform-mobile/Cargo.lock +++ b/platform-mobile/Cargo.lock @@ -221,18 +221,17 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -241,38 +240,40 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper 0.1.2", - "tower", + "sync_wrapper 1.0.1", + "tower 0.5.1", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", ] [[package]] name = "backon" -version = "0.4.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" +checksum = "e4fa97bb310c33c811334143cf64c5bb2b7b3c06e453db6b095d7061eff8f113" dependencies = [ "fastrand", - "futures-core", - "pin-project", + "gloo-timers", "tokio", ] @@ -353,7 +354,7 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.22", + "prettyplease", "proc-macro2", "quote", "regex", @@ -388,6 +389,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + [[package]] name = "bitcoin-private" version = "0.1.0" @@ -403,6 +410,16 @@ dependencies = [ "bitcoin-private", ] +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -494,12 +511,6 @@ dependencies = [ "syn_derive", ] -[[package]] -name = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - [[package]] name = "bs58" version = "0.5.1" @@ -816,23 +827,23 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "dapi-grpc-macros", "futures-core", "platform-version", - "prost 0.12.6", + "prost 0.13.3", "serde", "serde_bytes", "serde_json", "tenderdash-proto", - "tonic", - "tonic-build 0.9.2", + "tonic 0.12.3", + "tonic-build", ] [[package]] name = "dapi-grpc-macros" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "heck 0.5.0", "quote", @@ -876,16 +887,18 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "arc-swap", "async-trait", + "backon", "bip37-bloom-filter", + "chrono", "ciborium", "dapi-grpc", "dapi-grpc-macros", - "dashcore-rpc", - "derive_more", + "dashcore-rpc 0.15.8", + "derive_more 1.0.0", "dotenvy", "dpp", "drive", @@ -895,7 +908,7 @@ dependencies = [ "ferment-macro", "futures", "hex", - "http 0.2.12", + "http 1.1.0", "lru", "pollster", "rs-dapi-client", @@ -905,6 +918,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", + "zeroize", ] [[package]] @@ -914,27 +928,74 @@ source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac dependencies = [ "anyhow", "bech32", - "dashcore-private", - "dashcore_hashes", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", + "dashcore_hashes 0.12.0", "hex", "hex_lit", "rustversion", - "secp256k1", + "secp256k1 0.27.0", "serde", ] +[[package]] +name = "dashcore" +version = "0.32.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" +dependencies = [ + "anyhow", + "bech32", + "bitflags 2.6.0", + "bls-signatures", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "dashcore_hashes 0.14.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "ed25519-dalek", + "hex", + "hex_lit", + "lazy_static", + "rustversion", + "secp256k1 0.30.0", + "serde", + "serde_repr", + "strum", +] + +[[package]] +name = "dashcore-private" +version = "0.1.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" + [[package]] name = "dashcore-private" version = "0.1.0" source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" +[[package]] +name = "dashcore-private" +version = "0.1.0" +source = "git+https://github.com/dashpay/rust-dashcore#db9ad0df2baded4ca478663013f823491bddcd7c" + [[package]] name = "dashcore-rpc" version = "0.15.2" source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.4#bd6efdb850151f1dcd8e3f38d4796d18c5be518c" dependencies = [ - "dashcore-private", - "dashcore-rpc-json", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", + "dashcore-rpc-json 0.15.2", + "env_logger 0.10.2", + "hex", + "jsonrpc", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "dashcore-rpc" +version = "0.15.8" +source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.8#4d4d5b1488daa7f083d254a1f5acf03b550d5b10" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "dashcore-rpc-json 0.15.8", "env_logger 0.10.2", "hex", "jsonrpc", @@ -949,7 +1010,21 @@ version = "0.15.2" source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.4#bd6efdb850151f1dcd8e3f38d4796d18c5be518c" dependencies = [ "bincode", - "dashcore", + "dashcore 0.30.0", + "hex", + "serde", + "serde_json", + "serde_repr", + "serde_with", +] + +[[package]] +name = "dashcore-rpc-json" +version = "0.15.8" +source = "git+https://github.com/dashpay/rust-dashcore-rpc?tag=v0.15.8#4d4d5b1488daa7f083d254a1f5acf03b550d5b10" +dependencies = [ + "bincode", + "dashcore 0.32.0", "hex", "serde", "serde_json", @@ -962,15 +1037,34 @@ name = "dashcore_hashes" version = "0.12.0" source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" dependencies = [ - "dashcore-private", + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?branch=master)", "rs-x11-hash", - "secp256k1", + "secp256k1 0.27.0", "serde", ] +[[package]] +name = "dashcore_hashes" +version = "0.14.0" +source = "git+https://github.com/dashpay/rust-dashcore?tag=0.32.0#6a0ec164ca1bdcb8d19b29f40e946120e99473eb" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore?tag=0.32.0)", + "secp256k1 0.30.0", + "serde", +] + +[[package]] +name = "dashcore_hashes" +version = "0.14.0" +source = "git+https://github.com/dashpay/rust-dashcore#db9ad0df2baded4ca478663013f823491bddcd7c" +dependencies = [ + "dashcore-private 0.1.0 (git+https://github.com/dashpay/rust-dashcore)", + "secp256k1 0.30.0", +] + [[package]] name = "dashpay-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -980,7 +1074,7 @@ dependencies = [ [[package]] name = "data-contracts" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1037,6 +1131,27 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -1066,7 +1181,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dpns-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -1076,35 +1191,33 @@ dependencies = [ [[package]] name = "dpp" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "anyhow", "async-trait", "base64 0.22.1", "bincode", - "bls-signatures", - "bs58 0.4.0", + "bs58", "byteorder", "chrono", "ciborium", - "dashcore", + "dashcore 0.32.0", "data-contracts", - "derive_more", - "ed25519-dalek", - "env_logger 0.9.3", + "derive_more 1.0.0", + "env_logger 0.11.5", "ferment-interfaces", "ferment-macro", "getrandom", "hex", "indexmap 2.6.0", "integer-encoding", - "itertools 0.12.1", + "itertools 0.13.0", "json-schema-compatibility-validator", "jsonschema", "lazy_static", "log", "nohash-hasher", - "num_enum", + "num_enum 0.7.3", "once_cell", "platform-serialization", "platform-serialization-derive", @@ -1125,11 +1238,11 @@ dependencies = [ [[package]] name = "drive" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "byteorder", - "derive_more", + "derive_more 1.0.0", "dpp", "ferment", "ferment-interfaces", @@ -1153,15 +1266,16 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "dapi-grpc", - "derive_more", + "derive_more 1.0.0", "dpp", "drive", "ferment-macro", "hex", + "indexmap 2.6.0", "platform-serialization", "platform-serialization-derive", "serde", @@ -1242,19 +1356,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -1347,7 +1448,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-flags-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -1597,6 +1698,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "grovedb" version = "2.1.0" @@ -1606,7 +1719,7 @@ dependencies = [ "bincode", "bitvec", "blake3", - "derive_more", + "derive_more 0.99.18", "grovedb-costs", "grovedb-merk", "grovedb-path", @@ -1690,25 +1803,6 @@ dependencies = [ "itertools 0.12.1", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -1796,6 +1890,15 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex-literal" version = "0.4.1" @@ -1875,11 +1978,11 @@ dependencies = [ [[package]] name = "http-serde" -version = "1.1.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 0.2.12", + "http 1.1.0", "serde", ] @@ -1901,30 +2004,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -1934,10 +2013,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2", "http 1.1.0", "http-body 1.0.1", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -1953,25 +2033,26 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper", "hyper-util", - "rustls 0.23.14", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper 0.14.31", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -1982,7 +2063,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "native-tls", "tokio", @@ -2001,7 +2082,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2128,18 +2209,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -2172,7 +2253,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "json-patch", "once_cell", @@ -2291,7 +2372,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "platform-value", "platform-version", @@ -2353,12 +2434,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "multimap" version = "0.10.0" @@ -2516,7 +2591,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive 0.7.3", ] [[package]] @@ -2531,6 +2615,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate 3.2.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "object" version = "0.36.5" @@ -2734,8 +2830,9 @@ dependencies = [ "base64 0.13.1", "dapi-grpc", "dash-sdk", - "dashcore", - "dashcore-rpc", + "dashcore 0.30.0", + "dashcore-rpc 0.15.2", + "dashcore_hashes 0.14.0 (git+https://github.com/dashpay/rust-dashcore)", "dashpay-contract", "data-contracts", "dotenvy", @@ -2763,7 +2860,7 @@ dependencies = [ "simple-signer", "syn 2.0.79", "tokio", - "tonic", + "tonic 0.11.0", "tracing", "tracing-logcat", "tracing-subscriber", @@ -2771,7 +2868,7 @@ dependencies = [ [[package]] name = "platform-serialization" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "platform-version", @@ -2779,21 +2876,21 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "proc-macro2", "quote", "syn 2.0.79", - "virtue 0.0.14", + "virtue 0.0.17", ] [[package]] name = "platform-value" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "base64 0.22.1", "bincode", - "bs58 0.5.1", + "bs58", "cbindgen", "ciborium", "ferment", @@ -2814,7 +2911,7 @@ dependencies = [ [[package]] name = "platform-version" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "bincode", "ferment-interfaces", @@ -2827,7 +2924,7 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "proc-macro2", "quote", @@ -2855,16 +2952,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "prettyplease" version = "0.2.22" @@ -2926,16 +3013,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.6" @@ -2943,47 +3020,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.6", ] [[package]] -name = "prost-build" -version = "0.11.9" +name = "prost" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap 0.8.3", - "petgraph", - "prettyplease 0.1.25", - "prost 0.11.9", - "prost-types 0.11.9", - "regex", - "syn 1.0.109", - "tempfile", - "which", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" dependencies = [ "bytes", "heck 0.5.0", "itertools 0.12.1", "log", - "multimap 0.10.0", + "multimap", "once_cell", "petgraph", - "prettyplease 0.2.22", - "prost 0.12.6", - "prost-types 0.12.6", + "prettyplease", + "prost 0.13.3", + "prost-types", "regex", "syn 2.0.79", "tempfile", @@ -2991,22 +3055,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.12.1", @@ -3017,20 +3068,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.9" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.11.9", -] - -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", + "prost 0.13.3", ] [[package]] @@ -3181,11 +3223,11 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.6", + "h2", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-rustls", "hyper-tls", "hyper-util", @@ -3259,7 +3301,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "backon", "chrono", @@ -3350,20 +3392,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.14" @@ -3379,19 +3407,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -3466,9 +3481,21 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.12.0", "rand", - "secp256k1-sys", + "secp256k1-sys 0.8.1", + "serde", +] + +[[package]] +name = "secp256k1" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" +dependencies = [ + "bitcoin_hashes 0.14.0", + "rand", + "secp256k1-sys 0.10.1", "serde", ] @@ -3481,6 +3508,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -3655,11 +3691,11 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ "base64 0.22.1", "bincode", - "dashcore-rpc", + "dashcore-rpc 0.15.8", "dpp", ] @@ -3727,20 +3763,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -3865,13 +3901,12 @@ dependencies = [ [[package]] name = "tenderdash-abci" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1+1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "bytes", "hex", "lhash", - "prost 0.12.6", "semver", "serde_json", "tenderdash-proto", @@ -3882,33 +3917,33 @@ dependencies = [ [[package]] name = "tenderdash-proto" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1+1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "bytes", "chrono", - "derive_more", + "derive_more 1.0.0", "flex-error", "num-derive", "num-traits", - "prost 0.12.6", + "prost 0.13.3", "serde", "subtle-encoding", "tenderdash-proto-compiler", "time", - "tonic", + "tonic 0.12.3", ] [[package]] name = "tenderdash-proto-compiler" -version = "1.1.0" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.1.0#03b741f3f24281ec6990c6c343079076c549b0f8" +version = "1.2.1+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.1+1.3.0#aad72f4d25816bdf0f584ee4ba3cd383addf8a33" dependencies = [ "fs_extra", - "prost-build 0.12.6", + "prost-build", "regex", "tempfile", - "tonic-build 0.11.0", + "tonic-build", "ureq", "walkdir", "zip", @@ -4021,16 +4056,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -4052,24 +4077,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.14", + "rustls", "rustls-pki-types", "tokio", ] @@ -4141,54 +4155,64 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ - "async-stream", "async-trait", - "axum", "base64 0.21.7", "bytes", - "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.31", - "hyper-timeout", "percent-encoding", "pin-project", "prost 0.12.6", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", "tokio-stream", - "tower", "tower-layer", "tower-service", "tracing", - "webpki-roots", ] [[package]] -name = "tonic-build" -version = "0.9.2" +name = "tonic" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ - "prettyplease 0.1.25", - "proc-macro2", - "prost-build 0.11.9", - "quote", - "syn 1.0.109", + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.3", + "rustls-pemfile", + "socket2", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", + "webpki-roots", ] [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ - "prettyplease 0.2.22", + "prettyplease", "proc-macro2", - "prost-build 0.12.6", + "prost-build", + "prost-types", "quote", "syn 2.0.79", ] @@ -4213,6 +4237,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -4358,7 +4396,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.14", + "rustls", "rustls-pki-types", "url", "webpki-roots", @@ -4424,9 +4462,9 @@ checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" [[package]] name = "virtue" -version = "0.0.14" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b522f715ead3537dc57c9907899a08e461a8f1e87fc8414a4a89bbd9854289ff" +checksum = "7302ac74a033bf17b6e609ceec0f891ca9200d502d31f02dc7908d3d98767c9d" [[package]] name = "walkdir" @@ -4723,9 +4761,9 @@ dependencies = [ [[package]] name = "withdrawals-contract" -version = "1.3.0-dev.5" +version = "1.5.1" dependencies = [ - "num_enum", + "num_enum 0.5.11", "platform-value", "platform-version", "serde", @@ -4769,6 +4807,21 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "serde", + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] [[package]] name = "zip" diff --git a/platform-mobile/Cargo.toml b/platform-mobile/Cargo.toml index c55f81b..19c5dc1 100644 --- a/platform-mobile/Cargo.toml +++ b/platform-mobile/Cargo.toml @@ -45,6 +45,7 @@ dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [ "signer", "serde", ], default-features = false, branch = "master" } +dashcore_hashes = { git = "https://github.com/dashpay/rust-dashcore" } # dashcore-rpc is only needed for core rpc; TODO remove once we have correct core rpc impl dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc", tag = "v0.15.4" } rand = "0.8.5"