feat: bug fix release 0.1.2

fix: persist p2pool current share
fix: script release
This commit is contained in:
Cyrix126 2024-03-26 11:02:35 +01:00
parent 4b31346198
commit 91a544adfa
16 changed files with 28 additions and 15 deletions
CHANGELOG.mdCargo.lockCargo.toml
src/helper
utils
package.sh
skel
linux
macos-arm64/Gupaxx.app/Contents
macos-x64/Gupaxx.app/Contents

View file

@ -1,3 +1,18 @@
# v0.1.2
Fix release for beta version.
This version is only made for testing purposes and have feedbacks.
## Changes
## Fixes
Persist current shares value
fix script for release
## Bundled Versions
* [`P2Pool v3.10`](https://github.com/SChernykh/p2pool/releases/tag/v3.10)
* [`XMRig v6.21.2`](https://github.com/xmrig/xmrig/releases/tag/v6.21.2)
# v0.1.1 # v0.1.1
Fix release for beta version. Fix release for beta version.
This version is only made for testing purposes and have feedbacks. This version is only made for testing purposes and have feedbacks.

2
Cargo.lock generated
View file

@ -2064,7 +2064,7 @@ dependencies = [
[[package]] [[package]]
name = "gupaxx" name = "gupaxx"
version = "0.1.0" version = "0.1.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"benri", "benri",

View file

@ -1,7 +1,7 @@
cargo-features = ["profile-rustflags"] cargo-features = ["profile-rustflags"]
[package] [package]
name = "gupaxx" name = "gupaxx"
version = "0.1.1" version = "0.1.2"
authors = ["cyrix126 <gupaxx@baermail.fr>"] authors = ["cyrix126 <gupaxx@baermail.fr>"]
description = "Fork of Gupax integrating the XMRvsBeast Raffle " description = "Fork of Gupax integrating the XMRvsBeast Raffle "
documentation = "https://github.com/cyrix126/gupaxx" documentation = "https://github.com/cyrix126/gupaxx"

View file

@ -36,7 +36,7 @@ impl Helper {
output_pub: Arc<Mutex<String>>, output_pub: Arc<Mutex<String>>,
reader: Box<dyn std::io::Read + Send>, reader: Box<dyn std::io::Read + Send>,
gupax_p2pool_api: Arc<Mutex<GupaxP2poolApi>>, gupax_p2pool_api: Arc<Mutex<GupaxP2poolApi>>,
pub_api: Arc<Mutex<PubP2poolApi>>, gui_api: Arc<Mutex<PubP2poolApi>>,
) { ) {
use std::io::BufRead; use std::io::BufRead;
let mut stdout = std::io::BufReader::new(reader).lines(); let mut stdout = std::io::BufReader::new(reader).lines();
@ -74,7 +74,7 @@ impl Helper {
"P2pool | PTY getting current shares data from status: {} share", "P2pool | PTY getting current shares data from status: {} share",
shares shares
); );
lock!(pub_api).sidechain_shares = shares; lock!(gui_api).sidechain_shares = shares;
} else { } else {
error!("P2pool | PTY Getting data from status: Lines contains Your shares but no value found: {}", line); error!("P2pool | PTY Getting data from status: Lines contains Your shares but no value found: {}", line);
} }
@ -425,7 +425,7 @@ impl Helper {
let output_parse = Arc::clone(&lock!(process).output_parse); let output_parse = Arc::clone(&lock!(process).output_parse);
let output_pub = Arc::clone(&lock!(process).output_pub); let output_pub = Arc::clone(&lock!(process).output_pub);
let gupax_p2pool_api = Arc::clone(&gupax_p2pool_api); let gupax_p2pool_api = Arc::clone(&gupax_p2pool_api);
let p2pool_api_c = Arc::clone(&pub_api); let p2pool_api_c = Arc::clone(&gui_api);
thread::spawn(move || { thread::spawn(move || {
Self::read_pty_p2pool( Self::read_pty_p2pool(
output_parse, output_parse,
@ -879,6 +879,7 @@ impl PubP2poolApi {
output, output,
tick: std::mem::take(&mut gui_api.tick), tick: std::mem::take(&mut gui_api.tick),
tick_status: std::mem::take(&mut gui_api.tick_status), tick_status: std::mem::take(&mut gui_api.tick_status),
sidechain_shares: std::mem::take(&mut gui_api.sidechain_shares),
..pub_api.clone() ..pub_api.clone()
}; };
} }

View file

@ -48,9 +48,6 @@ title "Windows folder check"
[[ -f windows/P2Pool/p2pool.exe ]]; check "windows/P2Pool/p2pool.exe" [[ -f windows/P2Pool/p2pool.exe ]]; check "windows/P2Pool/p2pool.exe"
[[ -f windows/XMRig/xmrig.exe ]]; check "windows/XMRig/xmrig.exe" [[ -f windows/XMRig/xmrig.exe ]]; check "windows/XMRig/xmrig.exe"
# Get random date for tar/zip
title "RNG Date"
DATE=$(date -d @${RNG}); check "DATE ... $DATE"
# Tar Linux Bundle # Tar Linux Bundle
title "Tar Linux" title "Tar Linux"
@ -59,12 +56,12 @@ chmod +x linux/gupaxx
chmod +x linux/p2pool/p2pool chmod +x linux/p2pool/p2pool
chmod +x linux/xmrig/xmrig chmod +x linux/xmrig/xmrig
mv linux "gupaxx-$NEW_VER-linux-x64-bundle"; check "linux -> gupaxx-$NEW_VER-linux-x64-bundle" mv linux "gupaxx-$NEW_VER-linux-x64-bundle"; check "linux -> gupaxx-$NEW_VER-linux-x64-bundle"
tar -czpf "gupaxx-${NEW_VER}-linux-x64-bundle.tar.gz" "gupaxx-$NEW_VER-linux-x64-bundle" --owner=lm --group=lm --mtime="$DATE"; check "tar linux-bundle" tar -czpf "gupaxx-${NEW_VER}-linux-x64-bundle.tar.gz" "gupaxx-$NEW_VER-linux-x64-bundle" --owner=lm --group=lm ; check "tar linux-bundle"
# Tar Linux Standalone # Tar Linux Standalone
mv "gupaxx-$NEW_VER-linux-x64-bundle" "gupaxx-$NEW_VER-linux-x64-standalone"; check "gupaxx-$NEW_VER-linux-x64-bundle -> gupaxx-$NEW_VER-linux-x64-standalone" mv "gupaxx-$NEW_VER-linux-x64-bundle" "gupaxx-$NEW_VER-linux-x64-standalone"; check "gupaxx-$NEW_VER-linux-x64-bundle -> gupaxx-$NEW_VER-linux-x64-standalone"
rm -r "gupaxx-$NEW_VER-linux-x64-standalone/p2pool"; check "rm gupaxx-$NEW_VER-linux-x64-standalone/p2pool" rm -r "gupaxx-$NEW_VER-linux-x64-standalone/p2pool"; check "rm gupaxx-$NEW_VER-linux-x64-standalone/p2pool"
rm -r "gupaxx-$NEW_VER-linux-x64-standalone/xmrig"; check "rm gupaxx-$NEW_VER-linux-x64-standalone/xmrig" rm -r "gupaxx-$NEW_VER-linux-x64-standalone/xmrig"; check "rm gupaxx-$NEW_VER-linux-x64-standalone/xmrig"
tar -czpf "gupaxx-${NEW_VER}-linux-x64-standalone.tar.gz" "gupaxx-$NEW_VER-linux-x64-standalone" --owner=lm --group=lm --mtime="$DATE"; check "tar linux-standalone" tar -czpf "gupaxx-${NEW_VER}-linux-x64-standalone.tar.gz" "gupaxx-$NEW_VER-linux-x64-standalone" --owner=lm --group=lm ; check "tar linux-standalone"
# Remove dir # Remove dir
rm -r "gupaxx-$NEW_VER-linux-x64-standalone"; check "rm linux dir" rm -r "gupaxx-$NEW_VER-linux-x64-standalone"; check "rm linux dir"
@ -72,12 +69,12 @@ rm -r "gupaxx-$NEW_VER-linux-x64-standalone"; check "rm linux dir"
# Tar macOS Bundle # Tar macOS Bundle
title "Tar macOS-x64" title "Tar macOS-x64"
mv macos-x64 "gupaxx-$NEW_VER-macos-x64-bundle"; check "macos-x64 -> gupaxx-$NEW_VER-macos-x64-bundle" mv macos-x64 "gupaxx-$NEW_VER-macos-x64-bundle"; check "macos-x64 -> gupaxx-$NEW_VER-macos-x64-bundle"
tar -czpf "gupaxx-${NEW_VER}-macos-x64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-x64-bundle" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-bundle" tar -czpf "gupaxx-${NEW_VER}-macos-x64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-x64-bundle" --owner=lm --group=lm ; check "tar macos-bundle"
# Tar macOS Standalone # Tar macOS Standalone
mv "gupaxx-$NEW_VER-macos-x64-bundle" "gupaxx-$NEW_VER-macos-x64-standalone"; check "gupaxx-$NEW_VER-macos-x64-bundle -> gupaxx-$NEW_VER-macos-x64-standalone" mv "gupaxx-$NEW_VER-macos-x64-bundle" "gupaxx-$NEW_VER-macos-x64-standalone"; check "gupaxx-$NEW_VER-macos-x64-bundle -> gupaxx-$NEW_VER-macos-x64-standalone"
rm -r "gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/p2pool"; check "rm gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/p2pool" rm -r "gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/p2pool"; check "rm gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/p2pool"
rm -r "gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/xmrig"; check "rm gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/xmrig/xmrig" rm -r "gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/xmrig"; check "rm gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/xmrig/xmrig"
tar -czpf "gupaxx-${NEW_VER}-macos-x64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-x64-standalone" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-x64-standalone" tar -czpf "gupaxx-${NEW_VER}-macos-x64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-x64-standalone" --owner=lm --group=lm ; check "tar macos-x64-standalone"
# Remove dir # Remove dir
rm -r "gupaxx-$NEW_VER-macos-x64-standalone"; check "rm macos-x64 dir" rm -r "gupaxx-$NEW_VER-macos-x64-standalone"; check "rm macos-x64 dir"
@ -85,12 +82,12 @@ rm -r "gupaxx-$NEW_VER-macos-x64-standalone"; check "rm macos-x64 dir"
# Tar macOS Bundle # Tar macOS Bundle
title "Tar macOS-arm64" title "Tar macOS-arm64"
mv macos-arm64 "gupaxx-$NEW_VER-macos-arm64-bundle"; check "macos-arm64 -> gupaxx-$NEW_VER-macos-arm64-bundle" mv macos-arm64 "gupaxx-$NEW_VER-macos-arm64-bundle"; check "macos-arm64 -> gupaxx-$NEW_VER-macos-arm64-bundle"
tar -czpf "gupaxx-${NEW_VER}-macos-arm64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-arm64-bundle" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-arm64-bundle" tar -czpf "gupaxx-${NEW_VER}-macos-arm64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-arm64-bundle" --owner=lm --group=lm ; check "tar macos-arm64-bundle"
# Tar macOS Standalone # Tar macOS Standalone
mv "gupaxx-$NEW_VER-macos-arm64-bundle" "gupaxx-$NEW_VER-macos-arm64-standalone"; check "gupaxx-$NEW_VER-macos-arm64-bundle -> gupaxx-$NEW_VER-macos-arm64-standalone" mv "gupaxx-$NEW_VER-macos-arm64-bundle" "gupaxx-$NEW_VER-macos-arm64-standalone"; check "gupaxx-$NEW_VER-macos-arm64-bundle -> gupaxx-$NEW_VER-macos-arm64-standalone"
rm -r "gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/p2pool"; check "rm gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/p2pool" rm -r "gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/p2pool"; check "rm gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/p2pool"
rm -r "gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/xmrig"; check "rm gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/xmrig/xmrig" rm -r "gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/xmrig"; check "rm gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/xmrig/xmrig"
tar -czpf "gupaxx-${NEW_VER}-macos-arm64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-arm64-standalone" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-arm64-standalone" tar -czpf "gupaxx-${NEW_VER}-macos-arm64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-arm64-standalone" --owner=lm --group=lm ; check "tar macos-arm64-standalone"
# Remove dir # Remove dir
rm -r "gupaxx-$NEW_VER-macos-arm64-standalone"; check "rm macos dir" rm -r "gupaxx-$NEW_VER-macos-arm64-standalone"; check "rm macos dir"

View file

@ -1 +1 @@
./gupax ./gupaxx