From 681d806f30d3c2b67a1772b5e54ad4cd765d64d2 Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:13:05 +0300 Subject: [PATCH 1/9] menu test --- quilibrium_for_dummies.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quilibrium_for_dummies.sh b/quilibrium_for_dummies.sh index 64b43ea..ac883a6 100644 --- a/quilibrium_for_dummies.sh +++ b/quilibrium_for_dummies.sh @@ -441,14 +441,14 @@ echo " |_____/ \____|_|_|_|_|_|_|_|\____|___/ " - echo "Welcome you Dummy! What would you like to do today?" + echo "Welcome you Dummy!" echo "Please choose an option:" - echo "1) Install Prerequisites" - echo "2) Install Node" - echo "3) Configure grpCurl" - echo "4) Update Node" + echo "1) Install Prerequisites 4) Update Node 8) Restart Node" + echo "2) Install Node 5) Check Visibility 9) Stop Node" + echo "3) Configure grpCurl 6) Node Info e) Exit" + echo "4) Update Node 7) Node Logs" echo "5) Check Visibility" echo "6) Node Info" echo "7) Node Logs" From f4c5e66ea66e5fc5321f00ef2e9a1728f041f6cd Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:13:54 +0300 Subject: [PATCH 2/9] menu fix --- quilibrium_for_dummies.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/quilibrium_for_dummies.sh b/quilibrium_for_dummies.sh index ac883a6..0b720b6 100644 --- a/quilibrium_for_dummies.sh +++ b/quilibrium_for_dummies.sh @@ -450,12 +450,7 @@ echo " echo "3) Configure grpCurl 6) Node Info e) Exit" echo "4) Update Node 7) Node Logs" echo "5) Check Visibility" - echo "6) Node Info" - echo "7) Node Logs" - echo "8) Restart Node" - echo "9) Stop Node" - echo "e) Exit" - + read -p "Enter your choice: " choice case $choice in From 291dd31a5761465bbdfea4f25656afd24d81fa0e Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:19:05 +0300 Subject: [PATCH 3/9] Welcome screen --- quilibrium_for_dummies.sh | 40 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/quilibrium_for_dummies.sh b/quilibrium_for_dummies.sh index 0b720b6..57d7571 100644 --- a/quilibrium_for_dummies.sh +++ b/quilibrium_for_dummies.sh @@ -419,30 +419,32 @@ while true; do echo "Welcome to Quilibrium for Dummies!" echo " - _____ _ _ _ _ _ - / ___ \ (_) (_) | (_) - | | | |_ _ _| |_| | _ ____ _ _ _ ____ - | | |_| | | | | | | || \ / ___) | | | | \ - \ \____| |_| | | | | |_) ) | | | |_| | | | | - \_____)\____|_|_|_|____/|_| |_|\____|_|_|_| + _____ _ _ _ _ _ + / ___ \ (_) (_) | (_) + | | | |_ _ _| |_| | _ ____ _ _ _ ____ + | | |_| | | | | | | || \ / ___) | | | | \ + \ \____| |_| | | | | |_) ) | | | |_| | | | | + \_____)\____|_|_|_|____/|_| |_|\____|_|_|_| - ___ - / __) - | |__ ___ ____ - | __) _ \ / ___) - | | | |_| | | - _| \___/|_| + ___ + / __) + | |__ ___ ____ + | __) _ \ / ___) + | | | |_| | | + _| \___/|_| - _____ _ - (____ \ (_) - _ \ \ _ _ ____ ____ _ ____ ___ - | | | | | | | \| \| |/ _ )/___) - | |__/ /| |_| | | | | | | | ( (/ /|___ | - |_____/ \____|_|_|_|_|_|_|_|\____|___/ + _____ _ + (____ \ (_) + _ \ \ _ _ ____ ____ _ ____ ___ + | | | | | | | \| \| |/ _ )/___) + | |__/ /| |_| | | | | | | | ( (/ /|___ | + |_____/ \____|_|_|_|_|_|_|_|\____|___/ " echo "Welcome you Dummy!" - + echo "Please follow insturctions very carefully" + echo "Please install prerequisites first, then install node, lastly configure grpcurl. Do not forget to restart the node after configuration." + echo "Please choose an option:" echo "1) Install Prerequisites 4) Update Node 8) Restart Node" From c4e00be2506f566ee62d5ae75214afc8bec6cd33 Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:21:58 +0300 Subject: [PATCH 4/9] welcome screen --- quilibrium_for_dummies.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/quilibrium_for_dummies.sh b/quilibrium_for_dummies.sh index 57d7571..371dd10 100644 --- a/quilibrium_for_dummies.sh +++ b/quilibrium_for_dummies.sh @@ -443,16 +443,17 @@ echo " echo "Welcome you Dummy!" echo "Please follow insturctions very carefully" - echo "Please install prerequisites first, then install node, lastly configure grpcurl. Do not forget to restart the node after configuration." - + echo "Please install prerequisites first, then install node, lastly configure grpcurl." + echo "Do not forget to restart the node after configuration." + echo "" echo "Please choose an option:" - + echo "" echo "1) Install Prerequisites 4) Update Node 8) Restart Node" echo "2) Install Node 5) Check Visibility 9) Stop Node" echo "3) Configure grpCurl 6) Node Info e) Exit" echo "4) Update Node 7) Node Logs" echo "5) Check Visibility" - + echo "" read -p "Enter your choice: " choice case $choice in @@ -468,6 +469,6 @@ echo " e) break ;; *) echo "Invalid option, please try again." ;; esac - + echo "" read -n 1 -s -r -p "Press any key to continue" done \ No newline at end of file From 2069841d2ffe481b65a75b73f32c8b93ce0de380 Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:24:35 +0300 Subject: [PATCH 5/9] bugfix and benchmark --- .gitignore | 4 +++- profile/.profile | 3 ++- quilibrium_for_dummies.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8eeea1e..a85122a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ ssh.bat visibility/ visibility/visibility.py -visibility/peerlist.xml \ No newline at end of file +visibility/peerlist.xml +backup.sh +quilibrium_for_pros.sh \ No newline at end of file diff --git a/profile/.profile b/profile/.profile index 0c3ef83..55323fe 100644 --- a/profile/.profile +++ b/profile/.profile @@ -54,4 +54,5 @@ alias balance='cd ~/ceremonyclient/node && ./${NODE_BINARY} -balance && cd ~' alias nlog='sudo journalctl -u ceremonyclient.service -f --no-hostname -o cat' alias nstart='service ceremonyclient start' alias nrestart='service ceremonyclient restart' -alias nstop='service ceremonyclient stop' \ No newline at end of file +alias nstop='service ceremonyclient stop' +alias benchmark='last_next_difficulty=$(journalctl -u ceremonyclient -ocat -n 100 | grep difficulty | awk -F'"'"'[:,}]'"'"' '"'"'{for(i=1;i<=NF;i++){if($i~"next_difficulty_metric"){gsub(/[ "]/,"",$i); print $(i+1)}}}'"'"' | tail -n 1) && cpus=$(nproc) && echo "" && echo "Your Benchmark Details" && echo "Difficulty: $last_next_difficulty" && echo "CPU(s): $cpus" && if [ $cpus -gt 0 ]; then difficulty_per_core=$(echo "scale=2; ($cpus*$cpus*1000)/$last_next_difficulty" | bc); echo "Score: $difficulty_per_core"; fi' \ No newline at end of file diff --git a/quilibrium_for_dummies.sh b/quilibrium_for_dummies.sh index 371dd10..d9ec593 100644 --- a/quilibrium_for_dummies.sh +++ b/quilibrium_for_dummies.sh @@ -26,7 +26,7 @@ elif [ "$ARCH" = "aarch64" ]; then NODE_BINARY="node-$VERSION-linux-arm64" GO_BINARY="go1.20.14.linux-arm64.tar.gz" elif [ "$OS" = "Darwin" ]; then - NODE_BINARY="node-$VERSION-darwin-arm64.tar.gz" + NODE_BINARY="node-$VERSION-darwin-arm64" GO_BINARY="go1.20.14.linux-arm64.tar.gz" fi fi From fa3e82aa857c782909dacd665a9eb5e75944d5d6 Mon Sep 17 00:00:00 2001 From: Lenny Date: Fri, 7 Jun 2024 14:14:50 +0800 Subject: [PATCH 6/9] check cpulimit command --- install/install_quilibrium_service.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/install/install_quilibrium_service.sh b/install/install_quilibrium_service.sh index 094c2e7..6ab1f69 100644 --- a/install/install_quilibrium_service.sh +++ b/install/install_quilibrium_service.sh @@ -33,6 +33,15 @@ else echo "git is installed" fi +if ! command -v cpulimit &> /dev/null +then + echo "cpulimit could not be found" + echo "Installing cpulimit..." + su -c "apt update && apt install cpulimit -y" +else + echo "cpulimit is installed" +fi + sudo apt upgrade -y From bc1eb08d58ae836543163c2c515dfeb7d446c829 Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:16:46 +0300 Subject: [PATCH 7/9] backup --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a85122a..db2cf0b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ visibility/ visibility/visibility.py visibility/peerlist.xml backup.sh +backup_ozgur.sh quilibrium_for_pros.sh \ No newline at end of file From c6f176abb2fd4ae8f9ba14a2555f082658c9298c Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:45:52 +0300 Subject: [PATCH 8/9] gitignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index db2cf0b..65e9f5e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ ssh.bat visibility/ visibility/visibility.py visibility/peerlist.xml -backup.sh -backup_ozgur.sh +backup/backup.sh +backup/backup_ozgur.sh quilibrium_for_pros.sh \ No newline at end of file From 136af1b15dc2ab1fca370ad49074a21b795dbbc6 Mon Sep 17 00:00:00 2001 From: 0xOzgur <29779769+0xOzgur@users.noreply.github.com> Date: Sat, 8 Jun 2024 10:50:10 +0300 Subject: [PATCH 9/9] menu fix --- quilibrium_for_dummies.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quilibrium_for_dummies.sh b/quilibrium_for_dummies.sh index d9ec593..e6da1c4 100644 --- a/quilibrium_for_dummies.sh +++ b/quilibrium_for_dummies.sh @@ -448,11 +448,11 @@ echo " echo "" echo "Please choose an option:" echo "" - echo "1) Install Prerequisites 4) Update Node 8) Restart Node" - echo "2) Install Node 5) Check Visibility 9) Stop Node" - echo "3) Configure grpCurl 6) Node Info e) Exit" - echo "4) Update Node 7) Node Logs" - echo "5) Check Visibility" + echo "1) Install Prerequisites 5) Check Visibility 9) Stop Node" + echo "2) Install Node 6) Node Info e) Exit" + echo "3) Configure grpCurl 7) Node Logs " + echo "4) Update Node 8) Restart Node" + echo "" read -p "Enter your choice: " choice