feat: merge from upstream

CHANGELOG.md

@@ -1,13 +1,17 @@
 # v1.3.6
 ## Changes
 * [Remote Node](https://github.com/hinto-janai/gupax#remote-monero-nodes) changes:
+	- Added `xmr{1,2,3}.rs.me` (thanks @SChernykh [#80](https://github.com/hinto-janai/gupax/issues/79))
+	- Removed `moneronode.ddns.net` (thanks @dukethorion [#83](https://github.com/hinto-janai/gupax/issues/83))
 	- Removed `bunkernet.ddns.net`
 	- Removed `ru.poiuty.com`
-	- Added `xmr{1,2,3}.rs.me` (thanks @SChernykh [#80](https://github.com/hinto-janai/gupax/pull/80))
+
+## Fixes
+- Non-responding nodes not being sorted by ping speed
 
 ## Bundled Versions
 * [`P2Pool v3.10`](https://github.com/SChernykh/p2pool/releases/tag/v3.10)
-* [`XMRig v6.21.0`](https://github.com/xmrig/xmrig/releases/tag/v6.21.0)
+* [`XMRig v6.21.1`](https://github.com/xmrig/xmrig/releases/tag/v6.21.1)
 
 
 ---

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gupax"
-version = "1.3.5"
+version = "1.3.6"
 authors = ["hinto-janai <hinto.janai@protonmail.com>"]
 description = "GUI for P2Pool+XMRig"
 documentation = "https://github.com/hinto-janai/gupax"
@@ -36,7 +36,12 @@ dirs = "5.0.1"
 egui = "0.26.2"
 egui_extras = { version = "0.26.2", features = ["image"] }
 ## 2023-12-28: https://github.com/hinto-janai/gupax/issues/68
-eframe = { version = "0.26.2", default-features = false, features = ["glow"] }
+##
+## 2024-03-18: Both `glow` and `wgpu` seem to crash:
+## <https://github.com/hinto-janai/gupax/issues/84>
+## `wgpu` seems to crash on less computers though so...
+eframe = { version = "0.26.2", features = ["wgpu"] }
+
 ## 2023-02-06: The below gets fixed by using the [wgpu] backend instead of [glow]
 ## It also fixes crashes on CPU-based graphics. Only used for Windows.
 ## Using [wgpu] actually crashes macOS (fixed in 0.20.x though).
@@ -102,7 +107,6 @@ egui = {version = "0.26.2", features=["callstack"]}
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 tls-api-native-tls = "0.9.0"
-## [wgpu] backend
 
 # Windows dependencies
 [target.'cfg(windows)'.dependencies]

README.md

@@ -581,7 +581,6 @@ These are the remote nodes used by Gupax in the `[P2Pool Simple]` tab.
 | xmrbandwagon.hopto.org  | 🇺🇸 United States  | 18081    | 18084    |
 | xmr.spotlightsound.com  | 🇺🇸 United States  | 18081    | 18084    |
 | xmrnode.facspro.net     | 🇺🇸 United States  | 18089    | 18084    |
-| moneronode.ddns.net     | 🇺🇸 United States  | 18089    | 18084    |
 | node.richfowler.net     | 🇺🇸 United States  | 18089    | 18084    |
 
 ## Build

src/components/node.rs

@@ -29,7 +29,7 @@ use std::time::{Duration, Instant};
 // Remote Monero Nodes with ZMQ enabled.
 // The format is an array of tuples consisting of: (IP, LOCATION, RPC_PORT, ZMQ_PORT)
 
-pub const REMOTE_NODES: [(&str, &str, &str, &str); 19] = [
+pub const REMOTE_NODES: [(&str, &str, &str, &str); 18] = [
     ("monero.10z.com.ar", "Argentina", "18089", "18084"),
     ("monero1.heitechsoft.com", "Canada", "18081", "18084"),
     ("node.monerodevs.org", "Canada", "18089", "18084"),
@@ -47,7 +47,6 @@ pub const REMOTE_NODES: [(&str, &str, &str, &str); 19] = [
     ("xmrbandwagon.hopto.org", "United States", "18081", "18084"),
     ("xmr.spotlightsound.com", "United States", "18081", "18084"),
     ("xmrnode.facspro.net", "United States", "18089", "18084"),
-    ("moneronode.ddns.net", "United States", "18089", "18084"),
     ("node.richfowler.net", "United States", "18089", "18084"),
 ];
 
@@ -412,7 +411,8 @@ impl Ping {
             handle.await?;
         }
 
-        let node_vec = std::mem::take(&mut *lock!(node_vec));
+        let mut node_vec = std::mem::take(&mut *lock!(node_vec));
+        node_vec.sort_by(|a, b| a.ms.cmp(&b.ms));
         let fastest_info = format!("Fastest node: {}ms ... {}", node_vec[0].ms, node_vec[0].ip);
 
         let info = "Cleaning up connections".to_string();

src/utils/constants.rs

@@ -17,7 +17,7 @@
 
 pub const GUPAX_VERSION: &str = concat!("v", env!("CARGO_PKG_VERSION")); // e.g: v1.0.0
 pub const P2POOL_VERSION: &str = "v3.10";
-pub const XMRIG_VERSION: &str = "v6.21.0";
+pub const XMRIG_VERSION: &str = "v6.21.1";
 pub const COMMIT: &str = env!("COMMIT"); // set in build.rs
                                          // e.g: Gupax_v1_0_0
                                          // Would have been [Gupax_v1.0.0] but P2Pool truncates everything after [.]