Merge pull request #965 from guydavis/develop

Testing latest Chia RC

CHANGELOG.md

@@ -3,10 +3,13 @@
 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).
 
 ## [Unreleased]
+### Added
+- Optionally launch Chia Data Layer services (https://docs.chia.net/guides/datalayer-user-guide/) if env var `chia_data=true` is set.
 ### Changed
  - Harvester mode will now optionally also run chia-exporter for Prometheus results.
 ### Updated
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.5) to v2.1.5 - misc improvements, see their release notes.
+ - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/v2.1.4) to v2.1.4.
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.4.giga26) to v2.1.4.giga26.
 
 ## [2.1.4] - 2024-01-11

CREDITS.md

@@ -94,6 +94,7 @@ A big thanks to all that contributed with dev and test including:
 * @slowfinger
 * @ToTo
 * @Finball
+* @chris-merritt
 
 ## Trademark Notice
 CHIA NETWORK INC, CHIA™, the CHIA BLOCKCHAIN™, the CHIA PROTOCOL™, CHIALISP™ and the “leaf Logo” (including the leaf logo alone when it refers to or indicates Chia), are trademarks or registered trademarks of Chia Network, Inc., a Delaware corporation.  *There is no affliation between this Machinaris project and the main Chia Network project.*

VERSION

@@ -1 +1 @@
-2.1.5
+2.2.0

docker/dockerfile

@@ -101,6 +101,7 @@ ENV keys="/root/.chia/mnemonic.txt"
 ENV plots_dir="/plots"
 # One of fullnode, farmer, harvester, plotter, farmer+plotter, harvester+plotter. Default is fullnode
 ENV mode="fullnode"
+ENV chia_data="false"
 ENV chia_exporter="false"
 ENV chives_masternode="false"
 ENV gigahorse_recompute_server="false"

scripts/forks/cactus_install.sh

@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2023-08-24
-HASH=5e000ae5c26fd5799a025527720559fb2252b1d3
+# On 2024-01-24
+HASH=a1b033bfed034a699e14bd93ed356b7f8207e077
 
 if [ -z ${CACTUS_BRANCH} ]; then
     echo 'Skipping Cactus install as not requested.'

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.1.4/chia-blockchain-cli_2.1.4-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.2.0-rc1/chia-blockchain-cli_2.2.0rc1-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.4/chia-blockchain-cli_2.1.4-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.2.0-rc1/chia-blockchain-cli_2.2.0rc1-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     fi
 

scripts/forks/chia_launch.sh

@@ -99,6 +99,11 @@ if [[ ${mode} =~ ^fullnode.* ]]; then
     echo "Starting Chia Exporter service for Prometheus reporting..."
     sleep 20 && /usr/local/bin/chia-exporter serve 2>&1 > /root/.chia/mainnet/log/chia-exporter.log &
   fi
+  if [[ ${chia_data} == "true" ]]; then
+    echo "Starting Chia Data Layer services..."
+    sleep 20 && chia start data 2>&1 > /root/.chia/mainnet/log/chia-data.log &
+    sleep 20 && chia start data_layer_http 2>&1 >> /root/.chia/mainnet/log/chia-data.log &
+  fi
   if [[ ${mode} =~ .*timelord$ ]]; then
     if [ ! -f vdf_bench ]; then
         echo "Building timelord binaries..."