v1.1.0

CHANGELOG.md

@@ -1,21 +1,23 @@
 # v1.1.0
 ## Updates
-* **Status:** Added P2Pool submenu:
+* **Status:** [Added P2Pool submenu](https://github.com/hinto-janaiyo/gupax#Status)
 	- Total payouts across all time
 	- Total XMR mined across all time
 	- Formatted log lines of ALL payouts (date, amount, block) with sorting options
 	- Automatic/Manual calculator for average share/block time
 	- P2Pool/Monero stats for difficulty/hashrate/dominance
-* **Status:** Added more process stats:
+* **Status:** Added more process stats
-	- P2Pool: Current Monero node IP/RPC/ZMQ
+	- P2Pool
-	- P2Pool: Current Sidechain
+		- Current Monero node IP/RPC/ZMQ
-	- P2Pool: Current Monero address
+		- Current Sidechain
-	- XMRig: Current Pool IP
+		- Current Monero address
-	- XMRig: Current thread usage
+	- XMRig
-* **Key Shortcut:** Added two shortcuts:
+		- Current Pool IP
+		- Current thread usage
+* **Key Shortcut:** Added two shortcuts
 	- `C | Left Submenu`
 	- `V | Left Submenu`
-* **Command Line:** Added two flags:
+* **Command Line:** Added two flags
 	- `--payouts         Print the P2Pool payout log, payout count, and total XMR mined`
 	- `--reset-payouts   Reset the permanent P2Pool stats that appear in the [Status] tab`
 	

README.md

@@ -107,6 +107,8 @@ The `Gupax/P2Pool/XMRig` tabs have two versions, `Simple` & `Advanced`.
 
 `Simple` is for a minimal & working out-of-the-box configuration.
 
+---
+
 ### Status
 This tab has 2 submenus that show some info about running processes and P2Pool-specific stats.
 
@@ -115,6 +117,7 @@ This tab has 2 submenus that show some info about running processes and P2Pool-s
 ![processes.png](https://github.com/hinto-janaiyo/gupax/blob/main/images/processes.png)
 
 **P2Pool:**
+
 This submenu shows:
 - ***Permanent*** stats on all your payouts received via P2Pool & Gupax
 - Payout sorting options
@@ -122,6 +125,8 @@ This submenu shows:
 
 ![payouts.png](https://github.com/hinto-janaiyo/gupax/blob/main/images/payouts.png)
 
+---
+
 ### Gupax
 This tab has the updater and general Gupax settings.
 
@@ -384,7 +389,7 @@ e.g:
 
 The `payout` file is just a simple count of how many payouts have been received.
 
-The `xmr` file is the sum of XMR mined represented as [Atomic Units](https://web.getmonero.org/resources/moneropedia/atomic-units.html). The equation to represent this as normal XMR is:
+The `xmr` file is the sum of XMR mined as [Atomic Units](https://web.getmonero.org/resources/moneropedia/atomic-units.html). The equation to represent this as XMR is:
 ```rust
 XMR_ATOMIC_UNITS / 1,000,000,000,000
 ```
@@ -403,7 +408,7 @@ If you want to reset these stats, you can run:
 ```bash
 ./gupax --reset-payouts
 ```
-or just manually delete the `p2pool` folder in the Gupax OS data directory.
+or just manually delete the `p2pool` folder in the [Gupax OS data directory.](#Disk)
 
 ---
 
@@ -634,7 +639,7 @@ Although Gupax uses a temporary folder (`gupax_update_[A-Za-z0-9]`) to store tem
 ---
 
 ### How much memory does Gupax use?
-Gupax itself uses around 100-300 megabytes of memory.
+Gupax itself uses around 100-400 megabytes of memory.
 
 Gupax also holds up to [500,000 bytes](https://github.com/hinto-janaiyo/gupax/blob/e6bf49b309c64d29e50c0a1a185fcf0ebc05e7c7/src/helper.rs#L59) of log data from `P2Pool/XMRig` to display in the GUI terminals. These logs are reset once over capacity which takes around 1-4 hours.
 

src/README.md

@@ -22,7 +22,8 @@
 | disk.rs      | Code for writing to disk: `state.toml/node.toml/pool.toml`; This holds the structs for the [State] struct
 | ferris.rs    | Cute crab bytes
 | gupax.rs     | `Gupax` tab
-| helper.rs   | The "helper" thread that runs for the entire duration Gupax is alive. All the processing that needs to be done without blocking the main GUI thread runs here, including everything related to handling P2Pool/XMRig
+| helper.rs    | The "helper" thread that runs for the entire duration Gupax is alive. All the processing that needs to be done without blocking the main GUI thread runs here, including everything related to handling P2Pool/XMRig
+| human.rs     | Code for displaying human readable numbers & time
 | macros.rs    | General `macros!()` used in Gupax
 | main.rs      | The main `App` struct that holds all data + misc data/functions
 | node.rs      | Community node ping code for the `P2Pool` simple tab

src/main.rs

@@ -979,10 +979,6 @@ fn print_gupax_p2pool_api(gupax_p2pool_api: &Arc<Mutex<GupaxP2poolApi>>) {
 	exit(0);
 }
 
-// Prints the GupaxP2PoolApi [xmr] file in AtomicUnits and floating point.
-fn print_xmr_file(path: &PathBuf) {
-}
-
 //---------------------------------------------------------------------------------------------------- Main [App] frame
 fn main() {
 	let now = Instant::now();
@@ -1682,6 +1678,7 @@ impl eframe::App for App {
 						let distro = false;
 						let p2pool_gui_len = lock!(self.p2pool_api).output.len();
 						let xmrig_gui_len = lock!(self.xmrig_api).output.len();
+						let gupax_p2pool_api = lock!(self.gupax_p2pool_api);
 						let debug_info = format!(
 "Gupax version: {}\n
 Bundled P2Pool version: {}\n
@@ -1711,7 +1708,12 @@ XMRig console byte length: {}\n
 ------------------------------------------ XMRIG IMAGE ------------------------------------------
 {:#?}\n
 ------------------------------------------ GUPAX-P2POOL API ------------------------------------------
-{:#?}\n
+payout: {:#?}
+payout_u64: {:#?}
+xmr: {:#?}
+path_log: {:#?}
+path_payout: {:#?}
+path_xmr: {:#?}\n
 ------------------------------------------ WORKING STATE ------------------------------------------
 {:#?}\n
 ------------------------------------------ ORIGINAL STATE ------------------------------------------
@@ -1743,7 +1745,12 @@ XMRig console byte length: {}\n
 							xmrig_gui_len,
 							lock!(self.p2pool_img),
 							lock!(self.xmrig_img),
-							lock!(self.gupax_p2pool_api),
+							gupax_p2pool_api.payout,
+							gupax_p2pool_api.payout_u64,
+							gupax_p2pool_api.xmr,
+							gupax_p2pool_api.path_log,
+							gupax_p2pool_api.path_payout,
+							gupax_p2pool_api.path_xmr,
 							self.state,
 							lock!(self.og),
 						);

utils/package.sh

@@ -80,8 +80,8 @@ mv macos "gupax-$NEW_VER-macos-x64-bundle"; check "macos -> gupax-$NEW_VER-macos
 tar -czpf "gupax-${NEW_VER}-macos-x64-bundle.tar.gz" "gupax-$NEW_VER-macos-x64-bundle" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-bundle"
 # Tar macOS Standalone
 mv "gupax-$NEW_VER-macos-x64-bundle" "gupax-$NEW_VER-macos-x64-standalone"; check "gupax-$NEW_VER-macos-x64-bundle -> gupax-$NEW_VER-macos-x64-standalone"
-rm -r "gupax-$NEW_VER-macos-x64-standalone/p2pool"; check "rm gupax-$NEW_VER-macos-x64-standalone/p2pool"
+rm -r "gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/p2pool"; check "rm gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/p2pool"
-rm -r "gupax-$NEW_VER-macos-x64-standalone/xmrig"; check "rm gupax-$NEW_VER-macos-x64-standalone/xmrig"
+rm -r "gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/xmrig"; check "rm gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/xmrig/xmrig"
 tar -czpf "gupax-${NEW_VER}-macos-x64-standalone.tar.gz" "gupax-$NEW_VER-macos-x64-standalone" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-standalone"
 # Remove dir
 rm -r "gupax-$NEW_VER-macos-x64-standalone"; check "rm macos dir"

utils/skel/linux/Gupax.AppImage

@@ -0,0 +1 @@
+./gupax