Merge pull request #918 from guydavis/develop

v2.0.0
guydavis · Aug 24, 2023 · 1a75519 · 1a75519
2 parents f0c80a1 + 9eee525
commit 1a75519
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.0] - 2023-08-?
+## [2.0.0] - 2023-08-24
 ### Added
  - Request a new plot check, via 'Recheck' button added to Check results dialog on Farming page.  
  - Optionally exclude certain plot directories from replotting check to free disk space. Useful for drives only partially dedicated to holding plots.

diff --git a/docker/dockerfile b/docker/dockerfile
@@ -138,6 +138,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
 ENV XDG_CONFIG_HOME=/root/.chia
 ENV AUTO_PLOT=false
+ENV AUTO_ARCHIVE=false
 ENV PLOTMAN_BRANCH=${PLOTMAN_BRANCH}
 ENV CHIADOG_BRANCH=${CHIADOG_BRANCH}
 ENV FDCLI_BRANCH=${FDCLI_BRANCH}

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
@@ -27,10 +27,10 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" = "x86_64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0/chia-blockchain-cli_2.0.0-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     elif [[ "${arch_name}" = "arm64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0-rc6/chia-blockchain-cli_2.0.0rc6-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.0.0/chia-blockchain-cli_2.0.0-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
         echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}"

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
@@ -36,15 +36,13 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Please be patient as this takes hours now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
   # Latest Blockchain DB, first try direct download, then fallback to slower torrent
-  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent")
+  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https://torrents.chia.net/databases/mainnet/mainnet.\d{4}-\d{2}-\d{2}.tar.gz.torrent")
   echo "Please be patient! Downloading blockchain database indirectly (via libtorrent) from: "
   echo "    ${torrent}"
   curl -skLJ -O ${torrent}
-  #deactivate # Use the system python
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
-  #cd /chia-blockchain && . ./activate # Re-activate
   echo "Now decompressing the blockchain database..."
-  cd /root/.chia/mainnet/db/chia && gunzip *.gz
+  cd /root/.chia/mainnet/db/chia && tar -xf *.gz
   cd /root/.chia/mainnet/db
   mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.*.sqlite blockchain_v2_mainnet.sqlite
   rm -rf /root/.chia/mainnet/db/chia

diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh
@@ -32,16 +32,14 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Downloading Chia blockchain DB (many GBs in size) on first launch..."
   echo "Please be patient as this takes hours now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
-  # Latest Blockchain DB, first try direct download, then fallback to slower torrent
-  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent")
+    # Latest Blockchain DB, first try direct download, then fallback to slower torrent
+  torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https://torrents.chia.net/databases/mainnet/mainnet.\d{4}-\d{2}-\d{2}.tar.gz.torrent")
   echo "Please be patient! Downloading blockchain database indirectly (via libtorrent) from: "
   echo "    ${torrent}"
   curl -skLJ -O ${torrent}
-  deactivate 2>&1 >/dev/null # Use the system python
   /usr/bin/python /machinaris/scripts/chiadb_download.py $PWD/*.torrent >> /tmp/chiadb_download.log 2>&1
-  cd /chia-blockchain && . ./activate # Re-activate
   echo "Now decompressing the blockchain database..."
-  cd /root/.chia/mainnet/db/chia && gunzip *.gz
+  cd /root/.chia/mainnet/db/chia && tar -xf *.gz
   cd /root/.chia/mainnet/db
   mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.*.sqlite blockchain_v2_mainnet.sqlite
   rm -rf /root/.chia/mainnet/db/chia

diff --git a/scripts/plotman_autoplot.sh b/scripts/plotman_autoplot.sh
@@ -1,11 +1,15 @@
 #!/bin/env bash
 #
-# Starts Plotman, when AUTO_PLOT enabled, on a Chia/Chives fullnode or a plotter instance
+# Starts Plotman, when AUTO_PLOT/AUTO_ARCHIVE are enabled, on a Chia/Chives/MMX/Gigahorse fullnode or a plotter instance
 #
 
 if [[ (${mode} =~ ^fullnode.*  || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx' || ${blockchains} == 'gigahorse') ]]; then
     # Start plotting automatically if requested (not the default)
     if [ ${AUTO_PLOT,,} = "true" ]; then
         nohup plotman plot >> /root/.chia/plotman/logs/plotman.log 2>&1 &
     fi
+    # Start archiving automatically if requested (not the default)
+    if [ ${AUTO_ARCHIVE,,} = "true" ]; then
+        nohup plotman archive >> /root/.chia/plotman/logs/archiver.log 2>&1 &
+    fi
 fi