Merge branch 'dev' of github.com:aspectron/kaspa-ng

Author: aspect

Cargo.lock

@@ -10,7 +10,7 @@ default-members = ["app"]
 
 [workspace.package]
 rust-version = "1.81.0"
-version = "1.0.1"
+version = "1.0.3"
 authors = ["ASPECTRON Inc.","Kaspa Developers"]
 license = "PROPRIETARY"
 edition = "2021"
@@ -28,19 +28,19 @@ kaspa-ng-macros = { version = "1.0.0", path = "macros/", default-features = fals
 #  |___ |__] |__| | 
 # ___________________
 
-# egui = "=0.28.1"
-# epaint = "=0.28.1"
-# egui_plot = "=0.28.1"
-# egui_extras = { version = "=0.28.1", features = ["svg","image"] }
-# eframe = { version = "=0.28.1",  default-features = false, features = [
-#     "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
-#     "default_fonts", # Embed the default egui fonts.
-#     "glow",          # Use the glow rendering backend. Alternative: "wgpu".
-#     "persistence",   # Enable restoring app state when restarting the app.
-# ] }
+egui = "=0.31.1"
+epaint = "=0.31.1"
+egui_plot = "=0.32.1"
+egui_extras = { version = "=0.31.1", features = ["svg","image"] }
+eframe = { version = "=0.31.1",  default-features = false, features = [
+    "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
+    "default_fonts", # Embed the default egui fonts.
+    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
+    "persistence",   # Enable restoring app state when restarting the app.
+] }
 
-# egui-phosphor = { git = "https://github.com/aspectron/egui-phosphor", branch = "gamma",  version = "=0.6.0", features = ["thin","light","regular","bold"] }
-# egui-notify = { git = "https://github.com/aspectron/egui-notify", branch = "gamma"}
+egui-phosphor = { version = "=0.9.0", features = ["thin","light","regular","bold"] }
+egui-notify = { version = "=0.19.0"}
 
 
 # egui =  { path="../egui/crates/egui", version="=0.28.1"}
@@ -59,19 +59,19 @@ kaspa-ng-macros = { version = "1.0.0", path = "macros/", default-features = fals
 # egui-notify = { path = "../egui-notify" }
 # egui-toast = { path = "../egui-toast" }
 
-egui = { git = "https://github.com/aspectron/egui", branch = "gamma"}
-epaint =  { git = "https://github.com/aspectron/egui", branch = "gamma"}
+# egui = { git = "https://github.com/aspectron/egui", branch = "gamma"}
+# epaint =  { git = "https://github.com/aspectron/egui", branch = "gamma"}
 
-egui_plot = { git = "https://github.com/aspectron/egui_plot", branch = "gamma"}
-egui_extras = { git = "https://github.com/aspectron/egui", branch = "gamma", features = ["svg","image", "serde"] }
-eframe = { git = "https://github.com/aspectron/egui", branch = "gamma",  default-features = false, features = [
-    "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
-    "default_fonts", # Embed the default egui fonts.
-    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
-    "persistence",   # Enable restoring app state when restarting the app.
-] }
-egui-phosphor = { git = "https://github.com/aspectron/egui-phosphor", branch = "gamma",  version = "=0.6.0", features = ["thin","light","regular","bold"] }
-egui-notify = { git = "https://github.com/aspectron/egui-notify",  branch = "gamma"}
+# egui_plot = { git = "https://github.com/aspectron/egui_plot", branch = "gamma"}
+# egui_extras = { git = "https://github.com/aspectron/egui", branch = "gamma", features = ["svg","image", "serde"] }
+# eframe = { git = "https://github.com/aspectron/egui", branch = "gamma",  default-features = false, features = [
+#     "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
+#     "default_fonts", # Embed the default egui fonts.
+#     "glow",          # Use the glow rendering backend. Alternative: "wgpu".
+#     "persistence",   # Enable restoring app state when restarting the app.
+# ] }
+# egui-phosphor = { git = "https://github.com/aspectron/egui-phosphor", branch = "gamma",  version = "=0.6.0", features = ["thin","light","regular","bold"] }
+# egui-notify = { git = "https://github.com/aspectron/egui-notify",  branch = "gamma"}
 # egui-toast = { git = "https://github.com/aspectron/egui-toast", branch = "omega" }
 
 # egui = { path = "../egui/crates/egui" }

Cargo.toml

@@ -72,6 +72,17 @@ Kaspa NG application binary can be started in 3 ways:
 
 If you need access to the wallet in a headless environment, you can start Kaspa NG in daemon mode and then use the CLI wallet to access the wallet.
 
+#### Software Rendering for Windows x64 VMs
+
+Kaspa NG uses OpenGL.  Due to that, Kaspa NG may have problems powering up on the legacy hardware or inside of virtualization platforms that do not support hardware acceleration.
+
+To address this, you can use Mesa 3d Software Emulation library.
+Mesa 3d library build is available for download from the `resources/windows/mesa3d` folder of this repository.  
+Simply extract the archive and place the `opengl32.dll` file in the same folder as the `kaspa-ng.exe` executable.
+
+This library build was placed in this repository for direct download on 2025-05-14.
+The original build was created by Federico Dossena at [https://fdossena.com/?p=mesa/index.frag](https://fdossena.com/?p=mesa/index.frag).
+
 #### Solo Mining
 
 You can use the following stratum bridge to solo mine with Kaspa NG: https://github.com/rdugan/kaspa-stratum-bridge/releases

README.md

@@ -85,13 +85,7 @@ epaint.workspace = true
 egui_plot.workspace = true
 egui_extras.workspace = true
 chrono.workspace = true
-eframe = { workspace = true, default-features = false, features = [
-    "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
-    "default_fonts", # Embed the default egui fonts.
-    # "wgpu",          # Use the glow rendering backend. Alternative: "wgpu".
-    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
-    "persistence",   # Enable restoring app state when restarting the app.
-] }
+
 egui-phosphor = { workspace = true, features = ["light"] }
 # egui-phosphor = { workspace = true, features = ["thin","light","regular","bold"] }
 egui-notify.workspace = true
@@ -128,3 +122,21 @@ tokio.workspace = true
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen-futures.workspace = true
 
+[target.'cfg(not(target_os = "linux"))'.dependencies]
+eframe = { workspace = true,  default-features = false, features = [
+    "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
+    "default_fonts", # Embed the default egui fonts.
+    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
+    "persistence",   # Enable restoring app state when restarting the app.
+] }
+
+[target.'cfg(target_os = "linux")'.dependencies]
+eframe = { workspace = true, default-features = false, features = [
+    "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
+    "default_fonts", # Embed the default egui fonts.
+    # "wgpu",          # Use the glow rendering backend. Alternative: "wgpu".
+    "glow",          # Use the glow rendering backend. Alternative: "wgpu".
+    "persistence",   # Enable restoring app state when restarting the app.
+    "wayland"
+] }
+

core/Cargo.toml

@@ -272,7 +272,7 @@ cfg_if! {
                     let native_options = eframe::NativeOptions {
                         persist_window : true,
                         viewport,
-                        follow_system_theme: false,
+                        //follow_system_theme: false,
                         ..Default::default()
                     };
 
@@ -303,7 +303,7 @@ cfg_if! {
 
         // use crate::result::Result;
         // use crate::adaptor::Adaptor;
-        // use wasm_bindgen::JsCast;
+        use wasm_bindgen::JsCast;
 
         // pub async fn kaspa_ng_main(wallet_api : Option<Arc<dyn WalletApi>>, application_events : Option<ApplicationEventsChannel>, adaptor: Option<Arc<Adaptor>>) -> Result<()> {
         pub async fn kaspa_ng_main(application_context : ApplicationContext) -> Result<()> {
@@ -327,7 +327,7 @@ cfg_if! {
             // Redirect `log` message to `console.log` and friends:
             eframe::WebLogger::init(log::LevelFilter::Debug).ok();
             let web_options = eframe::WebOptions{
-                follow_system_theme: false,
+                //follow_system_theme: false,
                 ..eframe::WebOptions::default()
             };
 
@@ -351,8 +351,7 @@ cfg_if! {
 
             eframe::WebRunner::new()
                 .start(
-                    // will be used in >0.28.1 -> document().get_element_by_id("kaspa-ng").expect("<canvas id=\"kaspa-ng\"> not found.").dyn_into::<web_sys::HtmlCanvasElement>().unwrap(),
-                    "kaspa-ng",
+                    document().get_element_by_id("kaspa-ng").expect("<canvas id=\"kaspa-ng\"> not found.").dyn_into::<web_sys::HtmlCanvasElement>().unwrap(),
                     web_options,
                     Box::new(move |cc| {
 

core/src/app.rs

@@ -509,14 +509,23 @@ impl Core {
 
             if self.device.orientation() == Orientation::Portrait {
                 CentralPanel::default()
-                    .frame(Frame::default().fill(ctx.style().visuals.panel_fill))
+                    .frame(
+                        Frame::default()
+                            .corner_radius(4.)
+                            .inner_margin(0.)
+                            .outer_margin(Margin::symmetric(0, 3)),
+                    )
                     .show_inside(ui, |ui| {
-                        egui::TopBottomPanel::bottom("portrait_bottom_panel").show_inside(
-                            ui,
-                            |ui| {
+                        egui::TopBottomPanel::bottom("portrait_bottom_panel")
+                            .frame(
+                                Frame::default()
+                                    .corner_radius(4.)
+                                    .inner_margin(0.)
+                                    .outer_margin(Margin::symmetric(0, 3)),
+                            )
+                            .show_inside(ui, |ui| {
                                 Status::new(self).render(ui);
-                            },
-                        );
+                            });
 
                         if self.device.mobile() {
                             egui::TopBottomPanel::bottom("mobile_menu_panel").show_inside(
@@ -587,7 +596,7 @@ impl Core {
             } else {
                 egui::TopBottomPanel::bottom("bottom_panel")
                     // TODO - review margins
-                    .frame(Frame::default().rounding(4.).inner_margin(3.))
+                    .frame(Frame::default().corner_radius(4.).inner_margin(3.))
                     .show_inside(ui, |ui| {
                         Status::new(self).render(ui);
                         egui::warn_if_debug_build(ui);

core/src/core.rs

@@ -51,7 +51,7 @@ pub struct CompositeButton<'a> {
     small: bool,
     frame: Option<bool>,
     min_size: Vec2,
-    rounding: Option<Rounding>,
+    rounding: Option<CornerRadius>,
     padding: Option<Vec2>,
     selected: bool,
     show_loading_spinner: Option<bool>,
@@ -186,7 +186,7 @@ impl<'a> CompositeButton<'a> {
     }
 
     /// Set the rounding of the button.
-    pub fn rounding(mut self, rounding: impl Into<Rounding>) -> Self {
+    pub fn rounding(mut self, rounding: impl Into<CornerRadius>) -> Self {
         self.rounding = Some(rounding.into());
         self
     }
@@ -368,15 +368,15 @@ impl Widget for CompositeButton<'_> {
                 let selection = ui.visuals().selection;
                 (
                     Vec2::ZERO,
-                    Rounding::ZERO,
+                    CornerRadius::ZERO,
                     selection.bg_fill,
                     selection.stroke,
                 )
             } else if frame {
                 let expansion = Vec2::splat(visuals.expansion);
                 (
                     expansion,
-                    visuals.rounding,
+                    visuals.corner_radius,
                     visuals.weak_bg_fill,
                     visuals.bg_stroke,
                 )
@@ -391,6 +391,7 @@ impl Widget for CompositeButton<'_> {
                 frame_rounding,
                 frame_fill,
                 frame_stroke,
+                StrokeKind::Outside,
             );
 
             let mut cursor_x = rect.min.x + button_padding.x;
@@ -528,7 +529,7 @@ impl Widget for CompositeButton<'_> {
         }
 
         if let Some(cursor) = ui.visuals().interact_cursor {
-            if response.hovered {
+            if response.hovered() {
                 ui.ctx().set_cursor_icon(cursor);
             }
         }

core/src/egui/composite_button.rs

@@ -60,7 +60,7 @@ pub struct CompositeIcon {
     sense: Sense,
     small: bool,
     frame: Option<bool>,
-    rounding: Option<Rounding>,
+    rounding: Option<CornerRadius>,
     padding: Option<Vec2>,
     selected: bool,
     with_frame: bool,
@@ -146,7 +146,7 @@ impl CompositeIcon {
     }
 
     /// Set the rounding of the button.
-    pub fn rounding(mut self, rounding: impl Into<Rounding>) -> Self {
+    pub fn rounding(mut self, rounding: impl Into<CornerRadius>) -> Self {
         self.rounding = Some(rounding.into());
         self
     }
@@ -381,15 +381,15 @@ impl Widget for CompositeIcon {
                 let selection = ui.visuals().selection;
                 (
                     Vec2::ZERO,
-                    Rounding::ZERO,
+                    CornerRadius::ZERO,
                     selection.bg_fill,
                     selection.stroke,
                 )
             } else if frame {
                 let expansion = Vec2::splat(visuals.expansion);
                 (
                     expansion,
-                    visuals.rounding,
+                    visuals.corner_radius,
                     visuals.weak_bg_fill,
                     visuals.bg_stroke,
                 )
@@ -406,6 +406,7 @@ impl Widget for CompositeIcon {
                     frame_rounding,
                     frame_fill,
                     frame_stroke,
+                    StrokeKind::Outside,
                 );
             }
 
@@ -461,7 +462,7 @@ impl Widget for CompositeIcon {
         }
 
         if let Some(cursor) = ui.visuals().interact_cursor {
-            if response.hovered {
+            if response.hovered() {
                 ui.ctx().set_cursor_icon(cursor);
             }
         }

core/src/egui/composite_icon.rs

@@ -44,7 +44,7 @@ pub trait UiExtension {
     fn confirm_medium_apply_cancel(&mut self, align: Align) -> Option<Confirm>;
     fn confirm_medium_cancel(&mut self, align: Align) -> Option<Confirm>;
     fn sized_separator(&mut self, size: Vec2) -> Response;
-    fn widgets_rounding(&self) -> Rounding;
+    fn widgets_rounding(&self) -> CornerRadius;
     fn small_separator(&mut self) {
         self.add_separator(self.create_separator(None, 0.5, None));
     }
@@ -108,15 +108,15 @@ impl UiExtension for Ui {
         self.add(separator);
     }
 
-    fn widgets_rounding(&self) -> Rounding {
-        self.visuals().widgets.hovered.rounding
+    fn widgets_rounding(&self) -> CornerRadius {
+        self.visuals().widgets.hovered.corner_radius
     }
 
     fn medium_button_enabled(&mut self, enabled: bool, text: impl Into<WidgetText>) -> Response {
         self.add_enabled(
             enabled,
             Button::new(text)
-                .rounding(self.widgets_rounding())
+                .corner_radius(self.widgets_rounding())
                 .min_size(theme_style().medium_button_size()),
         )
     }
@@ -125,7 +125,7 @@ impl UiExtension for Ui {
         self.add_enabled(
             enabled,
             Button::new(text)
-                .rounding(self.widgets_rounding())
+                .corner_radius(self.widgets_rounding())
                 .min_size(theme_style().large_button_size()),
         )
     }
@@ -139,7 +139,7 @@ impl UiExtension for Ui {
         self.add_enabled(
             enabled,
             Button::new(text)
-                .rounding(self.widgets_rounding())
+                .corner_radius(self.widgets_rounding())
                 .selected(selected)
                 .min_size(theme_style().large_button_size()),
         )
@@ -414,7 +414,8 @@ impl LayoutJobBuilder {
             .add(Label::new(egui_phosphor::light::CLIPBOARD_TEXT).sense(Sense::click()))
             .clicked()
         {
-            ui.output_mut(|o| o.copied_text = text);
+            //ui.output_mut(|o| o.copied_text = text);
+            ui.ctx().copy_text(text);
             runtime().notify_clipboard(i18n("Copied to clipboard"));
         }
     }