Merge branch 'v1.4.18' into patch-1

2024-05-26 17:11:41 +03:00 · 2024-05-26 17:11:41 +03:00 · 736f2f5385
commit 736f2f5385
parent d6697b952e 6df2c7e7dd
5 changed files with 62 additions and 23 deletions
--- a/install/install_quilibrium_service.sh
+++ b/install/install_quilibrium_service.sh
@ -2,7 +2,9 @@

 cd ~
 # Step 0: Welcome
-echo "This script is made with ❤️ by 0xOzgur.eth"
+echo "This script is made with ❤️ by https://quilibrium.space @ 0xOzgur.eth"
+echo "The script is prepared for Ubuntu machines. If you are using another operating system, please check the compatibility of the script."
+echo "The script doesn't install GO or GrpCurl packages. If you want to install them please visit https://docs.quilibrium.space/installing-prerequisites page."
 echo "⏳Enjoy and sit back while you are building your Quilibrium Node!"
 echo "⏳Processing..."
 sleep 10  # Add a 10-second delay
@ -12,10 +14,9 @@ sleep 10  # Add a 10-second delay
 echo "Updating the machine"
 echo "⏳Processing..."
 sleep 2  # Add a 2-second delay
-apt update
-apt upgrade -y
-apt install sudo -y
-apt install git -y
+sudo apt update
+sudo apt upgrade -y
+sudo apt install git -y

 # Step 2: Adjust network buffer sizes
 echo "Adjusting network buffer sizes..."
@ -58,20 +59,37 @@ fi
 echo "⏳Downloading Ceremonyclient"
 sleep 1  # Add a 1-second delay
 cd ~
-git clone https://github.com/QuilibriumNetwork/ceremonyclient.git
+if [ -d "ceremonyclient" ]; then
+  echo "Directory ceremonyclient already exists, skipping git clone..."
+else
+  until git clone https://github.com/QuilibriumNetwork/ceremonyclient.git; do
+    echo "Git clone failed, retrying..."
+    sleep 2
+  done
+fi
 cd ~/ceremonyclient/
 git checkout release

+# Set the version number
+VERSION="1.4.18"
+
 # Get the system architecture
 ARCH=$(uname -m)

+
 # Step 5:Determine the ExecStart line based on the architecture
+# Get the current user's home directory
+HOME=$(eval echo ~$HOME_DIR)
+
+# Use the home directory in the path
+NODE_PATH="$HOME/ceremonyclient/node"
+
 if [ "$ARCH" = "x86_64" ]; then
-    EXEC_START="/root/ceremonyclient/node/node-1.4.18-linux-amd64"
+    EXEC_START="$NODE_PATH/node-$VERSION-linux-amd64"
 elif [ "$ARCH" = "aarch64" ]; then
-    EXEC_START="/root/ceremonyclient/node/node-1.4.18-linux-arm64"
+    EXEC_START="$NODE_PATH/node-$VERSION-linux-arm64"
 elif [ "$ARCH" = "arm64" ]; then
-    EXEC_START="/root/ceremonyclient/node/node-1.4.18-darwin-arm64"
+    EXEC_START="$NODE_PATH/node-$VERSION-darwin-arm64"
 else
    echo "Unsupported architecture: $ARCH"
    exit 1
@ -81,6 +99,7 @@ fi
 echo "⏳ Re-Creating Ceremonyclient Service"
 sleep 2  # Add a 2-second delay

+
 # Check if the file exists before attempting to remove it
 if [ -f "/lib/systemd/system/ceremonyclient.service" ]; then
    # If the file exists, remove it
@ -105,12 +124,13 @@ ExecStart=$EXEC_START
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable ceremonyclient
+sudo systemctl daemon-reload
+sudo systemctl enable ceremonyclient

 # Step 7: Start the ceremonyclient service
 echo "✅Starting Ceremonyclient Service"
 sleep 1  # Add a 1-second delay
-service ceremonyclient start
+sudo service ceremonyclient start

 # Step 8: See the logs of the ceremonyclient service
 echo "🎉Welcome to Quilibrium Ceremonyclient"
--- a/profile/.bash_profile
+++ b/profile/.bash_profile
@ -22,7 +22,16 @@ alias wttr='curl wttr.in'
 neofetch


-alias peer-count='cd ~/ceremonyclient/node && grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerInfo | grep peerId | wc -l && cd ~'
+alias dpeer-count='cd ~/ceremonyclient/ && docker compose exec node grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerManifests | grep peerId | wc -l'
+alias dnode-info='cd ~/ceremonyclient/ && docker compose exec node node -node-info && cd ~'
+alias ddb-console='cd ~/ceremonyclient/ && - docker compose exec node node --db-console && cd ~'
+alias dbalance='cd ~/ceremonyclient/ && docker compose exec node node -balance && cd ~'
+alias dlog='cd ~/ceremonyclient/ && docker compose logs -f -n, --tail 100 && cd ~'
+alias dstart='cd ~/ceremonyclient/ && docker compose up -d && cd ~'
+alias drestart='cd ~/ceremonyclient/ && docker compose down && docker compose up -d && cd ~'
+alias dstop='cd ~/ceremonyclient/ && docker compose down && cd ~'
+
+alias peer-count='cd ~/ceremonyclient/node && grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerManifests | grep peerId | wc -l && cd ~'
 alias node-info='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 -node-info && cd ~'
 alias db-console='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 --db-console && cd ~'
 alias balance='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 -balance && cd ~'
