From 65d38e3eefe68e4c7133c26d3c92efa3288babc2 Mon Sep 17 00:00:00 2001 From: pauldelucia Date: Tue, 17 Sep 2024 13:18:02 +0700 Subject: [PATCH 01/10] progress --- Cargo.lock | 113 +++++++++++++++++----------------- Cargo.toml | 18 +++--- src/backend.rs | 2 + src/backend/platform_info.rs | 81 +++++++++++++++++++++++- src/ui/views/platform_info.rs | 46 +++++++++++++- 5 files changed, 191 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 877a4bd..c4827e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1076,8 +1076,7 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "dapi-grpc-macros", "futures-core", @@ -1093,8 +1092,7 @@ dependencies = [ [[package]] name = "dapi-grpc-macros" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "heck 0.5.0", "quote", @@ -1138,8 +1136,7 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "arc-swap", "async-trait", @@ -1244,8 +1241,7 @@ dependencies = [ [[package]] name = "dashpay-contract" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "platform-value", "platform-version", @@ -1255,8 +1251,7 @@ dependencies = [ [[package]] name = "data-contracts" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1357,8 +1352,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpns-contract" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "platform-value", "platform-version", @@ -1368,8 +1362,7 @@ dependencies = [ [[package]] name = "dpp" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -1416,8 +1409,7 @@ dependencies = [ [[package]] name = "drive" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "arc-swap", "base64 0.22.1", @@ -1431,6 +1423,7 @@ dependencies = [ "enum-map", "grovedb", "grovedb-costs", + "grovedb-epoch-based-storage-flags", "grovedb-path", "grovedb-storage", "grovedb-version", @@ -1453,8 +1446,7 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "bincode", "dapi-grpc", @@ -1674,8 +1666,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "feature-flags-contract" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "platform-value", "platform-version", @@ -1943,8 +1934,9 @@ dependencies = [ [[package]] name = "grovedb" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77097f0a4cc70c4a69fa400f633c5f18739e446eaed05269a3d76e17fa4d33d2" dependencies = [ "bincode", "bitvec", @@ -1971,19 +1963,35 @@ dependencies = [ [[package]] name = "grovedb-costs" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0487d63a68621b910567a911b3708a8246501ae1912fa2f1920474dcb28a207" dependencies = [ "integer-encoding", "intmap", "thiserror", ] +[[package]] +name = "grovedb-epoch-based-storage-flags" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53eb4b99b056e34bcceef2d604c883aee40daa688ceb7ec558456e10bef27c64" +dependencies = [ + "grovedb-costs", + "hex", + "integer-encoding", + "intmap", + "thiserror", +] + [[package]] name = "grovedb-merk" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daedc296cac3093d244cbda0a11a5ef378bd4f747fcbe45b6cbed040c78cfb36" dependencies = [ + "bincode", "blake3", "byteorder", "colored", @@ -2005,13 +2013,15 @@ dependencies = [ [[package]] name = "grovedb-path" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3552accddbfe6e586853f50a102d665efc0449a63504e5e2113389be924f98c" [[package]] name = "grovedb-storage" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868d74460c6205563e7bc72549f3fa057ed8bd0f83d96e04b2286ca0a216149" dependencies = [ "blake3", "grovedb-costs", @@ -2029,8 +2039,9 @@ dependencies = [ [[package]] name = "grovedb-version" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d62bd20c621681dfd8aa6ca128702de775c67560c1fe412f380c5278d5c48ba" dependencies = [ "thiserror", "versioned-feature-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2038,8 +2049,9 @@ dependencies = [ [[package]] name = "grovedb-visualize" -version = "1.0.0" -source = "git+https://github.com/dashpay/grovedb?rev=713ad96a0ca443f72fa15738e82df529be1becbb#713ad96a0ca443f72fa15738e82df529be1becbb" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cd92c3a11055b1d841d071f801517b98575f9704f5a757a016fe83d35a37b8" dependencies = [ "hex", "itertools 0.12.1", @@ -2579,8 +2591,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "json-patch", "once_cell", @@ -2798,8 +2809,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "platform-value", "platform-version", @@ -3430,8 +3440,7 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-serialization" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "bincode", "platform-version", @@ -3439,8 +3448,7 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "proc-macro2", "quote", @@ -3450,8 +3458,7 @@ dependencies = [ [[package]] name = "platform-value" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "base64 0.22.1", "bincode", @@ -3472,8 +3479,7 @@ dependencies = [ [[package]] name = "platform-version" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "bincode", "grovedb-version", @@ -3484,8 +3490,7 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "proc-macro2", "quote", @@ -4041,8 +4046,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "backon", "chrono", @@ -4551,8 +4555,7 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple-signer" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "base64 0.22.1", "bincode", @@ -4704,8 +4707,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strategy-tests" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "bincode", "dpp", @@ -5999,8 +6001,7 @@ dependencies = [ [[package]] name = "withdrawals-contract" -version = "1.1.0-dev.1" -source = "git+https://github.com/dashpay/platform#55da39f601e3a8ae2232ea7ed0ab10a003898c52" +version = "1.2.0" dependencies = [ "num_enum", "platform-value", diff --git a/Cargo.toml b/Cargo.toml index 58c3356..af9294c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,24 +12,24 @@ tui-realm-stdlib = "1.3.1" tuirealm = "1.9.1" bs58 = "0.5.0" copypasta = "0.10.1" -dpp = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52", features = [ +dpp = { path = "../platform/packages/rs-dpp", features = [ "client", ] } -dash-sdk = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52" } -drive = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52" } -drive-proof-verifier = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52" } +dash-sdk = { path = "../platform/packages/rs-sdk" } +drive = { path = "../platform/packages/rs-drive" } +drive-proof-verifier = { path = "../platform/packages/rs-drive-proof-verifier" } thiserror = "1" serde = "1.0.197" serde_json = "1.0.120" toml = { version = "0.8.10", features = ["display"] } -dapi-grpc = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52", features = [ +dapi-grpc = { path = "../platform/packages/dapi-grpc", features = [ "client", ] } -rs-dapi-client = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52" } +rs-dapi-client = { path = "../platform/packages/rs-dapi-client" } tokio = { version = "1.36.0", features = ["full"] } bincode = { version = "2.0.0-rc.3", features = ["serde"] } -strategy-tests = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52" } -simple-signer = { git = "https://github.com/dashpay/platform", commit = "55da39f601e3a8ae2232ea7ed0ab10a003898c52" } +strategy-tests = { path = "../platform/packages/strategy-tests" } +simple-signer = { path = "../platform/packages/simple-signer" } reqwest = { version = "0.12.3", features = ["json"] } hex = { version = "0.4.3" } itertools = "0.12.1" @@ -48,7 +48,7 @@ tokio-util = "0.7.10" chrono = "0.4" chrono-humanize = "0.2.3" dashmap = "5.5.3" -grovedb-version = { git = "https://github.com/dashpay/grovedb", rev = "713ad96a0ca443f72fa15738e82df529be1becbb"} +grovedb-version = { version = "2.0.3"} sha2 = "0.10.8" arboard = { version = "3.4.0", default-features = false, features = ["windows-sys"] } hdrhistogram = "7.5.4" diff --git a/src/backend.rs b/src/backend.rs index 0c8a814..5fe486d 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -24,6 +24,7 @@ use dash_sdk::Sdk; use dpp::{ document::Document, identity::accessors::IdentityGettersV0, + node::status::EvonodeStatus, prelude::{Identifier, Identity}, voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll, }; @@ -83,6 +84,7 @@ pub enum CompletedTaskPayload { ContestedResources(ContestedResources), ContestedResourceContenders(ContestedDocumentResourceVotePoll, Contenders), DocumentsAndContestedResources(BTreeMap>, ContestedResources), + EvonodeStatuses(BTreeMap), } impl From for CompletedTaskPayload { diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index 16281ba..61081b7 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -1,12 +1,21 @@ +use std::collections::BTreeMap; +use std::time::Duration; + use chrono::{prelude::*, LocalResult}; use chrono_humanize::{Accuracy, HumanTime, Tense}; -use dapi_grpc::platform::v0::{Proof, ResponseMetadata}; +use dapi_grpc::platform::v0::{self as platform_proto, Proof, ResponseMetadata}; use dash_sdk::platform::fetch_current_no_parameters::FetchCurrent; +use dash_sdk::platform::Query; use dash_sdk::sdk::prettify_proof; use dash_sdk::{ platform::{Fetch, FetchMany, LimitQuery}, Sdk, }; +use dash_sdk::{RequestSettings, SdkBuilder}; +use dpp::node::status::v0::{EvonodeStatusV0, EvonodeStatusV0Getters}; +use dpp::node::status::EvonodeStatus; +use dpp::prelude::Identifier; +use dpp::version::PlatformVersion; use dpp::{ block::{ epoch::EpochIndex, @@ -14,8 +23,12 @@ use dpp::{ }, version::ProtocolVersionVoteCount, }; +use rs_dapi_client::{AddressList, DapiClient}; use crate::backend::{as_json_string, BackendEvent, Task}; +use crate::config::Config; + +use super::CompletedTaskPayload; #[derive(Debug, Clone, PartialEq)] pub(crate) enum PlatformInfoTask { @@ -23,6 +36,7 @@ pub(crate) enum PlatformInfoTask { FetchCurrentVersionVotingState, FetchSpecificEpochInfo(u16), FetchManyEpochInfo(u16, u32), // second is count + FetchNodeStatuses, } fn format_extended_epoch_info( @@ -170,5 +184,70 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> }, } } + PlatformInfoTask::FetchNodeStatuses => { + let address_list = match sdk.address_list() { + Ok(list) => list, + Err(e) => { + return BackendEvent::TaskCompleted { + task: Task::PlatformInfo(task), + execution_result: Err(format!( + "Failed to fetch DapiClient address list: {e}" + )), + } + } + }; + + tracing::info!("Address list length: {}", address_list.len()); + tracing::info!("Address list: {:?}", address_list); + + let mut node_statuses = BTreeMap::new(); + + let config = Config::load(); + let request_settings = RequestSettings { + connect_timeout: Some(Duration::from_secs(10)), + timeout: Some(Duration::from_secs(10)), + retries: None, + ban_failed_address: Some(false), + }; + + for address in address_list.addresses() { + let mut single_address_list = AddressList::new(); + single_address_list.add_uri(address.uri().clone()); + let sdk = SdkBuilder::new(address_list.clone()) + .with_version(PlatformVersion::get(1).unwrap()) + .with_core( + &config.core_host, + config.core_rpc_port, + &config.core_rpc_user, + &config.core_rpc_password, + ) + .with_settings(request_settings) + .build() + .expect("expected to build sdk"); + + let node_status = match EvonodeStatus::fetch(&sdk, ()).await { + Ok(result) => match result { + Some(status) => status, + None => { + tracing::info!("None result from fetching EvonodeStatus"); + continue; + } + }, + Err(e) => { + return BackendEvent::TaskCompleted { + task: Task::PlatformInfo(task), + execution_result: Err(format!("Error fetching node status: {e}")), + } + } + }; + + node_statuses.insert(node_status.pro_tx_hash(), node_status); + } + + BackendEvent::TaskCompleted { + task: Task::PlatformInfo(task), + execution_result: Ok(CompletedTaskPayload::EvonodeStatuses(node_statuses)), + } + } } } diff --git a/src/ui/views/platform_info.rs b/src/ui/views/platform_info.rs index 8645b1c..f23d0dc 100644 --- a/src/ui/views/platform_info.rs +++ b/src/ui/views/platform_info.rs @@ -1,16 +1,17 @@ //! Platform info views. +use dpp::node::status::v0::EvonodeStatusV0Getters; use tuirealm::{ event::{Key, KeyEvent, KeyModifiers}, tui::prelude::Rect, Frame, }; -use crate::ui::form::parsers::DocumentQueryTextInputParser; use crate::{ backend::{ platform_info::PlatformInfoTask::{ - FetchCurrentEpochInfo, FetchCurrentVersionVotingState, FetchSpecificEpochInfo, + self, FetchCurrentEpochInfo, FetchCurrentVersionVotingState, FetchNodeStatuses, + FetchSpecificEpochInfo, }, AppState, BackendEvent, Task, }, @@ -27,10 +28,11 @@ use crate::{ Event, }; -const COMMAND_KEYS: [ScreenCommandKey; 4] = [ +const COMMAND_KEYS: [ScreenCommandKey; 5] = [ ScreenCommandKey::new("q", "Back to Main"), ScreenCommandKey::new("n", "Fetch current Platform epoch info"), ScreenCommandKey::new("i", "Fetch previous Platform epoch info"), + ScreenCommandKey::new("s", "Fetch node statuses"), ScreenCommandKey::new("v", "Current version voting"), ]; @@ -76,6 +78,14 @@ impl ScreenController for PlatformInfoScreenController { block: true, }, + Event::Key(KeyEvent { + code: Key::Char('s'), + modifiers: KeyModifiers::NONE, + }) => ScreenFeedback::Task { + task: Task::PlatformInfo(FetchNodeStatuses), + block: true, + }, + Event::Key(KeyEvent { code: Key::Char('v'), modifiers: KeyModifiers::NONE, @@ -98,6 +108,35 @@ impl ScreenController for PlatformInfoScreenController { } } + // Backend events + Event::Backend(BackendEvent::TaskCompleted { + task: Task::PlatformInfo(PlatformInfoTask::FetchNodeStatuses), + execution_result, + }) => { + let info = match execution_result { + Ok(status_info) => match status_info { + crate::backend::CompletedTaskPayload::EvonodeStatuses(info_map) => { + let mut display_string = String::from( + "ProTxHash | Latest Block Height\n", + ); + display_string + .push_str("---------------------------------------------------\n"); + + // Iterate through the BTreeMap and append each key and the latest block height to the result + for (pro_tx_hash, status) in info_map.iter() { + let line = + format!("{} | {}\n", pro_tx_hash, status.latest_block_height()); + display_string.push_str(&line); + } + display_string + } + _ => todo!(), + }, + Err(e) => e.to_string(), + }; + self.info = Info::new_scrollable(&info); + ScreenFeedback::Redraw + } Event::Backend(BackendEvent::TaskCompleted { task: Task::PlatformInfo(_), execution_result, @@ -105,6 +144,7 @@ impl ScreenController for PlatformInfoScreenController { self.info = Info::new_from_result(execution_result); ScreenFeedback::Redraw } + _ => ScreenFeedback::None, } } From 55bdcf5a150a6985e6055eb6373aca112e9c0030 Mon Sep 17 00:00:00 2001 From: pauldelucia Date: Tue, 17 Sep 2024 16:15:19 +0700 Subject: [PATCH 02/10] progress --- .env.mainnet | 2 +- src/backend/platform_info.rs | 6 ++---- src/ui/views/platform_info.rs | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.env.mainnet b/.env.mainnet index b9e8bbe..60ce6d3 100644 --- a/.env.mainnet +++ b/.env.mainnet @@ -2,7 +2,7 @@ # COPY TO .env TO USE # Comma-separated list of full URLs to DAPI nodes for the explorer to connect to. -EXPLORER_DAPI_ADDRESSES=https://104.200.24.196:443,https://134.255.182.185:443,https://134.255.182.186:443,https://134.255.182.187:443,https://134.255.183.247:443,https://134.255.183.248:443,https://134.255.183.250:443,https://135.181.110.216:443,https://146.59.4.9:443,https://147.135.199.138:443,https://149.28.241.190:443,https://149.28.247.165:443,https://157.10.199.125:443,https://157.10.199.77:443,https://157.10.199.79:443,https://157.10.199.82:443,https://157.66.81.130:443,https://157.66.81.162:443,https://157.66.81.218:443,https://157.90.238.161:443,https://159.69.204.162:443,https://167.179.90.255:443,https://167.88.169.16:443,https://168.119.102.10:443,https://172.104.90.249:443,https://173.212.239.124:443,https://173.249.53.139:443,https://178.157.91.184:443,https://185.158.107.124:443,https://185.192.96.70:443,https://185.194.216.84:443,https://185.197.250.227:443,https://185.198.234.17:443,https://185.215.166.126:443,https://188.208.196.183:443,https://188.245.90.255:443,https://192.248.178.237:443,https://193.203.15.209:443,https://194.146.13.7:443,https://194.195.87.34:443,https://198.7.115.43:443,https://207.244.247.40:443,https://213.199.34.248:443,https://213.199.34.250:443,https://213.199.34.251:443,https://213.199.35.15:443,https://213.199.35.18:443,https://213.199.35.6:443,https://213.199.44.112:443,https://2.58.82.231:443,https://31.220.84.93:443,https://31.220.85.180:443,https://31.220.88.116:443,https://37.27.83.17:443,https://37.60.236.151:443,https://37.60.236.161:443,https://37.60.236.201:443,https://37.60.236.212:443,https://37.60.236.247:443,https://37.60.236.249:443,https://37.60.243.119:443,https://37.60.243.59:443,https://37.60.244.220:443,https://44.240.99.214:443,https://49.12.102.105:443,https://49.13.154.121:443,https://49.13.193.251:443,https://49.13.237.193:443,https://49.13.28.255:443,https://51.195.118.43:443,https://51.83.191.208:443,https://5.189.186.78:443,https://52.10.213.198:443,https://52.33.9.172:443,https://54.69.95.118:443,https://5.75.133.148:443,https://64.23.134.67:443,https://65.108.246.145:443,https://65.109.65.126:443,https://65.21.145.147:443,https://79.137.71.84:443,https://81.17.101.141:443,https://91.107.204.136:443,https://91.107.226.241:443,https://93.190.140.101:443,https://93.190.140.111:443,https://93.190.140.112:443,https://93.190.140.114:443,https://93.190.140.162:443,https://95.216.146.18:443 +EXPLORER_DAPI_ADDRESSES=https://149.28.241.190:443,https://216.238.75.46:443,https://134.255.182.186:443,https://49.12.233.191:443,https://157.90.178.32:443,https://185.217.127.139:443,https://66.245.196.52:443,https://80.147.135.74:443,https://157.66.81.162:443,https://213.199.34.250:443,https://178.157.91.176:443,https://157.90.238.161:443,https://5.182.33.231:443,https://185.198.234.68:443,https://37.60.236.212:443,https://207.244.247.40:443,https://45.32.70.131:443,https://158.220.122.76:443,https://52.33.9.172:443,https://185.158.107.124:443,https://185.198.234.17:443,https://93.190.140.101:443,https://194.163.153.225:443,https://194.146.13.7:443,https://93.190.140.112:443,https://75.119.132.2:443,https://65.108.74.95:443,https://44.240.99.214:443,https://5.75.133.148:443,https://192.248.178.237:443,https://95.179.159.65:443,https://2.58.14.149:443,https://146.19.247.160:443,https://139.84.232.129:443,https://37.60.243.119:443,https://194.195.87.34:443,https://43.163.251.51:443,https://45.77.77.195:443,https://65.108.246.145:443,https://64.176.10.71:443,https://158.247.247.241:443,https://194.163.170.55:443,https://37.60.244.220:443,https://95.179.234.163:443,https://2.58.82.231:443,https://139.180.143.115:443,https://185.198.234.54:443,https://213.199.44.112:443,https://37.27.67.154:443,https://157.173.113.158:443,https://134.255.182.185:443,https://91.199.149.177:443,https://91.239.233.173:443,https://139.84.137.143:443,https://84.46.251.96:443,https://173.212.239.124:443,https://144.217.69.169:443,https://157.10.199.77:443,https://5.189.186.78:443,https://139.84.170.10:443,https://173.249.53.139:443,https://37.60.236.151:443,https://188.245.150.142:443,https://43.167.244.109:443,https://37.27.67.159:443,https://49.12.187.42:443,https://104.200.24.196:443,https://37.60.236.225:443,https://172.104.90.249:443,https://57.128.212.163:443,https://37.60.236.249:443,https://158.220.122.74:443,https://86.107.168.29:443,https://185.198.234.25:443,https://148.113.201.221:443,https://86.107.168.43:443,https://195.201.34.10:443,https://134.255.183.250:443,https://84.46.248.78:443,https://185.192.96.70:443,https://134.255.183.248:443,https://52.36.102.91:443,https://134.255.183.247:443,https://49.13.28.255:443,https://168.119.102.10:443,https://159.69.42.14:443,https://49.13.237.193:443,https://37.27.83.17:443,https://37.27.28.6:443,https://134.255.182.187:443,https://142.132.165.149:443,https://193.203.15.209:443,https://78.47.86.233:443,https://38.242.198.100:443,https://192.175.127.198:443,https://37.27.67.163:443,https://79.137.71.84:443,https://198.7.115.43:443,https://70.34.206.123:443,https://163.172.20.205:443,https://65.108.74.78:443,https://108.61.165.170:443,https://157.10.199.79:443,https://31.220.88.116:443,https://185.166.217.154:443,https://37.27.67.164:443,https://31.220.85.180:443,https://43.167.240.90:443,https://161.97.170.251:443,https://157.10.199.82:443,https://91.107.226.241:443,https://86.107.168.44:443,https://167.88.169.16:443,https://216.238.99.9:443,https://62.169.17.112:443,https://52.10.213.198:443,https://149.28.201.164:443,https://198.7.115.38:443,https://37.60.236.161:443,https://49.13.193.251:443,https://46.254.241.9:443,https://66.70.170.22:443,https://65.108.74.75:443,https://192.99.44.64:443,https://95.179.241.182:443,https://86.107.168.28:443,https://95.216.146.18:443,https://185.194.216.84:443,https://31.220.84.93:443,https://185.197.250.227:443,https://139.180.141.253:443,https://149.28.247.165:443,https://213.199.34.251:443,https://108.160.135.149:443,https://95.171.21.131:443,https://185.198.234.12:443,https://87.228.24.64:443,https://45.32.52.10:443,https://91.107.204.136:443,https://38.242.231.212:443,https://64.176.35.235:443,https://167.179.90.255:443,https://157.66.81.130:443,https://157.10.199.125:443,https://46.254.241.8:443,https://49.12.102.105:443,https://134.255.182.189:443,https://81.17.101.141:443,https://65.108.74.79:443,https://64.23.134.67:443,https://54.69.95.118:443,https://158.220.122.13:443,https://49.13.154.121:443,https://75.119.149.9:443,https://93.190.140.111:443,https://93.190.140.114:443,https://195.201.238.55:443,https://135.181.110.216:443,https://45.76.141.74:443,https://65.21.145.147:443,https://50.116.28.103:443,https://188.245.90.255:443,https://130.162.233.186:443,https://65.109.65.126:443,https://195.7.7.28:443,https://188.208.196.183:443,https://43.167.239.145:443,https://178.157.91.184:443,https://37.60.236.201:443,https://95.179.139.125:443,https://213.199.34.248:443,https://178.157.91.178:443,https://213.199.35.18:443,https://213.199.35.6:443,https://77.221.148.204:443,https://37.60.243.59:443,https://37.27.67.156:443,https://37.60.236.247:443,https://5.189.145.80:443,https://159.69.204.162:443,https://46.254.241.11:443,https://173.199.71.83:443,https://185.215.166.126:443,https://91.234.35.132:443,https://157.66.81.218:443,https://213.199.35.15:443,https://114.132.172.215:443,https://93.190.140.162:443,https://65.108.74.109:443 # The hostname or IP address of Dash Core RPC interface. EXPLORER_CORE_HOST=127.0.0.1 diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index 61081b7..b3f3104 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -234,10 +234,8 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> } }, Err(e) => { - return BackendEvent::TaskCompleted { - task: Task::PlatformInfo(task), - execution_result: Err(format!("Error fetching node status: {e}")), - } + tracing::debug!("Error fetching node status: {e}"); + continue; } }; diff --git a/src/ui/views/platform_info.rs b/src/ui/views/platform_info.rs index f23d0dc..603381e 100644 --- a/src/ui/views/platform_info.rs +++ b/src/ui/views/platform_info.rs @@ -117,10 +117,10 @@ impl ScreenController for PlatformInfoScreenController { Ok(status_info) => match status_info { crate::backend::CompletedTaskPayload::EvonodeStatuses(info_map) => { let mut display_string = String::from( - "ProTxHash | Latest Block Height\n", + "ProTxHash | Latest Block Height\n", ); display_string - .push_str("---------------------------------------------------\n"); + .push_str("----------------------------------------------------\n"); // Iterate through the BTreeMap and append each key and the latest block height to the result for (pro_tx_hash, status) in info_map.iter() { From 743751c4278651952fa7fce8feef331605f8bf02 Mon Sep 17 00:00:00 2001 From: pauldelucia Date: Wed, 18 Sep 2024 20:08:58 +0700 Subject: [PATCH 03/10] multi thread --- src/backend/platform_info.rs | 83 ++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index b3f3104..09ed666 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -3,18 +3,16 @@ use std::time::Duration; use chrono::{prelude::*, LocalResult}; use chrono_humanize::{Accuracy, HumanTime, Tense}; -use dapi_grpc::platform::v0::{self as platform_proto, Proof, ResponseMetadata}; +use dapi_grpc::platform::v0::{Proof, ResponseMetadata}; use dash_sdk::platform::fetch_current_no_parameters::FetchCurrent; -use dash_sdk::platform::Query; use dash_sdk::sdk::prettify_proof; use dash_sdk::{ platform::{Fetch, FetchMany, LimitQuery}, Sdk, }; use dash_sdk::{RequestSettings, SdkBuilder}; -use dpp::node::status::v0::{EvonodeStatusV0, EvonodeStatusV0Getters}; +use dpp::node::status::v0::EvonodeStatusV0Getters; use dpp::node::status::EvonodeStatus; -use dpp::prelude::Identifier; use dpp::version::PlatformVersion; use dpp::{ block::{ @@ -23,7 +21,9 @@ use dpp::{ }, version::ProtocolVersionVoteCount, }; -use rs_dapi_client::{AddressList, DapiClient}; +use futures::future::join_all; +use rs_dapi_client::AddressList; +use tokio::task; use crate::backend::{as_json_string, BackendEvent, Task}; use crate::config::Config; @@ -200,8 +200,6 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> tracing::info!("Address list length: {}", address_list.len()); tracing::info!("Address list: {:?}", address_list); - let mut node_statuses = BTreeMap::new(); - let config = Config::load(); let request_settings = RequestSettings { connect_timeout: Some(Duration::from_secs(10)), @@ -210,36 +208,57 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> ban_failed_address: Some(false), }; + // Create a vector to hold the handles for all the spawned tasks + let mut handles = Vec::new(); + for address in address_list.addresses() { + let address = address.uri().clone(); + let config = config.clone(); + let request_settings = request_settings.clone(); let mut single_address_list = AddressList::new(); - single_address_list.add_uri(address.uri().clone()); - let sdk = SdkBuilder::new(address_list.clone()) - .with_version(PlatformVersion::get(1).unwrap()) - .with_core( - &config.core_host, - config.core_rpc_port, - &config.core_rpc_user, - &config.core_rpc_password, - ) - .with_settings(request_settings) - .build() - .expect("expected to build sdk"); - - let node_status = match EvonodeStatus::fetch(&sdk, ()).await { - Ok(result) => match result { - Some(status) => status, - None => { - tracing::info!("None result from fetching EvonodeStatus"); - continue; + single_address_list.add_uri(address); + + // Spawn a task for each iteration + let handle = task::spawn(async move { + let sdk = SdkBuilder::new(single_address_list.clone()) + .with_version(PlatformVersion::get(1).unwrap()) + .with_core( + &config.core_host, + config.core_rpc_port, + &config.core_rpc_user, + &config.core_rpc_password, + ) + .with_settings(request_settings) + .build() + .expect("expected to build sdk"); + + match EvonodeStatus::fetch(&sdk, ()).await { + Ok(result) => { + if let Some(status) = result { + Some((status.pro_tx_hash(), status)) + } else { + tracing::info!("None result from fetching EvonodeStatus"); + None + } + } + Err(e) => { + tracing::debug!("Error fetching node status: {e}"); + None } - }, - Err(e) => { - tracing::debug!("Error fetching node status: {e}"); - continue; } - }; + }); + + handles.push(handle); // Push each spawned task's handle into the vector + } - node_statuses.insert(node_status.pro_tx_hash(), node_status); + // Await all tasks to finish + let results = join_all(handles).await; + + let mut node_statuses = BTreeMap::new(); + for result in results { + if let Ok(Some((pro_tx_hash, node_status))) = result { + node_statuses.insert(pro_tx_hash, node_status); + } } BackendEvent::TaskCompleted { From b65de02df8131c66d9bb2030acb49acf33ce32df Mon Sep 17 00:00:00 2001 From: pauldelucia Date: Wed, 18 Sep 2024 22:20:11 +0700 Subject: [PATCH 04/10] undo comments --- src/backend/platform_info.rs | 11 +++-------- src/main.rs | 3 ++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index 09ed666..a2d68c7 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -197,9 +197,6 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> } }; - tracing::info!("Address list length: {}", address_list.len()); - tracing::info!("Address list: {:?}", address_list); - let config = Config::load(); let request_settings = RequestSettings { connect_timeout: Some(Duration::from_secs(10)), @@ -208,7 +205,6 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> ban_failed_address: Some(false), }; - // Create a vector to hold the handles for all the spawned tasks let mut handles = Vec::new(); for address in address_list.addresses() { @@ -218,10 +214,9 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> let mut single_address_list = AddressList::new(); single_address_list.add_uri(address); - // Spawn a task for each iteration let handle = task::spawn(async move { let sdk = SdkBuilder::new(single_address_list.clone()) - .with_version(PlatformVersion::get(1).unwrap()) + .with_version(PlatformVersion::latest()) .with_core( &config.core_host, config.core_rpc_port, @@ -229,6 +224,7 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> &config.core_rpc_password, ) .with_settings(request_settings) + .with_network(config.core_network()) .build() .expect("expected to build sdk"); @@ -248,10 +244,9 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> } }); - handles.push(handle); // Push each spawned task's handle into the vector + handles.push(handle); } - // Await all tasks to finish let results = join_all(handles).await; let mut node_statuses = BTreeMap::new(); diff --git a/src/main.rs b/src/main.rs index 4967456..7386284 100644 --- a/src/main.rs +++ b/src/main.rs @@ -67,7 +67,7 @@ async fn main() { ban_failed_address: Some(false), }; let sdk = SdkBuilder::new(address_list) - .with_version(PlatformVersion::get(1).unwrap()) + .with_version(PlatformVersion::latest()) .with_core( &config.core_host, config.core_rpc_port, @@ -75,6 +75,7 @@ async fn main() { &config.core_rpc_password, ) .with_settings(request_settings) + .with_network(config.core_network()) .build() .expect("expected to build sdk"); From 7117dafadde489234be8f2682aa9a3de8456d545 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:20:57 +0200 Subject: [PATCH 05/10] chore: update for new rs-sdk --- Cargo.lock | 54 ++++++++++++++--------------- src/backend.rs | 3 +- src/backend/identities.rs | 10 +++++- src/backend/platform_info.rs | 64 +++++++++++++---------------------- src/backend/strategies.rs | 2 +- src/ui/views/platform_info.rs | 3 +- 6 files changed, 62 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4827e0..e071fb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1076,7 +1076,7 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "dapi-grpc-macros", "futures-core", @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "dapi-grpc-macros" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "heck 0.5.0", "quote", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "arc-swap", "async-trait", @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "dashpay-contract" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "platform-value", "platform-version", @@ -1251,7 +1251,7 @@ dependencies = [ [[package]] name = "data-contracts" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1352,7 +1352,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpns-contract" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "platform-value", "platform-version", @@ -1362,7 +1362,7 @@ dependencies = [ [[package]] name = "dpp" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "anyhow", "async-trait", @@ -1409,7 +1409,7 @@ dependencies = [ [[package]] name = "drive" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "arc-swap", "base64 0.22.1", @@ -1446,7 +1446,7 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "bincode", "dapi-grpc", @@ -1666,7 +1666,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "feature-flags-contract" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "platform-value", "platform-version", @@ -2591,7 +2591,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "json-patch", "once_cell", @@ -2809,7 +2809,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "platform-value", "platform-version", @@ -3440,7 +3440,7 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-serialization" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "bincode", "platform-version", @@ -3448,7 +3448,7 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "proc-macro2", "quote", @@ -3458,7 +3458,7 @@ dependencies = [ [[package]] name = "platform-value" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "base64 0.22.1", "bincode", @@ -3479,7 +3479,7 @@ dependencies = [ [[package]] name = "platform-version" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "bincode", "grovedb-version", @@ -3490,7 +3490,7 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "proc-macro2", "quote", @@ -4046,7 +4046,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "backon", "chrono", @@ -4555,7 +4555,7 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple-signer" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "base64 0.22.1", "bincode", @@ -4707,7 +4707,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strategy-tests" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "bincode", "dpp", @@ -4893,8 +4893,8 @@ 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.0+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.0+1.3.0#79b1bcc141f8285fe9b5022f8288b4c49ddfbb0c" dependencies = [ "bytes", "hex", @@ -4910,8 +4910,8 @@ 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.0+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.0+1.3.0#79b1bcc141f8285fe9b5022f8288b4c49ddfbb0c" dependencies = [ "bytes", "chrono", @@ -4929,8 +4929,8 @@ dependencies = [ [[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.0+1.3.0" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.2.0+1.3.0#79b1bcc141f8285fe9b5022f8288b4c49ddfbb0c" dependencies = [ "fs_extra", "prost-build 0.12.6", @@ -6001,7 +6001,7 @@ dependencies = [ [[package]] name = "withdrawals-contract" -version = "1.2.0" +version = "1.4.0-dev.1" dependencies = [ "num_enum", "platform-value", diff --git a/src/backend.rs b/src/backend.rs index 5fe486d..2d5f998 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -24,11 +24,10 @@ use dash_sdk::Sdk; use dpp::{ document::Document, identity::accessors::IdentityGettersV0, - node::status::EvonodeStatus, prelude::{Identifier, Identity}, voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll, }; -use drive_proof_verifier::types::{Contenders, ContestedResources}; +use drive_proof_verifier::types::{Contenders, ContestedResources, EvonodeStatus}; use serde::Serialize; pub(crate) use state::AppState; use strategy_tests::Strategy; diff --git a/src/backend/identities.rs b/src/backend/identities.rs index dc76c25..3ed2220 100644 --- a/src/backend/identities.rs +++ b/src/backend/identities.rs @@ -1378,7 +1378,15 @@ impl AppState { //// Platform steps let updated_identity_balance = identity - .withdraw(sdk, new_receive_address, amount, None, None, signer, None) + .withdraw( + sdk, + Some(new_receive_address), + amount, + None, + None, + signer, + None, + ) .await?; identity.set_balance(updated_identity_balance); diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index a2d68c7..6fbbef3 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -1,19 +1,20 @@ use std::collections::BTreeMap; use std::time::Duration; +use super::CompletedTaskPayload; +use crate::backend::{as_json_string, BackendEvent, Task}; use chrono::{prelude::*, LocalResult}; use chrono_humanize::{Accuracy, HumanTime, Tense}; use dapi_grpc::platform::v0::{Proof, ResponseMetadata}; use dash_sdk::platform::fetch_current_no_parameters::FetchCurrent; +use dash_sdk::platform::types::evonode::EvoNode; +use dash_sdk::platform::FetchUnproved; use dash_sdk::sdk::prettify_proof; +use dash_sdk::RequestSettings; use dash_sdk::{ platform::{Fetch, FetchMany, LimitQuery}, Sdk, }; -use dash_sdk::{RequestSettings, SdkBuilder}; -use dpp::node::status::v0::EvonodeStatusV0Getters; -use dpp::node::status::EvonodeStatus; -use dpp::version::PlatformVersion; use dpp::{ block::{ epoch::EpochIndex, @@ -21,15 +22,11 @@ use dpp::{ }, version::ProtocolVersionVoteCount, }; +use drive_proof_verifier::types::EvonodeStatus; use futures::future::join_all; -use rs_dapi_client::AddressList; +use hex::ToHex; use tokio::task; -use crate::backend::{as_json_string, BackendEvent, Task}; -use crate::config::Config; - -use super::CompletedTaskPayload; - #[derive(Debug, Clone, PartialEq)] pub(crate) enum PlatformInfoTask { FetchCurrentEpochInfo, @@ -159,6 +156,7 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> PlatformInfoTask::FetchCurrentVersionVotingState => { match ProtocolVersionVoteCount::fetch_many(&sdk, ()).await { Ok(votes) => { + let votes: BTreeMap> = votes; let votes_info = votes .into_iter() .map(|(key, value)| { @@ -170,7 +168,7 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> .unwrap_or("No votes".to_string()) ) }) - .collect::>() + .collect::>() .join("\n"); BackendEvent::TaskCompleted { @@ -197,8 +195,7 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> } }; - let config = Config::load(); - let request_settings = RequestSettings { + let settings = RequestSettings { connect_timeout: Some(Duration::from_secs(10)), timeout: Some(Duration::from_secs(10)), retries: None, @@ -207,35 +204,20 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> let mut handles = Vec::new(); - for address in address_list.addresses() { - let address = address.uri().clone(); - let config = config.clone(); - let request_settings = request_settings.clone(); - let mut single_address_list = AddressList::new(); - single_address_list.add_uri(address); - + for address in address_list { + let sdk = sdk.clone(); let handle = task::spawn(async move { - let sdk = SdkBuilder::new(single_address_list.clone()) - .with_version(PlatformVersion::latest()) - .with_core( - &config.core_host, - config.core_rpc_port, - &config.core_rpc_user, - &config.core_rpc_password, - ) - .with_settings(request_settings) - .with_network(config.core_network()) - .build() - .expect("expected to build sdk"); - - match EvonodeStatus::fetch(&sdk, ()).await { - Ok(result) => { - if let Some(status) = result { - Some((status.pro_tx_hash(), status)) - } else { - tracing::info!("None result from fetching EvonodeStatus"); - None - } + let node = EvoNode::new(address); + match EvonodeStatus::fetch_unproved_with_settings(&sdk, node.clone(), settings) + .await + { + Ok((Some(status), _)) => Some((status.pro_tx_hash.encode_hex(), status)), + Ok((None, _)) => { + tracing::warn!( + ?node, + "no status found for node; this should not happen" + ); + None } Err(e) => { tracing::debug!("Error fetching node status: {e}"); diff --git a/src/backend/strategies.rs b/src/backend/strategies.rs index 4dab204..31f89a8 100644 --- a/src/backend/strategies.rs +++ b/src/backend/strategies.rs @@ -2110,7 +2110,7 @@ impl AppState { let result = identity .withdraw( sdk, - wallet_lock.receive_address(), + Some( wallet_lock.receive_address()), identity.balance() - 1_000_000, // not sure what this should be None, None, diff --git a/src/ui/views/platform_info.rs b/src/ui/views/platform_info.rs index 603381e..97fb16b 100644 --- a/src/ui/views/platform_info.rs +++ b/src/ui/views/platform_info.rs @@ -1,6 +1,5 @@ //! Platform info views. -use dpp::node::status::v0::EvonodeStatusV0Getters; use tuirealm::{ event::{Key, KeyEvent, KeyModifiers}, tui::prelude::Rect, @@ -125,7 +124,7 @@ impl ScreenController for PlatformInfoScreenController { // Iterate through the BTreeMap and append each key and the latest block height to the result for (pro_tx_hash, status) in info_map.iter() { let line = - format!("{} | {}\n", pro_tx_hash, status.latest_block_height()); + format!("{} | {}\n", pro_tx_hash, status.latest_block_height); display_string.push_str(&line); } display_string From 0ef3223548757355dbd6b4b65f6950f02bcea705 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:06:28 +0200 Subject: [PATCH 06/10] chore: update deps --- Cargo.lock | 708 ++++++++++++++++++++++++++++------------------------- 1 file changed, 368 insertions(+), 340 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e071fb1..d7b0b7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win 5.4.0", "log", @@ -160,15 +160,15 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-io" @@ -218,18 +218,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" @@ -306,7 +306,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "pin-project", "tokio", @@ -314,17 +314,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -389,13 +389,13 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.20", + "prettyplease 0.2.22", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.77", "which", ] @@ -416,7 +416,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -485,9 +485,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -558,10 +558,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "syn_derive", ] @@ -622,9 +622,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ "serde", ] @@ -648,8 +648,8 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "thiserror", ] @@ -661,16 +661,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-client", ] [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -714,12 +714,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -804,9 +805,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.11" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -814,9 +815,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.11" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -826,14 +827,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.11" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -907,9 +908,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -943,15 +944,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1071,7 +1072,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1096,7 +1097,7 @@ version = "1.4.0-dev.1" dependencies = [ "heck 0.5.0", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1120,7 +1121,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1131,7 +1132,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1154,7 +1155,7 @@ dependencies = [ "futures", "hex", "http 0.2.12", - "lru 0.12.3", + "lru 0.12.4", "pollster", "rs-dapi-client", "serde", @@ -1168,7 +1169,7 @@ dependencies = [ [[package]] name = "dashcore" version = "0.30.0" -source = "git+https://github.com/dashpay/rust-dashcore?branch=master#a29315dbe56729be1be963fb6f7b60a22288663f" +source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" dependencies = [ "anyhow", "bech32", @@ -1184,7 +1185,7 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.1.0" -source = "git+https://github.com/dashpay/rust-dashcore?branch=master#a29315dbe56729be1be963fb6f7b60a22288663f" +source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" [[package]] name = "dashcore-rpc" @@ -1218,7 +1219,7 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.12.0" -source = "git+https://github.com/dashpay/rust-dashcore?branch=master#a29315dbe56729be1be963fb6f7b60a22288663f" +source = "git+https://github.com/dashpay/rust-dashcore?branch=master#2f624ff36ac639336ea4d320ab446511b72ed194" dependencies = [ "dashcore-private", "rs-x11-hash", @@ -1292,7 +1293,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1305,7 +1306,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1326,7 +1327,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1380,7 +1381,7 @@ dependencies = [ "env_logger 0.9.3", "getrandom", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "integer-encoding", "itertools 0.12.1", "json-schema-compatibility-validator", @@ -1428,7 +1429,7 @@ dependencies = [ "grovedb-storage", "grovedb-version", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "integer-encoding", "intmap", "itertools 0.11.0", @@ -1541,7 +1542,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1606,9 +1607,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "event-listener" @@ -1660,9 +1661,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-flags-contract" @@ -1688,9 +1689,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1828,7 +1829,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -1902,9 +1903,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -1950,7 +1951,7 @@ dependencies = [ "grovedb-visualize", "hex", "hex-literal", - "indexmap 2.2.6", + "indexmap 2.5.0", "integer-encoding", "intmap", "itertools 0.12.1", @@ -2003,7 +2004,7 @@ dependencies = [ "grovedb-version", "grovedb-visualize", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "integer-encoding", "num_cpus", "rand", @@ -2069,7 +2070,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2078,9 +2079,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -2088,7 +2089,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2314,7 +2315,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -2327,15 +2328,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2372,9 +2373,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2385,16 +2386,15 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2442,9 +2442,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2462,9 +2462,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "4.0.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924df4f0e24e2e7f9cdd90babb0b96f93b20f3ecfa949ea9e6613756b8c8e1bf" +checksum = "0d762194228a2f1c11063e46e32e5acb96e66e906382b9eb5441f2e0504bbd5a" [[package]] name = "intmap" @@ -2488,17 +2488,17 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -2571,9 +2571,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2645,9 +2645,9 @@ checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" [[package]] name = "lazy-regex" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576c8060ecfdf2e56995cf3274b4f2d71fa5e4fa3607c1c0b63c10180ee58741" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" dependencies = [ "lazy-regex-proc_macros", "once_cell", @@ -2656,14 +2656,14 @@ dependencies = [ [[package]] name = "lazy-regex-proc_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9efb9e65d4503df81c615dc33ff07042a9408ac7f26b45abee25566f7fbfd12c" +checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -2686,9 +2686,9 @@ checksum = "744a4c881f502e98c2241d2e5f50040ac73b30194d64452bb6260393b53f0dc9" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -2718,9 +2718,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "pkg-config", @@ -2772,18 +2772,18 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown 0.14.5", ] [[package]] name = "lz4-sys" -version = "1.10.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -2840,9 +2840,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2884,11 +2884,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -2905,9 +2905,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", @@ -3066,7 +3066,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3270,9 +3270,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -3306,7 +3306,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3335,9 +3335,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3387,7 +3387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.5.0", ] [[package]] @@ -3407,7 +3407,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3434,9 +3434,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "platform-serialization" @@ -3452,7 +3452,7 @@ version = "1.4.0-dev.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "virtue 0.0.14", ] @@ -3465,7 +3465,7 @@ dependencies = [ "bs58 0.5.1", "ciborium", "hex", - "indexmap 2.2.6", + "indexmap 2.5.0", "lazy_static", "platform-serialization", "platform-version", @@ -3494,7 +3494,7 @@ version = "1.4.0-dev.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3515,17 +3515,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3536,9 +3536,9 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "powerfmt" @@ -3548,9 +3548,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" @@ -3564,12 +3567,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3584,11 +3587,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -3678,11 +3681,11 @@ dependencies = [ "multimap 0.10.0", "once_cell", "petgraph", - "prettyplease 0.2.20", + "prettyplease 0.2.22", "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.72", + "syn 2.0.77", "tempfile", ] @@ -3709,7 +3712,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -3794,18 +3797,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3857,7 +3860,7 @@ dependencies = [ "compact_str", "crossterm 0.27.0", "itertools 0.12.1", - "lru 0.12.3", + "lru 0.12.4", "paste", "stability", "strum 0.26.3", @@ -3886,18 +3889,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3948,9 +3951,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", @@ -3958,7 +3961,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", @@ -3987,7 +3990,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] @@ -4007,9 +4010,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -4025,9 +4028,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -4054,7 +4057,7 @@ dependencies = [ "futures", "hex", "http-serde", - "lru 0.12.3", + "lru 0.12.4", "rand", "serde", "serde_json", @@ -4124,9 +4127,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", @@ -4140,9 +4143,9 @@ dependencies = [ [[package]] name = "rust_decimal_macros" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05bf7103af0797dbce0667c471946b29b9eaea34652eff67324f360fec027de" +checksum = "da991f231869f34268415a49724c6578e740ad697ba0999199d6f22b3949332c" dependencies = [ "quote", "rust_decimal", @@ -4162,9 +4165,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] @@ -4185,9 +4188,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -4212,9 +4215,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "log", "once_cell", @@ -4227,9 +4230,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -4240,9 +4243,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -4250,15 +4253,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -4288,11 +4291,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4358,9 +4361,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -4377,9 +4380,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -4395,23 +4398,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", + "memchr", "ryu", "serde", ] @@ -4424,14 +4428,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -4473,7 +4477,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4514,9 +4518,9 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", "mio 0.8.11", @@ -4549,9 +4553,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" @@ -4612,7 +4616,7 @@ dependencies = [ "libc", "log", "memmap2", - "rustix 0.38.34", + "rustix 0.38.37", "thiserror", "wayland-backend", "wayland-client", @@ -4696,7 +4700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4757,7 +4761,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4770,7 +4774,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4801,9 +4805,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -4819,7 +4823,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -4833,6 +4837,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -4848,20 +4855,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4881,14 +4888,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -4964,22 +4972,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -5040,14 +5048,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -5074,7 +5082,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -5104,16 +5112,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5122,9 +5130,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -5135,21 +5143,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.17", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -5160,33 +5168,22 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.17" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.16", + "winnow 0.6.20", ] [[package]] @@ -5240,11 +5237,11 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ - "prettyplease 0.2.20", + "prettyplease 0.2.22", "proc-macro2", "prost-build 0.12.6", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -5269,15 +5266,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5298,7 +5295,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -5431,9 +5428,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -5443,18 +5440,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-truncate" @@ -5469,15 +5466,15 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "untrusted" @@ -5487,15 +5484,15 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "url", "webpki-roots", @@ -5601,34 +5598,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5638,9 +5636,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5648,32 +5646,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix 0.38.37", "scoped-tls", "smallvec", "wayland-sys", @@ -5681,12 +5679,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.34", + "rustix 0.38.37", "wayland-backend", "wayland-scanner", ] @@ -5704,20 +5702,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ - "rustix 0.38.34", + "rustix 0.38.37", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -5727,9 +5725,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -5740,9 +5738,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -5751,9 +5749,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -5763,9 +5761,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5773,9 +5771,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -5789,7 +5787,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -5810,11 +5808,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5832,6 +5830,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -5850,6 +5878,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -5982,23 +6019,13 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.16" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "withdrawals-contract" version = "1.4.0-dev.1" @@ -6038,7 +6065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", - "rustix 0.38.34", + "rustix 0.38.37", "x11rb-protocol", ] @@ -6050,9 +6077,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xkeysym" @@ -6066,6 +6093,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -6077,7 +6105,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.77", ] [[package]] @@ -6088,16 +6116,16 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" -version = "2.1.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b895748a3ebcb69b9d38dcfdf21760859a4b0d0b0015277640c2ef4c69640e6f" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", "crc32fast", "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.2.6", + "indexmap 2.5.0", "memchr", "thiserror", "zopfli", @@ -6119,9 +6147,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.12+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", From 9c88f0abae185d34c96b472677d88eda1aa88055 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:50:44 +0200 Subject: [PATCH 07/10] chore: update to most recent getStatus impl in sdk --- src/backend/platform_info.rs | 5 ++++- src/ui/views/platform_info.rs | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index 6fbbef3..6c88084 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -211,7 +211,10 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> match EvonodeStatus::fetch_unproved_with_settings(&sdk, node.clone(), settings) .await { - Ok((Some(status), _)) => Some((status.pro_tx_hash.encode_hex(), status)), + Ok((Some(status), _)) => { + let protx: String = status.pro_tx_hash.unwrap_or_default().encode_hex(); + Some((protx, status)) + } Ok((None, _)) => { tracing::warn!( ?node, diff --git a/src/ui/views/platform_info.rs b/src/ui/views/platform_info.rs index 97fb16b..5f23c13 100644 --- a/src/ui/views/platform_info.rs +++ b/src/ui/views/platform_info.rs @@ -123,8 +123,11 @@ impl ScreenController for PlatformInfoScreenController { // Iterate through the BTreeMap and append each key and the latest block height to the result for (pro_tx_hash, status) in info_map.iter() { - let line = - format!("{} | {}\n", pro_tx_hash, status.latest_block_height); + let line = format!( + "{} | {}\n", + pro_tx_hash, + status.latest_block_height.unwrap_or_default() + ); display_string.push_str(&line); } display_string From 5d2c9fd0f7baa30c8cbd465a3b4362b16e1ecac1 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:59:47 +0200 Subject: [PATCH 08/10] build: update platform ref in cargo.toml --- Cargo.lock | 21 +++++++++++++++++++++ Cargo.toml | 22 ++++++++++++---------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7b0b7b..4be228e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1078,6 +1078,7 @@ dependencies = [ [[package]] name = "dapi-grpc" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "dapi-grpc-macros", "futures-core", @@ -1094,6 +1095,7 @@ dependencies = [ [[package]] name = "dapi-grpc-macros" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "heck 0.5.0", "quote", @@ -1138,6 +1140,7 @@ dependencies = [ [[package]] name = "dash-sdk" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "arc-swap", "async-trait", @@ -1243,6 +1246,7 @@ dependencies = [ [[package]] name = "dashpay-contract" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "platform-value", "platform-version", @@ -1253,6 +1257,7 @@ dependencies = [ [[package]] name = "data-contracts" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1354,6 +1359,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpns-contract" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "platform-value", "platform-version", @@ -1364,6 +1370,7 @@ dependencies = [ [[package]] name = "dpp" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "anyhow", "async-trait", @@ -1411,6 +1418,7 @@ dependencies = [ [[package]] name = "drive" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "arc-swap", "base64 0.22.1", @@ -1448,6 +1456,7 @@ dependencies = [ [[package]] name = "drive-proof-verifier" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "bincode", "dapi-grpc", @@ -1668,6 +1677,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-flags-contract" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "platform-value", "platform-version", @@ -2592,6 +2602,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "json-patch", "once_cell", @@ -2810,6 +2821,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "platform-value", "platform-version", @@ -3441,6 +3453,7 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "platform-serialization" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "bincode", "platform-version", @@ -3449,6 +3462,7 @@ dependencies = [ [[package]] name = "platform-serialization-derive" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "proc-macro2", "quote", @@ -3459,6 +3473,7 @@ dependencies = [ [[package]] name = "platform-value" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "base64 0.22.1", "bincode", @@ -3480,6 +3495,7 @@ dependencies = [ [[package]] name = "platform-version" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "bincode", "grovedb-version", @@ -3491,6 +3507,7 @@ dependencies = [ [[package]] name = "platform-versioning" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "proc-macro2", "quote", @@ -4050,6 +4067,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "backon", "chrono", @@ -4560,6 +4578,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "base64 0.22.1", "bincode", @@ -4712,6 +4731,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strategy-tests" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "bincode", "dpp", @@ -6029,6 +6049,7 @@ dependencies = [ [[package]] name = "withdrawals-contract" version = "1.4.0-dev.1" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" dependencies = [ "num_enum", "platform-value", diff --git a/Cargo.toml b/Cargo.toml index af9294c..68e6222 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,24 +12,24 @@ tui-realm-stdlib = "1.3.1" tuirealm = "1.9.1" bs58 = "0.5.0" copypasta = "0.10.1" -dpp = { path = "../platform/packages/rs-dpp", features = [ +dpp = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk", features = [ "client", ] } -dash-sdk = { path = "../platform/packages/rs-sdk" } -drive = { path = "../platform/packages/rs-drive" } -drive-proof-verifier = { path = "../platform/packages/rs-drive-proof-verifier" } +dash-sdk = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk" } +drive = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk" } +drive-proof-verifier = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk" } thiserror = "1" serde = "1.0.197" serde_json = "1.0.120" toml = { version = "0.8.10", features = ["display"] } -dapi-grpc = { path = "../platform/packages/dapi-grpc", features = [ +dapi-grpc = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk", features = [ "client", ] } -rs-dapi-client = { path = "../platform/packages/rs-dapi-client" } +rs-dapi-client = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk" } tokio = { version = "1.36.0", features = ["full"] } bincode = { version = "2.0.0-rc.3", features = ["serde"] } -strategy-tests = { path = "../platform/packages/strategy-tests" } -simple-signer = { path = "../platform/packages/simple-signer" } +strategy-tests = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk" } +simple-signer = { git = "https://github.com/dashpay/platform", branch = "feat/get-node-status-in-sdk" } reqwest = { version = "0.12.3", features = ["json"] } hex = { version = "0.4.3" } itertools = "0.12.1" @@ -48,7 +48,9 @@ tokio-util = "0.7.10" chrono = "0.4" chrono-humanize = "0.2.3" dashmap = "5.5.3" -grovedb-version = { version = "2.0.3"} +grovedb-version = { version = "2.0.3" } sha2 = "0.10.8" -arboard = { version = "3.4.0", default-features = false, features = ["windows-sys"] } +arboard = { version = "3.4.0", default-features = false, features = [ + "windows-sys", +] } hdrhistogram = "7.5.4" From 091490ca94c974e680bef1461ee80ed895f7805d Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Fri, 27 Sep 2024 15:37:47 +0200 Subject: [PATCH 09/10] chore: update to sdk changes --- Cargo.lock | 42 +++++++++++++++++------------------ src/backend.rs | 4 ++-- src/backend/platform_info.rs | 11 ++++++--- src/ui/views/platform_info.rs | 3 +-- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4be228e..b969a1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1078,7 +1078,7 @@ dependencies = [ [[package]] name = "dapi-grpc" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "dapi-grpc-macros", "futures-core", @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "dapi-grpc-macros" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "heck 0.5.0", "quote", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "dash-sdk" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "arc-swap", "async-trait", @@ -1246,7 +1246,7 @@ dependencies = [ [[package]] name = "dashpay-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "platform-value", "platform-version", @@ -1257,7 +1257,7 @@ dependencies = [ [[package]] name = "data-contracts" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1359,7 +1359,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpns-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "platform-value", "platform-version", @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "dpp" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "anyhow", "async-trait", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "drive" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "arc-swap", "base64 0.22.1", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "drive-proof-verifier" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "bincode", "dapi-grpc", @@ -1677,7 +1677,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-flags-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "platform-value", "platform-version", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "json-patch", "once_cell", @@ -2821,7 +2821,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "platform-value", "platform-version", @@ -3453,7 +3453,7 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "platform-serialization" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "bincode", "platform-version", @@ -3462,7 +3462,7 @@ dependencies = [ [[package]] name = "platform-serialization-derive" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "proc-macro2", "quote", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "platform-value" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "base64 0.22.1", "bincode", @@ -3495,7 +3495,7 @@ dependencies = [ [[package]] name = "platform-version" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "bincode", "grovedb-version", @@ -3507,7 +3507,7 @@ dependencies = [ [[package]] name = "platform-versioning" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "proc-macro2", "quote", @@ -4067,7 +4067,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "backon", "chrono", @@ -4578,7 +4578,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "base64 0.22.1", "bincode", @@ -4731,7 +4731,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strategy-tests" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "bincode", "dpp", @@ -6049,7 +6049,7 @@ dependencies = [ [[package]] name = "withdrawals-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#baa706fa72534ff898c6b8b8c13f1e46a7a86b4b" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" dependencies = [ "num_enum", "platform-value", diff --git a/src/backend.rs b/src/backend.rs index 2d5f998..5f6c46b 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -27,7 +27,7 @@ use dpp::{ prelude::{Identifier, Identity}, voting::vote_polls::contested_document_resource_vote_poll::ContestedDocumentResourceVotePoll, }; -use drive_proof_verifier::types::{Contenders, ContestedResources, EvonodeStatus}; +use drive_proof_verifier::types::{Contenders, ContestedResources, EvoNodeStatus}; use serde::Serialize; pub(crate) use state::AppState; use strategy_tests::Strategy; @@ -83,7 +83,7 @@ pub enum CompletedTaskPayload { ContestedResources(ContestedResources), ContestedResourceContenders(ContestedDocumentResourceVotePoll, Contenders), DocumentsAndContestedResources(BTreeMap>, ContestedResources), - EvonodeStatuses(BTreeMap), + EvonodeStatuses(BTreeMap), } impl From for CompletedTaskPayload { diff --git a/src/backend/platform_info.rs b/src/backend/platform_info.rs index 6c88084..5533343 100644 --- a/src/backend/platform_info.rs +++ b/src/backend/platform_info.rs @@ -22,7 +22,7 @@ use dpp::{ }, version::ProtocolVersionVoteCount, }; -use drive_proof_verifier::types::EvonodeStatus; +use drive_proof_verifier::types::EvoNodeStatus; use futures::future::join_all; use hex::ToHex; use tokio::task; @@ -208,11 +208,16 @@ pub(super) async fn run_platform_task<'s>(sdk: &Sdk, task: PlatformInfoTask) -> let sdk = sdk.clone(); let handle = task::spawn(async move { let node = EvoNode::new(address); - match EvonodeStatus::fetch_unproved_with_settings(&sdk, node.clone(), settings) + match EvoNodeStatus::fetch_unproved_with_settings(&sdk, node.clone(), settings) .await { Ok((Some(status), _)) => { - let protx: String = status.pro_tx_hash.unwrap_or_default().encode_hex(); + let protx: String = status + .node + .pro_tx_hash + .as_ref() + .map(|h| h.encode_hex()) + .unwrap_or_default(); Some((protx, status)) } Ok((None, _)) => { diff --git a/src/ui/views/platform_info.rs b/src/ui/views/platform_info.rs index 5f23c13..0c8e38d 100644 --- a/src/ui/views/platform_info.rs +++ b/src/ui/views/platform_info.rs @@ -125,8 +125,7 @@ impl ScreenController for PlatformInfoScreenController { for (pro_tx_hash, status) in info_map.iter() { let line = format!( "{} | {}\n", - pro_tx_hash, - status.latest_block_height.unwrap_or_default() + pro_tx_hash, status.chain.latest_block_height ); display_string.push_str(&line); } From 1be4ba89f6ae9816d9dc098ea71cfc1b307dc3aa Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Fri, 27 Sep 2024 16:07:59 +0200 Subject: [PATCH 10/10] build: cargo update - sdk --- Cargo.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b969a1a..02cacbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1078,7 +1078,7 @@ dependencies = [ [[package]] name = "dapi-grpc" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "dapi-grpc-macros", "futures-core", @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "dapi-grpc-macros" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "heck 0.5.0", "quote", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "dash-sdk" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "arc-swap", "async-trait", @@ -1246,7 +1246,7 @@ dependencies = [ [[package]] name = "dashpay-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "platform-value", "platform-version", @@ -1257,7 +1257,7 @@ dependencies = [ [[package]] name = "data-contracts" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1359,7 +1359,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpns-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "platform-value", "platform-version", @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "dpp" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "anyhow", "async-trait", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "drive" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "arc-swap", "base64 0.22.1", @@ -1456,7 +1456,7 @@ dependencies = [ [[package]] name = "drive-proof-verifier" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "bincode", "dapi-grpc", @@ -1677,7 +1677,7 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "feature-flags-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "platform-value", "platform-version", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "json-patch", "once_cell", @@ -2821,7 +2821,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "platform-value", "platform-version", @@ -3453,7 +3453,7 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "platform-serialization" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "bincode", "platform-version", @@ -3462,7 +3462,7 @@ dependencies = [ [[package]] name = "platform-serialization-derive" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "proc-macro2", "quote", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "platform-value" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "base64 0.22.1", "bincode", @@ -3495,7 +3495,7 @@ dependencies = [ [[package]] name = "platform-version" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "bincode", "grovedb-version", @@ -3507,7 +3507,7 @@ dependencies = [ [[package]] name = "platform-versioning" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "proc-macro2", "quote", @@ -4067,7 +4067,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "backon", "chrono", @@ -4578,7 +4578,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "base64 0.22.1", "bincode", @@ -4731,7 +4731,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strategy-tests" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "bincode", "dpp", @@ -6049,7 +6049,7 @@ dependencies = [ [[package]] name = "withdrawals-contract" version = "1.4.0-dev.1" -source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#821af1fe1da83f19322bf1c288657d1e8008e4b4" +source = "git+https://github.com/dashpay/platform?branch=feat/get-node-status-in-sdk#7f9c668ec858c534ceb5027a2f1c5885ddf0f84e" dependencies = [ "num_enum", "platform-value",