Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
607 changes: 401 additions & 206 deletions Cargo.lock

Large diffs are not rendered by default.

33 changes: 16 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ rust-version = "1.92"
[dependencies]
tokio-util = { version = "0.7.15" }
bip39 = { version = "2.2.0", features = ["all-languages", "rand"] }
derive_more = "2.0.1"
egui = "0.32.0"
egui_extras = "0.32.0"
egui_commonmark = "0.21.1"
rfd = "0.15.4"
derive_more = "2.1.1"
egui = "0.33.3"
egui_extras = "0.33.3"
egui_commonmark = "0.22.0"
rfd = "0.17.2"
qrcode = "0.14.1"
nix = { version = "0.30.1", features = ["signal"] }
eframe = { version = "0.32.0", features = ["persistence"] }
nix = { version = "0.31.1", features = ["signal"] }
eframe = { version = "0.33.3", features = ["persistence"] }
base64 = "0.22.1"
dash-sdk = { git = "https://github.com/dashpay/platform", rev = "98a0ebeca4e6a9ae000d316c4c9c5b64f6fd3dd9", features = [
dash-sdk = { git = "https://github.com/dashpay/platform", rev = "806322247caf1037c6d73d3620804e27a2170a3d", features = [
"core_key_wallet",
"core_key_wallet_manager",
"core_bincode",
Expand All @@ -29,7 +29,7 @@ dash-sdk = { git = "https://github.com/dashpay/platform", rev = "98a0ebeca4e6a9a
] }
grovestark = { git = "https://www.github.com/dashpay/grovestark", rev = "5b9e289cca54c79b1305d5f4f40bf1148f1eb0e3" }
rayon = "1.8"
thiserror = "2.0.12"
thiserror = "2.0.18"
serde = "1.0.219"
serde_json = "1.0.140"
serde_yaml = { version = "0.9.34-deprecated" }
Expand All @@ -40,7 +40,7 @@ itertools = "0.14.0"
enum-iterator = "2.1.0"
futures = "0.3.31"
tracing = "0.1.41"
rand = "0.8"
rand = "0.9"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
dotenvy = "0.15.7"
envy = "0.4.2"
Expand All @@ -52,16 +52,15 @@ arboard = { version = "3.6.0", default-features = false, features = [
"windows-sys",
] }
directories = "6.0.0"
rusqlite = { version = "0.37.0", features = ["functions"] }
rusqlite = { version = "0.38.0", features = ["functions", "fallible_uint"] }
dark-light = "2.0.0"
image = { version = "0.25.6", default-features = false, features = [
"png",
"jpeg",
] }
resvg = "0.45"
reqwest = { version = "0.12", features = ["json", "stream"] }
bitflags = "2.9.1"
libsqlite3-sys = { version = "0.35.0", features = ["bundled"] }
resvg = "0.46"
reqwest = { version = "0.13", features = ["json", "stream"] }
bitflags = "2.10"
rust-embed = "8.7.2"
zeroize = "1.8.1"
zxcvbn = "3.1.0"
Expand All @@ -72,7 +71,7 @@ crossbeam-channel = "0.5.15"
regex = "1.11.1"
humantime = "2.2.0"
which = { version = "8.0.0" }
tz-rs = { version = "0.7.0" }


[target.'cfg(not(target_os = "windows"))'.dependencies]
zmq = "0.10.0"
Expand All @@ -86,7 +85,7 @@ raw-cpuid = "11.5.0"

[dev-dependencies]
tempfile = { version = "3.20.0" }
egui_kittest = { version = "0.32.0", features = ["eframe"] }
egui_kittest = { version = "0.33.3", features = ["eframe"] }

[build-dependencies]
winres = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/backend_task/dashpay/profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ pub async fn update_profile(
// Create new profile using DocumentCreateTransitionBuilder
// Generate random entropy for document ID (security: prevents predictable IDs)
let mut entropy = [0u8; 32];
rand::thread_rng().fill_bytes(&mut entropy);
rand::rng().fill_bytes(&mut entropy);

let profile_doc_id = Document::generate_document_id_v0(
&dashpay_contract.id(),
Expand Down
8 changes: 4 additions & 4 deletions src/components/core_p2p_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use dash_sdk::dpp::dashcore::network::message::{NetworkMessage, RawNetworkMessag
use dash_sdk::dpp::dashcore::network::message_qrinfo::QRInfo;
use dash_sdk::dpp::dashcore::network::message_sml::{GetMnListDiff, MnListDiff};
use dash_sdk::dpp::dashcore::network::{Address, message_network, message_qrinfo};
use rand::prelude::StdRng;
use rand::rngs::StdRng;
use rand::{Rng, SeedableRng};
use sha2::{Digest, Sha256};
use std::io::{ErrorKind, Read, Write};
Expand Down Expand Up @@ -250,7 +250,7 @@ impl CoreP2PHandler {
// Note: get_dml_diff and get_qr_info are already defined above (lines ~351 and ~364)
/// Perform the handshake (version/verack exchange) with the peer.
pub fn handshake(&mut self) -> Result<(), String> {
let mut rng = StdRng::from_entropy();
let mut rng = StdRng::from_os_rng();

// Build a version message.
let version_msg = NetworkMessage::Version(message_network::VersionMessage {
Expand All @@ -267,11 +267,11 @@ impl CoreP2PHandler {
address: Default::default(),
port: self.stream.local_addr().map_err(|e| e.to_string())?.port(),
},
nonce: rng.r#gen(),
nonce: rng.random(),
user_agent: "/dash-evo-tool:0.9/".to_string(),
start_height: 0,
relay: false,
mn_auth_challenge: rng.r#gen(),
mn_auth_challenge: rng.random(),
masternode_connection: false,
});

Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn load_icon() -> egui::IconData {
let image = image::imageops::resize(&image, 64, 64, image::imageops::FilterType::Lanczos3);
let (width, height) = image.dimensions();
egui::IconData {
rgba: image.into_raw(),
rgba: image.to_vec(),
width,
height,
}
Expand Down
2 changes: 1 addition & 1 deletion src/model/wallet/asset_lock_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl Wallet {
),
String,
> {
use rand::rngs::OsRng;
use bip39::rand::rngs::OsRng;

// Generate a random private key for the asset lock
let secp = Secp256k1::new();
Expand Down
2 changes: 1 addition & 1 deletion src/ui/components/confirmation_dialog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ impl ConfirmationDialog {
}

// Draw dark overlay behind the dialog for better visibility
let screen_rect = ui.ctx().screen_rect();
let screen_rect = ui.ctx().content_rect();
let painter = ui.ctx().layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("confirmation_dialog_overlay"),
Expand Down
2 changes: 1 addition & 1 deletion src/ui/components/info_popup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl InfoPopup {
}

// Draw dark overlay behind the popup for better visibility
let screen_rect = ui.ctx().screen_rect();
let screen_rect = ui.ctx().content_rect();
let painter = ui.ctx().layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("info_popup_overlay"),
Expand Down
9 changes: 5 additions & 4 deletions src/ui/components/left_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::ui::components::styled::GradientButton;
use crate::ui::theme::{DashColors, Shadow, Shape, Spacing};
use dash_sdk::dashcore_rpc::dashcore::Network;
use eframe::epaint::Margin;
use egui::{Color32, Context, Frame, ImageButton, RichText, SidePanel, TextureHandle};
use egui::{Color32, Context, Frame, Image, RichText, SidePanel, TextureHandle};
use egui_extras::{Size, StripBuilder};
use rust_embed::RustEmbed;
use std::sync::Arc;
Expand Down Expand Up @@ -249,9 +249,10 @@ pub fn add_left_panel(
};

if let Some(ref texture) = texture {
let button = ImageButton::new(texture)
.frame(false)
.tint(button_color);
let button = egui::Button::image(
Image::new(texture).tint(button_color),
)
.frame(false);

let added = ui.add(button);
if added.clicked() {
Expand Down
7 changes: 3 additions & 4 deletions src/ui/components/left_wallet_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::app::AppAction;
use crate::context::AppContext;
use crate::ui::RootScreenType;
use eframe::epaint::{Color32, Margin};
use egui::{Context, Frame, ImageButton, SidePanel, TextureHandle};
use egui::{Context, Frame, Image, SidePanel, TextureHandle};
use rust_embed::RustEmbed;
use std::sync::Arc;

Expand Down Expand Up @@ -92,9 +92,8 @@ pub fn add_left_panel(

// Add icon-based button if texture is loaded
if let Some(ref texture) = texture {
let button = ImageButton::new(texture)
.frame(false) // Remove button frame
.tint(button_color);
let button = egui::Button::image(Image::new(texture).tint(button_color))
.frame(false); // Remove button frame

if ui.add(button).clicked() {
action = AppAction::SetMainScreen(*screen_type);
Expand Down
3 changes: 2 additions & 1 deletion src/ui/components/top_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,8 @@ pub fn add_top_panel(
ui.add_space(3.0);
let font = egui::FontId::proportional(16.0);
let text_size = ui
.fonts(|f| {
.ctx()
.fonts_mut(|f| {
f.layout_no_wrap(
text.to_string(),
font.clone(),
Expand Down
2 changes: 1 addition & 1 deletion src/ui/components/wallet_unlock_popup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ impl WalletUnlockPopup {
}

// Draw dark overlay behind the popup
let screen_rect = ctx.screen_rect();
let screen_rect = ctx.content_rect();
let painter = ctx.layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("wallet_unlock_popup_overlay"),
Expand Down
4 changes: 2 additions & 2 deletions src/ui/identities/identities_screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ impl IdentitiesScreen {
let action = AppAction::None;

// Draw dark overlay behind the popup
let screen_rect = ctx.screen_rect();
let screen_rect = ctx.content_rect();
let painter = ctx.layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("confirm_removal_overlay"),
Expand Down Expand Up @@ -969,7 +969,7 @@ impl IdentitiesScreen {
let identity_id = self.editing_alias_identity.unwrap();

// Draw dark overlay behind the popup
let screen_rect = ctx.screen_rect();
let screen_rect = ctx.content_rect();
let painter = ctx.layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("edit_alias_overlay"),
Expand Down
2 changes: 1 addition & 1 deletion src/ui/tokens/tokens_screen/data_contract_json_pop_up.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ impl TokensScreen {
let mut is_open = true;

// Draw dark overlay behind the dialog for better visibility
let screen_rect = ui.ctx().screen_rect();
let screen_rect = ui.ctx().content_rect();
let painter = ui.ctx().layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("json_popup_overlay"),
Expand Down
2 changes: 1 addition & 1 deletion src/ui/wallets/add_new_wallet_screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ impl AddNewWalletScreen {
}

// Draw dark overlay behind the dialog
let screen_rect = ctx.screen_rect();
let screen_rect = ctx.content_rect();
let painter = ctx.layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("receive_funds_overlay"),
Expand Down
2 changes: 1 addition & 1 deletion src/ui/wallets/asset_lock_detail_screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ impl ScreenLike for AssetLockDetailScreen {
// Private key popup
if self.show_private_key_popup {
// Draw dark overlay behind the popup
let screen_rect = ctx.screen_rect();
let screen_rect = ctx.content_rect();
let painter = ctx.layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new("private_key_popup_overlay"),
Expand Down
2 changes: 1 addition & 1 deletion src/ui/wallets/wallets_screen/dialogs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub(super) struct PrivateKeyDialogState {

impl WalletsBalancesScreen {
pub(super) fn draw_modal_overlay(ctx: &Context, id: &str) {
let screen_rect = ctx.screen_rect();
let screen_rect = ctx.content_rect();
let painter = ctx.layer_painter(egui::LayerId::new(
egui::Order::Background,
egui::Id::new(id),
Expand Down
Loading