--- a/profile/.profile_binary
+++ b/profile/.profile_binary
@ -18,7 +18,7 @@ alias wttr='curl wttr.in'
 neofetch


-alias peer-count='cd ~/ceremonyclient/node && grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerInfo | grep peerId | wc -l && cd ~'
+alias peer-count='cd ~/ceremonyclient/node && grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerManifests | grep peerId | wc -l && cd ~'
 alias PeerManifests='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 -node-info && cd ~'
 alias db-console='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 --db-console && cd ~'
 alias balance='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 -balance && cd ~'
--- a/profile/.profile_docker
+++ b/profile/.profile_docker
@ -18,7 +18,7 @@ alias wttr='curl wttr.in'
 neofetch


-alias dpeer-count='cd ~/ceremonyclient/ && docker compose exec node grpcurl -plaintext -max-msg-sz 5000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerInfo | grep peerId | wc -l'
+alias dpeer-count='cd ~/ceremonyclient/ && docker compose exec node grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerManifests | grep peerId | wc -l'
 alias dnode-info='cd ~/ceremonyclient/ && docker compose exec node node -node-info && cd ~'
 alias ddb-console='cd ~/ceremonyclient/ && - docker compose exec node node --db-console && cd ~'
 alias dbalance='cd ~/ceremonyclient/ && docker compose exec node node -balance && cd ~'
@ -27,7 +27,7 @@ alias dstart='cd ~/ceremonyclient/ && docker compose up -d && cd ~'
 alias drestart='cd ~/ceremonyclient/ && docker compose down && docker compose up -d && cd ~'
 alias dstop='cd ~/ceremonyclient/ && docker compose down && cd ~'

-alias peer-count='cd ~/ceremonyclient/node && grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerInfo | grep peerId | wc -l && cd ~'
+alias peer-count='cd ~/ceremonyclient/node && grpcurl -plaintext -max-msg-sz 150000000 localhost:8337 quilibrium.node.node.pb.NodeService.GetPeerManifests | grep peerId | wc -l && cd ~'
 alias node-info='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 -node-info && cd ~'
 alias db-console='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 --db-console && cd ~'
 alias balance='cd ~/ceremonyclient/node && ./node-1.4.18-linux-amd64 -balance && cd ~'
--- a/update.sh
+++ b/update.sh
@ -1,8 +1,9 @@
 #!/bin/bash

 # Step 0: Welcome
-echo "This script is made with ❤️ by 0xOzgur.eth"
+echo "This script is made with ❤️ by https://quilibrium.space @ 0xOzgur.eth"
 echo "⏳Enjoy and sit back while you are upgrading your Quilibrium Node to v1.4.18!"
+echo "The script is prepared for Ubuntu machines. If you are using another operating system, please check the compatibility of the script."
 echo "⏳Processing..."
 sleep 10  # Add a 10-second delay

@ -15,16 +16,25 @@ cd  ~/ceremonyclient
 git pull
 git checkout release

+# Set the version number
+VERSION="1.4.18"
+
 # Get the system architecture
 ARCH=$(uname -m)

-# Determine the ExecStart line based on the architecture
+# Get the current user's home directory
+HOME=$(eval echo ~$HOME_DIR)
+
+# Use the home directory in the path
+NODE_PATH="$HOME/ceremonyclient/node"
+
+# Step10.1:Determine the ExecStart line based on the architecture
 if [ "$ARCH" = "x86_64" ]; then
-    EXEC_START="/root/ceremonyclient/node/node-1.4.18-linux-amd64"
+    EXEC_START="$NODE_PATH/node-$VERSION-linux-amd64"
 elif [ "$ARCH" = "aarch64" ]; then
-    EXEC_START="/root/ceremonyclient/node/node-1.4.18-linux-arm64"
+    EXEC_START="$NODE_PATH/node-$VERSION-linux-arm64"
 elif [ "$ARCH" = "arm64" ]; then
-    EXEC_START="/root/ceremonyclient/node/node-1.4.18-darwin-arm64"
+    EXEC_START="$NODE_PATH/node-$VERSION-darwin-arm64"
 else
    echo "Unsupported architecture: $ARCH"
    exit 1
@ -52,9 +62,9 @@ EOF
 # Step 4:Start the ceremonyclient service
 echo "✅ Starting Ceremonyclient Service"
 sleep 2  # Add a 2-second delay
-systemctl daemon-reload
-systemctl enable ceremonyclient
-service ceremonyclient start
+sudo systemctl daemon-reload
+sudo systemctl enable ceremonyclient
+sudo service ceremonyclient start

 # See the logs of the ceremonyclient service
 echo "🎉 Welcome to Quilibrium Ceremonyclient v1.4.18"