From 118685db176268f7b4be0014a53c92a2810b403e Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 26 Jun 2021 13:50:20 -0600 Subject: [PATCH 0001/1625] Calculate ETW for entire farm, not just fullnode. Fix for #118. --- api/__init__.py | 24 ----------------- api/migrations/README | 42 ++++++++++++++++++++++++++++- api/views/ping/resources.py | 2 +- common/utils/converters.py | 53 +++++++++++++++++++++++++++++++++++-- web/models/chia.py | 18 +++++++++++++ 5 files changed, 111 insertions(+), 28 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 1d91a2fa..28800dca 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -35,27 +35,3 @@ def set_sqlite_pragma(dbapi_connection, connection_record): api = extensions.create_api(app) views.register_blueprints(api) - -# -# Notes about using flask-migrate to manage schema: -# From then on as developer, modify models, then run this to generate a new migration and commit it. -# cd /code/machinaris/api -# FLASK_APP=__init__.py flask db migrate -> Creates migration based on current model. -# -# Then in scripts/setup_databases.sh, this is run on each launch -# cd /machinaris/api -# FLASK_APP=__init__.py flask db upgrade -> Applies migrations against old db -# -# -# Notes about the initial setup: -# -# To create very first migration, point to empty sqlite db, by putting these default_settings.py -#SQLALCHEMY_DATABASE_URI = 'sqlite:///' -#SQLALCHEMY_BINDS = { -# 'stats': 'sqlite:///', -# 'chiadog': 'sqlite:///', -#} -# cd /code/machinaris/api -# FLASK_APP=__init__.py flask db init --multidb -# FLASK_APP=__init__.py flask db migrate -# \ No newline at end of file diff --git a/api/migrations/README b/api/migrations/README index 98e4f9c4..2d5a97b2 100644 --- a/api/migrations/README +++ b/api/migrations/README @@ -1 +1,41 @@ -Generic single-database configuration. \ No newline at end of file +Schema versioning with Flask-Migrate + +## Creating a migration +As developer, modify models, then run this to generate a new migration and commit it. + +``` +cd /code/machinaris/api +FLASK_APP=__init__.py flask db migrate +``` +This creates migration based on current model. + +## Testing a migration + +Run scripts/setup_databases.sh manually. (This is run on each launch of the container) + +``` +cd /machinaris/api +FLASK_APP=__init__.py flask db upgrade +``` + +This applies migrations against old db + +## Initial Setup of Flask-migrate + +Note, initial adoption of flask-migrate happened in June, 2021 and should not need to be repeated. + +To create very first migration, point to empty sqlite db, by putting these default_settings.py + +``` +SQLALCHEMY_DATABASE_URI = 'sqlite:///' +SQLALCHEMY_BINDS = { + 'stats': 'sqlite:///', + 'chiadog': 'sqlite:///', +} +``` +then: +``` +cd /code/machinaris/api +FLASK_APP=__init__.py flask db init --multidb +FLASK_APP=__init__.py flask db migrate +``` diff --git a/api/views/ping/resources.py b/api/views/ping/resources.py index 73845e0e..b90b7d12 100644 --- a/api/views/ping/resources.py +++ b/api/views/ping/resources.py @@ -22,7 +22,7 @@ class Logs(MethodView): def get(self): response = make_response( """Pong! - """, 200) +""", 200) response.mimetype = "plain/text" return response diff --git a/common/utils/converters.py b/common/utils/converters.py index 6e9ce780..dc953b06 100644 --- a/common/utils/converters.py +++ b/common/utils/converters.py @@ -32,7 +32,17 @@ def str_to_gibs(str): logging.info(traceback.format_exc()) return None -# Convert expected time to win back to minutes. See https://github.com/Chia-Network/chia-blockchain/blob/9e21716965f6f6250f6fe4b3449a66f20794d3d9/chia/util/misc.py#L18 + + + + +################################################################################################## +# +# Chia™-blockchain - Apache Software License code below. +# For full license see: https://github.com/Chia-Network/chia-blockchain/blob/main/LICENSE +# +# Convert expected time to win back to minutes. +# See https://github.com/Chia-Network/chia-blockchain/blob/9e21716965f6f6250f6fe4b3449a66f20794d3d9/chia/util/misc.py#L18 def etw_to_minutes(etw): logging.info("ETW='{0}'".format(etw)) etw_total_minutes = 0 @@ -59,4 +69,43 @@ def etw_to_minutes(etw): match = re.search("(\d+) minute", etw) if match: etw_total_minutes += int(match.group(1), etw) - return etw_total_minutes \ No newline at end of file + return etw_total_minutes + +# Convert an expected time to win in minutes into human-readable units. +# https://github.com/Chia-Network/chia-blockchain/blob/9e21716965f6f6250f6fe4b3449a66f20794d3d9/chia/util/misc.py#L18 +def format_minutes(minutes: int) -> str: + if not isinstance(minutes, int): + return "Invalid" + if minutes == 0: + return "Now" + hour_minutes = 60 + day_minutes = 24 * hour_minutes + week_minutes = 7 * day_minutes + months_minutes = 43800 + year_minutes = 12 * months_minutes + years = int(minutes / year_minutes) + months = int(minutes / months_minutes) + weeks = int(minutes / week_minutes) + days = int(minutes / day_minutes) + hours = int(minutes / hour_minutes) + def format_unit_string(str_unit: str, count: int) -> str: + return f"{count} {str_unit}{('s' if count > 1 else '')}" + def format_unit(unit: str, count: int, unit_minutes: int, next_unit: str, next_unit_minutes: int) -> str: + formatted = format_unit_string(unit, count) + minutes_left = minutes % unit_minutes + if minutes_left >= next_unit_minutes: + formatted += " and " + format_unit_string(next_unit, int(minutes_left / next_unit_minutes)) + return formatted + if years > 0: + return format_unit("year", years, year_minutes, "month", months_minutes) + if months > 0: + return format_unit("month", months, months_minutes, "week", week_minutes) + if weeks > 0: + return format_unit("week", weeks, week_minutes, "day", day_minutes) + if days > 0: + return format_unit("day", days, day_minutes, "hour", hour_minutes) + if hours > 0: + return format_unit("hour", hours, hour_minutes, "minute", 1) + if minutes > 0: + return format_unit_string("minute", minutes) + return "Unknown" diff --git a/web/models/chia.py b/web/models/chia.py index 992f3fad..c55649b3 100644 --- a/web/models/chia.py +++ b/web/models/chia.py @@ -19,17 +19,22 @@ def __init__(self, farms): self.netspace_size = 0 self.netspace_display_size = "?" self.expected_time_to_win = "Unknown" + fullnode_plots_size = 0 for farm in farms: self.plot_count += farm.plot_count self.plots_size += farm.plots_size if farm.mode == "fullnode": self.total_chia = farm.total_chia + fullnode_plots_size = farm.plots_size self.netspace_display_size = converters.gib_to_fmt(farm.netspace_size) self.netspace_size = farm.netspace_size self.status = farm.status self.expected_time_to_win = farm.expected_time_to_win + self.plots_display_size = converters.gib_to_fmt(self.plots_size) self.calc_status(self.status) + if fullnode_plots_size != self.plots_size: # Calculate for full farm including harvesters + self.calc_entire_farm_etw(fullnode_plots_size, self.expected_time_to_win, self.plots_size) def calc_status(self, status): self.status = status @@ -38,6 +43,19 @@ def calc_status(self, status): else: self.display_status = self.status + def calc_entire_farm_etw(self, fullnode_plots_size, expected_time_to_win, total_farm_plots_size): + fullnode_etw_mins = converters.etw_to_minutes(expected_time_to_win) + #app.logger.info("Fullnode Size: {0}".format(fullnode_plots_size)) + #app.logger.info("Total Farm Size: {0}".format(total_farm_plots_size)) + #app.logger.info("Fullnode ETW Minutes: {0}".format(fullnode_etw_mins)) + try: + total_farm_etw_mins = (fullnode_plots_size / total_farm_plots_size) * fullnode_etw_mins + #app.logger.info("Total Farm ETW Minutes: {0}".format(total_farm_etw_mins)) + self.expected_time_to_win = converters.format_minutes(int(total_farm_etw_mins)) + except: + app.logger.debug("Failed to calculate ETW for entire farm due to: {0}".format(traceback.format_exc())) + self.expected_time_to_win = "Unknown" + class FarmPlots: def __init__(self, plots): From c1c3b620f66b65e21bf5aeddfa6904b078d961eb Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 27 Jun 2021 13:58:37 -0600 Subject: [PATCH 0002/1625] Initial support for Flax. --- .github/workflows/develop.yaml | 1 + config/plotman.sample.yaml | 2 +- dockerfile | 40 +++++----------- entrypoint.sh | 86 +++------------------------------- scripts/chia_install.sh | 11 +++++ scripts/chia_launch.sh | 59 +++++++++++++++++++++++ scripts/flax_install.sh | 13 +++++ scripts/flax_launch.sh | 56 ++++++++++++++++++++++ scripts/start_machinaris.sh | 24 ++++++++-- 9 files changed, 179 insertions(+), 113 deletions(-) create mode 100644 scripts/chia_install.sh create mode 100644 scripts/chia_launch.sh create mode 100644 scripts/flax_install.sh create mode 100644 scripts/flax_launch.sh diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml index 7c0b07ad..c5cfd94b 100644 --- a/.github/workflows/develop.yaml +++ b/.github/workflows/develop.yaml @@ -41,6 +41,7 @@ jobs: build-args: | "CHIA_BRANCH=1.1.7" "PATCH_CHIAPOS=true" + "FLAX_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml index cff4a134..7a7e9f9b 100644 --- a/config/plotman.sample.yaml +++ b/config/plotman.sample.yaml @@ -110,5 +110,5 @@ plotting: # The madmax plotter: https://github.com/madMAx43v3r/chia-plotter madmax: - n_threads: 4 # Default is 4, crank up if you have many cores + n_threads: 4 # Default is 4, SLOWLY crank up if you have many cores n_buckets: 256 # Default is 256 diff --git a/dockerfile b/dockerfile index 983596f3..c6d9006f 100644 --- a/dockerfile +++ b/dockerfile @@ -53,6 +53,7 @@ FROM package_stage # Base install of official Chia binaries at the given branch ARG CHIA_BRANCH ARG PATCH_CHIAPOS +ARG FLAX_BRANCH # copy local files COPY . /machinaris/ @@ -60,30 +61,15 @@ COPY . /machinaris/ # set workdir WORKDIR /chia-blockchain -# install Chia using official Chia Blockchain binaries +# Install Chia, Plotman, Chiadog, Madmax, Flax, Machinaris, etc RUN \ - git clone --branch ${CHIA_BRANCH} --single-branch https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain \ - && git submodule update --init mozilla-ca \ - && chmod +x install.sh \ - && /usr/bin/sh ./install.sh \ - \ -# cleanup apt and pip caches - \ - && rm -rf \ - /root/.cache \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* -# install additional tools such as Plotman, Chiadog, and Machinaris -RUN \ - /usr/bin/bash /machinaris/scripts/patch_chiapos.sh ${PATCH_CHIAPOS} \ - && . /machinaris/scripts/chiadog_install.sh \ - && . /machinaris/scripts/plotman_install.sh \ - && . /machinaris/scripts/madmax_install.sh \ - && . /machinaris/scripts/machinaris_install.sh \ - \ -# cleanup apt and pip caches - \ + /usr/bin/bash /machinaris/scripts/chia_install.sh ${CHIA_BRANCH} \ + && /usr/bin/bash /machinaris/scripts/patch_chiapos.sh ${PATCH_CHIAPOS} \ + && /usr/bin/bash /machinaris/scripts/chiadog_install.sh \ + && /usr/bin/bash /machinaris/scripts/plotman_install.sh \ + && /usr/bin/bash /machinaris/scripts/madmax_install.sh \ + && /usr/bin/bash /machinaris/scripts/machinaris_install.sh \ + && /usr/bin/bash /machinaris/scripts/flax_install.sh ${FLAX_BRANCH} \ && rm -rf \ /root/.cache \ /tmp/* \ @@ -96,14 +82,14 @@ 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" -# If mode=plotter, optional 2 public keys will be set in your plotman.yaml +# Default is only the 'chia' blockchain, but can add 'flax' too. A comma-separated list +ENV blockchains=chia +# If provided then these optional 2 public keys will be set in your plotman.yaml ENV farmer_pk="null" ENV pool_pk="null" # If mode=harvester, required for host and port the harvester will your farmer ENV farmer_address="null" ENV farmer_port="8447" -# Only set true if using Chia's old test for testing only, default uses mainnet -ENV testnet="false" # Can override the location of default settings for api and web servers. ENV API_SETTINGS_FILE='/root/.chia/machinaris/config/api.cfg' ENV WEB_SETTINGS_FILE='/root/.chia/machinaris/config/web.cfg' @@ -112,7 +98,7 @@ ENV controller_host="localhost" ENV controller_web_port=8926 ENV controller_api_port=8927 -ENV PATH="${PATH}:/chia-blockchain/venv/bin" +ENV PATH="${PATH}:/chia-blockchain/venv/bin:/flax-blockchain/venv/bin" ENV TZ=Etc/UTC ENV FLASK_ENV=production ENV FLASK_APP=/machinaris/main.py diff --git a/entrypoint.sh b/entrypoint.sh index dada9655..aeb2c185 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,90 +1,16 @@ # -# Configure and launch services for farming, harvesting, and plotting -# Original: https://github.com/Chia-Network/chia-docker/blob/main/entrypoint.sh -# - Improved key generation via webui when no keys found -# - Add plotter-only mode for systems to just run Plotman -# - Start Chiadog log monitoring process -# - Launch the Machinaris web and api servers in the background +# Configure and start plotting and farming services. # -cd /chia-blockchain +# Always launch Chia - required blockchain +/usr/bin/bash /machinaris/scripts/chia_launch.sh -. ./activate - -mkdir -p /root/.chia/mainnet/log -chia init >> /root/.chia/mainnet/log/init.log 2>&1 - -# Loop over provided list of key paths -for k in ${keys//:/ }; do - if [ -f ${k} ]; then - echo "Adding key at path: ${k}" - chia keys add -f ${k} > /dev/null - else - echo "Skipping 'chia keys add' as no file found at: ${k}" - fi -done - -# Loop over provided list of completed plot directories -for p in ${plots_dir//:/ }; do - chia plots add -d ${p} -done - -# import ssh key if exists -if [ -f "/id_rsa" ]; then - echo "/id_rsa exists, trying to import private ssh key" - mkdir -p ~/.ssh/ - cp -f /id_rsa ~/.ssh/id_rsa - #ssh-keygen -y -f ~/.ssh/id_rsa> ~/.ssh/id_rsa.pub || true - cat > ~/.ssh/config <<'_EOF' - Host * - StrictHostKeyChecking no -_EOF - chmod 700 ~/.ssh - chmod 600 ~/.ssh/* -fi - -sed -i 's/localhost/127.0.0.1/g' ~/.chia/mainnet/config/config.yaml - -# Start services based on mode selected. Default is 'fullnode' -if [[ ${mode} == 'fullnode' ]]; then - chia start farmer -elif [[ ${mode} =~ ^farmer.* ]]; then - chia start farmer-only -elif [[ ${mode} =~ ^harvester.* ]]; then - if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then - echo "A farmer peer address and port are required." - exit - else - if [ -d /root/.chia/farmer_ca ]; then - chia init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log - else - echo "Did not find your farmer's ca folder at /root/.chia/farmer_ca." - echo "See: https://github.com/guydavis/machinaris/wiki/Generic#harvester-only" - fi - chia configure --set-farmer-peer ${farmer_address}:${farmer_port} - chia configure --enable-upnp false - chia start harvester -r - fi -elif [[ ${mode} == 'plotter' ]]; then - echo "Starting in Plotter-only mode. Run Plotman from either CLI or WebUI." -fi - -# Optionally use testnet instead of mainnet -if [[ ${testnet} == "true" ]]; then - if [[ -z $full_node_port || $full_node_port == "null" ]]; then - chia configure --set-fullnode-port 58444 - fi -fi - -if [ ! -f /root/.chia/plotman/plotman.yaml ]; then - AUTO_PLOT="false" +# Optionally launch forked blockchains for multi-farming +if [[ ${blockchains} =~ ^flax.* ]]; then + /usr/bin/bash /machinaris/scripts/flax_launch.sh fi # Launch Machinaris web server and other services /machinaris/scripts/start_machinaris.sh -if [ ${AUTO_PLOT,,} = "true" ]; then - plotman plot -fi - while true; do sleep 30; done; diff --git a/scripts/chia_install.sh b/scripts/chia_install.sh new file mode 100644 index 00000000..ef0832d5 --- /dev/null +++ b/scripts/chia_install.sh @@ -0,0 +1,11 @@ +#!/bin/env bash +# +# Installs Chia as per https://github.com/Chia-Network/chia-blockchain/wiki/INSTALL#ubuntudebian +# + +CHIA_BRANCH=$1 + +git clone --branch ${CHIA_BRANCH} --single-branch https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain \ + && git submodule update --init mozilla-ca \ + && chmod +x install.sh \ + && /usr/bin/sh ./install.sh diff --git a/scripts/chia_launch.sh b/scripts/chia_launch.sh new file mode 100644 index 00000000..1e9d74f7 --- /dev/null +++ b/scripts/chia_launch.sh @@ -0,0 +1,59 @@ +#!/bin/env bash +# +# Initialize Chia service, depending on mode of system requested +# + + +cd /chia-blockchain + +. ./activate + +mkdir -p /root/.chia/mainnet/log +chia init >> /root/.chia/mainnet/log/init.log 2>&1 + +echo 'Configuring Chia...' +sed -i 's/log_stdout: true/log_stdout: false/g' /root/.chia/mainnet/config/config.yaml +sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.chia/mainnet/config/config.yaml + +# Loop over provided list of key paths +for k in ${keys//:/ }; do + if [ -f ${k} ]; then + echo "Adding key at path: ${k}" + chia keys add -f ${k} > /dev/null + else + echo "Skipping 'chia keys add' as no file found at: ${k}" + fi +done + +# Loop over provided list of completed plot directories +for p in ${plots_dir//:/ }; do + chia plots add -d ${p} +done + + + +sed -i 's/localhost/127.0.0.1/g' ~/.chia/mainnet/config/config.yaml + +# Start services based on mode selected. Default is 'fullnode' +if [[ ${mode} == 'fullnode' ]]; then + chia start farmer +elif [[ ${mode} =~ ^farmer.* ]]; then + chia start farmer-only +elif [[ ${mode} =~ ^harvester.* ]]; then + if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then + echo "A farmer peer address and port are required." + exit + else + if [ -d /root/.chia/farmer_ca ]; then + chia init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log + else + echo "Did not find your farmer's ca folder at /root/.chia/farmer_ca." + echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" + fi + chia configure --set-farmer-peer ${farmer_address}:${farmer_port} + chia configure --enable-upnp false + chia start harvester -r + fi +elif [[ ${mode} == 'plotter' ]]; then + echo "Starting in Plotter-only mode. Run Plotman from either CLI or WebUI." +fi diff --git a/scripts/flax_install.sh b/scripts/flax_install.sh new file mode 100644 index 00000000..6963b0c0 --- /dev/null +++ b/scripts/flax_install.sh @@ -0,0 +1,13 @@ +#!/bin/env bash +# +# Installs Flax as per https://github.com/Flax-Network/flax-blockchain +# + +FLAX_BRANCH=$1 + +rm -rf /root/.cache +git clone --branch ${FLAX_BRANCH} --single-branch https://github.com/Flax-Network/flax-blockchain.git /flax-blockchain \ + && cd /flax-blockchain \ + && git submodule update --init mozilla-ca \ + && chmod +x install.sh \ + && /usr/bin/sh ./install.sh diff --git a/scripts/flax_launch.sh b/scripts/flax_launch.sh new file mode 100644 index 00000000..7661dfe6 --- /dev/null +++ b/scripts/flax_launch.sh @@ -0,0 +1,56 @@ +#!/bin/env bash +# +# Initialize Flax service, depending on mode of system requested +# + +cd /flax-blockchain + +. ./activate + +mkdir -p /root/.flax/mainnet/log +flax init >> /root/.flax/mainnet/log/init.log 2>&1 + +echo 'Configuring Flax...' +sed -i 's/log_stdout: true/log_stdout: false/g' /root/.flax/mainnet/config/config.yaml +sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.flax/mainnet/config/config.yaml + +# Loop over provided list of key paths +for k in ${keys//:/ }; do + if [ -f ${k} ]; then + echo "Adding key at path: ${k}" + flax keys add -f ${k} > /dev/null + else + echo "Skipping 'flax keys add' as no file found at: ${k}" + fi +done + +# Loop over provided list of completed plot directories +for p in ${plots_dir//:/ }; do + flax plots add -d ${p} +done + +sed -i 's/localhost/127.0.0.1/g' ~/.flax/mainnet/config/config.yaml + +# Start services based on mode selected. Default is 'fullnode' +if [[ ${mode} == 'fullnode' ]]; then + flax start farmer +elif [[ ${mode} =~ ^farmer.* ]]; then + flax start farmer-only +elif [[ ${mode} =~ ^harvester.* ]]; then + if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then + echo "A farmer peer address and port are required." + exit + else + if [ -d /root/.flax/farmer_ca ]; then + flax init -c /root/.flax/farmer_ca 2>&1 > /root/.flax/mainnet/log/init.log + else + echo "Did not find your farmer's ca folder at /root/.flax/farmer_ca." + echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" + fi + flax configure --set-farmer-peer ${farmer_address}:${farmer_port} + flax configure --enable-upnp false + flax start harvester -r + fi +elif [[ ${mode} == 'plotter' ]]; then + echo "Starting in Plotter-only mode. Run Plotman from either CLI or WebUI." +fi diff --git a/scripts/start_machinaris.sh b/scripts/start_machinaris.sh index 700957ef..05f912bc 100644 --- a/scripts/start_machinaris.sh +++ b/scripts/start_machinaris.sh @@ -3,10 +3,6 @@ # Configures Chia and Plotman, then launches Machinaris web server # -echo 'Configuring Chia...' -sed -i 's/log_stdout: true/log_stdout: false/g' /root/.chia/mainnet/config/config.yaml -sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.chia/mainnet/config/config.yaml - echo 'Configuring Plotman...' mkdir -p /root/.chia/plotman/logs # Check for existing, old versions of plotman.yaml and migrate them, else use default @@ -17,13 +13,28 @@ fi if [ ${pool_pk} != 'null' ]; then sed -i "s/^.*pool_pk:.*$/ pool_pk: ${pool_pk}/g" /root/.chia/plotman/plotman.yaml fi +# Import ssh key if exists +if [ -f "/id_rsa" ]; then + echo "/id_rsa exists, trying to import private ssh key" + mkdir -p ~/.ssh/ + cp -f /id_rsa ~/.ssh/id_rsa + cat > ~/.ssh/config <<'_EOF' + Host * + StrictHostKeyChecking no +_EOF + chmod 700 ~/.ssh + chmod 600 ~/.ssh/* +fi +# Start plotting automatically if requested (not the default) +if [ ${AUTO_PLOT,,} = "true" ]; then + nohup plotman plot < /dev/tty >> /root/.chia/plotman/logs/plotman.log 2>&1 & +fi if [ "${mode}" != "plotter" ]; then echo 'Configuring Chiadog...' mkdir -p /root/.chia/chiadog/logs cp -n /machinaris/config/chiadog.sample.yaml /root/.chia/chiadog/config.yaml cp -f /machinaris/scripts/chiadog_notifier.sh /root/.chia/chiadog/notifier.sh && chmod 755 /root/.chia/chiadog/notifier.sh - . /machinaris/scripts/setup_databases.sh echo 'Starting Chiadog...' cd /chiadog @@ -34,6 +45,9 @@ if [ "${mode}" != "plotter" ]; then /chia-blockchain/venv/bin/python3 -u main.py --config /root/.chia/chiadog/config.yaml > /root/.chia/chiadog/logs/chiadog.log 2>&1 & fi +# Even standalone plotting mode needs database setup +. /machinaris/scripts/setup_databases.sh + mkdir -p /root/.chia/machinaris/config mkdir -p /root/.chia/machinaris/logs cd /machinaris From 0d1f029051273e4803cbbe321decd72a0951607f Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 27 Jun 2021 21:50:09 -0600 Subject: [PATCH 0003/1625] More for Flax support. --- api/commands/chia_cli.py | 72 ++++++++++------ api/commands/chiadog_cli.py | 20 ++--- api/migrations/versions/cc75568c1716_.py | 100 +++++++++++++++++++++++ api/models/chiadog.py | 1 + api/schedules/stats_farm.py | 39 ++++++--- api/schedules/status_alerts.py | 25 +++--- api/schedules/status_farm.py | 7 +- api/views/challenges/resources.py | 16 ++-- common/config/globals.py | 2 + common/models/alerts.py | 1 + common/models/blockchains.py | 1 + common/models/challenges.py | 1 + common/models/connections.py | 1 + common/models/farms.py | 7 +- common/models/stats.py | 3 + common/models/wallets.py | 1 + common/models/workers.py | 3 + dockerfile | 1 + scripts/flaxdog_install.sh | 22 +++++ scripts/flaxdog_notifier.sh | 13 +++ web/models/chia.py | 2 +- web/templates/index.html | 66 +++++++++++---- 22 files changed, 319 insertions(+), 85 deletions(-) create mode 100644 api/migrations/versions/cc75568c1716_.py create mode 100644 scripts/flaxdog_install.sh create mode 100644 scripts/flaxdog_notifier.sh diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py index f2220cdb..f6e0b773 100644 --- a/api/commands/chia_cli.py +++ b/api/commands/chia_cli.py @@ -24,13 +24,22 @@ from api.models import chia CHIA_BINARY = '/chia-blockchain/venv/bin/chia' +FLAX_BINARY = '/flax-blockchain/venv/bin/flax' # When reading tail of chia plots check output, limit to this many lines MAX_LOG_LINES = 2000 -def load_farm_summary(): +def get_binary(blockchain): + if blockchain == "chia": + return CHIA_BINARY + if blockchain == "flax": + return FLAX_BINARY + raise Exception("Invalid blockchain: ".format(blockchain)) + +def load_farm_summary(blockchain='chia'): + chia_binary = get_binary(blockchain) if globals.farming_enabled(): # Load from chia farm summary - proc = Popen("{0} farm summary".format(CHIA_BINARY), stdout=PIPE, stderr=PIPE, shell=True) + proc = Popen("{0} farm summary".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True) try: outs, errs = proc.communicate(timeout=90) except TimeoutExpired: @@ -61,16 +70,16 @@ def load_plots_farming(): plots_farming = chia.FarmPlots(all_entries) return plots_farming -def load_config(): - return open('/root/.chia/mainnet/config/config.yaml','r').read() +def load_config(blockchain='chia'): + return open('/root/.{0}/mainnet/config/config.yaml'.format(blockchain),'r').read() -def save_config(config): +def save_config(config, blockchain='chia'): try: # Validate the YAML first yaml.safe_load(config) # Save a copy of the old config file - src="/root/.chia/mainnet/config/config.yaml" - dst="/root/.chia/mainnet/config/config."+time.strftime("%Y%m%d-%H%M%S")+".yaml" + src="/root/.{0}/mainnet/config/config.yaml".format(blockchain) + dst="/root/.{0}/mainnet/config/config.".format(blockchain) + time.strftime("%Y%m%d-%H%M%S")+".yaml" shutil.copy(src,dst) # Now save the new contents to main config file with open(src, 'w') as writer: @@ -79,12 +88,13 @@ def save_config(config): app.logger.info(traceback.format_exc()) raise Exception('Updated config.yaml failed validation!\n' + str(ex)) else: - # TODO restart chia services + # TODO restart chia or flax services pass -def load_wallet_show(): +def load_wallet_show(blockchain='chia'): + chia_binary = get_binary(blockchain) wallet_show = "" - child = pexpect.spawn("{0} wallet show".format(CHIA_BINARY)) + child = pexpect.spawn("{0} wallet show".format(chia_binary)) wallet_index = 1 while True: i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"]) @@ -103,8 +113,9 @@ def load_wallet_show(): wallet_show += "ERROR:\n" + child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8") return chia.Wallet(wallet_show) -def load_blockchain_show(): - proc = Popen("{0} show --state".format(CHIA_BINARY), stdout=PIPE, stderr=PIPE, shell=True) +def load_blockchain_show(blockchain='chia'): + chia_binary = get_binary(blockchain) + proc = Popen("{0} show --state".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True) try: outs, errs = proc.communicate(timeout=90) except TimeoutExpired: @@ -115,8 +126,9 @@ def load_blockchain_show(): abort(500, description=errs.decode('utf-8')) return chia.Blockchain(outs.decode('utf-8').splitlines()) -def load_connections_show(): - proc = Popen("{0} show --connections".format(CHIA_BINARY), stdout=PIPE, stderr=PIPE, shell=True) +def load_connections_show(blockchain='chia'): + chia_binary = get_binary(blockchain) + proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True) try: outs, errs = proc.communicate(timeout=90) except TimeoutExpired: @@ -127,14 +139,15 @@ def load_connections_show(): abort(500, description=errs.decode('utf-8')) return chia.Connections(outs.decode('utf-8').splitlines()) -def add_connection(connection): +def add_connection(connection, blockchain='chia'): + chia_binary = get_binary(blockchain) try: hostname,port = connection.split(':') if socket.gethostbyname(hostname) == hostname: app.logger.debug('{} is a valid IP address'.format(hostname)) elif socket.gethostbyname(hostname) != hostname: app.logger.debug('{} is a valid hostname'.format(hostname)) - proc = Popen("{0} show --add-connection {1}".format(CHIA_BINARY, connection), stdout=PIPE, stderr=PIPE, shell=True) + proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True) try: outs, errs = proc.communicate(timeout=90) except TimeoutExpired: @@ -209,7 +222,14 @@ def generate_key(key_path): return False flash('Welcome! A new key has been generated at {0}. Keep it secret! Keep it safe!'.format(key_path), 'success') flash('{0}'.format(" ".join(mnemonic_words)), 'info') - proc = Popen("{0} start farmer".format(CHIA_BINARY), stdout=PIPE, stderr=PIPE, shell=True) + start_farmer('chia') + if globals.flax_enabled(): + # TODO 'flax keys add' the new key + start_farmer('flax') + +def start_farmer(blockchain='chia'): + chia_binary = get_binary(blockchain) + proc = Popen("{0} start farmer".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True) try: outs, errs = proc.communicate(timeout=90) except TimeoutExpired: @@ -226,9 +246,10 @@ def generate_key(key_path): return False return True -def remove_connection(node_id, ip): +def remove_connection(node_id, ip, blockchain='chia'): + chia_binary = get_binary(blockchain) try: - proc = Popen("{0} show --remove-connection {1}".format(CHIA_BINARY, node_id), stdout=PIPE, stderr=PIPE, shell=True) + proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True) try: outs, errs = proc.communicate(timeout=90) except TimeoutExpired: @@ -246,27 +267,28 @@ def remove_connection(node_id, ip): app.logger.info("Successfully removed connection to {0}".format(ip)) return True -def is_plots_check_running(): +def is_plots_check_running(blockchain='chia'): for proc in psutil.process_iter(['pid', 'name', 'cmdline']): - if proc.info['name'] == 'chia' and 'plots' in proc.info['cmdline'] and 'check' in proc.info['cmdline']: + if proc.info['name'] == blockchain and 'plots' in proc.info['cmdline'] and 'check' in proc.info['cmdline']: return proc.info['pid'] return None -def check_plots(first_load): +def check_plots(first_load, blockchain='chia'): + chia_binary = get_binary(blockchain) output_file = '/root/.chia/mainnet/log/plots_check.log' if not is_plots_check_running() and first_load == "true": try: log_fd = os.open(output_file, os.O_RDWR | os.O_CREAT) log_fo = os.fdopen(log_fd, "a+") - proc = Popen("{0} plots check".format(CHIA_BINARY), shell=True, + proc = Popen("{0} plots check".format(chia_binary), shell=True, universal_newlines=True, stdout=log_fo, stderr=log_fo) except: app.logger.info(traceback.format_exc()) return 'Failed to start plots check job!' else: - return "Starting chia plots check at " + datetime.datetime.now().strftime("%Y-%m-%d %H:%M") + return "Starting plots check at " + datetime.datetime.now().strftime("%Y-%m-%d %H:%M") else: - class_escape = re.compile(r' chia.plotting.(\w+)(\s+): ') + class_escape = re.compile(r' {0}.plotting.(\w+)(\s+): '.format(blockchain)) ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') proc = Popen(['tail', '-n', str(MAX_LOG_LINES), output_file], stdout=PIPE) return class_escape.sub('', ansi_escape.sub('', proc.stdout.read().decode("utf-8"))) diff --git a/api/commands/chiadog_cli.py b/api/commands/chiadog_cli.py index b3a1f6d6..629f1f21 100644 --- a/api/commands/chiadog_cli.py +++ b/api/commands/chiadog_cli.py @@ -18,16 +18,16 @@ from api.models import chiadog from api import app -def load_config(): - return open('/root/.chia/chiadog/config.yaml','r').read() +def load_config(blockchain='chia'): + return open('/root/.{0}/chiadog/config.yaml'.format(blockchain),'r').read() -def save_config(config): +def save_config(config, blockchain='chia'): try: # Validate the YAML first yaml.safe_load(config) # Save a copy of the old config file - src="/root/.chia/chiadog/config.yaml" - dst="/root/.chia/chiadog/config.yaml."+time.strftime("%Y%m%d-%H%M%S")+".yaml" + src='/root/.{0}/chiadog/config.yaml'.format(blockchain) + dst='/root/.{0}/chiadog/config.yaml'.format(blockchain)+time.strftime("%Y%m%d-%H%M%S")+".yaml" shutil.copy(src,dst) # Now save the new contents to main config file with open(src, 'w') as writer: @@ -36,13 +36,13 @@ def save_config(config): app.logger.info(traceback.format_exc()) raise Exception('Updated config.yaml failed validation!\n' + str(ex)) else: - if get_chiadog_pid(): - stop_chiadog() - start_chiadog() + if get_chiadog_pid(blockchain): + stop_chiadog(blockchain) + start_chiadog(blockchain) -def get_chiadog_pid(): +def get_chiadog_pid(blockchain='chia'): for proc in psutil.process_iter(['pid', 'name', 'cmdline']): - if proc.info['name'] == 'python3' and '/root/.chia/chiadog/config.yaml' in proc.info['cmdline']: + if proc.info['name'] == 'python3' and '/root/.{0}/chiadog/config.yaml'.format(blockchain) in proc.info['cmdline']: return proc.info['pid'] return None diff --git a/api/migrations/versions/cc75568c1716_.py b/api/migrations/versions/cc75568c1716_.py new file mode 100644 index 00000000..219fa79e --- /dev/null +++ b/api/migrations/versions/cc75568c1716_.py @@ -0,0 +1,100 @@ +"""empty message + +Revision ID: cc75568c1716 +Revises: 63557b49558a +Create Date: 2021-06-27 16:37:07.789526 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.sql import text + + +# revision identifiers, used by Alembic. +revision = 'cc75568c1716' +down_revision = '63557b49558a' +branch_labels = None +depends_on = None + + +def upgrade(engine_name): + globals()["upgrade_%s" % engine_name]() + + +def downgrade(engine_name): + globals()["downgrade_%s" % engine_name]() + + + + + +def upgrade_(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('alerts', sa.Column('blockchain', sa.String(length=64), nullable=True)) + op.add_column('blockchains', sa.Column('blockchain', sa.String(length=64), nullable=True)) + op.add_column('challenges', sa.Column('blockchain', sa.String(length=64), nullable=True)) + op.add_column('connections', sa.Column('blockchain', sa.String(length=64), nullable=True)) + op.add_column('farms', sa.Column('total_flax', sa.REAL(), nullable=True)) + op.add_column('farms', sa.Column('flax_netspace_size', sa.REAL(), nullable=True)) + op.add_column('farms', sa.Column('flax_expected_time_to_win', sa.String(length=64), nullable=True)) + op.add_column('wallets', sa.Column('blockchain', sa.String(length=64), nullable=True)) + # ### end Alembic commands ### + + # Update existing rows with default 'chia' blockchain + conn = op.get_bind() + conn.execute(text("update alerts set blockchain = 'chia'",{})) + conn.execute(text("update blockchains set blockchain = 'chia'",{})) + conn.execute(text("update challenges set blockchain = 'chia'",{})) + conn.execute(text("update connections set blockchain = 'chia'",{})) + conn.execute(text("update wallets set blockchain = 'chia'",{})) + + +def downgrade_(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('wallets', 'blockchain') + op.drop_column('farms', 'flax_expected_time_to_win') + op.drop_column('farms', 'flax_netspace_size') + op.drop_column('farms', 'total_flax') + op.drop_column('connections', 'blockchain') + op.drop_column('challenges', 'blockchain') + op.drop_column('blockchains', 'blockchain') + op.drop_column('alerts', 'blockchain') + # ### end Alembic commands ### + + +def upgrade_stats(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('stat_netspace_size', sa.Column('blockchain', sa.String(length=64), nullable=True)) + op.add_column('stat_time_to_win', sa.Column('blockchain', sa.String(length=64), nullable=True)) + op.add_column('stat_total_chia', sa.Column('blockchain', sa.String(length=64), nullable=True)) + # ### end Alembic commands ### + + # Update existing rows with default 'chia' blockchain + conn = op.get_bind() + conn.execute(text("update stat_netspace_size set blockchain = 'chia'",{})) + conn.execute(text("update stat_time_to_win set blockchain = 'chia'",{})) + conn.execute(text("update stat_total_chia set blockchain = 'chia'",{})) + +def downgrade_stats(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('stat_total_chia', 'blockchain') + op.drop_column('stat_time_to_win', 'blockchain') + op.drop_column('stat_netspace_size', 'blockchain') + # ### end Alembic commands ### + + +def upgrade_chiadog(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('notification', sa.Column('blockchain', sa.String(length=64), nullable=True)) + # ### end Alembic commands ### + + # Update existing rows with default 'chia' blockchain + conn = op.get_bind() + conn.execute(text("update notification set blockchain = 'chia'",{})) + + +def downgrade_chiadog(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('notification', 'blockchain') + # ### end Alembic commands ### + diff --git a/api/models/chiadog.py b/api/models/chiadog.py index 237893c0..2391acb8 100644 --- a/api/models/chiadog.py +++ b/api/models/chiadog.py @@ -12,6 +12,7 @@ class Notification(db.Model): __bind_key__ = 'chiadog' id = db.Column(db.Integer, primary_key=True, nullable=False) + blockchain = db.Column(db.String(64), nullable=True) priority = db.Column(db.String(40), nullable=False) service = db.Column(db.String(60), nullable=False) message = db.Column(db.String(255), nullable=False) diff --git a/api/schedules/stats_farm.py b/api/schedules/stats_farm.py index 6f707ffe..effbefd1 100644 --- a/api/schedules/stats_farm.py +++ b/api/schedules/stats_farm.py @@ -38,33 +38,52 @@ def collect(): with app.app_context(): app.logger.debug("Collecting stats about farms.") current_datetime = datetime.datetime.now().strftime("%Y%m%d%H%M") - farm_summary = chia_cli.load_farm_summary() + chia_farm_summary = chia_cli.load_farm_summary('chia') + flax_farm_summary = None + if globals.flax_enabled(): + flax_farm_summary = chia_cli.load_farm_summary('flax') db = get_db() cur = db.cursor() try: cur.execute("INSERT INTO stat_plot_count (value, created_at) VALUES (?,?)", - (farm_summary.plot_count,current_datetime,)) + (chia_farm_summary.plot_count,current_datetime,)) except: app.logger.info(traceback.format_exc()) try: cur.execute("INSERT INTO stat_plots_size (value, created_at) VALUES (?,?)", - (converters.str_to_gibs(farm_summary.plots_size),current_datetime,)) + (converters.str_to_gibs(chia_farm_summary.plots_size),current_datetime,)) except: app.logger.info(traceback.format_exc()) - if farm_summary.status == "Farming": # Only collect if fully synced + if chia_farm_summary.status == "Farming": # Only collect if fully synced try: - cur.execute("INSERT INTO stat_total_chia (value, created_at) VALUES (?,?)", - (farm_summary.total_chia,current_datetime,)) + cur.execute("INSERT INTO stat_total_chia (blockchain, value, created_at) VALUES ('chia',?,?)", + (chia_farm_summary.total_chia,current_datetime,)) except: app.logger.info(traceback.format_exc()) try: - cur.execute("INSERT INTO stat_netspace_size (value, created_at) VALUES (?,?)", - (converters.str_to_gibs(farm_summary.netspace_size),current_datetime,)) + cur.execute("INSERT INTO stat_netspace_size (blockchain, value, created_at) VALUES ('chia',?,?)", + (converters.str_to_gibs(chia_farm_summary.netspace_size),current_datetime,)) except: app.logger.info(traceback.format_exc()) try: - cur.execute("INSERT INTO stat_time_to_win (value, created_at) VALUES (?,?)", - (converters.etw_to_minutes(farm_summary.time_to_win),current_datetime,)) + cur.execute("INSERT INTO stat_time_to_win (blockchain, value, created_at) VALUES ('chia',?,?)", + (converters.etw_to_minutes(chia_farm_summary.time_to_win),current_datetime,)) + except: + app.logger.info(traceback.format_exc()) + if flax_farm_summary and flax_farm_summary.status == "Farming": # Only collect if fully synced + try: + cur.execute("INSERT INTO stat_total_chia (blockchain, value, created_at) VALUES ('flax',?,?)", + (flax_farm_summary.total_chia,current_datetime,)) + except: + app.logger.info(traceback.format_exc()) + try: + cur.execute("INSERT INTO stat_netspace_size (blockchain, value, created_at) VALUES ('flax',?,?)", + (converters.str_to_gibs(flax_farm_summary.netspace_size),current_datetime,)) + except: + app.logger.info(traceback.format_exc()) + try: + cur.execute("INSERT INTO stat_time_to_win (blockchain, value, created_at) VALUES ('flax',?,?)", + (converters.etw_to_minutes(flax_farm_summary.time_to_win),current_datetime,)) except: app.logger.info(traceback.format_exc()) db.commit() diff --git a/api/schedules/status_alerts.py b/api/schedules/status_alerts.py index 8264d9a4..60c416f3 100644 --- a/api/schedules/status_alerts.py +++ b/api/schedules/status_alerts.py @@ -34,17 +34,20 @@ def update(): first_run = False else: # On subsequent schedules, load only last 5 minutes. since = (datetime.datetime.now() - datetime.timedelta(minutes=5)).strftime("%Y-%m-%d %H:%M:%S.000") - alerts = chiadog_cli.get_notifications(since) - payload = [] - for alert in alerts: - payload.append({ - "unique_id": hostname + '_' + alert.created_at.strftime("%Y-%m-%d_%H:%M:%S"), - "hostname": hostname, - "priority": alert.priority, - "service": alert.service, - "message": alert.message, - "created_at": alert.created_at.strftime("%Y-%m-%d %H:%M:%S"), - }) + for blockchain in ['chia', 'flax']: + alerts = chiadog_cli.get_notifications(blockchain, since) + payload = [] + for alert in alerts: + payload.append({ + "unique_id": hostname + '_{0}_'.format(blockchain) + \ + alert.created_at.strftime("%Y-%m-%d_%H:%M:%S"), + "hostname": hostname, + "blockchain": blockchain, + "priority": alert.priority, + "service": alert.service, + "message": alert.message, + "created_at": alert.created_at.strftime("%Y-%m-%d %H:%M:%S"), + }) if len(payload) > 0: utils.send_post('/alerts/', payload, debug=False) except: diff --git a/api/schedules/status_farm.py b/api/schedules/status_farm.py index b2677622..f3c86a95 100644 --- a/api/schedules/status_farm.py +++ b/api/schedules/status_farm.py @@ -21,6 +21,8 @@ def update(): try: hostname = utils.get_hostname() farm_summary = chia_cli.load_farm_summary() + if globals.flax_enabled(): + flax_farm_summary = chia_cli.load_flax_farm_summary() payload = { "hostname": hostname, "mode": os.environ['mode'], @@ -29,7 +31,10 @@ def update(): "plots_size": converters.str_to_gibs(farm_summary.plots_size), "total_chia": 0 if not hasattr(farm_summary, 'total_chia') else farm_summary.total_chia, "netspace_size": 0 if not hasattr(farm_summary, 'netspace_size') else converters.str_to_gibs(farm_summary.netspace_size), - "expected_time_to_win": "" if not hasattr(farm_summary, 'time_to_win') else farm_summary.time_to_win + "expected_time_to_win": "" if not hasattr(farm_summary, 'time_to_win') else farm_summary.time_to_win, + "total_flax": 0 if not hasattr(farm_summary, 'total_flax') else farm_summary.total_flax, + "flax_netspace_size": 0 if not hasattr(farm_summary, 'flax_netspace_size') else converters.str_to_gibs(farm_summary.flax_netspace_size), + "flax_expected_time_to_win": "" if not hasattr(farm_summary, 'time_to_win') else farm_summary.flax_time_to_win, } utils.send_post('/farms/', payload, debug=False) except: diff --git a/api/views/challenges/resources.py b/api/views/challenges/resources.py index 7754d6b1..55f1676b 100644 --- a/api/views/challenges/resources.py +++ b/api/views/challenges/resources.py @@ -35,7 +35,7 @@ def get(self, args): def post(self, new_items): if len(new_items) == 0: return "No challenges provided.", 400 - db.session.query(Challenge).filter(Challenge.hostname==new_items[0]['hostname']).delete() + db.session.query(Challenge).filter(Challenge.hostname==new_items[0]['hostname'], Challenge.blockchain==new_items[0]['blockchain']).delete() items = [] for new_item in new_items: item = Challenge(**new_item) @@ -45,19 +45,19 @@ def post(self, new_items): return items -@blp.route('/') +@blp.route('//') class ChallengeByHostname(MethodView): @blp.etag @blp.response(200, ChallengeSchema) - def get(self, hostname): - return db.session.query(Challenge).filter(Challenge.hostname==hostname) + def get(self, hostname, blockchain): + return db.session.query(Challenge).filter(Challenge.hostname==hostname, Challenge.blockchain==blockchain) @blp.etag @blp.arguments(BatchOfChallengeSchema) @blp.response(200, ChallengeSchema(many=True)) - def put(self, new_items, hostname): - db.session.query(Challenge).filter(Challenge.hostname==hostname).delete() + def put(self, new_items, hostname, blockchain): + db.session.query(Challenge).filter(Challenge.hostname==hostname, Challenge.blockchain==blockchain).delete() items = [] for new_item in new_items: item = Challenge(**new_item) @@ -68,6 +68,6 @@ def put(self, new_items, hostname): @blp.etag @blp.response(204) - def delete(self, hostname): - db.session.query(Challenge).filter(Challenge.hostname==hostname).delete() + def delete(self, hostname, blockchain): + db.session.query(Challenge).filter(Challenge.hostname==hostname, Challenge.blockchain==blockchain).delete() db.session.commit() diff --git a/common/config/globals.py b/common/config/globals.py index f3732909..c8e930e1 100644 --- a/common/config/globals.py +++ b/common/config/globals.py @@ -106,6 +106,8 @@ def harvesting_enabled(): def plotting_enabled(): return "mode" in os.environ and ("plotter" in os.environ['mode'] or "fullnode" == os.environ['mode']) +def flax_enabled(): + return "blockchains" in os.environ and "flax" in os.environ['mode'] def archiving_enabled(): if not plotting_enabled(): diff --git a/common/models/alerts.py b/common/models/alerts.py index c03d4a56..3bc00c60 100644 --- a/common/models/alerts.py +++ b/common/models/alerts.py @@ -11,6 +11,7 @@ class Alert(db.Model): unique_id = sa.Column(sa.String(length=128), primary_key=True) hostname = sa.Column(sa.String(length=255), nullable=False) + blockchain = sa.Column(sa.String(length=64), nullable=True) priority = sa.Column(sa.String(64), nullable=False) service = sa.Column(sa.String(64), nullable=False) message = sa.Column(sa.String, nullable=False) diff --git a/common/models/blockchains.py b/common/models/blockchains.py index 76127b1d..e57f2347 100644 --- a/common/models/blockchains.py +++ b/common/models/blockchains.py @@ -10,6 +10,7 @@ class Blockchain(db.Model): __tablename__ = "blockchains" hostname = sa.Column(sa.String(length=255), primary_key=True) + blockchain = sa.Column(sa.String(length=64), nullable=True) details = sa.Column(sa.String, nullable=False) created_at = sa.Column(sa.DateTime(), server_default=func.now()) updated_at = sa.Column(sa.DateTime(), onupdate=func.now()) diff --git a/common/models/challenges.py b/common/models/challenges.py index e13a32e3..24f9c9a6 100644 --- a/common/models/challenges.py +++ b/common/models/challenges.py @@ -11,6 +11,7 @@ class Challenge(db.Model): unique_id = sa.Column(sa.String(length=64), primary_key=True) hostname = sa.Column(sa.String(length=255), nullable=False) + blockchain = sa.Column(sa.String(length=64), nullable=True) challenge_id = sa.Column(sa.String(length=64), nullable=False) plots_past_filter = sa.Column(sa.String(length=32), nullable=False) proofs_found = sa.Column(sa.Integer, nullable=False) diff --git a/common/models/connections.py b/common/models/connections.py index 26c70e64..ebf50226 100644 --- a/common/models/connections.py +++ b/common/models/connections.py @@ -10,6 +10,7 @@ class Connection(db.Model): __tablename__ = "connections" hostname = sa.Column(sa.String(length=255), primary_key=True) + blockchain = sa.Column(sa.String(length=64), nullable=True) details = sa.Column(sa.String, nullable=False) created_at = sa.Column(sa.DateTime(), server_default=func.now()) updated_at = sa.Column(sa.DateTime(), onupdate=func.now()) diff --git a/common/models/farms.py b/common/models/farms.py index a5bccaf9..05289642 100644 --- a/common/models/farms.py +++ b/common/models/farms.py @@ -14,9 +14,14 @@ class Farm(db.Model): status = sa.Column(sa.String(length=128), nullable=False) plot_count = sa.Column(sa.Integer, nullable=False) plots_size = sa.Column(sa.REAL, nullable=False) # GiB + total_chia = sa.Column(sa.REAL, nullable=False) netspace_size = sa.Column(sa.REAL, nullable=False) # GiB expected_time_to_win = sa.Column(sa.String(length=64), nullable=False) + + total_flax = sa.Column(sa.REAL, nullable=True) + flax_netspace_size = sa.Column(sa.REAL, nullable=True) # GiB + flax_expected_time_to_win = sa.Column(sa.String(length=64), nullable=True) + created_at = sa.Column(sa.DateTime(), server_default=func.now()) updated_at = sa.Column(sa.DateTime(), onupdate=func.now()) - diff --git a/common/models/stats.py b/common/models/stats.py index 703fead4..3b98bfb8 100644 --- a/common/models/stats.py +++ b/common/models/stats.py @@ -27,6 +27,7 @@ class StatTotalChia(db.Model): __tablename__ = "stat_total_chia" id = db.Column(db.Integer, primary_key=True) + blockchain = sa.Column(sa.String(length=64), nullable=True) value = db.Column(db.REAL) created_at = db.Column(db.String()) @@ -35,6 +36,7 @@ class StatNetspaceSize(db.Model): __tablename__ = "stat_netspace_size" id = db.Column(db.Integer, primary_key=True) + blockchain = sa.Column(sa.String(length=64), nullable=True) value = db.Column(db.REAL) created_at = db.Column(db.String()) @@ -43,6 +45,7 @@ class StatTimeToWin(db.Model): __tablename__ = "stat_time_to_win" id = db.Column(db.Integer, primary_key=True) + blockchain = sa.Column(sa.String(length=64), nullable=True) value = db.Column(db.REAL) created_at = db.Column(db.String()) diff --git a/common/models/wallets.py b/common/models/wallets.py index b7dbf241..fcc0983b 100644 --- a/common/models/wallets.py +++ b/common/models/wallets.py @@ -10,6 +10,7 @@ class Wallet(db.Model): __tablename__ = "wallets" hostname = sa.Column(sa.String(length=255), primary_key=True) + blockchain = sa.Column(sa.String(length=64), nullable=True) details = sa.Column(sa.String, nullable=False) created_at = sa.Column(sa.DateTime(), server_default=func.now()) updated_at = sa.Column(sa.DateTime(), onupdate=func.now()) diff --git a/common/models/workers.py b/common/models/workers.py index 4691c79c..bd426f71 100644 --- a/common/models/workers.py +++ b/common/models/workers.py @@ -23,6 +23,9 @@ class Worker(db.Model): def farming_status(self): return j.loads(self.services)['chia_farm_status'] + def flax_farming_status(self): + return j.loads(self.services)['flax_farm_status'] + def plotting_status(self): return j.loads(self.services)['plotman_status'] diff --git a/dockerfile b/dockerfile index c6d9006f..e73e93b1 100644 --- a/dockerfile +++ b/dockerfile @@ -70,6 +70,7 @@ RUN \ && /usr/bin/bash /machinaris/scripts/madmax_install.sh \ && /usr/bin/bash /machinaris/scripts/machinaris_install.sh \ && /usr/bin/bash /machinaris/scripts/flax_install.sh ${FLAX_BRANCH} \ + && /usr/bin/bash /machinaris/scripts/flaxdog_install.sh \ && rm -rf \ /root/.cache \ /tmp/* \ diff --git a/scripts/flaxdog_install.sh b/scripts/flaxdog_install.sh new file mode 100644 index 00000000..9b7c047b --- /dev/null +++ b/scripts/flaxdog_install.sh @@ -0,0 +1,22 @@ +#!/bin/env bash +# +# Installs Flaxdog for log monitoring and alerting +# + +echo 'Installing Flaxdog...' + +cd / + +git clone git@github.com:langhorst/flaxdog.git + +cd /flax-blockchain/ + +# Chia-blockchain needs PyYAML=5.4.1 but Chiadog wants exactly 5.4 +sed -i 's/==5.4/~=5.4/g' /flaxdog/requirements.txt + +# Also, as per Chiadog integrations page, the MQTT integration needs +# https://github.com/martomi/chiadog/blob/main/INTEGRATIONS.md +printf "\npaho-mqtt" >> /flaxdog/requirements.txt + +# Now install Chiadog python dependencies +venv/bin/pip3 install -r /flaxdog/requirements.txt diff --git a/scripts/flaxdog_notifier.sh b/scripts/flaxdog_notifier.sh new file mode 100644 index 00000000..ca7a2140 --- /dev/null +++ b/scripts/flaxdog_notifier.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# Record notifications from Chiadog to event files for parsing by Machinaris +# + +event_priority_name="$1" +event_service_name="$2" +event_message="$3" + +cd /root/.chia/chiadog/dbs +sqlite3 chiadog.db < - {% if farming.expected_time_to_win != 'Unknown' %} -
-
-
-

Expected Time to Win: - {{ farming.expected_time_to_win }} -

-
-
-
- {% endif %} -
{% if global_config.plotting_enabled %}
@@ -58,37 +46,79 @@
Farming:
-

{{ farming.plot_count }}

+

{{ farming.plot_count }}

Total Plots
{% if global_config.farming_enabled %}
-

{{ farming.total_chia }}

-
Total Chia Farmed
+

{{ farming.plots_display_size }}

+
Total Plots Size
{% endif %}
+ {% if farming.expected_time_to_win != 'Unknown' %} +
+
+
+

Chia - Expected Time to Win: + {{ farming.expected_time_to_win }} +

+
+
+
+ {% endif %} +
-

{{ farming.plots_display_size }}

-
Total Plots Size
+

{{ farming.total_chia }}

+
Total Chia Farmed
{% if global_config.farming_enabled %}

{{ farming.netspace_display_size }}

-
Estimated Netspace Size
+
Chia Netspace Size
{% endif %}
+ {% if global_config.flax_enabled %} + {% if farming.flax_expected_time_to_win != 'Unknown' %} +
+
+
+

Flax - Expected Time to Win: + {{ farming.flax_expected_time_to_win }} +

+
+
+
+ {% endif %} +
+
+
+

{{ farming.total_flax }}

+
Total Flax Farmed
+
+
+ {% if global_config.farming_enabled %} +
+
+

{{ farming.flax_netspace_display_size }}

+
Flax Netspace Size
+
+
+ {% endif %} +
+ {% endif %} + {% if global_config.farming_enabled %}
- Farming: - {{ farming.plot_count }} plots. - Current expected time to win: {{ farming.expected_time_to_win }} +
+
Farming: {{ farming.plot_count }} plots.
+
Chia ETW: {{ farming.expected_time_to_win }}
+ {% if global_config.flax_enabled %} +
Flax ETW: {{ farming.flax_expected_time_to_win }}
+ {% endif %}
@@ -81,11 +84,20 @@
+ +
+ +
-
-
- -
-
- -
-
+ + @@ -95,11 +90,11 @@ //Call the function when the page loads load_config("{{selected_worker.hostname}}", "{{selected_blockchain}}"); }); - + function downloadConfig() { worker = $("#worker").val() blockchain = $("#blockchain").val() - window.location.href = '/settings/config/' + worker + '_'+ blockchain + 'dog_config.yaml?type=alerts&worker=' + worker + "&blockchain=" + blockchain + window.location.href = '/settings/config/' + worker + '_' + blockchain + 'dog_config.yaml?type=alerts&worker=' + worker + "&blockchain=" + blockchain } {% endblock %} \ No newline at end of file diff --git a/web/templates/settings/farming.html b/web/templates/settings/farming.html index 74ff475a..ffa39437 100644 --- a/web/templates/settings/farming.html +++ b/web/templates/settings/farming.html @@ -40,7 +40,8 @@
@@ -57,15 +58,9 @@ -
-
- -
-
- -
-
+ + @@ -96,7 +91,7 @@ //Call the function when the page loads load_config("{{selected_worker.hostname}}", "{{selected_blockchain}}"); }); - + function downloadConfig() { worker = $("#worker").val() blockchain = $("#blockchain").val() diff --git a/web/templates/settings/plotting.html b/web/templates/settings/plotting.html index 9e8cb795..3ff5bcc2 100644 --- a/web/templates/settings/plotting.html +++ b/web/templates/settings/plotting.html @@ -40,8 +40,8 @@
@@ -50,15 +50,9 @@ -
-
- -
-
- -
-
+ + diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html index bfd7ddeb..7cd00aab 100644 --- a/web/templates/worker_launch.html +++ b/web/templates/worker_launch.html @@ -155,18 +155,11 @@ cmd += ' -h ' + document.getElementById("worker_hostname").value + line_end; } else { - errors.push("Missing worker hostname. Please also provide an IP address if the hostname won't resolve on your LAN."); + errors.push("Missing worker hostname. Please provide a short name to identify your worker."); } if (document.getElementById("dns_ip_addr").value) { cmd += ' --dns ' + document.getElementById("dns_ip_addr").value + line_end; } - else { - if (os == 'windows') { - cmd += ' --dns (Get-DnsClientServerAddress -AddressFamily IPv4 | Select-Object -ExpandProperty ServerAddresses)' + line_end; - } else { - //cmd += " --dns $(cat /etc/resolv.conf | grep nameserver | cut -d ' ' -f 2)" + line_end; - } - } cmd += ' -v ' + document.getElementById("appdata").value + ':/root/.chia' + line_end; var cur_vols = $('#volumes').children().length var plots_dir = [] @@ -217,6 +210,9 @@ if (document.getElementById("ip_addr").value) { cmd += ' -e worker_address=' + document.getElementById("ip_addr").value + line_end; } + else { + errors.push("Missing worker IP address. Please provide the IP the conntroller will connect to for commands."); + } cmd += ' -e plots_dir=' + plots_dir.join(':') + line_end; var blockchains = 'chia' if (document.getElementById("blockchain-flax").checked) { @@ -387,7 +383,7 @@

Machinaris Worker - Launch Config

- +
@@ -398,7 +394,7 @@

Machinaris Worker - Launch Config

-
@@ -451,7 +447,7 @@

Machinaris Worker - Launch Config

- +
@@ -463,12 +459,12 @@

Machinaris Worker - Launch Config

- +
- +
From 7ff47a5c86f6554dc4560d08d2a07e19eddec8ca Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 20 Aug 2021 13:16:09 -0600 Subject: [PATCH 0082/1625] Fixes --- api/commands/chia_cli.py | 4 +-- api/gunicorn.conf.py | 18 +++++----- api/models/log.py | 6 +++- web/actions/stats.py | 52 +++++++++++++++++++++++------ web/routes.py | 4 +-- web/templates/farming/workers.html | 38 ++++++++++----------- web/templates/plotting/workers.html | 52 ++++++++++++++++++----------- web/templates/settings/pools.html | 1 + 8 files changed, 112 insertions(+), 63 deletions(-) diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py index 9bb52171..9a284619 100644 --- a/api/commands/chia_cli.py +++ b/api/commands/chia_cli.py @@ -98,7 +98,7 @@ def load_wallet_show(blockchain): child = pexpect.spawn("{0} wallet show".format(chia_binary)) wallet_index = 1 while True: - i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"]) + i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120) if i == 0: app.logger.debug("wallet show returned 'Wallet height...' so collecting details.") wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8") @@ -120,7 +120,7 @@ def load_plotnft_show(blockchain): child = pexpect.spawn("{0} plotnft show".format(chia_binary)) wallet_index = 1 while True: - i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"]) + i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120) if i == 0: app.logger.debug("wallet show returned 'Wallet height...' so collecting details.") wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8") diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py index 2028b210..11e6536d 100644 --- a/api/gunicorn.conf.py +++ b/api/gunicorn.conf.py @@ -29,15 +29,15 @@ def on_starting(server): scheduler.add_job(func=status_controller.update, name="controller", trigger='interval', seconds=120, jitter=60) scheduler.add_job(func=status_farm.update, name="farms", trigger='interval', seconds=120, jitter=60) scheduler.add_job(func=status_plotting.update, name="plottings", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_plots.update, name="plots", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_wallets.update, name="wallets", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_plotnfts.update, name="plotnfts", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_blockchains.update, name="blockchains", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_connections.update, name="connections", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_keys.update, name="keys", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_alerts.update, name="alerts", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_pools.update, name="pools", trigger='interval', seconds=120, jitter=60) - scheduler.add_job(func=status_partials.update, name="partials", trigger='interval', seconds=120, jitter=60) + scheduler.add_job(func=status_plots.update, name="plots", trigger='interval', seconds=300, jitter=150) + scheduler.add_job(func=status_wallets.update, name="wallets", trigger='interval', seconds=600, jitter=300) + scheduler.add_job(func=status_plotnfts.update, name="plotnfts", trigger='interval', seconds=600, jitter=300) + scheduler.add_job(func=status_blockchains.update, name="blockchains", trigger='interval', seconds=300, jitter=150) + scheduler.add_job(func=status_connections.update, name="connections", trigger='interval', seconds=300, jitter=150) + scheduler.add_job(func=status_keys.update, name="keys", trigger='interval', seconds=600, jitter=300) + scheduler.add_job(func=status_alerts.update, name="alerts", trigger='interval', seconds=300, jitter=150) + scheduler.add_job(func=status_pools.update, name="pools", trigger='interval', seconds=300, jitter=150) + scheduler.add_job(func=status_partials.update, name="partials", trigger='interval', seconds=300, jitter=150) #scheduler.add_job(func=status_points.update, name="points", trigger='interval', seconds=10, jitter=0) app.logger.debug("Starting background scheduler...") diff --git a/api/models/log.py b/api/models/log.py index d0abe622..e581cda8 100644 --- a/api/models/log.py +++ b/api/models/log.py @@ -36,6 +36,7 @@ class Partials: def __init__(self, cli_stdout): self.columns = [ 'challenge_id', 'plots_past_filter', 'proofs_found', 'time_taken', 'created_at'] self.rows = [] + launcher_id = None for line in cli_stdout: try: if "Submitting partial" in line: @@ -43,7 +44,7 @@ def __init__(self, cli_stdout): created_at = line.split()[0].replace('T', ' ') launcher_id = re.search('partial for (\w+) to', line, re.IGNORECASE).group(1) pool_url = re.search('to (.*)$', line, re.IGNORECASE).group(1) - elif "Pool response" in line: + elif "Pool response" in line and launcher_id: pool_response = line[line.index('{'):] self.rows.append({ 'launcher_id': launcher_id, @@ -51,6 +52,9 @@ def __init__(self, cli_stdout): 'pool_response': pool_response, 'created_at': created_at }) + created_at = None + launcher_id = None + pool_url = None except: app.logger.info("Failed to parse partial line: {0}".format(line)) app.logger.info(traceback.format_exc()) diff --git a/web/actions/stats.py b/web/actions/stats.py index f8d342ec..8ae3ac82 100644 --- a/web/actions/stats.py +++ b/web/actions/stats.py @@ -142,7 +142,40 @@ def daily_summaries(since, hostname, blockchain): hostname, blockchain, str(ex))) return result -def load_disk_usage(disk_type): +def load_recent_disk_usage(disk_type): + db = get_stats_db() + cur = db.cursor() + summary_by_worker = {} + value_factor = "" # Leave at GB for plotting disks + if disk_type == "plots": + value_factor = "/1024" # Divide to TB for plots disks + for wk in chia.load_farmers(): + hostname = wk['hostname'] + dates = [] + paths = {} + sql = "select path, value{0}, created_at from stat_{1}_disk_used where hostname = ? order by created_at, path".format(value_factor, disk_type) + used_result = cur.execute(sql, [ wk['hostname'], ]).fetchall() + for used_row in used_result: + if not used_row[2] in dates: + dates.append(used_row[2]) + if not used_row[0] in paths: + paths[used_row[0]] = {} + values = paths[used_row[0]] + values[used_row[2]] = used_row[1] + if len(dates) > 0: + summary_by_worker[hostname] = { "dates": dates, "paths": paths.keys(), } + for path in paths.keys(): + path_values = [] + for date in dates: + if path in paths: + path_values.append(paths[path][date]) + else: + path_values.append('null') + summary_by_worker[hostname][path] = path_values + app.logger.info(summary_by_worker.keys()) + return summary_by_worker + +def load_current_disk_usage(disk_type): db = get_stats_db() cur = db.cursor() summary_by_worker = {} @@ -161,16 +194,13 @@ def load_disk_usage(disk_type): if len(used_result) != len(free_result): app.logger.info("Found mismatched count of disk used/free stats for {0}".format(disk_type)) else: - for i in range(len(used_result)): - paths.append(used_result[i][0]) - used.append(used_result[i][1]) - if used_result[i][0] != free_result[i][0]: - app.logger.info("Found misordered paths for {0} disk used/free stats: {1} and {2}".format(disk_type, used_result[i][0], free_result[i][0])) - continue - if used_result[i][2] != free_result[i][2]: - app.logger.info("Found misordered created_at for {0} disk used/free stats: {1} and {2}".format(disk_type, used_result[i][2], free_result[i][2])) - continue - free.append(free_result[i][1]) + for used_row in used_result: + paths.append(used_row[0]) + used.append(used_row[1]) + for free_row in free_result: + if used_row[0] == free_row[0]: + free.append(free_row[1]) + continue if len(paths): summary_by_worker[hostname] = { "paths": paths, "used": used, "free": free} #app.logger.info(summary_by_worker.keys()) diff --git a/web/routes.py b/web/routes.py index c4f37d06..cc39265d 100644 --- a/web/routes.py +++ b/web/routes.py @@ -96,7 +96,7 @@ def plotting_jobs(): def plotting_workers(): gc = globals.load() plotters = plotman.load_plotters() - disk_usage = stats.load_disk_usage('plotting') + disk_usage = stats.load_recent_disk_usage('plotting') return render_template('plotting/workers.html', plotters=plotters, disk_usage=disk_usage, global_config=gc) @app.route('/farming/plots') @@ -120,7 +120,7 @@ def farming_workers(): gc = globals.load() farmers = chia.load_farmers() daily_summaries = stats.load_daily_farming_summaries() - disk_usage = stats.load_disk_usage('plots') + disk_usage = stats.load_current_disk_usage('plots') return render_template('farming/workers.html', farmers=farmers, daily_summaries=daily_summaries, disk_usage=disk_usage, global_config=gc) diff --git a/web/templates/farming/workers.html b/web/templates/farming/workers.html index bbeca202..b2ad0269 100644 --- a/web/templates/farming/workers.html +++ b/web/templates/farming/workers.html @@ -101,32 +101,32 @@
{{ farmer.hostname }}
type: 'bar', data: { labels: {{ disk_usage[farmer.hostname].paths | safe }}, - datasets: [{ - label: "Disk Space Used (TB)", - data: {{ disk_usage[farmer.hostname].used | safe }}, - backgroundColor: 'rgba(255, 99, 132, 0.2)', - borderColor: 'rgba(255, 99, 132, 1)', + datasets: [{ + label: "Disk Space Used (TB)", + data: {{ disk_usage[farmer.hostname].used | safe }}, + backgroundColor: 'rgba(255, 99, 132, 0.2)', + borderColor: 'rgba(255, 99, 132, 1)', }, - { - label: 'Disk Space Free (TB)', - data: {{ disk_usage[farmer.hostname].free | safe }}, - backgroundColor: 'rgba(54, 162, 235, 0.2)', - borderColor: 'rgba(54, 162, 235, 1)', + { + label: 'Disk Space Free (TB)', + data: {{ disk_usage[farmer.hostname].free | safe }}, + backgroundColor: 'rgba(54, 162, 235, 0.2)', + borderColor: 'rgba(54, 162, 235, 1)', }], }, - borderWidth: 1, + borderWidth: 1, options: { - responsive: true, + responsive: true, scales: { - x: { - stacked: true, - }, - y: { - stacked: true, - beginAtZero: true + x: { + stacked: true, + }, + y: { + stacked: true, + beginAtZero: true + } } } - } }); {% endif %} diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html index 23868139..31d216fd 100644 --- a/web/templates/plotting/workers.html +++ b/web/templates/plotting/workers.html @@ -56,37 +56,51 @@
{{ plotter.hostname }}
{% endblock %} {% block scripts %} + {% for plotter in plotters %} {% if disk_usage[plotter.hostname] %} + {% endblock %} \ No newline at end of file diff --git a/web/templates/workers.html b/web/templates/workers.html index b7aa3dcd..f5f767c3 100644 --- a/web/templates/workers.html +++ b/web/templates/workers.html @@ -50,9 +50,9 @@ {% if worker.hostname == worker.displayname %} - {{worker.displayname}} + {{worker.displayname}} {% else %} - {{worker.displayname}} {% endif %} {{worker.mode}} From 69c6fdf7913cf66416abb656dc5fa28b0b8ec64f Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 24 Aug 2021 22:02:48 -0600 Subject: [PATCH 0084/1625] Blockchain challenges as chart. --- SECURITY.md | 9 ++++ api/commands/log_parser.py | 4 +- api/gunicorn.conf.py | 2 +- api/schedules/stats_disk.py | 2 +- api/schedules/status_alerts.py | 2 +- api/schedules/status_challenges.py | 15 ++++++ api/views/certificates/resources.py | 2 +- api/views/challenges/resources.py | 18 ++++--- common/utils/converters.py | 6 +++ scripts/chia_launch.sh | 2 + scripts/flax_launch.sh | 2 + web/actions/chia.py | 6 ++- web/actions/stats.py | 7 +-- web/models/chia.py | 26 ++++++++++ web/routes.py | 9 ++-- web/templates/alerts.html | 2 +- web/templates/base.html | 4 ++ web/templates/index.html | 76 ++++++++++++++++++++++++----- web/templates/plotting/workers.html | 46 ++++++++++------- web/templates/views/challenges.html | 38 --------------- web/templates/worker.html | 2 +- 21 files changed, 185 insertions(+), 95 deletions(-) create mode 100644 SECURITY.md delete mode 100644 web/templates/views/challenges.html diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..54630f04 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,9 @@ +# Security Policy + +## Supported Versions + +Machinaris security patches will be made for the [current release](https://github.com/guydavis/machinaris/wiki/Releases#release-streams), aka `:latest`. + +## Reporting a Vulnerability + +Please create a new [Discussion](https://github.com/guydavis/machinaris/discussions) with full details of the vulnerability. I will provide a response asap. Thanks in advance! diff --git a/api/commands/log_parser.py b/api/commands/log_parser.py index c9225b90..7ac15d5f 100644 --- a/api/commands/log_parser.py +++ b/api/commands/log_parser.py @@ -24,8 +24,8 @@ CHIA_LOG = '/root/.chia/mainnet/log/debug.log' FLAX_LOG = '/root/.flax/mainnet/log/debug.log' -# Roughly 1 minutes worth of challenges -CHALLENGES_TO_LOAD = 8 +# Roughly 2 minutes worth of challenges, sent 90 seconds, for overlap +CHALLENGES_TO_LOAD = 16 # Most recent partial proofs, actually double as 2 log lines per partial PARTIALS_TO_LOAD = 50 diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py index 11e6536d..715fe2f7 100644 --- a/api/gunicorn.conf.py +++ b/api/gunicorn.conf.py @@ -24,7 +24,7 @@ def on_starting(server): #scheduler.add_job(func=stats_disk.collect, trigger='interval', seconds=10) # Test immediately # Status gathering - reported via API - scheduler.add_job(func=status_challenges.update, name="challenges", trigger='interval', seconds=5) + scheduler.add_job(func=status_challenges.update, name="challenges", trigger='interval', seconds=90, jitter=45) scheduler.add_job(func=status_worker.update, name="workers", trigger='interval', seconds=120, jitter=60) scheduler.add_job(func=status_controller.update, name="controller", trigger='interval', seconds=120, jitter=60) scheduler.add_job(func=status_farm.update, name="farms", trigger='interval', seconds=120, jitter=60) diff --git a/api/schedules/stats_disk.py b/api/schedules/stats_disk.py index 87848189..7e14155c 100644 --- a/api/schedules/stats_disk.py +++ b/api/schedules/stats_disk.py @@ -20,7 +20,7 @@ TABLES = ['stat_plots_total_used', 'stat_plots_disk_used', 'stat_plots_disk_free', 'stat_plotting_total_used', 'stat_plotting_disk_used', 'stat_plotting_disk_free'] -DELETE_OLD_STATS_AFTER_DAYS = 2 +DELETE_OLD_STATS_AFTER_DAYS = 1 def get_db(): db = getattr(g, '_stats_database', None) diff --git a/api/schedules/status_alerts.py b/api/schedules/status_alerts.py index bc1c4a0f..6d2a1a86 100644 --- a/api/schedules/status_alerts.py +++ b/api/schedules/status_alerts.py @@ -38,7 +38,7 @@ def update(): first_run = False else: # On subsequent schedules, load only last 5 minutes. since = (datetime.datetime.now() - datetime.timedelta(minutes=5)).strftime("%Y-%m-%d %H:%M:%S.000") - alerts = db.session.query(a.Alert).filter(a.Alert.created_at >= since).order_by(a.Alert.created_at.desc()).limit(20).all() + alerts = db.session.query(a.Alert).filter(a.Alert.created_at >= since, a.Alert.hostname == hostname).order_by(a.Alert.created_at.desc()).limit(20).all() payload = [] for alert in alerts: payload.append({ diff --git a/api/schedules/status_challenges.py b/api/schedules/status_challenges.py index 20938449..a74e9cd4 100644 --- a/api/schedules/status_challenges.py +++ b/api/schedules/status_challenges.py @@ -2,6 +2,7 @@ # Performs a REST call to controller (possibly localhost) of latest blockchain challenges. # +import datetime import os import traceback @@ -13,11 +14,25 @@ from api.commands import log_parser from api import utils +def delete_old_challenges(db): + try: + cutoff = datetime.datetime.now() - datetime.timedelta(hours=1) + cur = db.cursor() + cur.execute("DELETE FROM challenges WHERE created_at < {1}".format( + table, cutoff.strftime("%Y%m%d%H%M"))) + db.commit() + except: + app.logger.info("Failed to delete old challenges.") + app.logger.info(traceback.format_exc()) + def update(): if not globals.farming_enabled() and not globals.harvesting_enabled(): #app.logger.info("Skipping recent challenges collection on plotting-only instance.") return with app.app_context(): + from api import db + if globals.load()['is_controller']: + delete_old_challenges(db) try: hostname = utils.get_displayname() blockchains = ['chia'] diff --git a/api/views/certificates/resources.py b/api/views/certificates/resources.py index d6e8ace4..2996fdb4 100644 --- a/api/views/certificates/resources.py +++ b/api/views/certificates/resources.py @@ -49,6 +49,6 @@ def allow_download(self): worker_setup_marker = "/root/.chia/machinaris/tmp/worker_launch.tmp" if os.path.exists(worker_setup_marker): last_modified_date = datetime.datetime.fromtimestamp(os.path.getmtime(worker_setup_marker)) - fifteen_minutes_ago = datetime.datetime.now() - datetime.timedelta(minutes=15) + fifteen_minutes_ago = datetime.datetime.now() - datetime.timedelta(minutes=30) return last_modified_date >= fifteen_minutes_ago return False \ No newline at end of file diff --git a/api/views/challenges/resources.py b/api/views/challenges/resources.py index 094dd8b3..d2d6fa1a 100644 --- a/api/views/challenges/resources.py +++ b/api/views/challenges/resources.py @@ -35,12 +35,13 @@ def get(self, args): def post(self, new_items): if len(new_items) == 0: return "No challenges provided.", 400 - db.session.query(Challenge).filter(Challenge.hostname==new_items[0]['hostname']).delete() items = [] for new_item in new_items: - item = Challenge(**new_item) - items.append(item) - db.session.add(item) + item = Challenge.query.get(new_item['unique_id']) + if not item: # Request contains previously received challenges, only add new + item = Challenge(**new_item) + items.append(item) + db.session.add(item) db.session.commit() return items @@ -57,12 +58,13 @@ def get(self, hostname, blockchain): @blp.arguments(BatchOfChallengeSchema) @blp.response(200, ChallengeSchema(many=True)) def put(self, new_items, hostname, blockchain): - db.session.query(Challenge).filter(Challenge.hostname==hostname, Challenge.blockchain==blockchain).delete() items = [] for new_item in new_items: - item = Challenge(**new_item) - items.append(item) - db.session.add(item) + item = Challenge.query.get(new_item['unique_id']) + if not item: # Request contains previously received challenges, only add new + item = Challenge(**new_item) + items.append(item) + db.session.add(item) db.session.commit() return items diff --git a/common/utils/converters.py b/common/utils/converters.py index 6dcaa046..b8140865 100644 --- a/common/utils/converters.py +++ b/common/utils/converters.py @@ -32,6 +32,12 @@ def str_to_gibs(str): print(traceback.format_exc()) return None +def convert_date_for_luxon(datestr): + year = datestr[:4] + month = datestr[4:6] + day = datestr[6:8] + time = datestr[8:] + return "{0}-{1}-{2}T{3}".format(year, month, day, time) diff --git a/scripts/chia_launch.sh b/scripts/chia_launch.sh index 6295f4e8..972c92de 100644 --- a/scripts/chia_launch.sh +++ b/scripts/chia_launch.sh @@ -51,6 +51,8 @@ elif [[ ${mode} =~ ^harvester.* ]]; then response=$(curl --write-out '%{http_code}' --silent http://${controller_host}:8927/certificates/?type=chia --output /tmp/certs.zip) if [ $response == '200' ]; then unzip /tmp/certs.zip -d /root/.chia/farmer_ca + else + echo "Certificates response of ${response} from http://${controller_host}:8927/certificates/?type=chia. Try clicking 'New Worker' button on 'Workers' page first." fi rm -f /tmp/certs.zip fi diff --git a/scripts/flax_launch.sh b/scripts/flax_launch.sh index 168765c7..2480ad9d 100644 --- a/scripts/flax_launch.sh +++ b/scripts/flax_launch.sh @@ -61,6 +61,8 @@ elif [[ ${mode} =~ ^harvester.* ]]; then response=$(curl --write-out '%{http_code}' --silent http://${controller_host}:8927/certificates/?type=flax --output /tmp/certs.zip) if [ $response == '200' ]; then unzip /tmp/certs.zip -d /root/.flax/farmer_ca + else + echo "Certificates response of ${response} from http://${controller_host}:8927/certificates/?type=flax. Try clicking 'New Worker' button on 'Workers' page first." fi rm -f /tmp/certs.zip fi diff --git a/web/actions/chia.py b/web/actions/chia.py index d5859507..b59cf5ba 100644 --- a/web/actions/chia.py +++ b/web/actions/chia.py @@ -28,7 +28,7 @@ partials as pr from common.config import globals from web.models.chia import FarmSummary, FarmPlots, BlockchainChallenges, Wallets, \ - Blockchains, Connections, Keys, Plotnfts, Pools, Partials + Blockchains, Connections, Keys, Plotnfts, Pools, Partials, ChallengesChartData from . import worker as wk CHIA_BINARY = '/chia-blockchain/venv/bin/chia' @@ -51,6 +51,10 @@ def recent_challenges(): challenges = db.session.query(c.Challenge).filter(c.Challenge.created_at >= five_minutes_ago).order_by(c.Challenge.created_at.desc()).limit(20) return BlockchainChallenges(challenges) +def challenges_chart_data(): + challenges = db.session.query(c.Challenge).order_by(c.Challenge.created_at.desc(), c.Challenge.hostname, c.Challenge.blockchain).all() + return ChallengesChartData(challenges) + def load_partials(): partials = db.session.query(pr.Partial).order_by(pr.Partial.created_at.desc()).limit(10) return Partials(partials) diff --git a/web/actions/stats.py b/web/actions/stats.py index cbbb0236..4ff81672 100644 --- a/web/actions/stats.py +++ b/web/actions/stats.py @@ -156,12 +156,13 @@ def load_recent_disk_usage(disk_type): sql = "select path, value{0}, created_at from stat_{1}_disk_used where hostname = ? order by created_at, path".format(value_factor, disk_type) used_result = cur.execute(sql, [ wk['hostname'], ]).fetchall() for used_row in used_result: - if not used_row[2] in dates: - dates.append(used_row[2]) + converted_date = converters.convert_date_for_luxon(used_row[2]) + if not converted_date in dates: + dates.append(converted_date) if not used_row[0] in paths: paths[used_row[0]] = {} values = paths[used_row[0]] - values[used_row[2]] = used_row[1] + values[converted_date] = used_row[1] if len(dates) > 0: summary_by_worker[hostname] = { "dates": dates, "paths": paths.keys(), } for path in paths.keys(): diff --git a/web/models/chia.py b/web/models/chia.py index b307e887..9698bf10 100644 --- a/web/models/chia.py +++ b/web/models/chia.py @@ -109,6 +109,32 @@ def __init__(self, challenges): 'created_at': challenge.created_at, }) + +class ChallengesChartData: + + def __init__(self, challenges): + self.labels = [] + datasets = {} + for challenge in challenges: + created_at = challenge.created_at.replace(' ', 'T') + if not created_at in self.labels: + self.labels.append(created_at) + host_chain = challenge.hostname + '_' + challenge.blockchain + if not host_chain in datasets: + datasets[host_chain] = {} + dataset = datasets[host_chain] + dataset[created_at] = float(challenge.time_taken.split()[0]) # Drop off the 'secs' + # Now build a sparse array with null otherwise + self.data = {} + for key in datasets.keys(): + self.data[key] = [] + for label in self.labels: + for key in datasets.keys(): + if label in datasets[key]: + self.data[key].append(datasets[key][label]) + else: + self.data[key].append('null') # Javascript null + class Wallets: def __init__(self, wallets): diff --git a/web/routes.py b/web/routes.py index 68a103e4..18676749 100644 --- a/web/routes.py +++ b/web/routes.py @@ -30,16 +30,13 @@ def index(): farming = chia.load_farm_summary() plotting = plotman.load_plotting_summary() challenges = chia.recent_challenges() + challenges_chart_data = chia.challenges_chart_data() partials = chia.load_partials() daily_diff = stats.load_daily_diff() return render_template('index.html', reload_seconds=120, farming=farming.__dict__, \ plotting=plotting.__dict__, challenges=challenges, workers=workers, - daily_diff=daily_diff, partials=partials, global_config=gc) - -@app.route('/views/challenges') -def views_challenges(): - challenges = chia.recent_challenges() - return render_template('views/challenges.html', challenges=challenges) + daily_diff=daily_diff, partials=partials, challenges_chart_data=challenges_chart_data, + global_config=gc) @app.route('/setup', methods=['GET', 'POST']) def setup(): diff --git a/web/templates/alerts.html b/web/templates/alerts.html index 200ecb58..7e57cf69 100644 --- a/web/templates/alerts.html +++ b/web/templates/alerts.html @@ -91,7 +91,7 @@ - {{notification.hostname}} + {{notification.worker}} {{notification.blockchain}} {{notification.service}} {{notification.message}} diff --git a/web/templates/base.html b/web/templates/base.html index b6b6fdf4..c47e9224 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -177,6 +177,10 @@ src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.js"> + + {% block scripts %}{% endblock %} diff --git a/web/templates/index.html b/web/templates/index.html index e1b77a87..7f2ece67 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -120,7 +120,7 @@
Flax Netspace
{% if global_config.farming_enabled %}
- {% include 'views/challenges.html' %} +
{% endif %} @@ -160,20 +160,70 @@
Flax Netspace
{% block scripts %} {% if global_config.farming_enabled %} {% endif %} diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html index 31d216fd..c9eda3f0 100644 --- a/web/templates/plotting/workers.html +++ b/web/templates/plotting/workers.html @@ -58,20 +58,20 @@
{{ plotter.hostname }}
{% block scripts %} {% for plotter in plotters %} @@ -81,20 +81,30 @@
{{ plotter.hostname }}
var myChart = new Chart(ctx, { type: 'line', data: { - labels: {{ disk_usage[plotter.hostname].dates|safe }}, + labels: {{ disk_usage[plotter.hostname].dates | safe }}, datasets: [ {% for path in disk_usage[plotter.hostname].paths %} - { - label: "{{path}}", - data: {{ disk_usage[plotter.hostname][path]|safe }}, - backgroundColor: color({{loop.index-1}}), - }, + { + label: "{{path}}", + data: {{ disk_usage[plotter.hostname][path] | safe }}, + backgroundColor: color({{ loop.index - 1 }}), + }, {% endfor %} ], }, borderWidth: 1, options: { scales: { + x: { + type: 'time', + time: { + tooltipFormat: 'DD T' + }, + title: { + display: true, + text: 'Time - Last 24 Hours' + } + }, y: { beginAtZero: true, title: { @@ -104,7 +114,7 @@
{{ plotter.hostname }}
} } } - }); + }); {% endif %} {% endfor %} diff --git a/web/templates/views/challenges.html b/web/templates/views/challenges.html deleted file mode 100644 index 00495354..00000000 --- a/web/templates/views/challenges.html +++ /dev/null @@ -1,38 +0,0 @@ -{% if challenges.rows|length > 0 %} - - - - - - - - - - - - - - {% for challenge in challenges.rows %} - - - - - - - - - - {% endfor %} - -
WorkerBlockchainChallengePlots Passed FilterProofs FoundTime TakenDate
{{challenge.hostname}}{{challenge.blockchain}}{{challenge.challenge_id}}{{challenge.plots_past_filter}}{{challenge.proofs_found}}{{challenge.time_taken}}{{challenge.created_at}}
- - {% else %} - -
-
No recent challenges found in Chia's log on your farmers. Are they configured and running?
-
If you have plots and this persists for long, check the Alerts tab and review Chia's log. - See the FAQ.
-
- {% endif %} \ No newline at end of file diff --git a/web/templates/worker.html b/web/templates/worker.html index 79904274..4aa21f49 100644 --- a/web/templates/worker.html +++ b/web/templates/worker.html @@ -52,7 +52,7 @@ {{worker.updated_at | datetimefilter}} - Time on Worker + Local Time on Worker {{worker.time_on_worker}} From bbe464e2373f6fad535ce1b6e75effaa80a47951 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 24 Aug 2021 22:28:16 -0600 Subject: [PATCH 0085/1625] Fix for challenge deletion --- api/schedules/status_challenges.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/schedules/status_challenges.py b/api/schedules/status_challenges.py index a74e9cd4..16c3296d 100644 --- a/api/schedules/status_challenges.py +++ b/api/schedules/status_challenges.py @@ -8,6 +8,7 @@ from flask import g +from common.models import challenges as c from common.config import globals from common.utils import converters from api import app @@ -17,10 +18,9 @@ def delete_old_challenges(db): try: cutoff = datetime.datetime.now() - datetime.timedelta(hours=1) - cur = db.cursor() - cur.execute("DELETE FROM challenges WHERE created_at < {1}".format( - table, cutoff.strftime("%Y%m%d%H%M"))) - db.commit() + db.session.query(c.Challenge).filter(c.Challenge.created_at < "{0}".format( + cutoff.strftime("%Y%m%d%H%M"))).delete() + db.session.commit() except: app.logger.info("Failed to delete old challenges.") app.logger.info(traceback.format_exc()) From 5555eb1a9d4f9b751176e1ae26ce74a1f3523786 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 24 Aug 2021 22:34:48 -0600 Subject: [PATCH 0086/1625] More cleanup of old challenges code. --- web/actions/chia.py | 10 +++------- web/models/chia.py | 24 ------------------------ web/routes.py | 6 ++---- web/templates/index.html | 2 +- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/web/actions/chia.py b/web/actions/chia.py index b59cf5ba..638b3b3f 100644 --- a/web/actions/chia.py +++ b/web/actions/chia.py @@ -27,8 +27,9 @@ blockchains as b, connections as co, keys as k, plotnfts as pn, pools as po, \ partials as pr from common.config import globals -from web.models.chia import FarmSummary, FarmPlots, BlockchainChallenges, Wallets, \ - Blockchains, Connections, Keys, Plotnfts, Pools, Partials, ChallengesChartData +from web.models.chia import FarmSummary, FarmPlots, Wallets, \ + Blockchains, Connections, Keys, Plotnfts, Pools, Partials, \ + ChallengesChartData from . import worker as wk CHIA_BINARY = '/chia-blockchain/venv/bin/chia' @@ -46,11 +47,6 @@ def load_plots_farming(hostname=None): plots = query.all() return FarmPlots(plots) -def recent_challenges(): - five_minutes_ago = (datetime.datetime.now() - datetime.timedelta(minutes=5)).strftime("%Y-%m-%d %H:%M:%S.000") - challenges = db.session.query(c.Challenge).filter(c.Challenge.created_at >= five_minutes_ago).order_by(c.Challenge.created_at.desc()).limit(20) - return BlockchainChallenges(challenges) - def challenges_chart_data(): challenges = db.session.query(c.Challenge).order_by(c.Challenge.created_at.desc(), c.Challenge.hostname, c.Challenge.blockchain).all() return ChallengesChartData(challenges) diff --git a/web/models/chia.py b/web/models/chia.py index 9698bf10..364ced07 100644 --- a/web/models/chia.py +++ b/web/models/chia.py @@ -86,30 +86,6 @@ def __init__(self, plots): 'type': plot.type if plot.type else "" }) -class BlockchainChallenges: - - def __init__(self, challenges): - self.columns = ['hostname', - 'blockchain', - 'challenge_id', - 'plots_past_filter', - 'proofs_found', - 'time_taken', - 'created_at', - ] - self.rows = [] - for challenge in challenges: - self.rows.append({ - 'hostname': challenge.hostname, - 'blockchain': challenge.blockchain, - 'challenge_id': challenge.challenge_id, - 'plots_past_filter': challenge.plots_past_filter, - 'proofs_found': challenge.proofs_found, - 'time_taken': challenge.time_taken, - 'created_at': challenge.created_at, - }) - - class ChallengesChartData: def __init__(self, challenges): diff --git a/web/routes.py b/web/routes.py index 18676749..a0aa4407 100644 --- a/web/routes.py +++ b/web/routes.py @@ -29,14 +29,12 @@ def index(): workers = worker.load_worker_summary() farming = chia.load_farm_summary() plotting = plotman.load_plotting_summary() - challenges = chia.recent_challenges() challenges_chart_data = chia.challenges_chart_data() partials = chia.load_partials() daily_diff = stats.load_daily_diff() return render_template('index.html', reload_seconds=120, farming=farming.__dict__, \ - plotting=plotting.__dict__, challenges=challenges, workers=workers, - daily_diff=daily_diff, partials=partials, challenges_chart_data=challenges_chart_data, - global_config=gc) + plotting=plotting.__dict__, workers=workers, daily_diff=daily_diff, partials=partials, + challenges_chart_data=challenges_chart_data, global_config=gc) @app.route('/setup', methods=['GET', 'POST']) def setup(): diff --git a/web/templates/index.html b/web/templates/index.html index 7f2ece67..009d2582 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -182,7 +182,7 @@
Flax Netspace
var ctx = document.getElementById('challenges_chart'); var myChart = new Chart(ctx, { - type: 'line', + type: 'scatter', data: { labels: {{ challenges_chart_data.labels | safe }}, datasets: [ From 9612e409aa226d5ec385ac02a3527c32f2fb03c1 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 10:33:13 -0600 Subject: [PATCH 0087/1625] Display partials in bar chart. --- api/schedules/status_challenges.py | 7 +-- api/schedules/status_partials.py | 15 ++++++ web/actions/chia.py | 9 ++-- web/models/chia.py | 37 ++++++++------- web/routes.py | 7 +-- web/templates/index.html | 73 ++++++++++++++++-------------- 6 files changed, 88 insertions(+), 60 deletions(-) diff --git a/api/schedules/status_challenges.py b/api/schedules/status_challenges.py index 16c3296d..316be7b8 100644 --- a/api/schedules/status_challenges.py +++ b/api/schedules/status_challenges.py @@ -8,8 +8,8 @@ from flask import g -from common.models import challenges as c from common.config import globals +from common.models import challenges as c from common.utils import converters from api import app from api.commands import log_parser @@ -18,8 +18,9 @@ def delete_old_challenges(db): try: cutoff = datetime.datetime.now() - datetime.timedelta(hours=1) - db.session.query(c.Challenge).filter(c.Challenge.created_at < "{0}".format( - cutoff.strftime("%Y%m%d%H%M"))).delete() + cutoff_str = "{0}".format(cutoff.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]) + #app.logger.info("Purging old challenges earlier than {0}".format(cutoff_str)) + db.session.query(c.Challenge).filter(c.Challenge.created_at < cutoff_str).delete() db.session.commit() except: app.logger.info("Failed to delete old challenges.") diff --git a/api/schedules/status_partials.py b/api/schedules/status_partials.py index 3bc4b2af..de6a3cf1 100644 --- a/api/schedules/status_partials.py +++ b/api/schedules/status_partials.py @@ -8,17 +8,32 @@ from flask import g from common.config import globals +from common.models import partials as p from common.utils import converters from api import app from api.commands import log_parser from api import utils +def delete_old_partials(db): + try: + cutoff = datetime.datetime.now() - datetime.timedelta(days=1) + cutoff_str = "{0}".format(cutoff.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]) + #app.logger.info("Purging old partials earlier than {0}".format(cutoff_str)) + db.session.query(p.Partial).filter(p.Partial.created_at < cutoff_str).delete() + db.session.commit() + except: + app.logger.info("Failed to delete old partials.") + app.logger.info(traceback.format_exc()) + def update(): if not globals.farming_enabled() and not globals.harvesting_enabled(): #app.logger.info("Skipping recent partials collection on plotting-only instance.") return with app.app_context(): try: + from api import db + if globals.load()['is_controller']: + delete_old_partials(db) hostname = utils.get_hostname() blockchains = ['chia'] if globals.flax_enabled(): diff --git a/web/actions/chia.py b/web/actions/chia.py index 638b3b3f..4f9135e2 100644 --- a/web/actions/chia.py +++ b/web/actions/chia.py @@ -28,7 +28,7 @@ partials as pr from common.config import globals from web.models.chia import FarmSummary, FarmPlots, Wallets, \ - Blockchains, Connections, Keys, Plotnfts, Pools, Partials, \ + Blockchains, Connections, Keys, Plotnfts, Pools, PartialsChartData, \ ChallengesChartData from . import worker as wk @@ -51,9 +51,10 @@ def challenges_chart_data(): challenges = db.session.query(c.Challenge).order_by(c.Challenge.created_at.desc(), c.Challenge.hostname, c.Challenge.blockchain).all() return ChallengesChartData(challenges) -def load_partials(): - partials = db.session.query(pr.Partial).order_by(pr.Partial.created_at.desc()).limit(10) - return Partials(partials) +def partials_chart_data(): + day_ago = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y-%m-%d %H:00:00.000") + partials = db.session.query(pr.Partial).filter(pr.Partial.created_at >= day_ago).order_by(pr.Partial.created_at.desc()).limit(10) + return PartialsChartData(partials) def load_wallets(): wallets = db.session.query(w.Wallet).all() diff --git a/web/models/chia.py b/web/models/chia.py index 364ced07..7bccdc38 100644 --- a/web/models/chia.py +++ b/web/models/chia.py @@ -2,7 +2,7 @@ import os import traceback -from datetime import datetime +import datetime from web import app from common.utils import converters @@ -147,20 +147,25 @@ def __init__(self, blockchains): 'details': blockchain.details, 'updated_at': blockchain.updated_at }) -class Partials: +class PartialsChartData: def __init__(self, partials): - self.columns = ['hostname', 'blockchain', 'launcher_id', 'pool_url', 'pool_response', 'created_at'] - self.rows = [] + self.labels = [] + label_index_by_hour = {} + for i in range(24): + start_time = datetime.datetime.now().replace(microsecond=0, second=0, minute=0) - datetime.timedelta(hours=24-i) + self.labels.append(start_time.strftime("%I %p")) + label_index_by_hour[start_time.strftime("%H")] = len(self.labels) - 1 + self.data = {} for partial in partials: - self.rows.append({ - 'hostname': partial.hostname, - 'blockchain': partial.blockchain, - 'launcher_id': partial.launcher_id, - 'pool_url': partial.pool_url, - 'pool_response': partial.pool_response, - 'created_at': partial.created_at }) - + created_at = partial.created_at + pool_launcher = partial.pool_url.replace('https://', '') + ' (' + partial.launcher_id[:8] + '...)' + if not pool_launcher in self.data: + self.data[pool_launcher] = [0] * 24 # Initialize as list of zeros + dataset = self.data[pool_launcher] + partial_hour_at = created_at[11:13] + dataset[label_index_by_hour[partial_hour_at]] += 1 + class Connections: def __init__(self, connections): @@ -194,8 +199,8 @@ def parse(connections): 'ip': vals[1], 'ports': vals[2], 'nodeid': vals[3].replace('...',''), - 'last_connect': datetime.strptime( \ - str(datetime.today().year) + ' ' + vals[4] + ' ' + vals[5] + ' ' + vals[6], + 'last_connect': datetime.datetime.strptime( \ + str(datetime.datetime.today().year) + ' ' + vals[4] + ' ' + vals[5] + ' ' + vals[6], '%Y %b %d %H:%M:%S'), 'mib_up': float(vals[7].split('|')[0]), 'mib_down': float(vals[7].split('|')[1]) @@ -210,7 +215,7 @@ def __init__(self, plotnfts): self.columns = ['hostname', 'details', 'updated_at'] self.rows = [] for plotnft in plotnfts: - updated_at = plotnft.updated_at or datetime.now() + updated_at = plotnft.updated_at or datetime.datetime.now() self.rows.append({ 'hostname': plotnft.hostname, 'blockchain': plotnft.blockchain, @@ -235,7 +240,7 @@ def __init__(self, pools, plotnfts): for pool in pools: launcher_id = pool.launcher_id plotnft = self.find_plotnft(plotnfts, launcher_id) - updated_at = pool.updated_at or datetime.now() + updated_at = pool.updated_at or datetime.datetime.now() pool_state = json.loads(pool.pool_state) if plotnft: status = self.extract_plotnft_value(plotnft, "Current state:") diff --git a/web/routes.py b/web/routes.py index a0aa4407..aed9e926 100644 --- a/web/routes.py +++ b/web/routes.py @@ -30,11 +30,12 @@ def index(): farming = chia.load_farm_summary() plotting = plotman.load_plotting_summary() challenges_chart_data = chia.challenges_chart_data() - partials = chia.load_partials() + partials_chart_data = chia.partials_chart_data() daily_diff = stats.load_daily_diff() return render_template('index.html', reload_seconds=120, farming=farming.__dict__, \ - plotting=plotting.__dict__, workers=workers, daily_diff=daily_diff, partials=partials, - challenges_chart_data=challenges_chart_data, global_config=gc) + plotting=plotting.__dict__, workers=workers, daily_diff=daily_diff, \ + partials_chart_data=partials_chart_data, challenges_chart_data=challenges_chart_data, \ + global_config=gc) @app.route('/setup', methods=['GET', 'POST']) def setup(): diff --git a/web/templates/index.html b/web/templates/index.html index 009d2582..f3dd5de9 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -119,40 +119,17 @@
Flax Netspace
{% if global_config.farming_enabled %}
-
+
+

Blockchain Challenges to Harvesters

- {% endif %} - - {% if partials.rows|length > 0 %}
-
- - - - - - - - - - - - {% for partial in partials.rows %} - - - - - - - - {% endfor %} - -
BlockchainPoolResponseLauncherDate
{{partial.blockchain}}{{partial.pool_url}}{{partial.pool_response}}{{partial.launcher_id|launcheridshortener}}{{partial.created_at}}
+
+

Partial Proofs to Pools

+
- {% endif %} {% endblock %} @@ -197,12 +174,6 @@
Flax Netspace
}, borderWidth: 1, options: { - plugins: { - title: { - display: true, - text: 'Blockchain Challenges', - } - }, scales: { x: { type: 'time', @@ -224,6 +195,40 @@
Flax Netspace
} } }); + var ctx = document.getElementById('partials_chart'); + var myChart = new Chart(ctx, { + type: 'bar', + data: { + labels: {{ partials_chart_data.labels | safe }}, + datasets: [ + {% for key in partials_chart_data.data %} + { + label: "{{key}}", + data: {{ partials_chart_data.data[key] | safe }}, + backgroundColor: color({{ loop.index - 1 }}), + }, + {% endfor %} + ], + }, + borderWidth: 1, + options: { + scales: { + x: { + title: { + display: true, + text: 'Time - Last 24 Hours' + } + }, + y: { + beginAtZero: true, + title: { + display: true, + text: "Partials Submitted", + } + } + } + } + }); }) {% endif %} From dce4e5f55a5c134b867b8a85889bd87cefbdce12 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 14:48:23 -0600 Subject: [PATCH 0088/1625] Fixes from fresh install testing. --- api/commands/chia_cli.py | 3 +-- api/schedules/status_partials.py | 1 + common/utils/converters.py | 5 ++++- web/actions/chia.py | 2 +- web/actions/worker.py | 2 +- web/models/chia.py | 2 +- web/templates/index.html | 2 +- web/templates/setup.html | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py index 9a284619..3f585c51 100644 --- a/api/commands/chia_cli.py +++ b/api/commands/chia_cli.py @@ -48,8 +48,7 @@ def load_farm_summary(blockchain): proc.communicate() abort(500, description="The timeout is expired!") if errs: - app.logger.info("Failed to load chia farm summary at.") - app.logger.info(traceback.format_exc()) + app.logger.debug("Error from {0} farm summary because {1}".format(blockchain, outs.decode('utf-8'))) farm_summary = chia.FarmSummary(cli_stdout=outs.decode('utf-8').splitlines()) else: # Just get plot count and size farm_summary = chia.FarmSummary(farm_plots=load_plots_farming()) diff --git a/api/schedules/status_partials.py b/api/schedules/status_partials.py index de6a3cf1..583a6821 100644 --- a/api/schedules/status_partials.py +++ b/api/schedules/status_partials.py @@ -2,6 +2,7 @@ # Performs a REST call to controller (possibly localhost) of latest blockchain partials. # +import datetime import os import traceback diff --git a/common/utils/converters.py b/common/utils/converters.py index b8140865..1be5096e 100644 --- a/common/utils/converters.py +++ b/common/utils/converters.py @@ -11,7 +11,10 @@ def sizeof_fmt(num, suffix='B'): if abs(num) < 1024.0: return "%3.3f %s%s" % (num, unit, suffix) num /= 1024.0 - return "%.3f %s%s" % (num, 'Yi', suffix) + value = "%.3f %s%s" % (num, 'Yi', suffix) + if value == "0.000 B": + return "0" + return value def gib_to_fmt(gibs): return sizeof_fmt(gibs * 1024 * 1024 * 1024) diff --git a/web/actions/chia.py b/web/actions/chia.py index 4f9135e2..e647fee9 100644 --- a/web/actions/chia.py +++ b/web/actions/chia.py @@ -193,7 +193,7 @@ def generate_key(key_path): return False flash('Welcome! A new key has been generated at {0} within the container filesystem. See the '.format(key_path) + \ 'Wiki for ' + \ - 'details.', 'success') + 'details. Please allow 5-10 minutes for Chia to begin syncing to peers...', 'success') flash('{0}'.format(" ".join(mnemonic_words)), 'info') if os.environ['mode'].startswith('farmer'): cmd = 'farmer-only' diff --git a/web/actions/worker.py b/web/actions/worker.py index 9c8b4f2f..9379911d 100644 --- a/web/actions/worker.py +++ b/web/actions/worker.py @@ -82,7 +82,7 @@ def generate_warnings(worker, plots): warnings = [] worker_plot_file_count = len(plots.rows) worker_summary_plot_count = plot_count_from_summary(worker.hostname) - if not worker_summary_plot_count: + if not worker_summary_plot_count and worker_plot_file_count > 0: warnings.append(WorkerWarning("Disconnected harvester!", "Farm summary reports no harvester for {0}, but Machinaris found {1} plots on disk. Further investigation of the worker harvesting service is recommended.".format( worker.hostname, worker_plot_file_count))) diff --git a/web/models/chia.py b/web/models/chia.py index 7bccdc38..f93f641a 100644 --- a/web/models/chia.py +++ b/web/models/chia.py @@ -117,7 +117,7 @@ def __init__(self, wallets): self.columns = ['hostname', 'details', 'updated_at'] self.rows = [] for wallet in wallets: - updated_at = wallet.updated_at or datetime.now() + updated_at = wallet.updated_at or datetime.datetime.now() self.rows.append({ 'hostname': wallet.hostname, 'blockchain': wallet.blockchain, diff --git a/web/templates/index.html b/web/templates/index.html index f3dd5de9..0bf04434 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -163,7 +163,7 @@

Partial Proofs to Pools

data: { labels: {{ challenges_chart_data.labels | safe }}, datasets: [ - {% for key in challenges_chart_data.data %} + {% for key in challenges_chart_data.data | sort %} { label: "{{key}}", data: {{ challenges_chart_data.data[key] | safe }}, diff --git a/web/templates/setup.html b/web/templates/setup.html index 69fabdaf..71911261 100644 --- a/web/templates/setup.html +++ b/web/templates/setup.html @@ -44,7 +44,7 @@ {% endwith %}
-

To get started with Machinaris as a Chia™ fullnode or farmer, either import your existing +

To get started with Machinaris as a Chia™ fullnode, either import your existing 24-word mnemonic seed phrase:

From 0817629f63b92c155c1a2f36cba97f6cedaf7bd8 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 18:16:47 -0600 Subject: [PATCH 0089/1625] Fix defaults on first sync. --- api/models/chia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/models/chia.py b/api/models/chia.py index e41bbd80..c921eb62 100644 --- a/api/models/chia.py +++ b/api/models/chia.py @@ -16,7 +16,7 @@ def __init__(self, cli_stdout=None, farm_plots=None): if cli_stdout: next_line_local_harvester = False self.plot_count = 0 - self.plots_size = None + self.plots_size = 0 for line in cli_stdout: if next_line_local_harvester: self.plot_count = line.strip().split(' ')[0] From 0d3477a0f1450904d7c41751137832a68c4015e9 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 20:36:00 -0600 Subject: [PATCH 0090/1625] More guards for initial install. --- api/models/chia.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/models/chia.py b/api/models/chia.py index c921eb62..05c33c5b 100644 --- a/api/models/chia.py +++ b/api/models/chia.py @@ -34,6 +34,11 @@ def __init__(self, cli_stdout=None, farm_plots=None): next_line_local_harvester = True elif not self.plots_size and "Total size of plots" in line: self.plots_size = line.split(':')[1].strip() + try: + float(self.plots_size) + except: + app.logger.info("Plots size was {0} so resetting to zero.".format(self.plots_size)) + self.plots_size = 0 elif "Estimated network space" in line: self.calc_netspace_size(line.split(':')[1].strip()) elif "Expected time to win" in line: From f436af267565e258d8f1bb24d4ddbd2c3fad90b3 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 20:47:15 -0600 Subject: [PATCH 0091/1625] Latest format from Flax. --- api/models/chia.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/api/models/chia.py b/api/models/chia.py index 05c33c5b..395a85ad 100644 --- a/api/models/chia.py +++ b/api/models/chia.py @@ -32,13 +32,6 @@ def __init__(self, cli_stdout=None, farm_plots=None): self.plot_count = line.split(':')[1].strip() elif "Local Harvester" in line: next_line_local_harvester = True - elif not self.plots_size and "Total size of plots" in line: - self.plots_size = line.split(':')[1].strip() - try: - float(self.plots_size) - except: - app.logger.info("Plots size was {0} so resetting to zero.".format(self.plots_size)) - self.plots_size = 0 elif "Estimated network space" in line: self.calc_netspace_size(line.split(':')[1].strip()) elif "Expected time to win" in line: From fe62e7abedffe321637753b9a7e62fa7ab3f38eb Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 20:49:12 -0600 Subject: [PATCH 0092/1625] Latest for Flax again. --- api/models/chia.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/models/chia.py b/api/models/chia.py index 395a85ad..f403ffee 100644 --- a/api/models/chia.py +++ b/api/models/chia.py @@ -28,8 +28,6 @@ def __init__(self, cli_stdout=None, farm_plots=None): self.total_chia = line.split(':')[1].strip() elif "Total flax farmed" in line: self.total_chia = line.split(':')[1].strip() - elif "Plot count:" in line: - self.plot_count = line.split(':')[1].strip() elif "Local Harvester" in line: next_line_local_harvester = True elif "Estimated network space" in line: From 2855c6353cfbba9e875ec0bc6def02a6d75dd263 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 21:48:14 -0600 Subject: [PATCH 0093/1625] More plots size conversion guards. --- api/schedules/status_farm.py | 19 +++++++++++++++++-- common/utils/converters.py | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/api/schedules/status_farm.py b/api/schedules/status_farm.py index f14c7422..f7517ddb 100644 --- a/api/schedules/status_farm.py +++ b/api/schedules/status_farm.py @@ -13,6 +13,21 @@ from api.commands import chia_cli from api import utils +# On initialization Chia outputs +def safely_gather_plots_size_gibs(plots_size): + plots_size_gibs = 0 + try: + plots_size_gibs = converters.str_to_gibs(plots_size) + except: + app.logger.info("Unconvertable plots size: {0} Using zero.".format(plots_size)) + plots_size_gibs = 0 + try: + float(plots_size_gibs) + except: + app.logger.info("Unfloatable plots size: {0} Using zero.".format(plots_size)) + plots_size_gibs = 0 + return plots_size_gibs + def update(): if not globals.farming_enabled() and not globals.harvesting_enabled(): #app.logger.info("Skipping farm summary status collection on plotting-only instance.") @@ -26,7 +41,7 @@ def update(): "mode": os.environ['mode'], "status": "" if not hasattr(farm_summary, 'status') else farm_summary.status, "plot_count": farm_summary.plot_count, - "plots_size": converters.str_to_gibs(farm_summary.plots_size), + "plots_size": safely_gather_plots_size_gibs(farm_summary.plots_size), "total_chia": 0 if not hasattr(farm_summary, 'total_chia') else farm_summary.total_chia, "netspace_size": 0 if not hasattr(farm_summary, 'netspace_size') else converters.str_to_gibs(farm_summary.netspace_size), "expected_time_to_win": "" if not hasattr(farm_summary, 'time_to_win') else farm_summary.time_to_win, @@ -38,7 +53,7 @@ def update(): "flax_netspace_size": 0 if not hasattr(flax_farm_summary, 'netspace_size') else converters.str_to_gibs(flax_farm_summary.netspace_size), "flax_expected_time_to_win": "" if not hasattr(flax_farm_summary, 'time_to_win') else flax_farm_summary.time_to_win, }) - utils.send_post('/farms/', payload, debug=False) + utils.send_post('/farms/', payload, debug=True) except: app.logger.info("Failed to load farm summary and send.") app.logger.info(traceback.format_exc()) diff --git a/common/utils/converters.py b/common/utils/converters.py index 1be5096e..e1b167b7 100644 --- a/common/utils/converters.py +++ b/common/utils/converters.py @@ -33,7 +33,7 @@ def str_to_gibs(str): except: print("Failed to convert to GiB: {0}".format(str)) print(traceback.format_exc()) - return None + return 0.0 def convert_date_for_luxon(datestr): year = datestr[:4] From 303428b711b0613e4888cb2d008e1940b055c0eb Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 25 Aug 2021 22:14:21 -0600 Subject: [PATCH 0094/1625] Handle MiB --- common/utils/converters.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/utils/converters.py b/common/utils/converters.py index e1b167b7..cb665974 100644 --- a/common/utils/converters.py +++ b/common/utils/converters.py @@ -22,7 +22,9 @@ def gib_to_fmt(gibs): def str_to_gibs(str): try: val,unit = str.split(' ') - if unit.lower().strip().endswith('gib'): + if unit.lower().strip().endswith('mib'): + return float(val) / 1024 + elif unit.lower().strip().endswith('gib'): return float(val) elif unit.lower().strip().endswith('tib'): return float(val) * 1024 From 21ecc714c5e05e9046b1c2ddf5ea0ad6dbd03765 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 26 Aug 2021 09:32:16 -0600 Subject: [PATCH 0095/1625] Improved message. --- web/templates/wallet.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/templates/wallet.html b/web/templates/wallet.html index 0c45e0ff..cb19ab12 100644 --- a/web/templates/wallet.html +++ b/web/templates/wallet.html @@ -32,8 +32,8 @@
{% else %}
-
No wallets found from any farmers. Not configured?
-
Try running 'chia wallet show' on your farmers to verify.
+
No wallet status received. Perhaps just starting? Please allow at least 10 minutes to update.
+
You can also try running 'chia wallet show' on your fullnode's in-container shell to verify.
{% endif %} From 815f5f615ed329c98154f985f9bc1b15416cb371 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 26 Aug 2021 19:50:42 -0600 Subject: [PATCH 0096/1625] Fixes and Chia 1.2.4 --- .github/workflows/develop.yaml | 2 +- .github/workflows/main.yaml | 2 +- .github/workflows/test.yaml | 2 +- CHANGELOG.md | 9 +++++++++ README.md | 2 +- api/schedules/status_farm.py | 2 +- web/routes.py | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml index bf2ee73a..0aca1b56 100644 --- a/.github/workflows/develop.yaml +++ b/.github/workflows/develop.yaml @@ -39,7 +39,7 @@ jobs: platforms: linux/amd64 push: true build-args: | - "CHIA_BRANCH=1.2.3" + "CHIA_BRANCH=1.2.4" "FLAX_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8e2b05d3..d85e32cb 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -40,7 +40,7 @@ jobs: platforms: linux/amd64,linux/arm64 push: true build-args: | - "CHIA_BRANCH=1.2.3" + "CHIA_BRANCH=1.2.4" "FLAX_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0e597a99..da60d449 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,7 +39,7 @@ jobs: platforms: linux/amd64,linux/arm64 push: true build-args: | - "CHIA_BRANCH=1.2.3" + "CHIA_BRANCH=1.2.4" "FLAX_BRANCH=main" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test diff --git a/CHANGELOG.md b/CHANGELOG.md index 84e769e2..e7ecdf38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ 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). +## [0.5.3] - 2021-08-27 + +- Worker page for each worker shows Warnings for certain configuraton issues. +- Farming page now shows current disk usage for each drive (free and used) +- Plotting page now shows recent disk usage for each drive (free and used) +- Summary page now charts recent blockchain challenges and partial proofs +- Fixes from feedback received by users on the Machinaris Discord. Thanks all! +- Chia - Update to version 1.2.4. See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.4). + ## [0.5.2] - 2021-08-13 - Machinaris - Docker images now available for [Apple M1](https://github.com/guydavis/machinaris/issues/43) and [Raspberry Pi OS](https://github.com/guydavis/machinaris/issues/155) architectures. diff --git a/README.md b/README.md index 6a7e5877..5bf8d1d8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # machinaris -A Docker image for plotting and farming the Chia™ cryptocurrency on [one computer](https://github.com/guydavis/machinaris/wiki/Docker) or across [many](https://github.com/guydavis/machinaris/wiki/Workers). Try the easy install using [Launch Wizard](https://machinaris.app). +A Docker image for plotting and farming the Chia™ cryptocurrency on [one computer](https://github.com/guydavis/machinaris/wiki/Docker) or across [many](https://github.com/guydavis/machinaris/wiki/Workers). Try the easy install using the [Launch Wizard](https://machinaris.app). ![Home](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/machinaris_home.png) diff --git a/api/schedules/status_farm.py b/api/schedules/status_farm.py index f7517ddb..bc540592 100644 --- a/api/schedules/status_farm.py +++ b/api/schedules/status_farm.py @@ -53,7 +53,7 @@ def update(): "flax_netspace_size": 0 if not hasattr(flax_farm_summary, 'netspace_size') else converters.str_to_gibs(flax_farm_summary.netspace_size), "flax_expected_time_to_win": "" if not hasattr(flax_farm_summary, 'time_to_win') else flax_farm_summary.time_to_win, }) - utils.send_post('/farms/', payload, debug=True) + utils.send_post('/farms/', payload, debug=False) except: app.logger.info("Failed to load farm summary and send.") app.logger.info(traceback.format_exc()) diff --git a/web/routes.py b/web/routes.py index aed9e926..3038a4dd 100644 --- a/web/routes.py +++ b/web/routes.py @@ -82,7 +82,7 @@ def plotting_jobs(): plotman.action_plots(action, plot_ids) else: app.logger.info("Unknown plotting form: {0}".format(request.form)) - return redirect(url_for('plotting')) # Force a redirect to allow time to update status + return redirect(url_for('plotting_jobs')) # Force a redirect to allow time to update status plotters = plotman.load_plotters() plotting = plotman.load_plotting_summary() return render_template('plotting/jobs.html', reload_seconds=120, plotting=plotting, From 91ec2f969a1cd8967caa5e4308180543b73f822d Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 26 Aug 2021 20:13:59 -0600 Subject: [PATCH 0097/1625] New Chia wants changed CA permsissions. --- scripts/chia_launch.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/chia_launch.sh b/scripts/chia_launch.sh index 972c92de..01a493d3 100644 --- a/scripts/chia_launch.sh +++ b/scripts/chia_launch.sh @@ -38,8 +38,10 @@ sed -i 's/localhost/127.0.0.1/g' ~/.chia/mainnet/config/config.yaml # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} == 'fullnode' ]]; then + chmod -R 0600 ~/.chia/mainnet/config/ssl chia start farmer elif [[ ${mode} =~ ^farmer.* ]]; then + chmod -R 0600 ~/.chia/mainnet/config/ssl chia start farmer-only elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then @@ -64,6 +66,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then fi chia configure --set-farmer-peer ${farmer_address}:${farmer_port} chia configure --enable-upnp false + chmod -R 0600 ~/.chia/mainnet/config/ssl chia start harvester -r fi elif [[ ${mode} == 'plotter' ]]; then From e3704b19c9037ed38c002618053ff6e774ff6f82 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 26 Aug 2021 20:46:30 -0600 Subject: [PATCH 0098/1625] Version guard for 1.2.4 --- common/config/globals.py | 2 +- web/templates/base.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/config/globals.py b/common/config/globals.py index 92391aa3..1feed5d4 100644 --- a/common/config/globals.py +++ b/common/config/globals.py @@ -139,7 +139,7 @@ def archiving_enabled(): def load_chia_version(): global last_chia_version global last_chia_version_load_time - if last_chia_version and last_chia_version_load_time >= \ + if last_chia_version and last_chia_version_load_time and last_chia_version_load_time >= \ (datetime.datetime.now() - datetime.timedelta(days=RELOAD_MINIMUM_DAYS)): return last_chia_version proc = Popen("{0} version".format(CHIA_BINARY), diff --git a/web/templates/base.html b/web/templates/base.html index c47e9224..3c551b3f 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -122,7 +122,7 @@  About
-
-
-
-
Plotting: - - {{ plotting.display_status }} - -
-
-
-
-
-
Farming: - - {{ farming.display_status }} - -
-
-
-
+ {% endfor %} diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html index 91cf7b6f..261c279e 100644 --- a/web/templates/farming/plots.html +++ b/web/templates/farming/plots.html @@ -42,22 +42,15 @@ {{ farmer.displayname }}: {{farmer.farming_status}}
    + {% for blockchain in farm.config.enabled_blockchains %}
  • + onclick='ViewLogs("{{ farmer.hostname }}","{{blockchain}}");return false;'> - View Chia Log + View {{blockchain|capitalize}} Log
    • - {% if global_config.flax_enabled %} -
  • - - - View Flax Log - -
    • - {% endif %} + {% endfor %}
  • diff --git a/web/templates/worker.html b/web/templates/worker.html index c0126725..ba2f532c 100644 --- a/web/templates/worker.html +++ b/web/templates/worker.html @@ -39,6 +39,10 @@ Hostname {{worker.hostname}} + + Port + {{worker.port}} + Display Name {{worker.displayname}} diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html index 72aa71fa..417e05c2 100644 --- a/web/templates/worker_launch.html +++ b/web/templates/worker_launch.html @@ -84,6 +84,11 @@ toggleControllerAddressVisibility(); } function toggleFarmerAddressVisibility() { + if (document.getElementById('mode-harvester').checked) { + $('#blockchains_row').show() + } else { + $('#blockchains_row').hide() + } toggleControllerAddressVisibility(); } function toggleControllerAddressVisibility() { @@ -116,7 +121,6 @@ } function updateDocker() { var errors = []; - run = updateDockerRun(errors); compose = updateDockerCompose(errors); if (errors.length > 0) { msg = "
      "; @@ -126,188 +130,108 @@ msg += "
    "; $('#errors').html(msg); $('#errors').show(); - $('#run').html(''); $('#compose').html(''); } else { - $('#run').html(run); $('#compose').html(compose); $('#errors').hide(); } } - function updateDockerRun(errors) { - var os = getRadioButtonValue('os') - if (os == 'windows') { - line_end = ' `\n'; - } else { - line_end = ' \\\n'; - } - cmd = 'docker run' + line_end; - cmd += ' -d --name machinaris' + line_end; - if (document.getElementById("worker_hostname").value) { - cmd += ' -h ' + document.getElementById("worker_hostname").value + line_end; - } - else { - errors.push("Missing worker hostname. Please provide a short name to identify your worker."); - } - if (document.getElementById("dns_ip_addr").value) { - cmd += ' --dns ' + document.getElementById("dns_ip_addr").value + line_end; - } - if (os == 'windows') { - cmd += ' -v $HOME/.machinaris:/root/.chia' + line_end; - } else { - cmd += ' -v ~/.machinaris:/root/.chia' + line_end; - } - cmd += ' --restart always' + line_end; - var cur_vols = $('#volumes').children().length - var plots_dir = [] - $('#volumes').children().each((index, element) => { - volume_host_path = document.getElementById("volume_host_path" + index).value; - volume_container_path = document.getElementById("volume_container_path" + index).value; - if (volume_host_path.endsWith(':')) { - errors.push("Invalid host path ending with colon. Try adding a slash to the end like this " + volume_host_path + '/'); - } - if (!volume_host_path) { - errors.push("Empty host path provided for volume at '" + volume_container_path + "'. Please provide a host path."); - } else if (!volume_container_path) { - errors.push("Empty container path provided for volume at '" + volume_host_path + "'. Please provide a container path."); - } - cmd += ' -v "' + volume_host_path + ':' + volume_container_path + '"' + line_end; - if ($('#volume_type' + index).val() == 'plots') { - plots_dir.push(volume_container_path) - } - }); - cmd += ' -e TZ=' + $('#timezone').val() + line_end; - var mode = "" - if (document.getElementById('mode-harvester').checked) { - mode = "harvester"; - cmd += ' -e farmer_address=' + document.getElementById("controller_host").value + line_end; - cmd += ' -e farmer_port=8447' + line_end; - if (document.getElementById("blockchain-flax").checked) { - cmd += ' -e flax_farmer_port=6885' + line_end; - } - } - if (document.getElementById('mode-plotter').checked) { - if (mode) { - mode += ',plotter'; - } - else { - mode = 'plotter'; - } - cmd += ' -e farmer_pk=' + document.getElementById("farmer_pk").value + line_end; - cmd += ' -e pool_pk=' + document.getElementById("pool_pk").value + line_end; - cmd += ' -e pool_contract_address=' + document.getElementById("pool_contract_address").value + line_end; - } - if (mode) { // harvester, plotter, or harvester+plotter - cmd += ' -e mode=' + mode + line_end; - cmd += ' -e controller_host=' + document.getElementById("controller_host").value + line_end; - cmd += ' -e controller_api_port=' + document.getElementById("controller_api_port").value + line_end; - } else { // fullnode - cmd += ' -e mode=fullnode' + line_end; - } - if (document.getElementById("ip_addr").value) { - cmd += ' -e worker_address=' + document.getElementById("ip_addr").value + line_end; - } - else { - errors.push("Missing worker IP address. Please provide the IP the conntroller will connect to for commands."); - } - cmd += ' -e plots_dir=' + plots_dir.join(':') + line_end; - var blockchains = 'chia' - if (document.getElementById("blockchain-flax").checked) { - blockchains += ',flax' - } - cmd += ' -e blockchains=' + blockchains + line_end; - var auto_plot = getRadioButtonValue('auto_plot'); - if (auto_plot == "true") { - cmd += ' -e AUTO_PLOT=' + auto_plot + line_end; - } - cmd += ' -p 8926:8926 -p 8927:8927' + line_end; - if (!mode) { // Defaults to fullnode - cmd += ' -p 8444:8444 -p 8447:8447' + line_end; - if (document.getElementById("blockchain-flax").checked) { - cmd += ' -p 6888:6888 -p 6885:6885' + line_end; - } - } - cmd += ' ghcr.io/guydavis/machinaris'; - return cmd; - } - function updateDockerCompose() { + function updateDockerCompose(errors) { var line_end = ' \n'; var os = getRadioButtonValue('os') cmd = "version: '3.9'" + line_end; - cmd += "services:" + line_end; - cmd += " machinaris:" + line_end; - cmd += " image: ghcr.io/guydavis/machinaris" + line_end; - cmd += " container_name: machinaris" + line_end; - if (document.getElementById("worker_hostname").value) { - cmd += ' hostname: ' + document.getElementById("worker_hostname").value + line_end; - } - if (document.getElementById("dns_ip_addr").value) { - cmd += ' dns: ' + document.getElementById("dns_ip_addr").value + line_end; - } - cmd += ' restart: always' + line_end; - cmd += ' volumes:' + line_end; - cmd += ' - ~/.machinaris:/root/.chia' + line_end; - var cur_vols = $('#volumes').children().length - var plots_dir = [] - $('#volumes').children().each((index, element) => { - volume_host_path = document.getElementById("volume_host_path" + index).value; - volume_container_path = document.getElementById("volume_container_path" + index).value; - cmd += ' - "' + volume_host_path + ':' + volume_container_path + '"' + line_end; - if ($('#volume_type' + index).val() == 'plots') { - plots_dir.push(volume_container_path) - } - }); - cmd += ' environment:' + line_end; - cmd += ' - TZ=' + $('#timezone').val() + line_end; - var mode = "" - if (document.getElementById('mode-harvester').checked) { - mode = "harvester"; - cmd += ' - farmer_address=' + document.getElementById("controller_host").value + line_end; - cmd += ' - farmer_port=8447' + line_end; - if (document.getElementById("blockchain-flax").checked) { - cmd += ' - flax_farmer_port=6885' + line_end; - } - } - if (document.getElementById('mode-plotter').checked) { - if (mode) { - mode += ',plotter'; - } - else { - mode = 'plotter'; - } - cmd += ' - farmer_pk=' + document.getElementById("farmer_pk").value + line_end; - cmd += ' - pool_pk=' + document.getElementById("pool_pk").value + line_end; - cmd += ' - pool_contract_address=' + document.getElementById("pool_contract_address").value + line_end; - } - if (mode) { // harvester, plotter, or harvester+plotter - cmd += ' - mode=' + mode + line_end; - cmd += ' - controller_host=' + document.getElementById("controller_host").value + line_end; - cmd += ' - controller_api_port=' + document.getElementById("controller_api_port").value + line_end; - } else { // fullnode - cmd += ' - mode=fullnode' + line_end; - } - if (document.getElementById("ip_addr").value) { - cmd += ' - worker_address=' + document.getElementById("ip_addr").value + line_end; - } - cmd += ' - plots_dir=' + plots_dir.join(':') + line_end; - var blockchains = 'chia' - if (document.getElementById("blockchain-flax").checked) { - blockchains += ',flax' - } - cmd += ' - blockchains=' + blockchains + line_end; - var auto_plot = getRadioButtonValue('auto_plot'); - if (auto_plot == "true") { - cmd += ' - AUTO_PLOT=' + auto_plot + line_end; - } - cmd += ' ports:' + line_end; - cmd += ' - 8926:8926' + line_end; - cmd += ' - 8927:8927' + line_end; - if (!mode) { // Defaults to fullnode - cmd += ' - 8444:8444' + line_end; - cmd += ' - 8447:8447' + line_end; - if (document.getElementById("blockchain-flax").checked) { - cmd += ' - 6888:6888' + line_end; - cmd += ' - 6885:6885' + line_end; + cmd += "services:" + line_end + line_end; + + var blockchains = document.getElementsByName('blockchains'); + var worker_port = 8928; + for(var i = 0; i < blockchains.length; ++i) { + if (blockchains[i].checked) { + var blockchain = blockchains[i].value + cmd += " machinaris-" + blockchain + ":" + line_end; + cmd += " image: ghcr.io/guydavis/machinaris-" + blockchain + line_end; + cmd += " container_name: machinaris-" + blockchain + line_end; + if (document.getElementById("worker_hostname").value) { + cmd += ' hostname: ' + document.getElementById("worker_hostname").value + line_end; + } + else if (i == 0) { + errors.push("Missing worker hostname. Please provide a short name to identify your worker."); + } + if (document.getElementById("dns_ip_addr").value) { + cmd += ' dns: ' + document.getElementById("dns_ip_addr").value + line_end; + } + cmd += ' restart: always' + line_end; + cmd += ' volumes:' + line_end; + cmd += ' - ~/.machinaris:/root/.chia' + line_end; + var cur_vols = $('#volumes').children().length + var plots_dir = [] + $('#volumes').children().each((index, element) => { + volume_host_path = document.getElementById("volume_host_path" + index).value; + volume_container_path = document.getElementById("volume_container_path" + index).value; + if (i == 0) { // Record error on first pass + if (volume_host_path.endsWith(':')) { + errors.push("Invalid host path ending with colon. Try adding a slash to the end like this " + volume_host_path + '/'); + } + if (!volume_host_path) { + errors.push("Empty host path provided for volume at '" + volume_container_path + "'. Please provide a host path."); + } else if (!volume_container_path) { + errors.push("Empty container path provided for volume at '" + volume_host_path + "'. Please provide a container path."); + } + } + cmd += ' - "' + volume_host_path + ':' + volume_container_path + '"' + line_end; + if ($('#volume_type' + index).val() == 'plots') { + plots_dir.push(volume_container_path) + } + }); + cmd += ' environment:' + line_end; + cmd += ' - TZ=' + $('#timezone').val() + line_end; + var mode = "" + if (document.getElementById('mode-harvester').checked) { + mode = "harvester"; + cmd += ' - farmer_address=' + document.getElementById("controller_host").value + line_end; + cmd += ' - farmer_port=8447' + line_end; // TODO Look up farmer port by blockchain type + } + if (document.getElementById('mode-plotter').checked) { + if (mode) { + mode += ',plotter'; + } + else { + mode = 'plotter'; + } + cmd += ' - farmer_pk=' + document.getElementById("farmer_pk").value + line_end; + cmd += ' - pool_pk=' + document.getElementById("pool_pk").value + line_end; + cmd += ' - pool_contract_address=' + document.getElementById("pool_contract_address").value + line_end; + } + if (mode) { // harvester, plotter, or harvester+plotter + cmd += ' - mode=' + mode + line_end; + cmd += ' - controller_host=' + document.getElementById("controller_host").value + line_end; + cmd += ' - controller_api_port=' + document.getElementById("controller_api_port").value + line_end; + } else if (i == 0) { // fullnode + errors.push("Neither Harvester or Plottter mode selected. Please choose one or both."); + } + if (document.getElementById("ip_addr").value) { + cmd += ' - worker_address=' + document.getElementById("ip_addr").value + line_end; + } + else if (i == 0) { + errors.push("Missing worker IP address. Please provide the IP the conntroller will connect to for commands."); + } + cmd += ' - plots_dir=' + plots_dir.join(':') + line_end; + cmd += ' - blockchains=' + blockchain + line_end; + var auto_plot = getRadioButtonValue('auto_plot'); + if (auto_plot == "true") { + cmd += ' - AUTO_PLOT=' + auto_plot + line_end; + } + cmd += ' ports:' + line_end; + cmd += ' - 8926:8926' + line_end; + cmd += ' - 8927:8927' + line_end; + if (!mode) { // Defaults to fullnode + cmd += ' - 8444:8444' + line_end; + cmd += ' - 8447:8447' + line_end; + if (document.getElementById("blockchain-flax").checked) { + cmd += ' - 6888:6888' + line_end; + cmd += ' - 6885:6885' + line_end; + } + } + cmd += line_end; } } return cmd; @@ -326,9 +250,8 @@

    Machinaris Worker - Launch Config

    -

    Complete the form below to create a launch command to run on a new computer. - Either paste the Docker run into a shell/terminal OR save a docker-compose.yml - and then run "docker-compose up".

    +

    Complete the form below to run new harvesters/plotters on other computers across your network. + Save the generated docker-compose.yml file to a folder named 'machinaris', then execute "docker-compose up" from a shell.

    @@ -448,28 +371,47 @@

    Machinaris Worker - Launch Config

    id='dns_ip_addr' onkeyup="updateDocker()">
    -
    +
    - +
    + id="blockchain-flax" onclick="updateDocker()" value="flax"> +
    +
    + + +
    +
    + + +
    +
    + +
    -
    -

    Volume Mounts

    @@ -528,14 +470,6 @@

    Volume Mounts

    -
    - - - -

    Docker Run

    - 
    
-    
    
     
    
         

From e495b51d46d7289231a820271a130e89fee4971a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 22 Sep 2021 15:14:17 -0600
Subject: [PATCH 0152/1625] Fixes for separate flax.

---
 docker/entrypoint.sh         | 14 +++++---------
 scripts/config_api_server.sh |  1 -
 scripts/start_machinaris.sh  | 11 +++++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index afa4ac65..1d24f874 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,16 +2,12 @@
 #  Configure and start plotting and farming services.
 #
 
-# Print a wide line to ensure Unraid's Docker Logs view doesn't truncate the left-side of our logs
-echo "Welcome! Machinaris is an easy-to-use WebUI for Chia plotting and farming. Includes Chia, Plotman, MadMax, Chiadog, Bladebit and Flax in a single Docker image."
+echo "Welcome to Machinaris!"
 
-# Always launch Chia - required blockchain
-/usr/bin/bash /machinaris/scripts/chia_launch.sh
-
-# Optionally launch forked blockchains for multi-farming
-if [[ ${blockchains} =~ flax ]]; then
-  /usr/bin/bash /machinaris/scripts/flax_launch.sh
-fi
+# Start selected forks
+for fork in ${blockchains//,/ }; do
+  /usr/bin/bash /machinaris/scripts/${fork}_launch.sh
+done
 
 # Launch Machinaris web server and other services
 /machinaris/scripts/start_machinaris.sh
diff --git a/scripts/config_api_server.sh b/scripts/config_api_server.sh
index d1956852..d437cf05 100644
--- a/scripts/config_api_server.sh
+++ b/scripts/config_api_server.sh
@@ -14,5 +14,4 @@ if [ ! -f "${API_SETTINGS_FILE}" ]; then
             echo "STATUS_EVERY_X_MINUTES = 2" > ${API_SETTINGS_FILE}
         fi
     fi
-    cat ${API_SETTINGS_FILE}
 fi
diff --git a/scripts/start_machinaris.sh b/scripts/start_machinaris.sh
index ff2a7454..fe8bf8a0 100644
--- a/scripts/start_machinaris.sh
+++ b/scripts/start_machinaris.sh
@@ -3,6 +3,10 @@
 # Configures Chia and Plotman, then launches Machinaris web server
 #
 
+echo 'Checking working directory...'
+ls -al /
+ls -al /chia-blockchain
+
 echo 'Configuring Plotman...'
 mkdir -p /root/.chia/plotman/logs
 # Check for existing, old versions of plotman.yaml and migrate them, else use default
@@ -35,10 +39,9 @@ fi
 
 # Start the log monitors
 if [ "${mode}" != "plotter" ]; then
-    . /machinaris/scripts/chiadog_launch.sh
-fi
-if [[ "${mode}" != "plotter" ]] && [[ ${blockchains} =~ flax ]]; then
-    . /machinaris/scripts/flaxdog_launch.sh
+    for fork in ${blockchains//,/ }; do
+        . /machinaris/scripts/${fork}dog_launch.sh
+    done
 fi
 
 # Even standalone plotting mode needs database setup

From 7f58cf60b704a736d482650e0b67b6a577aa4ff6 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 22 Sep 2021 18:19:48 -0600
Subject: [PATCH 0153/1625] Fixes for workers.

---
 web/actions/chia.py              | 7 +++++--
 web/actions/chiadog.py           | 4 +++-
 web/actions/plotman.py           | 4 +++-
 web/models/worker.py             | 2 ++
 web/templates/farming/plots.html | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/web/actions/chia.py b/web/actions/chia.py
index 4328d33f..f341f3f5 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -3,6 +3,7 @@
 #
 
 import datetime
+import json
 import os
 import pexpect
 import psutil
@@ -94,13 +95,15 @@ def load_farmers():
             farmers.append({
                 'hostname': farmer.hostname,
                 'displayname': farmer.displayname,
-                'farming_status': farmer.farming_status().lower()
+                'farming_status': farmer.farming_status().lower(),
+                'config': json.loads(farmer.config),
             })
         elif farmer in worker_summary.harvesters:
             farmers.append({
                 'hostname': farmer.hostname,
                 'displayname': farmer.displayname,
-                'farming_status': 'harvesting'
+                'farming_status': 'harvesting',
+                'config': json.loads(farmer.config),
             })
     return sorted(farmers, key=lambda f: f['displayname'])
 
diff --git a/web/actions/chiadog.py b/web/actions/chiadog.py
index f5d621f3..8a76dc78 100644
--- a/web/actions/chiadog.py
+++ b/web/actions/chiadog.py
@@ -3,6 +3,7 @@
 #
 
 import datetime
+import json
 import os
 import psutil
 import signal
@@ -31,7 +32,8 @@ def load_farmers():
             farmers.append({
                 'hostname': farmer.hostname,
                 'displayname': farmer.displayname,
-                'monitoring_status': farmer.monitoring_status().lower()
+                'monitoring_status': farmer.monitoring_status().lower(),
+                'config': json.loads(farmer.config),
             })
     return farmers
 
diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index a7be3581..6ee8db7f 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -3,6 +3,7 @@
 #
 
 import datetime
+import json
 import os
 from flask.helpers import make_response
 import psutil
@@ -42,7 +43,8 @@ def load_plotters():
             'displayname': plotter.displayname,
             'plotting_status': plotter.plotting_status(),
             'archiving_status': plotter.archiving_status(),
-            'archiving_enabled': plotter.archiving_enabled()
+            'archiving_enabled': plotter.archiving_enabled(),
+            'config': json.loads(plotter.config),
         })
     return sorted(plotters, key=lambda p: p['displayname'])
 
diff --git a/web/models/worker.py b/web/models/worker.py
index 18142196..6b19739d 100644
--- a/web/models/worker.py
+++ b/web/models/worker.py
@@ -36,6 +36,8 @@ def __init__(self, workers):
             gc = globals.load()
             if 'bladebit_version' in config:
                 other_versions += "Bladebit: " + config['bladebit_version'] + "
    "
+            if not 'enabled_blockchains' in config:  # Default if missing from old records
+                config['enabled_blockchains'] = 'chia'
             for blockchain in config['enabled_blockchains']:
                 if '{0}_version' in config:
                     other_versions += blockchain.capitalize() + ": " + config['{0}_version'] + "
    "
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index 261c279e..1ca3342a 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -42,7 +42,7 @@ 
                             {{ farmer.displayname }}: {{farmer.farming_status}}
                         
                             
diff --git a/web/templates/network/blockchain.html b/web/templates/network/blockchain.html
deleted file mode 100644
index c69634a5..00000000
--- a/web/templates/network/blockchain.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-
    
-    Network - chia show
-
    
-
-
-    
-
-
    
-    {% if blockchains.rows|length > 0 %}
-    {% for blockchain in blockchains.rows %}
-    
    
-        
    {{blockchain.displayname}} - {{blockchain.blockchain}}
    
-        
    {{ blockchain.details}}
    
-    
    
-    {% endfor %}
-
    
-{% else %}
-
    
-    
    No blockchains found from any farmers. Not added?
    
-    
    Try running 'chia show --state' on your farmers to verify.
    
-
    
-{% endif %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/web/templates/network/connections.html b/web/templates/network/connections.html
deleted file mode 100644
index 91e5e4cf..00000000
--- a/web/templates/network/connections.html
+++ /dev/null
@@ -1,130 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-
    
-    Network - chia show
-
    
-
-
    
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    {% if category == 'message' %}
-    
-
-    
-    
-
-    
    
-        {% if connections.rows|length > 0 %}
-        {% for connection in connections.rows %}
-        
    
-            
-                
-                    Check Port Forwarding
-                
-            
-            
    {{connection.displayname}} - {{connection.blockchain}}
    
-            
    
-            
    
-                
-                    
-                        
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                        
-                    
-                    
-                        {% for row in connections.blockchains[connection.blockchain] %}
-                        
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                        
-                        {% endfor %}
-                    
-                
    TypeIP AddressPortsNode IDSB HeightLast ConnectMiB UpMiB Down
    
-                            {% if row.type == "FULL_NODE" or (row.type == "WALLET" and row.ip != "127.0.0.1") %}
-                                
-                            {% endif %}
-                            {{row.type}}{{row.ip}}{{row.ports}}{{row.nodeid}}{{row.height}}{{row.last_connect}}{{row.mib_up}}{{row.mib_down}}
    
-            
    
-            
    
-            
    
-                
-            
    
-        
    
-        
    
-        {% endfor %}
-    
    
-    {% else %}
-    
    
-        
    No connections found from any farmers. Not running?
    
-        
    Try running 'chia show --connections' on your farmers to verify.
    
-    
    
-    {% endif %}
-    
-    {% endblock %}
-
-    {% block scripts %}
-    
-    {% endblock %}
\ No newline at end of file

From e0096a73dd29e3ac97c38a991d8492de56772bdf Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 27 Sep 2021 22:02:12 -0600
Subject: [PATCH 0172/1625] hddcoin

---
 api/rpc/chia.py                 |  6 ++++++
 common/config/globals.py        |  2 +-
 scripts/forks/hddcoin_launch.sh | 28 ++++++++++++++--------------
 web/rpc/chia.py                 |  9 ++++++++-
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/api/rpc/chia.py b/api/rpc/chia.py
index 63f7befb..3c3de75d 100644
--- a/api/rpc/chia.py
+++ b/api/rpc/chia.py
@@ -18,6 +18,12 @@
     from flax.util.default_root import DEFAULT_ROOT_PATH
     from flax.util.ints import uint16
     from flax.util.config import load_config as load_fork_config
+elif importlib.util.find_spec("hddcoin"):
+    from hddcoin.rpc.full_node_rpc_client import FullNodeRpcClient
+    from hddcoin.rpc.farmer_rpc_client import FarmerRpcClient
+    from hddcoin.util.default_root import DEFAULT_ROOT_PATH
+    from hddcoin.util.ints import uint16
+    from hddcoin.util.config import load_config as load_fork_config
 else:
     raise Exception("Neither chia or flax found on pythonpath!")
 
diff --git a/common/config/globals.py b/common/config/globals.py
index 74592454..bbd8e4f7 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -37,7 +37,7 @@
 CHIA_BINARY = '/chia-blockchain/venv/bin/chia'
 FLAX_BINARY = '/flax-blockchain/venv/bin/flax'
 NCHAIN_BINARY = '/ext9-blockchain/venv/bin/chia'
-HDDCOIN_BINARY = '/hddcoin-blockchain/venv/bin/chia'
+HDDCOIN_BINARY = '/hddcoin-blockchain/venv/bin/hddcoin'
 CHIVES_BINARY = '/chives-blockchain/venv/bin/chia'
 
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
diff --git a/scripts/forks/hddcoin_launch.sh b/scripts/forks/hddcoin_launch.sh
index d325368c..371c7de4 100644
--- a/scripts/forks/hddcoin_launch.sh
+++ b/scripts/forks/hddcoin_launch.sh
@@ -9,7 +9,7 @@ cd /hddcoin-blockchain
 . ./activate
 
 mkdir -p /root/.hddcoin/mainnet/log
-chia init >> /root/.hddcoin/mainnet/log/init.log 2>&1 
+hddcoin init >> /root/.hddcoin/mainnet/log/init.log 2>&1 
 
 echo 'Configuring HDDCoin...'
 while [ ! -f /root/.hddcoin/mainnet/config/config.yaml ]; do
@@ -23,33 +23,33 @@ sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.hddcoin/mainnet/config/co
 for k in ${keys//:/ }; do
   if [ -f ${k} ]; then
     echo "Adding key at path: ${k}"
-    chia keys add -f ${k} > /dev/null
+    hddcoin keys add -f ${k} > /dev/null
   else
-    echo "Skipping 'chia keys add' as no file found at: ${k}"
+    echo "Skipping 'hddcoin keys add' as no file found at: ${k}"
   fi
 done
 
 # Loop over provided list of completed plot directories
 for p in ${plots_dir//:/ }; do
-    chia plots add -d ${p}
+    hddcoin plots add -d ${p}
 done
 
 sed -i 's/localhost/127.0.0.1/g' ~/.hddcoin/mainnet/config/config.yaml
 
 chmod 755 -R /root/.hddcoin/mainnet/config/ssl/ &> /dev/null
-chia init --fix-ssl-permissions > /dev/null 
+hddcoin init --fix-ssl-permissions > /dev/null 
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  chia start farmer
+  hddcoin start farmer
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  chia start farmer-only
+  hddcoin start farmer-only
 elif [[ ${mode} =~ ^harvester.* ]]; then
   if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
     echo "A farmer peer address and port are required."
     exit
   else
-    if [ ! -f /root/.hddcoin/farmer_ca/chia_ca.crt ]; then
+    if [ ! -f /root/.hddcoin/farmer_ca/hddcoin_ca.crt ]; then
       mkdir -p /root/.hddcoin/farmer_ca
       response=$(curl --write-out '%{http_code}' --silent http://${controller_host}:8930/certificates/?type=hddcoin --output /tmp/certs.zip)
       if [ $response == '200' ]; then
@@ -59,17 +59,17 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
       fi
       rm -f /tmp/certs.zip 
     fi
-    if [ -f /root/.hddcoin/farmer_ca/chia_ca.crt ]; then
-      chia init -c /root/.hddcoin/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log
+    if [ -f /root/.hddcoin/farmer_ca/hddcoin_ca.crt ]; then
+      hddcoin init -c /root/.hddcoin/farmer_ca 2>&1 > /root/.hddcoin/mainnet/log/init.log
       chmod 755 -R /root/.hddcoin/mainnet/config/ssl/ &> /dev/null
-      chia init --fix-ssl-permissions > /dev/null 
+      hddcoin init --fix-ssl-permissions > /dev/null 
     else
       echo "Did not find your farmer's certificates within /root/.hddcoin/farmer_ca."
       echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
     fi
-    chia configure --set-farmer-peer ${farmer_address}:${farmer_port}
-    chia configure --enable-upnp false
-    chia start harvester -r
+    hddcoin configure --set-farmer-peer ${farmer_address}:${farmer_port}
+    hddcoin configure --enable-upnp false
+    hddcoin start harvester -r
   fi
 elif [[ ${mode} == 'plotter' ]]; then
     echo "Starting in Plotter-only mode.  Run Plotman from either CLI or WebUI."
diff --git a/web/rpc/chia.py b/web/rpc/chia.py
index a7278a87..0cdb9a7a 100644
--- a/web/rpc/chia.py
+++ b/web/rpc/chia.py
@@ -18,8 +18,15 @@
     from flax.util.default_root import DEFAULT_ROOT_PATH
     from flax.util.ints import uint16
     from flax.util.config import load_config as load_fork_config
+elif importlib.util.find_spec("hddcoin"):
+    from hddcoin.rpc.full_node_rpc_client import FullNodeRpcClient
+    from hddcoin.rpc.farmer_rpc_client import FarmerRpcClient
+    from hddcoin.util.default_root import DEFAULT_ROOT_PATH
+    from hddcoin.util.ints import uint16
+    from hddcoin.util.config import load_config as load_fork_config
 else:
-    raise Exception("Neither chia or flax found on pythonpath!")
+    raise Exception("Can't find chia, flax, hddcoin on pythonpath!")
+
 from web import app
 
 async def load_plots_per_harvester():

From 4ac73c167d71d7fbd1d79b0b262add1c31b6918b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 28 Sep 2021 21:24:59 -0600
Subject: [PATCH 0173/1625] Initial work for chives.

---
 api/commands/log_parser.py     | 4 +---
 api/rpc/chia.py                | 8 +++++++-
 scripts/forks/chives_launch.sh | 5 -----
 web/rpc/chia.py                | 8 +++++++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/api/commands/log_parser.py b/api/commands/log_parser.py
index c37dbc2c..7473ca6d 100644
--- a/api/commands/log_parser.py
+++ b/api/commands/log_parser.py
@@ -38,9 +38,7 @@ def recent_challenges(blockchain):
         CHALLENGES_TO_LOAD = CHALLENGES_PER_MINUTE * int(schedule_every_x_minutes) + CHALLENGES_PER_MINUTE
     except:
         CHALLENGES_TO_LOAD = CHALLENGES_PER_MINUTE * 2 + CHALLENGES_PER_MINUTE
-    log_file = CHIA_LOG
-    if blockchain == 'flax':
-        log_file = FLAX_LOG
+    log_file = get_farming_log_file(blockchain)
     if not os.path.exists(log_file):
         app.logger.debug(
             "Skipping challenges parsing as no such log file: {0}".format(log_file))
diff --git a/api/rpc/chia.py b/api/rpc/chia.py
index 3c3de75d..3a8c556a 100644
--- a/api/rpc/chia.py
+++ b/api/rpc/chia.py
@@ -24,8 +24,14 @@
     from hddcoin.util.default_root import DEFAULT_ROOT_PATH
     from hddcoin.util.ints import uint16
     from hddcoin.util.config import load_config as load_fork_config
+elif importlib.util.find_spec("chives"):
+    from chives.rpc.full_node_rpc_client import FullNodeRpcClient
+    from chives.rpc.farmer_rpc_client import FarmerRpcClient
+    from chives.util.default_root import DEFAULT_ROOT_PATH
+    from chives.util.ints import uint16
+    from chives.util.config import load_config as load_fork_config
 else:
-    raise Exception("Neither chia or flax found on pythonpath!")
+    raise Exception("RPC modules found on pythonpath!")
 
 from api import app
 
diff --git a/scripts/forks/chives_launch.sh b/scripts/forks/chives_launch.sh
index a06d3eb3..fbbda697 100644
--- a/scripts/forks/chives_launch.sh
+++ b/scripts/forks/chives_launch.sh
@@ -36,9 +36,6 @@ done
 
 sed -i 's/localhost/127.0.0.1/g' ~/.chives/mainnet/config/config.yaml
 
-chmod 755 -R /root/.chives/mainnet/config/ssl/ &> /dev/null
-chives init --fix-ssl-permissions > /dev/null 
-
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
   chives start farmer
@@ -61,8 +58,6 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
     fi
     if [ -f /root/.chives/farmer_ca/chives_ca.crt ]; then
       chives init -c /root/.chives/farmer_ca 2>&1 > /root/.chives/mainnet/log/init.log
-      chmod 755 -R /root/.chives/mainnet/config/ssl/ &> /dev/null
-      chives init --fix-ssl-permissions > /dev/null 
     else
       echo "Did not find your farmer's certificates within /root/.chives/farmer_ca."
       echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
diff --git a/web/rpc/chia.py b/web/rpc/chia.py
index 0cdb9a7a..32ec9aa0 100644
--- a/web/rpc/chia.py
+++ b/web/rpc/chia.py
@@ -24,8 +24,14 @@
     from hddcoin.util.default_root import DEFAULT_ROOT_PATH
     from hddcoin.util.ints import uint16
     from hddcoin.util.config import load_config as load_fork_config
+elif importlib.util.find_spec("chives"):
+    from chives.rpc.full_node_rpc_client import FullNodeRpcClient
+    from chives.rpc.farmer_rpc_client import FarmerRpcClient
+    from chives.util.default_root import DEFAULT_ROOT_PATH
+    from chives.util.ints import uint16
+    from chives.util.config import load_config as load_fork_config
 else:
-    raise Exception("Can't find chia, flax, hddcoin on pythonpath!")
+    raise Exception("RPC modules found on pythonpath!")
 
 from web import app
 

From a0ed2d44cc2116690acdaf2597d464cd72b09ba0 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 29 Sep 2021 08:41:46 -0600
Subject: [PATCH 0174/1625] Docker folder links.

---
 api/views/farms/resources.py        |   6 +-
 common/config/globals.py            |   2 +-
 licenses/LICENSE_madmax_plotter.txt | 875 +++++++---------------------
 scripts/forks/chives_launch.sh      |   6 +
 scripts/forks/hddcoin_launch.sh     |   7 +-
 5 files changed, 217 insertions(+), 679 deletions(-)

diff --git a/api/views/farms/resources.py b/api/views/farms/resources.py
index cd528555..2bc63323 100644
--- a/api/views/farms/resources.py
+++ b/api/views/farms/resources.py
@@ -32,16 +32,16 @@ def get(self, args):
     @blp.arguments(FarmSchema)
     @blp.response(201, FarmSchema)
     def post(self, new_item):
-        app.logger.info("Farm incoming: {0}".format(new_item))
+        #app.logger.info("Farm incoming: {0}".format(new_item))
         item = db.session.query(Farm).filter(Farm.hostname==new_item['hostname'], \
             Farm.blockchain==new_item['blockchain']).first()
         if item: # upsert
-            app.logger.info("Upserting an existing farm...")
+            #app.logger.info("Upserting an existing farm...")
             new_item['created_at'] = item.created_at
             new_item['updated_at'] = dt.datetime.now()
             FarmSchema().update(item, new_item)
         else: # insert
-            app.logger.info("Inserting a new farm...")
+            #app.logger.info("Inserting a new farm...")
             item = Farm(**new_item)
         db.session.add(item)
         db.session.commit()
diff --git a/common/config/globals.py b/common/config/globals.py
index bbd8e4f7..e890f073 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -38,7 +38,7 @@
 FLAX_BINARY = '/flax-blockchain/venv/bin/flax'
 NCHAIN_BINARY = '/ext9-blockchain/venv/bin/chia'
 HDDCOIN_BINARY = '/hddcoin-blockchain/venv/bin/hddcoin'
-CHIVES_BINARY = '/chives-blockchain/venv/bin/chia'
+CHIVES_BINARY = '/chives-blockchain/venv/bin/chives'
 
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
 
diff --git a/licenses/LICENSE_madmax_plotter.txt b/licenses/LICENSE_madmax_plotter.txt
index e72bfdda..f49a4e16 100644
--- a/licenses/LICENSE_madmax_plotter.txt
+++ b/licenses/LICENSE_madmax_plotter.txt
@@ -1,674 +1,201 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. 
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-      Copyright (C)   
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-.
\ No newline at end of file
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/scripts/forks/chives_launch.sh b/scripts/forks/chives_launch.sh
index fbbda697..ac97b89b 100644
--- a/scripts/forks/chives_launch.sh
+++ b/scripts/forks/chives_launch.sh
@@ -8,6 +8,11 @@ cd /chives-blockchain
 
 . ./activate
 
+# Only the /root/.chia folder is volume-mounted so store chives within
+mkdir -p /root/.chia/chives
+rm -f /root/.chives
+ln -s /root/.chia/chives /root/.chives
+
 mkdir -p /root/.chives/mainnet/log
 chives init >> /root/.chives/mainnet/log/init.log 2>&1 
 
@@ -38,6 +43,7 @@ sed -i 's/localhost/127.0.0.1/g' ~/.chives/mainnet/config/config.yaml
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
+  if [ ! -f /root/.chives/farmer_ca/chives_ca.crt ]; then
   chives start farmer
 elif [[ ${mode} =~ ^farmer.* ]]; then
   chives start farmer-only
diff --git a/scripts/forks/hddcoin_launch.sh b/scripts/forks/hddcoin_launch.sh
index 371c7de4..acd3dc14 100644
--- a/scripts/forks/hddcoin_launch.sh
+++ b/scripts/forks/hddcoin_launch.sh
@@ -8,8 +8,13 @@ cd /hddcoin-blockchain
 
 . ./activate
 
+# Only the /root/.chia folder is volume-mounted so store hddcoin within
+mkdir -p /root/.chia/hddcoin
+rm -f /root/.hddcoin
+ln -s /root/.chia/hddcoin /root/.hddcoin
+
 mkdir -p /root/.hddcoin/mainnet/log
-hddcoin init >> /root/.hddcoin/mainnet/log/init.log 2>&1 
+hddcoin init >> /root/.hddcoin/mainnet/log/init.log 2>&1
 
 echo 'Configuring HDDCoin...'
 while [ ! -f /root/.hddcoin/mainnet/config/config.yaml ]; do

From d0aaf4bf59c919299652c9ef39a7352a79023961 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 29 Sep 2021 10:17:34 -0600
Subject: [PATCH 0175/1625] Paths and launch checks.

---
 api/commands/log_parser.py      | 21 ++++++++-------------
 common/config/globals.py        | 19 +++++++++++++++++++
 scripts/forks/chives_launch.sh  | 13 ++++++++++---
 scripts/forks/flax_launch.sh    | 12 ++++++++++--
 scripts/forks/hddcoin_launch.sh | 12 ++++++++++--
 scripts/forks/nchain_launch.sh  | 12 ++++++++++--
 6 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/api/commands/log_parser.py b/api/commands/log_parser.py
index 7473ca6d..def8b08d 100644
--- a/api/commands/log_parser.py
+++ b/api/commands/log_parser.py
@@ -17,6 +17,7 @@
 from flask import Flask, jsonify, abort, request, flash
 from subprocess import Popen, TimeoutExpired, PIPE
 
+from common.config import globals
 from api.models import log
 from api import app
 
@@ -86,7 +87,6 @@ def recent_partials(blockchain):
     # app.logger.debug(partials)
     return partials
 
-
 def find_plotting_job_log(plot_id):
     dir_path = '/root/.chia/plotman/logs'
     directory = os.fsencode(dir_path)
@@ -107,17 +107,8 @@ def find_plotting_job_log(plot_id):
     return None
 
 def get_farming_log_file(blockchain):
-    if blockchain == 'flax':
-        return "/root/.flax/mainnet/log/debug.log"
-    if blockchain == 'chives':
-        return "/root/.chives/mainnet/log/debug.log"
-    if blockchain == 'nchain':
-        return "/root/.chia/ext9/mainnet/log/debug.log"
-    if blockchain == 'hddcoin':
-        return "/root/.hddcoin/mainnet/log/debug.log"
-    if blockchain == 'chia':
-        return "/root/.chia/mainnet/log/debug.log"
-    raise Exception("No farming log for unknown blockchain: {0}".format(blockchain))
+    mainnet_folder = globals.get_blockchain_mainnet(blockchain)
+    return mainnet_folder + '/log/debug.log'
 
 def get_log_lines(log_type, log_id=None, blockchain=None):
     if log_type == "alerts":
@@ -141,7 +132,11 @@ def get_log_lines(log_type, log_id=None, blockchain=None):
     #app.logger.info("Log file found at {0}".format(log_file))
     if blockchain == "flax":
         class_escape = re.compile(r' flax.plotting.(\w+)(\s+): ')
-    else:
+    elif blockchain == "chives":
+        class_escape = re.compile(r' chives.plotting.(\w+)(\s+): ')
+    elif blockchain == "hddcoin":
+        class_escape = re.compile(r' hddcoin.plotting.(\w+)(\s+): ')
+    else: # Chia and NChain both
         class_escape = re.compile(r' chia.plotting.(\w+)(\s+): ')
     ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
     proc = Popen(['tail', '-n', str(MAX_LOG_LINES), log_file], stdout=PIPE)
diff --git a/common/config/globals.py b/common/config/globals.py
index e890f073..25e2f67f 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -55,6 +55,19 @@ def get_blockchain_binary(blockchain):
         return CHIVES_BINARY
     raise Exception("Invalid blockchain: ".format(blockchain))
 
+def get_blockchain_mainnet(blockchain):
+    if blockchain == 'flax':
+        return "/root/.flax/mainnet"
+    if blockchain == 'chives':
+        return "/root/.chives/mainnet"
+    if blockchain == 'nchain':
+        return "/root/.chia/ext9"
+    if blockchain == 'hddcoin':
+        return "/root/.hddcoin/mainnet"
+    if blockchain == 'chia':
+        return "/root/.chia/mainnet"
+    raise Exception("No mainnet folder for unknown blockchain: {0}".format(blockchain))
+
 def load():
     cfg = {}
     cfg['plotting_enabled'] = plotting_enabled()
@@ -96,6 +109,12 @@ def is_setup():
     if "mode" in os.environ and 'harvester' in os.environ['mode']:
         # Harvester doesn't require a mnemonic private key as farmer's ca already imported.
         return True
+    try:
+        if os.path.exist(get_blockchain_mainnet(enabled_blockchains()[0]) + '/config/ssl/wallet/public_wallet.key'):
+            logging.info("Skipping check for mnemonic.txt as public wallet key exists on disk.")
+            return True
+    except Exception as ex:
+        logging.info("Failed to find presence of public wallet key.")
     # All other modes, we should have at least one keys path
     if "keys" not in os.environ:
         logging.info(
diff --git a/scripts/forks/chives_launch.sh b/scripts/forks/chives_launch.sh
index ac97b89b..6ae8ad4b 100644
--- a/scripts/forks/chives_launch.sh
+++ b/scripts/forks/chives_launch.sh
@@ -43,10 +43,17 @@ sed -i 's/localhost/127.0.0.1/g' ~/.chives/mainnet/config/config.yaml
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  if [ ! -f /root/.chives/farmer_ca/chives_ca.crt ]; then
-  chives start farmer
+  if [ ! -f ~/.chives/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    chives start farmer
+  fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  chives start farmer-only
+  if [ ! -f ~/.chives/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    chives start farmer-only
+  fi
 elif [[ ${mode} =~ ^harvester.* ]]; then
   if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
     echo "A farmer peer address and port are required."
diff --git a/scripts/forks/flax_launch.sh b/scripts/forks/flax_launch.sh
index 4409eef1..adaa56ba 100644
--- a/scripts/forks/flax_launch.sh
+++ b/scripts/forks/flax_launch.sh
@@ -51,9 +51,17 @@ flax init --fix-ssl-permissions > /dev/null
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  flax start farmer
+  if [ ! -f ~/.flax/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    flax start farmer
+  fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  flax start farmer-only
+  if [ ! -f ~/.flax/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    flax start farmer-only
+  fi
 elif [[ ${mode} =~ ^harvester.* ]]; then
   if [[ -z ${farmer_address} || -z ${flax_farmer_port} ]]; then
     echo "A farmer peer address and port are required."
diff --git a/scripts/forks/hddcoin_launch.sh b/scripts/forks/hddcoin_launch.sh
index acd3dc14..547c3f48 100644
--- a/scripts/forks/hddcoin_launch.sh
+++ b/scripts/forks/hddcoin_launch.sh
@@ -46,9 +46,17 @@ hddcoin init --fix-ssl-permissions > /dev/null
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  hddcoin start farmer
+  if [ ! -f ~/.hddcoin/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    hddcoin start farmer
+  fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  hddcoin start farmer-only
+  if [ ! -f ~/.hddcoin/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    hddcoin start farmer-only
+  fi
 elif [[ ${mode} =~ ^harvester.* ]]; then
   if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
     echo "A farmer peer address and port are required."
diff --git a/scripts/forks/nchain_launch.sh b/scripts/forks/nchain_launch.sh
index 619b289b..bd60a93f 100644
--- a/scripts/forks/nchain_launch.sh
+++ b/scripts/forks/nchain_launch.sh
@@ -41,9 +41,17 @@ chia init --fix-ssl-permissions > /dev/null
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  chia start farmer
+  if [ ! -f ~/.chia/ext9/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    chia start farmer
+  fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  chia start farmer-only
+  if [ ! -f ~/.chia/ext9/config/ssl/wallet/public_wallet.ky ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
+  else
+    chia start farmer-only
+  fi
 elif [[ ${mode} =~ ^harvester.* ]]; then
   if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
     echo "A farmer peer address and port are required."

From 4b5d5b59aeba0c06d5bc6bda5b3ce57cdcddbc48 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 29 Sep 2021 13:54:33 -0600
Subject: [PATCH 0176/1625] Typo for key.

---
 scripts/forks/chives_launch.sh  | 4 ++--
 scripts/forks/flax_launch.sh    | 4 ++--
 scripts/forks/hddcoin_launch.sh | 4 ++--
 scripts/forks/nchain_launch.sh  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/forks/chives_launch.sh b/scripts/forks/chives_launch.sh
index 6ae8ad4b..557f45a7 100644
--- a/scripts/forks/chives_launch.sh
+++ b/scripts/forks/chives_launch.sh
@@ -43,13 +43,13 @@ sed -i 's/localhost/127.0.0.1/g' ~/.chives/mainnet/config/config.yaml
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  if [ ! -f ~/.chives/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.chives/mainnet/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     chives start farmer
   fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  if [ ! -f ~/.chives/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.chives/mainnet/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     chives start farmer-only
diff --git a/scripts/forks/flax_launch.sh b/scripts/forks/flax_launch.sh
index adaa56ba..4c03b7d9 100644
--- a/scripts/forks/flax_launch.sh
+++ b/scripts/forks/flax_launch.sh
@@ -51,13 +51,13 @@ flax init --fix-ssl-permissions > /dev/null
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  if [ ! -f ~/.flax/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.flax/mainnet/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     flax start farmer
   fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  if [ ! -f ~/.flax/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.flax/mainnet/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     flax start farmer-only
diff --git a/scripts/forks/hddcoin_launch.sh b/scripts/forks/hddcoin_launch.sh
index 547c3f48..a17f9776 100644
--- a/scripts/forks/hddcoin_launch.sh
+++ b/scripts/forks/hddcoin_launch.sh
@@ -46,13 +46,13 @@ hddcoin init --fix-ssl-permissions > /dev/null
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  if [ ! -f ~/.hddcoin/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.hddcoin/mainnet/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     hddcoin start farmer
   fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  if [ ! -f ~/.hddcoin/mainnet/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.hddcoin/mainnet/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     hddcoin start farmer-only
diff --git a/scripts/forks/nchain_launch.sh b/scripts/forks/nchain_launch.sh
index bd60a93f..5f0ba77d 100644
--- a/scripts/forks/nchain_launch.sh
+++ b/scripts/forks/nchain_launch.sh
@@ -41,13 +41,13 @@ chia init --fix-ssl-permissions > /dev/null
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
-  if [ ! -f ~/.chia/ext9/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.chia/ext9/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     chia start farmer
   fi
 elif [[ ${mode} =~ ^farmer.* ]]; then
-  if [ ! -f ~/.chia/ext9/config/ssl/wallet/public_wallet.ky ]; then
+  if [ ! -f ~/.chia/ext9/config/ssl/wallet/public_wallet.key ]; then
     echo "No wallet key found, so not starting farming services.  Please add your mnemonic.txt to /root/.chia and restart."
   else
     chia start farmer-only

From ab308c51a6ee5b580db7c75e8d126c5e2b7b416f Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 29 Sep 2021 14:28:47 -0600
Subject: [PATCH 0177/1625] New credit.

---
 CREDITS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CREDITS.md b/CREDITS.md
index a71d00e4..e155482c 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -61,6 +61,7 @@ A big thanks to all that contributed with dev and test including:
 * depasseg
 * sonicaj
 * OlivierLA75
+* jdoerrerstl1977
 
 ## 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.*
\ No newline at end of file

From 54c42b614d0ef856e281a834ab2f7bee222eaf0e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 30 Sep 2021 20:40:44 -0600
Subject: [PATCH 0178/1625] Chia 1.2.8 and displayname for plotting workers.

---
 .github/workflows/develop.yaml |  2 +-
 .github/workflows/main.yaml    |  2 +-
 .github/workflows/test.yaml    |  2 +-
 CHANGELOG.md                   |  3 +++
 web/models/plotman.py          | 10 +++++++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml
index afe67f1f..58c09f0c 100644
--- a/.github/workflows/develop.yaml
+++ b/.github/workflows/develop.yaml
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.7"
+            "CHIA_BRANCH=1.2.8"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 16f9255d..7d150ce3 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -41,7 +41,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.7"
+            "CHIA_BRANCH=1.2.8"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8efa596d..63d18522 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.7"
+            "CHIA_BRANCH=1.2.8"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bd97f4a..8500462b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 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).
 
+## [0.5.7] - 2021-10-01
+ - Chia - Update to version 1.2.8.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.8). 
+
 ## [0.5.6] - 2021-09-17 
 
  - Machinaris - On RaspPi, allow configurable status update frequency when running a Machinaris fullnode/controller.
diff --git a/web/models/plotman.py b/web/models/plotman.py
index 662602c6..076daeff 100644
--- a/web/models/plotman.py
+++ b/web/models/plotman.py
@@ -2,6 +2,7 @@
 import traceback
 
 from web import app
+from web.actions import worker as w
 
 
 class PlottingSummary:
@@ -25,8 +26,15 @@ def __init__(self, plottings):
                         ]
         self.rows = []
         for plotting in plottings:
+            try:
+                app.logger.debug("Found worker with hostname '{0}'".format(plotting.hostname))
+                displayname = w.get_worker(plotting.hostname).displayname
+            except:
+                app.logger.info("Unable to find a worker with hostname '{0}'".format(plotting.hostname))
+                displayname = plotting.hostname
             self.rows.append({
-                'worker': plotting.hostname,
+                'hostname': plotting.hostname,
+                'worker': displayname,
                 'plotter': plotting.plotter,
                 'plot_id': plotting.plot_id,
                 'k': plotting.k,

From a3cfde432f3f1d36dac739e480f12e1d50107fd3 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 1 Oct 2021 07:45:40 -0600
Subject: [PATCH 0179/1625] Temporarily build test off main.

---
 .github/workflows/test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8efa596d..7413514b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -3,7 +3,7 @@ name: test
 on:
   push:
     branches:
-      - 'integration'
+      - 'main'
 
 jobs:
   docker:
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.7"
+            "CHIA_BRANCH=1.2.8"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test

From 2f6c3da217e088e021c20530cc9f246d08e288ce Mon Sep 17 00:00:00 2001
From: y2kboy23 
Date: Fri, 1 Oct 2021 21:17:35 +0000
Subject: [PATCH 0180/1625] Bladebit 1.2.0 Changes

---
 docker/dockerfile        |  1 +
 scripts/bladebit_make.sh | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 2f2cf067..22450584 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -38,6 +38,7 @@ RUN \
 		cmake \
 		rsync \
 		libsodium-dev \
+		libgmp-dev \
 		libnuma-dev \
 		g++ \
 		iputils-ping \
diff --git a/scripts/bladebit_make.sh b/scripts/bladebit_make.sh
index ad0831a2..c0051f89 100644
--- a/scripts/bladebit_make.sh
+++ b/scripts/bladebit_make.sh
@@ -13,17 +13,19 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
         echo "arch_name=${arch_name}"
         if [ "${arch_name}" = "x86_64" ]; then
             echo "Building bladebit on x86_64..."
-            ./build-bls
-            make clean
-            make -j$(nproc --all) 
-            ln -s /bladebit/.bin/release/bladebit /usr/bin/bladebit
+            mkdir -p bladebit && cd build
+            cmake ..
+            cmake --build . --target bladebit --config release
+            mv ./bladebit /usr/bin/Bladebit
+            cd .. && rm -r ./build
             echo "Bladebit version: "`bladebit --version`
         elif [ "${arch_name}" = "arm64" ]; then
             echo "Building bladebit on arm64..."
-            ./build-bls
-            make clean
-            make -j$(nproc --all) CONFIG=release.arm 
-            ln -s /bladebit/.bin/release.arm/bladebit /usr/bin/bladebit
+            mkdir -p bladebit && cd build
+            cmake ..
+            cmake --build . --target bladebit --config release
+            mv ./bladebit /usr/bin/Bladebit
+            cd .. && rm -r ./build
             echo "Bladebit version: "`bladebit --version`
         else
             echo "Building bladebit skipped -> unsupported architecture: ${arch_name}"

From d34fee6d4c75b0853f6d33be127233699d3b6382 Mon Sep 17 00:00:00 2001
From: y2kboy23 
Date: Fri, 1 Oct 2021 21:29:20 +0000
Subject: [PATCH 0181/1625] Fix Typo

---
 scripts/bladebit_make.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bladebit_make.sh b/scripts/bladebit_make.sh
index c0051f89..9af3f597 100644
--- a/scripts/bladebit_make.sh
+++ b/scripts/bladebit_make.sh
@@ -13,7 +13,7 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
         echo "arch_name=${arch_name}"
         if [ "${arch_name}" = "x86_64" ]; then
             echo "Building bladebit on x86_64..."
-            mkdir -p bladebit && cd build
+            mkdir -p build && cd build
             cmake ..
             cmake --build . --target bladebit --config release
             mv ./bladebit /usr/bin/Bladebit
@@ -21,7 +21,7 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
             echo "Bladebit version: "`bladebit --version`
         elif [ "${arch_name}" = "arm64" ]; then
             echo "Building bladebit on arm64..."
-            mkdir -p bladebit && cd build
+            mkdir -p build && cd build
             cmake ..
             cmake --build . --target bladebit --config release
             mv ./bladebit /usr/bin/Bladebit

From 04a077000729425decdba9f7d314b8dcc624719d Mon Sep 17 00:00:00 2001
From: y2kboy23 
Date: Fri, 1 Oct 2021 21:59:29 +0000
Subject: [PATCH 0182/1625] Another typo

---
 scripts/bladebit_make.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bladebit_make.sh b/scripts/bladebit_make.sh
index 9af3f597..efec2ae1 100644
--- a/scripts/bladebit_make.sh
+++ b/scripts/bladebit_make.sh
@@ -16,7 +16,7 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
             mkdir -p build && cd build
             cmake ..
             cmake --build . --target bladebit --config release
-            mv ./bladebit /usr/bin/Bladebit
+            mv ./bladebit /usr/bin/bladebit
             cd .. && rm -r ./build
             echo "Bladebit version: "`bladebit --version`
         elif [ "${arch_name}" = "arm64" ]; then
@@ -24,7 +24,7 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
             mkdir -p build && cd build
             cmake ..
             cmake --build . --target bladebit --config release
-            mv ./bladebit /usr/bin/Bladebit
+            mv ./bladebit /usr/bin/bladebit
             cd .. && rm -r ./build
             echo "Bladebit version: "`bladebit --version`
         else

From e2e31806af4ef8168e9f454ef1537142afbea2a8 Mon Sep 17 00:00:00 2001
From: y2kboy23 
Date: Fri, 1 Oct 2021 22:00:18 +0000
Subject: [PATCH 0183/1625] One more

---
 scripts/bladebit_make.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bladebit_make.sh b/scripts/bladebit_make.sh
index efec2ae1..0c812b89 100644
--- a/scripts/bladebit_make.sh
+++ b/scripts/bladebit_make.sh
@@ -15,7 +15,7 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
             echo "Building bladebit on x86_64..."
             mkdir -p build && cd build
             cmake ..
-            cmake --build . --target bladebit --config release
+            cmake --build . --target bladebit --config Release
             mv ./bladebit /usr/bin/bladebit
             cd .. && rm -r ./build
             echo "Bladebit version: "`bladebit --version`
@@ -23,7 +23,7 @@ if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
             echo "Building bladebit on arm64..."
             mkdir -p build && cd build
             cmake ..
-            cmake --build . --target bladebit --config release
+            cmake --build . --target bladebit --config Release
             mv ./bladebit /usr/bin/bladebit
             cd .. && rm -r ./build
             echo "Bladebit version: "`bladebit --version`

From d3b834070b521298ee2df4af8da55b90c2210c69 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 1 Oct 2021 21:39:16 -0600
Subject: [PATCH 0184/1625] Bladebit 1.2.0 cleanups

---
 docker/dockerfile                             |  2 +-
 docker/entrypoint.sh                          |  3 --
 ...{bladebit_clone.sh => bladebit_install.sh} | 10 ++++--
 scripts/bladebit_make.sh                      | 34 -------------------
 4 files changed, 9 insertions(+), 40 deletions(-)
 rename scripts/{bladebit_clone.sh => bladebit_install.sh} (57%)
 delete mode 100644 scripts/bladebit_make.sh

diff --git a/docker/dockerfile b/docker/dockerfile
index 22450584..7765db43 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -68,7 +68,7 @@ RUN \
 	&& /usr/bin/bash /machinaris/scripts/chiadog_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/plotman_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/madmax_install.sh \
-	&& /usr/bin/bash /machinaris/scripts/bladebit_clone.sh \
+	&& /usr/bin/bash /machinaris/scripts/bladebit_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/machinaris_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/flax_install.sh ${FLAX_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/flaxdog_install.sh \
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index afa4ac65..ad6885f6 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -16,7 +16,4 @@ fi
 # Launch Machinaris web server and other services
 /machinaris/scripts/start_machinaris.sh
 
-# Build bladebit plotter on first run of container
-/usr/bin/bash /machinaris/scripts/bladebit_make.sh > /tmp/bladebit_make.log 2>&1 
-
 while true; do sleep 30; done;
diff --git a/scripts/bladebit_clone.sh b/scripts/bladebit_install.sh
similarity index 57%
rename from scripts/bladebit_clone.sh
rename to scripts/bladebit_install.sh
index 148a9f03..1722730f 100644
--- a/scripts/bladebit_clone.sh
+++ b/scripts/bladebit_install.sh
@@ -2,11 +2,17 @@
 #
 # Installs bladebit - A fast RAM-only, k32-only, Chia plotter.
 # 416 GiB of RAM are needed. See https://github.com/harold-b/bladebit
-# NOTE: During Docker image build on Github build servers, just clone the repo
 #
 
 BLADEBIT_BRANCH=master
 
-# Checkout the project
 cd /
 git clone --recursive --branch ${BLADEBIT_BRANCH} https://github.com/harold-b/bladebit.git
+
+cd /bladebit
+mkdir -p build && cd build
+cmake ..
+cmake --build . --target bladebit --config Release
+mv ./bladebit /usr/bin/bladebit
+cd .. && rm -r ./build
+echo "Bladebit version: "`bladebit --version`
diff --git a/scripts/bladebit_make.sh b/scripts/bladebit_make.sh
deleted file mode 100644
index 0c812b89..00000000
--- a/scripts/bladebit_make.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/env bash
-#
-# Installs bladebit - A fast RAM-only, k32-only, Chia plotter.
-# 416 GiB of RAM are needed. See https://github.com/harold-b/bladebit
-# NOTE: Bladebit checks proc count at build time, so must build when Docker first launched
-#
-
-if [[ ${mode} == 'fullnode' ]] || [[ ${mode} =~ ^plotter.* ]]; then
-    if [ ! -f /usr/bin/bladebit ]; then
-        cd /bladebit
-        # Build the code, previously cloned when image was built on Github build servers
-        arch_name="$(uname -m)"
-        echo "arch_name=${arch_name}"
-        if [ "${arch_name}" = "x86_64" ]; then
-            echo "Building bladebit on x86_64..."
-            mkdir -p build && cd build
-            cmake ..
-            cmake --build . --target bladebit --config Release
-            mv ./bladebit /usr/bin/bladebit
-            cd .. && rm -r ./build
-            echo "Bladebit version: "`bladebit --version`
-        elif [ "${arch_name}" = "arm64" ]; then
-            echo "Building bladebit on arm64..."
-            mkdir -p build && cd build
-            cmake ..
-            cmake --build . --target bladebit --config Release
-            mv ./bladebit /usr/bin/bladebit
-            cd .. && rm -r ./build
-            echo "Bladebit version: "`bladebit --version`
-        else
-            echo "Building bladebit skipped -> unsupported architecture: ${arch_name}"
-        fi
-    fi
-fi

From 412be0ff6b1ff1c356993b628977003dc9b3661a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 1 Oct 2021 22:51:39 -0600
Subject: [PATCH 0185/1625] Chia 1.2.9

---
 .github/workflows/develop.yaml | 2 +-
 .github/workflows/main.yaml    | 2 +-
 .github/workflows/test.yaml    | 2 +-
 CHANGELOG.md                   | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml
index afe67f1f..0649aa7e 100644
--- a/.github/workflows/develop.yaml
+++ b/.github/workflows/develop.yaml
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.7"
+            "CHIA_BRANCH=1.2.9"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 16f9255d..86b054e0 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -41,7 +41,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.7"
+            "CHIA_BRANCH=1.2.9"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7413514b..1117a13a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.2.8"
+            "CHIA_BRANCH=1.2.9"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bd97f4a..604d9fd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 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).
 
+## [0.5.7] - 2021-10-02 
+ - Chia - Update to version 1.2.8.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.8).
+  - Chia - Update to version 1.2.9.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.9).
+
 ## [0.5.6] - 2021-09-17 
 
  - Machinaris - On RaspPi, allow configurable status update frequency when running a Machinaris fullnode/controller.

From cd9888be9497a3bdbb587c51a8f817f18d60390f Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 2 Oct 2021 08:37:43 -0600
Subject: [PATCH 0186/1625] v0.5.7

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 604d9fd2..d910aa6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.5.7] - 2021-10-02 
  - Chia - Update to version 1.2.8.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.8).
-  - Chia - Update to version 1.2.9.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.9).
+ - Bladebit - Update to version 1.2.0.  See their [changelog for details](https://github.com/harold-b/bladebit/releases/tag/1.2.0)
+ - Chia - Update to version 1.2.9.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.9).
 
 ## [0.5.6] - 2021-09-17 
 

From f87c4215115529f5ab42b2cbae13e6db050ec635 Mon Sep 17 00:00:00 2001
From: Andrew Rowland 
Date: Sat, 2 Oct 2021 12:56:50 -0700
Subject: [PATCH 0187/1625] *compile binaries separately *reduces docker image
 by about 300mb

---
 docker/dockerfile | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 7765db43..604a3d16 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -1,6 +1,17 @@
 # set ubuntu release version
 ARG UBUNTU_VER="hirsute"
 
+######## builder ###########
+FROM ubuntu:${UBUNTU_VER} as builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y build-essential cmake libgmp-dev libnuma-dev libsodium-dev git
+
+COPY . /machinaris/
+
+RUN /usr/bin/bash /machinaris/scripts/madmax_install.sh && /usr/bin/bash /machinaris/scripts/bladebit_install.sh
+
 ######## packages stage ###########
 FROM ubuntu:${UBUNTU_VER} as package_stage
 
@@ -9,23 +20,22 @@ ARG DEBIAN_FRONTEND=noninteractive
 # install build packages
 RUN \
 	apt-get update \
-	&& apt-get install -y \
+	&& apt-get install --no-install-recommends -y \
 		acl \
 		ansible \
 		apt \
 		bash \
 		bc \
-		build-essential \
 		ca-certificates \
 		curl \
 		git \
 		jq \
+		lsb-release \
 		nfs-common \
 		openssl \
 		python3 \
 		python3.9-distutils \
 		python3.9-venv \
-		python3-dev \
 		python3-pip \
 		python-is-python3 \
 		sqlite3 \
@@ -35,12 +45,7 @@ RUN \
 		unzip \
 		vim \
 		wget \
-		cmake \
 		rsync \
-		libsodium-dev \
-		libgmp-dev \
-		libnuma-dev \
-		g++ \
 		iputils-ping \
 	\
 # cleanup apt cache
@@ -62,13 +67,16 @@ COPY . /machinaris/
 # set workdir
 WORKDIR /chia-blockchain
 
+#copy compiled files/binaries
+COPY --from=builder /usr/bin/bladebit /usr/bin/bladebit 
+COPY --from=builder /usr/lib/chia-plotter /usr/lib/chia-plotter
+COPY --from=builder /usr/bin/chia_plot /usr/bin/chia_plot
+
 # Install Chia, Plotman, Chiadog, Madmax, Flax, Machinaris, etc
 RUN \
 	/usr/bin/bash /machinaris/scripts/chia_install.sh ${CHIA_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/chiadog_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/plotman_install.sh \
-	&& /usr/bin/bash /machinaris/scripts/madmax_install.sh \
-	&& /usr/bin/bash /machinaris/scripts/bladebit_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/machinaris_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/flax_install.sh ${FLAX_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/flaxdog_install.sh \
@@ -124,4 +132,4 @@ EXPOSE 8926
 EXPOSE 8927
 
 WORKDIR /chia-blockchain
-ENTRYPOINT ["bash", "./entrypoint.sh"]
+ENTRYPOINT ["bash", "./entrypoint.sh"]
\ No newline at end of file

From fc23924607339d104303f19854743e6577d5b45c Mon Sep 17 00:00:00 2001
From: Andrew Rowland 
Date: Sat, 2 Oct 2021 13:03:28 -0700
Subject: [PATCH 0188/1625] adding in libraries

---
 docker/dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/dockerfile b/docker/dockerfile
index 604a3d16..07ef9b68 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -47,6 +47,9 @@ RUN \
 		wget \
 		rsync \
 		iputils-ping \
+		libnuma1 \
+		libsodium23 \
+		libgmp10 \
 	\
 # cleanup apt cache
 	\

From 9d5872b8a6ebf8290c5e42d199c7a91b9a44ed2c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 2 Oct 2021 15:57:29 -0600
Subject: [PATCH 0189/1625] Forgot to bump version.

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ad83b1b0..dc2b74e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.6
\ No newline at end of file
+0.5.7
\ No newline at end of file

From cc0cfae04054ba632ace0b3c66d3a249414824a2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 2 Oct 2021 20:38:34 -0600
Subject: [PATCH 0190/1625] Update ports for forks.

---
 docker/dockerfile            | 19 +++++++++++++++----
 scripts/forks/flax_launch.sh |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 823aac35..08a35a07 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -77,7 +77,7 @@ COPY --from=builder /usr/bin/bladebit /usr/bin/bladebit
 COPY --from=builder /usr/lib/chia-plotter /usr/lib/chia-plotter
 COPY --from=builder /usr/bin/chia_plot /usr/bin/chia_plot
 
-# Install Chia, Plotman, Chiadog, Madmax, Flax, Machinaris, etc
+# Install Chia (and forks), Plotman, Chiadog, Machinaris, etc
 RUN \
 	/usr/bin/bash /machinaris/scripts/forks/chia_install.sh ${CHIA_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/chives_install.sh ${CHIVES_BRANCH} \
@@ -99,8 +99,8 @@ 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" 
-# Required is the 'chia' blockchain, but can optionally add 'flax' too. A comma-separated list.
-ENV blockchains="chia,flax"
+# The single blockchain to run: chia, flax, nchain, hddcoin, chives, etc
+ENV blockchains="chia"
 # If provided then these optional 3 public keys will be set in your plotman.yaml
 ENV farmer_pk="null"
 ENV pool_pk="null"
@@ -108,7 +108,6 @@ ENV pool_contract_address="null"
 # If mode=harvester, required for host and port the harvester will your farmer
 ENV farmer_address="null"
 ENV farmer_port="8447"
-ENV flax_farmer_port="6885"
 # Can override the location of default settings for api and web servers.
 ENV API_SETTINGS_FILE='/root/.chia/machinaris/config/api.cfg'
 ENV WEB_SETTINGS_FILE='/root/.chia/machinaris/config/web.cfg'
@@ -133,6 +132,18 @@ EXPOSE 8447
 EXPOSE 6888
 # Flax RPC port - DO NOT forward at router
 EXPOSE 6885
+# NChain protocol port - forward at router
+EXPOSE 58445
+# NChain RPC port - DO NOT forward at router
+EXPOSE 58448
+# HDDCoin protocol port - forward at router
+EXPOSE 28444
+# HDDCoin RPC port - DO NOT forward at router
+EXPOSE 28448
+# Chives protocol port - forward at router
+EXPOSE 9699
+# Chives RPC port - DO NOT forward at router
+EXPOSE 9647
 # Machinaris WebUI - DO NOT forward at router, proxy if needed
 EXPOSE 8926
 # Machinaris API - DO NOT forward at router
diff --git a/scripts/forks/flax_launch.sh b/scripts/forks/flax_launch.sh
index 4c03b7d9..e5a26503 100644
--- a/scripts/forks/flax_launch.sh
+++ b/scripts/forks/flax_launch.sh
@@ -63,7 +63,7 @@ elif [[ ${mode} =~ ^farmer.* ]]; then
     flax start farmer-only
   fi
 elif [[ ${mode} =~ ^harvester.* ]]; then
-  if [[ -z ${farmer_address} || -z ${flax_farmer_port} ]]; then
+  if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
     echo "A farmer peer address and port are required."
     exit
   else
@@ -85,7 +85,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then
       echo "Did not find your farmer's certificates within /root/.flax/farmer_ca."
       echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
     fi
-    flax configure --set-farmer-peer ${farmer_address}:${flax_farmer_port}
+    flax configure --set-farmer-peer ${farmer_address}:${farmer_port}
     flax configure --enable-upnp false
     flax start harvester -r
   fi

From 9e3c300a920b907f2c4beb6376631ad7db1bce82 Mon Sep 17 00:00:00 2001
From: Andrew Rowland 
Date: Sun, 3 Oct 2021 12:32:17 -0700
Subject: [PATCH 0191/1625] missed bladebit dependancy

---
 docker/dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/dockerfile b/docker/dockerfile
index 07ef9b68..03a8fcea 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -50,6 +50,7 @@ RUN \
 		libnuma1 \
 		libsodium23 \
 		libgmp10 \
+		libgmpxx4ldbl \
 	\
 # cleanup apt cache
 	\

From b9fb0a7ec1a4825e1174c0611c58a447391a1208 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 3 Oct 2021 18:50:06 -0600
Subject: [PATCH 0192/1625] Adding test builds for forks.

---
 .github/workflows/develop.yaml      |  2 +-
 .github/workflows/test-chives.yaml  | 46 +++++++++++++++++++++++++++++
 .github/workflows/test-flax.yaml    | 46 +++++++++++++++++++++++++++++
 .github/workflows/test-hddcoin.yaml | 46 +++++++++++++++++++++++++++++
 .github/workflows/test-nchain.yaml  | 46 +++++++++++++++++++++++++++++
 .github/workflows/test.yaml         |  2 +-
 6 files changed, 186 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/test-chives.yaml
 create mode 100644 .github/workflows/test-flax.yaml
 create mode 100644 .github/workflows/test-hddcoin.yaml
 create mode 100644 .github/workflows/test-nchain.yaml

diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml
index aeadcbb3..ea9d1bdd 100644
--- a/.github/workflows/develop.yaml
+++ b/.github/workflows/develop.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
             "CHIA_BRANCH=1.2.9"
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
new file mode 100644
index 00000000..f72f6453
--- /dev/null
+++ b/.github/workflows/test-chives.yaml
@@ -0,0 +1,46 @@
+name: develop-chives
+
+on:
+  push:
+    branches:
+      - 'integration'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "CHIVES_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop
diff --git a/.github/workflows/test-flax.yaml b/.github/workflows/test-flax.yaml
new file mode 100644
index 00000000..e964ef41
--- /dev/null
+++ b/.github/workflows/test-flax.yaml
@@ -0,0 +1,46 @@
+name: develop-flax
+
+on:
+  push:
+    branches:
+      - 'integration'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "FLAX_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flax:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flax:develop
diff --git a/.github/workflows/test-hddcoin.yaml b/.github/workflows/test-hddcoin.yaml
new file mode 100644
index 00000000..2c71d95c
--- /dev/null
+++ b/.github/workflows/test-hddcoin.yaml
@@ -0,0 +1,46 @@
+name: develop-hddcoin
+
+on:
+  push:
+    branches:
+      - 'integration'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "HDDCOIN_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
diff --git a/.github/workflows/test-nchain.yaml b/.github/workflows/test-nchain.yaml
new file mode 100644
index 00000000..1e4e8434
--- /dev/null
+++ b/.github/workflows/test-nchain.yaml
@@ -0,0 +1,46 @@
+name: develop-nchain
+
+on:
+  push:
+    branches:
+      - 'integration'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "NCHAIN_BRANCH=net9.dev"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-nchain:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-nchain:develop
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1117a13a..855293a1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -3,7 +3,7 @@ name: test
 on:
   push:
     branches:
-      - 'main'
+      - 'integration'
 
 jobs:
   docker:

From db7e371ec0c65a6d8c974598b39d92960697c68a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 3 Oct 2021 20:46:28 -0600
Subject: [PATCH 0193/1625] Python build is missing make now.

---
 docker/dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker/dockerfile b/docker/dockerfile
index 03a8fcea..8fe3efbe 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -26,6 +26,7 @@ RUN \
 		apt \
 		bash \
 		bc \
+		build-essential \
 		ca-certificates \
 		curl \
 		git \
@@ -36,6 +37,7 @@ RUN \
 		python3 \
 		python3.9-distutils \
 		python3.9-venv \
+		python3-dev \
 		python3-pip \
 		python-is-python3 \
 		sqlite3 \
@@ -76,6 +78,9 @@ COPY --from=builder /usr/bin/bladebit /usr/bin/bladebit
 COPY --from=builder /usr/lib/chia-plotter /usr/lib/chia-plotter
 COPY --from=builder /usr/bin/chia_plot /usr/bin/chia_plot
 
+# Required for Chia blockchain install among others
+RUN apt-get update && apt-get install -y build-essential cmake
+
 # Install Chia, Plotman, Chiadog, Madmax, Flax, Machinaris, etc
 RUN \
 	/usr/bin/bash /machinaris/scripts/chia_install.sh ${CHIA_BRANCH} \

From 69e323efe083b10fd56a9df3ea21c48ec15fe4b7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 4 Oct 2021 09:32:52 -0600
Subject: [PATCH 0194/1625] Bladebit fixes.

---
 CHANGELOG.md | 3 +++
 VERSION      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d910aa6c..c0a308fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 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).
 
+## [0.5.8] - 2021-10-08 
+- Bladebit - Patch for broken library dependency. 
+
 ## [0.5.7] - 2021-10-02 
  - Chia - Update to version 1.2.8.  See their [changelog for details](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.2.8).
  - Bladebit - Update to version 1.2.0.  See their [changelog for details](https://github.com/harold-b/bladebit/releases/tag/1.2.0)
diff --git a/VERSION b/VERSION
index dc2b74e6..b35b9dd0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.7
\ No newline at end of file
+0.5.8
\ No newline at end of file

From e98b5aee5bd4ae713fc93d3fe7ffcaf4dc0a082e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 4 Oct 2021 10:11:45 -0600
Subject: [PATCH 0195/1625] Number the plots directories to prevent users from
 re-using same in-container path over and over.

---
 web/templates/worker_launch.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 21d6e140..735b613f 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -423,7 +423,7 @@ 
    Volume Mounts
    
                     
    
                     
    
                         
-                        
                     
    
                     
    

From a53b9938e45f01ac643f1516ed72cedc880fb852 Mon Sep 17 00:00:00 2001
From: y2kboy23 
Date: Mon, 4 Oct 2021 11:46:03 -0700
Subject: [PATCH 0196/1625] Reverting changes

Bladebit worked with these installed.  Switching back and will research further.
---
 docker/dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 8fe3efbe..4796ccc2 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -20,7 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 # install build packages
 RUN \
 	apt-get update \
-	&& apt-get install --no-install-recommends -y \
+	&& apt-get install -y \
 		acl \
 		ansible \
 		apt \
@@ -49,10 +49,9 @@ RUN \
 		wget \
 		rsync \
 		iputils-ping \
-		libnuma1 \
-		libsodium23 \
-		libgmp10 \
-		libgmpxx4ldbl \
+                libgmp-dev \
+                libnuma-dev \
+		libsodium-dev \
 	\
 # cleanup apt cache
 	\
@@ -141,4 +140,4 @@ EXPOSE 8926
 EXPOSE 8927
 
 WORKDIR /chia-blockchain
-ENTRYPOINT ["bash", "./entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["bash", "./entrypoint.sh"]

From 4d9abbbaffa5d022c490b2a4650f2b2cf542b12a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 4 Oct 2021 19:46:41 -0600
Subject: [PATCH 0197/1625] Warning for unresponsive worker.

---
 .github/workflows/develop.yaml |  2 +-
 common/models/workers.py       |  8 +++++
 web/actions/worker.py          |  5 ++++
 web/models/chia.py             | 19 +++++++++++-
 web/models/worker.py           | 30 ++++++++++++-------
 web/routes.py                  |  3 +-
 web/templates/keys.html        | 53 ++++++++++++++++++++--------------
 web/templates/worker.html      | 14 +++++----
 web/templates/workers.html     |  2 +-
 9 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml
index ea9d1bdd..aeadcbb3 100644
--- a/.github/workflows/develop.yaml
+++ b/.github/workflows/develop.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           build-args: |
             "CHIA_BRANCH=1.2.9"
diff --git a/common/models/workers.py b/common/models/workers.py
index f6eb3774..1e28496f 100644
--- a/common/models/workers.py
+++ b/common/models/workers.py
@@ -64,3 +64,11 @@ def monitoring_status(self):
                 return j.loads(self.services)['chiadog_status'] 
             except:
                 return "Unkown"
+    
+    def connection_status(self):
+        fifteen_mins_ago = dt.datetime.now() - dt.timedelta(minutes=15)
+        if self.ping_success_at and self.ping_success_at >= fifteen_mins_ago:
+            return self.latest_ping_result
+        elif self.latest_ping_result and self.latest_ping_result == 'Responding':
+            return "Unknown"
+        return self.latest_ping_result
diff --git a/web/actions/worker.py b/web/actions/worker.py
index f417627d..e686fc82 100644
--- a/web/actions/worker.py
+++ b/web/actions/worker.py
@@ -81,6 +81,11 @@ def __init__(self, title, message, level="info"):
 
 def generate_warnings(worker, plots):
     warnings = []
+    # Check if worker is responding to pings
+    app.logger.info(worker)
+    if worker.connection_status() != "Responding":
+        warnings.append(WorkerWarning("Worker not responding to pings.",  
+            "Please check the worker container and restart if necessary."))
     # TODO - Warning for harvester not connected (worker but not in farm summary)
     # TODO - Warning for harvester not responding quickly enough
     # TODO - Warning for harvester not responding often enough
diff --git a/web/models/chia.py b/web/models/chia.py
index b8566ed5..626b6f88 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -18,12 +18,22 @@ def __init__(self, farm_recs):
         self.farms = {}
         for farm_rec in farm_recs: 
             if farm_rec.mode == "fullnode":
+                try:
+                    app.logger.debug("Found worker with hostname '{0}'".format(farm_rec.hostname))
+                    wkr = w.get_worker(farm_rec.hostname, farm_rec.blockchain)
+                    displayname = wkr.displayname
+                    connection_status = wkr.connection_status()
+                except Exception as ex:
+                    app.logger.info(str(ex))
+                    app.logger.info("Unable to find a worker with hostname '{0}' and blockchain '{1}'".format(farm_rec.hostname, farm_rec.blockchain))
+                    displayname = farm_rec.hostname
+                    connection_status = None
                 farm = {
                     "plot_count": int(farm_rec.plot_count),
                     "plots_size": farm_rec.plots_size,
                     "plots_display_size": converters.gib_to_fmt(farm_rec.plots_size),
                     "status": farm_rec.status,
-                    "display_status": "Active" if farm_rec.status == "Farming" else farm_rec.status,
+                    "display_status": self.status_if_responding(displayname, farm_rec.blockchain, connection_status, farm_rec.status),
                     "total_coins": '0.0' if not farm_rec.total_coins else round(farm_rec.total_coins, 6),
                     "netspace_display_size": '?' if not farm_rec.netspace_size else converters.gib_to_fmt(farm_rec.netspace_size),
                     "netspace_size": farm_rec.netspace_size,
@@ -38,6 +48,12 @@ def __init__(self, farm_recs):
         if len(self.farms) == 0:  # Handle completely missing farm summary info 
             self.farms['chia'] = {} # with empty chia farm
 
+    def status_if_responding(self, displayname, blockchain, connection_status, last_status):
+        if connection_status == 'Responding':
+            return "Active" if last_status == "Farming" else last_status
+        app.logger.info("Oops! {0} ({1}) had connection_success: {2}".format(displayname, blockchain, connection_status))
+        return "Unknown"
+
 class FarmPlots:
 
      def __init__(self, plots):
@@ -126,6 +142,7 @@ def __init__(self, keys):
             self.rows.append({ 
                 'displayname': displayname, 
                 'hostname': key.hostname,
+                'blockchain': key.blockchain,
                 'details': key.details,
                 'updated_at': key.updated_at }) 
 
diff --git a/web/models/worker.py b/web/models/worker.py
index 10851e61..652e0fdc 100644
--- a/web/models/worker.py
+++ b/web/models/worker.py
@@ -1,9 +1,8 @@
+import datetime
 import json
 import os
 import traceback
 
-from datetime import datetime
-
 from common.config import globals
 
 from web import app
@@ -61,6 +60,12 @@ def set_worker_attributes(self, worker):
     def set_ping_response(self, response):
         self.ping_response = response
 
+    def status_if_responding(self, displayname, blockchain, connection_status, last_status):
+        if connection_status == "Responding":
+            return last_status
+        app.logger.info("Oops! {0} ({1}) last connection status: {2}".format(displayname, blockchain, connection_status))
+        return "Unknown"
+
     def fullnodes(self):
         filtered = []
         for worker in self.workers:
@@ -72,6 +77,11 @@ def fullnodes(self):
                 if not host:
                     host = Host(worker.hostname, worker.displayname)
                     filtered.append(host)
+                host.workers.append({
+                    'hostname': worker.hostname,
+                    'displayname': worker.displayname,
+                    'config': json.loads(worker.config),
+                })
         filtered.sort(key=lambda w: w.displayname)
         return filtered
 
@@ -90,8 +100,8 @@ def plotters(self):
                     'hostname': worker.hostname,
                     'displayname': worker.displayname,
                     'plotting_status': worker.plotting_status(),
-                    'archiving_status': worker.archiving_status(),
-                    'archiving_enabled': worker.archiving_enabled(),
+                    'archiving_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.archiving_status()),
+                    'archiving_enabled': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.archiving_enabled()),
                     'config': json.loads(worker.config),
                 })
         filtered.sort(key=lambda w: w.displayname)
@@ -113,8 +123,8 @@ def farmers(self):
                     'hostname': worker.hostname,
                     'displayname': worker.displayname,
                     'blockchain': worker.blockchain,
-                    'farming_status': worker.farming_status().lower(),
-                    'monitoring_status': worker.monitoring_status().lower()
+                    'farming_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.farming_status().lower()),
+                    'monitoring_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.monitoring_status().lower())
                 })
         filtered.sort(key=lambda w: w.displayname)
         return filtered
@@ -135,8 +145,8 @@ def harvesters(self):
                     'hostname': worker.hostname,
                     'displayname': worker.displayname,
                     'blockchain': worker.blockchain,
-                    'farming_status': worker.farming_status().lower(),
-                    'monitoring_status': worker.monitoring_status().lower()
+                    'farming_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.farming_status().lower()),
+                    'monitoring_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.monitoring_status().lower())
                 })
         filtered.sort(key=lambda w: w.displayname)
         return filtered
@@ -157,8 +167,8 @@ def farmers_harvesters(self):
                     'hostname': worker.hostname,
                     'displayname': worker.displayname,
                     'blockchain': worker.blockchain,
-                    'farming_status': worker.farming_status().lower(),
-                    'monitoring_status': worker.monitoring_status().lower()
+                    'farming_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.farming_status().lower()),
+                    'monitoring_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.monitoring_status().lower())
                 })
         filtered.sort(key=lambda w: w.displayname)
         return filtered
diff --git a/web/routes.py b/web/routes.py
index 6575511f..702461dc 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -171,7 +171,8 @@ def workers():
 def worker_route():
     gc = globals.load()
     hostname=request.args.get('hostname')
-    wkr = worker.load_worker_summary(hostname=hostname).workers[0]
+    blockchain=request.args.get('blockchain')
+    wkr = worker.get_worker(hostname, blockchain)
     plots = chia.load_plots_farming(hostname=hostname)
     plotting = plotman.load_plotting_summary(hostname=hostname)
     plots_disk_usage = stats.load_current_disk_usage('plots',hostname=hostname)
diff --git a/web/templates/keys.html b/web/templates/keys.html
index 1b23af4d..06770552 100644
--- a/web/templates/keys.html
+++ b/web/templates/keys.html
@@ -2,36 +2,45 @@
 
 {% block content %}
 
-
    
-    
    
-        
-            
-        
+
+
+{% if keys.rows|length > 0 %}
+
    
-
-
    
-    Wallet - chia keys show 
-
    
-
-
    
-    {% if keys.rows|length > 0 %}
-    {% for key in keys.rows %}
-    
    
-        
    {{key.displayname}} - {{key.blockchain}}
    
-        
    {{ key.details}}
    
-    
    
-    {% endfor %}
-
    
+
 {% else %}
 
    
     
    No keys found from any farmers. Not added?
    
-    
    Try running 'chia key show' on your farmers to verify.
    
+    
    Try running 'chia keys show' on your farmers to verify.
    
 
    
 {% endif %}
 
 
+
 
    NOTE: Machinaris will never display your private key here.
    
 
 
    However, you may view it yourself by executing this from within the Docker container.
    
diff --git a/web/templates/worker.html b/web/templates/worker.html
index ba2f532c..e8d0c358 100644
--- a/web/templates/worker.html
+++ b/web/templates/worker.html
@@ -36,16 +36,20 @@
       
-            
+            
-            
-            
+            
+            
-            
-            
+            
+            
+          
+          
+            
+            
diff --git a/web/templates/workers.html b/web/templates/workers.html
index 3e71cdd5..cff02e8e 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -51,7 +51,7 @@
           {% for worker in workers.workers %}
           

From 708a10218da2ecaa5b23d56c83058637be543093 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 6 Oct 2021 13:19:35 -0600
Subject: [PATCH 0198/1625] Revert some build changes to hopefully fix
 bladebit.

---
 docker/dockerfile           | 29 +++++++----------------------
 scripts/bladebit_install.sh |  6 +++---
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 4796ccc2..14ff7ade 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -1,17 +1,6 @@
 # set ubuntu release version
 ARG UBUNTU_VER="hirsute"
 
-######## builder ###########
-FROM ubuntu:${UBUNTU_VER} as builder
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y build-essential cmake libgmp-dev libnuma-dev libsodium-dev git
-
-COPY . /machinaris/
-
-RUN /usr/bin/bash /machinaris/scripts/madmax_install.sh && /usr/bin/bash /machinaris/scripts/bladebit_install.sh
-
 ######## packages stage ###########
 FROM ubuntu:${UBUNTU_VER} as package_stage
 
@@ -47,11 +36,13 @@ RUN \
 		unzip \
 		vim \
 		wget \
+		cmake \
 		rsync \
 		iputils-ping \
-                libgmp-dev \
-                libnuma-dev \
+		libgmp-dev \
+		libnuma-dev \
 		libsodium-dev \
+		g++ \
 	\
 # cleanup apt cache
 	\
@@ -72,19 +63,13 @@ COPY . /machinaris/
 # set workdir
 WORKDIR /chia-blockchain
 
-#copy compiled files/binaries
-COPY --from=builder /usr/bin/bladebit /usr/bin/bladebit 
-COPY --from=builder /usr/lib/chia-plotter /usr/lib/chia-plotter
-COPY --from=builder /usr/bin/chia_plot /usr/bin/chia_plot
-
-# Required for Chia blockchain install among others
-RUN apt-get update && apt-get install -y build-essential cmake
-
 # Install Chia, Plotman, Chiadog, Madmax, Flax, Machinaris, etc
 RUN \
 	/usr/bin/bash /machinaris/scripts/chia_install.sh ${CHIA_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/chiadog_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/plotman_install.sh \
+	&& /usr/bin/bash /machinaris/scripts/madmax_install.sh \
+	&& /usr/bin/bash /machinaris/scripts/bladebit_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/machinaris_install.sh \
 	&& /usr/bin/bash /machinaris/scripts/flax_install.sh ${FLAX_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/flaxdog_install.sh \
@@ -140,4 +125,4 @@ EXPOSE 8926
 EXPOSE 8927
 
 WORKDIR /chia-blockchain
-ENTRYPOINT ["bash", "./entrypoint.sh"]
+ENTRYPOINT ["bash", "./entrypoint.sh"]
\ No newline at end of file
diff --git a/scripts/bladebit_install.sh b/scripts/bladebit_install.sh
index 1722730f..25bee3fd 100644
--- a/scripts/bladebit_install.sh
+++ b/scripts/bladebit_install.sh
@@ -7,12 +7,12 @@
 BLADEBIT_BRANCH=master
 
 cd /
-git clone --recursive --branch ${BLADEBIT_BRANCH} https://github.com/harold-b/bladebit.git
+git clone --recursive --branch ${BLADEBIT_BRANCH} https://github.com/Chia-Network/bladebit.git
 
 cd /bladebit
 mkdir -p build && cd build
 cmake ..
 cmake --build . --target bladebit --config Release
-mv ./bladebit /usr/bin/bladebit
-cd .. && rm -r ./build
+ln -s ./bladebit /usr/bin/bladebit
+cd /
 echo "Bladebit version: "`bladebit --version`

From 07c4a3ee34c157bf6fd012cbb1dffc64c0dc5616 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 6 Oct 2021 22:21:40 -0600
Subject: [PATCH 0199/1625] Getting plotting working again.

---
 api/migrations/versions/292c8d1a45fb_.py |  52 +++++++++
 api/migrations/versions/bf024c5e1aea_.py |  52 +++++++++
 api/schedules/status_blockchains.py      |   2 +-
 api/schedules/status_plots.py            |  23 +++-
 api/schedules/status_plotting.py         |   6 +-
 api/views/alerts/resources.py            |  14 +--
 api/views/blockchains/resources.py       |  15 ++-
 api/views/connections/resources.py       |  19 ++--
 api/views/plottings/resources.py         |  26 +----
 common/models/plots.py                   |   1 +
 common/models/plottings.py               |   2 +
 web/__init__.py                          |   9 ++
 web/actions/plotman.py                   |  39 ++++---
 web/models/chia.py                       |  15 +--
 web/models/worker.py                     |  22 ++++
 web/routes.py                            |   2 +-
 web/templates/farming/plots.html         |   5 +-
 web/templates/plotting/jobs.html         | 139 ++++++++++++++---------
 web/templates/worker.html                |   4 +-
 19 files changed, 313 insertions(+), 134 deletions(-)
 create mode 100644 api/migrations/versions/292c8d1a45fb_.py
 create mode 100644 api/migrations/versions/bf024c5e1aea_.py

diff --git a/api/migrations/versions/292c8d1a45fb_.py b/api/migrations/versions/292c8d1a45fb_.py
new file mode 100644
index 00000000..b0f1667f
--- /dev/null
+++ b/api/migrations/versions/292c8d1a45fb_.py
@@ -0,0 +1,52 @@
+"""empty message
+
+Revision ID: 292c8d1a45fb
+Revises: bb1f1d3ee5d0
+Create Date: 2021-10-06 10:07:51.279047
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '292c8d1a45fb'
+down_revision = 'bb1f1d3ee5d0'
+branch_labels = None
+depends_on = None
+
+
+def upgrade(engine_name):
+    globals()["upgrade_%s" % engine_name]()
+
+
+def downgrade(engine_name):
+    globals()["downgrade_%s" % engine_name]()
+
+
+
+
+
+def upgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('plottings', sa.Column('blockchain', sa.String(length=64), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('plottings', 'blockchain')
+    # ### end Alembic commands ###
+
+
+def upgrade_stats():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stats():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
diff --git a/api/migrations/versions/bf024c5e1aea_.py b/api/migrations/versions/bf024c5e1aea_.py
new file mode 100644
index 00000000..5cafee3f
--- /dev/null
+++ b/api/migrations/versions/bf024c5e1aea_.py
@@ -0,0 +1,52 @@
+"""empty message
+
+Revision ID: bf024c5e1aea
+Revises: 292c8d1a45fb
+Create Date: 2021-10-06 10:11:41.894401
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'bf024c5e1aea'
+down_revision = '292c8d1a45fb'
+branch_labels = None
+depends_on = None
+
+
+def upgrade(engine_name):
+    globals()["upgrade_%s" % engine_name]()
+
+
+def downgrade(engine_name):
+    globals()["downgrade_%s" % engine_name]()
+
+
+
+
+
+def upgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('plots', sa.Column('blockchain', sa.String(length=64), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('plots', 'blockchain')
+    # ### end Alembic commands ###
+
+
+def upgrade_stats():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stats():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
diff --git a/api/schedules/status_blockchains.py b/api/schedules/status_blockchains.py
index bb0d43b7..711970d5 100644
--- a/api/schedules/status_blockchains.py
+++ b/api/schedules/status_blockchains.py
@@ -32,7 +32,7 @@ def update():
                     "blockchain": blockchain,
                     "details": bc.text.replace('\r', ''),
                 }
-                utils.send_post('/blockchains/', payload, debug=False)
+                utils.send_post('/blockchains', payload, debug=False)
         except:
             app.logger.info("Failed to load and send blockchains status.")
             app.logger.info(traceback.format_exc())
diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index ec0b42c3..9ea5ec2a 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -33,12 +33,20 @@ def get_plot_attrs(plot_id, filename):
 def update():
     global last_full_send_time
     with app.app_context():
+        since = (datetime.datetime.now() - datetime.timedelta(minutes=FULL_SEND_INTERVAL_MINS)).strftime("%Y-%m-%d %H:%M")
+        if not last_full_send_time or last_full_send_time <= \
+            (datetime.datetime.now() - datetime.timedelta(minutes=FULL_SEND_INTERVAL_MINS)):
+            since = None  # No since filter sends all plots, not just recent
+            last_full_send_time = datetime.datetime.now()
+        if 'chia' in globals.enabled_blockchains():
+            update_chia_plots(since)
+        elif 'chives' in globals.enabled_blockchains():
+            update_chives_plots(since)
+        else:
+            app.logger.debug("Skipping plots update from blockchains other than chia and chives as they all farm same as chia.")
+
+def update_chia_plots(since):
         try:
-            since = (datetime.datetime.now() - datetime.timedelta(minutes=FULL_SEND_INTERVAL_MINS)).strftime("%Y-%m-%d %H:%M")
-            if not last_full_send_time or last_full_send_time <= \
-                (datetime.datetime.now() - datetime.timedelta(minutes=FULL_SEND_INTERVAL_MINS)):
-                since = None  # No since filter sends all plots, not just recent
-                last_full_send_time = datetime.datetime.now()
             controller_hostname = utils.get_hostname()
             plots_farming = chia.get_all_plots()
             payload = []
@@ -47,6 +55,7 @@ def update():
                 if not since or created_at > since:
                     payload.append({
                         "plot_id": short_plot_id,
+                        "blockchain": 'chia',
                         # '172.17.0.2' was weird non-local IP on OlivierLA75's Docker setup, inside his container
                         "hostname": controller_hostname if plot['hostname'] in ['127.0.0.1' , '172.17.0.2']  else plot['hostname'],
                         "dir": dir,
@@ -65,3 +74,7 @@ def update():
         except:
             app.logger.info("Failed to load plots farming and send.")
             app.logger.info(traceback.format_exc())
+
+def update_chives_plots(since):
+    # TODO Must do old approach of looking on disk
+    pass
\ No newline at end of file
diff --git a/api/schedules/status_plotting.py b/api/schedules/status_plotting.py
index e78a97db..9917164b 100644
--- a/api/schedules/status_plotting.py
+++ b/api/schedules/status_plotting.py
@@ -17,12 +17,14 @@ def update():
     with app.app_context():
         try:
             hostname = utils.get_hostname()
+            blockchain = globals.enabled_blockchains()[0]
             plotting_summary = plotman_cli.load_plotting_summary()
             payload = []
             for plot in plotting_summary.rows:
                 payload.append({
                     "plot_id": plot['plot_id'],
                     "hostname": hostname,
+                    "blockchain": blockchain,
                     "plotter": plot['plotter'],
                     "k": plot['k'],
                     "tmp": plot['tmp'],
@@ -38,9 +40,9 @@ def update():
                     "io": plot['io'],
                 })
             if len(payload) > 0:
-                utils.send_post('/plottings/', payload, debug=False)
+                utils.send_post('/plottings/{0}/{1}'.format(hostname, blockchain), payload, debug=False)
             else:
-                utils.send_delete('/plottings/{0}'.format(hostname), debug=False)
+                utils.send_delete('/plottings/{0}/{1}'.format(hostname, blockchain), debug=False)
         except:
             app.logger.info("Failed to load plotting summary and send.")
             app.logger.info(traceback.format_exc())
diff --git a/api/views/alerts/resources.py b/api/views/alerts/resources.py
index 7dc2b5c4..9111d98f 100644
--- a/api/views/alerts/resources.py
+++ b/api/views/alerts/resources.py
@@ -44,18 +44,18 @@ def post(self, new_items):
         return items
 
 
-@blp.route('/')
-class AlertByHostname(MethodView):
+@blp.route('//')
+class AlertByHostnameBlockchain(MethodView):
 
     @blp.etag
     @blp.response(200, AlertSchema)
-    def get(self, hostname):
-        return db.session.query(Alert).filter(Alert.hostname==hostname)
+    def get(self, hostname, blockchain):
+        return db.session.query(Alert).filter(Alert.hostname==hostname, Alert.blockchain==blockchain)
 
     @blp.etag
     @blp.arguments(BatchOfAlertSchema)
     @blp.response(200, AlertSchema(many=True))
-    def put(self, new_items, hostname):
+    def put(self, new_items, hostname, blockchain):
         items = []
         for new_item in new_items:
             item = db.session.query(Alert).get(new_item['unique_id'])
@@ -68,6 +68,6 @@ def put(self, new_items, hostname):
 
     @blp.etag
     @blp.response(204)
-    def delete(self, hostname):
-        db.session.query(Alert).filter(Alert.hostname==hostname).delete()
+    def delete(self, hostname, blockchain):
+        db.session.query(Alert).filter(Alert.hostname==hostname, Alert.blockchain==blockchain).delete()
         db.session.commit()
diff --git a/api/views/blockchains/resources.py b/api/views/blockchains/resources.py
index b30b53e5..fa6d267f 100644
--- a/api/views/blockchains/resources.py
+++ b/api/views/blockchains/resources.py
@@ -46,18 +46,20 @@ def post(self, new_item):
 
 
 @blp.route('//')
-class BlockchainsByHostname(MethodView):
+class BlockchainsByHostnameBlockchain(MethodView):
 
     @blp.etag
     @blp.response(200, BlockchainSchema)
-    def get(self, hostname):
-        return db.session.query(Blockchain).get_or_404(hostname)
+    def get(self, hostname, blockchain):
+        return db.session.query(Blockchain).filter(Blockchain.hostname==hostname, \
+            Blockchain.blockchain==blockchain).first()
 
     @blp.etag
     @blp.arguments(BlockchainSchema)
     @blp.response(200, BlockchainSchema)
     def put(self, new_item, hostname, blockchain):
-        item = db.session.query(Blockchain).get_or_404(hostname)
+        item = db.session.query(Blockchain).filter(Blockchain.hostname==hostname, \
+            Blockchain.blockchain==blockchain).first()
         new_item['hostname'] = item.hostname
         new_item['created_at'] = item.created_at
         new_item['updated_at'] = dt.datetime.now()
@@ -69,8 +71,9 @@ def put(self, new_item, hostname, blockchain):
 
     @blp.etag
     @blp.response(204)
-    def delete(self, hostname):
-        item = db.session.query(Blockchain).get_or_404(hostname)
+    def delete(self, hostname, blockchain):
+        item = db.session.query(Blockchain).filter(Blockchain.hostname==hostname, \
+            Blockchain.blockchain==blockchain).first()
         blp.check_etag(item, BlockchainSchema)
         db.session.delete(item)
         db.session.commit()
\ No newline at end of file
diff --git a/api/views/connections/resources.py b/api/views/connections/resources.py
index 8be37b3e..5a3f1ce9 100644
--- a/api/views/connections/resources.py
+++ b/api/views/connections/resources.py
@@ -45,19 +45,21 @@ def post(self, new_item):
         return item
 
 
-@blp.route('/')
-class ConnectionsByHostname(MethodView):
+@blp.route('//')
+class ConnectionsByHostnameBlockchain(MethodView):
 
     @blp.etag
     @blp.response(200, ConnectionSchema)
-    def get(self, hostname):
-        return db.session.query(Connection).get_or_404(hostname)
+    def get(self, hostname, blockchain):
+        return db.session.query(Connection).filter(Connection.hostname==hostname, \
+            Connection.blockchain==blockchain).first()
 
     @blp.etag
     @blp.arguments(ConnectionSchema)
     @blp.response(200, ConnectionSchema)
-    def put(self, new_item, hostname):
-        item = db.session.query(Connection).get_or_404(hostname)
+    def put(self, new_item, hostname, blockchain):
+        item = db.session.query(Connection).filter(Connection.hostname==hostname, \
+            Connection.blockchain==blockchain).first()
         new_item['hostname'] = item.hostname
         new_item['created_at'] = item.created_at
         new_item['updated_at'] = dt.datetime.now()
@@ -69,8 +71,9 @@ def put(self, new_item, hostname):
 
     @blp.etag
     @blp.response(204)
-    def delete(self, hostname):
-        item = db.session.query(Connection).get_or_404(hostname)
+    def delete(self, hostname, blockchain):
+        item = db.session.query(Connection).filter(Connection.hostname==hostname, \
+            Connection.blockchain==blockchain).first()
         blp.check_etag(item, ConnectionSchema)
         db.session.delete(item)
         db.session.commit()
\ No newline at end of file
diff --git a/api/views/plottings/resources.py b/api/views/plottings/resources.py
index b3e38501..59cd7c44 100644
--- a/api/views/plottings/resources.py
+++ b/api/views/plottings/resources.py
@@ -29,35 +29,19 @@ def get(self, args):
         ret = db.session.query(Plotting).filter_by(**args)
         return ret
 
-    @blp.etag
-    @blp.arguments(BatchOfPlottingSchema)
-    @blp.response(201, PlottingSchema(many=True))
-    def post(self, new_items):
-        # Now delete all old plottings by hostname of first new plotting
-        db.session.query(Plotting).filter(Plotting.hostname==new_items[0]['hostname']).delete()
-        items = []
-        for new_item in new_items:
-            item = Plotting(**new_item)
-            db.session.add(item)
-            items.append(item)
-        db.session.commit()
-        return items
-
-
-@blp.route('/')
+@blp.route('//')
 class PlottingByHostname(MethodView):
 
     @blp.etag
     @blp.response(200, PlottingSchema)
-    def get(self, hostname):
-        return db.session.query(Plotting).filter(Plotting.hostname==hostname)
+    def get(self, hostname, blockchain):
+        return db.session.query(Plotting).filter(Plotting.hostname==hostname, Plotting.blockchain==blockchain)
 
     @blp.etag
     @blp.arguments(BatchOfPlottingSchema)
     @blp.response(200, PlottingSchema(many=True))
-    def put(self, new_items, hostname):
-        # Now delete all old plottings by hostname of first new plotting
-        db.session.query(Plotting).filter(Plotting.hostname==hostname).delete()
+    def post(self, new_items, hostname, blockchain):
+        db.session.query(Plotting).filter(Plotting.hostname==hostname, Plotting.blockchain==blockchain).delete()
         items = []
         for new_item in new_items:
             item = Plotting(**new_item)
diff --git a/common/models/plots.py b/common/models/plots.py
index 28c90727..94d6258c 100644
--- a/common/models/plots.py
+++ b/common/models/plots.py
@@ -10,6 +10,7 @@ class Plot(db.Model):
     __tablename__ = "plots"
 
     hostname = sa.Column(sa.String(length=255), primary_key=True)
+    blockchain = sa.Column(sa.String(length=64), nullable=True)
     plot_id = sa.Column(sa.String(length=16), primary_key=True)
     type = sa.Column(sa.String(length=32), nullable=True)
     dir = sa.Column(sa.String(length=255), nullable=False)
diff --git a/common/models/plottings.py b/common/models/plottings.py
index 0a901dd2..82ff8d4c 100644
--- a/common/models/plottings.py
+++ b/common/models/plottings.py
@@ -3,6 +3,7 @@
 
 from sqlalchemy.sql import func
 from sqlalchemy.orm import relationship, backref
+from sqlalchemy.sql.elements import True_
 
 from common.extensions.database import db
 
@@ -12,6 +13,7 @@ class Plotting(db.Model):
     plot_id = sa.Column(sa.String(length=8), primary_key=True)
     hostname = sa.Column(sa.String(length=255), nullable=False)
     plotter = sa.Column(sa.String(length=64), nullable=True)
+    blockchain = sa.Column(sa.String(length=64), nullable=True)
     k = sa.Column(sa.Integer, nullable=False)
     tmp = sa.Column(sa.String(length=255), nullable=False)
     dst = sa.Column(sa.String(length=255), nullable=False)
diff --git a/web/__init__.py b/web/__init__.py
index 02a4f64d..4902d502 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -54,6 +54,15 @@ def datetimefilter(value, format="%Y-%m-%d %H:%M"):
 
 app.jinja_env.filters['datetimefilter'] = datetimefilter
 
+def timesecondstrimmer(value):
+    if value:
+        #app.logger.info("{0} => {1}".format(value, value.strftime(format)))
+        return value[:value.rindex(':')]
+    else:
+        return ""
+
+app.jinja_env.filters['timesecondstrimmer'] = timesecondstrimmer
+
 def plotnameshortener(value):
     #app.logger.info("Shorten: {0}".format(value))
     match = re.match("plot-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", value)
diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index e9c2847e..b2e0e63f 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -218,25 +218,28 @@ def save_config(plotter, config):
         else:
             flash("
    {0}
    ".format(response.content.decode('utf-8')), 'danger')
 
-def analyze(plot_file, plotters):
+def analyze(plot_file, hosts):
     # Don't know which plotter might have the plot result so try them in-turn
-    for plotter in plotters:
-        if plotter.latest_ping_result != "Responding":
-            app.logger.info("Skipping analyze call to {0} as last ping was: {1}".format( \
-                plotter.hostname, plotter.latest_ping_result))
-            continue
-        try:
-            app.logger.info("Trying {0} for analyze....".format(plotter.hostname))
-            payload = {"service":"plotting", "action":"analyze", "plot_file": plot_file }
-            response = utils.send_post(plotter, "/analysis/", payload, debug=False)
-            if response.status_code == 200:
-                return response.content.decode('utf-8')
-            elif response.status_code == 404:
-                app.logger.info("Plotter on {0} did not have plot log for {1}".format(plotter.hostname, plot_file))
-            else:
-                app.logger.info("Plotter on {0} returned an unexpected error: {1}".format(plotter.hostname, response.status_code))
-        except:
-            app.logger.info(traceback.format_exc())
+    for plotter in hosts.workers:
+        if plotter.mode == 'fullmode' or 'plotter' in plotter.mode:
+            if plotter.latest_ping_result != "Responding":
+                app.logger.info("Skipping analyze call to {0} as last ping was: {1}".format( \
+                    plotter.hostname, plotter.latest_ping_result))
+                continue
+            try:
+                app.logger.info("Trying {0}:{1} for analyze....".format(plotter.hostname, plotter.port))
+                payload = {"service":"plotting", "action":"analyze", "plot_file": plot_file }
+                response = utils.send_post(plotter, "/analysis/", payload, debug=False)
+                if response.status_code == 200:
+                    return response.content.decode('utf-8')
+                elif response.status_code == 404:
+                    app.logger.info("Plotter on {0}:{1} did not have plot log for {1}".format(
+                        plotter.hostname, plotter.port, plot_file))
+                else:
+                    app.logger.info("Plotter on {0}:{1} returned an unexpected error: {1}".format(
+                        plotter.hostname, plotter.port, response.status_code))
+            except:
+                app.logger.info(traceback.format_exc())
     return make_response("Sorry, not plotting job log found.  Perhaps plot was made elsewhere?", 200)
 
 def load_plotting_keys():
diff --git a/web/models/chia.py b/web/models/chia.py
index 626b6f88..8ddced3c 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -57,7 +57,7 @@ def status_if_responding(self, displayname, blockchain, connection_status, last_
 class FarmPlots:
 
      def __init__(self, plots):
-        self.columns = ['worker', 'plot_id',  'dir', 'plot', 'type', 'create_date', 'size' ]
+        self.columns = ['worker', 'fork', 'plot_id',  'dir', 'plot', 'type', 'create_date', 'size' ]
         self.rows = []
         displaynames = {}
         for plot in plots:
@@ -72,7 +72,8 @@ def __init__(self, plots):
                     displayname = plot.hostname
                 displaynames[plot.hostname] = displayname
             self.rows.append({ 
-                'hostname': plot.hostname, 
+                'hostname': plot.hostname,
+                'fork': plot.blockchain, 
                 'worker': displayname, 
                 'plot_id': plot.plot_id, 
                 'dir': plot.dir,  
@@ -223,15 +224,15 @@ def get_add_connection_example(self, blockchain):
         
     def blockchain_port(self,blockchain):
         if blockchain == 'chia':
-            return 8927
+            return 8444
         elif blockchain == 'flax':
-            return 8928
+            return 6668
         elif blockchain == 'nchain':
-            return 8929
+            return 9699
         elif blockchain == 'hddcoin':
-            return 8930
+            return 28444
         elif blockchain == 'chives':
-            return 8931
+            return 58445
         raise("Unknown blockchain fork of selected: " + blockchain)
 
     def parse(self, connection):
diff --git a/web/models/worker.py b/web/models/worker.py
index 652e0fdc..54f12964 100644
--- a/web/models/worker.py
+++ b/web/models/worker.py
@@ -13,6 +13,25 @@ def __init__(self, hostname, displayname):
         self.hostname = hostname 
         self.displayname = displayname
         self.workers = []
+    
+    def plotting_status(self):
+        status = "unknown"
+        for worker in self.workers:
+            if worker['plotting_status'] == 'running':
+                status = "running"
+            elif not status == 'running':
+                status = worker['plotting_status']
+        return status
+
+    def farming_status(self):
+        status = "unknown"
+        for worker in self.workers:
+            if worker['farming_status'] == 'farming':
+                status = "farming"
+            elif not status == 'farming':
+                status = worker['farming_status']
+        return status
+
 
 class WorkerSummary:
 
@@ -98,7 +117,10 @@ def plotters(self):
                     filtered.append(host)
                 host.workers.append({
                     'hostname': worker.hostname,
+                    'blockchain': worker.blockchain,
                     'displayname': worker.displayname,
+                    'connection_status': worker.connection_status(),
+                    'url': worker.url,
                     'plotting_status': worker.plotting_status(),
                     'archiving_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.archiving_status()),
                     'archiving_enabled': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.archiving_enabled()),
diff --git a/web/routes.py b/web/routes.py
index 702461dc..574a04a3 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -97,7 +97,7 @@ def plotting_workers():
 def farming_plots():
     if request.args.get('analyze'):  # Xhr with a plot filename
         plot_file = request.args.get('analyze')
-        plotters = worker.load_worker_summary().plotters
+        plotters = worker.load_worker_summary().plotters()
         return plotman.analyze(plot_file, plotters)
     elif request.args.get('check'):  # Xhr calling for check output
         w = worker.get_worker(request.args.get('hostname'))
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index fb8d819f..51d167ca 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -39,19 +39,20 @@ 
                     
    
                         
                         
    
 
 
+
+
+
+
 
-  
+  
 
 
 
-  
    
-    
-  
    
 
+  
    
+
+    
    
+      
+
+      
    {{random_message}}
    
+
+      
+    
    
+  
    
 
 
 
\ No newline at end of file
diff --git a/web/templates/plotting/jobs.html b/web/templates/plotting/jobs.html
index f6e37010..832e748b 100644
--- a/web/templates/plotting/jobs.html
+++ b/web/templates/plotting/jobs.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    
@@ -105,13 +105,13 @@ 
    For more, see the Machinaris > {2} 2>&1 &".format(blockchain, configfile, logfile), \
-                shell=True, universal_newlines=True, stdout=None, stderr=None, cwd="/{0}dog".format(blockchain))
+                shell=True, universal_newlines=True, stdout=None, stderr=None, cwd="/chiadog")
         except:
             app.logger.info('Failed to start monitoring!')
             app.logger.info(traceback.format_exc())
diff --git a/api/commands/plotman_cli.py b/api/commands/plotman_cli.py
index f723259f..a20b9e24 100644
--- a/api/commands/plotman_cli.py
+++ b/api/commands/plotman_cli.py
@@ -165,10 +165,10 @@ def stop_archiver():
     app.logger.info("Stopping Archiver run...")
     os.kill(get_archiver_pid(), signal.SIGTERM)
 
-def load_config():
+def load_config(blockchain):
     return open('/root/.chia/plotman/plotman.yaml','r').read()
 
-def save_config(config):
+def save_config(config, blockchain):
     # Validate the YAML first
     yaml.safe_load(config)
     # Save a copy of the old config file
diff --git a/api/models/chia.py b/api/models/chia.py
index a9f1d09b..b0c0b0f2 100644
--- a/api/models/chia.py
+++ b/api/models/chia.py
@@ -25,8 +25,12 @@ def __init__(self, cli_stdout=None, farm_plots=None):
                     self.calc_status(line.split(':')[1].strip())
                 elif "Total chia farmed" in line:
                     self.total_coins = line.split(':')[1].strip()
+                elif "Total chives farmed" in line:
+                    self.total_coins = line.split(':')[1].strip()
                 elif "Total flax farmed" in line:
                     self.total_coins = line.split(':')[1].strip()
+                elif "Total hddcoin farmed" in line:
+                    self.total_coins = line.split(':')[1].strip()
                 elif "Estimated network space" in line:
                     self.calc_netspace_size(line.split(':')[1].strip())
                 elif "Expected time to win" in line:
diff --git a/api/views/configs/resources.py b/api/views/configs/resources.py
index c3e1185c..c02f20f8 100644
--- a/api/views/configs/resources.py
+++ b/api/views/configs/resources.py
@@ -26,43 +26,23 @@ def get(self):
         response.mimetype = "application/json"
         return response
 
-
-@blp.route('/')
+@blp.route('//')
 class ConfigByType(MethodView):
 
-    def get(self, type):
-        if type == "plotting":
-            config = plotman_cli.load_config()
-        else: 
-            try:
-                blockchain = request.args.get('blockchain')
-            except:
-                abort(400, "Type of {0} request query parameter of blockchain=chia|flax.".format(type))
-            if type == "farming":
-                config = chia_cli.load_config(blockchain)
-            elif type == "alerts":
-                config = chiadog_cli.load_config(blockchain)
-            else:
-                abort(400, "Unknown config type provided: {0}".format(type))
+    def get(self, type, blockchain):
+        if type == "farming":
+            config = chia_cli.load_config(blockchain)
+        elif type == "alerts":
+            config = chiadog_cli.load_config(blockchain)
+        elif type == "plotting":
+            app.logger.info("Search for plotting config...")
+            config = plotman_cli.load_config(blockchain)
+        else:
+            abort(400, "Unknown config type provided: {0}".format(type))
         response = make_response(config, 200)
         response.mimetype = "application/x-yaml"
         return response
 
-    def put(self, type):
-        try:
-            if type == "plotting":
-                plotman_cli.save_config(self.clean_config(request.data))
-            elif type in ["farming", "alerts"]:
-                abort(400, "Farming and alerts config requires blockchain (chia or flax) in subpath.")
-            else:
-                abort(400, "Unknown config type provided: {0}".format(type))
-            response = make_response("Successfully saved config.", 200)
-            return response
-        except Exception as ex:
-            app.logger.info("Failed to save a validated Plotman config.")
-            app.logger.info(traceback.format_exc())
-            return str(ex), 400
-
     def clean_config(self, req_data):
         # First decode the bytes
         config = req_data.decode('utf-8')
@@ -72,15 +52,14 @@ def clean_config(self, req_data):
         config = config.replace('\\r\\n', '\r\n')
         return config
 
-@blp.route('//')
-class ConfigByType(MethodView):
-
     def put(self, type, blockchain):
         try:
             if type == "farming":
                 chia_cli.save_config(self.clean_config(request.data), blockchain)
             elif type == "alerts":
                 chiadog_cli.save_config(self.clean_config(request.data), blockchain)
+            elif type == "plotting":
+                plotman_cli.save_config(self.clean_config(request.data), blockchain)
             else:
                 abort(400, "Unknown config type provided: {0}".format(type))
             response = make_response("Successfully saved config.", 200)
diff --git a/common/models/workers.py b/common/models/workers.py
index 1e28496f..b2a76769 100644
--- a/common/models/workers.py
+++ b/common/models/workers.py
@@ -70,5 +70,5 @@ def connection_status(self):
         if self.ping_success_at and self.ping_success_at >= fifteen_mins_ago:
             return self.latest_ping_result
         elif self.latest_ping_result and self.latest_ping_result == 'Responding':
-            return "Unknown"
+            return "Offline" # Was responding but over 15 minutes ago
         return self.latest_ping_result
diff --git a/web/actions/chia.py b/web/actions/chia.py
index d9b56f2d..6baf9b5d 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -35,7 +35,8 @@
 
 def load_farm_summary():
     farms = db.session.query(f.Farm).order_by(f.Farm.hostname).all()
-    return FarmSummary(farms)
+    wallets = db.session.query(w.Wallet).order_by(w.Wallet.blockchain).all()
+    return FarmSummary(farms, wallets)
 
 def load_plots_farming(hostname=None):
     query = db.session.query(p.Plot).order_by(p.Plot.created_at.desc())
@@ -88,7 +89,7 @@ def load_farmers():
     return wk.load_worker_summary().farmers_harvesters()
 
 def load_config(farmer, blockchain):
-    return utils.send_get(farmer, "/configs/farming?blockchain=" + blockchain, debug=False).content
+    return utils.send_get(farmer, "/configs/farming/"+ blockchain, debug=False).content
 
 def save_config(farmer, blockchain, config):
     try: # Validate the YAML first
@@ -105,6 +106,7 @@ def save_config(farmer, blockchain, config):
     else:
         flash('Nice! Chia\'s config.yaml validated and saved successfully.', 'success')
 
+# TODO Must extract this over to API-side for remote connection add on other fork fullnodes
 def add_connection(connection, blockchain):
     binary = globals.get_chia_binary(blockchain)
     try:
diff --git a/web/actions/chiadog.py b/web/actions/chiadog.py
index 05c3f7df..bfea2835 100644
--- a/web/actions/chiadog.py
+++ b/web/actions/chiadog.py
@@ -22,21 +22,10 @@
 from . import worker as wk
 
 def load_config(farmer, blockchain):
-    return utils.send_get(farmer, "/configs/alerts?blockchain=" + blockchain, debug=False).content
+    return utils.send_get(farmer, "/configs/alerts/"+ blockchain, debug=False).content
 
 def load_farmers():
     return wk.load_worker_summary().farmers_harvesters()
-    worker_summary = wk.load_worker_summary()
-    farmers = []
-    for farmer in worker_summary.workers:
-        if (farmer in worker_summary.farmers) or (farmer in worker_summary.harvesters):
-            farmers.append({
-                'hostname': farmer.hostname,
-                'displayname': farmer.displayname,
-                'monitoring_status': farmer.monitoring_status().lower(),
-                'config': json.loads(farmer.config),
-            })
-    return farmers
 
 def save_config(farmer, blockchain, config):
     try: # Validate the YAML first
diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index a26a6072..b12b7429 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -166,7 +166,7 @@ def load_config_replacements():
         replacements.append([ 'pool_contract_address:\s+REPLACE_WITH_THE_REAL_VALUE.*$', 'pool_contract_address: '+ pool_contract_address])
     return replacements
 
-def load_config(plotter):
+def load_config(plotter, blockchain):
     replacements = []
     try:
         replacements = load_config_replacements()
@@ -174,7 +174,7 @@ def load_config(plotter):
         app.logger.info("Unable to load replacements on install with mode={0}".format(os.environ['mode']))
         app.logger.info(traceback.format_exc())
     lines = []
-    config = utils.send_get(plotter, "/configs/plotting", debug=False).content.decode('utf-8')
+    config = utils.send_get(plotter, "/configs/plotting/" + blockchain, debug=False).content.decode('utf-8')
     replaces = 0
     for line in config.splitlines():
         for replacement in replacements:
@@ -200,7 +200,7 @@ def inspect_config(hostname, config):
     else:
          app.logger.info("Saving config to {0}, found a malformed config without a 'plotting' section.")
 
-def save_config(plotter, config):
+def save_config(plotter, blockchain, config):
     try: # Validate the YAML first
         c = yaml.safe_load(config)
         inspect_config(plotter.hostname, c)
@@ -209,7 +209,7 @@ def save_config(plotter, config):
         flash('Updated plotman.yaml failed validation! Fix and save or refresh page.', 'danger')
         flash(str(ex), 'warning')
     try:
-        response = utils.send_put(plotter, "/configs/plotting", config, debug=False)
+        response = utils.send_put(plotter, "/configs/plotting/" + blockchain, config, debug=False)
     except Exception as ex:
         flash('Failed to save config to plotter.  Please check log files.', 'danger')
         flash(str(ex), 'warning')
@@ -219,10 +219,11 @@ def save_config(plotter, config):
         else:
             flash("
    {0}
    ".format(response.content.decode('utf-8')), 'danger')
 
-def analyze(plot_file, hosts):
+def analyze(plot_file, workers):
     # Don't know which plotter might have the plot result so try them in-turn
-    for plotter in hosts.workers:
-        if plotter.mode == 'fullmode' or 'plotter' in plotter.mode:
+    for plotter in workers:
+        #app.logger.info("{0}:{1} - {2} - {3}".format(plotter.hostname, plotter.port, plotter.blockchain, plotter.mode))
+        if plotter.mode == 'fullnode' or 'plotter' in plotter.mode:
             if plotter.latest_ping_result != "Responding":
                 app.logger.info("Skipping analyze call to {0} as last ping was: {1}".format( \
                     plotter.hostname, plotter.latest_ping_result))
@@ -234,10 +235,10 @@ def analyze(plot_file, hosts):
                 if response.status_code == 200:
                     return response.content.decode('utf-8')
                 elif response.status_code == 404:
-                    app.logger.info("Plotter on {0}:{1} did not have plot log for {1}".format(
+                    app.logger.info("Plotter on {0}:{1} did not have plot log for {2}".format(
                         plotter.hostname, plotter.port, plot_file))
                 else:
-                    app.logger.info("Plotter on {0}:{1} returned an unexpected error: {1}".format(
+                    app.logger.info("Plotter on {0}:{1} returned an unexpected error: {2}".format(
                         plotter.hostname, plotter.port, response.status_code))
             except:
                 app.logger.info(traceback.format_exc())
diff --git a/web/actions/stats.py b/web/actions/stats.py
index ffdb8ed7..45129370 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -126,18 +126,17 @@ def netspace_size_diff(since, blockchain):
     return result
 
 def load_daily_farming_summaries():
-    summary_by_worker = {}
+    summary_by_workers = {}
     since_date = datetime.datetime.now() - datetime.timedelta(hours=24)
     for host in chia.load_farmers():
-        summary_by_worker[host.displayname] = {}
+        summary_by_workers[host.displayname] = {}
         for wk in host.workers:
-            summary_by_worker[wk['blockchain']] = daily_summaries(since_date, wk['hostname'], wk['displayname'], wk['blockchain']), 
-    return summary_by_worker
+            summary_by_workers[host.displayname][wk['blockchain']] = daily_summaries(since_date, wk['hostname'], wk['displayname'], wk['blockchain']), 
+    return summary_by_workers
 
 def daily_summaries(since, hostname, displayname, blockchain):
     result = None
     try:
-        #app.logger.debug(since)
         result = db.session.query(Alert).filter(
                 or_(Alert.hostname==hostname,Alert.hostname==displayname), 
                 Alert.blockchain==blockchain,
@@ -145,8 +144,11 @@ def daily_summaries(since, hostname, displayname, blockchain):
                 Alert.priority == "LOW",
                 Alert.service == "DAILY"
             ).order_by(Alert.created_at.desc()).first()
+        #app.logger.info("Daily for {0}-{1} is {2}".format(displayname, blockchain, result))
+        if result:
+            return result.message
     except Exception as ex:
-        app.logger.debug("Failed to query for latest daily summary for {0} - {1} because {2}".format(
+        app.logger.info("Failed to query for latest daily summary for {0} - {1} because {2}".format(
             hostname, blockchain, str(ex)))
     return result
 
diff --git a/web/models/chia.py b/web/models/chia.py
index 8ddced3c..5c817fe5 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -1,4 +1,5 @@
 import json
+import locale
 import os
 import re
 import traceback
@@ -12,9 +13,18 @@
 # Treat *.plot files smaller than this as in-transit (copying) so don't count them
 MINIMUM_K32_PLOT_SIZE_BYTES = 100 * 1024 * 1024
 
+# Mapping of blockchains to currency symbols
+CURRENCY_SYMBOLS = {
+    "chia": "XCH",
+    "chives": "XCC",
+    "flax": "XFX",
+    "hddcoin": "HDD",
+    "nchain": "NCH",
+}
+
 class FarmSummary:
 
-    def __init__(self, farm_recs):
+    def __init__(self, farm_recs, wallet_recs):
         self.farms = {}
         for farm_rec in farm_recs: 
             if farm_rec.mode == "fullnode":
@@ -28,6 +38,10 @@ def __init__(self, farm_recs):
                     app.logger.info("Unable to find a worker with hostname '{0}' and blockchain '{1}'".format(farm_rec.hostname, farm_rec.blockchain))
                     displayname = farm_rec.hostname
                     connection_status = None
+                try:
+                    wallet_balance = self.sum_wallet_balance(wallet_recs, farm_rec.hostname, farm_rec.blockchain)
+                except: 
+                    wallet_balance = '?'
                 farm = {
                     "plot_count": int(farm_rec.plot_count),
                     "plots_size": farm_rec.plots_size,
@@ -35,6 +49,8 @@ def __init__(self, farm_recs):
                     "status": farm_rec.status,
                     "display_status": self.status_if_responding(displayname, farm_rec.blockchain, connection_status, farm_rec.status),
                     "total_coins": '0.0' if not farm_rec.total_coins else round(farm_rec.total_coins, 6),
+                    "wallet_balance": wallet_balance,
+                    "currency_symbol": CURRENCY_SYMBOLS[farm_rec.blockchain],
                     "netspace_display_size": '?' if not farm_rec.netspace_size else converters.gib_to_fmt(farm_rec.netspace_size),
                     "netspace_size": farm_rec.netspace_size,
                     "expected_time_to_win": farm_rec.expected_time_to_win,
@@ -52,7 +68,27 @@ def status_if_responding(self, displayname, blockchain, connection_status, last_
         if connection_status == 'Responding':
             return "Active" if last_status == "Farming" else last_status
         app.logger.info("Oops! {0} ({1}) had connection_success: {2}".format(displayname, blockchain, connection_status))
-        return "Unknown"
+        return "Offline"
+    
+    def sum_wallet_balance(self, wallet_recs, hostname, blockchain):
+        numeric_const_pattern = '-Total\sBalance:\s+((?: (?: \d* \. \d+ ) | (?: \d+ \.? ) )(?: [Ee] [+-]? \d+ )?)'
+        rx = re.compile(numeric_const_pattern, re.VERBOSE)
+        found_balance = False
+        sum = 0.0
+        for wallet_rec in wallet_recs:
+            if wallet_rec.hostname == hostname and wallet_rec.blockchain == blockchain:
+                try:
+                    for balance in rx.findall(wallet_rec.details):
+                        #app.logger.info("Found balance of {0} for for {1} - {2}".format(balance, 
+                        # wallet_rec.hostname, wallet_rec.blockchain))
+                        sum += locale.atof(balance)
+                        found_balance = True
+                except Exception as ex:
+                    app.logger.info("Failed to find current wallet balance number for {0} - {1}: {2}".format(
+                        wallet_rec.hostname, wallet_rec.blockchain, str(ex)))
+        if found_balance:
+            return round(sum, 6)
+        return '?'
 
 class FarmPlots:
 
diff --git a/web/models/worker.py b/web/models/worker.py
index 54f12964..934b57ee 100644
--- a/web/models/worker.py
+++ b/web/models/worker.py
@@ -83,7 +83,7 @@ def status_if_responding(self, displayname, blockchain, connection_status, last_
         if connection_status == "Responding":
             return last_status
         app.logger.info("Oops! {0} ({1}) last connection status: {2}".format(displayname, blockchain, connection_status))
-        return "Unknown"
+        return "Offline"
 
     def fullnodes(self):
         filtered = []
@@ -121,6 +121,7 @@ def plotters(self):
                     'displayname': worker.displayname,
                     'connection_status': worker.connection_status(),
                     'url': worker.url,
+                    'port': worker.port,
                     'plotting_status': worker.plotting_status(),
                     'archiving_status': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.archiving_status()),
                     'archiving_enabled': self.status_if_responding(worker.displayname, worker.blockchain, worker.connection_status(), worker.archiving_enabled()),
diff --git a/web/routes.py b/web/routes.py
index bf6bfbc5..8ebb7c81 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -99,9 +99,9 @@ def plotting_workers():
 def farming_plots():
     if request.args.get('analyze'):  # Xhr with a plot filename
         plot_file = request.args.get('analyze')
-        plotters = worker.load_worker_summary().plotters()
-        return plotman.analyze(plot_file, plotters)
+        return plotman.analyze(plot_file, worker.load_worker_summary().workers)
     elif request.args.get('check'):  # Xhr calling for check output
+        # TODO Replace this with regular background plots check instead
         w = worker.get_worker(request.args.get('hostname'))
         first_load = request.args.get("first_load")
         return chia.check_plots(w, first_load)
@@ -216,13 +216,15 @@ def find_selected_worker(workers_summary, hostname, blockchain='chia'):
 @app.route('/settings/plotting', methods=['GET', 'POST'])
 def settings_plotting():
     selected_worker_hostname = None
+    blockchains = globals.enabled_blockchains()
+    selected_blockchain = blockchains[0]
     gc = globals.load()
     if request.method == 'POST':
         selected_worker_hostname = request.form.get('worker')
-        plotman.save_config(worker.get_worker(selected_worker_hostname), request.form.get("config"))
+        plotman.save_config(worker.get_worker(selected_worker_hostname, selected_blockchain), request.form.get("config"))
     workers_summary = worker.load_worker_summary()
     selected_worker = find_selected_worker(workers_summary, selected_worker_hostname)
-    return render_template('settings/plotting.html',
+    return render_template('settings/plotting.html', blockchains=blockchains, selected_blockchain=selected_blockchain,
         workers=workers_summary.plotters, selected_worker=selected_worker, global_config=gc)
 
 @app.route('/settings/farming', methods=['GET', 'POST'])
@@ -272,15 +274,13 @@ def settings_pools():
 @app.route('/settings/config/')
 def views_settings_config(path):
     config_type = request.args.get('type')
+    w = worker.get_worker(request.args.get('worker'), request.args.get('blockchain'))
     if config_type == "alerts":
-        w = worker.get_worker(request.args.get('worker'), request.args.get('blockchain'))
         response = make_response(chiadog.load_config(w, request.args.get('blockchain')), 200)
     elif config_type == "farming":
-        w = worker.get_worker(request.args.get('worker'), request.args.get('blockchain'))
         response = make_response(chia.load_config(w, request.args.get('blockchain')), 200)
     elif config_type == "plotting":
-        w = worker.get_worker(request.args.get('worker'))
-        [replaced, config] = plotman.load_config(w)
+        [replaced, config] = plotman.load_config(w, request.args.get('blockchain'))
         response = make_response(config, 200)
         response.headers.set('ConfigReplacementsOccurred', replaced)
     else:
diff --git a/web/static/landings.txt b/web/static/landings.txt
index e9803232..af2e7053 100644
--- a/web/static/landings.txt
+++ b/web/static/landings.txt
@@ -8,4 +8,8 @@ First rule of forks... you don't talk about forks on /r/chia.
 Farm the dip!
 Departing for El Salvador now...
 You can fit so many smart contracts in this bad boy.
-"Expected time to win"? Really?
\ No newline at end of file
+"Expected time to win"? Really?
+Psst! You got any more of that disk space?
+Hi-ho! Hi-ho! A schucking we will go.
+I'll make my own Chia... with blackjack and hookers!
+Keep calm and plot on.
\ No newline at end of file
diff --git a/web/templates/base.html b/web/templates/base.html
index 8591340b..c6d4c468 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -48,7 +48,7 @@
                         {% if global_config.farming_enabled %}
                         
  • 
                             
-                                 Wallet
+                                 Wallets
                         
    • 
                         {% endif %}
                         {% if global_config.farming_enabled %}
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index 51d167ca..8cab9916 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -150,8 +150,8 @@ 
    
         $(document).ready(function () {
             $('#data').DataTable({
                 "pageLength": 25,
-                "order": [[5, "desc"]],
-                "columnDefs": [{ "orderable": false, targets: [7] }],
+                "order": [[6, "desc"]],
+                "columnDefs": [{ "orderable": false, targets: [8] }],
             });
         });
     
diff --git a/web/templates/farming/workers.html b/web/templates/farming/workers.html
index 2d4480b5..79e34dfb 100644
--- a/web/templates/farming/workers.html
+++ b/web/templates/farming/workers.html
@@ -50,23 +50,38 @@ 
    {{ farmer.displayname }}
    
             
    
-                {% if farmer.hostname in daily_summaries %}
-                
    
-                    
-                    
    
-                        {% for blockchain, summary in daily_summaries[farmer.hostname].items() %}
-                        
    
-                            
    {{summary.message }}
    
+                {% if farmer.displayname in daily_summaries %}
+                
                 {% endif %}
             
    
diff --git a/web/templates/index.html b/web/templates/index.html
index 28ddcd66..5ad89957 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -37,19 +37,21 @@ 
    {{ blockchain|capitalize }} - Expected Time to Win:
 
         
    
           
    
-            
    
-              
    {{farms[blockchain].total_coins }}
    
-              
    {{ blockchain|capitalize }} Farmed
    
+            
    
+              
    Plotting:
+                
+                  {{ plotting.display_status }}
+                
+              
    
             
    
           
    
           
    
-            
    
-              
    {{farms[blockchain].netspace_display_size }}
-              
    
-              
    {{ blockchain|capitalize }} Netspace
    
+            
    
+              
    Farming:
+                
+                  {{ farms[blockchain].display_status }}
+                
+              
    
             
    
           
    
         
    
@@ -72,22 +74,27 @@ 
    Total Plots Size
    
         
    
 
         
    
-          
    
-            
    
-              
    Plotting:
-                
-                  {{ plotting.display_status }}
-                
-              
    
+          
    
+            
    
+              
    {{farms[blockchain].wallet_balance }}
    
+              
    {{ farms[blockchain].currency_symbol }} Balance
    
             
    
           
    
-          
    
-            
    
-              
    Farming:
-                
-                  {{ farms[blockchain].display_status }}
-                
-              
    
+          
    
+            
    
+              
    {{farms[blockchain].total_coins }}
    
+              
    {{ farms[blockchain].currency_symbol }} Farmed
    
+            
    
+          
    
+          
    
+            
    
+              
    {{farms[blockchain].netspace_display_size }}
+              
    
+              
    {{ blockchain|capitalize }} Netspace
    
             
    
           
    
         
    
diff --git a/web/templates/settings/plotting.html b/web/templates/settings/plotting.html
index f18f4347..728e702e 100644
--- a/web/templates/settings/plotting.html
+++ b/web/templates/settings/plotting.html
@@ -45,6 +45,11 @@
                         {% endfor %}
                     
                 
    
+                
+                
    
+                    
+                
    
             
    
             
    
                 
+            
    
+            
+            
+        
+    
+
+    {% endblock %}
+
+    {% block scripts %}
+    
+    {% endblock %}
\ No newline at end of file

From 90cbe8476e6d802277b2b4bd681739005e02724c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 19 Jan 2022 11:08:33 -0700
Subject: [PATCH 0535/1625] MMX test4 network

---
 scripts/forks/mmx_install.sh |  2 +-
 scripts/forks/mmx_launch.sh  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 90bf3602..44b76ce0 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -12,7 +12,7 @@ if [ -z ${MMX_BRANCH} ]; then
 else
 	rm -rf /root/.cache
 	apt-get update
-	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
+	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen librocksdb-dev
 	git clone --branch ${MMX_BRANCH} --single-branch https://github.com/madMAx43v3r/mmx-node.git /mmx-node
 	cd /mmx-node
 	git submodule update --init --recursive 
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index dd0e4d83..9598b0e0 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -30,19 +30,19 @@ ln -s /root/.chia/mmx/config /mmx-node/config
 escaped_plot_dirs=$(printf '%s\n' "$plot_dirs" | sed -e 's/[\/&]/\\&/g')
 sed -i "s/\"plot_dirs\":.*$/\"plot_dirs\": [ $escaped_plot_dirs ]/g" ./config/local/Harvester.json
 
-# Symlink the NETWORK file, use 'test3' for now
-if [ ! -f /root/.chia/mmx/NETWORK ]; then
-	echo 'test3' > /root/.chia/mmx/NETWORK
-fi
+# Symlink the NETWORK file, use 'test4' for now
+#if [ ! -f /root/.chia/mmx/NETWORK ]; then
+echo 'test4' > /root/.chia/mmx/NETWORK
+#fi
 rm -f ./NETWORK
 ln -s /root/.chia/mmx/NETWORK /mmx-node/NETWORK
 
-# Symlink the testnet3 folder
-if [ ! -d /root/.chia/mmx/testnet3 ]; then
-	mkdir /root/.chia/mmx/testnet3
+# Symlink the testnet4 folder
+if [ ! -d /root/.chia/mmx/testnet4 ]; then
+	mkdir /root/.chia/mmx/testnet4
 fi
-rm -rf ./testnet3
-ln -s /root/.chia/mmx/testnet3 /mmx-node/testnet3
+rm -rf ./testnet4
+ln -s /root/.chia/mmx/testnet4 /mmx-node/testnet4
 
 # Create a key if none found from previous runs
 if [[ ${mode} == 'fullnode' ]]; then

From 917d82b4ff1c82b0c16b6d88c7a7ca041492b9a7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 19 Jan 2022 14:03:47 -0700
Subject: [PATCH 0536/1625] Fixes for MMX changes.

---
 api/commands/mmx_cli.py |  2 +-
 web/models/chia.py      | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/commands/mmx_cli.py b/api/commands/mmx_cli.py
index 02a55918..36865d0a 100644
--- a/api/commands/mmx_cli.py
+++ b/api/commands/mmx_cli.py
@@ -79,7 +79,7 @@ def save_config(config, blockchain):
 
 def load_wallet_show(blockchain):
     mmx_binary = globals.get_blockchain_binary(blockchain)
-    proc = Popen("{0} wallet show".format(mmx_binary), stdout=PIPE, stderr=PIPE, shell=True)
+    proc = Popen("({0} node info | grep Synced) && {0} wallet show".format(mmx_binary), stdout=PIPE, stderr=PIPE, shell=True)
     try:
         outs, errs = proc.communicate(timeout=90)
     except TimeoutExpired:
diff --git a/web/models/chia.py b/web/models/chia.py
index b8394d0d..bf2ac955 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -270,13 +270,18 @@ def extract_status(self, blockchain, details, worker_status):
             if not details:
                 return None
             if blockchain == 'mmx':
-                return "-"
+                pattern = '^Synced: (.*)$'
             else:
                 pattern = '^Sync status: (.*)$'
             for line in details.split('\n'):
                 m = re.match(pattern, line)
-                if m: 
-                    return m.group(1).strip()
+                if m:
+                    status = m.group(1).strip()
+                    if 'Yes' == status: # MMX
+                        return "Synced"
+                    if 'No' == status: # MMX
+                        return "Syncing" 
+                    return status
         return "Offline"
 
 class Keys:

From 3581d357e13a8803a798279e6268e98e37ca1771 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 19 Jan 2022 20:38:55 -0700
Subject: [PATCH 0537/1625] Exclude MMX from Chiadog pages.

---
 web/actions/chiadog.py |  2 +-
 web/models/chia.py     | 10 ++++++++--
 web/models/worker.py   |  4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/actions/chiadog.py b/web/actions/chiadog.py
index d4c30828..8f2015c6 100644
--- a/web/actions/chiadog.py
+++ b/web/actions/chiadog.py
@@ -25,7 +25,7 @@ def load_config(farmer, blockchain):
     return utils.send_get(farmer, "/configs/alerts/"+ blockchain, debug=False).content
 
 def load_farmers():
-    return wk.load_worker_summary().farmers_harvesters()
+    return wk.load_worker_summary().farmers_harvesters(exclude_blockchains=['mmx'])
 
 def save_config(farmer, blockchain, config):
     try: # Validate the YAML first
diff --git a/web/models/chia.py b/web/models/chia.py
index bf2ac955..8838582a 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -263,7 +263,7 @@ def sum_mmx_wallet_balance(self, hostname, blockchain, include_cold_balance=True
                     sum += locale.atof(wallet.cold_balance)
         if found_balance:
             return converters.round_balance(sum)
-        return '?'
+        return '0' # Initially MMX reports nothing at all for a balance.  This implies zero.
 
     def extract_status(self, blockchain, details, worker_status):
         if worker_status == 'Responding':
@@ -337,7 +337,7 @@ def extract_status(self, blockchain, details, worker_status):
             if not details:
                 return None
             if blockchain == 'mmx':
-                pattern = '^(Synced: .*)$'
+                pattern = '^Synced: (.*)$'
             else:
                 pattern = '^Current Blockchain Status: (.*)$'
             for line in details.split('\n'):
@@ -348,6 +348,12 @@ def extract_status(self, blockchain, details, worker_status):
                         return "Synced"
                     if 'Syncing' in status:
                         return "Syncing"
+                    if 'Not Synced' in status:
+                        return 'Not Synced'
+                    if 'Yes' == status: # MMX
+                        return "Synced"
+                    if 'No' == status: # MMX
+                        return "Syncing" 
                     return status
         return "Offline"
 
diff --git a/web/models/worker.py b/web/models/worker.py
index 32604443..43c71dd2 100644
--- a/web/models/worker.py
+++ b/web/models/worker.py
@@ -203,10 +203,12 @@ def harvesters(self):
         filtered.sort(key=lambda w: w.displayname)
         return filtered
 
-    def farmers_harvesters(self):
+    def farmers_harvesters(self, exclude_blockchains=None):
         filtered = []
         for worker in self.workers:
             if worker.mode == "fullnode" or "farmer" in worker.mode or "harvester" in worker.mode:
+                if exclude_blockchains and worker.blockchain in exclude_blockchains:
+                    continue
                 host = None
                 for h in filtered:
                     if h.displayname == worker.displayname:

From a3412e4098d13adb4d7582e38b017d52d206caff Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 20 Jan 2022 07:43:06 -0700
Subject: [PATCH 0538/1625] More logging for NFT reward recovery.

---
 api/schedules/nft_recover.py | 3 +++
 web/templates/base.html      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/schedules/nft_recover.py b/api/schedules/nft_recover.py
index 5d399fb8..f2c1ae2f 100644
--- a/api/schedules/nft_recover.py
+++ b/api/schedules/nft_recover.py
@@ -29,6 +29,9 @@ def execute():
         if not wallet_id: 
             app.logger.info("Found no wallet id, so skipping NFT 7/8 reward recovery.")
             return
+        if len(plotnfts) == 0:
+            app.logger.info("Found no Chia PlotNFTs at all, so skipping NFT 7/8 reward recovery.")
+            return
         for plotnft in plotnfts:
             if not plotnft.launcher: 
                 app.logger.info("Found no launcher id, so skipping NFT 7/8 reward recovery on plotnft: {0}".format(plotnft))
diff --git a/web/templates/base.html b/web/templates/base.html
index f7e61ef5..0e6e9e9e 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -28,7 +28,7 @@
                         id="menu">
                         
  • 
                             
-                                 Summary
+                                 Summary
                             
                         
    • 
                         {% if global_config.plotting_enabled %}

From a1ad3ad60bd7443ed81d30a6dc09abee6d8b3164 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 20 Jan 2022 10:44:44 -0700
Subject: [PATCH 0539/1625] Cache last good cold wallet balance response from
 alltheblocks.net to avoid reporting zero.

---
 api/commands/websvcs.py | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 5bbc0f26..56fd6488 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -11,6 +11,7 @@
 from api import app
 
 COLD_WALLET_ADDRESSES_FILE = '/root/.chia/machinaris/config/cold_wallet_addresses.json'
+COLD_WALLET_CACHE_FILE = '/root/.chia/machinaris/config/cold_wallet_cache.json'
 
 MOJO_PER_COIN = {
     'btcgreen': 1000000000000,
@@ -40,15 +41,35 @@ def load_cold_wallet_addresses():
             return data
     return data
 
+def load_cold_wallet_cache():
+    data = {}
+    if os.path.exists(COLD_WALLET_CACHE_FILE):
+        try:
+            with open(COLD_WALLET_CACHE_FILE) as f:
+                data = json.load(f)
+        except Exception as ex:
+            msg = "Unable to read cache from {0} because {1}".format(COLD_WALLET_CACHE_FILE, str(ex))
+            app.logger.error(msg)
+            return data
+    return data
+
+def save_cold_wallet_cache(cold_wallet_cache):
+    try:
+        with open(COLD_WALLET_CACHE_FILE, 'w') as f:
+            json.dump(cold_wallet_cache, f)
+    except Exception as ex:
+        app.logger.error("Failed to store cold wallet cache in {0} because {1}".format(COLD_WALLET_CACHE_FILE, str(ex)))
+
 def get_alltheblocks_name(blockchain):
     if blockchain == 'staicoin':
         return 'stai' # Special case for staicoin's inconsistent naming convention
     return blockchain
 
 def cold_wallet_balance(blockchain, debug=False):
-    balance = 0.0
+    total_balance = 0.0
     alltheblocks_blockchain = get_alltheblocks_name(blockchain)
     addresses_per_blockchain = load_cold_wallet_addresses()
+    cold_wallet_cache = load_cold_wallet_cache()
     if blockchain in addresses_per_blockchain:
         if debug:
             http.client.HTTPConnection.debuglevel = 1
@@ -56,10 +77,16 @@ def cold_wallet_balance(blockchain, debug=False):
             url = f"https://api.alltheblocks.net/{alltheblocks_blockchain}/address/{address}"
             try:
                 response = json.loads(requests.get(url).content)
-                balance += response['balance'] / MOJO_PER_COIN[blockchain] 
+                balance = response['balance'] / MOJO_PER_COIN[blockchain]
+                cold_wallet_cache[address] = balance  # Save last good response from websvc
+                total_balance += balance
             except Exception as ex:
                 app.logger.info("Failed to query {0} due to {1}".format(url, str(ex)))
+                if address in cold_wallet_cache:
+                    app.logger.info("Using previous cold wallet balance of {0} WHICH MAY BE STALE!")
+                    total_balance += float(cold_wallet_cache[address])
         http.client.HTTPConnection.debuglevel = 0
-        return balance
+        save_cold_wallet_cache(cold_wallet_cache)
+        return total_balance
     else:
         return '' # No cold wallet addresses to check

From d73f682a6012e8acd5f450e8cbfc23a6dfd68d5d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 20 Jan 2022 10:49:56 -0700
Subject: [PATCH 0540/1625] Fix typo in log message.

---
 api/commands/websvcs.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 56fd6488..09099eb4 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -83,8 +83,9 @@ def cold_wallet_balance(blockchain, debug=False):
             except Exception as ex:
                 app.logger.info("Failed to query {0} due to {1}".format(url, str(ex)))
                 if address in cold_wallet_cache:
-                    app.logger.info("Using previous cold wallet balance of {0} WHICH MAY BE STALE!")
-                    total_balance += float(cold_wallet_cache[address])
+                    cached_cold_balance = float(cold_wallet_cache[address])
+                    app.logger.info("Using previous cold wallet balance of {0} WHICH MAY BE STALE!".format(cached_cold_balance))
+                    total_balance += cached_cold_balance
         http.client.HTTPConnection.debuglevel = 0
         save_cold_wallet_cache(cold_wallet_cache)
         return total_balance

From 8dc484927969d4e548dca006f6110f90d791ec35 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 20 Jan 2022 16:57:45 -0700
Subject: [PATCH 0541/1625] Further summary page improvements.

---
 CHANGELOG.md               |   2 +-
 CREDITS.md                 |   2 +-
 api/commands/websvcs.py    | 113 ++++++++++++++++++++++++++++++-------
 api/gunicorn.conf.py       |   5 +-
 common/utils/converters.py |  16 ++++++
 docker/requirements.txt    |   3 +-
 web/actions/stats.py       |  12 ++++
 web/models/chia.py         |   3 +
 web/templates/summary.html |  20 ++++---
 web/templates/wallet.html  |   2 +
 10 files changed, 146 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adc8710a..91d6ef86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain.  Requires its own plot files for `testnet3`.
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases) - update to version 1.2.11
- - Blockchains page - New summary table for blockchain status at a glance.
+ - Improved summary display for status.  Estimated price in USD provided by alltheblocks.net
  - Various fixes for issues reported in the Discord.  Thanks all!
 
 ## [0.6.8] - 2022-01-04
diff --git a/CREDITS.md b/CREDITS.md
index cf25ae10..dafa1353 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -38,7 +38,7 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 
 ## Other Resources
 * [Blockchain DB Downloads](https://chiaforksblockchain.com/) - from Maize
-* [All the Blocks](https://alltheblocks.net/) - blockchain & wallet info
+* [All the Blocks](https://alltheblocks.net/) - blockchain, wallet, and pricing info
 
 ## Testers and Developers
 
diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 09099eb4..ac5cc2e2 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -2,6 +2,8 @@
 # Access to public web APIs
 #
 
+import bs4
+import datetime
 import http
 import json
 import os
@@ -10,8 +12,10 @@
 
 from api import app
 
+ALLTHEBLOCKS_REQUEST_INTERVAL_MINS = 15
 COLD_WALLET_ADDRESSES_FILE = '/root/.chia/machinaris/config/cold_wallet_addresses.json'
-COLD_WALLET_CACHE_FILE = '/root/.chia/machinaris/config/cold_wallet_cache.json'
+COLD_WALLET_CACHE_FILE = '/root/.chia/machinaris/dbs/cold_wallet_cache.json'
+BLOCKCHAIN_PRICES_CACHE_FILE = '/root/.chia/machinaris/dbs/blockchain_prices_cache.json'
 
 MOJO_PER_COIN = {
     'btcgreen': 1000000000000,
@@ -48,7 +52,7 @@ def load_cold_wallet_cache():
             with open(COLD_WALLET_CACHE_FILE) as f:
                 data = json.load(f)
         except Exception as ex:
-            msg = "Unable to read cache from {0} because {1}".format(COLD_WALLET_CACHE_FILE, str(ex))
+            msg = "Unable to read cold wallet cache from {0} because {1}".format(COLD_WALLET_CACHE_FILE, str(ex))
             app.logger.error(msg)
             return data
     return data
@@ -65,29 +69,98 @@ def get_alltheblocks_name(blockchain):
         return 'stai' # Special case for staicoin's inconsistent naming convention
     return blockchain
 
-def cold_wallet_balance(blockchain, debug=False):
+def request_cold_wallet_balance(blockchain, cold_wallet_cache, alltheblocks_blockchain, address, debug=False):
+    app.logger.info("Requesting {0} wallet balance for {1}".format(alltheblocks_blockchain, address))
+    url = f"https://api.alltheblocks.net/{alltheblocks_blockchain}/address/{address}"
+    try:
+        if debug:
+            http.client.HTTPConnection.debuglevel = 1
+        response = json.loads(requests.get(url).content)
+        balance = response['balance'] / MOJO_PER_COIN[blockchain]
+        cold_wallet_cache[address] = balance  # Save last good response from websvc
+        app.logger.info("Received cold wallet balance of {0}".format(balance))
+        http.client.HTTPConnection.debuglevel = 0
+        return balance
+    except Exception as ex:
+        app.logger.info("Failed to query {0} due to {1}".format(url, str(ex)))
+        return None
+
+last_cold_wallet_request_time = None
+def cold_wallet_balance(blockchain):
+    global last_cold_wallet_request_time
     total_balance = 0.0
     alltheblocks_blockchain = get_alltheblocks_name(blockchain)
     addresses_per_blockchain = load_cold_wallet_addresses()
     cold_wallet_cache = load_cold_wallet_cache()
     if blockchain in addresses_per_blockchain:
-        if debug:
-            http.client.HTTPConnection.debuglevel = 1
-        for address in addresses_per_blockchain[blockchain]:
-            url = f"https://api.alltheblocks.net/{alltheblocks_blockchain}/address/{address}"
-            try:
-                response = json.loads(requests.get(url).content)
-                balance = response['balance'] / MOJO_PER_COIN[blockchain]
-                cold_wallet_cache[address] = balance  # Save last good response from websvc
-                total_balance += balance
-            except Exception as ex:
-                app.logger.info("Failed to query {0} due to {1}".format(url, str(ex)))
+        if not last_cold_wallet_request_time or last_cold_wallet_request_time <= \
+                (datetime.datetime.now() - datetime.timedelta(minutes=ALLTHEBLOCKS_REQUEST_INTERVAL_MINS)):
+            for address in addresses_per_blockchain[blockchain]:
+                total_balance += request_cold_wallet_balance(blockchain, cold_wallet_cache, alltheblocks_blockchain, address)
+            save_cold_wallet_cache(cold_wallet_cache)
+            last_cold_wallet_request_time = datetime.datetime.now()
+            return total_balance
+        else:
+            for address in addresses_per_blockchain[blockchain]:
                 if address in cold_wallet_cache:
                     cached_cold_balance = float(cold_wallet_cache[address])
-                    app.logger.info("Using previous cold wallet balance of {0} WHICH MAY BE STALE!".format(cached_cold_balance))
+                    #app.logger.info("Using previous cold wallet balance of {0} which may be stale.".format(cached_cold_balance))
                     total_balance += cached_cold_balance
-        http.client.HTTPConnection.debuglevel = 0
-        save_cold_wallet_cache(cold_wallet_cache)
-        return total_balance
-    else:
-        return '' # No cold wallet addresses to check
+            return total_balance
+    return '' # No cold wallet addresses to check
+
+def load_prices_cache():
+    data = {}
+    if os.path.exists(BLOCKCHAIN_PRICES_CACHE_FILE):
+        try:
+            with open(BLOCKCHAIN_PRICES_CACHE_FILE) as f:
+                data = json.load(f)
+        except Exception as ex:
+            msg = "Unable to read price cache from {0} because {1}".format(BLOCKCHAIN_PRICES_CACHE_FILE, str(ex))
+            app.logger.error(msg)
+            return data
+    return data
+
+def save_prices_cache(data):
+    try:
+        with open(BLOCKCHAIN_PRICES_CACHE_FILE, 'w') as f:
+            json.dump(data, f)
+    except Exception as ex:
+        app.logger.error("Failed to store prices cache in {0} because {1}".format(BLOCKCHAIN_PRICES_CACHE_FILE, str(ex)))
+
+def request_prices(prices, debug=False):
+    url = "https://alltheblocks.net"
+    app.logger.info("Requesting recent pricing for blockchains from {0}".format(url))
+    if debug:
+        http.client.HTTPConnection.debuglevel = 1
+    data = requests.get(url).text
+    http.client.HTTPConnection.debuglevel = 0
+    soup = bs4.BeautifulSoup(data, 'html.parser')
+    table = soup.find('table', class_="table b-table table-sm")
+    for row in table.tbody.find_all('tr'):
+        if 'data-pk' in row.attrs:
+            blockchain = row['data-pk'].replace('stai', 'staicoin')
+            price_column = row.find('td', class_='text-right')
+            if len(price_column.contents) == 1:
+                price_value = price_column.contents[0].string.strip()
+                if price_value.startswith('$'):
+                    app.logger.info("{0} @ {1}".format(blockchain, price_value[1:].strip()))
+                    try:
+                        prices[blockchain] = float(price_value[1:].strip())
+                    except Exception as ex:
+                        app.logger.info("Failed to parse a decimal number from {0}".format(price_value[1:].strip()))
+                else:
+                    #app.logger.info("No price found for blockchain: {0}".format(blockchain))
+                    pass
+    return prices
+
+last_price_request_time = None
+def get_prices():
+    global last_price_request_time
+    prices = load_prices_cache()
+    if not last_price_request_time or last_price_request_time <= \
+            (datetime.datetime.now() - datetime.timedelta(minutes=ALLTHEBLOCKS_REQUEST_INTERVAL_MINS)):
+            request_prices(prices)
+            last_price_request_time = datetime.datetime.now()
+    save_prices_cache(prices)
+    return prices
\ No newline at end of file
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 1aa34cbd..2fcaf7ef 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -14,6 +14,8 @@ def on_starting(server):
     from api.schedules import stats_disk, stats_farm, nft_recover, plots_check, log_rotate, db_backup, restart_stuck_farmer
     from common.config import globals
 
+    from api.commands import websvcs
+
     scheduler = BackgroundScheduler()
 
     schedule_every_x_minutes = "?"
@@ -63,10 +65,11 @@ def on_starting(server):
     if utils.is_controller():
         scheduler.add_job(func=plots_check.execute, name="plot_checks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=status_controller.update, name="controller", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
+        scheduler.add_job(func=websvcs.get_prices, name="get_prices", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', hours=12)
 
     # Testing only
-    #scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=websvcs.test_chia_cold, name="test_chia_cold", trigger='interval', seconds=10) # Test immediately
 
     app.logger.debug("Starting background scheduler...")
     scheduler.start()
diff --git a/common/utils/converters.py b/common/utils/converters.py
index ad1a8693..00d00ab7 100644
--- a/common/utils/converters.py
+++ b/common/utils/converters.py
@@ -2,12 +2,16 @@
 # Common utility methods
 #
 
+import json
 import math
+import os
 import re
 import traceback
 
 #from flask_babel import format_number
 
+BLOCKCHAIN_PRICES_CACHE_FILE = '/root/.chia/machinaris/dbs/blockchain_prices_cache.json'
+
 def sizeof_fmt(num, suffix='B'):
     for unit in ['','Ki','Mi','Gi','Ti','Pi','Ei','Zi']:
         if abs(num) < 1024.0:
@@ -67,6 +71,18 @@ def round_balance(value):
     return str(round(value, 4))
     #return format_number(value)
 
+def to_usd(blockchain, coins):
+    if os.path.exists(BLOCKCHAIN_PRICES_CACHE_FILE):
+        try:
+            with open(BLOCKCHAIN_PRICES_CACHE_FILE) as f:
+                data = json.load(f)
+                if blockchain in data:
+                    return "${:,.2f}".format(float(data[blockchain]) * float(coins))
+                return ''
+        except Exception as ex:
+            print("Unable to convert  to $USD because {0}".format(str(ex)))
+    return ''
+
 ##################################################################################################
 #
 # Chia™-blockchain - Apache Software License code below.
diff --git a/docker/requirements.txt b/docker/requirements.txt
index cc9cb747..895ba93f 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -17,4 +17,5 @@ flask-migrate
 ruamel.yaml
 psutil
 pytest
-flask-babel
\ No newline at end of file
+flask-babel
+beautifulsoup4
\ No newline at end of file
diff --git a/web/actions/stats.py b/web/actions/stats.py
index f9d8f687..6b61c916 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -12,7 +12,9 @@
 from common.utils import converters
 from common.models.alerts import Alert
 from common.models.challenges import Challenge
+from common.models.pools import POOLABLE_BLOCKCHAINS
 from common.models.plots import Plot
+from common.models.partials import Partial
 from common.models.stats import StatPlotCount, StatPlotsSize, StatTotalCoins, StatNetspaceSize, StatTimeToWin, \
         StatPlotsTotalUsed, StatPlotsDiskUsed, StatPlotsDiskFree, StatPlottingTotalUsed, \
         StatPlottingDiskUsed, StatPlottingDiskFree
@@ -303,9 +305,19 @@ def load_summary_stats(blockchains):
         except Exception as ex:
             app.logger.error(ex)
             app.logger.info("No recent challenge response times found for {0}".format(blockchain))
+        partials_per_hour = ''
+        if blockchain in POOLABLE_BLOCKCHAINS:
+            try:
+                day_ago = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y-%m-%d %H:%M")
+                partial_records = db.session.query(Partial).filter(Partial.blockchain==blockchain, Partial.created_at >= day_ago ).order_by(Partial.created_at.desc()).all()
+                partials_per_hour = "%.2f per hour" % (len(partial_records) / 24)
+            except Exception as ex:
+                app.logger.error(ex)
+                app.logger.info("No recent partials submitted for {0}".format(blockchain))
         stats[blockchain] = {
             'harvesters': harvesters,
             'max_resp': max_response,
+            'partials_per_hour': partials_per_hour,
             'plottings': "TODO"
         }
     return stats
\ No newline at end of file
diff --git a/web/models/chia.py b/web/models/chia.py
index 8838582a..780c1b2b 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -29,11 +29,13 @@ def __init__(self, blockchains, farms, wallets, stats):
                 'status': blockchain['status'],
                 'farmed': farm['total_coins'],
                 'wallet': wallet['total_balance'],
+                'usd': converters.to_usd(blockchain['blockchain'], wallet['total_balance']),
                 'height': blockchain['peak_height'],
                 'plots': farm['plot_count'],
                 'harvesters': stats[blockchain['blockchain']]['harvesters'], 
                 'max_resp': stats[blockchain['blockchain']]['max_resp'], 
                 'plottings': stats[blockchain['blockchain']]['plottings'], 
+                'partials_per_hour': stats[blockchain['blockchain']]['partials_per_hour'], 
                 'etw': self.etw_to_days(blockchain['blockchain'], farm['expected_time_to_win']),
             })
 
@@ -219,6 +221,7 @@ def __init__(self, wallets, cold_wallet_addresses={}):
                 'cold_balance': cold_balance,
                 'cold_address': ','.join(cold_wallet_addresses[wallet.blockchain]) if wallet.blockchain in cold_wallet_addresses else '',
                 'total_balance': total_balance,
+                'usd_balance': converters.to_usd(wallet.blockchain, total_balance),
                 'updated_at': wallet.updated_at }) 
 
     def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=True):
diff --git a/web/templates/summary.html b/web/templates/summary.html
index bc4ffc08..ccdcd287 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -4,7 +4,7 @@
 
 
    
     
    
-      
+      
         
       
     
    
@@ -26,13 +26,15 @@
             
    
-                
-                
-                
-                
+                
+                
+                
+                
+                
+                
@@ -54,13 +56,15 @@
                     {% endif %}  
                     {{summary.status}}
                 
-                
-                
-                
+                
+                
+                
+                
+                
             {% endfor %}
diff --git a/web/templates/wallet.html b/web/templates/wallet.html
index da755524..db5175bd 100644
--- a/web/templates/wallet.html
+++ b/web/templates/wallet.html
@@ -79,6 +79,7 @@ 
+                
@@ -100,6 +101,7 @@ 
+                
-                
+                
+                
-                
-                
-                
@@ -64,8 +62,8 @@
                 
-                
-                
+                
+                
             {% endfor %}
         

From 1b493b9381e947e58474f853b46928a3364cb45b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 21 Jan 2022 14:39:04 -0700
Subject: [PATCH 0543/1625] EDV USD

---
 CHANGELOG.md               | 4 ++--
 CREDITS.md                 | 5 ++++-
 common/config/globals.py   | 3 +--
 web/templates/summary.html | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91d6ef86..09a46e37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,10 @@
 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).
 
 ## [0.6.9] - 2022-02-04
- - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain.  Requires its own plot files for `testnet3`.
+ - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases) - update to version 1.2.11
  - Improved summary display for status.  Estimated price in USD provided by alltheblocks.net
- - Various fixes for issues reported in the Discord.  Thanks all!
+ - Various fixes for issues reported in the Discord.  Thanks to all who reported!
 
 ## [0.6.8] - 2022-01-04
  - [SHIBGreen](https://github.com/BTCgreen-Network/shibgreen-blockchain) - cross-farming support for this blockchain fork.
diff --git a/CREDITS.md b/CREDITS.md
index dafa1353..ca5c8154 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -24,7 +24,8 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [DataTables.js](https://datatables.net/): Filter/search/pagination of dynamic tables, as per [this tutorial](https://blog.miguelgrinberg.com/post/beautiful-interactive-tables-for-your-flask-templates).
 * [Charts.js](https://www.chartjs.org/): dynamic charting library.
 
-## Blockchain Forks
+## Blockchains
+* [BTCgreen](https://github.com/BTCgreen-Network/btcgreen-blockchain)
 * [Cactus](https://github.com/Cactus-Network/cactus-blockchain)
 * [Chives](https://github.com/HiveProject2021/chives-blockchain)
 * [Cryptodoge](https://github.com/CryptoDoge-Network/cryptodoge)
@@ -32,7 +33,9 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [Flora](https://github.com/Flora-Network/flora-blockchain)
 * [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain)
 * [Maize](https://github.com/Maize-Network/maize-blockchain)
+* [MMX](https://github.com/madMAx43v3r/mmx-node)
 * [NChain](https://gitee.com/ext9/ext9-blockchain)
+* [SHIBgreen](https://github.com/BTCgreen-Network/shibgreen-blockchain)
 * [Staicoin](https://github.com/STATION-I/staicoin-blockchain)
 * [Stor](https://github.com/Stor-Network/stor-blockchain)
 
diff --git a/common/config/globals.py b/common/config/globals.py
index 24681e98..f195a293 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -33,8 +33,7 @@
 
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
 
-# TODO Remove /code from path
-INFO_FILE = '/code/machinaris/common/config/blockchains.json'
+INFO_FILE = '/machinaris/common/config/blockchains.json'
 
 def get_supported_blockchains():
     try:
diff --git a/web/templates/summary.html b/web/templates/summary.html
index 773a3497..f1ba5bb1 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -35,7 +35,7 @@
                 
                 
-                
+                

From f6d41eaeb10880b619faeeadeae3e1cb656d39a1 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 22 Jan 2022 14:35:23 -0700
Subject: [PATCH 0544/1625] Renderer for cells showing bad states on Summary
 page.

---
 api/commands/websvcs.py        |  2 +-
 api/gunicorn.conf.py           |  2 +-
 api/schedules/nft_recover.py   | 16 +++++++++---
 common/config/blockchains.json |  2 +-
 common/utils/converters.py     |  6 +++--
 web/actions/stats.py           |  2 +-
 web/models/chia.py             |  4 +--
 web/models/worker.py           |  2 +-
 web/templates/alerts.html      |  4 +--
 web/templates/summary.html     | 48 ++++++++++++++++++++++++++++++++++
 10 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index ac5cc2e2..7eef086a 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -144,7 +144,7 @@ def request_prices(prices, debug=False):
             if len(price_column.contents) == 1:
                 price_value = price_column.contents[0].string.strip()
                 if price_value.startswith('$'):
-                    app.logger.info("{0} @ {1}".format(blockchain, price_value[1:].strip()))
+                    #app.logger.info("{0} @ {1}".format(blockchain, price_value[1:].strip()))
                     try:
                         prices[blockchain] = float(price_value[1:].strip())
                     except Exception as ex:
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 183a2355..a621208c 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -69,7 +69,7 @@ def on_starting(server):
         scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', hours=12)
 
     # Testing only
-    #scheduler.add_job(func=websvcs.test_chia_cold, name="test_chia_cold", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', seconds=120) # Test immediately
 
     app.logger.debug("Starting background scheduler...")
     scheduler.start()
diff --git a/api/schedules/nft_recover.py b/api/schedules/nft_recover.py
index f2c1ae2f..3baa6f97 100644
--- a/api/schedules/nft_recover.py
+++ b/api/schedules/nft_recover.py
@@ -23,12 +23,16 @@ def execute():
         app.logger.info("****************** Starting twice daily NFT 7/8 reward recovery. *********************")
         fullnodes = db.session.query(wk.Worker).filter(wk.Worker.mode == 'fullnode', 
             wk.Worker.blockchain != 'chia', wk.Worker.blockchain != 'chives').order_by(wk.Worker.blockchain).all()
+        app.logger.info("Found {0} fullnodes to initiate reward recovery on.".format(len(fullnodes)))
         wallet = db.session.query(w.Wallet).filter(w.Wallet.blockchain == 'chia').first()
-        plotnfts = db.session.query(p.Plotnft).filter(p.Plotnft.blockchain == 'chia').all()
+        if not wallet:
+            app.logger.info("Found no Chia wallet details during reward recovery.")
+            return
         wallet_id = wallet.wallet_id()
         if not wallet_id: 
             app.logger.info("Found no wallet id, so skipping NFT 7/8 reward recovery.")
             return
+        plotnfts = db.session.query(p.Plotnft).filter(p.Plotnft.blockchain == 'chia').all()
         if len(plotnfts) == 0:
             app.logger.info("Found no Chia PlotNFTs at all, so skipping NFT 7/8 reward recovery.")
             return
@@ -41,7 +45,9 @@ def execute():
                 app.logger.info("Found no pool contract address, so skipping NFT 7/8 reward recovery on plotnft: {0}".format(plotnft))
                 continue
             for fullnode in fullnodes:
-                if fullnode.blockchain != 'hddcoin':
+                if fullnode.latest_ping_result != 'Responding':
+                    app.logger.error("Skipping reward recovery for {0} as last ping to {1}:{2} returned {3}.".format(
+                        fullnode.blockchain, fullnode.hostname, fullnode.port, fullnode.latest_ping_result))
                     continue
                 payload = {
                     'blockchain': fullnode.blockchain,
@@ -49,5 +55,9 @@ def execute():
                     'launcher_id': plotnft.launcher,
                     'pool_contract_address': pool_contract_address
                 }
-                utils.send_worker_post(fullnode, '/rewards/', payload, debug=True)
+                try:
+                    utils.send_worker_post(fullnode, '/rewards/', payload, debug=True)
+                except Exception as ex:
+                    app.logger.error("Failed to request reward recovery for {0} to {1}:{2} because {3}.".format(
+                        fullnode.blockchain, fullnode.hostname, fullnode.port, str(ex)))
             
\ No newline at end of file
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 4d205dc9..624b3093 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -161,7 +161,7 @@
         "network_port": 12334,
         "farmer_port": 11330,
         "worker_port": 8940,
-        "reward": 0.19,
+        "reward": 0.211632,
         "mojos_per_coin": 1000000,
         "blocks_per_day": 4608,
         "git_url": "https://github.com/madMAx43v3r/mmx-node",
diff --git a/common/utils/converters.py b/common/utils/converters.py
index 00d00ab7..11790677 100644
--- a/common/utils/converters.py
+++ b/common/utils/converters.py
@@ -77,10 +77,12 @@ def to_usd(blockchain, coins):
             with open(BLOCKCHAIN_PRICES_CACHE_FILE) as f:
                 data = json.load(f)
                 if blockchain in data:
-                    return "${:,.2f}".format(float(data[blockchain]) * float(coins))
+                    if isinstance(coins, str):
+                        coins = float(coins.replace(',',''))
+                    return "${:,.2f}".format(float(data[blockchain]) * coins)
                 return ''
         except Exception as ex:
-            print("Unable to convert  to $USD because {0}".format(str(ex)))
+            print("Unable to convert to $USD because {0}".format(str(ex)))
     return ''
 
 ##################################################################################################
diff --git a/web/actions/stats.py b/web/actions/stats.py
index c1e7bbe8..d85a9b97 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -318,7 +318,7 @@ def load_summary_stats(blockchains):
                 for wk in host.workers:
                     if wk['blockchain'] == blockchain:
                         harvesters_total += 1
-                        app.logger.info(wk['farming_status'])
+                        #app.logger.info(wk['farming_status'])
                         if wk['farming_status'] in ['farming', 'harvesting']: 
                             harvsters_online += 1
             harvesters = "{0} / {1}".format(harvsters_online, harvesters_total)
diff --git a/web/models/chia.py b/web/models/chia.py
index bf582b51..d21a4ea6 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -119,7 +119,7 @@ def __init__(self, farm_recs, wallet_recs):
     def status_if_responding(self, displayname, blockchain, connection_status, last_status):
         if connection_status == 'Responding':
             return "Active" if last_status == "Farming" else last_status
-        app.logger.info("Oops! {0} ({1}) had connection_success: {2}".format(displayname, blockchain, connection_status))
+        #app.logger.info("Oops! {0} ({1}) had connection_success: {2}".format(displayname, blockchain, connection_status))
         return "Offline"
 
     def selected_blockchain(self):
@@ -532,7 +532,7 @@ def parse_mmx(self, connection, blockchain):
         conns = []
         for line in connection.details.split('\n'):
             try:
-                app.logger.info(line)
+                #app.logger.info(line)
                 m = re.match("\[(.+)\]   height =  (\d+), (\d+\.?\d*) MB recv, (\d*\.?\d*) MB sent, timeout = (\d+\.?\d*) sec", line.strip(), re.IGNORECASE)
                 if m:
                     connection = {
diff --git a/web/models/worker.py b/web/models/worker.py
index 43c71dd2..1a8db364 100644
--- a/web/models/worker.py
+++ b/web/models/worker.py
@@ -109,7 +109,7 @@ def set_ping_response(self, response):
     def status_if_responding(self, displayname, blockchain, connection_status, last_status):
         if connection_status == "Responding":
             return last_status
-        app.logger.info("Oops! {0} ({1}) last connection status: {2}".format(displayname, blockchain, connection_status))
+        #app.logger.info("Oops! {0} ({1}) last connection status: {2}".format(displayname, blockchain, connection_status))
         return "offline"
 
     def fullnodes(self):
diff --git a/web/templates/alerts.html b/web/templates/alerts.html
index 4b4937e6..727e2366 100644
--- a/web/templates/alerts.html
+++ b/web/templates/alerts.html
@@ -44,12 +44,12 @@
                     
  • 
                         
-                            {{worker.blockchain|capitalize}}
                             {% if worker.monitoring_status == 'running' %}
                                 
                             {% else %}
                                 
-                            {% endif %}
+                            {% endif %}  
+                            {{worker.blockchain|capitalize}}
                         
                     
    • 
                     {% endfor %}
diff --git a/web/templates/summary.html b/web/templates/summary.html
index f1ba5bb1..d4e86649 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -84,6 +84,54 @@ 
    Please allow at least 15 minutes for blockchains to get started.
    
 $(document).ready(function () {
     $('#data').DataTable({
         "pageLength": 25,
+        "columnDefs": [
+            { 
+                targets: [4], "orderable": true, 
+                "render": function ( data, type, row, meta ) {
+                    if (data && data.includes('/')) {
+                        arr = data.split("/");
+                        responding = arr[0].trim();
+                        total = arr[1].trim();
+                        if (responding == 0) {
+                            return "" + data + "";
+                        }
+                        if (responding < total) {
+                            return "" + data + "";
+                        }
+                    }
+                    return data;
+                }
+            },
+            { 
+                targets: [5], "orderable": true, 
+                "render": function ( data, type, row, meta ) {
+                    if (data && data.endsWith('secs')) {
+                        arr = data.split(" ");
+                        response_seconds = Number(arr[0].trim());
+                        if (response_seconds > 30) {
+                            return "" + data + "";
+                        }
+                        if (response_seconds > 10) {
+                            return "" + data + "";
+                        }
+                    }
+                    return data;
+                }
+            },
+            { 
+                targets: [6], "orderable": true, 
+                "render": function ( data, type, row, meta ) {
+                    if (data && data.includes('/')) {
+                        arr = data.split("/");
+                        partials = arr[0].trim();
+                        if (partials == '0.00') {
+                            return "" + data + "";
+                        }
+                    }
+                    return data;
+                }
+            },
+        ],
     });
 })
 

From 05737571e4bd5fb3224b43df37f9b12378d2b195 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 22 Jan 2022 16:30:28 -0700
Subject: [PATCH 0545/1625] Latest versions of dependencies.

---
 CHANGELOG.md                       | 2 +-
 scripts/forks/btcgreen_install.sh  | 4 ++--
 scripts/forks/cactus_install.sh    | 4 ++--
 scripts/forks/hddcoin_install.sh   | 4 ++--
 scripts/forks/nchain_install.sh    | 2 +-
 scripts/forks/shibgreen_install.sh | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09a46e37..b60ee37d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
- - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases) - update to version 1.2.11
+ - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases) - update to version 2.0.0
  - Improved summary display for status.  Estimated price in USD provided by alltheblocks.net
  - Various fixes for issues reported in the Discord.  Thanks to all who reported!
 
diff --git a/scripts/forks/btcgreen_install.sh b/scripts/forks/btcgreen_install.sh
index 07dafd8d..054152c7 100644
--- a/scripts/forks/btcgreen_install.sh
+++ b/scripts/forks/btcgreen_install.sh
@@ -4,8 +4,8 @@
 #
 
 BTCGREEN_BRANCH=$1
-# On 2021-12-05
-HASH=263e39a22a0415028b5989511302d351d7158b38
+# On 2022-01-22
+HASH=2ab991f6b207872b17ce237ebe409defb96cd524
 
 if [ -z ${BTCGREEN_BRANCH} ]; then
 	echo 'Skipping BTCGreen install as not requested.'
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index c89c5562..5f8369cb 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2021-11-06
-HASH=f9d9f106041c74402f9bd08695a62ab6a762f09a
+# On 2022-01-22
+HASH=9eef13171dff764bd0549de1479d775272e16bcc
 
 if [ -z ${CACTUS_BRANCH} ]; then
 	echo 'Skipping Cactus install as not requested.'
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index 6be010ec..a323e565 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 HDDCOIN_BRANCH=$1
-# On 2022-01-06
-HASH=eee4312aa9ed6e48458e342daab2591733638295
+# On 2022-01-22
+HASH=1b7f475af43dd251d6b8e866066a0834712f45ec
 
 if [ -z ${HDDCOIN_BRANCH} ]; then
 	echo 'Skipping HDDCoin install as not requested.'
diff --git a/scripts/forks/nchain_install.sh b/scripts/forks/nchain_install.sh
index d5806c9c..f830139f 100644
--- a/scripts/forks/nchain_install.sh
+++ b/scripts/forks/nchain_install.sh
@@ -5,7 +5,7 @@
 
 NCHAIN_BRANCH=$1
 # On 2021-12-01
-HASH=2F3c51a0bc6ee3930b40296a75dccf0ad8daab3a68
+HASH=3c51a0bc6ee3930b40296a75dccf0ad8daab3a68
 
 if [ -z ${NCHAIN_BRANCH} ]; then
 	echo 'Skipping NChain install as not requested.'
diff --git a/scripts/forks/shibgreen_install.sh b/scripts/forks/shibgreen_install.sh
index 71a37f8c..60cd331e 100644
--- a/scripts/forks/shibgreen_install.sh
+++ b/scripts/forks/shibgreen_install.sh
@@ -1,6 +1,6 @@
 #!/bin/env bash
 #
-# Installs SHIBGreen as per https://github.com/SHIBgreen-Network/shibgreen-blockchain
+# Installs SHIBGreen as per https://github.com/BTCgreen-Network/shibgreen-blockchain
 #
 
 SHIBGREEN_BRANCH=$1

From d517baf8054f845b62fc7eef7088bfff7d117752 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 23 Jan 2022 09:19:48 -0700
Subject: [PATCH 0546/1625] Fix for Chia DB download link.

---
 scripts/forks/chia_launch.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index f0211173..593327ff 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -39,7 +39,8 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Please be patient as takes minutes now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/ && cd /root/.chia/mainnet/db/
   # Latest Blockchain DB download from direct from https://www.chia-database.com/
-  curl -skLJ -o - https://nginx.chia-database.com/blockchain_v1_mainnet-`date +%d-%m-%y`.zip | zcat >> blockchain_v1_mainnet.sqlite
+  file_time=$(curl -s https://chia-database.com | grep -Po "blockchain_v1_mainnet-\K(\d|-)+")
+  curl -skLJ -o - https://nginx.chia-database.com/blockchain_v1_mainnet-${file_time}.zip | zcat >> blockchain_v1_mainnet.sqlite
 fi
 
 echo 'Configuring Chia...'

From 9e0443cda9e33dfa4541860f01afc1aca86ace32 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 23 Jan 2022 09:33:52 -0700
Subject: [PATCH 0547/1625] Path fixes for Chia DB download.

---
 scripts/forks/chia_launch.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 593327ff..cdc45efc 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -37,10 +37,13 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo 'Starting web server...  Browse to port 8926.'
   echo "Downloading Chia blockchain DB (many GBs in size) on first launch..."
   echo "Please be patient as takes minutes now, but saves days of syncing time later."
-  mkdir -p /root/.chia/mainnet/db/ && cd /root/.chia/mainnet/db/
+  mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
   # Latest Blockchain DB download from direct from https://www.chia-database.com/
   file_time=$(curl -s https://chia-database.com | grep -Po "blockchain_v1_mainnet-\K(\d|-)+")
   curl -skLJ -o - https://nginx.chia-database.com/blockchain_v1_mainnet-${file_time}.zip | zcat >> blockchain_v1_mainnet.sqlite
+  cd /root/.chia/mainnet/db
+  mv /root/.chia/mainnet/db/chia/blockchain_v1_mainnet.sqlite .
+  rm -rf /root/.chia/mainnet/db/chia
 fi
 
 echo 'Configuring Chia...'

From 2ea636bd3b8adfbec453a8312c0bcaf2a4732b6f Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 23 Jan 2022 10:53:51 -0700
Subject: [PATCH 0548/1625] Download page messaging.

---
 common/config/globals.py | 4 ++--
 web/templates/setup.html | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/config/globals.py b/common/config/globals.py
index f195a293..bd6a009f 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -141,8 +141,8 @@ def is_setup():
                 logging.info(traceback.format_exc())
     return foundKey
 
-# On very first launch of the main Chia container, blockchain DB is being downloaded so must wait.
-CHIA_BLOCKCHAIN_DB_SIZE = 32 * 1024 * 1024 * 1024 # Approaching 32 GBs in late 2021
+# On very first launch of the main Chia container, blockchain DB zip is being downloaded so must wait.
+CHIA_BLOCKCHAIN_DB_SIZE = 45 * 1024 * 1024 * 1024 # Almost 45 uncompressed GB in early 2022
 def blockchain_downloading():
     db_path = '/root/.chia/mainnet/db'
     if path.exists(f"{db_path}/blockchain_v1_mainnet.sqlite"):
diff --git a/web/templates/setup.html b/web/templates/setup.html
index cac472d3..0c8c6b7a 100644
--- a/web/templates/setup.html
+++ b/web/templates/setup.html
@@ -25,7 +25,7 @@
                         style="height:128px; width:128px; float:left; margin-left:50px" />
                     
    
                         
    Welcome to Machinaris!
    
-                        
    An easy-to-use WebUI for Chia™ plotting and farming.
    
+                        
    An easy-to-use WebUI for Chia™ plotting and farming.
    
                     
    
                     
    
                     
    
@@ -58,9 +58,9 @@
                         
    
                         
    
 
-                        
    On very first launch, the Chia blockchain database is being downloaded from
-                        https://chiaforksblockchain.com.  At nearly 30 GB in 
-                        size, this will take a while.
    
+                        
    On very first launch, the Chia blockchain database (~20 GB compressed) is being downloaded from
+                        https://www.chia-database.com/.  
+                        At about 45 GB in uncompressed size (progress shown above), this will take a while.
    
 
                         
    However minutes of download now, will save you multiple days of blockchain syncing later. 
                             Please be patient!
    

From 02cf7af332f83cba4e8dbc936e799d231822068b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 24 Jan 2022 08:49:44 -0700
Subject: [PATCH 0549/1625] Correct duplicated tabs on Pools page for those
 with multiple pools per blockchain.

---
 web/models/pools.py      | 20 +++++++++++++-------
 web/templates/pools.html | 22 ++++++++++++----------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/web/models/pools.py b/web/models/pools.py
index eaca12dc..64a16edd 100644
--- a/web/models/pools.py
+++ b/web/models/pools.py
@@ -22,7 +22,7 @@ def __init__(self, plotnfts):
             except:
                 app.logger.info("Plotnfts.init(): Unable to find a worker with hostname '{0}'".format(plotnft.hostname))
                 displayname = plotnft.hostname
-            self.rows.append({ 
+            plotnft_obj = { 
                 'displayname': displayname, 
                 'hostname': plotnft.hostname,
                 'blockchain': plotnft.blockchain,
@@ -30,7 +30,9 @@ def __init__(self, plotnfts):
                 'wallet_num': plotnft.wallet_num,
                 'header': plotnft.header, 
                 'details': plotnft.details, 
-                'updated_at': plotnft.updated_at })
+                'updated_at': plotnft.updated_at 
+            }
+            self.rows.append(plotnft_obj)
     
     def get_current_pool_url(self):
         pool_url = None
@@ -45,8 +47,7 @@ def get_current_pool_url(self):
 class Pools:
 
     def __init__(self, pools, plotnfts):
-        self.columns = ['hostname', 'blockchain', 'pool_state', 'updated_at']
-        self.rows = []
+        self.blockchains = {}
         for pool in pools:
             try:
                 app.logger.debug("Found worker with hostname '{0}'".format(pool.hostname))
@@ -70,7 +71,7 @@ def __init__(self, pools, plotnfts):
                     points_successful_last_24h = "0"
                 else:
                     points_successful_last_24h = "%.2f"% ( (points_found_24h - pool_errors_24h) / points_found_24h * 100)
-            self.rows.append({ 
+            pool_obj = { 
                 'displayname': displayname, 
                 'hostname': pool.hostname,
                 'launcher_id': pool.launcher_id, 
@@ -81,8 +82,13 @@ def __init__(self, pools, plotnfts):
                 'updated_at': pool.updated_at,
                 'status': status,
                 'points_successful_last_24h': points_successful_last_24h
-            })
-        app.logger.info(self.rows)
+            }
+            if pool.blockchain in self.blockchains:
+                blockchain_pools = self.blockchains[pool.blockchain]
+            else:
+                blockchain_pools = []
+                self.blockchains[pool.blockchain] = blockchain_pools
+            blockchain_pools.append(pool_obj)
     
     def find_plotnft(self, plotnfts, launcher_id):
         for plotnft in plotnfts:
diff --git a/web/templates/pools.html b/web/templates/pools.html
index 8b5c008c..f3c08327 100644
--- a/web/templates/pools.html
+++ b/web/templates/pools.html
@@ -36,25 +36,26 @@
       }
   
 
-  {% if pools.rows|length > 0 %}
+  {% if pools.blockchains|length > 0 %}
       
-            
+            
           {% endfor %}
           {% else %}
           
-            
+            
           {% endif %}
         

From 3a6254f4d0729813b0f5a69934eb4a1cba9bde44 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 25 Jan 2022 19:38:30 -0700
Subject: [PATCH 0551/1625] Challenges on Summary page for MMX.

---
 api/commands/log_parser.py       |  6 +++---
 api/models/log.py                | 27 ++++++++++++++++++---------
 api/models/mmx.py                |  2 +-
 api/schedules/status_plots.py    |  3 ++-
 api/views/plots/resources.py     |  5 ++---
 common/config/globals.py         |  2 ++
 web/models/chia.py               |  1 -
 web/templates/farming/plots.html |  2 ++
 web/templates/index.html         |  2 +-
 9 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/api/commands/log_parser.py b/api/commands/log_parser.py
index b11ee029..eda8d06f 100644
--- a/api/commands/log_parser.py
+++ b/api/commands/log_parser.py
@@ -54,7 +54,7 @@ def recent_challenges(blockchain):
         abort(500, description=errs.decode('utf-8'))
     cli_stdout = outs.decode('utf-8')
     #app.logger.debug("Challenges grep: {0}".format(cli_stdout))
-    challenges = log.Challenges(cli_stdout.splitlines())
+    challenges = log.Challenges(cli_stdout.splitlines(), blockchain)
     # app.logger.debug(challenges)
     return challenges
 
@@ -104,8 +104,8 @@ def find_plotting_job_log(plot_id):
     return None
 
 def get_farming_log_file(blockchain):
-    if blockchain == 'mmx': 
-        return '/root/.mmx/logs/mmx_node.log'
+    if blockchain == 'mmx':
+         return "/root/.mmx/{0}/logs/mmx_node_{1}.txt".format(globals.MMX_NETWORK, datetime.datetime.now().strftime("%Y_%m_%d"))
     mainnet_folder = globals.get_blockchain_network_path(blockchain)
     return mainnet_folder + '/log/debug.log'
 
diff --git a/api/models/log.py b/api/models/log.py
index e581cda8..7f4e53a1 100644
--- a/api/models/log.py
+++ b/api/models/log.py
@@ -11,20 +11,29 @@
 class Challenges:
 
     # Parse the provided most recent lines of grepped output for challenges
-    def __init__(self, cli_stdout):
+    def __init__(self, cli_stdout, blockchain):
         self.columns = [ 'challenge_id', 'plots_past_filter', 'proofs_found', 'time_taken', 'created_at']
         self.rows = []
         for line in cli_stdout:
             #app.logger.info(line)
             try:
-                self.rows.append({
-                    'challenge_id': re.search('eligible for farming (\w+)', line, re.IGNORECASE).group(1) + '...',
-                    'plots_past_filter': str(re.search('INFO\s*(\d+) plots were eligible', line, re.IGNORECASE).group(1)) + \
-                        '/' + str(re.search('Total (\d+) plots', line, re.IGNORECASE).group(1)),
-                    'proofs_found': int(re.search('Found (\d+) proofs', line, re.IGNORECASE).group(1)),
-                    'time_taken': str(re.search('Time: (\d+\.?\d*) s.', line, re.IGNORECASE).group(1)) + ' secs',
-                    'created_at': line.split()[0].replace('T', ' ')
-                })
+                if blockchain == 'mmx':
+                    self.rows.append({
+                        'challenge_id': re.search('eligible for height (\d+)', line, re.IGNORECASE).group(1),
+                        'plots_past_filter': str(re.search('INFO:\s*(\d+) plots were eligible', line, re.IGNORECASE).group(1)),
+                        'proofs_found': 0, # TODO What does log line with a proof look like?
+                        'time_taken': str(re.search('took ([0-9]+\.?[0-9]*(?:[Ee]\ *-?\ *[0-9]+)?) sec', line, re.IGNORECASE).group(1)) + ' secs',
+                        'created_at': line[:19]  # example at line start: 2022-01-25 10:14:33
+                    })
+                else: # All Chia forks
+                    self.rows.append({
+                        'challenge_id': re.search('eligible for farming (\w+)', line, re.IGNORECASE).group(1) + '...',
+                        'plots_past_filter': str(re.search('INFO\s*(\d+) plots were eligible', line, re.IGNORECASE).group(1)) + \
+                            '/' + str(re.search('Total (\d+) plots', line, re.IGNORECASE).group(1)),
+                        'proofs_found': int(re.search('Found (\d+) proofs', line, re.IGNORECASE).group(1)),
+                        'time_taken': str(re.search('Time: (\d+\.?\d*) s.', line, re.IGNORECASE).group(1)) + ' secs',
+                        'created_at': line.split()[0].replace('T', ' ')
+                    })
             except:
                 app.logger.info("Failed to parse challenge line: {0}".format(line))
                 app.logger.info(traceback.format_exc())
diff --git a/api/models/mmx.py b/api/models/mmx.py
index 674ec1c4..9254910e 100644
--- a/api/models/mmx.py
+++ b/api/models/mmx.py
@@ -63,7 +63,7 @@ def __init__(self, entries):
                 app.logger.info("Skipping non-plot file named: {0}".format(path))
                 continue
             dir,file=os.path.split(path)
-            groups = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
+            groups = re.match("plot-mmx-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
             if not groups:
                 app.logger.info("Invalid plot file name provided: {0}".format(file))
                 continue
diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index 4fee6702..f65eb2c6 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -27,12 +27,13 @@
 last_full_send_time = None
 
 def get_plot_attrs(plot_id, filename):
-    short_plot_id = plot_id[2:10]
     dir,file = os.path.split(filename)
     match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
+        short_plot_id = match.group(7)[:8]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
     else:
+        short_plot_id = plot_id[2:10]
         created_at = "" 
     return [short_plot_id, dir,file,created_at]
 
diff --git a/api/views/plots/resources.py b/api/views/plots/resources.py
index 1716460e..268d264a 100644
--- a/api/views/plots/resources.py
+++ b/api/views/plots/resources.py
@@ -83,14 +83,13 @@ def get(self, args):
     @blp.arguments(BatchOfPlotSchema)
     @blp.response(201, PlotSchema(many=True))
     def post(self, new_items):
-        # Re-enabled as Chives sends plots listing from its fullnode
+        # Re-enabled as MMX sends plots listing from its fullnode
         items = []
         displaynames = {}
         plots_status = open_status_json()
         for new_item in new_items:
             # Skip any previously sent by existing plot_id
-            if not db.session.query(Plot).filter(Plot.hostname==new_item['hostname'], 
-                Plot.plot_id==new_item['plot_id']).first():
+            if not db.session.query(Plot).filter(Plot.hostname==new_item['hostname'], Plot.plot_id==new_item['plot_id']).first():
                 short_plot_id = new_item['plot_id'][:8]
                 item = Plot(**new_item)
                 item.displayname = lookup_worker_displayname(displaynames, new_item['hostname'])
diff --git a/common/config/globals.py b/common/config/globals.py
index bd6a009f..a3c82daf 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -31,6 +31,8 @@
 BLADEBIT_BINARY = '/usr/bin/bladebit'
 CHIADOG_PATH = '/chiadog'
 
+MMX_NETWORK = 'testnet4'
+
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
 
 INFO_FILE = '/machinaris/common/config/blockchains.json'
diff --git a/web/models/chia.py b/web/models/chia.py
index d21a4ea6..28d55553 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -23,7 +23,6 @@ def __init__(self, blockchains, farms, wallets, stats):
         for blockchain in blockchains.rows:
             farm = self.find_farm(farms, blockchain['blockchain'])
             wallet = self.find_wallet(wallets, blockchain['blockchain'])
-            #app.logger.info(blockchain)
             self.rows.append({
                 'blockchain': blockchain['blockchain'],
                 'status': blockchain['status'],
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index f90ac52d..63764d53 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -84,6 +84,8 @@ 
                                     onclick='ViewLogs("{{ worker.hostname }}","{{worker.blockchain}}");return false;'>
                                     {% if worker.connection_status == 'offline' or worker.connection_status == 'Connection Refused' %}
                                         
+                                    {% elif worker.farming_status == 'not available' %}
+                                        
                                     {% elif worker.farming_status == 'farming' or worker.farming_status == 'harvesting' %}
                                         
                                     {% else %}
diff --git a/web/templates/index.html b/web/templates/index.html
index 878e7e87..bc008390 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -51,7 +51,7 @@ 
    Farming:
                 
Date: Wed, 26 Jan 2022 09:31:11 -0700
Subject: [PATCH 0552/1625] Worker status from MMX harvesters.

---
 api/commands/chia_cli.py   | 2 +-
 api/commands/mmx_cli.py    | 2 ++
 api/models/mmx.py          | 5 +++++
 web/templates/workers.html | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 91dcc9f0..f7774687 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -29,7 +29,7 @@
 
 def load_farm_summary(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    if globals.farming_enabled() or (blockchain == 'chives' and globals.harvesting_enabled()):
+    if globals.farming_enabled():
         proc = Popen("{0} farm summary".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
         try:
             outs, errs = proc.communicate(timeout=90)
diff --git a/api/commands/mmx_cli.py b/api/commands/mmx_cli.py
index 36865d0a..62142ab3 100644
--- a/api/commands/mmx_cli.py
+++ b/api/commands/mmx_cli.py
@@ -37,6 +37,8 @@ def load_farm_info(blockchain):
         if errs:
             app.logger.debug("Error from {0} farm summary because {1}".format(blockchain, outs.decode('utf-8')))
         return mmx.FarmSummary(outs.decode('utf-8').splitlines(), blockchain)
+    elif globals.harvesting_enabled():
+        return mmx.HarvesterSummary()
     else:
         raise Exception("Unable to load farm summary on non-farmer and non-harvester.")
 
diff --git a/api/models/mmx.py b/api/models/mmx.py
index 9254910e..2236733a 100644
--- a/api/models/mmx.py
+++ b/api/models/mmx.py
@@ -52,6 +52,11 @@ def calc_netspace_size(self, netspace_size):
             app.logger.info("Unable to split network size value: {0}".format(netspace_size))
             self.display_netspace_size = self.netspace_size
 
+class HarvesterSummary:
+
+    def __init__(self):
+        self.status = "Harvesting" # TODO Check for harvester status via MMX somehow (logs or cmds)
+
 class FarmPlots:
 
      def __init__(self, entries):
diff --git a/web/templates/workers.html b/web/templates/workers.html
index 750ef540..3b4d658d 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -62,7 +62,7 @@
             
    
-                
+                
@@ -100,10 +131,10 @@ 
-                
-                
+                
+                
-                
@@ -157,6 +188,14 @@ 
    {{_('You can also try running "chia wallet show" on your fullnode\'s in-cont
                 "pageLength": 25,
                 "columnDefs": [{ "orderable": false, targets: [5] }],
             });
+            $("#btnSaveSettings").click(function () {
+                $("#btnCancelSettings").prop("disabled", true);
+                $(this).prop("disabled", true);
+                $(this).html(
+                    ` Saving...`
+                );
+                $("#settings-form").submit();
+            });
             $("#btnSave").click(function () {
                 $("#btnCancel").prop("disabled", true);
                 $(this).prop("disabled", true);
diff --git a/web/translations/de/LC_MESSAGES/messages.po b/web/translations/de/LC_MESSAGES/messages.po
index c0c1fd6e..aa8aed15 100644
--- a/web/translations/de/LC_MESSAGES/messages.po
+++ b/web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-20 17:15-0700\n"
+"POT-Creation-Date: 2022-02-21 17:14-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
@@ -18,58 +18,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:90
+#: routes.py:76 routes.py:218
+msgid "Saved local currency setting."
+msgstr ""
+
+#: routes.py:95
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:122
+#: routes.py:127
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:172
+#: routes.py:177
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:198
+#: routes.py:203
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:269
+#: routes.py:223
+msgid "Saved cold wallet addresses."
+msgstr ""
+
+#: routes.py:282
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:374
+#: routes.py:387
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:380
+#: routes.py:393
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:385
+#: routes.py:398
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:392
+#: routes.py:405
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:397
+#: routes.py:410
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:416
+#: routes.py:429
 msgid "Unsupported log type"
 msgstr ""
 
+#: actions/stats.py:338
+msgid "secs"
+msgstr ""
+
+#: actions/stats.py:348 models/chia.py:228
+msgid "hour"
+msgstr ""
+
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
 msgstr ""
@@ -94,6 +110,58 @@ msgstr ""
 msgid "Please use a consistent Machinaris version to avoid issues."
 msgstr ""
 
+#: models/chia.py:133 models/chia.py:222
+msgid "days"
+msgstr ""
+
+#: models/chia.py:210
+msgid "years"
+msgstr ""
+
+#: models/chia.py:212
+msgid "year"
+msgstr ""
+
+#: models/chia.py:214
+msgid "months"
+msgstr ""
+
+#: models/chia.py:216
+msgid "month"
+msgstr ""
+
+#: models/chia.py:218
+msgid "weeks"
+msgstr ""
+
+#: models/chia.py:220
+msgid "week"
+msgstr ""
+
+#: models/chia.py:224
+msgid "day"
+msgstr ""
+
+#: models/chia.py:226
+msgid "hours"
+msgstr ""
+
+#: models/chia.py:230
+msgid "minutes"
+msgstr ""
+
+#: models/chia.py:232
+msgid "minute"
+msgstr ""
+
+#: models/chia.py:234
+msgid "Never (no plots)"
+msgstr ""
+
+#: models/chia.py:236
+msgid "Soon"
+msgstr ""
+
 #: templates/alerts.html:14
 msgid "Alerts: Recent Notifications"
 msgstr ""
@@ -107,7 +175,7 @@ msgstr ""
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:27 templates/wallet.html:77 templates/worker.html:47
+#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -213,12 +281,13 @@ msgstr ""
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:31
+#: templates/plotting/workers.html:96 templates/summary.html:61
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91
+#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
+#: templates/wallet.html:22 templates/wallet.html:45
 msgid "Settings"
 msgstr ""
 
@@ -270,8 +339,8 @@ msgstr ""
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/summary.html:28
-#: templates/wallet.html:78
+#: templates/blockchains.html:32 templates/summary.html:58
+#: templates/wallet.html:108
 msgid "Status"
 msgstr ""
 
@@ -283,7 +352,7 @@ msgstr ""
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/wallet.html:83
+#: templates/blockchains.html:35 templates/wallet.html:113
 msgid "Updated At"
 msgstr ""
 
@@ -374,7 +443,7 @@ msgstr ""
 msgid "Total Plots Size"
 msgstr ""
 
-#: templates/index.html:89
+#: templates/index.html:89 templates/wallet.html:112
 msgid "Balance"
 msgstr ""
 
@@ -556,115 +625,116 @@ msgid ""
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
 
-#: templates/summary.html:29
+#: templates/summary.html:15 templates/wallet.html:51
+msgid "Local Currency:"
+msgstr ""
+
+#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
+#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
+#: templates/plotting/workers.html:34 templates/settings/pools.html:39
+#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings/alerts.html:55 templates/settings/farming.html:56
+#: templates/settings/plotting.html:56 templates/settings/pools.html:41
+#: templates/settings/tools.html:55 templates/summary.html:29
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Save"
+msgstr ""
+
+#: templates/summary.html:59
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:30
+#: templates/summary.html:60
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:32
+#: templates/summary.html:62
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:33
+#: templates/summary.html:63
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:34
+#: templates/summary.html:64
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:36
+#: templates/summary.html:66
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:37
+#: templates/summary.html:67 templates/summary.html:68
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:38
-msgid "EDV US"
-msgstr ""
-
-#: templates/summary.html:49 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
-#: templates/summary.html:51
+#: templates/summary.html:81
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:53
+#: templates/summary.html:83
 msgid "Syncing"
 msgstr ""
 
-#: templates/summary.html:55
+#: templates/summary.html:85
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:78
+#: templates/summary.html:108
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:79
+#: templates/summary.html:109
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
-#: templates/wallet.html:45
+#: templates/wallet.html:75
 msgid "Wallet Settings"
 msgstr ""
 
-#: templates/wallet.html:55
+#: templates/wallet.html:85
 msgid "Cold Wallet Address:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/wallet.html:61
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/wallet.html:62
-msgid "Save"
-msgstr ""
-
-#: templates/wallet.html:69
+#: templates/wallet.html:99
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:79
+#: templates/wallet.html:109
 msgid "Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:80
+#: templates/wallet.html:110
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:81
+#: templates/wallet.html:111
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:82
-msgid "USD*"
+#: templates/wallet.html:136
+msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:117
+#: templates/wallet.html:147
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:141
+#: templates/wallet.html:171
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:142
+#: templates/wallet.html:172
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1224,4 +1294,3 @@ msgstr ""
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr ""
-
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
index e0f4baa0..501e4f2a 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-20 17:15-0700\n"
+"POT-Creation-Date: 2022-02-21 17:14-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: fr\n"
@@ -18,27 +18,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:90
+#: routes.py:76 routes.py:218
+msgid "Saved local currency setting."
+msgstr "Paramètre de devise locale enregistré."
+
+#: routes.py:95
 msgid "Blockchain download"
 msgstr "Télécharger le blockchain"
 
-#: routes.py:122
+#: routes.py:127
 msgid "Unknown plotting form"
 msgstr "Forme inconnue"
 
-#: routes.py:172
+#: routes.py:177
 msgid "Error! Please see logs."
 msgstr "Erreur! Veuillez consulter les journaux."
 
-#: routes.py:198
+#: routes.py:203
 msgid "Unknown alerts form"
 msgstr "Forme inconnue"
 
-#: routes.py:269
+#: routes.py:223
+msgid "Saved cold wallet addresses."
+msgstr "Adresses de portefeuille froid enregistrées."
+
+#: routes.py:282
 msgid "Unknown form action"
 msgstr "Action inconnue"
 
-#: routes.py:374
+#: routes.py:387
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
@@ -46,7 +54,7 @@ msgstr ""
 "Aucun travailleur %{worker} pour la blockchain %{blockchain}. Veuillez "
 "sélectionner une autre blockchain."
 
-#: routes.py:380
+#: routes.py:393
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
@@ -54,7 +62,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour notifier%{blockchain}. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:385
+#: routes.py:398
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
@@ -62,7 +70,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour cultiver%{blockchain}. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:392
+#: routes.py:405
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
@@ -70,16 +78,24 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour parceller%{blockchain}. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:397
+#: routes.py:410
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour %{blockchain}. Veuillez "
 "vérifier vos travailleurs."
 
-#: routes.py:416
+#: routes.py:429
 msgid "Unsupported log type"
 msgstr "Type de journal non pris en charge"
 
+#: actions/stats.py:338
+msgid "secs"
+msgstr "secs"
+
+#: actions/stats.py:348 models/chia.py:228
+msgid "hour"
+msgstr "heure"
+
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
 msgstr "Le worker ne répond pas aux pings."
@@ -108,6 +124,58 @@ msgstr ""
 "Veuillez utiliser une version cohérente de Machinaris pour éviter les "
 "problèmes."
 
+#: models/chia.py:133 models/chia.py:222
+msgid "days"
+msgstr "jours"
+
+#: models/chia.py:210
+msgid "years"
+msgstr "ans"
+
+#: models/chia.py:212
+msgid "year"
+msgstr "an"
+
+#: models/chia.py:214
+msgid "months"
+msgstr "mois"
+
+#: models/chia.py:216
+msgid "month"
+msgstr "mois"
+
+#: models/chia.py:218
+msgid "weeks"
+msgstr "semaines"
+
+#: models/chia.py:220
+msgid "week"
+msgstr "semaine"
+
+#: models/chia.py:224
+msgid "day"
+msgstr "jour"
+
+#: models/chia.py:226
+msgid "hours"
+msgstr "heures"
+
+#: models/chia.py:230
+msgid "minutes"
+msgstr "minutes"
+
+#: models/chia.py:232
+msgid "minute"
+msgstr "minute"
+
+#: models/chia.py:234
+msgid "Never (no plots)"
+msgstr "Jamais (pas de plots)"
+
+#: models/chia.py:236
+msgid "Soon"
+msgstr "Bientôt"
+
 #: templates/alerts.html:14
 msgid "Alerts: Recent Notifications"
 msgstr "Alertes: notifications récentes"
@@ -121,7 +189,7 @@ msgstr "Worker"
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:27 templates/wallet.html:77 templates/worker.html:47
+#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr "Blockchain"
@@ -228,12 +296,13 @@ msgstr "Pools"
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:31
+#: templates/plotting/workers.html:96 templates/summary.html:61
 #: templates/workers.html:14
 msgid "Workers"
 msgstr "Workers"
 
-#: templates/base.html:91
+#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
+#: templates/wallet.html:22 templates/wallet.html:45
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -285,8 +354,8 @@ msgstr "Plotman"
 msgid "Blockchain Summary"
 msgstr "Blockchain"
 
-#: templates/blockchains.html:32 templates/summary.html:28
-#: templates/wallet.html:78
+#: templates/blockchains.html:32 templates/summary.html:58
+#: templates/wallet.html:108
 msgid "Status"
 msgstr "Statut"
 
@@ -298,7 +367,7 @@ msgstr "Hauteur maximale"
 msgid "Peak Time"
 msgstr "Heure de pointe"
 
-#: templates/blockchains.html:35 templates/wallet.html:83
+#: templates/blockchains.html:35 templates/wallet.html:113
 msgid "Updated At"
 msgstr "Mis à jour à"
 
@@ -360,7 +429,9 @@ msgstr "Ajouter une nouvelle connexion"
 
 #: templates/connections.html:143
 msgid "No connections found from any farmers yet. Perhaps just starting?"
-msgstr "Aucune connexion trouvée d'aucun worker pour le moment. Peut-être juste commencer?"
+msgstr ""
+"Aucune connexion trouvée d'aucun worker pour le moment. Peut-être juste "
+"commencer?"
 
 #: templates/connections.html:144
 msgid ""
@@ -388,7 +459,7 @@ msgstr "Plots totales"
 msgid "Total Plots Size"
 msgstr "Taille totale des plots"
 
-#: templates/index.html:89
+#: templates/index.html:89 templates/wallet.html:112
 msgid "Balance"
 msgstr "Total"
 
@@ -593,109 +664,110 @@ msgstr ""
 "mnenmoic vous-même sur la ligne de commande, consultez les %(wiki_link)s "
 "pour plus de détails."
 
-#: templates/summary.html:29
+#: templates/summary.html:15 templates/wallet.html:51
+msgid "Local Currency:"
+msgstr "Monnaie locale:"
+
+#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
+#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
+#: templates/plotting/workers.html:34 templates/settings/pools.html:39
+#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+msgid "Cancel"
+msgstr "Annuler"
+
+#: templates/settings/alerts.html:55 templates/settings/farming.html:56
+#: templates/settings/plotting.html:56 templates/settings/pools.html:41
+#: templates/settings/tools.html:55 templates/summary.html:29
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: templates/summary.html:59
 msgid "Height"
 msgstr "Hauteur"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:30
+#: templates/summary.html:60
 msgid "Plots"
 msgstr "Plots"
 
-#: templates/summary.html:32
+#: templates/summary.html:62
 msgid "Max Resp."
 msgstr "Resp. Max"
 
-#: templates/summary.html:33
+#: templates/summary.html:63
 msgid "Partials"
 msgstr "Partiels"
 
-#: templates/summary.html:34
+#: templates/summary.html:64
 msgid "ETW"
 msgstr "ETW"
 
-#: templates/summary.html:36
+#: templates/summary.html:66
 msgid "Wallet"
 msgstr "Portefeuille"
 
-#: templates/summary.html:37
+#: templates/summary.html:67 templates/summary.html:68
 msgid "EDV"
 msgstr "EDV"
 
-#: templates/summary.html:38
-msgid "EDV US"
-msgstr "EDV US"
-
-#: templates/summary.html:49 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: templates/summary.html:51
+#: templates/summary.html:81
 msgid "Synced"
 msgstr "Synchronisé"
 
-#: templates/summary.html:53
+#: templates/summary.html:83
 msgid "Syncing"
 msgstr "Synchronisation"
 
-#: templates/summary.html:55
+#: templates/summary.html:85
 msgid "Not Synced"
 msgstr "Non synchronisé"
 
-#: templates/summary.html:78
+#: templates/summary.html:108
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr "Aucune blockchain trouvée chez les farmers. Pas ajouté?"
 
-#: templates/summary.html:79
+#: templates/summary.html:109
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Veuillez prévoir au moins 15 minutes pour que les blockchains commencent."
 
-#: templates/wallet.html:45
+#: templates/wallet.html:75
 msgid "Wallet Settings"
 msgstr "Paramètres du portefeuille"
 
-#: templates/wallet.html:55
+#: templates/wallet.html:85
 msgid "Cold Wallet Address:"
 msgstr "Adresse du portefeuille froid:"
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/wallet.html:61
-msgid "Cancel"
-msgstr "Annuler"
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/wallet.html:62
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: templates/wallet.html:69
+#: templates/wallet.html:99
 msgid "Wallet Summary"
 msgstr "Résumé quotidien"
 
-#: templates/wallet.html:79
+#: templates/wallet.html:109
 msgid "Wallet Balance"
 msgstr "Solde du portefeuille"
 
-#: templates/wallet.html:80
+#: templates/wallet.html:110
 msgid "Cold Wallet Balance"
 msgstr "Solde de portefeuille froid"
 
-#: templates/wallet.html:81
+#: templates/wallet.html:111
 msgid "Total Balance"
 msgstr "Solde total"
 
-#: templates/wallet.html:82
-msgid "USD*"
-msgstr "USD*"
+#: templates/wallet.html:136
+msgid "Edit Wallet"
+msgstr "Modifier le portefeuille"
 
-#: templates/wallet.html:117
+#: templates/wallet.html:147
 msgid "Wallet Details"
 msgstr "Détails du portefeuille"
 
-#: templates/wallet.html:141
+#: templates/wallet.html:171
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -703,7 +775,7 @@ msgstr ""
 "Aucun statut de portefeuille reçu. Peut-être que vous venez juste de "
 "commencer? Veuillez autoriser au moins 10 minutes pour mettre à jour."
 
-#: templates/wallet.html:142
+#: templates/wallet.html:172
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1316,4 +1388,3 @@ msgstr "Commencer..."
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr "Journaux PlotNFT de"
-
diff --git a/web/translations/it/LC_MESSAGES/messages.po b/web/translations/it/LC_MESSAGES/messages.po
index 259fb3ad..7a40b28d 100644
--- a/web/translations/it/LC_MESSAGES/messages.po
+++ b/web/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-20 17:15-0700\n"
+"POT-Creation-Date: 2022-02-21 17:14-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -18,58 +18,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:90
+#: routes.py:76 routes.py:218
+msgid "Saved local currency setting."
+msgstr ""
+
+#: routes.py:95
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:122
+#: routes.py:127
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:172
+#: routes.py:177
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:198
+#: routes.py:203
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:269
+#: routes.py:223
+msgid "Saved cold wallet addresses."
+msgstr ""
+
+#: routes.py:282
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:374
+#: routes.py:387
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:380
+#: routes.py:393
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:385
+#: routes.py:398
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:392
+#: routes.py:405
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:397
+#: routes.py:410
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:416
+#: routes.py:429
 msgid "Unsupported log type"
 msgstr ""
 
+#: actions/stats.py:338
+msgid "secs"
+msgstr ""
+
+#: actions/stats.py:348 models/chia.py:228
+msgid "hour"
+msgstr ""
+
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
 msgstr ""
@@ -94,6 +110,58 @@ msgstr ""
 msgid "Please use a consistent Machinaris version to avoid issues."
 msgstr ""
 
+#: models/chia.py:133 models/chia.py:222
+msgid "days"
+msgstr ""
+
+#: models/chia.py:210
+msgid "years"
+msgstr ""
+
+#: models/chia.py:212
+msgid "year"
+msgstr ""
+
+#: models/chia.py:214
+msgid "months"
+msgstr ""
+
+#: models/chia.py:216
+msgid "month"
+msgstr ""
+
+#: models/chia.py:218
+msgid "weeks"
+msgstr ""
+
+#: models/chia.py:220
+msgid "week"
+msgstr ""
+
+#: models/chia.py:224
+msgid "day"
+msgstr ""
+
+#: models/chia.py:226
+msgid "hours"
+msgstr ""
+
+#: models/chia.py:230
+msgid "minutes"
+msgstr ""
+
+#: models/chia.py:232
+msgid "minute"
+msgstr ""
+
+#: models/chia.py:234
+msgid "Never (no plots)"
+msgstr ""
+
+#: models/chia.py:236
+msgid "Soon"
+msgstr ""
+
 #: templates/alerts.html:14
 msgid "Alerts: Recent Notifications"
 msgstr ""
@@ -107,7 +175,7 @@ msgstr ""
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:27 templates/wallet.html:77 templates/worker.html:47
+#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -212,12 +280,13 @@ msgstr ""
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:31
+#: templates/plotting/workers.html:96 templates/summary.html:61
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91
+#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
+#: templates/wallet.html:22 templates/wallet.html:45
 msgid "Settings"
 msgstr ""
 
@@ -269,8 +338,8 @@ msgstr ""
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/summary.html:28
-#: templates/wallet.html:78
+#: templates/blockchains.html:32 templates/summary.html:58
+#: templates/wallet.html:108
 msgid "Status"
 msgstr ""
 
@@ -282,7 +351,7 @@ msgstr ""
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/wallet.html:83
+#: templates/blockchains.html:35 templates/wallet.html:113
 msgid "Updated At"
 msgstr ""
 
@@ -372,7 +441,7 @@ msgstr ""
 msgid "Total Plots Size"
 msgstr ""
 
-#: templates/index.html:89
+#: templates/index.html:89 templates/wallet.html:112
 msgid "Balance"
 msgstr ""
 
@@ -553,115 +622,116 @@ msgid ""
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
 
-#: templates/summary.html:29
+#: templates/summary.html:15 templates/wallet.html:51
+msgid "Local Currency:"
+msgstr ""
+
+#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
+#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
+#: templates/plotting/workers.html:34 templates/settings/pools.html:39
+#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings/alerts.html:55 templates/settings/farming.html:56
+#: templates/settings/plotting.html:56 templates/settings/pools.html:41
+#: templates/settings/tools.html:55 templates/summary.html:29
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Save"
+msgstr ""
+
+#: templates/summary.html:59
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:30
+#: templates/summary.html:60
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:32
+#: templates/summary.html:62
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:33
+#: templates/summary.html:63
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:34
+#: templates/summary.html:64
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:36
+#: templates/summary.html:66
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:37
+#: templates/summary.html:67 templates/summary.html:68
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:38
-msgid "EDV US"
-msgstr ""
-
-#: templates/summary.html:49 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
-#: templates/summary.html:51
+#: templates/summary.html:81
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:53
+#: templates/summary.html:83
 msgid "Syncing"
 msgstr ""
 
-#: templates/summary.html:55
+#: templates/summary.html:85
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:78
+#: templates/summary.html:108
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:79
+#: templates/summary.html:109
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
-#: templates/wallet.html:45
+#: templates/wallet.html:75
 msgid "Wallet Settings"
 msgstr ""
 
-#: templates/wallet.html:55
+#: templates/wallet.html:85
 msgid "Cold Wallet Address:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/wallet.html:61
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/wallet.html:62
-msgid "Save"
-msgstr ""
-
-#: templates/wallet.html:69
+#: templates/wallet.html:99
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:79
+#: templates/wallet.html:109
 msgid "Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:80
+#: templates/wallet.html:110
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:81
+#: templates/wallet.html:111
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:82
-msgid "USD*"
+#: templates/wallet.html:136
+msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:117
+#: templates/wallet.html:147
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:141
+#: templates/wallet.html:171
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:142
+#: templates/wallet.html:172
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1219,4 +1289,3 @@ msgstr ""
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr ""
-
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index 9e5fea14..f5f3c213 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-20 17:15-0700\n"
+"POT-Creation-Date: 2022-02-21 17:14-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: zh\n"
@@ -18,58 +18,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:90
+#: routes.py:76 routes.py:218
+msgid "Saved local currency setting."
+msgstr ""
+
+#: routes.py:95
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:122
+#: routes.py:127
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:172
+#: routes.py:177
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:198
+#: routes.py:203
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:269
+#: routes.py:223
+msgid "Saved cold wallet addresses."
+msgstr ""
+
+#: routes.py:282
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:374
+#: routes.py:387
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:380
+#: routes.py:393
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:385
+#: routes.py:398
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:392
+#: routes.py:405
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:397
+#: routes.py:410
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:416
+#: routes.py:429
 msgid "Unsupported log type"
 msgstr ""
 
+#: actions/stats.py:338
+msgid "secs"
+msgstr ""
+
+#: actions/stats.py:348 models/chia.py:228
+msgid "hour"
+msgstr ""
+
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
 msgstr ""
@@ -94,6 +110,58 @@ msgstr ""
 msgid "Please use a consistent Machinaris version to avoid issues."
 msgstr ""
 
+#: models/chia.py:133 models/chia.py:222
+msgid "days"
+msgstr ""
+
+#: models/chia.py:210
+msgid "years"
+msgstr ""
+
+#: models/chia.py:212
+msgid "year"
+msgstr ""
+
+#: models/chia.py:214
+msgid "months"
+msgstr ""
+
+#: models/chia.py:216
+msgid "month"
+msgstr ""
+
+#: models/chia.py:218
+msgid "weeks"
+msgstr ""
+
+#: models/chia.py:220
+msgid "week"
+msgstr ""
+
+#: models/chia.py:224
+msgid "day"
+msgstr ""
+
+#: models/chia.py:226
+msgid "hours"
+msgstr ""
+
+#: models/chia.py:230
+msgid "minutes"
+msgstr ""
+
+#: models/chia.py:232
+msgid "minute"
+msgstr ""
+
+#: models/chia.py:234
+msgid "Never (no plots)"
+msgstr ""
+
+#: models/chia.py:236
+msgid "Soon"
+msgstr ""
+
 #: templates/alerts.html:14
 msgid "Alerts: Recent Notifications"
 msgstr ""
@@ -107,7 +175,7 @@ msgstr ""
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:27 templates/wallet.html:77 templates/worker.html:47
+#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -212,12 +280,13 @@ msgstr ""
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:31
+#: templates/plotting/workers.html:96 templates/summary.html:61
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91
+#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
+#: templates/wallet.html:22 templates/wallet.html:45
 msgid "Settings"
 msgstr ""
 
@@ -269,8 +338,8 @@ msgstr ""
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/summary.html:28
-#: templates/wallet.html:78
+#: templates/blockchains.html:32 templates/summary.html:58
+#: templates/wallet.html:108
 msgid "Status"
 msgstr ""
 
@@ -282,7 +351,7 @@ msgstr ""
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/wallet.html:83
+#: templates/blockchains.html:35 templates/wallet.html:113
 msgid "Updated At"
 msgstr ""
 
@@ -372,7 +441,7 @@ msgstr ""
 msgid "Total Plots Size"
 msgstr ""
 
-#: templates/index.html:89
+#: templates/index.html:89 templates/wallet.html:112
 msgid "Balance"
 msgstr ""
 
@@ -553,115 +622,116 @@ msgid ""
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
 
-#: templates/summary.html:29
+#: templates/summary.html:15 templates/wallet.html:51
+msgid "Local Currency:"
+msgstr ""
+
+#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
+#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
+#: templates/plotting/workers.html:34 templates/settings/pools.html:39
+#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings/alerts.html:55 templates/settings/farming.html:56
+#: templates/settings/plotting.html:56 templates/settings/pools.html:41
+#: templates/settings/tools.html:55 templates/summary.html:29
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Save"
+msgstr ""
+
+#: templates/summary.html:59
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:30
+#: templates/summary.html:60
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:32
+#: templates/summary.html:62
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:33
+#: templates/summary.html:63
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:34
+#: templates/summary.html:64
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:36
+#: templates/summary.html:66
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:37
+#: templates/summary.html:67 templates/summary.html:68
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:38
-msgid "EDV US"
-msgstr ""
-
-#: templates/summary.html:49 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
-#: templates/summary.html:51
+#: templates/summary.html:81
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:53
+#: templates/summary.html:83
 msgid "Syncing"
 msgstr ""
 
-#: templates/summary.html:55
+#: templates/summary.html:85
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:78
+#: templates/summary.html:108
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:79
+#: templates/summary.html:109
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
-#: templates/wallet.html:45
+#: templates/wallet.html:75
 msgid "Wallet Settings"
 msgstr ""
 
-#: templates/wallet.html:55
+#: templates/wallet.html:85
 msgid "Cold Wallet Address:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/wallet.html:61
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/wallet.html:62
-msgid "Save"
-msgstr ""
-
-#: templates/wallet.html:69
+#: templates/wallet.html:99
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:79
+#: templates/wallet.html:109
 msgid "Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:80
+#: templates/wallet.html:110
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:81
+#: templates/wallet.html:111
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:82
-msgid "USD*"
+#: templates/wallet.html:136
+msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:117
+#: templates/wallet.html:147
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:141
+#: templates/wallet.html:171
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:142
+#: templates/wallet.html:172
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."

From 3d968f8bb6a768e8e7a914f19a94cd21134aa24c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 22 Feb 2022 17:45:26 -0700
Subject: [PATCH 0604/1625] Testing maize build issues.

---
 CHANGELOG.md                   | 1 +
 scripts/forks/maize_install.sh | 2 ++
 web/templates/summary.html     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 367e7a69..3d69b3d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. The format
 ## [0.7.0] - 2022-03-04
  - [Chia](https://www.chia.net/2022/02/09/1.3-beta-release.en.html) - beta of v1.3 release (chia version reports v1.2.12dev254 currently)
  - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
+ - Internationalization support for locale-specific text, numbers, and currencies.  Translators wanted!
 
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
diff --git a/scripts/forks/maize_install.sh b/scripts/forks/maize_install.sh
index d018bd9b..6e471767 100644
--- a/scripts/forks/maize_install.sh
+++ b/scripts/forks/maize_install.sh
@@ -10,11 +10,13 @@ HASH=d6375e840084c269faadf6c511c9321180d17d13
 if [ -z ${MAIZE_BRANCH} ]; then
 	echo 'Skipping Maize install as not requested.'
 else
+	cd /
 	rm -rf /root/.cache
 	git clone --branch ${MAIZE_BRANCH} --single-branch https://github.com/Maize-Network/maize-blockchain.git /maize-blockchain
 	cd /maize-blockchain 
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
+	pwd
 	chmod +x install.sh
 	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
 	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
diff --git a/web/templates/summary.html b/web/templates/summary.html
index d17ae32b..3e4973b4 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -81,7 +81,7 @@ 
                 
                 
    
-                
+                

From 46e690a35cd3f8d843c21b33b30a4206d8ed1646 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 22 Feb 2022 21:04:19 -0700
Subject: [PATCH 0605/1625] Extract API messages returned to user.

---
 api/commands/chia_cli.py                    |  3 +-
 api/commands/pools_cli.py                   | 17 ++---
 api/translations/de/LC_MESSAGES/messages.po | 32 ++++++++-
 api/translations/fr/LC_MESSAGES/messages.po | 41 +++++++++++-
 api/translations/it/LC_MESSAGES/messages.po | 32 ++++++++-
 api/translations/zh/LC_MESSAGES/messages.po | 32 ++++++++-
 web/translations/de/LC_MESSAGES/messages.po | 73 +++++++++++----------
 web/translations/fr/LC_MESSAGES/messages.po | 73 +++++++++++----------
 web/translations/it/LC_MESSAGES/messages.po | 73 +++++++++++----------
 web/translations/zh/LC_MESSAGES/messages.po | 72 ++++++++++----------
 10 files changed, 290 insertions(+), 158 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index f7774687..bd6e59af 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -16,6 +16,7 @@
 import yaml
 
 from flask import Flask, jsonify, abort, request, flash
+from flask_babel import _, lazy_gettext as _l
 from stat import S_ISREG, ST_CTIME, ST_MTIME, ST_MODE, ST_SIZE
 from subprocess import Popen, TimeoutExpired, PIPE, STDOUT
 from os import path
@@ -62,7 +63,7 @@ def save_config(config, blockchain):
             writer.write(config)
     except Exception as ex:
         app.logger.info(traceback.format_exc())
-        raise Exception('Updated config.yaml failed validation!\n' + str(ex))
+        raise Exception(_('Updated config.yaml failed validation!') + '\n' + str(ex))
     else:
         pass
 
diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index 49b0ee06..566a784e 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -18,6 +18,7 @@
 import urllib
 import yaml
 
+from flask_babel import _, lazy_gettext as _l
 from stat import S_ISREG, ST_CTIME, ST_MTIME, ST_MODE, ST_SIZE
 from subprocess import Popen, TimeoutExpired, PIPE
 from sqlalchemy import or_
@@ -64,7 +65,7 @@ def dispatch_action(job):
         if msg.strip():
             return msg
         else:
-            return "No requested pool modifications were sent.  Current settings are unchanged."
+            return _("No requested pool modifications were sent. Current settings are unchanged.")
     else:
         raise Exception("Unsupported action {0} for pools.".format(action))
 
@@ -122,7 +123,7 @@ def process_pool_save(blockchain, choice, pool_wallet_id, pool_url, current_pool
 
 def process_pool_leave(blockchain, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    cmd = "wallet_num{0} plotnft leave -y -i {1}".format(chia_binary, pool_wallet_id)
+    cmd = "{0} plotnft leave -y -i {1}".format(chia_binary, pool_wallet_id)
     app.logger.info("Attempting to leave pool: {0}".format(cmd))
     result = ""
     child = pexpect.spawn(cmd)
@@ -147,7 +148,7 @@ def process_pool_leave(blockchain, pool_wallet_id):
     for line in stdout_lines:
         if "Error" in line:
             raise Exception('Error while leaving pool: ' + line)
-    return 'Successfully left pool, switching to self plotting.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. View the log for details.'
+    return _('Successfully left pool, switching to self plotting. Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. View the log for details.')
 
 def process_pool_join(blockchain, pool_url, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
@@ -162,10 +163,10 @@ def process_pool_join(blockchain, pool_url, pool_wallet_id):
     if not result.netloc:
         raise Exception("No hostname or IP provided.")
     if pool_wallet_id: # Just joining a pool with existing NFT
-        cmd = "wallet_num{0} plotnft join -y -u {1} -i {2}".format(chia_binary, pool_url, pool_wallet_id)
+        cmd = "{0} plotnft join -y -u {1} -i {2}".format(chia_binary, pool_url, pool_wallet_id)
         pool_wallet_id = pool_wallet_id
     else:  # Both creating NFT and joining pool in one setp
-        cmd = "wallet_num{0} plotnft create -y -u {1} -s pool".format(chia_binary, pool_url)
+        cmd = "{0} plotnft create -y -u {1} -s pool".format(chia_binary, pool_url)
         pool_wallet_id = 1
     app.logger.info("Executing: {0}".format(cmd))
     result = ""
@@ -191,11 +192,11 @@ def process_pool_join(blockchain, pool_url, pool_wallet_id):
         for line in stdout_lines:
             if "Error" in line:
                 raise Exception('Error while joining Chia pool. Please double-check pool URL: {0} {1}'.format(pool_url, line))
-    return 'Successfully joined {0} pool by creating Chia NFT.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. Be patient! View the log for details.'.format(pool_url)
+    return _('Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. Be patient! View the log for details.', pool_url=pool_url)
 
 def process_self_pool(blockchain, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    cmd = "wallet_num{0} plotnft create -y -s local".format(chia_binary)
+    cmd = "{0} plotnft create -y -s local".format(chia_binary)
     app.logger.info("Attempting to create NFT for self-pooling. {0}".format(cmd))
     result = ""
     child = pexpect.spawn(cmd)
@@ -220,4 +221,4 @@ def process_self_pool(blockchain, pool_wallet_id):
     for line in stdout_lines:
         if "Error" in line:
             raise Exception('Error while creating self-pooling NFT: {0}'.format(line))
-    return 'Successfully created a NFT for self-pooling.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. Be patient! View the log for details.'
+    return _('Successfully created a NFT for self-pooling.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. Be patient! View the log for details.')
diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de/LC_MESSAGES/messages.po
index a836946a..b58f0a51 100644
--- a/api/translations/de/LC_MESSAGES/messages.po
+++ b/api/translations/de/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues/353\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
@@ -17,6 +17,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: commands/chia_cli.py:66
+msgid "Updated config.yaml failed validation!"
+msgstr ""
+
+#: commands/pools_cli.py:68
+msgid "No requested pool modifications were sent. Current settings are unchanged."
+msgstr ""
+
+#: commands/pools_cli.py:151
+msgid ""
+"Successfully left pool, switching to self plotting. Please wait a few "
+"minutes or more to complete. DO NOT immediately re-submit your request. "
+"View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:195
+#, python-format
+msgid ""
+"Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait "
+"a few minutes or more to complete. DO NOT immediately re-submit your "
+"request. Be patient! View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:224
+msgid ""
+"Successfully created a NFT for self-pooling.  Please wait a few minutes "
+"or more to complete. DO NOT immediately re-submit your request. Be "
+"patient! View the log for details."
+msgstr ""
+
 #: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr/LC_MESSAGES/messages.po
index ebfa1dab..e7ae9ce1 100644
--- a/api/translations/fr/LC_MESSAGES/messages.po
+++ b/api/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
@@ -18,7 +18,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: commands/chia_cli.py:66
+msgid "Updated config.yaml failed validation!"
+msgstr "Échec de la validation du fichier config.yaml mis à jour!"
+
+#: commands/pools_cli.py:68
+msgid "No requested pool modifications were sent. Current settings are unchanged."
+msgstr "Aucune modification de pool demandée n'a été envoyée. Les paramètres actuels sont inchangés."
+
+#: commands/pools_cli.py:151
+msgid ""
+"Successfully left pool, switching to self plotting. Please wait a few "
+"minutes or more to complete. DO NOT immediately re-submit your request. "
+"View the log for details."
+msgstr "Le pool a été quitté avec succès, passant à self-plotting. Veuillez patienter quelques instants"
+"minutes ou plus pour terminer. NE PAS soumettre à nouveau votre demande immédiatement."
+"Afficher le journal pour plus de détails."
+
+#: commands/pools_cli.py:195
+#, python-format
+msgid ""
+"Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait "
+"a few minutes or more to complete. DO NOT immediately re-submit your "
+"request. Be patient! View the log for details."
+msgstr ""
+"Rejoindre avec succès le pool %(pool_url)s en créant Chia NFT. Veuillez patienter"
+"quelques minutes ou plus pour terminer. NE RENOUVELEZ PAS immédiatement votre "
+"demande. Soyez patient! Consultez le journal pour plus de détails."
+
+#: commands/pools_cli.py:224
+msgid ""
+"Successfully created a NFT for self-pooling.  Please wait a few minutes "
+"or more to complete. DO NOT immediately re-submit your request. Be "
+"patient! View the log for details."
+msgstr ""
+"Un NFT a été créé avec succès pour l'auto-pooling. Veuillez patienter quelques minutes "
+"ou plus à compléter. NE PAS soumettre à nouveau votre demande immédiatement. Soyez "
+"patient! Consultez le journal pour plus de détails."
+
 #: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr "Le pong!"
-
diff --git a/api/translations/it/LC_MESSAGES/messages.po b/api/translations/it/LC_MESSAGES/messages.po
index 17b3d5ae..860342ef 100644
--- a/api/translations/it/LC_MESSAGES/messages.po
+++ b/api/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -18,6 +18,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: commands/chia_cli.py:66
+msgid "Updated config.yaml failed validation!"
+msgstr ""
+
+#: commands/pools_cli.py:68
+msgid "No requested pool modifications were sent. Current settings are unchanged."
+msgstr ""
+
+#: commands/pools_cli.py:151
+msgid ""
+"Successfully left pool, switching to self plotting. Please wait a few "
+"minutes or more to complete. DO NOT immediately re-submit your request. "
+"View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:195
+#, python-format
+msgid ""
+"Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait "
+"a few minutes or more to complete. DO NOT immediately re-submit your "
+"request. Be patient! View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:224
+msgid ""
+"Successfully created a NFT for self-pooling.  Please wait a few minutes "
+"or more to complete. DO NOT immediately re-submit your request. Be "
+"patient! View the log for details."
+msgstr ""
+
 #: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index be19aa01..272fbd35 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: zh\n"
@@ -18,6 +18,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: commands/chia_cli.py:66
+msgid "Updated config.yaml failed validation!"
+msgstr ""
+
+#: commands/pools_cli.py:68
+msgid "No requested pool modifications were sent. Current settings are unchanged."
+msgstr ""
+
+#: commands/pools_cli.py:151
+msgid ""
+"Successfully left pool, switching to self plotting. Please wait a few "
+"minutes or more to complete. DO NOT immediately re-submit your request. "
+"View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:195
+#, python-format
+msgid ""
+"Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait "
+"a few minutes or more to complete. DO NOT immediately re-submit your "
+"request. Be patient! View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:224
+msgid ""
+"Successfully created a NFT for self-pooling.  Please wait a few minutes "
+"or more to complete. DO NOT immediately re-submit your request. Be "
+"patient! View the log for details."
+msgstr ""
+
 #: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
diff --git a/web/translations/de/LC_MESSAGES/messages.po b/web/translations/de/LC_MESSAGES/messages.po
index aa8aed15..a3f865ac 100644
--- a/web/translations/de/LC_MESSAGES/messages.po
+++ b/web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
@@ -175,7 +175,7 @@ msgstr ""
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
+#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -281,13 +281,13 @@ msgstr ""
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:61
+#: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
-#: templates/wallet.html:22 templates/wallet.html:45
+#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
+#: templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
@@ -339,8 +339,8 @@ msgstr ""
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/summary.html:58
-#: templates/wallet.html:108
+#: templates/blockchains.html:32 templates/summary.html:74
+#: templates/wallet.html:109
 msgid "Status"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr ""
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/wallet.html:113
+#: templates/blockchains.html:35 templates/wallet.html:114
 msgid "Updated At"
 msgstr ""
 
@@ -443,7 +443,7 @@ msgstr ""
 msgid "Total Plots Size"
 msgstr ""
 
-#: templates/index.html:89 templates/wallet.html:112
+#: templates/index.html:89 templates/wallet.html:113
 msgid "Balance"
 msgstr ""
 
@@ -625,116 +625,116 @@ msgid ""
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
 
-#: templates/summary.html:15 templates/wallet.html:51
+#: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
 msgstr ""
 
 #: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
 #: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
 #: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
 msgid "Cancel"
 msgstr ""
 
 #: templates/settings/alerts.html:55 templates/settings/farming.html:56
 #: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:29
-#: templates/wallet.html:65 templates/wallet.html:92
+#: templates/settings/tools.html:55 templates/summary.html:45
+#: templates/wallet.html:66 templates/wallet.html:93
 msgid "Save"
 msgstr ""
 
-#: templates/summary.html:59
+#: templates/summary.html:75
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:60
+#: templates/summary.html:76
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:62
+#: templates/summary.html:78
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:63
+#: templates/summary.html:79
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:64
+#: templates/summary.html:80
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:66
+#: templates/summary.html:82
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:67 templates/summary.html:68
+#: templates/summary.html:83 templates/summary.html:84
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:95 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
-#: templates/summary.html:81
+#: templates/summary.html:97
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:83
+#: templates/summary.html:99
 msgid "Syncing"
 msgstr ""
 
-#: templates/summary.html:85
+#: templates/summary.html:101
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:108
+#: templates/summary.html:124
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:109
+#: templates/summary.html:125
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
-#: templates/wallet.html:75
+#: templates/wallet.html:76
 msgid "Wallet Settings"
 msgstr ""
 
-#: templates/wallet.html:85
+#: templates/wallet.html:86
 msgid "Cold Wallet Address:"
 msgstr ""
 
-#: templates/wallet.html:99
+#: templates/wallet.html:100
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:109
+#: templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:110
+#: templates/wallet.html:111
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:111
+#: templates/wallet.html:112
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:136
+#: templates/wallet.html:137
 msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:147
+#: templates/wallet.html:148
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:171
+#: templates/wallet.html:172
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:172
+#: templates/wallet.html:173
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1294,3 +1294,4 @@ msgstr ""
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr ""
+
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
index 501e4f2a..34b7961b 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: fr\n"
@@ -189,7 +189,7 @@ msgstr "Worker"
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
+#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr "Blockchain"
@@ -296,13 +296,13 @@ msgstr "Pools"
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:61
+#: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr "Workers"
 
-#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
-#: templates/wallet.html:22 templates/wallet.html:45
+#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
+#: templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -354,8 +354,8 @@ msgstr "Plotman"
 msgid "Blockchain Summary"
 msgstr "Blockchain"
 
-#: templates/blockchains.html:32 templates/summary.html:58
-#: templates/wallet.html:108
+#: templates/blockchains.html:32 templates/summary.html:74
+#: templates/wallet.html:109
 msgid "Status"
 msgstr "Statut"
 
@@ -367,7 +367,7 @@ msgstr "Hauteur maximale"
 msgid "Peak Time"
 msgstr "Heure de pointe"
 
-#: templates/blockchains.html:35 templates/wallet.html:113
+#: templates/blockchains.html:35 templates/wallet.html:114
 msgid "Updated At"
 msgstr "Mis à jour à"
 
@@ -459,7 +459,7 @@ msgstr "Plots totales"
 msgid "Total Plots Size"
 msgstr "Taille totale des plots"
 
-#: templates/index.html:89 templates/wallet.html:112
+#: templates/index.html:89 templates/wallet.html:113
 msgid "Balance"
 msgstr "Total"
 
@@ -664,110 +664,110 @@ msgstr ""
 "mnenmoic vous-même sur la ligne de commande, consultez les %(wiki_link)s "
 "pour plus de détails."
 
-#: templates/summary.html:15 templates/wallet.html:51
+#: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
 msgstr "Monnaie locale:"
 
 #: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
 #: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
 #: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
 msgid "Cancel"
 msgstr "Annuler"
 
 #: templates/settings/alerts.html:55 templates/settings/farming.html:56
 #: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:29
-#: templates/wallet.html:65 templates/wallet.html:92
+#: templates/settings/tools.html:55 templates/summary.html:45
+#: templates/wallet.html:66 templates/wallet.html:93
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/summary.html:59
+#: templates/summary.html:75
 msgid "Height"
 msgstr "Hauteur"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:60
+#: templates/summary.html:76
 msgid "Plots"
 msgstr "Plots"
 
-#: templates/summary.html:62
+#: templates/summary.html:78
 msgid "Max Resp."
 msgstr "Resp. Max"
 
-#: templates/summary.html:63
+#: templates/summary.html:79
 msgid "Partials"
 msgstr "Partiels"
 
-#: templates/summary.html:64
+#: templates/summary.html:80
 msgid "ETW"
 msgstr "ETW"
 
-#: templates/summary.html:66
+#: templates/summary.html:82
 msgid "Wallet"
 msgstr "Portefeuille"
 
-#: templates/summary.html:67 templates/summary.html:68
+#: templates/summary.html:83 templates/summary.html:84
 msgid "EDV"
 msgstr "EDV"
 
-#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:95 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: templates/summary.html:81
+#: templates/summary.html:97
 msgid "Synced"
 msgstr "Synchronisé"
 
-#: templates/summary.html:83
+#: templates/summary.html:99
 msgid "Syncing"
 msgstr "Synchronisation"
 
-#: templates/summary.html:85
+#: templates/summary.html:101
 msgid "Not Synced"
 msgstr "Non synchronisé"
 
-#: templates/summary.html:108
+#: templates/summary.html:124
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr "Aucune blockchain trouvée chez les farmers. Pas ajouté?"
 
-#: templates/summary.html:109
+#: templates/summary.html:125
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Veuillez prévoir au moins 15 minutes pour que les blockchains commencent."
 
-#: templates/wallet.html:75
+#: templates/wallet.html:76
 msgid "Wallet Settings"
 msgstr "Paramètres du portefeuille"
 
-#: templates/wallet.html:85
+#: templates/wallet.html:86
 msgid "Cold Wallet Address:"
 msgstr "Adresse du portefeuille froid:"
 
-#: templates/wallet.html:99
+#: templates/wallet.html:100
 msgid "Wallet Summary"
 msgstr "Résumé quotidien"
 
-#: templates/wallet.html:109
+#: templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr "Solde du portefeuille"
 
-#: templates/wallet.html:110
+#: templates/wallet.html:111
 msgid "Cold Wallet Balance"
 msgstr "Solde de portefeuille froid"
 
-#: templates/wallet.html:111
+#: templates/wallet.html:112
 msgid "Total Balance"
 msgstr "Solde total"
 
-#: templates/wallet.html:136
+#: templates/wallet.html:137
 msgid "Edit Wallet"
 msgstr "Modifier le portefeuille"
 
-#: templates/wallet.html:147
+#: templates/wallet.html:148
 msgid "Wallet Details"
 msgstr "Détails du portefeuille"
 
-#: templates/wallet.html:171
+#: templates/wallet.html:172
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -775,7 +775,7 @@ msgstr ""
 "Aucun statut de portefeuille reçu. Peut-être que vous venez juste de "
 "commencer? Veuillez autoriser au moins 10 minutes pour mettre à jour."
 
-#: templates/wallet.html:172
+#: templates/wallet.html:173
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1388,3 +1388,4 @@ msgstr "Commencer..."
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr "Journaux PlotNFT de"
+
diff --git a/web/translations/it/LC_MESSAGES/messages.po b/web/translations/it/LC_MESSAGES/messages.po
index 7a40b28d..03babe22 100644
--- a/web/translations/it/LC_MESSAGES/messages.po
+++ b/web/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -175,7 +175,7 @@ msgstr ""
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
+#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:61
+#: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
-#: templates/wallet.html:22 templates/wallet.html:45
+#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
+#: templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
@@ -338,8 +338,8 @@ msgstr ""
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/summary.html:58
-#: templates/wallet.html:108
+#: templates/blockchains.html:32 templates/summary.html:74
+#: templates/wallet.html:109
 msgid "Status"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/wallet.html:113
+#: templates/blockchains.html:35 templates/wallet.html:114
 msgid "Updated At"
 msgstr ""
 
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Total Plots Size"
 msgstr ""
 
-#: templates/index.html:89 templates/wallet.html:112
+#: templates/index.html:89 templates/wallet.html:113
 msgid "Balance"
 msgstr ""
 
@@ -622,116 +622,116 @@ msgid ""
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
 
-#: templates/summary.html:15 templates/wallet.html:51
+#: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
 msgstr ""
 
 #: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
 #: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
 #: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
 msgid "Cancel"
 msgstr ""
 
 #: templates/settings/alerts.html:55 templates/settings/farming.html:56
 #: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:29
-#: templates/wallet.html:65 templates/wallet.html:92
+#: templates/settings/tools.html:55 templates/summary.html:45
+#: templates/wallet.html:66 templates/wallet.html:93
 msgid "Save"
 msgstr ""
 
-#: templates/summary.html:59
+#: templates/summary.html:75
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:60
+#: templates/summary.html:76
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:62
+#: templates/summary.html:78
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:63
+#: templates/summary.html:79
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:64
+#: templates/summary.html:80
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:66
+#: templates/summary.html:82
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:67 templates/summary.html:68
+#: templates/summary.html:83 templates/summary.html:84
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:95 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
-#: templates/summary.html:81
+#: templates/summary.html:97
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:83
+#: templates/summary.html:99
 msgid "Syncing"
 msgstr ""
 
-#: templates/summary.html:85
+#: templates/summary.html:101
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:108
+#: templates/summary.html:124
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:109
+#: templates/summary.html:125
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
-#: templates/wallet.html:75
+#: templates/wallet.html:76
 msgid "Wallet Settings"
 msgstr ""
 
-#: templates/wallet.html:85
+#: templates/wallet.html:86
 msgid "Cold Wallet Address:"
 msgstr ""
 
-#: templates/wallet.html:99
+#: templates/wallet.html:100
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:109
+#: templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:110
+#: templates/wallet.html:111
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:111
+#: templates/wallet.html:112
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:136
+#: templates/wallet.html:137
 msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:147
+#: templates/wallet.html:148
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:171
+#: templates/wallet.html:172
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:172
+#: templates/wallet.html:173
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1289,3 +1289,4 @@ msgstr ""
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr ""
+
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index f5f3c213..c076c47c 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-21 17:14-0700\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: zh\n"
@@ -175,7 +175,7 @@ msgstr ""
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:57 templates/wallet.html:107 templates/worker.html:47
+#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -280,13 +280,13 @@ msgstr ""
 
 #: templates/base.html:85 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:61
+#: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:9 templates/summary.html:37
-#: templates/wallet.html:22 templates/wallet.html:45
+#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
+#: templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
@@ -338,8 +338,8 @@ msgstr ""
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/summary.html:58
-#: templates/wallet.html:108
+#: templates/blockchains.html:32 templates/summary.html:74
+#: templates/wallet.html:109
 msgid "Status"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/wallet.html:113
+#: templates/blockchains.html:35 templates/wallet.html:114
 msgid "Updated At"
 msgstr ""
 
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Total Plots Size"
 msgstr ""
 
-#: templates/index.html:89 templates/wallet.html:112
+#: templates/index.html:89 templates/wallet.html:113
 msgid "Balance"
 msgstr ""
 
@@ -622,116 +622,116 @@ msgid ""
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
 
-#: templates/summary.html:15 templates/wallet.html:51
+#: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
 msgstr ""
 
 #: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
 #: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
 #: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:28 templates/wallet.html:64 templates/wallet.html:91
+#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
 msgid "Cancel"
 msgstr ""
 
 #: templates/settings/alerts.html:55 templates/settings/farming.html:56
 #: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:29
-#: templates/wallet.html:65 templates/wallet.html:92
+#: templates/settings/tools.html:55 templates/summary.html:45
+#: templates/wallet.html:66 templates/wallet.html:93
 msgid "Save"
 msgstr ""
 
-#: templates/summary.html:59
+#: templates/summary.html:75
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:60
+#: templates/summary.html:76
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:62
+#: templates/summary.html:78
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:63
+#: templates/summary.html:79
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:64
+#: templates/summary.html:80
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:66
+#: templates/summary.html:82
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:67 templates/summary.html:68
+#: templates/summary.html:83 templates/summary.html:84
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:79 templates/worker.html:78 templates/workers.html:72
+#: templates/summary.html:95 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
-#: templates/summary.html:81
+#: templates/summary.html:97
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:83
+#: templates/summary.html:99
 msgid "Syncing"
 msgstr ""
 
-#: templates/summary.html:85
+#: templates/summary.html:101
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:108
+#: templates/summary.html:124
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:109
+#: templates/summary.html:125
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
-#: templates/wallet.html:75
+#: templates/wallet.html:76
 msgid "Wallet Settings"
 msgstr ""
 
-#: templates/wallet.html:85
+#: templates/wallet.html:86
 msgid "Cold Wallet Address:"
 msgstr ""
 
-#: templates/wallet.html:99
+#: templates/wallet.html:100
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:109
+#: templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:110
+#: templates/wallet.html:111
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:111
+#: templates/wallet.html:112
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:136
+#: templates/wallet.html:137
 msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:147
+#: templates/wallet.html:148
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:171
+#: templates/wallet.html:172
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:172
+#: templates/wallet.html:173
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."

From caeb1f543194ca7c1d76ecd4ef94589d055e7407 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 23 Feb 2022 10:25:25 -0700
Subject: [PATCH 0606/1625] Doc updates.

---
 CHANGELOG.md | 2 +-
 CREDITS.md   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d69b3d3..25b6edbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format
 ## [0.7.0] - 2022-03-04
  - [Chia](https://www.chia.net/2022/02/09/1.3-beta-release.en.html) - beta of v1.3 release (chia version reports v1.2.12dev254 currently)
  - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
- - Internationalization support for locale-specific text, numbers, and currencies.  Translators wanted!
+ - Internationalization support for locale-specific text, numbers, and currencies.  [Translators wanted](https://github.com/guydavis/machinaris/wiki/Localization)!
 
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
diff --git a/CREDITS.md b/CREDITS.md
index 45721767..ebd0644f 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -41,8 +41,10 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [Stor](https://github.com/Stor-Network/stor-blockchain)
 
 ## Other Resources
-* [Blockchain DB Downloads](https://chiaforksblockchain.com/) - from Maize
+* [FD-CLI](https://github.com/Flora-Network/flora-dev-cli) - script to regularly recover 7/8 rewards 
+* [Chia DB Downloads](https://www.chia-database.com/) - for Chia blockchain database
 * [All the Blocks](https://alltheblocks.net/) - blockchain, wallet, and pricing info
+* [Coin Gecko](https://coingecko.com/) - fiat currency exchange info
 
 ## Testers and Developers
 

From 08b5fc36ef1e7c0c0fae7a4a252812fd031f5386 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 25 Feb 2022 15:58:50 -0700
Subject: [PATCH 0607/1625] Adding empty translation files for Portuguese.

---
 api/default_settings.py                     |    2 +-
 api/translations/pt/LC_MESSAGES/messages.po |   54 +
 web/default_settings.py                     |    2 +-
 web/templates/plotting/jobs.html            |    6 +-
 web/translations/pt/LC_MESSAGES/messages.po | 1292 +++++++++++++++++++
 5 files changed, 1353 insertions(+), 3 deletions(-)
 create mode 100644 api/translations/pt/LC_MESSAGES/messages.po
 create mode 100644 web/translations/pt/LC_MESSAGES/messages.po

diff --git a/api/default_settings.py b/api/default_settings.py
index c57747be..45ac91e4 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -51,4 +51,4 @@ class DefaultConfig:
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
 
     BABEL_TRANSLATION_DIRECTORIES = "api/translations"
-    LANGUAGES = ['en', 'de', 'fr', 'it', 'zh']
+    LANGUAGES = ['en', 'de', 'fr', 'it', 'pt', 'zh']
diff --git a/api/translations/pt/LC_MESSAGES/messages.po b/api/translations/pt/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..4d43984f
--- /dev/null
+++ b/api/translations/pt/LC_MESSAGES/messages.po
@@ -0,0 +1,54 @@
+# Portuguese translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"PO-Revision-Date: 2022-02-25 15:32-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: pt\n"
+"Language-Team: pt \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: commands/chia_cli.py:66
+msgid "Updated config.yaml failed validation!"
+msgstr ""
+
+#: commands/pools_cli.py:68
+msgid "No requested pool modifications were sent. Current settings are unchanged."
+msgstr ""
+
+#: commands/pools_cli.py:151
+msgid ""
+"Successfully left pool, switching to self plotting. Please wait a few "
+"minutes or more to complete. DO NOT immediately re-submit your request. "
+"View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:195
+#, python-format
+msgid ""
+"Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait "
+"a few minutes or more to complete. DO NOT immediately re-submit your "
+"request. Be patient! View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:224
+msgid ""
+"Successfully created a NFT for self-pooling.  Please wait a few minutes "
+"or more to complete. DO NOT immediately re-submit your request. Be "
+"patient! View the log for details."
+msgstr ""
+
+#: views/ping/resources.py:25 views/ping/resources.py:28
+msgid "Pong!"
+msgstr ""
+
diff --git a/web/default_settings.py b/web/default_settings.py
index b18342f3..2957fc57 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -40,4 +40,4 @@ class DefaultConfig:
 
     # Note, babel looks in /machinaris/web/translations with this path.
     BABEL_TRANSLATION_DIRECTORIES = "translations"
-    LANGUAGES = ['en', 'de', 'fr', 'it', 'zh']
+    LANGUAGES = ['en', 'de', 'fr', 'it', 'pt', 'zh']
diff --git a/web/templates/plotting/jobs.html b/web/templates/plotting/jobs.html
index 2a7c2b04..98e3fec5 100644
--- a/web/templates/plotting/jobs.html
+++ b/web/templates/plotting/jobs.html
@@ -329,7 +329,11 @@ 
    {{_('Plotting Speed - k%(k_size)s Plots', k_si
                     "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
                 },
                 {% endif %}
-                "ordering": false, 
+                "columnDefs": [
+                    { 
+                        targets: [0,4,5,6,7,8,9,10,11,12,13,14,15,16,17], "orderable": false
+                    }
+                ] 
             });
             $("#btnSuspend").click(function () {
                 $(this).prop("disabled", true);
diff --git a/web/translations/pt/LC_MESSAGES/messages.po b/web/translations/pt/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..51d96f8d
--- /dev/null
+++ b/web/translations/pt/LC_MESSAGES/messages.po
@@ -0,0 +1,1292 @@
+# Portuguese translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"PO-Revision-Date: 2022-02-25 15:32-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: pt\n"
+"Language-Team: pt \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: routes.py:76 routes.py:218
+msgid "Saved local currency setting."
+msgstr ""
+
+#: routes.py:95
+msgid "Blockchain download"
+msgstr ""
+
+#: routes.py:127
+msgid "Unknown plotting form"
+msgstr ""
+
+#: routes.py:177
+msgid "Error! Please see logs."
+msgstr ""
+
+#: routes.py:203
+msgid "Unknown alerts form"
+msgstr ""
+
+#: routes.py:223
+msgid "Saved cold wallet addresses."
+msgstr ""
+
+#: routes.py:282
+msgid "Unknown form action"
+msgstr ""
+
+#: routes.py:387
+msgid ""
+"No worker at %{worker} for blockchain %{blockchain}. Please select "
+"another blockchain."
+msgstr ""
+
+#: routes.py:393
+msgid ""
+"For Alerts config, found no responding fullnode found for %{blockchain}. "
+"Please check your workers."
+msgstr ""
+
+#: routes.py:398
+msgid ""
+"For Farming config, found no responding fullnode found for %{blockchain}."
+" Please check your workers."
+msgstr ""
+
+#: routes.py:405
+msgid ""
+"For Plotting config, found no responding fullnode found for "
+"%{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:410
+msgid "No responding fullnode found for %{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:429
+msgid "Unsupported log type"
+msgstr ""
+
+#: actions/stats.py:338
+msgid "secs"
+msgstr ""
+
+#: actions/stats.py:348 models/chia.py:228
+msgid "hour"
+msgstr ""
+
+#: actions/worker.py:106
+msgid "Worker not responding to pings."
+msgstr ""
+
+#: actions/worker.py:107
+msgid "Please check the worker container and restart if necessary."
+msgstr ""
+
+#: actions/worker.py:109
+msgid "Worker time is offset from controller."
+msgstr ""
+
+#: actions/worker.py:110
+msgid "Please ensure worker and controller share same timezone."
+msgstr ""
+
+#: actions/worker.py:116
+msgid "Machinaris version does not match controller."
+msgstr ""
+
+#: actions/worker.py:117
+msgid "Please use a consistent Machinaris version to avoid issues."
+msgstr ""
+
+#: models/chia.py:133 models/chia.py:222
+msgid "days"
+msgstr ""
+
+#: models/chia.py:210
+msgid "years"
+msgstr ""
+
+#: models/chia.py:212
+msgid "year"
+msgstr ""
+
+#: models/chia.py:214
+msgid "months"
+msgstr ""
+
+#: models/chia.py:216
+msgid "month"
+msgstr ""
+
+#: models/chia.py:218
+msgid "weeks"
+msgstr ""
+
+#: models/chia.py:220
+msgid "week"
+msgstr ""
+
+#: models/chia.py:224
+msgid "day"
+msgstr ""
+
+#: models/chia.py:226
+msgid "hours"
+msgstr ""
+
+#: models/chia.py:230
+msgid "minutes"
+msgstr ""
+
+#: models/chia.py:232
+msgid "minute"
+msgstr ""
+
+#: models/chia.py:234
+msgid "Never (no plots)"
+msgstr ""
+
+#: models/chia.py:236
+msgid "Soon"
+msgstr ""
+
+#: templates/alerts.html:14
+msgid "Alerts: Recent Notifications"
+msgstr ""
+
+#: templates/alerts.html:72 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
+msgid "Worker"
+msgstr ""
+
+#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/settings/alerts.html:45 templates/settings/farming.html:46
+#: templates/settings/plotting.html:46 templates/settings/tools.html:45
+#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/workers.html:43
+msgid "Blockchain"
+msgstr ""
+
+#: templates/alerts.html:74
+msgid "Service"
+msgstr ""
+
+#: templates/alerts.html:75
+msgid "Notification"
+msgstr ""
+
+#: templates/alerts.html:76
+msgid "Recorded At"
+msgstr ""
+
+#: templates/alerts.html:77
+msgid "Priority"
+msgstr ""
+
+#: templates/alerts.html:99
+msgid "Remove Selected"
+msgstr ""
+
+#: templates/alerts.html:101
+msgid "Remove All"
+msgstr ""
+
+#: templates/alerts.html:105
+msgid "No notifications from Chiadog yet... so check back soon."
+msgstr ""
+
+#: templates/alerts.html:106
+msgid ""
+"Expect at least a summary notification once daily as long as running "
+"above."
+msgstr ""
+
+#: templates/alerts.html:120
+msgid "Chiadog Log on "
+msgstr ""
+
+#: templates/alerts.html:146 templates/plotting/jobs.html:363
+msgid "Starting..."
+msgstr ""
+
+#: templates/alerts.html:153 templates/plotting/jobs.html:373
+msgid "Stopping..."
+msgstr ""
+
+#: templates/alerts.html:160
+msgid "Removing..."
+msgstr ""
+
+#: templates/alerts.html:168
+msgid "Purging..."
+msgstr ""
+
+#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#: templates/controller.html:10
+msgid "Machinaris"
+msgstr ""
+
+#: templates/base.html:31
+msgid "Summary"
+msgstr ""
+
+#: templates/base.html:37 templates/base.html:108 templates/index.html:41
+#: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
+msgid "Plotting"
+msgstr ""
+
+#: templates/base.html:43 templates/base.html:102 templates/index.html:50
+#: templates/settings/farming.html:15
+msgid "Farming"
+msgstr ""
+
+#: templates/base.html:49
+msgid "Wallets"
+msgstr ""
+
+#: templates/base.html:55
+msgid "Keys"
+msgstr ""
+
+#: templates/base.html:62
+msgid "Blockchains"
+msgstr ""
+
+#: templates/base.html:69
+msgid "Connections"
+msgstr ""
+
+#: templates/base.html:75 templates/base.html:96
+#: templates/settings/alerts.html:14
+msgid "Alerts"
+msgstr ""
+
+#: templates/base.html:81 templates/base.html:114
+msgid "Pools"
+msgstr ""
+
+#: templates/base.html:85 templates/farming/plots.html:69
+#: templates/farming/workers.html:28 templates/plotting/jobs.html:94
+#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/workers.html:14
+msgid "Workers"
+msgstr ""
+
+#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
+#: templates/wallet.html:23 templates/wallet.html:46
+msgid "Settings"
+msgstr ""
+
+#: templates/base.html:120 templates/settings/tools.html:14
+msgid "Tools"
+msgstr ""
+
+#: templates/base.html:131
+msgid "About"
+msgstr ""
+
+#: templates/base.html:134
+msgid "Install"
+msgstr ""
+
+#: templates/base.html:136
+msgid "Project"
+msgstr ""
+
+#: templates/base.html:138
+msgid "Wiki"
+msgstr ""
+
+#: templates/base.html:140
+msgid "Issues"
+msgstr ""
+
+#: templates/base.html:142
+msgid "License"
+msgstr ""
+
+#: templates/base.html:144
+msgid "Credits"
+msgstr ""
+
+#: templates/base.html:160
+msgid "Bladebit"
+msgstr ""
+
+#: templates/base.html:175
+msgid "Madmax"
+msgstr ""
+
+#: templates/base.html:179
+msgid "Plotman"
+msgstr ""
+
+#: templates/blockchains.html:23
+msgid "Blockchain Summary"
+msgstr ""
+
+#: templates/blockchains.html:32 templates/summary.html:74
+#: templates/wallet.html:109
+msgid "Status"
+msgstr ""
+
+#: templates/blockchains.html:33
+msgid "Peak Height"
+msgstr ""
+
+#: templates/blockchains.html:34
+msgid "Peak Time"
+msgstr ""
+
+#: templates/blockchains.html:35 templates/wallet.html:114
+msgid "Updated At"
+msgstr ""
+
+#: templates/blockchains.html:62
+msgid "Blockchain Details"
+msgstr ""
+
+#: templates/blockchains.html:87
+msgid "No blockchains found from any farmers. Not added?"
+msgstr ""
+
+#: templates/blockchains.html:88
+msgid "Try running \"chia show --state\" on your farmers to verify."
+msgstr ""
+
+#: templates/connections.html:70
+msgid "Type"
+msgstr ""
+
+#: templates/connections.html:71 templates/worker.html:39
+msgid "IP Address"
+msgstr ""
+
+#: templates/connections.html:72
+msgid "Ports"
+msgstr ""
+
+#: templates/connections.html:73
+msgid "Node ID"
+msgstr ""
+
+#: templates/connections.html:74
+msgid "SB Height"
+msgstr ""
+
+#: templates/connections.html:75
+msgid "Last Connect"
+msgstr ""
+
+#: templates/connections.html:76
+msgid "MiB Up"
+msgstr ""
+
+#: templates/connections.html:77
+msgid "MiB Down"
+msgstr ""
+
+#: templates/connections.html:109
+msgid "Disconnect Selected"
+msgstr ""
+
+#: templates/connections.html:115
+msgid "Check Port Forwarding"
+msgstr ""
+
+#: templates/connections.html:131
+msgid "Add New Connection"
+msgstr ""
+
+#: templates/connections.html:143
+msgid "No connections found from any farmers yet. Perhaps just starting?"
+msgstr ""
+
+#: templates/connections.html:144
+msgid ""
+"After a while, try running \"chia show --connections\" on your farmers to"
+" verify."
+msgstr ""
+
+#: templates/controller.html:23
+msgid "Machinaris Worker"
+msgstr ""
+
+#: templates/controller.html:26
+msgid "This Machinaris worker is controlled at:"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
+#: templates/index.html:72
+msgid "Total Plots"
+msgstr ""
+
+#: templates/index.html:79
+msgid "Total Plots Size"
+msgstr ""
+
+#: templates/index.html:89 templates/wallet.html:113
+msgid "Balance"
+msgstr ""
+
+#: templates/index.html:96
+msgid "Farmed"
+msgstr ""
+
+#: templates/index.html:105
+msgid "Netspace"
+msgstr ""
+
+#: templates/index.html:120
+msgid "Challenges from Harvesters"
+msgstr ""
+
+#: templates/index.html:136
+msgid "Partial Proofs for Pools"
+msgstr ""
+
+#: templates/farming/workers.html:80 templates/index.html:147
+msgid "Previous"
+msgstr ""
+
+#: templates/farming/workers.html:84 templates/index.html:151
+msgid "Next"
+msgstr ""
+
+#: templates/keys.html:43
+msgid "NOTE: Machinaris will never display your private key here."
+msgstr ""
+
+#: templates/keys.html:44
+msgid ""
+"However, you may view it yourself by executing this from within the "
+"Docker container."
+msgstr ""
+
+#: templates/keys.html:54
+msgid "Best Practices"
+msgstr ""
+
+#: templates/keys.html:58
+#, python-format
+msgid ""
+"Machinaris uses an online wallet for farming. It is strongly recommended "
+"that you use a cold wallet for your payout instructions. Tutorial on the "
+"%(wiki_link_open)swiki%(wiki_link_close)s. Please add \"Setup a Cold "
+"Wallet\" to your To-Do list!"
+msgstr ""
+
+#: templates/keys.html:71
+msgid "No keys found from any farmers. Not added?"
+msgstr ""
+
+#: templates/keys.html:72
+msgid "Try running \"chia keys show\" on your farmers to verify."
+msgstr ""
+
+#: templates/logs.html:11
+msgid "Machinaris Logs"
+msgstr ""
+
+#: templates/logs.html:62
+msgid "Autoscroll"
+msgstr ""
+
+#: templates/pools.html:61
+msgid "Pool:"
+msgstr ""
+
+#: templates/pools.html:66
+msgid "SELF_POOL"
+msgstr ""
+
+#: templates/pools.html:71
+msgid "Status:"
+msgstr ""
+
+#: templates/pools.html:72
+msgid "Current Difficulty:"
+msgstr ""
+
+#: templates/pools.html:73
+msgid "Current Points Balance:"
+msgstr ""
+
+#: templates/pools.html:74
+msgid "Points Found Since Start:"
+msgstr ""
+
+#: templates/pools.html:75
+msgid "Points Found in Last 24 Hours:"
+msgstr ""
+
+#: templates/pools.html:76
+msgid "Points Successful in Last 24 Hours:"
+msgstr ""
+
+#: templates/pools.html:77
+msgid "Number of Plots:"
+msgstr ""
+
+#: templates/pools.html:79
+msgid "Launcher ID:"
+msgstr ""
+
+#: templates/pools.html:97
+msgid "No pools have been found yet. Perhaps the wallet is still syncing?"
+msgstr ""
+
+#: templates/pools.html:98
+msgid ""
+"If you would like to join a pool, please select the \"Settings | Pools\" "
+"page to get started."
+msgstr ""
+
+#: templates/pools.html:99
+msgid "For more, see the Machinaris"
+msgstr ""
+
+#: templates/setup.html:27
+msgid "Welcome to Machinaris!"
+msgstr ""
+
+#: templates/setup.html:28
+#, python-format
+msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
+msgstr ""
+
+#: templates/setup.html:61
+#, python-format
+msgid ""
+"On very first launch, the Chia compressed blockchain database "
+"%(compressed)s is being downloaded from %(dl_link)s. At about "
+"%(uncompressed)s in uncompressed size (progress shown above), this will "
+"take a while. However minutes of download now, will save you multiple "
+"days of blockchain syncing later. Please be patient!"
+msgstr ""
+
+#: templates/setup.html:75
+#, python-format
+msgid ""
+"NOTE: If you would prefer to allow Chia to sync the blockchain over many "
+"days, see the %(init_link)s for details. Similarly, you may instead "
+"%(import_link_open)s import your own blockchain %(import_link_close)s if "
+"you have one from a previous Chia install."
+msgstr ""
+
+#: templates/setup.html:83
+#, python-format
+msgid ""
+"To get started with Machinaris as a Chia%(trademark)s fullnode, either "
+"import your existing 24-word mnemonic seed phrase"
+msgstr ""
+
+#: templates/setup.html:90
+msgid "Import Existing Key"
+msgstr ""
+
+#: templates/setup.html:91
+msgid "OR"
+msgstr ""
+
+#: templates/setup.html:93
+msgid ""
+"You can generate a brand-new mnemonic phrase that will be written to this"
+" in-container path"
+msgstr ""
+
+#: templates/setup.html:96
+msgid "Generate New Key"
+msgstr ""
+
+#: templates/setup.html:110
+#, python-format
+msgid ""
+"NOTE: If you would prefer to instead import your mnenmoic seed phrase "
+"yourself at the command-line, see the %(wiki_link)s for details."
+msgstr ""
+
+#: templates/summary.html:31 templates/wallet.html:52
+msgid "Local Currency:"
+msgstr ""
+
+#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
+#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
+#: templates/plotting/workers.html:34 templates/settings/pools.html:39
+#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr ""
+
+#: templates/settings/alerts.html:55 templates/settings/farming.html:56
+#: templates/settings/plotting.html:56 templates/settings/pools.html:41
+#: templates/settings/tools.html:55 templates/summary.html:45
+#: templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr ""
+
+#: templates/summary.html:75
+msgid "Height"
+msgstr ""
+
+#: templates/farming/plots.html:66 templates/farming/workers.html:25
+#: templates/summary.html:76
+msgid "Plots"
+msgstr ""
+
+#: templates/summary.html:78
+msgid "Max Resp."
+msgstr ""
+
+#: templates/summary.html:79
+msgid "Partials"
+msgstr ""
+
+#: templates/summary.html:80
+msgid "ETW"
+msgstr ""
+
+#: templates/summary.html:82
+msgid "Wallet"
+msgstr ""
+
+#: templates/summary.html:83 templates/summary.html:84
+msgid "EDV"
+msgstr ""
+
+#: templates/summary.html:95 templates/worker.html:78 templates/workers.html:72
+msgid "Offline"
+msgstr ""
+
+#: templates/summary.html:97
+msgid "Synced"
+msgstr ""
+
+#: templates/summary.html:99
+msgid "Syncing"
+msgstr ""
+
+#: templates/summary.html:101
+msgid "Not Synced"
+msgstr ""
+
+#: templates/summary.html:124
+msgid "No blockchains found from any farmers. Just starting up?"
+msgstr ""
+
+#: templates/summary.html:125
+msgid "Please allow at least 15 minutes for blockchains to get started."
+msgstr ""
+
+#: templates/wallet.html:76
+msgid "Wallet Settings"
+msgstr ""
+
+#: templates/wallet.html:86
+msgid "Cold Wallet Address:"
+msgstr ""
+
+#: templates/wallet.html:100
+msgid "Wallet Summary"
+msgstr ""
+
+#: templates/wallet.html:110
+msgid "Wallet Balance"
+msgstr ""
+
+#: templates/wallet.html:111
+msgid "Cold Wallet Balance"
+msgstr ""
+
+#: templates/wallet.html:112
+msgid "Total Balance"
+msgstr ""
+
+#: templates/wallet.html:137
+msgid "Edit Wallet"
+msgstr ""
+
+#: templates/wallet.html:148
+msgid "Wallet Details"
+msgstr ""
+
+#: templates/wallet.html:172
+msgid ""
+"No wallet status received.  Perhaps just starting?  Please allow at least"
+" 10 minutes to update."
+msgstr ""
+
+#: templates/wallet.html:173
+msgid ""
+"You can also try running \"chia wallet show\" on your fullnode's in-"
+"container shell to verify."
+msgstr ""
+
+#: templates/worker.html:35
+msgid "Details"
+msgstr ""
+
+#: templates/worker.html:43 templates/workers.html:42
+msgid "Hostname"
+msgstr ""
+
+#: templates/worker.html:51
+msgid "Port"
+msgstr ""
+
+#: templates/worker.html:55
+msgid "System Type"
+msgstr ""
+
+#: templates/worker.html:59
+msgid "Last Status Received At"
+msgstr ""
+
+#: templates/worker.html:63
+msgid "Local Time on Worker"
+msgstr ""
+
+#: templates/worker.html:67
+msgid "Last Ping to Worker"
+msgstr ""
+
+#: templates/worker.html:70 templates/workers.html:64
+msgid "Responding"
+msgstr ""
+
+#: templates/worker.html:72 templates/workers.html:66
+msgid "Connection Refused"
+msgstr ""
+
+#: templates/worker.html:74 templates/workers.html:68
+msgid "Connection Timeout"
+msgstr ""
+
+#: templates/worker.html:76 templates/workers.html:70
+msgid "Connection Error"
+msgstr ""
+
+#: templates/worker.html:86
+msgid "Last Successful Ping to Worker"
+msgstr ""
+
+#: templates/worker.html:90 templates/workers.html:48
+msgid "Version"
+msgstr ""
+
+#: templates/worker.html:98
+msgid "Farmr ID"
+msgstr ""
+
+#: templates/worker.html:106
+msgid "Recent Warnings"
+msgstr ""
+
+#: templates/worker.html:121
+msgid "Yay! No issues currently."
+msgstr ""
+
+#: templates/farming/workers.html:114 templates/worker.html:183
+msgid "Disk Space Used (TB)"
+msgstr ""
+
+#: templates/farming/workers.html:120 templates/worker.html:189
+msgid "Disk Space Free (TB)"
+msgstr ""
+
+#: templates/worker_launch.html:50 templates/worker_launch.html:609
+#: templates/worker_launch.html:630
+msgid "Host Path"
+msgstr ""
+
+#: templates/worker_launch.html:55 templates/worker_launch.html:614
+#: templates/worker_launch.html:635
+msgid "Container Path"
+msgstr ""
+
+#: templates/worker_launch.html:60 templates/worker_launch.html:619
+#: templates/worker_launch.html:640
+msgid "Used for:"
+msgstr ""
+
+#: templates/worker_launch.html:63 templates/worker_launch.html:622
+#: templates/worker_launch.html:643
+msgid "Final Plots"
+msgstr ""
+
+#: templates/worker_launch.html:64 templates/worker_launch.html:623
+#: templates/worker_launch.html:644
+msgid "Plotting Temp"
+msgstr ""
+
+#: templates/worker_launch.html:65 templates/worker_launch.html:624
+#: templates/worker_launch.html:645
+msgid "Other"
+msgstr ""
+
+#: templates/worker_launch.html:234
+msgid "Unknown blockchain fork of selected:"
+msgstr ""
+
+#: templates/worker_launch.html:266
+msgid ""
+"Missing worker hostname.  Please provide a short name to identify your "
+"worker."
+msgstr ""
+
+#: templates/worker_launch.html:282
+msgid ""
+"Invalid host path ending with colon. Try adding a slash to the end like "
+"this"
+msgstr ""
+
+#: templates/worker_launch.html:285
+msgid "Empty host path provided for volume at "
+msgstr ""
+
+#: templates/worker_launch.html:285
+msgid "Please provide a host path."
+msgstr ""
+
+#: templates/worker_launch.html:287
+msgid "Empty container path provided for volume at "
+msgstr ""
+
+#: templates/worker_launch.html:287
+msgid "Please provide a container path."
+msgstr ""
+
+#: templates/worker_launch.html:332
+msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
+msgstr ""
+
+#: templates/worker_launch.html:338
+msgid ""
+"Missing worker IP address.  Please provide the IP the conntroller will "
+"connect to for commands."
+msgstr ""
+
+#: templates/worker_launch.html:380
+msgid "Machinaris Worker - Launch Config"
+msgstr ""
+
+#: templates/worker_launch.html:381
+msgid ""
+"Complete the form below to run new harvesters/plotters on other computers"
+" across your network. Save the generated docker-compose.yml file to a "
+"folder named \"machinaris\", then execute \"docker-compose up\" from a "
+"shell."
+msgstr ""
+
+#: templates/worker_launch.html:385
+msgid "Operating System"
+msgstr ""
+
+#: templates/worker_launch.html:391
+msgid "Linux"
+msgstr ""
+
+#: templates/worker_launch.html:398
+msgid "Macintosh"
+msgstr ""
+
+#: templates/worker_launch.html:405
+msgid "Windows"
+msgstr ""
+
+#: templates/worker_launch.html:411
+msgid "Machinaris Mode"
+msgstr ""
+
+#: templates/worker_launch.html:417
+msgid "Harvester"
+msgstr ""
+
+#: templates/worker_launch.html:424
+msgid "Plotter"
+msgstr ""
+
+#: templates/worker_launch.html:432
+msgid "Farmer Public Key"
+msgstr ""
+
+#: templates/worker_launch.html:437
+msgid "Pool Public Key"
+msgstr ""
+
+#: templates/worker_launch.html:442
+msgid "Pool Contract Address"
+msgstr ""
+
+#: templates/worker_launch.html:447
+msgid "Plot on Startup"
+msgstr ""
+
+#: templates/worker_launch.html:453
+msgid "True"
+msgstr ""
+
+#: templates/worker_launch.html:460
+msgid "False"
+msgstr ""
+
+#: templates/worker_launch.html:468
+msgid "Controller IP Address"
+msgstr ""
+
+#: templates/worker_launch.html:473
+msgid "Controller API Port"
+msgstr ""
+
+#: templates/worker_launch.html:480
+msgid "Worker Hostname"
+msgstr ""
+
+#: templates/worker_launch.html:485
+msgid "Worker IP Address"
+msgstr ""
+
+#: templates/worker_launch.html:492
+msgid "Blockchains to Farm"
+msgstr ""
+
+#: templates/worker_launch.html:605
+msgid "Volume Mounts"
+msgstr ""
+
+#: templates/worker_launch.html:654
+msgid "Add New Volume"
+msgstr ""
+
+#: templates/worker_launch.html:656
+msgid "Remove Last Volume"
+msgstr ""
+
+#: templates/worker_launch.html:663
+msgid "Copy"
+msgstr ""
+
+#: templates/worker_launch.html:667
+msgid "Docker Compose"
+msgstr ""
+
+#: templates/workers.html:44
+msgid "Mode"
+msgstr ""
+
+#: templates/workers.html:45
+msgid "Last Status Received"
+msgstr ""
+
+#: templates/workers.html:46
+msgid "Last Ping"
+msgstr ""
+
+#: templates/workers.html:47
+msgid "Last Successful Ping"
+msgstr ""
+
+#: templates/workers.html:49
+msgid "Logs"
+msgstr ""
+
+#: templates/workers.html:94
+msgid "Prune Selected"
+msgstr ""
+
+#: templates/workers.html:96
+msgid "New Worker"
+msgstr ""
+
+#: templates/workers.html:103
+msgid "No Machinaris workers have reported status successfully."
+msgstr ""
+
+#: templates/workers.html:104
+msgid "Please check each expected worker's log files."
+msgstr ""
+
+#: templates/workers.html:105
+#, python-format
+msgid "For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
+msgstr ""
+
+#: templates/farming/plots.html:9
+msgid "Plotting Analysis"
+msgstr ""
+
+#: templates/farming/plots.html:13
+msgid "Analysis of the plotting job log shows time (seconds) spent in each phase:"
+msgstr ""
+
+#: templates/farming/plots.html:24
+msgid "Plot Check"
+msgstr ""
+
+#: templates/farming/plots.html:86 templates/plotting/jobs.html:117
+#: templates/plotting/workers.html:122
+msgid "Worker is offline."
+msgstr ""
+
+#: templates/farming/plots.html:88
+msgid "Farming not started successfully."
+msgstr ""
+
+#: templates/farming/plots.html:147
+msgid "Farming Log for "
+msgstr ""
+
+#: templates/farming/plots.html:201
+msgid "Good Plot"
+msgstr ""
+
+#: templates/farming/plots.html:203
+msgid "Bad Plot"
+msgstr ""
+
+#: templates/farming/workers.html:66
+msgid "Daily Summary"
+msgstr ""
+
+#: templates/farming/workers.html:70
+#, python-format
+msgid "No daily summary found for %(blockchain)s on %(displayname)s."
+msgstr ""
+
+#: templates/farming/workers.html:72
+msgid ""
+"Please check that your Machinaris container for this blockchain is "
+"running. Also please verify settings on the Alerts page."
+msgstr ""
+
+#: templates/farming/workers.html:93
+#, python-format
+msgid ""
+"No plots disk stats recorded recently for %(hostname)s with Chia "
+"blockchain. Please ensure all paths containing plots have been "
+"%(wiki_link_open)s configured %(wiki_link_close)s. Also ensure the Chia "
+"worker is reporting into the controller on the Workers page."
+msgstr ""
+
+#: templates/plotting/jobs.html:9
+msgid "Confirm Kill"
+msgstr ""
+
+#: templates/plotting/jobs.html:13
+msgid ""
+"This action will terminate the selected plots, whether running or "
+"stopped, and delete all their temporary files. If Plotman is still "
+"running, another plot will be immediately started, so please stop Plotman"
+" first from the top-right. Continue?"
+msgstr ""
+
+#: templates/plotting/jobs.html:17 templates/plotting/jobs.html:193
+msgid "Kill Selected"
+msgstr ""
+
+#: templates/plotting/jobs.html:27 templates/plotting/jobs.html:123
+msgid "Start Plotting"
+msgstr ""
+
+#: templates/plotting/jobs.html:31
+msgid ""
+"This action will start Plotman and launch a plotting run using your "
+"configured plotter. Be careful about running more than one plotter on a "
+"single machine at a time. Continue?"
+msgstr ""
+
+#: templates/plotting/jobs.html:35 templates/plotting/workers.html:17
+msgid "Start"
+msgstr ""
+
+#: templates/plotting/jobs.html:45 templates/plotting/jobs.html:120
+msgid "Stop Plotting"
+msgstr ""
+
+#: templates/plotting/jobs.html:49
+msgid ""
+"This action will stop Plotman from launching new plotting jobs.  Running "
+"jobs will run to completion. Continue?"
+msgstr ""
+
+#: templates/plotting/jobs.html:53 templates/plotting/workers.html:35
+msgid "Stop"
+msgstr ""
+
+#: templates/plotting/jobs.html:63 templates/plotting/workers.html:45
+#: templates/plotting/workers.html:63
+msgid "Worker Offline"
+msgstr ""
+
+#: templates/plotting/jobs.html:67 templates/plotting/workers.html:67
+msgid ""
+"This worker is not currently online and responding to pings from the "
+"controller.  Please check the Workers page and bring the system back "
+"online."
+msgstr ""
+
+#: templates/plotting/jobs.html:70 templates/plotting/workers.html:53
+#: templates/plotting/workers.html:70
+msgid "OK"
+msgstr ""
+
+#: templates/plotting/jobs.html:91 templates/plotting/workers.html:93
+msgid "Jobs"
+msgstr ""
+
+#: templates/plotting/jobs.html:189
+msgid "Suspend Selected"
+msgstr ""
+
+#: templates/plotting/jobs.html:191
+msgid "Resume Selected"
+msgstr ""
+
+#: templates/plotting/jobs.html:204
+#, python-format
+msgid "Plotting Speed - k%(k_size)s Plots"
+msgstr ""
+
+#: templates/plotting/jobs.html:337
+msgid "Suspending..."
+msgstr ""
+
+#: templates/plotting/jobs.html:345
+msgid "Resuming..."
+msgstr ""
+
+#: templates/plotting/jobs.html:354
+msgid "Killing..."
+msgstr ""
+
+#: templates/plotting/workers.html:9 templates/plotting/workers.html:128
+msgid "Start Archiving"
+msgstr ""
+
+#: templates/plotting/workers.html:13
+msgid ""
+"This action will start Plotman archiving from the configured dst folder. "
+"Completed plots will be disributed locally or transferred remotely. "
+"Continue?"
+msgstr ""
+
+#: templates/plotting/workers.html:27 templates/plotting/workers.html:125
+msgid "Stop Archiving"
+msgstr ""
+
+#: templates/plotting/workers.html:31
+msgid ""
+"This action will stop Plotman archiving from the configured dst folder, "
+"preventing further completed plot transfers. Continue?"
+msgstr ""
+
+#: templates/plotting/workers.html:49
+#, python-format
+msgid ""
+"This worker is not currently configured for Plotman "
+"%(wiki_link_open)sarchiving%(wiki_link_open)s to enable local or remote "
+"transfer of completed plots.  Please visit the Settings | Plotting page "
+"to configure this worker."
+msgstr ""
+
+#: templates/plotting/workers.html:103
+msgid "Archiving"
+msgstr ""
+
+#: templates/plotting/workers.html:119
+msgid "Archiving is disabled.  See Settings | Plotting page."
+msgstr ""
+
+#: templates/settings/alerts.html:57 templates/settings/farming.html:58
+#: templates/settings/plotting.html:58 templates/settings/tools.html:57
+msgid "Download"
+msgstr ""
+
+#: templates/settings/pools.html:32
+msgid "Confirm Pool Change"
+msgstr ""
+
+#: templates/settings/pools.html:36
+msgid ""
+"This action will switch your current pooling selection, possibly "
+"resulting in a small charge (few mojos) against your wallet. Continue "
+"anyway?"
+msgstr ""
+
+#: templates/settings/pools.html:85
+#, python-format
+msgid ""
+"Join a pool and get consistent farming rewards. The average returns are "
+"the same, %(break)sbut it is much less volatile. You can easily switch "
+"pools without having to re-plot."
+msgstr ""
+
+#: templates/settings/pools.html:88
+msgid "ERROR: Unable to join a pool because:"
+msgstr ""
+
+#: templates/settings/pools.html:111
+msgid "Self pool. When you win a block, you will earn rewards."
+msgstr ""
+
+#: templates/settings/pools.html:122
+msgid "Connected to pool:"
+msgstr ""
+
+#: templates/settings/pools.html:122
+msgid "Connect to pool:"
+msgstr ""
+
+#: templates/settings/pools.html:132
+msgid "Compare Pools"
+msgstr ""
+
+#: templates/settings/pools.html:135
+msgid "Get Mojos"
+msgstr ""
+
+#: templates/settings/pools.html:157
+msgid "Save Changes"
+msgstr ""
+
+#: templates/settings/pools.html:161
+msgid "View Log"
+msgstr ""
+
+#: templates/settings/pools.html:172
+msgid ""
+"No wallets found yet.  Perhaps this is a brand-new installation? If so, "
+"please wait for complete start-up."
+msgstr ""
+
+#: templates/settings/pools.html:173
+msgid "For more on Pooling, see the Machinaris"
+msgstr ""
+
+#: templates/settings/pools.html:173
+msgid "wiki"
+msgstr ""
+
+#: templates/settings/pools.html:185
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings/pools.html:197
+msgid "PlotNFT Log on "
+msgstr ""
+

From 232c78c6dc5da2b717471091c9b9db23357dea59 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 27 Feb 2022 11:59:39 -0700
Subject: [PATCH 0608/1625] Optional mapping of peers by their IP address on
 the Connections page.

---
 api/commands/websvcs.py                     |   6 +-
 api/gunicorn.conf.py                        |   5 +-
 api/schedules/geolocate_peers.py            |  93 ++++++++++
 api/translations/de/LC_MESSAGES/messages.po |   4 +-
 api/translations/fr/LC_MESSAGES/messages.po |  31 ++--
 api/translations/it/LC_MESSAGES/messages.po |   4 +-
 api/translations/pt/LC_MESSAGES/messages.po |   4 +-
 api/translations/zh/LC_MESSAGES/messages.po |   4 +-
 api/views/ping/resources.py                 |   4 +-
 docker/entrypoint.sh                        |   6 +
 docker/requirements.txt                     |   3 +-
 scripts/pull_3rd_party_libs.sh              |   5 +
 web/actions/chia.py                         |   4 +-
 web/actions/mapping.py                      |  79 +++++++++
 web/models/chia.py                          |  53 +++++-
 web/routes.py                               |  22 ++-
 web/templates/base.html                     |   2 +
 web/templates/connections.html              | 129 +++++++++++++-
 web/templates/wallet.html                   |   6 +-
 web/translations/de/LC_MESSAGES/messages.po | 177 +++++++++++--------
 web/translations/fr/LC_MESSAGES/messages.po | 180 ++++++++++++--------
 web/translations/it/LC_MESSAGES/messages.po | 176 +++++++++++--------
 web/translations/pt/LC_MESSAGES/messages.po | 176 +++++++++++--------
 web/translations/zh/LC_MESSAGES/messages.po | 176 +++++++++++--------
 24 files changed, 933 insertions(+), 416 deletions(-)
 create mode 100644 api/schedules/geolocate_peers.py
 create mode 100644 web/actions/mapping.py

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 54fa0066..87b05fee 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -14,9 +14,9 @@
 
 ALLTHEBLOCKS_REQUEST_INTERVAL_MINS = 15
 COLD_WALLET_ADDRESSES_FILE = '/root/.chia/machinaris/config/cold_wallet_addresses.json'
-COLD_WALLET_CACHE_FILE = '/root/.chia/machinaris/dbs/cold_wallet_cache.json'
-BLOCKCHAIN_PRICES_CACHE_FILE = '/root/.chia/machinaris/dbs/blockchain_prices_cache.json'
-EXCHANGE_RATES_CACHE_FILE = '/root/.chia/machinaris/dbs/exchange_rates_cache.json'
+COLD_WALLET_CACHE_FILE = '/root/.chia/machinaris/cache/cold_wallet_cache.json'
+BLOCKCHAIN_PRICES_CACHE_FILE = '/root/.chia/machinaris/cache/blockchain_prices_cache.json'
+EXCHANGE_RATES_CACHE_FILE = '/root/.chia/machinaris/cache/exchange_rates_cache.json'
 
 MOJO_PER_COIN = {
     'btcgreen': 1000000000000,
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 9b226ff6..201ceacf 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -11,7 +11,8 @@ def on_starting(server):
         status_plots, status_challenges, status_wallets, status_blockchains, \
         status_connections, status_keys, status_alerts, status_controller, \
         status_plotnfts, status_pools, status_partials
-    from api.schedules import stats_disk, stats_farm, nft_recover, plots_check, log_rotate, db_backup, restart_stuck_farmer
+    from api.schedules import stats_disk, stats_farm, nft_recover, plots_check, \
+        log_rotate, db_backup, restart_stuck_farmer, geolocate_peers
     from common.config import globals
 
     from api.commands import websvcs
@@ -71,6 +72,8 @@ def on_starting(server):
         scheduler.add_job(func=status_controller.update, name="controller", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=websvcs.get_prices, name="get_prices", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', hours=12)
+        scheduler.add_job(func=geolocate_peers.execute, name="geolocate_peers", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
+        
 
     # Testing only
     #scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', seconds=120) # Test immediately
diff --git a/api/schedules/geolocate_peers.py b/api/schedules/geolocate_peers.py
new file mode 100644
index 00000000..7e623203
--- /dev/null
+++ b/api/schedules/geolocate_peers.py
@@ -0,0 +1,93 @@
+#
+# Performs optional geolocation of peer connections by IP address for mapping
+# Only if Maxmind license file is found at /root/.chia/machinaris/config/maxmind_license.json 
+#
+
+import ast
+import geoip2.webservice
+import json
+import os
+import re
+import traceback
+
+from common.models import connections as co
+from common.config import globals
+from api import app
+
+MAXMIND_LICENSE_FILE = '/root/.chia/machinaris/config/maxmind_license.json'
+GEOIP_CACHE_FILE = '/root/.chia/machinaris/cache/geoip_cache.json'
+
+def load_maxmind_license():
+    if not os.path.exists(MAXMIND_LICENSE_FILE):
+        return None
+    try:
+        with open(MAXMIND_LICENSE_FILE) as f:
+            data = json.load(f)
+    except Exception as ex:
+        msg = "Unable to valid json from {0} because {1}".format(MAXMIND_LICENSE_FILE, str(ex))
+        app.logger.error(msg)
+    return data
+
+def load_geoip_cache():
+    data = {}
+    if os.path.exists(GEOIP_CACHE_FILE):
+        try:
+            with open(GEOIP_CACHE_FILE) as f:
+                data = json.load(f)
+        except Exception as ex:
+            msg = "Unable to read geoip cache from {0} because {1}".format(GEOIP_CACHE_FILE, str(ex))
+            app.logger.error(msg)
+            return data
+    return data
+
+def save_geoip_cache(data):
+    try:
+        with open(GEOIP_CACHE_FILE, 'w') as f:
+            json.dump(data, f)
+    except Exception as ex:
+        app.logger.error("Failed to store geoip cache in {0} because {1}".format(GEOIP_CACHE_FILE, str(ex)))
+
+def geolocate_ip_addresses(ip_addresses):
+    license = load_maxmind_license()
+    if not license:
+        app.logger.info("Skipping geolocation of peer connections by IP address as no Maxmind license found.")
+        return
+    geoip_cache = load_geoip_cache()
+    with geoip2.webservice.Client(license["account"], license['license_key'], host="geolite.info") as client:
+        for ip_address in ip_addresses:
+            if ip_address in geoip_cache:
+                continue
+            try:
+                response = client.city(ip_address)
+                app.logger.info("{0} located at {1}".format(ip_address, response.location))
+                geoip_cache[ip_address] = { 
+                    'latitude': response.location.latitude, 
+                    'longitude': response.location.longitude, 
+                }
+                try:
+                    geoip_cache[ip_address]['city'] = ast.literal_eval(str(response.city.names))
+                except:
+                    pass
+                try:
+                    geoip_cache[ip_address]['country'] = ast.literal_eval(str(response.country.names))
+                except:
+                    pass
+            except Exception as ex:
+                geoip_cache[ip_address] = None
+                app.logger.info("Failed to query Maxmind city web service for {0} because {1}.".format(ip_address, str(ex)))
+    save_geoip_cache(geoip_cache)
+
+def execute():
+    with app.app_context():
+        from api import db
+        gc = globals.load()
+        if not gc['is_controller']:
+            return # Only controller should attempt geolocation
+        ip_addresses = []
+        for connection in db.session.query(co.Connection).all():
+            for line in connection.details.split('\n'):
+                match = re.search(r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}', line.strip())
+                if match and match.group() != "127.0.0.1":
+                    #app.logger.info("Adding {0}".format(match.group()))
+                    ip_addresses.append(match.group())
+        geolocate_ip_addresses(ip_addresses)
diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de/LC_MESSAGES/messages.po
index b58f0a51..34160ffa 100644
--- a/api/translations/de/LC_MESSAGES/messages.po
+++ b/api/translations/de/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues/353\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
@@ -47,7 +47,7 @@ msgid ""
 "patient! View the log for details."
 msgstr ""
 
-#: views/ping/resources.py:25 views/ping/resources.py:28
+#: views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr/LC_MESSAGES/messages.po
index e7ae9ce1..c5e83d51 100644
--- a/api/translations/fr/LC_MESSAGES/messages.po
+++ b/api/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
@@ -24,16 +24,20 @@ msgstr "Échec de la validation du fichier config.yaml mis à jour!"
 
 #: commands/pools_cli.py:68
 msgid "No requested pool modifications were sent. Current settings are unchanged."
-msgstr "Aucune modification de pool demandée n'a été envoyée. Les paramètres actuels sont inchangés."
+msgstr ""
+"Aucune modification de pool demandée n'a été envoyée. Les paramètres "
+"actuels sont inchangés."
 
 #: commands/pools_cli.py:151
 msgid ""
 "Successfully left pool, switching to self plotting. Please wait a few "
 "minutes or more to complete. DO NOT immediately re-submit your request. "
 "View the log for details."
-msgstr "Le pool a été quitté avec succès, passant à self-plotting. Veuillez patienter quelques instants"
-"minutes ou plus pour terminer. NE PAS soumettre à nouveau votre demande immédiatement."
-"Afficher le journal pour plus de détails."
+msgstr ""
+"Le pool a été quitté avec succès, passant à self-plotting. Veuillez "
+"patienter quelques instantsminutes ou plus pour terminer. NE PAS "
+"soumettre à nouveau votre demande immédiatement.Afficher le journal pour "
+"plus de détails."
 
 #: commands/pools_cli.py:195
 #, python-format
@@ -42,9 +46,10 @@ msgid ""
 "a few minutes or more to complete. DO NOT immediately re-submit your "
 "request. Be patient! View the log for details."
 msgstr ""
-"Rejoindre avec succès le pool %(pool_url)s en créant Chia NFT. Veuillez patienter"
-"quelques minutes ou plus pour terminer. NE RENOUVELEZ PAS immédiatement votre "
-"demande. Soyez patient! Consultez le journal pour plus de détails."
+"Rejoindre avec succès le pool %(pool_url)s en créant Chia NFT. Veuillez "
+"patienterquelques minutes ou plus pour terminer. NE RENOUVELEZ PAS "
+"immédiatement votre demande. Soyez patient! Consultez le journal pour "
+"plus de détails."
 
 #: commands/pools_cli.py:224
 msgid ""
@@ -52,10 +57,12 @@ msgid ""
 "or more to complete. DO NOT immediately re-submit your request. Be "
 "patient! View the log for details."
 msgstr ""
-"Un NFT a été créé avec succès pour l'auto-pooling. Veuillez patienter quelques minutes "
-"ou plus à compléter. NE PAS soumettre à nouveau votre demande immédiatement. Soyez "
-"patient! Consultez le journal pour plus de détails."
+"Un NFT a été créé avec succès pour l'auto-pooling. Veuillez patienter "
+"quelques minutes ou plus à compléter. NE PAS soumettre à nouveau votre "
+"demande immédiatement. Soyez patient! Consultez le journal pour plus de "
+"détails."
 
-#: views/ping/resources.py:25 views/ping/resources.py:28
+#: views/ping/resources.py:28
 msgid "Pong!"
 msgstr "Le pong!"
+
diff --git a/api/translations/it/LC_MESSAGES/messages.po b/api/translations/it/LC_MESSAGES/messages.po
index 860342ef..fcfaddc0 100644
--- a/api/translations/it/LC_MESSAGES/messages.po
+++ b/api/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -48,7 +48,7 @@ msgid ""
 "patient! View the log for details."
 msgstr ""
 
-#: views/ping/resources.py:25 views/ping/resources.py:28
+#: views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/pt/LC_MESSAGES/messages.po b/api/translations/pt/LC_MESSAGES/messages.po
index 4d43984f..ca6eaf9f 100644
--- a/api/translations/pt/LC_MESSAGES/messages.po
+++ b/api/translations/pt/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-25 15:32-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: pt\n"
@@ -48,7 +48,7 @@ msgid ""
 "patient! View the log for details."
 msgstr ""
 
-#: views/ping/resources.py:25 views/ping/resources.py:28
+#: views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 272fbd35..fb7ff3ab 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: zh\n"
@@ -48,7 +48,7 @@ msgid ""
 "patient! View the log for details."
 msgstr ""
 
-#: views/ping/resources.py:25 views/ping/resources.py:28
+#: views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/views/ping/resources.py b/api/views/ping/resources.py
index 64e3e959..b3bcafbb 100644
--- a/api/views/ping/resources.py
+++ b/api/views/ping/resources.py
@@ -21,8 +21,8 @@
 class Logs(MethodView):
 
     def get(self):
-        app.logger.info("IN PING, MATCH IS {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
-        app.logger.info("IN PING, PONG IS {0}".format(_('Pong!')))
+        #app.logger.info("IN PING, MATCH IS {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+        #app.logger.info("IN PING, PONG IS {0}".format(_('Pong!')))
         response = make_response(
             """{0}
 """.format(_('Pong!')), 200)
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index cc9a88e3..9c884a88 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -30,6 +30,12 @@ if [ -f /root/.chia/mainnet/log/plotnft.log ]; then
   mv /root/.chia/mainnet/log/plotnft.log /root/.chia/machinaris/logs/plotnft.log
 fi
 
+# v0.7.0 upgrade step - move location of cache json
+if [[ ! -d /root/.chia/machinaris/cache ]] && [[ -f /root/.chia/machinaris/dbs/cold_wallet_cache.json ]] ; then
+  mkdir -p /root/.chia/machinaris/cache
+  mv /root/.chia/machinaris/dbs/*cache.json /root/.chia/machinaris/cache/
+fi
+
 # Refuse to run if Portainer launched containers out of order and created a directory for mnemonic.txt
 if [[ "${mode}" == 'fullnode' ]] && [[ -d /root/.chia/mnemonic.txt ]]; then
   echo "Portainer (or similar) launched a fork container before the main Machinaris container on first run."
diff --git a/docker/requirements.txt b/docker/requirements.txt
index 895ba93f..f16a4ae4 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -18,4 +18,5 @@ ruamel.yaml
 psutil
 pytest
 flask-babel
-beautifulsoup4
\ No newline at end of file
+beautifulsoup4
+geoip2
\ No newline at end of file
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index bd95d82c..f3b6ba85 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -34,6 +34,11 @@ wget -O ${BASEPATH}/bs.zip -nv "https://github.com/twbs/bootstrap/releases/downl
 unzip -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/css/bootstrap.min.css* bootstrap-${BOOTSTRAP_VERSION}*/js/bootstrap.bundle.min.js*  && \
 rm -f ${BASEPATH}/bs.zip
 
+# Leaflet
+wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v1.7.1/leaflet.zip" && \
+unzip -o ${BASEPATH}/leaflet.zip -d $BASEPATH/ && \
+rm -f ${BASEPATH}/leaflet.zip
+
 # Pull localization files for DataTables.js
 mkdir -p $BASEPATH/i18n/
 LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" $BASEPATH/../../default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
diff --git a/web/actions/chia.py b/web/actions/chia.py
index fc5da16b..00bfdec5 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -144,9 +144,9 @@ def load_summaries():
         traceback.print_exc()
     return None
 
-def load_connections():
+def load_connections(lang='en'):
     connections = db.session.query(co.Connection).all()
-    return Connections(connections)
+    return Connections(connections, lang)
 
 def load_keys():
     keys = db.session.query(k.Key).order_by(k.Key.blockchain).all()
diff --git a/web/actions/mapping.py b/web/actions/mapping.py
new file mode 100644
index 00000000..e3da6819
--- /dev/null
+++ b/web/actions/mapping.py
@@ -0,0 +1,79 @@
+#
+# Performs optional geolocation of peer connections by IP address for mapping
+# Only if Maxmind license file is found at /root/.chia/machinaris/config/maxmind_license.json 
+#
+
+import ast
+from marshmallow import validates_schema
+
+from pytest import mark
+import geoip2.webservice
+import json
+import os
+import re
+import traceback
+
+from common.models import connections as co
+from common.config import globals
+from api import app
+
+MAXMIND_LICENSE_FILE = '/root/.chia/machinaris/config/maxmind_license.json'
+MAPBOX_LICENSE_FILE = '/root/.chia/machinaris/config/mapbox_license.json'
+GEOIP_CACHE_FILE = '/root/.chia/machinaris/cache/geoip_cache.json'
+
+def load_maxmind_license():
+    if not os.path.exists(MAXMIND_LICENSE_FILE):
+        return None
+    try:
+        with open(MAXMIND_LICENSE_FILE) as f:
+            data = json.load(f)
+    except Exception as ex:
+        msg = "Unable to valid json from {0} because {1}".format(MAXMIND_LICENSE_FILE, str(ex))
+        app.logger.error(msg)
+    return data
+
+def load_mapbox_license():
+    if not os.path.exists(MAPBOX_LICENSE_FILE):
+        return None
+    try:
+        with open(MAPBOX_LICENSE_FILE) as f:
+            data = json.load(f)
+    except Exception as ex:
+        msg = "Unable to valid json from {0} because {1}".format(MAPBOX_LICENSE_FILE, str(ex))
+        app.logger.error(msg)
+    return data
+
+def save_settings(maxmind_account, maxmind_license_key, mapbox_access_token):
+    try:
+        with open(MAXMIND_LICENSE_FILE, 'w') as f:
+            json.dump({"account": maxmind_account.strip(), "license_key": maxmind_license_key.strip()}, f)
+    except Exception as ex:
+        app.logger.error("Failed to store Maxmind settings in {0} because {1}".format(MAXMIND_LICENSE_FILE, str(ex)))
+    if mapbox_access_token and mapbox_access_token.strip():
+        try:
+            with open(MAPBOX_LICENSE_FILE, 'w') as f:
+                json.dump({"access_token": mapbox_access_token.strip()}, f)
+        except Exception as ex:
+            app.logger.error("Failed to store Mapbox settings in {0} because {1}".format(MAPBOX_LICENSE_FILE, str(ex)))
+
+def load_geoip_cache():
+    data = {}
+    if os.path.exists(GEOIP_CACHE_FILE):
+        try:
+            with open(GEOIP_CACHE_FILE) as f:
+                data = json.load(f)
+        except Exception as ex:
+            msg = "Unable to read geoip cache from {0} because {1}".format(GEOIP_CACHE_FILE, str(ex))
+            app.logger.error(msg)
+            return data
+    return data
+
+def generate_marker_hues(connections):
+    marker_hues = {}
+    count = len(connections.rows)
+    index = 0
+    for connection in connections.rows:
+        marker_hues[connection['blockchain']] = 360/count * index
+        index += 1
+    #app.logger.info(marker_hues)
+    return marker_hues
\ No newline at end of file
diff --git a/web/models/chia.py b/web/models/chia.py
index b22c22e9..750b6747 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -8,7 +8,7 @@
 from flask_babel import _, lazy_gettext as _l
 
 from web import app
-from web.actions import worker as w
+from web.actions import worker as w, mapping
 from common.config import globals
 from common.utils import converters, fiat
 
@@ -509,9 +509,10 @@ def extract_time(self, blockchain, details):
 
 class Connections:
 
-    def __init__(self, connections):
+    def __init__(self, connections, lang):
         self.rows = []
         self.blockchains = {}
+        geoip_cache = mapping.load_geoip_cache()
         for connection in connections:
             worker_status = None
             try:
@@ -532,9 +533,9 @@ def __init__(self, connections):
                 'add_exmample': self.get_add_connection_example(connection.blockchain)
             })
             if connection.blockchain == 'mmx':
-                self.blockchains[connection.blockchain] = self.parse_mmx(connection, connection.blockchain)
+                self.blockchains[connection.blockchain] = self.parse_mmx(connection, connection.blockchain, geoip_cache, lang)
             else:
-                self.blockchains[connection.blockchain] = self.parse_chia(connection, connection.blockchain)
+                self.blockchains[connection.blockchain] = self.parse_chia(connection, connection.blockchain, geoip_cache, lang)
         self.rows.sort(key=lambda conn: conn['blockchain'])
     
     def get_add_connection_example(self, blockchain):
@@ -603,7 +604,39 @@ def blockchain_port(self,blockchain):
 
         raise("Unknown blockchain fork of selected: " + blockchain)
 
-    def parse_chia(self, connection, blockchain):
+    def set_geolocation(self, geoip_cache, connection, lang):
+        latitude = None
+        longitude = None
+        city = ''
+        country = ''
+        if connection['ip'] in geoip_cache:
+            geoip = geoip_cache[connection['ip']]
+            latitude = geoip['latitude']
+            longitude = geoip['longitude']
+            try:
+                for key in geoip['city']:
+                    if key.startswith(lang):
+                        city = geoip['city'][key]
+                        break
+                if not city:
+                    city = geoip['city']['en']
+            except:
+                pass
+            try:
+                for key in geoip['country']:
+                    if key.startswith(lang):
+                        country = geoip['country'][key]
+                        break
+                if not country:
+                    country = geoip['country']['en']
+            except:
+                pass
+        connection['latitude'] = latitude
+        connection['longitude'] = longitude
+        connection['city'] = city
+        connection['country'] = country
+
+    def parse_chia(self, connection, blockchain, geoip_cache, lang):
         conns = []
         for line in connection.details.split('\n'):
             try:
@@ -642,6 +675,10 @@ def parse_chia(self, connection, blockchain):
                         if len(vals) > 9: # HDDCoin keeps SBHeight and Hash on same line
                             connection['height'] = vals[8]
                             connection['hash'] = vals[9]
+                        try:
+                            self.set_geolocation(geoip_cache, connection, lang)
+                        except:
+                            traceback.print_exc()
                         if blockchain == 'hddcoin' or vals[0] != "FULL_NODE":  # FARMER and WALLET only on one line 
                             conns.append(connection)
                     else:
@@ -651,7 +688,7 @@ def parse_chia(self, connection, blockchain):
                 app.logger.info(traceback.format_exc())
         return conns
 
-    def parse_mmx(self, connection, blockchain):
+    def parse_mmx(self, connection, blockchain, geoip_cache, lang):
         conns = []
         for line in connection.details.split('\n'):
             try:
@@ -669,6 +706,10 @@ def parse_mmx(self, connection, blockchain):
                         'mib_down': "%.1f"% round(self.rate_to_mb(m.group(4), m.group(5)) * int(m.group(8)) * 60, 2),
                         'timeout': m.group(9)
                     }
+                    try:
+                        self.set_geolocation(geoip_cache, connection, lang)
+                    except:
+                        traceback.print_exc()
                     conns.append(connection)
                 elif line.strip():
                     app.logger.info("Bad peer line: {0}".format(line))
diff --git a/web/routes.py b/web/routes.py
index 796ef0cf..da9dd49c 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -16,7 +16,8 @@
 from common.utils import fiat
 from common.models import pools as po
 from web import app, utils
-from web.actions import chia, pools as p, plotman, chiadog, worker, log_handler, stats, warnings, forktools
+from web.actions import chia, pools as p, plotman, chiadog, worker, \
+        log_handler, stats, warnings, forktools, mapping
 
 def get_lang(request):
     lang = None
@@ -273,15 +274,20 @@ def connections():
     gc = globals.load()
     selected_blockchain = worker.default_blockchain()
     if request.method == 'POST':
-        selected_blockchain = request.form.get('blockchain')
-        if request.form.get('action') == "add":
-            chia.add_connection(request.form.get("connection"), request.form.get('hostname'), request.form.get('blockchain'))
-        elif request.form.get('action') == 'remove':
-            chia.remove_connection(request.form.getlist('nodeid'), request.form.get('hostname'), request.form.get('blockchain'))
+        if request.form.get('maxmind_account'):
+            mapping.save_settings(request.form.get('maxmind_account'), request.form.get('maxmind_license_key'), request.form.get('mapbox_access_token'))
+            flash(_("Saved mapping settings.  Please allow 10 minutes to generate location information for the map."), 'success')
         else:
-            app.logger.info(_("Unknown form action") + ": {0}".format(request.form))
-    connections = chia.load_connections()
+            selected_blockchain = request.form.get('blockchain')
+            if request.form.get('action') == "add":
+                chia.add_connection(request.form.get("connection"), request.form.get('hostname'), request.form.get('blockchain'))
+            elif request.form.get('action') == 'remove':
+                chia.remove_connection(request.form.getlist('nodeid'), request.form.get('hostname'), request.form.get('blockchain'))
+            else:
+                app.logger.info(_("Unknown form action") + ": {0}".format(request.form))
+    connections = chia.load_connections(lang=request.accept_languages.best_match(app.config['LANGUAGES']))
     return render_template('connections.html', reload_seconds=120, selected_blockchain = selected_blockchain,
+        maxmind_license = mapping.load_maxmind_license(), mapbox_license = mapping.load_mapbox_license(), marker_hues=mapping.generate_marker_hues(connections),
         connections=connections, global_config=gc, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/settings/plotting', methods=['GET', 'POST'])
diff --git a/web/templates/base.html b/web/templates/base.html
index e2ddd999..f75e44aa 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -7,6 +7,7 @@
     
     
     
+    
     {{_('Machinaris')}}
     {% if reload_seconds %}
     
@@ -192,6 +193,7 @@
     
     
     
+    
     {% block scripts %}{% endblock %}
 
 
diff --git a/web/templates/connections.html b/web/templates/connections.html
index 8c565457..78376c7e 100644
--- a/web/templates/connections.html
+++ b/web/templates/connections.html
@@ -18,24 +18,88 @@
         {% endwith %}
     
 
-    
    
-        
    
-          
-            
-          
+    
 
+    
    
+        
    
+            
+             
+            
+        
    
+    
    
+
     
 
+{% if maxmind_license %}
+
+
    
+    
    
+        
    {{_('Connections Map')}}
    
+        
    
+            Blockchains:
+            {% for blockchain in marker_hues.keys() %}
+                
+            {% endfor %}
+        
    
+    
    
+
    
+
+
    
+
+
    
+    {{_('Connection Details')}}
+
    
+
+{% endif %}
+
     {% if connections.rows|length > 0 %}
     
    
+                                        {% if maxmind_license %}
+                                        
+                                        
+                                        {% endif %}
                                         
-                                        
@@ -88,8 +155,11 @@
                                         
+                                        {% if maxmind_license %}
+                                        
+                                        
+                                        {% endif %}
                                         
-                                        
@@ -149,6 +219,38 @@ 
    {{_('After a while, try running "chia show --connections" on your farmers to
 
     {% block scripts %}
     
     {% endblock %}
\ No newline at end of file
diff --git a/web/templates/wallet.html b/web/templates/wallet.html
index 9c4a4b34..0b8de2ce 100644
--- a/web/templates/wallet.html
+++ b/web/templates/wallet.html
@@ -80,9 +80,9 @@ 
    
-                
-                    
-                
+              
+                  
+              
               
               
             
    
diff --git a/web/translations/de/LC_MESSAGES/messages.po b/web/translations/de/LC_MESSAGES/messages.po
index a3f865ac..4912e66d 100644
--- a/web/translations/de/LC_MESSAGES/messages.po
+++ b/web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
@@ -18,63 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:76 routes.py:218
+#: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
 msgstr ""
 
-#: routes.py:95
+#: routes.py:96
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:127
+#: routes.py:128
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:177
+#: routes.py:178
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:203
+#: routes.py:204
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:223
+#: routes.py:224
 msgid "Saved cold wallet addresses."
 msgstr ""
 
-#: routes.py:282
+#: routes.py:279
+msgid ""
+"Saved mapping settings.  Please allow 10 minutes to generate location "
+"information for the map."
+msgstr ""
+
+#: routes.py:287
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:387
+#: routes.py:393
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:393
+#: routes.py:399
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:398
+#: routes.py:404
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:405
+#: routes.py:411
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:410
+#: routes.py:416
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:429
+#: routes.py:435
 msgid "Unsupported log type"
 msgstr ""
 
@@ -218,11 +224,11 @@ msgstr ""
 msgid "Chiadog Log on "
 msgstr ""
 
-#: templates/alerts.html:146 templates/plotting/jobs.html:363
+#: templates/alerts.html:146 templates/plotting/jobs.html:367
 msgid "Starting..."
 msgstr ""
 
-#: templates/alerts.html:153 templates/plotting/jobs.html:373
+#: templates/alerts.html:153 templates/plotting/jobs.html:377
 msgid "Stopping..."
 msgstr ""
 
@@ -234,104 +240,105 @@ msgstr ""
 msgid "Purging..."
 msgstr ""
 
-#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 #, fuzzy
 msgid "Machinaris"
 msgstr "Willkommen zu"
 
-#: templates/base.html:31
+#: templates/base.html:32
 msgid "Summary"
 msgstr ""
 
-#: templates/base.html:37 templates/base.html:108 templates/index.html:41
+#: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:43 templates/base.html:102 templates/index.html:50
+#: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:49
+#: templates/base.html:50
 msgid "Wallets"
 msgstr ""
 
-#: templates/base.html:55
+#: templates/base.html:56
 msgid "Keys"
 msgstr ""
 
-#: templates/base.html:62
+#: templates/base.html:63
 msgid "Blockchains"
 msgstr ""
 
-#: templates/base.html:69
+#: templates/base.html:70
 msgid "Connections"
 msgstr ""
 
-#: templates/base.html:75 templates/base.html:96
+#: templates/base.html:76 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
 msgstr ""
 
-#: templates/base.html:81 templates/base.html:114
+#: templates/base.html:82 templates/base.html:115
 msgid "Pools"
 msgstr ""
 
-#: templates/base.html:85 templates/farming/plots.html:69
+#: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
-#: templates/wallet.html:23 templates/wallet.html:46
+#: templates/base.html:92 templates/connections.html:25
+#: templates/connections.html:59 templates/summary.html:25
+#: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
-#: templates/base.html:120 templates/settings/tools.html:14
+#: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
 msgstr ""
 
-#: templates/base.html:131
+#: templates/base.html:132
 msgid "About"
 msgstr ""
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Install"
 msgstr ""
 
-#: templates/base.html:136
+#: templates/base.html:137
 msgid "Project"
 msgstr ""
 
-#: templates/base.html:138
+#: templates/base.html:139
 msgid "Wiki"
 msgstr ""
 
-#: templates/base.html:140
+#: templates/base.html:141
 msgid "Issues"
 msgstr ""
 
-#: templates/base.html:142
+#: templates/base.html:143
 msgid "License"
 msgstr ""
 
-#: templates/base.html:144
+#: templates/base.html:145
 msgid "Credits"
 msgstr ""
 
-#: templates/base.html:160
+#: templates/base.html:161
 msgid "Bladebit"
 msgstr ""
 
-#: templates/base.html:175
+#: templates/base.html:176
 msgid "Madmax"
 msgstr ""
 
-#: templates/base.html:179
+#: templates/base.html:180
 msgid "Plotman"
 msgstr ""
 
@@ -368,55 +375,94 @@ msgstr ""
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr ""
 
-#: templates/connections.html:70
+#: templates/connections.html:34
+msgid "Maxmind Account (Required):"
+msgstr ""
+
+#: templates/connections.html:39
+msgid "Maxmind License Key (Required):"
+msgstr ""
+
+#: templates/connections.html:44
+msgid "Mapbox Access Token (Optional):"
+msgstr ""
+
+#: templates/connections.html:50 templates/plotting/jobs.html:16
+#: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
+#: templates/plotting/workers.html:16 templates/plotting/workers.html:34
+#: templates/settings/pools.html:39 templates/summary.html:44
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr ""
+
+#: templates/connections.html:51 templates/settings/alerts.html:55
+#: templates/settings/farming.html:56 templates/settings/plotting.html:56
+#: templates/settings/pools.html:41 templates/settings/tools.html:55
+#: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr ""
+
+#: templates/connections.html:84
+msgid "Connections Map"
+msgstr ""
+
+#: templates/connections.html:98
+msgid "Connection Details"
+msgstr ""
+
+#: templates/connections.html:134
 msgid "Type"
 msgstr ""
 
-#: templates/connections.html:71 templates/worker.html:39
+#: templates/connections.html:135 templates/worker.html:39
 msgid "IP Address"
 msgstr ""
 
-#: templates/connections.html:72
-msgid "Ports"
+#: templates/connections.html:137
+msgid "City"
 msgstr ""
 
-#: templates/connections.html:73
-msgid "Node ID"
+#: templates/connections.html:138
+msgid "Country"
 msgstr ""
 
-#: templates/connections.html:74
+#: templates/connections.html:140
+msgid "Ports"
+msgstr ""
+
+#: templates/connections.html:141
 msgid "SB Height"
 msgstr ""
 
-#: templates/connections.html:75
+#: templates/connections.html:142
 msgid "Last Connect"
 msgstr ""
 
-#: templates/connections.html:76
+#: templates/connections.html:143
 msgid "MiB Up"
 msgstr ""
 
-#: templates/connections.html:77
+#: templates/connections.html:144
 msgid "MiB Down"
 msgstr ""
 
-#: templates/connections.html:109
+#: templates/connections.html:179
 msgid "Disconnect Selected"
 msgstr ""
 
-#: templates/connections.html:115
+#: templates/connections.html:185
 msgid "Check Port Forwarding"
 msgstr ""
 
-#: templates/connections.html:131
+#: templates/connections.html:201
 msgid "Add New Connection"
 msgstr ""
 
-#: templates/connections.html:143
+#: templates/connections.html:213
 msgid "No connections found from any farmers yet. Perhaps just starting?"
 msgstr ""
 
-#: templates/connections.html:144
+#: templates/connections.html:214
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
@@ -629,20 +675,6 @@ msgstr ""
 msgid "Local Currency:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:45
-#: templates/wallet.html:66 templates/wallet.html:93
-msgid "Save"
-msgstr ""
-
 #: templates/summary.html:75
 msgid "Height"
 msgstr ""
@@ -1167,15 +1199,15 @@ msgstr ""
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr ""
 
-#: templates/plotting/jobs.html:337
+#: templates/plotting/jobs.html:341
 msgid "Suspending..."
 msgstr ""
 
-#: templates/plotting/jobs.html:345
+#: templates/plotting/jobs.html:349
 msgid "Resuming..."
 msgstr ""
 
-#: templates/plotting/jobs.html:354
+#: templates/plotting/jobs.html:358
 msgid "Killing..."
 msgstr ""
 
@@ -1294,4 +1326,3 @@ msgstr ""
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
 msgstr ""
-
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
index 34b7961b..02bed326 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: fr\n"
@@ -18,35 +18,43 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:76 routes.py:218
+#: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
 msgstr "Paramètre de devise locale enregistré."
 
-#: routes.py:95
+#: routes.py:96
 msgid "Blockchain download"
 msgstr "Télécharger le blockchain"
 
-#: routes.py:127
+#: routes.py:128
 msgid "Unknown plotting form"
 msgstr "Forme inconnue"
 
-#: routes.py:177
+#: routes.py:178
 msgid "Error! Please see logs."
 msgstr "Erreur! Veuillez consulter les journaux."
 
-#: routes.py:203
+#: routes.py:204
 msgid "Unknown alerts form"
 msgstr "Forme inconnue"
 
-#: routes.py:223
+#: routes.py:224
 msgid "Saved cold wallet addresses."
 msgstr "Adresses de portefeuille froid enregistrées."
 
-#: routes.py:282
+#: routes.py:279
+msgid ""
+"Saved mapping settings.  Please allow 10 minutes to generate location "
+"information for the map."
+msgstr ""
+"Paramètres de cartographie enregistrés. Veuillez patienter 10 minutes pour générer l'emplacement"
+"informations pour la carte."
+
+#: routes.py:287
 msgid "Unknown form action"
 msgstr "Action inconnue"
 
-#: routes.py:387
+#: routes.py:393
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
@@ -54,7 +62,7 @@ msgstr ""
 "Aucun travailleur %{worker} pour la blockchain %{blockchain}. Veuillez "
 "sélectionner une autre blockchain."
 
-#: routes.py:393
+#: routes.py:399
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
@@ -62,7 +70,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour notifier%{blockchain}. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:398
+#: routes.py:404
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
@@ -70,7 +78,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour cultiver%{blockchain}. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:405
+#: routes.py:411
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
@@ -78,13 +86,13 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour parceller%{blockchain}. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:410
+#: routes.py:416
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour %{blockchain}. Veuillez "
 "vérifier vos travailleurs."
 
-#: routes.py:429
+#: routes.py:435
 msgid "Unsupported log type"
 msgstr "Type de journal non pris en charge"
 
@@ -234,11 +242,11 @@ msgstr ""
 msgid "Chiadog Log on "
 msgstr "Journaux Chiadog de "
 
-#: templates/alerts.html:146 templates/plotting/jobs.html:363
+#: templates/alerts.html:146 templates/plotting/jobs.html:367
 msgid "Starting..."
 msgstr "Commencer..."
 
-#: templates/alerts.html:153 templates/plotting/jobs.html:373
+#: templates/alerts.html:153 templates/plotting/jobs.html:377
 msgid "Stopping..."
 msgstr "Arrêt..."
 
@@ -250,103 +258,104 @@ msgstr "Reprendre..."
 msgid "Purging..."
 msgstr "Arrêt..."
 
-#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 msgid "Machinaris"
 msgstr "Machinaris"
 
-#: templates/base.html:31
+#: templates/base.html:32
 msgid "Summary"
 msgstr "Résumé"
 
-#: templates/base.html:37 templates/base.html:108 templates/index.html:41
+#: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr "Plotting"
 
-#: templates/base.html:43 templates/base.html:102 templates/index.html:50
+#: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr "Farming"
 
-#: templates/base.html:49
+#: templates/base.html:50
 msgid "Wallets"
 msgstr "Portefeuilles"
 
-#: templates/base.html:55
+#: templates/base.html:56
 msgid "Keys"
 msgstr "Clés"
 
-#: templates/base.html:62
+#: templates/base.html:63
 msgid "Blockchains"
 msgstr "Blockchains"
 
-#: templates/base.html:69
+#: templates/base.html:70
 msgid "Connections"
 msgstr "Connexions"
 
-#: templates/base.html:75 templates/base.html:96
+#: templates/base.html:76 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
 msgstr "Alertes"
 
-#: templates/base.html:81 templates/base.html:114
+#: templates/base.html:82 templates/base.html:115
 msgid "Pools"
 msgstr "Pools"
 
-#: templates/base.html:85 templates/farming/plots.html:69
+#: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr "Workers"
 
-#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
-#: templates/wallet.html:23 templates/wallet.html:46
+#: templates/base.html:92 templates/connections.html:25
+#: templates/connections.html:59 templates/summary.html:25
+#: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr "Paramètres"
 
-#: templates/base.html:120 templates/settings/tools.html:14
+#: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
 msgstr "Outils"
 
-#: templates/base.html:131
+#: templates/base.html:132
 msgid "About"
 msgstr "À propos"
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Install"
 msgstr "Installer"
 
-#: templates/base.html:136
+#: templates/base.html:137
 msgid "Project"
 msgstr "Projet"
 
-#: templates/base.html:138
+#: templates/base.html:139
 msgid "Wiki"
 msgstr "Wiki"
 
-#: templates/base.html:140
+#: templates/base.html:141
 msgid "Issues"
 msgstr "Problèmes"
 
-#: templates/base.html:142
+#: templates/base.html:143
 msgid "License"
 msgstr "Licence"
 
-#: templates/base.html:144
+#: templates/base.html:145
 msgid "Credits"
 msgstr "Crédits"
 
-#: templates/base.html:160
+#: templates/base.html:161
 msgid "Bladebit"
 msgstr "Bladebit"
 
-#: templates/base.html:175
+#: templates/base.html:176
 msgid "Madmax"
 msgstr "Madmax"
 
-#: templates/base.html:179
+#: templates/base.html:180
 msgid "Plotman"
 msgstr "Plotman"
 
@@ -383,57 +392,96 @@ msgstr "Aucune blockchain trouvée chez les farmers. Pas ajouté?"
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr "Essayez d'exécuter \"chia show --state\" sur vos farmers pour vérifier."
 
-#: templates/connections.html:70
+#: templates/connections.html:34
+msgid "Maxmind Account (Required):"
+msgstr "Compte Maxmind (obligatoire):"
+
+#: templates/connections.html:39
+msgid "Maxmind License Key (Required):"
+msgstr "Clé de licence Maxmind (obligatoire):"
+
+#: templates/connections.html:44
+msgid "Mapbox Access Token (Optional):"
+msgstr "Jeton d'accès Mapbox (facultatif):"
+
+#: templates/connections.html:50 templates/plotting/jobs.html:16
+#: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
+#: templates/plotting/workers.html:16 templates/plotting/workers.html:34
+#: templates/settings/pools.html:39 templates/summary.html:44
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr "Annuler"
+
+#: templates/connections.html:51 templates/settings/alerts.html:55
+#: templates/settings/farming.html:56 templates/settings/plotting.html:56
+#: templates/settings/pools.html:41 templates/settings/tools.html:55
+#: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: templates/connections.html:84
+msgid "Connections Map"
+msgstr "Carte des Connexions"
+
+#: templates/connections.html:98
+msgid "Connection Details"
+msgstr "Détails de Connexion"
+
+#: templates/connections.html:134
 msgid "Type"
 msgstr "Type"
 
-#: templates/connections.html:71 templates/worker.html:39
+#: templates/connections.html:135 templates/worker.html:39
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: templates/connections.html:72
+#: templates/connections.html:137
+msgid "City"
+msgstr "Ville"
+
+#: templates/connections.html:138
+msgid "Country"
+msgstr "Pays"
+
+#: templates/connections.html:140
 msgid "Ports"
 msgstr "Ports"
 
-#: templates/connections.html:73
-msgid "Node ID"
-msgstr "Node ID"
-
-#: templates/connections.html:74
+#: templates/connections.html:141
 msgid "SB Height"
 msgstr "Hauteur SB"
 
-#: templates/connections.html:75
+#: templates/connections.html:142
 msgid "Last Connect"
 msgstr "Dernière connexion"
 
-#: templates/connections.html:76
+#: templates/connections.html:143
 msgid "MiB Up"
 msgstr "MiB Up"
 
-#: templates/connections.html:77
+#: templates/connections.html:144
 msgid "MiB Down"
 msgstr "MiB Down"
 
-#: templates/connections.html:109
+#: templates/connections.html:179
 msgid "Disconnect Selected"
 msgstr "Taille sélectionnée"
 
-#: templates/connections.html:115
+#: templates/connections.html:185
 msgid "Check Port Forwarding"
 msgstr "Vérifier la redirection de port"
 
-#: templates/connections.html:131
+#: templates/connections.html:201
 msgid "Add New Connection"
 msgstr "Ajouter une nouvelle connexion"
 
-#: templates/connections.html:143
+#: templates/connections.html:213
 msgid "No connections found from any farmers yet. Perhaps just starting?"
 msgstr ""
 "Aucune connexion trouvée d'aucun worker pour le moment. Peut-être juste "
 "commencer?"
 
-#: templates/connections.html:144
+#: templates/connections.html:214
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
@@ -668,20 +716,6 @@ msgstr ""
 msgid "Local Currency:"
 msgstr "Monnaie locale:"
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
-msgid "Cancel"
-msgstr "Annuler"
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:45
-#: templates/wallet.html:66 templates/wallet.html:93
-msgid "Save"
-msgstr "Sauvegarder"
-
 #: templates/summary.html:75
 msgid "Height"
 msgstr "Hauteur"
@@ -1244,15 +1278,15 @@ msgstr "Continuer la sélection"
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr "Vitesse de Plotting - k%(k_size)s Plots"
 
-#: templates/plotting/jobs.html:337
+#: templates/plotting/jobs.html:341
 msgid "Suspending..."
 msgstr "Suspendre..."
 
-#: templates/plotting/jobs.html:345
+#: templates/plotting/jobs.html:349
 msgid "Resuming..."
 msgstr "Reprendre..."
 
-#: templates/plotting/jobs.html:354
+#: templates/plotting/jobs.html:358
 msgid "Killing..."
 msgstr "Tuer..."
 
diff --git a/web/translations/it/LC_MESSAGES/messages.po b/web/translations/it/LC_MESSAGES/messages.po
index 03babe22..9b140f4f 100644
--- a/web/translations/it/LC_MESSAGES/messages.po
+++ b/web/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -18,63 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:76 routes.py:218
+#: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
 msgstr ""
 
-#: routes.py:95
+#: routes.py:96
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:127
+#: routes.py:128
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:177
+#: routes.py:178
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:203
+#: routes.py:204
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:223
+#: routes.py:224
 msgid "Saved cold wallet addresses."
 msgstr ""
 
-#: routes.py:282
+#: routes.py:279
+msgid ""
+"Saved mapping settings.  Please allow 10 minutes to generate location "
+"information for the map."
+msgstr ""
+
+#: routes.py:287
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:387
+#: routes.py:393
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:393
+#: routes.py:399
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:398
+#: routes.py:404
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:405
+#: routes.py:411
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:410
+#: routes.py:416
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:429
+#: routes.py:435
 msgid "Unsupported log type"
 msgstr ""
 
@@ -218,11 +224,11 @@ msgstr ""
 msgid "Chiadog Log on "
 msgstr ""
 
-#: templates/alerts.html:146 templates/plotting/jobs.html:363
+#: templates/alerts.html:146 templates/plotting/jobs.html:367
 msgid "Starting..."
 msgstr ""
 
-#: templates/alerts.html:153 templates/plotting/jobs.html:373
+#: templates/alerts.html:153 templates/plotting/jobs.html:377
 msgid "Stopping..."
 msgstr ""
 
@@ -234,103 +240,104 @@ msgstr ""
 msgid "Purging..."
 msgstr ""
 
-#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 msgid "Machinaris"
 msgstr ""
 
-#: templates/base.html:31
+#: templates/base.html:32
 msgid "Summary"
 msgstr ""
 
-#: templates/base.html:37 templates/base.html:108 templates/index.html:41
+#: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:43 templates/base.html:102 templates/index.html:50
+#: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:49
+#: templates/base.html:50
 msgid "Wallets"
 msgstr ""
 
-#: templates/base.html:55
+#: templates/base.html:56
 msgid "Keys"
 msgstr ""
 
-#: templates/base.html:62
+#: templates/base.html:63
 msgid "Blockchains"
 msgstr ""
 
-#: templates/base.html:69
+#: templates/base.html:70
 msgid "Connections"
 msgstr ""
 
-#: templates/base.html:75 templates/base.html:96
+#: templates/base.html:76 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
 msgstr ""
 
-#: templates/base.html:81 templates/base.html:114
+#: templates/base.html:82 templates/base.html:115
 msgid "Pools"
 msgstr ""
 
-#: templates/base.html:85 templates/farming/plots.html:69
+#: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
-#: templates/wallet.html:23 templates/wallet.html:46
+#: templates/base.html:92 templates/connections.html:25
+#: templates/connections.html:59 templates/summary.html:25
+#: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
-#: templates/base.html:120 templates/settings/tools.html:14
+#: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
 msgstr ""
 
-#: templates/base.html:131
+#: templates/base.html:132
 msgid "About"
 msgstr ""
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Install"
 msgstr ""
 
-#: templates/base.html:136
+#: templates/base.html:137
 msgid "Project"
 msgstr ""
 
-#: templates/base.html:138
+#: templates/base.html:139
 msgid "Wiki"
 msgstr ""
 
-#: templates/base.html:140
+#: templates/base.html:141
 msgid "Issues"
 msgstr ""
 
-#: templates/base.html:142
+#: templates/base.html:143
 msgid "License"
 msgstr ""
 
-#: templates/base.html:144
+#: templates/base.html:145
 msgid "Credits"
 msgstr ""
 
-#: templates/base.html:160
+#: templates/base.html:161
 msgid "Bladebit"
 msgstr ""
 
-#: templates/base.html:175
+#: templates/base.html:176
 msgid "Madmax"
 msgstr ""
 
-#: templates/base.html:179
+#: templates/base.html:180
 msgid "Plotman"
 msgstr ""
 
@@ -367,55 +374,94 @@ msgstr ""
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr ""
 
-#: templates/connections.html:70
+#: templates/connections.html:34
+msgid "Maxmind Account (Required):"
+msgstr ""
+
+#: templates/connections.html:39
+msgid "Maxmind License Key (Required):"
+msgstr ""
+
+#: templates/connections.html:44
+msgid "Mapbox Access Token (Optional):"
+msgstr ""
+
+#: templates/connections.html:50 templates/plotting/jobs.html:16
+#: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
+#: templates/plotting/workers.html:16 templates/plotting/workers.html:34
+#: templates/settings/pools.html:39 templates/summary.html:44
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr ""
+
+#: templates/connections.html:51 templates/settings/alerts.html:55
+#: templates/settings/farming.html:56 templates/settings/plotting.html:56
+#: templates/settings/pools.html:41 templates/settings/tools.html:55
+#: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr ""
+
+#: templates/connections.html:84
+msgid "Connections Map"
+msgstr ""
+
+#: templates/connections.html:98
+msgid "Connection Details"
+msgstr ""
+
+#: templates/connections.html:134
 msgid "Type"
 msgstr ""
 
-#: templates/connections.html:71 templates/worker.html:39
+#: templates/connections.html:135 templates/worker.html:39
 msgid "IP Address"
 msgstr ""
 
-#: templates/connections.html:72
-msgid "Ports"
+#: templates/connections.html:137
+msgid "City"
 msgstr ""
 
-#: templates/connections.html:73
-msgid "Node ID"
+#: templates/connections.html:138
+msgid "Country"
 msgstr ""
 
-#: templates/connections.html:74
+#: templates/connections.html:140
+msgid "Ports"
+msgstr ""
+
+#: templates/connections.html:141
 msgid "SB Height"
 msgstr ""
 
-#: templates/connections.html:75
+#: templates/connections.html:142
 msgid "Last Connect"
 msgstr ""
 
-#: templates/connections.html:76
+#: templates/connections.html:143
 msgid "MiB Up"
 msgstr ""
 
-#: templates/connections.html:77
+#: templates/connections.html:144
 msgid "MiB Down"
 msgstr ""
 
-#: templates/connections.html:109
+#: templates/connections.html:179
 msgid "Disconnect Selected"
 msgstr ""
 
-#: templates/connections.html:115
+#: templates/connections.html:185
 msgid "Check Port Forwarding"
 msgstr ""
 
-#: templates/connections.html:131
+#: templates/connections.html:201
 msgid "Add New Connection"
 msgstr ""
 
-#: templates/connections.html:143
+#: templates/connections.html:213
 msgid "No connections found from any farmers yet. Perhaps just starting?"
 msgstr ""
 
-#: templates/connections.html:144
+#: templates/connections.html:214
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
@@ -626,20 +672,6 @@ msgstr ""
 msgid "Local Currency:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:45
-#: templates/wallet.html:66 templates/wallet.html:93
-msgid "Save"
-msgstr ""
-
 #: templates/summary.html:75
 msgid "Height"
 msgstr ""
@@ -1162,15 +1194,15 @@ msgstr ""
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr ""
 
-#: templates/plotting/jobs.html:337
+#: templates/plotting/jobs.html:341
 msgid "Suspending..."
 msgstr ""
 
-#: templates/plotting/jobs.html:345
+#: templates/plotting/jobs.html:349
 msgid "Resuming..."
 msgstr ""
 
-#: templates/plotting/jobs.html:354
+#: templates/plotting/jobs.html:358
 msgid "Killing..."
 msgstr ""
 
diff --git a/web/translations/pt/LC_MESSAGES/messages.po b/web/translations/pt/LC_MESSAGES/messages.po
index 51d96f8d..a4f526ad 100644
--- a/web/translations/pt/LC_MESSAGES/messages.po
+++ b/web/translations/pt/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-25 15:32-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: pt\n"
@@ -18,63 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:76 routes.py:218
+#: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
 msgstr ""
 
-#: routes.py:95
+#: routes.py:96
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:127
+#: routes.py:128
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:177
+#: routes.py:178
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:203
+#: routes.py:204
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:223
+#: routes.py:224
 msgid "Saved cold wallet addresses."
 msgstr ""
 
-#: routes.py:282
+#: routes.py:279
+msgid ""
+"Saved mapping settings.  Please allow 10 minutes to generate location "
+"information for the map."
+msgstr ""
+
+#: routes.py:287
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:387
+#: routes.py:393
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:393
+#: routes.py:399
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:398
+#: routes.py:404
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:405
+#: routes.py:411
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:410
+#: routes.py:416
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:429
+#: routes.py:435
 msgid "Unsupported log type"
 msgstr ""
 
@@ -218,11 +224,11 @@ msgstr ""
 msgid "Chiadog Log on "
 msgstr ""
 
-#: templates/alerts.html:146 templates/plotting/jobs.html:363
+#: templates/alerts.html:146 templates/plotting/jobs.html:367
 msgid "Starting..."
 msgstr ""
 
-#: templates/alerts.html:153 templates/plotting/jobs.html:373
+#: templates/alerts.html:153 templates/plotting/jobs.html:377
 msgid "Stopping..."
 msgstr ""
 
@@ -234,103 +240,104 @@ msgstr ""
 msgid "Purging..."
 msgstr ""
 
-#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 msgid "Machinaris"
 msgstr ""
 
-#: templates/base.html:31
+#: templates/base.html:32
 msgid "Summary"
 msgstr ""
 
-#: templates/base.html:37 templates/base.html:108 templates/index.html:41
+#: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:43 templates/base.html:102 templates/index.html:50
+#: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:49
+#: templates/base.html:50
 msgid "Wallets"
 msgstr ""
 
-#: templates/base.html:55
+#: templates/base.html:56
 msgid "Keys"
 msgstr ""
 
-#: templates/base.html:62
+#: templates/base.html:63
 msgid "Blockchains"
 msgstr ""
 
-#: templates/base.html:69
+#: templates/base.html:70
 msgid "Connections"
 msgstr ""
 
-#: templates/base.html:75 templates/base.html:96
+#: templates/base.html:76 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
 msgstr ""
 
-#: templates/base.html:81 templates/base.html:114
+#: templates/base.html:82 templates/base.html:115
 msgid "Pools"
 msgstr ""
 
-#: templates/base.html:85 templates/farming/plots.html:69
+#: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
-#: templates/wallet.html:23 templates/wallet.html:46
+#: templates/base.html:92 templates/connections.html:25
+#: templates/connections.html:59 templates/summary.html:25
+#: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
-#: templates/base.html:120 templates/settings/tools.html:14
+#: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
 msgstr ""
 
-#: templates/base.html:131
+#: templates/base.html:132
 msgid "About"
 msgstr ""
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Install"
 msgstr ""
 
-#: templates/base.html:136
+#: templates/base.html:137
 msgid "Project"
 msgstr ""
 
-#: templates/base.html:138
+#: templates/base.html:139
 msgid "Wiki"
 msgstr ""
 
-#: templates/base.html:140
+#: templates/base.html:141
 msgid "Issues"
 msgstr ""
 
-#: templates/base.html:142
+#: templates/base.html:143
 msgid "License"
 msgstr ""
 
-#: templates/base.html:144
+#: templates/base.html:145
 msgid "Credits"
 msgstr ""
 
-#: templates/base.html:160
+#: templates/base.html:161
 msgid "Bladebit"
 msgstr ""
 
-#: templates/base.html:175
+#: templates/base.html:176
 msgid "Madmax"
 msgstr ""
 
-#: templates/base.html:179
+#: templates/base.html:180
 msgid "Plotman"
 msgstr ""
 
@@ -367,55 +374,94 @@ msgstr ""
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr ""
 
-#: templates/connections.html:70
+#: templates/connections.html:34
+msgid "Maxmind Account (Required):"
+msgstr ""
+
+#: templates/connections.html:39
+msgid "Maxmind License Key (Required):"
+msgstr ""
+
+#: templates/connections.html:44
+msgid "Mapbox Access Token (Optional):"
+msgstr ""
+
+#: templates/connections.html:50 templates/plotting/jobs.html:16
+#: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
+#: templates/plotting/workers.html:16 templates/plotting/workers.html:34
+#: templates/settings/pools.html:39 templates/summary.html:44
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr ""
+
+#: templates/connections.html:51 templates/settings/alerts.html:55
+#: templates/settings/farming.html:56 templates/settings/plotting.html:56
+#: templates/settings/pools.html:41 templates/settings/tools.html:55
+#: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr ""
+
+#: templates/connections.html:84
+msgid "Connections Map"
+msgstr ""
+
+#: templates/connections.html:98
+msgid "Connection Details"
+msgstr ""
+
+#: templates/connections.html:134
 msgid "Type"
 msgstr ""
 
-#: templates/connections.html:71 templates/worker.html:39
+#: templates/connections.html:135 templates/worker.html:39
 msgid "IP Address"
 msgstr ""
 
-#: templates/connections.html:72
-msgid "Ports"
+#: templates/connections.html:137
+msgid "City"
 msgstr ""
 
-#: templates/connections.html:73
-msgid "Node ID"
+#: templates/connections.html:138
+msgid "Country"
 msgstr ""
 
-#: templates/connections.html:74
+#: templates/connections.html:140
+msgid "Ports"
+msgstr ""
+
+#: templates/connections.html:141
 msgid "SB Height"
 msgstr ""
 
-#: templates/connections.html:75
+#: templates/connections.html:142
 msgid "Last Connect"
 msgstr ""
 
-#: templates/connections.html:76
+#: templates/connections.html:143
 msgid "MiB Up"
 msgstr ""
 
-#: templates/connections.html:77
+#: templates/connections.html:144
 msgid "MiB Down"
 msgstr ""
 
-#: templates/connections.html:109
+#: templates/connections.html:179
 msgid "Disconnect Selected"
 msgstr ""
 
-#: templates/connections.html:115
+#: templates/connections.html:185
 msgid "Check Port Forwarding"
 msgstr ""
 
-#: templates/connections.html:131
+#: templates/connections.html:201
 msgid "Add New Connection"
 msgstr ""
 
-#: templates/connections.html:143
+#: templates/connections.html:213
 msgid "No connections found from any farmers yet. Perhaps just starting?"
 msgstr ""
 
-#: templates/connections.html:144
+#: templates/connections.html:214
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
@@ -626,20 +672,6 @@ msgstr ""
 msgid "Local Currency:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:45
-#: templates/wallet.html:66 templates/wallet.html:93
-msgid "Save"
-msgstr ""
-
 #: templates/summary.html:75
 msgid "Height"
 msgstr ""
@@ -1162,15 +1194,15 @@ msgstr ""
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr ""
 
-#: templates/plotting/jobs.html:337
+#: templates/plotting/jobs.html:341
 msgid "Suspending..."
 msgstr ""
 
-#: templates/plotting/jobs.html:345
+#: templates/plotting/jobs.html:349
 msgid "Resuming..."
 msgstr ""
 
-#: templates/plotting/jobs.html:354
+#: templates/plotting/jobs.html:358
 msgid "Killing..."
 msgstr ""
 
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index c076c47c..5fbcb551 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-22 20:40-0700\n"
+"POT-Creation-Date: 2022-02-27 11:47-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: zh\n"
@@ -18,63 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:76 routes.py:218
+#: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
 msgstr ""
 
-#: routes.py:95
+#: routes.py:96
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:127
+#: routes.py:128
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:177
+#: routes.py:178
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:203
+#: routes.py:204
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:223
+#: routes.py:224
 msgid "Saved cold wallet addresses."
 msgstr ""
 
-#: routes.py:282
+#: routes.py:279
+msgid ""
+"Saved mapping settings.  Please allow 10 minutes to generate location "
+"information for the map."
+msgstr ""
+
+#: routes.py:287
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:387
+#: routes.py:393
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:393
+#: routes.py:399
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:398
+#: routes.py:404
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:405
+#: routes.py:411
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:410
+#: routes.py:416
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:429
+#: routes.py:435
 msgid "Unsupported log type"
 msgstr ""
 
@@ -218,11 +224,11 @@ msgstr ""
 msgid "Chiadog Log on "
 msgstr ""
 
-#: templates/alerts.html:146 templates/plotting/jobs.html:363
+#: templates/alerts.html:146 templates/plotting/jobs.html:367
 msgid "Starting..."
 msgstr ""
 
-#: templates/alerts.html:153 templates/plotting/jobs.html:373
+#: templates/alerts.html:153 templates/plotting/jobs.html:377
 msgid "Stopping..."
 msgstr ""
 
@@ -234,103 +240,104 @@ msgstr ""
 msgid "Purging..."
 msgstr ""
 
-#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 msgid "Machinaris"
 msgstr ""
 
-#: templates/base.html:31
+#: templates/base.html:32
 msgid "Summary"
 msgstr ""
 
-#: templates/base.html:37 templates/base.html:108 templates/index.html:41
+#: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:43 templates/base.html:102 templates/index.html:50
+#: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:49
+#: templates/base.html:50
 msgid "Wallets"
 msgstr ""
 
-#: templates/base.html:55
+#: templates/base.html:56
 msgid "Keys"
 msgstr ""
 
-#: templates/base.html:62
+#: templates/base.html:63
 msgid "Blockchains"
 msgstr ""
 
-#: templates/base.html:69
+#: templates/base.html:70
 msgid "Connections"
 msgstr ""
 
-#: templates/base.html:75 templates/base.html:96
+#: templates/base.html:76 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
 msgstr ""
 
-#: templates/base.html:81 templates/base.html:114
+#: templates/base.html:82 templates/base.html:115
 msgid "Pools"
 msgstr ""
 
-#: templates/base.html:85 templates/farming/plots.html:69
+#: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
 
-#: templates/base.html:91 templates/summary.html:25 templates/summary.html:53
-#: templates/wallet.html:23 templates/wallet.html:46
+#: templates/base.html:92 templates/connections.html:25
+#: templates/connections.html:59 templates/summary.html:25
+#: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
 msgstr ""
 
-#: templates/base.html:120 templates/settings/tools.html:14
+#: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
 msgstr ""
 
-#: templates/base.html:131
+#: templates/base.html:132
 msgid "About"
 msgstr ""
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Install"
 msgstr ""
 
-#: templates/base.html:136
+#: templates/base.html:137
 msgid "Project"
 msgstr ""
 
-#: templates/base.html:138
+#: templates/base.html:139
 msgid "Wiki"
 msgstr ""
 
-#: templates/base.html:140
+#: templates/base.html:141
 msgid "Issues"
 msgstr ""
 
-#: templates/base.html:142
+#: templates/base.html:143
 msgid "License"
 msgstr ""
 
-#: templates/base.html:144
+#: templates/base.html:145
 msgid "Credits"
 msgstr ""
 
-#: templates/base.html:160
+#: templates/base.html:161
 msgid "Bladebit"
 msgstr ""
 
-#: templates/base.html:175
+#: templates/base.html:176
 msgid "Madmax"
 msgstr ""
 
-#: templates/base.html:179
+#: templates/base.html:180
 msgid "Plotman"
 msgstr ""
 
@@ -367,55 +374,94 @@ msgstr ""
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr ""
 
-#: templates/connections.html:70
+#: templates/connections.html:34
+msgid "Maxmind Account (Required):"
+msgstr ""
+
+#: templates/connections.html:39
+msgid "Maxmind License Key (Required):"
+msgstr ""
+
+#: templates/connections.html:44
+msgid "Mapbox Access Token (Optional):"
+msgstr ""
+
+#: templates/connections.html:50 templates/plotting/jobs.html:16
+#: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
+#: templates/plotting/workers.html:16 templates/plotting/workers.html:34
+#: templates/settings/pools.html:39 templates/summary.html:44
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr ""
+
+#: templates/connections.html:51 templates/settings/alerts.html:55
+#: templates/settings/farming.html:56 templates/settings/plotting.html:56
+#: templates/settings/pools.html:41 templates/settings/tools.html:55
+#: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr ""
+
+#: templates/connections.html:84
+msgid "Connections Map"
+msgstr ""
+
+#: templates/connections.html:98
+msgid "Connection Details"
+msgstr ""
+
+#: templates/connections.html:134
 msgid "Type"
 msgstr ""
 
-#: templates/connections.html:71 templates/worker.html:39
+#: templates/connections.html:135 templates/worker.html:39
 msgid "IP Address"
 msgstr ""
 
-#: templates/connections.html:72
-msgid "Ports"
+#: templates/connections.html:137
+msgid "City"
 msgstr ""
 
-#: templates/connections.html:73
-msgid "Node ID"
+#: templates/connections.html:138
+msgid "Country"
 msgstr ""
 
-#: templates/connections.html:74
+#: templates/connections.html:140
+msgid "Ports"
+msgstr ""
+
+#: templates/connections.html:141
 msgid "SB Height"
 msgstr ""
 
-#: templates/connections.html:75
+#: templates/connections.html:142
 msgid "Last Connect"
 msgstr ""
 
-#: templates/connections.html:76
+#: templates/connections.html:143
 msgid "MiB Up"
 msgstr ""
 
-#: templates/connections.html:77
+#: templates/connections.html:144
 msgid "MiB Down"
 msgstr ""
 
-#: templates/connections.html:109
+#: templates/connections.html:179
 msgid "Disconnect Selected"
 msgstr ""
 
-#: templates/connections.html:115
+#: templates/connections.html:185
 msgid "Check Port Forwarding"
 msgstr ""
 
-#: templates/connections.html:131
+#: templates/connections.html:201
 msgid "Add New Connection"
 msgstr ""
 
-#: templates/connections.html:143
+#: templates/connections.html:213
 msgid "No connections found from any farmers yet. Perhaps just starting?"
 msgstr ""
 
-#: templates/connections.html:144
+#: templates/connections.html:214
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
@@ -626,20 +672,6 @@ msgstr ""
 msgid "Local Currency:"
 msgstr ""
 
-#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
-#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
-#: templates/plotting/workers.html:34 templates/settings/pools.html:39
-#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings/alerts.html:55 templates/settings/farming.html:56
-#: templates/settings/plotting.html:56 templates/settings/pools.html:41
-#: templates/settings/tools.html:55 templates/summary.html:45
-#: templates/wallet.html:66 templates/wallet.html:93
-msgid "Save"
-msgstr ""
-
 #: templates/summary.html:75
 msgid "Height"
 msgstr ""
@@ -1162,15 +1194,15 @@ msgstr ""
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr ""
 
-#: templates/plotting/jobs.html:337
+#: templates/plotting/jobs.html:341
 msgid "Suspending..."
 msgstr ""
 
-#: templates/plotting/jobs.html:345
+#: templates/plotting/jobs.html:349
 msgid "Resuming..."
 msgstr ""
 
-#: templates/plotting/jobs.html:354
+#: templates/plotting/jobs.html:358
 msgid "Killing..."
 msgstr ""
 

From 4e0349a578b3262e6be939634d2734d5f444caf2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 27 Feb 2022 19:17:39 -0700
Subject: [PATCH 0609/1625] Per-blockchain toggle for geoip map.

---
 CHANGELOG.md                   |  1 +
 CREDITS.md                     |  3 +++
 scripts/pull_3rd_party_libs.sh |  4 +++-
 web/models/chia.py             |  2 +-
 web/templates/base.html        |  1 +
 web/templates/connections.html | 23 ++++++++++++++++++++---
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25b6edbe..6bf927a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. The format
  - [Chia](https://www.chia.net/2022/02/09/1.3-beta-release.en.html) - beta of v1.3 release (chia version reports v1.2.12dev254 currently)
  - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
  - Internationalization support for locale-specific text, numbers, and currencies.  [Translators wanted](https://github.com/guydavis/machinaris/wiki/Localization)!
+ - Geolocation of peer connections for each blockchain by their IP address. [Optionally enabled](https://github.com/guydavis/machinaris/wiki/Connections).
 
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
diff --git a/CREDITS.md b/CREDITS.md
index ebd0644f..6d36b5b8 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -24,6 +24,9 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [DataTables.js](https://datatables.net/): Filter/search/pagination of dynamic tables, as per [this tutorial](https://blog.miguelgrinberg.com/post/beautiful-interactive-tables-for-your-flask-templates).
 * [Charts.js](https://www.chartjs.org/): dynamic charting library.
 * [Flask-Babel](https://pythonhosted.org/Flask-BabelEx/): internationaliztion and localization, as per [this tutorial](https://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-xiii-i18n-and-l10n).
+* [Leaflet](https://leafletjs.com/): Web mapping toolkit.  Fantastic maps, easy to use!
+* [Maxmind](https://maxmind.com/): Geolocation API for mapping IP addresses of peer connections.
+* [Mapbox](https://mapbox.com): Nice looking map tiles for use with Leaflet on the Connections page map.
 
 ## Blockchains
 * [BTCgreen](https://github.com/BTCgreen-Network/btcgreen-blockchain)
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index f3b6ba85..7a44556d 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -34,10 +34,12 @@ wget -O ${BASEPATH}/bs.zip -nv "https://github.com/twbs/bootstrap/releases/downl
 unzip -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/css/bootstrap.min.css* bootstrap-${BOOTSTRAP_VERSION}*/js/bootstrap.bundle.min.js*  && \
 rm -f ${BASEPATH}/bs.zip
 
-# Leaflet
+# Leaflet and plugins
 wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v1.7.1/leaflet.zip" && \
 unzip -o ${BASEPATH}/leaflet.zip -d $BASEPATH/ && \
 rm -f ${BASEPATH}/leaflet.zip
+wget -O ${BASEPATH}/leaflet-layervisibility.js -nv "https://unpkg.com/leaflet-layervisibility/dist/leaflet-layervisibility.js"
+sed -i 's/\/\/# sourceMapping.*//g' ${BASEPATH}/leaflet-layervisibility.js
 
 # Pull localization files for DataTables.js
 mkdir -p $BASEPATH/i18n/
diff --git a/web/models/chia.py b/web/models/chia.py
index 750b6747..56308b51 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -609,7 +609,7 @@ def set_geolocation(self, geoip_cache, connection, lang):
         longitude = None
         city = ''
         country = ''
-        if connection['ip'] in geoip_cache:
+        if connection['ip'] in geoip_cache and geoip_cache[connection['ip']]:
             geoip = geoip_cache[connection['ip']]
             latitude = geoip['latitude']
             longitude = geoip['longitude']
diff --git a/web/templates/base.html b/web/templates/base.html
index f75e44aa..4b711ec4 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -194,6 +194,7 @@
     
     
     
+    
     {% block scripts %}{% endblock %}
 
 
diff --git a/web/templates/connections.html b/web/templates/connections.html
index 78376c7e..d3175ee1 100644
--- a/web/templates/connections.html
+++ b/web/templates/connections.html
@@ -85,8 +85,9 @@ 
         
    
             Blockchains:
             {% for blockchain in marker_hues.keys() %}
-                
+            
             {% endfor %}
         
    
     
@@ -240,14 +241,19 @@ 
    {{_('After a while, try running "chia show --connections" on your farmers to
                 {% endif %}
             ]
         });
+        var layerGroups = {};
         function load_map_points(map) {
             {% for connection in connections.rows %}
+                var layerGroup = L.layerGroup().addTo(map);
                 {% for row in connections.blockchains[connection.blockchain] %}
                     {% if row.latitude %}
-                        var marker = L.marker([{{row.latitude}},{{row.longitude}}]).addTo(map).bindPopup('{{connection.blockchain|capitalize}} - {{row.ip}}
    {% if row.city %}{{row.city}}, {% endif %}{{row.country}}');
+                        var marker = L.marker([{{row.latitude}},{{row.longitude}}]).addTo(map);
+                        marker.bindPopup('{{connection.blockchain|capitalize}} - {{row.ip}}
    {% if row.city %}{{row.city}}, {% endif %}{{row.country}}');
                         marker._icon.classList.add("hue_{{connection.blockchain}}");
+                        layerGroup.addLayer(marker);
                     {% endif %}
                 {% endfor %}
+                layerGroups['{{connection.blockchain}}'] = layerGroup;
             {% endfor %}
         }
         {% endif %}
@@ -285,6 +291,17 @@ 
    {{_('After a while, try running "chia show --connections" on your farmers to
                 );
                 $("#settings-form").submit();
             });
+            $("#{{connection.blockchain}}_toggle").click(function(event) {
+                event.preventDefault();
+                for (const [blockchain, layerGroup] of Object.entries(layerGroups)) {
+                    if (layerGroup == layerGroups['{{connection.blockchain}}']) {
+                        layerGroup.show();
+                    } 
+                    else {
+                        layerGroup.hide();
+                    }
+                }
+            });
             {% endfor %}
             {% if mapbox_license %}
             load_map_points(map);

From e20efbd4541e9c9f8c656be6e1e4d719c5e8cc3c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 27 Feb 2022 20:14:46 -0700
Subject: [PATCH 0610/1625] Improved blockchain selection on Connections map.

---
 web/templates/connections.html | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/web/templates/connections.html b/web/templates/connections.html
index d3175ee1..670ff626 100644
--- a/web/templates/connections.html
+++ b/web/templates/connections.html
@@ -81,14 +81,20 @@ 
 
 
    
     
    
-        
    {{_('Connections Map')}}
    
-        
    
-            Blockchains:
-            {% for blockchain in marker_hues.keys() %}
-            
-            {% endfor %}
+        
    {{_('Connections Map')}}
    
+        
    
+            
    
+                
+                
+            
    
         
    
     
    
 
    

From 50e99503e5fc699acd775f48ff4ca6295e1f7954 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 27 Feb 2022 21:18:59 -0700
Subject: [PATCH 0611/1625] Fix for new json cache location.

---
 api/schedules/geolocate_peers.py | 17 ++++++++++++++++-
 common/utils/fiat.py             |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/api/schedules/geolocate_peers.py b/api/schedules/geolocate_peers.py
index 7e623203..2738b09a 100644
--- a/api/schedules/geolocate_peers.py
+++ b/api/schedules/geolocate_peers.py
@@ -4,6 +4,7 @@
 #
 
 import ast
+import datetime
 import geoip2.webservice
 import json
 import os
@@ -17,6 +18,9 @@
 MAXMIND_LICENSE_FILE = '/root/.chia/machinaris/config/maxmind_license.json'
 GEOIP_CACHE_FILE = '/root/.chia/machinaris/cache/geoip_cache.json'
 
+MISSING_LOCATION_RETRY_HOURS = 24
+last_missing_location_retry_time = None
+
 def load_maxmind_license():
     if not os.path.exists(MAXMIND_LICENSE_FILE):
         return None
@@ -48,15 +52,26 @@ def save_geoip_cache(data):
         app.logger.error("Failed to store geoip cache in {0} because {1}".format(GEOIP_CACHE_FILE, str(ex)))
 
 def geolocate_ip_addresses(ip_addresses):
+    global last_missing_location_retry_time
     license = load_maxmind_license()
     if not license:
         app.logger.info("Skipping geolocation of peer connections by IP address as no Maxmind license found.")
         return
     geoip_cache = load_geoip_cache()
+    missing_retry = False
+    if not last_missing_location_retry_time or last_missing_location_retry_time <= \
+        (datetime.datetime.now() - datetime.timedelta(hours=MISSING_LOCATION_RETRY_HOURS)):
+        missing_retry = True  # Since its been a while, retry all missing locations for ips
+        last_missing_location_retry_time = datetime.datetime.now()
     with geoip2.webservice.Client(license["account"], license['license_key'], host="geolite.info") as client:
         for ip_address in ip_addresses:
             if ip_address in geoip_cache:
-                continue
+                if geoip_cache[ip_address]:
+                    continue
+                if not missing_retry:
+                    continue  # Don't request location too often for IPs which weren't resolved earlier
+                else:
+                    app.logger.info("Retrying {0}, as previously returned {1}.".format(ip_address, geoip_cache[ip_address]))
             try:
                 response = client.city(ip_address)
                 app.logger.info("{0} located at {1}".format(ip_address, response.location))
diff --git a/common/utils/fiat.py b/common/utils/fiat.py
index e3d6645f..e836381d 100644
--- a/common/utils/fiat.py
+++ b/common/utils/fiat.py
@@ -6,8 +6,8 @@
 import os
 import traceback
 
-BLOCKCHAIN_PRICES_CACHE_FILE = '/root/.chia/machinaris/dbs/blockchain_prices_cache.json'
-EXCHANGE_RATES_CACHE_FILE = '/root/.chia/machinaris/dbs/exchange_rates_cache.json'
+BLOCKCHAIN_PRICES_CACHE_FILE = '/root/.chia/machinaris/cache/blockchain_prices_cache.json'
+EXCHANGE_RATES_CACHE_FILE = '/root/.chia/machinaris/cache/exchange_rates_cache.json'
 LOCALE_SETTINGS = '/root/.chia/machinaris/config/locale_settings.json'
 
 def to_fiat(blockchain, coins):

From 5aa07a22caf799d8b624a62cfcaf98f51e6028f8 Mon Sep 17 00:00:00 2001
From: Antonio Casqueiro 
Date: Mon, 28 Feb 2022 14:01:06 +0000
Subject: [PATCH 0612/1625] Portuguese pt_PT translation

---
 api/translations/pt/LC_MESSAGES/messages.po |  15 +-
 web/translations/pt/LC_MESSAGES/messages.po | 625 +++++++++++---------
 2 files changed, 373 insertions(+), 267 deletions(-)

diff --git a/api/translations/pt/LC_MESSAGES/messages.po b/api/translations/pt/LC_MESSAGES/messages.po
index ca6eaf9f..435e6edd 100644
--- a/api/translations/pt/LC_MESSAGES/messages.po
+++ b/api/translations/pt/LC_MESSAGES/messages.po
@@ -20,11 +20,11 @@ msgstr ""
 
 #: commands/chia_cli.py:66
 msgid "Updated config.yaml failed validation!"
-msgstr ""
+msgstr "A validação do ficheiro config.yaml falhou!"
 
 #: commands/pools_cli.py:68
 msgid "No requested pool modifications were sent. Current settings are unchanged."
-msgstr ""
+msgstr "Nenhuma das modificações efectuadas à pool foi enviada. A configuração actual não foi modificada."
 
 #: commands/pools_cli.py:151
 msgid ""
@@ -32,6 +32,9 @@ msgid ""
 "minutes or more to complete. DO NOT immediately re-submit your request. "
 "View the log for details."
 msgstr ""
+"Saida da pool bem sucedida, mudando para o modo self plotting. Por favor aguarde uns "
+"minutos, ou mais algum tempo, para a operação terminar. NÃO FAÇA novamente a mesma operação. "
+"Consultar o log para ver mais detalhes."
 
 #: commands/pools_cli.py:195
 #, python-format
@@ -40,6 +43,9 @@ msgid ""
 "a few minutes or more to complete. DO NOT immediately re-submit your "
 "request. Be patient! View the log for details."
 msgstr ""
+"Juntou-se à pool %(pool_url)s com sucesso através da criação de um Chia NFT. Por favor aguade "
+"uns minutos, ou mais algum tempo, para a operação terminar. NÃO FAÇA novamente a mesma operação. "
+"Seja paciente. Pode consultar o log para ver mais detalhes."
 
 #: commands/pools_cli.py:224
 msgid ""
@@ -47,8 +53,11 @@ msgid ""
 "or more to complete. DO NOT immediately re-submit your request. Be "
 "patient! View the log for details."
 msgstr ""
+"O NFT para self-pooling foi criado com sucesso. Por favor aguarde uns minutos, "
+"ou mais algum tempo, para a operação terminar. NÃO FAÇA novamente a mesma operação. "
+"Seja paciente. Pode consultar o log para ver mais detalhes."
 
 #: views/ping/resources.py:28
 msgid "Pong!"
-msgstr ""
+msgstr "Pong!"
 
diff --git a/web/translations/pt/LC_MESSAGES/messages.po b/web/translations/pt/LC_MESSAGES/messages.po
index a4f526ad..5d7269af 100644
--- a/web/translations/pt/LC_MESSAGES/messages.po
+++ b/web/translations/pt/LC_MESSAGES/messages.po
@@ -20,163 +20,170 @@ msgstr ""
 
 #: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
-msgstr ""
+msgstr "Gravar definições da moeda local"
 
 #: routes.py:96
 msgid "Blockchain download"
-msgstr ""
+msgstr "Descarregando o Blockchain"
 
 #: routes.py:128
 msgid "Unknown plotting form"
-msgstr ""
+msgstr "Plotting form desconhecido"
 
 #: routes.py:178
 msgid "Error! Please see logs."
-msgstr ""
+msgstr "Erro! Por favor consulte os logs."
 
 #: routes.py:204
 msgid "Unknown alerts form"
-msgstr ""
+msgstr "Alerts form desconhecido"
 
 #: routes.py:224
 msgid "Saved cold wallet addresses."
-msgstr ""
-
+msgstr "O endereço da Cold Wallet foi gravado."
 #: routes.py:279
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
-msgstr ""
+msgstr "TODO"
 
 #: routes.py:287
 msgid "Unknown form action"
-msgstr ""
+msgstr "Form action desconhecida"
 
 #: routes.py:393
 msgid ""
 "No worker at %{worker} for blockchain %{blockchain}. Please select "
 "another blockchain."
 msgstr ""
+"Não existe worker no %{worker} para o blockchain %{blockchain}. Por favor seleccione "
+"outro blockchain."
 
 #: routes.py:399
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
+"For Alerts config, foi encontrado um fullnode que não responde para o %{blockchain}. "
+"Por favor verifica os teus workers."
 
 #: routes.py:404
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
+"For Farming config, foi encontrado um fullnode que não responde para o %{blockchain}. "
+"Por favor verifica os teus workers."
 
 #: routes.py:411
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
+"For Plotting config, foi encontrado um fullnode que não responde para o %{blockchain}. "
+"Por favor verifica os teus workers."
 
 #: routes.py:416
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
-msgstr ""
+msgstr "Foi encontrado um fullnode que não responde para o %{blockchain}. Por favor verifica os teus workers."
 
 #: routes.py:435
 msgid "Unsupported log type"
-msgstr ""
+msgstr "Tipo de log não suportado"
 
 #: actions/stats.py:338
 msgid "secs"
-msgstr ""
+msgstr "segs"
 
 #: actions/stats.py:348 models/chia.py:228
 msgid "hour"
-msgstr ""
+msgstr "hora"
 
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
-msgstr ""
+msgstr "Worker não está a responder a pings."
 
 #: actions/worker.py:107
 msgid "Please check the worker container and restart if necessary."
-msgstr ""
+msgstr "Por favor verifique o container do worker e reinicie-o se necessário."
 
 #: actions/worker.py:109
 msgid "Worker time is offset from controller."
-msgstr ""
+msgstr "A hora do Worker não coincide com a do Controlador"
 
 #: actions/worker.py:110
 msgid "Please ensure worker and controller share same timezone."
-msgstr ""
+msgstr "Por favor certifique-se que o Worker e o Controlador estão no mesmo fuso horário"
 
 #: actions/worker.py:116
 msgid "Machinaris version does not match controller."
-msgstr ""
+msgstr "A versão do Machinaris não é a mesma da versão do controller."
 
 #: actions/worker.py:117
 msgid "Please use a consistent Machinaris version to avoid issues."
-msgstr ""
+msgstr "Por favor usa a mesma versão do Machinaris para evitar ocorrerem problemas inesperados."
 
 #: models/chia.py:133 models/chia.py:222
 msgid "days"
-msgstr ""
+msgstr "dias"
 
 #: models/chia.py:210
 msgid "years"
-msgstr ""
+msgstr "anos"
 
 #: models/chia.py:212
 msgid "year"
-msgstr ""
+msgstr "ano"
 
 #: models/chia.py:214
 msgid "months"
-msgstr ""
+msgstr "meses"
 
 #: models/chia.py:216
 msgid "month"
-msgstr ""
+msgstr "mês"
 
 #: models/chia.py:218
 msgid "weeks"
-msgstr ""
+msgstr "semanas"
 
 #: models/chia.py:220
 msgid "week"
-msgstr ""
+msgstr "semana"
 
 #: models/chia.py:224
 msgid "day"
-msgstr ""
+msgstr "dia"
 
 #: models/chia.py:226
 msgid "hours"
-msgstr ""
+msgstr "horas"
 
 #: models/chia.py:230
 msgid "minutes"
-msgstr ""
+msgstr "minutos"
 
 #: models/chia.py:232
 msgid "minute"
-msgstr ""
+msgstr "minuto"
 
 #: models/chia.py:234
 msgid "Never (no plots)"
-msgstr ""
+msgstr "Nunca (sem plots)"
 
 #: models/chia.py:236
 msgid "Soon"
-msgstr ""
+msgstr "Em breve"
 
 #: templates/alerts.html:14
 msgid "Alerts: Recent Notifications"
-msgstr ""
+msgstr "Alertas: Notificações recentes"
 
 #: templates/alerts.html:72 templates/settings/alerts.html:36
 #: templates/settings/farming.html:37 templates/settings/plotting.html:37
 #: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
-msgstr ""
+msgstr "Worker"
 
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
@@ -184,207 +191,209 @@ msgstr ""
 #: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
-msgstr ""
+msgstr "Blockchain"
 
 #: templates/alerts.html:74
 msgid "Service"
-msgstr ""
+msgstr "Serviço"
 
 #: templates/alerts.html:75
 msgid "Notification"
-msgstr ""
+msgstr "Notifcação"
 
 #: templates/alerts.html:76
 msgid "Recorded At"
-msgstr ""
+msgstr "Registado em"
 
 #: templates/alerts.html:77
 msgid "Priority"
-msgstr ""
+msgstr "Prioridade"
 
 #: templates/alerts.html:99
 msgid "Remove Selected"
-msgstr ""
+msgstr "Remover seleccionados"
 
 #: templates/alerts.html:101
 msgid "Remove All"
-msgstr ""
+msgstr "Remover todos"
 
 #: templates/alerts.html:105
 msgid "No notifications from Chiadog yet... so check back soon."
-msgstr ""
+msgstr "Ainda não existem notificações do Chiadog... por isso, verifique novamente, dentro de alguns minutos."
 
 #: templates/alerts.html:106
 msgid ""
 "Expect at least a summary notification once daily as long as running "
 "above."
 msgstr ""
+"Espere ter pelo menos uma notificação diariamente desde que esteja a correr "
+"o Chiadog."
 
 #: templates/alerts.html:120
 msgid "Chiadog Log on "
-msgstr ""
+msgstr "Chiadog Log on "
 
 #: templates/alerts.html:146 templates/plotting/jobs.html:367
 msgid "Starting..."
-msgstr ""
+msgstr "Iniciando..."
 
 #: templates/alerts.html:153 templates/plotting/jobs.html:377
 msgid "Stopping..."
-msgstr ""
+msgstr "Parando..."
 
 #: templates/alerts.html:160
 msgid "Removing..."
-msgstr ""
+msgstr "Removendo..."
 
 #: templates/alerts.html:168
 msgid "Purging..."
-msgstr ""
+msgstr "Eliminando..."
 
 #: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 msgid "Machinaris"
-msgstr ""
+msgstr "Machinaris"
 
 #: templates/base.html:32
 msgid "Summary"
-msgstr ""
+msgstr "Sumário"
 
 #: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
-msgstr ""
+msgstr "Plotting"
 
 #: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
-msgstr ""
+msgstr "Farming"
 
 #: templates/base.html:50
 msgid "Wallets"
-msgstr ""
+msgstr "Wallets"
 
 #: templates/base.html:56
 msgid "Keys"
-msgstr ""
+msgstr "Chaves"
 
 #: templates/base.html:63
 msgid "Blockchains"
-msgstr ""
+msgstr "Blockchains"
 
 #: templates/base.html:70
 msgid "Connections"
-msgstr ""
+msgstr "Ligações"
 
-#: templates/base.html:76 templates/base.html:97
+#: templates/base.html:75 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
-msgstr ""
+msgstr "Alertas"
 
-#: templates/base.html:82 templates/base.html:115
+#: templates/base.html:81 templates/base.html:115
 msgid "Pools"
-msgstr ""
+msgstr "Pools"
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
-msgstr ""
+msgstr "Workers"
 
 #: templates/base.html:92 templates/connections.html:25
 #: templates/connections.html:59 templates/summary.html:25
 #: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
-msgstr ""
+msgstr "Definições"
 
 #: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
-msgstr ""
+msgstr "Ferramentas"
 
 #: templates/base.html:132
 msgid "About"
-msgstr ""
+msgstr "Acerca de"
 
 #: templates/base.html:135
 msgid "Install"
-msgstr ""
+msgstr "Instalar"
 
 #: templates/base.html:137
 msgid "Project"
-msgstr ""
+msgstr "Projecto"
 
 #: templates/base.html:139
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #: templates/base.html:141
 msgid "Issues"
-msgstr ""
+msgstr "Issues"
 
 #: templates/base.html:143
 msgid "License"
-msgstr ""
+msgstr "Licença"
 
 #: templates/base.html:145
 msgid "Credits"
-msgstr ""
+msgstr "Créditos"
 
 #: templates/base.html:161
 msgid "Bladebit"
-msgstr ""
+msgstr "Bladebit"
 
 #: templates/base.html:176
 msgid "Madmax"
-msgstr ""
+msgstr "Madmax"
 
 #: templates/base.html:180
 msgid "Plotman"
-msgstr ""
+msgstr "Plotman"
 
 #: templates/blockchains.html:23
 msgid "Blockchain Summary"
-msgstr ""
+msgstr "Blockchain sumário"
 
 #: templates/blockchains.html:32 templates/summary.html:74
 #: templates/wallet.html:109
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #: templates/blockchains.html:33
 msgid "Peak Height"
-msgstr ""
+msgstr "Peak Height""
 
 #: templates/blockchains.html:34
 msgid "Peak Time"
-msgstr ""
+msgstr "Peak Time"
 
 #: templates/blockchains.html:35 templates/wallet.html:114
 msgid "Updated At"
-msgstr ""
+msgstr "Actualizado em"
 
 #: templates/blockchains.html:62
 msgid "Blockchain Details"
-msgstr ""
+msgstr "Blockchain detalhes"
 
 #: templates/blockchains.html:87
 msgid "No blockchains found from any farmers. Not added?"
-msgstr ""
+msgstr "Não foi encontrado nenhum blockchain para os farmers. Não foram adicionados?"
 
 #: templates/blockchains.html:88
 msgid "Try running \"chia show --state\" on your farmers to verify."
-msgstr ""
+msgstr "Tente correr \"chia show --state\" nos seus farmers para verificar."
 
 #: templates/connections.html:34
 msgid "Maxmind Account (Required):"
-msgstr ""
+msgstr "Conta Maxmind (obrigatório):"
 
 #: templates/connections.html:39
 msgid "Maxmind License Key (Required):"
-msgstr ""
+msgstr "Chave da licença Maxmind (obrigatório):"
 
 #: templates/connections.html:44
 msgid "Mapbox Access Token (Optional):"
-msgstr ""
+msgstr "Mapbox token de acesso (Opcional):"
 
 #: templates/connections.html:50 templates/plotting/jobs.html:16
 #: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
@@ -392,142 +401,146 @@ msgstr ""
 #: templates/settings/pools.html:39 templates/summary.html:44
 #: templates/wallet.html:65 templates/wallet.html:92
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: templates/connections.html:51 templates/settings/alerts.html:55
 #: templates/settings/farming.html:56 templates/settings/plotting.html:56
 #: templates/settings/pools.html:41 templates/settings/tools.html:55
 #: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
 msgid "Save"
-msgstr ""
+msgstr "Gravar"
 
 #: templates/connections.html:84
 msgid "Connections Map"
-msgstr ""
+msgstr "Mapa de conexões"
 
 #: templates/connections.html:98
 msgid "Connection Details"
-msgstr ""
+msgstr "Detalhe da conexão"
 
 #: templates/connections.html:134
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #: templates/connections.html:135 templates/worker.html:39
 msgid "IP Address"
-msgstr ""
+msgstr "Endereço IP"
 
 #: templates/connections.html:137
 msgid "City"
-msgstr ""
+msgstr "Cidade"
 
 #: templates/connections.html:138
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #: templates/connections.html:140
 msgid "Ports"
-msgstr ""
+msgstr "Portos"
 
 #: templates/connections.html:141
 msgid "SB Height"
-msgstr ""
+msgstr "SB Height"
 
 #: templates/connections.html:142
 msgid "Last Connect"
-msgstr ""
+msgstr "Última ligação"
 
 #: templates/connections.html:143
 msgid "MiB Up"
-msgstr ""
+msgstr "MiB Up"
 
 #: templates/connections.html:144
 msgid "MiB Down"
-msgstr ""
+msgstr "MiB Down"
 
 #: templates/connections.html:179
 msgid "Disconnect Selected"
-msgstr ""
+msgstr "Desligar os seleccionados"
 
 #: templates/connections.html:185
 msgid "Check Port Forwarding"
-msgstr ""
+msgstr "Verifique o Port Forwarding"
 
 #: templates/connections.html:201
 msgid "Add New Connection"
-msgstr ""
+msgstr "Adicionar uma nova ligação"
 
 #: templates/connections.html:213
 msgid "No connections found from any farmers yet. Perhaps just starting?"
-msgstr ""
+msgstr "Não foram encontradas ligações para nenhum dos farmers. Talvez o sistema apenas tenha arrancado há pouco tempo?"
 
 #: templates/connections.html:214
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
 msgstr ""
+"Após algum tempo, tente correr \"chia show --connections\" nos seus farmers para"
+" verificar."
 
 #: templates/controller.html:23
 msgid "Machinaris Worker"
-msgstr ""
+msgstr "Machinaris Worker"
 
 #: templates/controller.html:26
 msgid "This Machinaris worker is controlled at:"
-msgstr ""
+msgstr "Este worker do Machinaris é controlado de:"
 
 #: templates/index.html:30
 msgid "Expected Time to Win"
-msgstr ""
+msgstr "Tempo expectável para ganhar"
 
 #: templates/index.html:72
 msgid "Total Plots"
-msgstr ""
+msgstr "Plots: Total"
 
 #: templates/index.html:79
 msgid "Total Plots Size"
-msgstr ""
+msgstr "Plots: Total de espaço ocupado"
 
 #: templates/index.html:89 templates/wallet.html:113
 msgid "Balance"
-msgstr ""
+msgstr "Balanço"
 
 #: templates/index.html:96
 msgid "Farmed"
-msgstr ""
+msgstr "Farmed"
 
 #: templates/index.html:105
 msgid "Netspace"
-msgstr ""
+msgstr "Netspace"
 
 #: templates/index.html:120
 msgid "Challenges from Harvesters"
-msgstr ""
+msgstr "Challenges das Harvesters"
 
 #: templates/index.html:136
 msgid "Partial Proofs for Pools"
-msgstr ""
+msgstr "Partial Proofs das Pools"
 
 #: templates/farming/workers.html:80 templates/index.html:147
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #: templates/farming/workers.html:84 templates/index.html:151
 msgid "Next"
-msgstr ""
+msgstr "Seguinte"
 
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
-msgstr ""
+msgstr "NOTA: Machinaris nunca irá mostrar a tua chave privada aqui."
 
 #: templates/keys.html:44
 msgid ""
 "However, you may view it yourself by executing this from within the "
 "Docker container."
 msgstr ""
+"No entanto, podes vê-la executando este comando dentro do "
+"Docker container."
 
 #: templates/keys.html:54
 msgid "Best Practices"
-msgstr ""
+msgstr "As melhores práticas"
 
 #: templates/keys.html:58
 #, python-format
@@ -537,85 +550,91 @@ msgid ""
 "%(wiki_link_open)swiki%(wiki_link_close)s. Please add \"Setup a Cold "
 "Wallet\" to your To-Do list!"
 msgstr ""
+"Machinaris usa uma Wallet onlime para farming. É fortemente recomendado "
+"que utilizes uma Cold Wallet para guardares o que ganhas. Existe um tutorial no "
+"%(wiki_link_open)swiki%(wiki_link_close)s. Por favor inclui \"Configurar uma Cold "
+"Wallet\" na tua lista das coisas a fazer!"
 
 #: templates/keys.html:71
 msgid "No keys found from any farmers. Not added?"
-msgstr ""
+msgstr "Não foram encontradas chaves para os farmers. Não foram adicionadas?"
 
 #: templates/keys.html:72
 msgid "Try running \"chia keys show\" on your farmers to verify."
-msgstr ""
+msgstr "Tente correr \"chia keys show\" nos seus farmers para verificar."
 
 #: templates/logs.html:11
 msgid "Machinaris Logs"
-msgstr ""
+msgstr "Machinaris Logs"
 
 #: templates/logs.html:62
 msgid "Autoscroll"
-msgstr ""
+msgstr "Autoscroll"
 
 #: templates/pools.html:61
 msgid "Pool:"
-msgstr ""
+msgstr "Pool:"
 
 #: templates/pools.html:66
 msgid "SELF_POOL"
-msgstr ""
+msgstr "SELF_POOL"
 
 #: templates/pools.html:71
 msgid "Status:"
-msgstr ""
+msgstr "Estado:"
 
 #: templates/pools.html:72
 msgid "Current Difficulty:"
-msgstr ""
+msgstr "Dificuldade actual:"
 
 #: templates/pools.html:73
 msgid "Current Points Balance:"
-msgstr ""
+msgstr "Pontos actuais"
 
 #: templates/pools.html:74
 msgid "Points Found Since Start:"
-msgstr ""
+msgstr "Pontos encontrados desde o início:"
 
 #: templates/pools.html:75
 msgid "Points Found in Last 24 Hours:"
-msgstr ""
+msgstr "Pontos encontrados nas últimas 24 horas:"
 
 #: templates/pools.html:76
 msgid "Points Successful in Last 24 Hours:"
-msgstr ""
+msgstr "Pontos com sucesso nas últimas 24 horas:"
 
 #: templates/pools.html:77
 msgid "Number of Plots:"
-msgstr ""
+msgstr "Número de Plots:"
 
 #: templates/pools.html:79
 msgid "Launcher ID:"
-msgstr ""
+msgstr "Launcher ID:"
 
 #: templates/pools.html:97
 msgid "No pools have been found yet. Perhaps the wallet is still syncing?"
-msgstr ""
+msgstr "Ainda não foram encontrados Pools. Talvez a wallet ainda esteja a sincronizar?"
 
 #: templates/pools.html:98
 msgid ""
 "If you would like to join a pool, please select the \"Settings | Pools\" "
 "page to get started."
 msgstr ""
+"Se gostavas de juntar-te a uma Pool, por favor selecciona a página \"Definições | Pools\" "
+"para começar."
 
 #: templates/pools.html:99
 msgid "For more, see the Machinaris"
-msgstr ""
+msgstr "Para mais informação, vê o Machinaris"
 
 #: templates/setup.html:27
 msgid "Welcome to Machinaris!"
-msgstr ""
+msgstr "Bemvindo ao Machinaris!"
 
 #: templates/setup.html:28
 #, python-format
 msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
-msgstr ""
+msgstr "Um interface web para o Chia%(trademark)s plotting e farming."
 
 #: templates/setup.html:61
 #, python-format
@@ -626,6 +645,11 @@ msgid ""
 "take a while. However minutes of download now, will save you multiple "
 "days of blockchain syncing later. Please be patient!"
 msgstr ""
+"Na primeira vez que o sistema é usado, é feito download da base de dados comprimida do blockchain Chia "
+"%(compressed)s a partir de %(dl_link)s. Cerca de "
+"%(uncompressed)s descomprimido (o progresso é mostrado acima), isto irá "
+"demorar bastante tempo. No entanto horas/minutos de download agora, irão poupar vários "
+"dias a sincronizar o blockchain. Por favor seja paciente!"
 
 #: templates/setup.html:75
 #, python-format
@@ -635,6 +659,10 @@ msgid ""
 "%(import_link_open)s import your own blockchain %(import_link_close)s if "
 "you have one from a previous Chia install."
 msgstr ""
+"NOTA: Se preferires fazer a sincronização do blockchain Chia durante vários "
+"dias, vê os %(init_link)s para mais detalhes. Em alternativa, podes "
+"%(import_link_open)s importar a tua própria base de dados com o blockchain %(import_link_close)s se "
+"tives uma tua, de uma instalação que tenhas feito anteriormente do Chia."
 
 #: templates/setup.html:83
 #, python-format
@@ -642,24 +670,28 @@ msgid ""
 "To get started with Machinaris as a Chia%(trademark)s fullnode, either "
 "import your existing 24-word mnemonic seed phrase"
 msgstr ""
+"Para começares a usar o Machinaris como um Chia%(trademark)s fullnode, podes "
+"importar a tua própria mnemônica de 24 palavras"
 
 #: templates/setup.html:90
 msgid "Import Existing Key"
-msgstr ""
+msgstr "Importar uma chave existe"
 
 #: templates/setup.html:91
 msgid "OR"
-msgstr ""
+msgstr "OU"
 
 #: templates/setup.html:93
 msgid ""
 "You can generate a brand-new mnemonic phrase that will be written to this"
 " in-container path"
 msgstr ""
+"Podes gerar uma nova mnemônica que será escrita para este"
+" caminho no container"
 
 #: templates/setup.html:96
 msgid "Generate New Key"
-msgstr ""
+msgstr "Gerar uma nova chave"
 
 #: templates/setup.html:110
 #, python-format
@@ -667,255 +699,281 @@ msgid ""
 "NOTE: If you would prefer to instead import your mnenmoic seed phrase "
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
+"NOTA: Se preferires importar a tua própria mnemônica de 24 palavras "
+"usando a linha de comandos, vê %(wiki_link)s para mais detalhes."
 
 #: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
-msgstr ""
+msgstr "Moeda local:"
+
+#: templates/plotting/jobs.html:16 templates/plotting/jobs.html:34
+#: templates/plotting/jobs.html:52 templates/plotting/workers.html:16
+#: templates/plotting/workers.html:34 templates/settings/pools.html:39
+#: templates/summary.html:44 templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: templates/settings/alerts.html:55 templates/settings/farming.html:56
+#: templates/settings/plotting.html:56 templates/settings/pools.html:41
+#: templates/settings/tools.html:55 templates/summary.html:45
+#: templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr "Gravar"
 
 #: templates/summary.html:75
 msgid "Height"
-msgstr ""
+msgstr "Height"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
 #: templates/summary.html:76
 msgid "Plots"
-msgstr ""
+msgstr "Plots"
 
 #: templates/summary.html:78
 msgid "Max Resp."
-msgstr ""
+msgstr "Max Resp."
 
 #: templates/summary.html:79
 msgid "Partials"
-msgstr ""
+msgstr "Partials"
 
 #: templates/summary.html:80
 msgid "ETW"
-msgstr ""
+msgstr "ETW"
 
 #: templates/summary.html:82
 msgid "Wallet"
-msgstr ""
+msgstr "Wallet"
 
 #: templates/summary.html:83 templates/summary.html:84
 msgid "EDV"
-msgstr ""
+msgstr "EDV"
 
 #: templates/summary.html:95 templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
 
 #: templates/summary.html:97
 msgid "Synced"
-msgstr ""
+msgstr "Sincronizado"
 
 #: templates/summary.html:99
 msgid "Syncing"
-msgstr ""
+msgstr "A sincronizar"
 
 #: templates/summary.html:101
 msgid "Not Synced"
-msgstr ""
+msgstr "Não sincronizado"
 
 #: templates/summary.html:124
 msgid "No blockchains found from any farmers. Just starting up?"
-msgstr ""
+msgstr "Não foram encontrados blockchains para nenhum dos farmers. Acabaste de arrancar o sistema?"
 
 #: templates/summary.html:125
 msgid "Please allow at least 15 minutes for blockchains to get started."
-msgstr ""
+msgstr "Por favor aguarde pelo menos 15 minutos para os blockchains iniciarem."
 
 #: templates/wallet.html:76
 msgid "Wallet Settings"
-msgstr ""
+msgstr "Definições da Wallet"
 
 #: templates/wallet.html:86
 msgid "Cold Wallet Address:"
-msgstr ""
+msgstr "Endereço da Cold Wallet:"
 
 #: templates/wallet.html:100
 msgid "Wallet Summary"
-msgstr ""
+msgstr "Wallet: Sumário"
 
 #: templates/wallet.html:110
 msgid "Wallet Balance"
-msgstr ""
+msgstr "Wallet: Balanço"
 
 #: templates/wallet.html:111
 msgid "Cold Wallet Balance"
-msgstr ""
+msgstr "Cold Wallet: Balanço"
 
 #: templates/wallet.html:112
 msgid "Total Balance"
-msgstr ""
+msgstr "Balanço total"
 
 #: templates/wallet.html:137
 msgid "Edit Wallet"
-msgstr ""
+msgstr "Editar wallet"
 
 #: templates/wallet.html:148
 msgid "Wallet Details"
-msgstr ""
+msgstr "Detalhes da Wallet"
 
 #: templates/wallet.html:172
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
+"O estado da Wallet ainda não foi recebido. Acabaste de arrancar o sistema? Por favor aguarda pelo menos"
+" 10 minutos para a actualização."
 
 #: templates/wallet.html:173
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
 msgstr ""
+"Também podes tentar correr \"chia wallet show\" na linha de comandos "
+"dos teus fullnode's containers para verificar."
 
 #: templates/worker.html:35
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #: templates/worker.html:43 templates/workers.html:42
 msgid "Hostname"
-msgstr ""
+msgstr "Hostname"
 
 #: templates/worker.html:51
 msgid "Port"
-msgstr ""
+msgstr "Porto"
 
 #: templates/worker.html:55
 msgid "System Type"
-msgstr ""
+msgstr "Tipo de sistema"
 
 #: templates/worker.html:59
 msgid "Last Status Received At"
-msgstr ""
+msgstr "Último estado recebido em"
 
 #: templates/worker.html:63
 msgid "Local Time on Worker"
-msgstr ""
+msgstr "Tempo local no Worker"
 
 #: templates/worker.html:67
 msgid "Last Ping to Worker"
-msgstr ""
+msgstr "Último ping para o Worker"
 
 #: templates/worker.html:70 templates/workers.html:64
 msgid "Responding"
-msgstr ""
+msgstr "Respondendo"
 
 #: templates/worker.html:72 templates/workers.html:66
 msgid "Connection Refused"
-msgstr ""
+msgstr "Conexão recusada"
 
 #: templates/worker.html:74 templates/workers.html:68
 msgid "Connection Timeout"
-msgstr ""
+msgstr "Timeout na conexão"
 
 #: templates/worker.html:76 templates/workers.html:70
 msgid "Connection Error"
-msgstr ""
+msgstr "Erro na conexão"
 
 #: templates/worker.html:86
 msgid "Last Successful Ping to Worker"
-msgstr ""
+msgstr "Último ping para o Worker com sucesso"
 
 #: templates/worker.html:90 templates/workers.html:48
 msgid "Version"
-msgstr ""
+msgstr "Versão"
 
 #: templates/worker.html:98
 msgid "Farmr ID"
-msgstr ""
+msgstr "Farmr ID"
 
 #: templates/worker.html:106
 msgid "Recent Warnings"
-msgstr ""
+msgstr "Avisos recentes"
 
 #: templates/worker.html:121
 msgid "Yay! No issues currently."
-msgstr ""
+msgstr "Yay! Sem problemas actualmente."
 
 #: templates/farming/workers.html:114 templates/worker.html:183
 msgid "Disk Space Used (TB)"
-msgstr ""
+msgstr "Espaço em disco usado (TB)"
 
 #: templates/farming/workers.html:120 templates/worker.html:189
 msgid "Disk Space Free (TB)"
-msgstr ""
+msgstr "Espaço em disco livre (TB)"
 
 #: templates/worker_launch.html:50 templates/worker_launch.html:609
 #: templates/worker_launch.html:630
 msgid "Host Path"
-msgstr ""
+msgstr "Host path"
 
 #: templates/worker_launch.html:55 templates/worker_launch.html:614
 #: templates/worker_launch.html:635
 msgid "Container Path"
-msgstr ""
+msgstr "Container path"
 
 #: templates/worker_launch.html:60 templates/worker_launch.html:619
 #: templates/worker_launch.html:640
 msgid "Used for:"
-msgstr ""
+msgstr "Usado para:"
 
 #: templates/worker_launch.html:63 templates/worker_launch.html:622
 #: templates/worker_launch.html:643
 msgid "Final Plots"
-msgstr ""
+msgstr "Plots finais"
 
 #: templates/worker_launch.html:64 templates/worker_launch.html:623
 #: templates/worker_launch.html:644
 msgid "Plotting Temp"
-msgstr ""
+msgstr "Plotting temp"
 
 #: templates/worker_launch.html:65 templates/worker_launch.html:624
 #: templates/worker_launch.html:645
 msgid "Other"
-msgstr ""
+msgstr "Outros"
 
 #: templates/worker_launch.html:234
 msgid "Unknown blockchain fork of selected:"
-msgstr ""
+msgstr "Unknown blockchain fork of selected:"
 
 #: templates/worker_launch.html:266
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
 msgstr ""
+"Falta o hostname do Worker. Por favor indique um nome cursto para identificar o "
+"Worker."
 
 #: templates/worker_launch.html:282
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
 msgstr ""
+"Host path inválido terminado com dois pontos. Tente adicionar o caracter '/' no final "
+"assim"
 
 #: templates/worker_launch.html:285
 msgid "Empty host path provided for volume at "
-msgstr ""
+msgstr "Foi indicado um host path vazio para o volume em "
 
 #: templates/worker_launch.html:285
 msgid "Please provide a host path."
-msgstr ""
+msgstr "Por favor indique um host path."
 
 #: templates/worker_launch.html:287
 msgid "Empty container path provided for volume at "
-msgstr ""
+msgstr "Foi indicado um container path vazio para o volume em "
 
 #: templates/worker_launch.html:287
 msgid "Please provide a container path."
-msgstr ""
+msgstr "Por favor indique um container path."
 
 #: templates/worker_launch.html:332
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
-msgstr ""
+msgstr "Não foi seleccionado o modo Harvester nem o modo Plottter. Por favor escolha um ou ambos."
 
 #: templates/worker_launch.html:338
 msgid ""
 "Missing worker IP address.  Please provide the IP the conntroller will "
 "connect to for commands."
 msgstr ""
+"Falta o endereço IP do Worker. Por favor indique o endereço IP que o controlador irá "
+"ligar-se para comandos."
 
 #: templates/worker_launch.html:380
 msgid "Machinaris Worker - Launch Config"
-msgstr ""
+msgstr "Machinaris Worker - Configuração de arranque"
 
 #: templates/worker_launch.html:381
 msgid ""
@@ -924,187 +982,193 @@ msgid ""
 "folder named \"machinaris\", then execute \"docker-compose up\" from a "
 "shell."
 msgstr ""
+"Complete o formulário abaixo para correr novos harvesters/plotters nos outros computadores"
+" na sua rede. Grave o ficheiro docker-compose.yml para uma "
+"pasta chamada \"machinaris\", depois execute \"docker-compose up\" a partir da "
+"linha de comandos."
 
 #: templates/worker_launch.html:385
 msgid "Operating System"
-msgstr ""
+msgstr "Sistema operativo"
 
 #: templates/worker_launch.html:391
 msgid "Linux"
-msgstr ""
+msgstr "Linux"
 
 #: templates/worker_launch.html:398
 msgid "Macintosh"
-msgstr ""
+msgstr "Macintosh"
 
 #: templates/worker_launch.html:405
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: templates/worker_launch.html:411
 msgid "Machinaris Mode"
-msgstr ""
+msgstr "Modo do Machinaris"
 
 #: templates/worker_launch.html:417
 msgid "Harvester"
-msgstr ""
+msgstr "Harvester"
 
 #: templates/worker_launch.html:424
 msgid "Plotter"
-msgstr ""
+msgstr "Plotter"
 
 #: templates/worker_launch.html:432
 msgid "Farmer Public Key"
-msgstr ""
+msgstr "Farmer chave pública"
 
 #: templates/worker_launch.html:437
 msgid "Pool Public Key"
-msgstr ""
+msgstr "Pool chave pública"
 
 #: templates/worker_launch.html:442
 msgid "Pool Contract Address"
-msgstr ""
+msgstr "Pool endereço do contrato"
 
 #: templates/worker_launch.html:447
 msgid "Plot on Startup"
-msgstr ""
+msgstr "Iniciar plotting ao arrancar"
 
 #: templates/worker_launch.html:453
 msgid "True"
-msgstr ""
+msgstr "Verdadeiro"
 
 #: templates/worker_launch.html:460
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #: templates/worker_launch.html:468
 msgid "Controller IP Address"
-msgstr ""
+msgstr "Controlador: Endereço IP"
 
 #: templates/worker_launch.html:473
 msgid "Controller API Port"
-msgstr ""
+msgstr "Controlador: Porto da API"
 
 #: templates/worker_launch.html:480
 msgid "Worker Hostname"
-msgstr ""
+msgstr "Worker: Hostname"
 
 #: templates/worker_launch.html:485
 msgid "Worker IP Address"
-msgstr ""
+msgstr "Worker: Endereço IP"
 
 #: templates/worker_launch.html:492
 msgid "Blockchains to Farm"
-msgstr ""
+msgstr "Blockchains to Farm"
 
 #: templates/worker_launch.html:605
 msgid "Volume Mounts"
-msgstr ""
+msgstr "Volumes montados"
 
 #: templates/worker_launch.html:654
 msgid "Add New Volume"
-msgstr ""
+msgstr "Adicionar um novo volume"
 
 #: templates/worker_launch.html:656
 msgid "Remove Last Volume"
-msgstr ""
+msgstr "Remover o último volume"
 
 #: templates/worker_launch.html:663
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
 #: templates/worker_launch.html:667
 msgid "Docker Compose"
-msgstr ""
+msgstr "Docker Compose"
 
 #: templates/workers.html:44
 msgid "Mode"
-msgstr ""
+msgstr "Modo"
 
 #: templates/workers.html:45
 msgid "Last Status Received"
-msgstr ""
+msgstr "Último estado recebido"
 
 #: templates/workers.html:46
 msgid "Last Ping"
-msgstr ""
+msgstr "Último ping"
 
 #: templates/workers.html:47
 msgid "Last Successful Ping"
-msgstr ""
+msgstr "Último ping com sucesso"
 
 #: templates/workers.html:49
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #: templates/workers.html:94
 msgid "Prune Selected"
-msgstr ""
+msgstr "Eliminar os seleccionados"
 
 #: templates/workers.html:96
 msgid "New Worker"
-msgstr ""
+msgstr "Novo Worker"
 
 #: templates/workers.html:103
 msgid "No Machinaris workers have reported status successfully."
-msgstr ""
+msgstr "Nenhum Worker do Machinaris reportou um estado com sucesso."
 
 #: templates/workers.html:104
 msgid "Please check each expected worker's log files."
-msgstr ""
+msgstr "Por favor verifique o ficherio de log de cada Worker."
 
 #: templates/workers.html:105
 #, python-format
 msgid "For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
-msgstr ""
+msgstr "Para mais informação, veja o Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
 
 #: templates/farming/plots.html:9
 msgid "Plotting Analysis"
-msgstr ""
+msgstr "Plotting: Análise"
 
 #: templates/farming/plots.html:13
 msgid "Analysis of the plotting job log shows time (seconds) spent in each phase:"
-msgstr ""
+msgstr "Análise do log dos plotting jobs que mostra o tempo (segundos) gasto em cada fase:"
 
 #: templates/farming/plots.html:24
 msgid "Plot Check"
-msgstr ""
+msgstr "Verificação do Plot"
 
 #: templates/farming/plots.html:86 templates/plotting/jobs.html:117
 #: templates/plotting/workers.html:122
 msgid "Worker is offline."
-msgstr ""
+msgstr "Worker offline."
 
 #: templates/farming/plots.html:88
 msgid "Farming not started successfully."
-msgstr ""
+msgstr "Farming não foi iniciado com sucesso."
 
 #: templates/farming/plots.html:147
 msgid "Farming Log for "
-msgstr ""
+msgstr "Farming Log para"
 
 #: templates/farming/plots.html:201
 msgid "Good Plot"
-msgstr ""
+msgstr "Plot em bom estado"
 
 #: templates/farming/plots.html:203
 msgid "Bad Plot"
-msgstr ""
+msgstr "Plot com problemas"
 
 #: templates/farming/workers.html:66
 msgid "Daily Summary"
-msgstr ""
+msgstr "Sumário diário"
 
 #: templates/farming/workers.html:70
 #, python-format
 msgid "No daily summary found for %(blockchain)s on %(displayname)s."
-msgstr ""
+msgstr "Não foi encontrado um sumário diário para %(blockchain)s no %(displayname)s."
 
 #: templates/farming/workers.html:72
 msgid ""
 "Please check that your Machinaris container for this blockchain is "
 "running. Also please verify settings on the Alerts page."
 msgstr ""
+"Por favor verifique que o seu Machinaris container para este blockchain está a "
+"correr. Por favor verifique também as definições na página de Alertas."
 
 #: templates/farming/workers.html:93
 #, python-format
@@ -1114,10 +1178,14 @@ msgid ""
 "%(wiki_link_open)s configured %(wiki_link_close)s. Also ensure the Chia "
 "worker is reporting into the controller on the Workers page."
 msgstr ""
+"Não existem estatisticas do disco para os Plots do %(hostname)s para o Chia "
+"blockchain. Por favor certifique-se que todos os caminhos para os directórios dos plots foram "
+"%(wiki_link_open)s configurados %(wiki_link_close)s. Verifique ainda que o Chia "
+"worker está a reportar para o Conttrolador na página dos Workers."
 
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
-msgstr ""
+msgstr "Confirmar que é para matar"
 
 #: templates/plotting/jobs.html:13
 msgid ""
@@ -1126,14 +1194,18 @@ msgid ""
 "running, another plot will be immediately started, so please stop Plotman"
 " first from the top-right. Continue?"
 msgstr ""
+"Esta acção irá terminar os Plots seleccionados, estejam estes a correr ou "
+"parados, e apagar todos os ficheiros temporários. Se o Plotman ainda está a "
+"correr, outro  Plot será iniciado automaticamente, por isso primeiro pare o Plotman"
+" a partir do canto superior direito. Continuar?"
 
 #: templates/plotting/jobs.html:17 templates/plotting/jobs.html:193
 msgid "Kill Selected"
-msgstr ""
+msgstr "Matar os seleccionados"
 
 #: templates/plotting/jobs.html:27 templates/plotting/jobs.html:123
 msgid "Start Plotting"
-msgstr ""
+msgstr "Plotting: Iniciar"
 
 #: templates/plotting/jobs.html:31
 msgid ""
@@ -1141,29 +1213,34 @@ msgid ""
 "configured plotter. Be careful about running more than one plotter on a "
 "single machine at a time. Continue?"
 msgstr ""
+"Esta acção irá iniciar o Plotman e lançar o plotting run usando "
+"o plotter configurado. Tenha cuidado ao correr mais de um plotter numa "
+"única máquina em simultâneo. Continuar?"
 
 #: templates/plotting/jobs.html:35 templates/plotting/workers.html:17
 msgid "Start"
-msgstr ""
+msgstr "Iniciar"
 
 #: templates/plotting/jobs.html:45 templates/plotting/jobs.html:120
 msgid "Stop Plotting"
-msgstr ""
+msgstr "Parar Plotting"
 
 #: templates/plotting/jobs.html:49
 msgid ""
 "This action will stop Plotman from launching new plotting jobs.  Running "
 "jobs will run to completion. Continue?"
 msgstr ""
+"Esta acção irá impedir que o Plotman lance novos plotting jobs. "
+"Os jobs que estão a correr irão continuar até terem terminado. Continuar?"
 
 #: templates/plotting/jobs.html:53 templates/plotting/workers.html:35
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: templates/plotting/jobs.html:63 templates/plotting/workers.html:45
 #: templates/plotting/workers.html:63
 msgid "Worker Offline"
-msgstr ""
+msgstr "Worker offline"
 
 #: templates/plotting/jobs.html:67 templates/plotting/workers.html:67
 msgid ""
@@ -1171,44 +1248,47 @@ msgid ""
 "controller.  Please check the Workers page and bring the system back "
 "online."
 msgstr ""
+"Este Worker não está actualmente online e a responder a pings do "
+"Controlador. Por favor verifique a página dos Workers e volte a colocar novamente o sistema "
+"online."
 
 #: templates/plotting/jobs.html:70 templates/plotting/workers.html:53
 #: templates/plotting/workers.html:70
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: templates/plotting/jobs.html:91 templates/plotting/workers.html:93
 msgid "Jobs"
-msgstr ""
+msgstr "Jobs"
 
 #: templates/plotting/jobs.html:189
 msgid "Suspend Selected"
-msgstr ""
+msgstr "Suspender os seleccionados"
 
 #: templates/plotting/jobs.html:191
 msgid "Resume Selected"
-msgstr ""
+msgstr "Retomar os seleccionados"
 
 #: templates/plotting/jobs.html:204
 #, python-format
 msgid "Plotting Speed - k%(k_size)s Plots"
-msgstr ""
+msgstr "Velocidade de Plotting - k%(k_size)s Plots"
 
 #: templates/plotting/jobs.html:341
 msgid "Suspending..."
-msgstr ""
+msgstr "A suspender..."
 
 #: templates/plotting/jobs.html:349
 msgid "Resuming..."
-msgstr ""
+msgstr "A retomar..."
 
 #: templates/plotting/jobs.html:358
 msgid "Killing..."
-msgstr ""
+msgstr "Matando..."
 
 #: templates/plotting/workers.html:9 templates/plotting/workers.html:128
 msgid "Start Archiving"
-msgstr ""
+msgstr "Iniciar arquivar"
 
 #: templates/plotting/workers.html:13
 msgid ""
@@ -1216,16 +1296,21 @@ msgid ""
 "Completed plots will be disributed locally or transferred remotely. "
 "Continue?"
 msgstr ""
+"Esta acção irá iniciar o arquiver do Plotman a partir da pasta dst configurada. "
+"Os Plots completos irão ser distribuidos localmente ou transferidos remotamente. "
+"Continuar?"
 
 #: templates/plotting/workers.html:27 templates/plotting/workers.html:125
 msgid "Stop Archiving"
-msgstr ""
+msgstr "Parar arquivar"
 
 #: templates/plotting/workers.html:31
 msgid ""
 "This action will stop Plotman archiving from the configured dst folder, "
 "preventing further completed plot transfers. Continue?"
 msgstr ""
+"Esta acção irá parar o archiving do Plotman a partir da pasta dst configurada, "
+"impedindo a transferência de novo Plots que tenham terminado. Continuar?"
 
 #: templates/plotting/workers.html:49
 #, python-format
@@ -1235,23 +1320,27 @@ msgid ""
 "transfer of completed plots.  Please visit the Settings | Plotting page "
 "to configure this worker."
 msgstr ""
+"Este  Worker não está actualmente configurado para o Plotman "
+"%(wiki_link_open)sarchiving%(wiki_link_open)s para activar transferencias locais ou remotas "
+"de Plots que tenham terminado para. Por favor veja a página Definições | Plotting "
+"para configurar este Worker."
 
 #: templates/plotting/workers.html:103
 msgid "Archiving"
-msgstr ""
+msgstr "Arquivar"
 
 #: templates/plotting/workers.html:119
 msgid "Archiving is disabled.  See Settings | Plotting page."
-msgstr ""
+msgstr "Arquivar: Desactivado. Veja a página Definições | Plotting."
 
 #: templates/settings/alerts.html:57 templates/settings/farming.html:58
 #: templates/settings/plotting.html:58 templates/settings/tools.html:57
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/settings/pools.html:32
 msgid "Confirm Pool Change"
-msgstr ""
+msgstr "Confirmar a mudança de Pool"
 
 #: templates/settings/pools.html:36
 msgid ""
@@ -1259,6 +1348,9 @@ msgid ""
 "resulting in a small charge (few mojos) against your wallet. Continue "
 "anyway?"
 msgstr ""
+"Esta acção irá alterar a Pool seleccionada, provavelmente "
+"resultado no pagamento de uma pequena taxa (alguns mojos) usando a sua Wallet. Tem a certeza "
+"que pretende continuar?"
 
 #: templates/settings/pools.html:85
 #, python-format
@@ -1267,58 +1359,63 @@ msgid ""
 "the same, %(break)sbut it is much less volatile. You can easily switch "
 "pools without having to re-plot."
 msgstr ""
+"Junte-se a uma Pool e obtenha recompensas por estar farming de forma consistente. O ganho médio é "
+"o mesmo, %(break)smas muito menos volátil. Pode facilmente mudar de Pools "
+"sem ter de recriar novamente os Plots."
 
 #: templates/settings/pools.html:88
 msgid "ERROR: Unable to join a pool because:"
-msgstr ""
+msgstr "ERRO: Não foi possível juntar-se à Pool porque:"
 
 #: templates/settings/pools.html:111
 msgid "Self pool. When you win a block, you will earn rewards."
-msgstr ""
+msgstr "Farming sem usar uma Pool. Quando ganhas um bloco, o benefício será todo para ti."
 
 #: templates/settings/pools.html:122
 msgid "Connected to pool:"
-msgstr ""
+msgstr "Ligado à pool:"
 
 #: templates/settings/pools.html:122
 msgid "Connect to pool:"
-msgstr ""
+msgstr "Ligar-se à pool:"
 
 #: templates/settings/pools.html:132
 msgid "Compare Pools"
-msgstr ""
+msgstr "Comparar Pools"
 
 #: templates/settings/pools.html:135
 msgid "Get Mojos"
-msgstr ""
+msgstr "Obter Mojos"
 
 #: templates/settings/pools.html:157
 msgid "Save Changes"
-msgstr ""
+msgstr "Gravar alterações"
 
 #: templates/settings/pools.html:161
 msgid "View Log"
-msgstr ""
+msgstr "Ver log"
 
 #: templates/settings/pools.html:172
 msgid ""
 "No wallets found yet.  Perhaps this is a brand-new installation? If so, "
 "please wait for complete start-up."
 msgstr ""
+"Ainda não foi encontrado nenhuma Wallet. Talvez tenha acabado de instalar de novo o Machinaris? Se sim, "
+"por favor aguarde que o arranque termine."
 
 #: templates/settings/pools.html:173
 msgid "For more on Pooling, see the Machinaris"
-msgstr ""
+msgstr "Para mais informações sobre Pooling, veja o Machinaris"
 
 #: templates/settings/pools.html:173
 msgid "wiki"
-msgstr ""
+msgstr "wiki"
 
 #: templates/settings/pools.html:185
 msgid "Saving..."
-msgstr ""
+msgstr "Gravando..."
 
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
-msgstr ""
+msgstr "PlotNFT Log de "
 

From 1cb2e42c78710edb77cc86b3a400335bc925115d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 28 Feb 2022 10:59:19 -0700
Subject: [PATCH 0613/1625] Credit to Antonio for the PT translation.  Thanks!

---
 CREDITS.md           | 2 +-
 common/utils/fiat.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index 6d36b5b8..6633b485 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -96,7 +96,7 @@ A big thanks to all that contributed with dev and test including:
 * bafff
 * tjb_altf4
 * halfroom (aka Sagittarius)
-* vfarmer.antcasq
+* vfarmer.antcasq (Antonio Casqueiro)
 
 ## 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.*
\ No newline at end of file
diff --git a/common/utils/fiat.py b/common/utils/fiat.py
index e836381d..52c80d73 100644
--- a/common/utils/fiat.py
+++ b/common/utils/fiat.py
@@ -53,6 +53,8 @@ def get_fiat_exchange_to_usd():
     return 1.0 # Default fiat is $USD
 
 def get_local_currency():
+    if not os.path.exists(LOCALE_SETTINGS):
+        return None
     try:
         with open(LOCALE_SETTINGS) as f:
             data = json.load(f)

From e017da074c2a46c02c25c99980572defbe8ad40e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 28 Feb 2022 12:16:11 -0700
Subject: [PATCH 0614/1625] Fix for missing folder, escaped wiki link.

---
 scripts/setup_databases.sh | 1 +
 web/templates/workers.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/scripts/setup_databases.sh b/scripts/setup_databases.sh
index b44c35ec..ec46767e 100644
--- a/scripts/setup_databases.sh
+++ b/scripts/setup_databases.sh
@@ -5,6 +5,7 @@
 
 mkdir -p /root/.chia/machinaris/logs
 mkdir -p /root/.chia/machinaris/dbs
+mkdir -p /root/.chia/machinaris/cache
 
 # Optional reset parameter will remove broken DBs, allowing fresh setup of status
 if [[ $1 == "reset" ]]; then
diff --git a/web/templates/workers.html b/web/templates/workers.html
index 94833eef..5ab3d6c7 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -99,6 +99,7 @@
 
   {% else %}
 
+  {% autoescape false %}
   
    
     
    {{_('No Machinaris workers have reported status successfully.')}}
    
     
    {{_('Please check each expected worker\'s log files.')}}
    
@@ -107,6 +108,7 @@ 
    {{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.
         wiki_link_close='')}}
     
    
   
    
+  {% endautoescape %}
   
    
   
    
   {% endif %}

From e35d0c26834db717438d39566bf17498821174ac Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 28 Feb 2022 16:40:12 -0700
Subject: [PATCH 0615/1625] More fixes for i18n.

---
 api/default_settings.py                       |   2 +-
 api/schedules/geolocate_peers.py              |   8 +-
 .../{de => de_DE}/LC_MESSAGES/messages.po     |   2 +-
 .../{fr => fr_FR}/LC_MESSAGES/messages.po     |   2 +-
 .../{it => it_IT}/LC_MESSAGES/messages.po     |   2 +-
 .../{pt => pt_PT}/LC_MESSAGES/messages.po     |  42 +--
 api/translations/zh/LC_MESSAGES/messages.po   |   2 +-
 scripts/pull_3rd_party_libs.sh                |  28 +-
 web/default_settings.py                       |   2 +-
 web/models/chia.py                            |  34 +-
 web/static/landings/{de.txt => de_DE.txt}     |   0
 web/static/landings/{fr.txt => fr_FR.txt}     |   0
 web/static/landings/{it.txt => it_IT.txt}     |   0
 web/static/landings/pt_PT.txt                 |  63 ++++
 web/templates/alerts.html                     |   7 +-
 web/templates/blockchains.html                |   2 +-
 web/templates/connections.html                |   3 +-
 web/templates/farming/plots.html              |  10 +-
 web/templates/plotting/jobs.html              |  10 +-
 web/templates/summary.html                    |  10 +-
 web/templates/wallet.html                     |   4 +-
 web/templates/worker.html                     |   4 +-
 web/templates/workers.html                    |   8 +-
 .../{de => de_DE}/LC_MESSAGES/messages.po     |  39 +--
 .../{fr => fr_FR}/LC_MESSAGES/messages.po     |  42 +--
 .../{it => it_IT}/LC_MESSAGES/messages.po     |  38 +--
 .../{pt => pt_PT}/LC_MESSAGES/messages.po     | 290 ++++++++++--------
 web/translations/zh/LC_MESSAGES/messages.po   |  38 +--
 28 files changed, 395 insertions(+), 297 deletions(-)
 rename api/translations/{de => de_DE}/LC_MESSAGES/messages.po (97%)
 rename api/translations/{fr => fr_FR}/LC_MESSAGES/messages.po (98%)
 rename api/translations/{it => it_IT}/LC_MESSAGES/messages.po (97%)
 rename api/translations/{pt => pt_PT}/LC_MESSAGES/messages.po (59%)
 rename web/static/landings/{de.txt => de_DE.txt} (100%)
 rename web/static/landings/{fr.txt => fr_FR.txt} (100%)
 rename web/static/landings/{it.txt => it_IT.txt} (100%)
 create mode 100644 web/static/landings/pt_PT.txt
 rename web/translations/{de => de_DE}/LC_MESSAGES/messages.po (98%)
 rename web/translations/{fr => fr_FR}/LC_MESSAGES/messages.po (98%)
 rename web/translations/{it => it_IT}/LC_MESSAGES/messages.po (98%)
 rename web/translations/{pt => pt_PT}/LC_MESSAGES/messages.po (84%)

diff --git a/api/default_settings.py b/api/default_settings.py
index 45ac91e4..e774014f 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -51,4 +51,4 @@ class DefaultConfig:
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
 
     BABEL_TRANSLATION_DIRECTORIES = "api/translations"
-    LANGUAGES = ['en', 'de', 'fr', 'it', 'pt', 'zh']
+    LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'pt_PT', 'zh']
diff --git a/api/schedules/geolocate_peers.py b/api/schedules/geolocate_peers.py
index 2738b09a..234b8e8a 100644
--- a/api/schedules/geolocate_peers.py
+++ b/api/schedules/geolocate_peers.py
@@ -66,13 +66,17 @@ def geolocate_ip_addresses(ip_addresses):
     with geoip2.webservice.Client(license["account"], license['license_key'], host="geolite.info") as client:
         for ip_address in ip_addresses:
             if ip_address in geoip_cache:
+                #app.logger.info("GEOLOCATE: Have a cache entry for {0}".format(ip_address))
                 if geoip_cache[ip_address]:
+                    #app.logger.info("GEOLOCATE: Already have a valid location for {0} at {1}".format(ip_address, geoip_cache[ip_address]))
                     continue
-                if not missing_retry:
+                elif not missing_retry:
+                    app.logger.info("GEOLOCATE: No valid location, but not retrying yet. {0}".format(ip_address))
                     continue  # Don't request location too often for IPs which weren't resolved earlier
                 else:
-                    app.logger.info("Retrying {0}, as previously returned {1}.".format(ip_address, geoip_cache[ip_address]))
+                    app.logger.info("GEOLOCATE: Retrying {0}, as previously returned {1}.".format(ip_address, geoip_cache[ip_address]))
             try:
+                app.logger.info("GEOLOCATE: Querying maxmind for a valid location of {0}".format(ip_address))
                 response = client.city(ip_address)
                 app.logger.info("{0} located at {1}".format(ip_address, response.location))
                 geoip_cache[ip_address] = { 
diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po
similarity index 97%
rename from api/translations/de/LC_MESSAGES/messages.po
rename to api/translations/de_DE/LC_MESSAGES/messages.po
index 34160ffa..df93e075 100644
--- a/api/translations/de/LC_MESSAGES/messages.po
+++ b/api/translations/de_DE/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues/353\n"
-"POT-Creation-Date: 2022-02-27 11:47-0700\n"
+"POT-Creation-Date: 2022-02-28 14:57-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po
similarity index 98%
rename from api/translations/fr/LC_MESSAGES/messages.po
rename to api/translations/fr_FR/LC_MESSAGES/messages.po
index c5e83d51..375adf16 100644
--- a/api/translations/fr/LC_MESSAGES/messages.po
+++ b/api/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-27 11:47-0700\n"
+"POT-Creation-Date: 2022-02-28 14:57-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
diff --git a/api/translations/it/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po
similarity index 97%
rename from api/translations/it/LC_MESSAGES/messages.po
rename to api/translations/it_IT/LC_MESSAGES/messages.po
index fcfaddc0..a893e6bf 100644
--- a/api/translations/it/LC_MESSAGES/messages.po
+++ b/api/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-27 11:47-0700\n"
+"POT-Creation-Date: 2022-02-28 14:57-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
diff --git a/api/translations/pt/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po
similarity index 59%
rename from api/translations/pt/LC_MESSAGES/messages.po
rename to api/translations/pt_PT/LC_MESSAGES/messages.po
index 435e6edd..986460cc 100644
--- a/api/translations/pt/LC_MESSAGES/messages.po
+++ b/api/translations/pt_PT/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# Portuguese translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# Portuguese translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-27 11:47-0700\n"
-"PO-Revision-Date: 2022-02-25 15:32-0700\n"
-"Last-Translator: FULL NAME \n"
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Creation-Date: 2022-02-16 15:00-0700\n"
+"POT-Creation-Date: 2022-02-28 14:57-0700\n"
+"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"Last-Translator: FULL NAME\n"
 "Language: pt\n"
 "Language-Team: pt \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -24,7 +24,9 @@ msgstr "A validação do ficheiro config.yaml falhou!"
 
 #: commands/pools_cli.py:68
 msgid "No requested pool modifications were sent. Current settings are unchanged."
-msgstr "Nenhuma das modificações efectuadas à pool foi enviada. A configuração actual não foi modificada."
+msgstr ""
+"Nenhuma das modificações efectuadas à pool foi enviada. A configuração "
+"actual não foi modificada."
 
 #: commands/pools_cli.py:151
 msgid ""
@@ -32,9 +34,9 @@ msgid ""
 "minutes or more to complete. DO NOT immediately re-submit your request. "
 "View the log for details."
 msgstr ""
-"Saida da pool bem sucedida, mudando para o modo self plotting. Por favor aguarde uns "
-"minutos, ou mais algum tempo, para a operação terminar. NÃO FAÇA novamente a mesma operação. "
-"Consultar o log para ver mais detalhes."
+"Saida da pool bem sucedida, mudando para o modo self plotting. Por favor "
+"aguarde uns minutos, ou mais algum tempo, para a operação terminar. NÃO "
+"FAÇA novamente a mesma operação. Consultar o log para ver mais detalhes."
 
 #: commands/pools_cli.py:195
 #, python-format
@@ -43,9 +45,10 @@ msgid ""
 "a few minutes or more to complete. DO NOT immediately re-submit your "
 "request. Be patient! View the log for details."
 msgstr ""
-"Juntou-se à pool %(pool_url)s com sucesso através da criação de um Chia NFT. Por favor aguade "
-"uns minutos, ou mais algum tempo, para a operação terminar. NÃO FAÇA novamente a mesma operação. "
-"Seja paciente. Pode consultar o log para ver mais detalhes."
+"Juntou-se à pool %(pool_url)s com sucesso através da criação de um Chia "
+"NFT. Por favor aguade uns minutos, ou mais algum tempo, para a operação "
+"terminar. NÃO FAÇA novamente a mesma operação. Seja paciente. Pode "
+"consultar o log para ver mais detalhes."
 
 #: commands/pools_cli.py:224
 msgid ""
@@ -53,9 +56,10 @@ msgid ""
 "or more to complete. DO NOT immediately re-submit your request. Be "
 "patient! View the log for details."
 msgstr ""
-"O NFT para self-pooling foi criado com sucesso. Por favor aguarde uns minutos, "
-"ou mais algum tempo, para a operação terminar. NÃO FAÇA novamente a mesma operação. "
-"Seja paciente. Pode consultar o log para ver mais detalhes."
+"O NFT para self-pooling foi criado com sucesso. Por favor aguarde uns "
+"minutos, ou mais algum tempo, para a operação terminar. NÃO FAÇA "
+"novamente a mesma operação. Seja paciente. Pode consultar o log para ver "
+"mais detalhes."
 
 #: views/ping/resources.py:28
 msgid "Pong!"
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index fb7ff3ab..ce7ea0ed 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-02-27 11:47-0700\n"
+"POT-Creation-Date: 2022-02-28 14:57-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: zh\n"
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index 7a44556d..191c9b96 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -4,16 +4,16 @@
 #
 
 # Bootstrap Icons
-BSI_VERSION=1.7.2
+BSI_VERSION=1.8.1
 BOOTSTRAP_VERSION=5.1.3
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
 # List of other css/js links
 LIST="
-https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.css
-https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.js
-https://cdn.datatables.net/1.10.25/js/jquery.dataTables.js
-https://cdn.jsdelivr.net/npm/chart.js@3.5.0/dist/chart.min.js
+https://cdn.datatables.net/1.11.5/css/dataTables.bootstrap5.css
+https://cdn.datatables.net/1.11.5/js/dataTables.bootstrap5.js
+https://cdn.datatables.net/1.11.5/js/jquery.dataTables.js
+https://cdn.jsdelivr.net/npm/chart.js@3.7.1/dist/chart.min.js
 https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.1.0/dist/chartjs-adapter-luxon.min.js
 https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js
 https://moment.github.io/luxon/global/luxon.min.js"
@@ -25,18 +25,18 @@ done
 
 # Bootstrap Icons
 wget -nv -O ${BASEPATH}/bsi-icons.zip "https://github.com/twbs/icons/releases/download/v${BSI_VERSION}/bootstrap-icons-${BSI_VERSION}.zip" && \
-unzip -o ${BASEPATH}/bsi-icons.zip -d $BASEPATH/ && \
+unzip -q -o ${BASEPATH}/bsi-icons.zip -d $BASEPATH/ && \
 mv $BASEPATH/bootstrap-icons-${BSI_VERSION} $BASEPATH/icons && \
 rm -f ${BASEPATH}/bsi-icons.zip
 
 # Bootstrap
 wget -O ${BASEPATH}/bs.zip -nv "https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip" && \
-unzip -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/css/bootstrap.min.css* bootstrap-${BOOTSTRAP_VERSION}*/js/bootstrap.bundle.min.js*  && \
+unzip -q -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/css/bootstrap.min.css* bootstrap-${BOOTSTRAP_VERSION}*/js/bootstrap.bundle.min.js*  && \
 rm -f ${BASEPATH}/bs.zip
 
 # Leaflet and plugins
 wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v1.7.1/leaflet.zip" && \
-unzip -o ${BASEPATH}/leaflet.zip -d $BASEPATH/ && \
+unzip -q -o ${BASEPATH}/leaflet.zip -d $BASEPATH/ && \
 rm -f ${BASEPATH}/leaflet.zip
 wget -O ${BASEPATH}/leaflet-layervisibility.js -nv "https://unpkg.com/leaflet-layervisibility/dist/leaflet-layervisibility.js"
 sed -i 's/\/\/# sourceMapping.*//g' ${BASEPATH}/leaflet-layervisibility.js
@@ -50,10 +50,12 @@ do
   if [[ "$lang" == 'en' ]]; then
       continue  # No separate translation files for default locale
   fi
-  # First try $lang.json
-  wget -nv -O ${BASEPATH}/i18n/datatables.${lang}.json https://raw.githubusercontent.com/DataTables/Plugins/master/i18n/${lang}.json
-  if [ $? != 0 ]; then # Then try $lang_$lang.json  (Example French)
-    echo "Going for ${lang}_${lang}.json"
-    wget -nv -O ${BASEPATH}/i18n/datatables.${lang}.json https://raw.githubusercontent.com/DataTables/Plugins/master/i18n/${lang}_${lang}.json
+
+  lang_hyphen=${lang/_/-}
+  wget -nv -O ${BASEPATH}/i18n/datatables.${lang}.json https://raw.githubusercontent.com/DataTables/Plugins/master/i18n/${lang_hyphen}.json
+  if [ $? == 0 ]; then
+    echo "Successfully downloaded DataTables language translations for ${lang}."
+  else
+    echo "ERROR: Failed to download DataTables language translations for ${lang}."
   fi
 done
diff --git a/web/default_settings.py b/web/default_settings.py
index 2957fc57..027d7536 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -40,4 +40,4 @@ class DefaultConfig:
 
     # Note, babel looks in /machinaris/web/translations with this path.
     BABEL_TRANSLATION_DIRECTORIES = "translations"
-    LANGUAGES = ['en', 'de', 'fr', 'it', 'pt', 'zh']
+    LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'pt_PT', 'zh']
diff --git a/web/models/chia.py b/web/models/chia.py
index 56308b51..a3a9f641 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -601,9 +601,23 @@ def blockchain_port(self,blockchain):
             return 1999
         if blockchain == 'stor':
             return 8668
-
         raise("Unknown blockchain fork of selected: " + blockchain)
 
+    def get_geoname_for_lang(self, location, lang):
+        lang_codes = [ lang, ]
+        if '_' in lang: 
+            lang_codes.append(lang.split('_')[0]) # Secondarily, add more generic code
+        for lang_code in lang_codes:
+            for key in location:
+                if key.startswith(lang_code): # Note, means a pt_PT user may get pt_BR as that's the only 'pt' that Maxmind provides
+                    #app.logger.info('Found matching geoname for {0} in {1}'.format(lang, location))
+                    return location[key]
+        if 'en' in location: # Default fallback is 'en'
+            app.logger.info('Falling back to English geoname for {0} in {1}'.format(lang, location))
+            return location['en']
+        app.logger.info('Unable to find a geoname for {0} in {1}'.format(lang, location))
+        return '' # Blank if no such match
+
     def set_geolocation(self, geoip_cache, connection, lang):
         latitude = None
         longitude = None
@@ -614,23 +628,13 @@ def set_geolocation(self, geoip_cache, connection, lang):
             latitude = geoip['latitude']
             longitude = geoip['longitude']
             try:
-                for key in geoip['city']:
-                    if key.startswith(lang):
-                        city = geoip['city'][key]
-                        break
-                if not city:
-                    city = geoip['city']['en']
+                city = self.get_geoname_for_lang(geoip['city'], lang)
             except:
-                pass
+                traceback.print_exc()
             try:
-                for key in geoip['country']:
-                    if key.startswith(lang):
-                        country = geoip['country'][key]
-                        break
-                if not country:
-                    country = geoip['country']['en']
+                country = self.get_geoname_for_lang(geoip['country'], lang)
             except:
-                pass
+                traceback.print_exc()
         connection['latitude'] = latitude
         connection['longitude'] = longitude
         connection['city'] = city
diff --git a/web/static/landings/de.txt b/web/static/landings/de_DE.txt
similarity index 100%
rename from web/static/landings/de.txt
rename to web/static/landings/de_DE.txt
diff --git a/web/static/landings/fr.txt b/web/static/landings/fr_FR.txt
similarity index 100%
rename from web/static/landings/fr.txt
rename to web/static/landings/fr_FR.txt
diff --git a/web/static/landings/it.txt b/web/static/landings/it_IT.txt
similarity index 100%
rename from web/static/landings/it.txt
rename to web/static/landings/it_IT.txt
diff --git a/web/static/landings/pt_PT.txt b/web/static/landings/pt_PT.txt
new file mode 100644
index 00000000..23fc8543
--- /dev/null
+++ b/web/static/landings/pt_PT.txt
@@ -0,0 +1,63 @@
+Get in loser, we're going to the moon!
+Loading all the doge now...
+The IRS has been notified.
+I was told... there would be lambos.
+HODL!
+Good choice for a new hobby.
+First rule of forks... you don't talk about forks on /r/chia.
+Farm the dip!
+You can fit so many smart contracts in this bad boy.
+"Expected time to win"? Really?
+Psst! You got any more of that disk space?
+Hi-ho! Hi-ho! A schucking we will go.
+I'll make my own Chia... with blackjack and hookers!
+Keep calm and plot on.
+All your coins are belong to us.
+...formatting all hard drives in 3 2 1...
+Life is like a box of shitcoins
+Relax! They say this inflation is only transitory.
+Altcoins? Gotta Catch 'Em All
+The best time to begin plotting was March 17 2021, the second best time is today.
+Ch Ch Ch Chia
+What happens on the blockchain stays on the blockchain.
+Not your grandma's currency.
+My chia pet was so boring... I'd rather go watch my cryptocurrency grow.
+Cha-ching!
+Have you tried restarting it?
+Never trust a chia farm you can't throw out a window.
+The American dollar wants you to stop.
+Machinaris makes a great Christmas present.
+"Remember GME" (Game Stop)
+Life satisfaction and winning Chia coins... are basically the same thing.
+If in doubt, you could always try a fork.
+Raising the demand for hardrives since 2021
+Now with lootboxes
+Machinaris was the imposter
+You know what is really scary... No WiFi
+Wow lucky!
+I've never met a coin I didn't like
+We've never left Beta
+If and when the FBI calls... please don't tell them you're "plotting something"
+How's the electric bill these days?
+Today is someone's birthday!
+I remember working once...
+When are you going to get a "real" job?
+Working is so overrated
+There are two types of people in this world, those that farm cryptocurrency and those who do not.
+It's a great community, join our Discord!
+Stonks!
+Have you tried Keybase?  My condolences...
+When Moon?
+When Flamethrower?
+Does Elon know?
+BITCONNEEEEEEEEEECT!
+When the dust settles..... (too soon?)
+No SSDs were harmed in the making of this movie.
+(Pro Tip) If you delete System32 you can fit in more plots
+[A]bort, [R]etry, [F]ail
+Please insert Disk 2 and press any key to continue...
+Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
+10 PRINT "WITTY TEXT GOES HERE"
+Just Remember...... You could have bought GPUs instead
+Congratulations you've won $0.00! Please pay the Gas fee to receive your winnings.
+1337.png
\ No newline at end of file
diff --git a/web/templates/alerts.html b/web/templates/alerts.html
index b5af4626..55fa76a5 100644
--- a/web/templates/alerts.html
+++ b/web/templates/alerts.html
@@ -131,14 +131,15 @@ 
    {{_('Expect at least a summary notification once daily as long as running ab
         }
         $(document).ready(function () {
             $('#data').DataTable({
+                "pageLength": 10,
+                "lengthMenu": [ [10, 25, 50, 100, 200, -1], [10, 25, 50, 100, 200, "All"] ],
+                "order": [[5 , "desc"]],
+                "columnDefs": [{ "orderable": false, targets: [0] }],
                 {% if lang != 'en' %}
                 "language": {
                     "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
                 },
                 {% endif %}
-                "pageLength": 10,
-                "lengthMenu": [ [10, 25, 50, 100, 200, -1], [10, 25, 50, 100, 200, "All"] ],
-                "columnDefs": [{ "orderable": false, targets: [0] }],
             });
             $("#btnStart").click(function () {
                 $(this).prop("disabled", true);
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 82800477..10727818 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -95,12 +95,12 @@ 
    {{_('Try running "chia show --state" on your farmers to verify.')}}
    
 
diff --git a/web/templates/connections.html b/web/templates/connections.html
index 670ff626..f3befded 100644
--- a/web/templates/connections.html
+++ b/web/templates/connections.html
@@ -266,12 +266,13 @@ 
    {{_('After a while, try running "chia show --connections" on your farmers to
         $(document).ready(function () {
             {% for connection in connections.rows %}
             $('#conns_{{connection.displayname}}_{{connection.blockchain}}').DataTable({
+                // Note, without an "order" here, first column of checkboxes still shows as orderable. It's fine...
+                "columnDefs": [{ "orderable": false, targets: [0] }],
                 {% if lang != 'en' %}
                 "language": {
                     "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
                 },
                 {% endif %}
-                "columnDefs": [{ "orderable": false, targets: [0] }],
             });
             $("#btnAdd_{{connection.displayname}}_{{connection.blockchain}}").click(function () {
                 $(this).prop("disabled", true);
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index 0ff04825..01606d82 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -171,11 +171,6 @@ 
    
                 "pageLength": 25,
                 "serverSide": true,
                 "ajax": "{{ url_for('farming_data') }}",
-                {% if lang != 'en' %}
-                "language": {
-                    "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
-                },
-                {% endif %}
                 "order": [[6, "desc"]],
                 "columnDefs": [
                     { 
@@ -207,6 +202,11 @@ 
                         }
                     }, 
                 ],
+                {% if lang != 'en' %}
+                "language": {
+                    "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
+                },
+                {% endif %}
             });
         });
     
diff --git a/web/templates/plotting/jobs.html b/web/templates/plotting/jobs.html
index 98e3fec5..f23b9026 100644
--- a/web/templates/plotting/jobs.html
+++ b/web/templates/plotting/jobs.html
@@ -324,16 +324,16 @@ 
    {{_('Plotting Speed - k%(k_size)s Plots', k_si
         }
         $(document).ready(function () {
             $('#data').DataTable({ 
+                "columnDefs": [
+                    { 
+                        targets: [0,4,5,6,7,8,9,10,11,12,13,14,15,16,17], "orderable": false
+                    }
+                ],
                 {% if lang != 'en' %}
                 "language": {
                     "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
                 },
                 {% endif %}
-                "columnDefs": [
-                    { 
-                        targets: [0,4,5,6,7,8,9,10,11,12,13,14,15,16,17], "orderable": false
-                    }
-                ] 
             });
             $("#btnSuspend").click(function () {
                 $(this).prop("disabled", true);
diff --git a/web/templates/summary.html b/web/templates/summary.html
index 3e4973b4..5b58e272 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -140,11 +140,6 @@ 
    {{_('Please allow at least 15 minutes for blockchains to get started.')}}{{_('Please allow at least 15 minutes for blockchains to get started.')}}
diff --git a/web/templates/wallet.html b/web/templates/wallet.html
index 0b8de2ce..8e1bf9cb 100644
--- a/web/templates/wallet.html
+++ b/web/templates/wallet.html
@@ -180,13 +180,13 @@ 
    {{_('You can also try running "chia wallet show" on your fullnode\'s in-cont
 
-    {% endblock %}
\ No newline at end of file
+    {% endblock %}

From e97c08955ac32bcdea4aa4000a1cb7b58515d6f2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 11 Mar 2022 11:38:04 -0700
Subject: [PATCH 0656/1625] Final changelog

---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0dd3b99..153cc45b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,14 @@
 
 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).
 
+## Known Issues
+ - Chiadog will sporadically replay alerts when the Machinaris container is restarted. #588
+ - Coin prices are unavailable from [AllTheBlocks](https://alltheblocks.net), so no fiat conversion in Machinaris currently.
+
 ## [0.7.0] - 2022-03-11
  - [Chia](https://chia.net) - [v1.3](https://www.reddit.com/r/chia/comments/t95vuk/13_is_live/), please note reports of issues in this new Chia release...  double-check your Wallet and Pools settings after upgrading!
- - [Internationalization](https://github.com/guydavis/machinaris/wiki/Localization) for locale-specific text, numbers, and currencies.  Huge thanks to @antcasq and @fabriziocacicia for providing translations!
- - Geolocation of peer connections for each blockchain by their IP address. [Optionally enabled](https://github.com/guydavis/machinaris/wiki/Connections).
+ - [Internationalization](https://github.com/guydavis/machinaris/wiki/Localization) for locale-specific text, numbers, and currencies.  Huge thanks to @antcasq (pt_PT) and @fabriziocacicia (it_IT) for providing translations!
+ - Geolocation of peer connections for each blockchain by their IP address. [Optionally enabled](https://github.com/guydavis/machinaris/wiki/Connections) using a free Maxmind account.
   - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
 
 ## [0.6.9] - 2022-02-04

From 21384db4a1585770809d8efa9c804cecbc31aaf0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Mar 2022 18:48:40 +0000
Subject: [PATCH 0657/1625] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 .github/workflows/codeql-analysis.yml     | 2 +-
 .github/workflows/develop-base.yaml       | 2 +-
 .github/workflows/develop-btcgreen.yaml   | 2 +-
 .github/workflows/develop-cactus.yaml     | 2 +-
 .github/workflows/develop-chia.yaml       | 2 +-
 .github/workflows/develop-chives.yaml     | 2 +-
 .github/workflows/develop-cryptodoge.yaml | 2 +-
 .github/workflows/develop-flax.yaml       | 2 +-
 .github/workflows/develop-flora.yaml      | 2 +-
 .github/workflows/develop-hddcoin.yaml    | 2 +-
 .github/workflows/develop-maize.yaml      | 2 +-
 .github/workflows/develop-mmx.yaml        | 2 +-
 .github/workflows/develop-nchain.yaml     | 2 +-
 .github/workflows/develop-shibgreen.yaml  | 2 +-
 .github/workflows/develop-silicoin.yaml   | 2 +-
 .github/workflows/develop-staicoin.yaml   | 2 +-
 .github/workflows/develop-stor.yaml       | 2 +-
 .github/workflows/main-base.yaml          | 2 +-
 .github/workflows/main-btcgreen.yaml      | 2 +-
 .github/workflows/main-cactus.yaml        | 2 +-
 .github/workflows/main-chia.yaml          | 2 +-
 .github/workflows/main-chives.yaml        | 2 +-
 .github/workflows/main-cryptodoge.yaml    | 2 +-
 .github/workflows/main-flax.yaml          | 2 +-
 .github/workflows/main-flora.yaml         | 2 +-
 .github/workflows/main-hddcoin.yaml       | 2 +-
 .github/workflows/main-maize.yaml         | 2 +-
 .github/workflows/main-mmx.yaml           | 2 +-
 .github/workflows/main-nchain.yaml        | 2 +-
 .github/workflows/main-shibgreen.yaml     | 2 +-
 .github/workflows/main-silicoin.yaml      | 2 +-
 .github/workflows/main-staicoin.yaml      | 2 +-
 .github/workflows/main-stor.yaml          | 2 +-
 .github/workflows/test-base.yaml          | 2 +-
 .github/workflows/test-btcgreen.yaml      | 2 +-
 .github/workflows/test-cactus.yaml        | 2 +-
 .github/workflows/test-chia.yaml          | 2 +-
 .github/workflows/test-chives.yaml        | 2 +-
 .github/workflows/test-cryptodoge.yaml    | 2 +-
 .github/workflows/test-flax.yaml          | 2 +-
 .github/workflows/test-flora.yaml         | 2 +-
 .github/workflows/test-hddcoin.yaml       | 2 +-
 .github/workflows/test-maize.yaml         | 2 +-
 .github/workflows/test-mmx.yaml           | 2 +-
 .github/workflows/test-nchain.yaml        | 2 +-
 .github/workflows/test-shibgreen.yaml     | 2 +-
 .github/workflows/test-silicoin.yaml      | 2 +-
 .github/workflows/test-staicoin.yaml      | 2 +-
 .github/workflows/test-stor.yaml          | 2 +-
 .github/workflows/unit-tests.yml          | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 175336e2..14d05c38 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
index 24417cb3..0cf2646a 100644
--- a/.github/workflows/develop-base.yaml
+++ b/.github/workflows/develop-base.yaml
@@ -8,7 +8,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-btcgreen.yaml b/.github/workflows/develop-btcgreen.yaml
index 54cd64d1..4d26dc91 100644
--- a/.github/workflows/develop-btcgreen.yaml
+++ b/.github/workflows/develop-btcgreen.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-cactus.yaml b/.github/workflows/develop-cactus.yaml
index 416efec2..309beb0f 100644
--- a/.github/workflows/develop-cactus.yaml
+++ b/.github/workflows/develop-cactus.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index db8bc1e4..3d8f2fc1 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
index b9da3578..bd32e4a1 100644
--- a/.github/workflows/develop-chives.yaml
+++ b/.github/workflows/develop-chives.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-cryptodoge.yaml b/.github/workflows/develop-cryptodoge.yaml
index 08db785a..5462b93f 100644
--- a/.github/workflows/develop-cryptodoge.yaml
+++ b/.github/workflows/develop-cryptodoge.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-flax.yaml b/.github/workflows/develop-flax.yaml
index 94c89b50..2c8d716b 100644
--- a/.github/workflows/develop-flax.yaml
+++ b/.github/workflows/develop-flax.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml
index 045dfa8e..d598b5a8 100644
--- a/.github/workflows/develop-flora.yaml
+++ b/.github/workflows/develop-flora.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index e1d856ff..fee1a7b3 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-maize.yaml b/.github/workflows/develop-maize.yaml
index c6871c2d..b155d255 100644
--- a/.github/workflows/develop-maize.yaml
+++ b/.github/workflows/develop-maize.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 0f1c33b6..5a2ab845 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-nchain.yaml b/.github/workflows/develop-nchain.yaml
index 8177a690..587389d6 100644
--- a/.github/workflows/develop-nchain.yaml
+++ b/.github/workflows/develop-nchain.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-shibgreen.yaml b/.github/workflows/develop-shibgreen.yaml
index fca5b3ea..bebf56d4 100644
--- a/.github/workflows/develop-shibgreen.yaml
+++ b/.github/workflows/develop-shibgreen.yaml
@@ -10,7 +10,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
index f8cb6d82..0d985b6c 100644
--- a/.github/workflows/develop-silicoin.yaml
+++ b/.github/workflows/develop-silicoin.yaml
@@ -10,7 +10,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index 60dae6b3..5429c600 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/develop-stor.yaml b/.github/workflows/develop-stor.yaml
index 4261a7b4..f7cc48bc 100644
--- a/.github/workflows/develop-stor.yaml
+++ b/.github/workflows/develop-stor.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
index 26079c12..ece4b310 100644
--- a/.github/workflows/main-base.yaml
+++ b/.github/workflows/main-base.yaml
@@ -8,7 +8,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-btcgreen.yaml b/.github/workflows/main-btcgreen.yaml
index fc564181..c77c2d3f 100644
--- a/.github/workflows/main-btcgreen.yaml
+++ b/.github/workflows/main-btcgreen.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-cactus.yaml b/.github/workflows/main-cactus.yaml
index fd9feb23..81fc3642 100644
--- a/.github/workflows/main-cactus.yaml
+++ b/.github/workflows/main-cactus.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 7b1e7547..89cfb011 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 16c18574..f826c6d5 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-cryptodoge.yaml b/.github/workflows/main-cryptodoge.yaml
index cec78c94..dac78b6f 100644
--- a/.github/workflows/main-cryptodoge.yaml
+++ b/.github/workflows/main-cryptodoge.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-flax.yaml b/.github/workflows/main-flax.yaml
index 9bb5710b..99e0e0a6 100644
--- a/.github/workflows/main-flax.yaml
+++ b/.github/workflows/main-flax.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-flora.yaml b/.github/workflows/main-flora.yaml
index 4ba7157b..2cad2d05 100644
--- a/.github/workflows/main-flora.yaml
+++ b/.github/workflows/main-flora.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-hddcoin.yaml b/.github/workflows/main-hddcoin.yaml
index 3704bd14..63fb2d51 100644
--- a/.github/workflows/main-hddcoin.yaml
+++ b/.github/workflows/main-hddcoin.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-maize.yaml b/.github/workflows/main-maize.yaml
index 487005b2..50fc9852 100644
--- a/.github/workflows/main-maize.yaml
+++ b/.github/workflows/main-maize.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index aa5cd426..e3109018 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-nchain.yaml b/.github/workflows/main-nchain.yaml
index c4cbad63..8397e576 100644
--- a/.github/workflows/main-nchain.yaml
+++ b/.github/workflows/main-nchain.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-shibgreen.yaml b/.github/workflows/main-shibgreen.yaml
index 94ec9a69..de940b43 100644
--- a/.github/workflows/main-shibgreen.yaml
+++ b/.github/workflows/main-shibgreen.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-silicoin.yaml b/.github/workflows/main-silicoin.yaml
index 839def9e..3adbc99f 100644
--- a/.github/workflows/main-silicoin.yaml
+++ b/.github/workflows/main-silicoin.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-staicoin.yaml b/.github/workflows/main-staicoin.yaml
index 8e79008a..efe7107e 100644
--- a/.github/workflows/main-staicoin.yaml
+++ b/.github/workflows/main-staicoin.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/main-stor.yaml b/.github/workflows/main-stor.yaml
index 49634703..199dc07f 100644
--- a/.github/workflows/main-stor.yaml
+++ b/.github/workflows/main-stor.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
index 4e9a19b1..2a817600 100644
--- a/.github/workflows/test-base.yaml
+++ b/.github/workflows/test-base.yaml
@@ -8,7 +8,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-btcgreen.yaml b/.github/workflows/test-btcgreen.yaml
index d4baec93..5992bd61 100644
--- a/.github/workflows/test-btcgreen.yaml
+++ b/.github/workflows/test-btcgreen.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-cactus.yaml b/.github/workflows/test-cactus.yaml
index 2982d990..7a05f33a 100644
--- a/.github/workflows/test-cactus.yaml
+++ b/.github/workflows/test-cactus.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 9da170a7..ea5fc524 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index 7a987ef0..5bee0ddc 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-cryptodoge.yaml b/.github/workflows/test-cryptodoge.yaml
index a9857125..793eef45 100644
--- a/.github/workflows/test-cryptodoge.yaml
+++ b/.github/workflows/test-cryptodoge.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-flax.yaml b/.github/workflows/test-flax.yaml
index 424eee1b..ca9115f3 100644
--- a/.github/workflows/test-flax.yaml
+++ b/.github/workflows/test-flax.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-flora.yaml b/.github/workflows/test-flora.yaml
index dafcece0..b2fcb988 100644
--- a/.github/workflows/test-flora.yaml
+++ b/.github/workflows/test-flora.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-hddcoin.yaml b/.github/workflows/test-hddcoin.yaml
index ee238432..c2767436 100644
--- a/.github/workflows/test-hddcoin.yaml
+++ b/.github/workflows/test-hddcoin.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-maize.yaml b/.github/workflows/test-maize.yaml
index 4544ccb8..ff8f9a9d 100644
--- a/.github/workflows/test-maize.yaml
+++ b/.github/workflows/test-maize.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index cddcd041..cf3ae298 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-nchain.yaml b/.github/workflows/test-nchain.yaml
index c90abcf1..6902f8db 100644
--- a/.github/workflows/test-nchain.yaml
+++ b/.github/workflows/test-nchain.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-shibgreen.yaml b/.github/workflows/test-shibgreen.yaml
index 53b32a54..5d65f38f 100644
--- a/.github/workflows/test-shibgreen.yaml
+++ b/.github/workflows/test-shibgreen.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-silicoin.yaml b/.github/workflows/test-silicoin.yaml
index 4484ecdc..b86cca80 100644
--- a/.github/workflows/test-silicoin.yaml
+++ b/.github/workflows/test-silicoin.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-staicoin.yaml b/.github/workflows/test-staicoin.yaml
index 7d43abfb..d3828cc4 100644
--- a/.github/workflows/test-staicoin.yaml
+++ b/.github/workflows/test-staicoin.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/test-stor.yaml b/.github/workflows/test-stor.yaml
index de66d0ca..3fa973eb 100644
--- a/.github/workflows/test-stor.yaml
+++ b/.github/workflows/test-stor.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index e19908e4..98c3c9f4 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python 3.9
         uses: actions/setup-python@v3
         with:

From a281c6a227f336c1ac1770cc3cdc448346ea0000 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 11 Mar 2022 21:41:52 -0700
Subject: [PATCH 0658/1625] Fix for broken error message due to i18n.

---
 web/templates/farming/workers.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/templates/farming/workers.html b/web/templates/farming/workers.html
index c23c0d61..a48aaa28 100644
--- a/web/templates/farming/workers.html
+++ b/web/templates/farming/workers.html
@@ -90,9 +90,11 @@ 
    {{ blockchain|capitalize }} - {{_('Daily Summary')}}
    
                 {% else %}
+                {% autoescape false %}
                 
    {{_('No plots disk stats recorded recently for %(hostname)s with Chia blockchain. Please ensure all paths containing plots have been %(wiki_link_open)s configured %(wiki_link_close)s. Also ensure the Chia worker is reporting into the controller on the Workers page.', 
-                    hostname=farmer.hostname, wiki_link='', wiki_link_close='')}}
+                    hostname=farmer.hostname, wiki_link_open='', wiki_link_close='')}}
                 
    
+                {% endautoescape %}
                 {% endif %}
             
         

From b65b1a9f9d7c814cba3be95b87335984cdd92274 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 12 Mar 2022 15:24:20 -0700
Subject: [PATCH 0659/1625] Fix price lookup and debug wallet parsing.

---
 api/commands/websvcs.py         | 31 +++++++++++++++++++++++++++++--
 api/gunicorn.conf.py            |  1 -
 api/schedules/status_wallets.py |  2 +-
 web/models/chia.py              |  3 ++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 7f7713df..1a7e3462 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -2,13 +2,13 @@
 # Access to public web APIs
 #
 
-import traceback
+import bs4
 import datetime
 import http
 import json
 import os
 import requests
-import socket
+import traceback
 
 from api import app
 
@@ -130,6 +130,33 @@ def save_prices_cache(data):
         app.logger.error("Failed to store prices cache in {0} because {1}".format(BLOCKCHAIN_PRICES_CACHE_FILE, str(ex)))
 
 def request_prices(prices, debug=False):
+    url = "https://alltheblocks.net"
+    app.logger.info("Requesting recent pricing for blockchains from {0}".format(url))
+    if debug:
+        http.client.HTTPConnection.debuglevel = 1
+    data = requests.get(url).text
+    http.client.HTTPConnection.debuglevel = 0
+    soup = bs4.BeautifulSoup(data, 'html.parser')
+    table = soup.find('table', class_="table b-table table-sm")
+    for row in table.tbody.find_all('tr'):
+        if 'data-pk' in row.attrs:
+            blockchain = row['data-pk'].replace('stai', 'staicoin')
+            price_column = row.find('td', class_='text-right')
+            if len(price_column.contents) == 1:
+                price_value = price_column.contents[0].string.strip()
+                if price_value.startswith('$'):
+                    #app.logger.info("{0} @ {1}".format(blockchain, price_value[1:].strip()))
+                    try:
+                        prices[blockchain] = float(price_value[1:].strip())
+                    except Exception as ex:
+                        app.logger.info("Failed to parse a decimal number from {0}".format(price_value[1:].strip()))
+                else:
+                    app.logger.info("No price found for blockchain: {0}".format(blockchain))
+                    pass
+    return prices
+
+# NOT USED: ATB api does not provide prices as of 2022-03-12
+def request_prices_api(prices, debug=False):
     url = "https://api.alltheblocks.net/atb/blockchain/settings-and-stats"
     app.logger.info("Requesting recent pricing for blockchains from {0}".format(url))
     if debug:
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index a51abed1..72a5ef40 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -73,7 +73,6 @@ def on_starting(server):
         scheduler.add_job(func=websvcs.get_prices, name="get_prices", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=nft_recover.execute, name="nft_recover", trigger='interval', hours=12)
         scheduler.add_job(func=geolocate_peers.execute, name="geolocate_peers", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
-        
 
     # Testing only
     #scheduler.add_job(func=websvcs.get_prices, name="get_prices", trigger='interval', seconds=10) # Test immediately
diff --git a/api/schedules/status_wallets.py b/api/schedules/status_wallets.py
index a6675fcb..8dfea354 100644
--- a/api/schedules/status_wallets.py
+++ b/api/schedules/status_wallets.py
@@ -34,7 +34,7 @@ def update():
                     "details": public_wallet.text.replace('\r', ''),
                 }
                 #app.logger.info(payload)
-                utils.send_post('/wallets/', payload, debug=False)
+                utils.send_post('/wallets/', payload, debug=True)
         except:
             app.logger.info("Failed to load and send public wallet status.")
             app.logger.info(traceback.format_exc())
diff --git a/web/models/chia.py b/web/models/chia.py
index d9b2f6d4..0d1983e0 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -310,9 +310,10 @@ def __init__(self, wallets, cold_wallet_addresses={}):
         self.rows = []
         self.cold_wallet_addresses = cold_wallet_addresses
         for wallet in wallets:
+            app.logger.info("Wallets.init(): Parsing wallet for blockchain: {0}".format(wallet.blockchain))
             worker_status = None
             try:
-                app.logger.debug("Found worker with hostname '{0}'".format(wallet.hostname))
+                app.logger.info("Wallets.init(): Found worker with hostname '{0}'".format(wallet.hostname))
                 worker = w.get_worker(wallet.hostname, wallet.blockchain)
                 worker_status = worker.connection_status()
                 displayname = worker.displayname

From 993a00410139fcc426c6d960457fd441375e730d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 12 Mar 2022 19:50:41 -0700
Subject: [PATCH 0660/1625] Fix save path for Silicoin and Staicoin as they
 deviate.

---
 api/commands/chia_cli.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index bd6e59af..d3bdd174 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -55,8 +55,9 @@ def save_config(config, blockchain):
         # Validate the YAML first
         yaml.safe_load(config)
         # Save a copy of the old config file
-        src="/root/.{0}/mainnet/config/config.yaml".format(blockchain)
-        dst="/root/.{0}/mainnet/config/config.".format(blockchain) + time.strftime("%Y%m%d-%H%M%S")+".yaml"
+        mainnet = globals.get_blockchain_network_path(blockchain)
+        src=f'{mainnet}/config/config.yaml'
+        dst=f'{mainnet}/config/config.' + time.strftime("%Y%m%d-%H%M%S")+".yaml"
         shutil.copy(src,dst)
         # Now save the new contents to main config file
         with open(src, 'w') as writer:

From bdf9e40b097f4968b74f23a2a3ea755a0fed18ba Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Mar 2022 10:34:15 -0600
Subject: [PATCH 0661/1625] Updated Flax hash, also empty Dutch translation
 files.

---
 api/default_settings.py                       |    2 +-
 .../de_DE/LC_MESSAGES/messages.po             |   11 +-
 .../fr_FR/LC_MESSAGES/messages.po             |    4 +-
 .../it_IT/LC_MESSAGES/messages.po             |    4 +-
 .../nl_NL/LC_MESSAGES/messages.po             |   53 +
 .../pt_PT/LC_MESSAGES/messages.po             |    4 +-
 api/translations/zh/LC_MESSAGES/messages.po   |   11 +-
 scripts/forks/flax_install.sh                 |    4 +-
 web/default_settings.py                       |    2 +-
 .../de_DE/LC_MESSAGES/messages.po             |    8 +-
 .../fr_FR/LC_MESSAGES/messages.po             |    8 +-
 .../it_IT/LC_MESSAGES/messages.po             |    8 +-
 .../nl_NL/LC_MESSAGES/messages.po             | 1379 +++++++++++++++++
 .../pt_PT/LC_MESSAGES/messages.po             |    8 +-
 web/translations/zh/LC_MESSAGES/messages.po   |   12 +-
 15 files changed, 1474 insertions(+), 44 deletions(-)
 create mode 100644 api/translations/nl_NL/LC_MESSAGES/messages.po
 create mode 100644 web/translations/nl_NL/LC_MESSAGES/messages.po

diff --git a/api/default_settings.py b/api/default_settings.py
index e774014f..1dfb3b6e 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -51,4 +51,4 @@ class DefaultConfig:
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
 
     BABEL_TRANSLATION_DIRECTORIES = "api/translations"
-    LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'pt_PT', 'zh']
+    LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'nl_NL', 'pt_PT', 'zh']
diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po
index da27408b..391d1489 100644
--- a/api/translations/de_DE/LC_MESSAGES/messages.po
+++ b/api/translations/de_DE/LC_MESSAGES/messages.po
@@ -1,14 +1,13 @@
-# German (Germany) translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# German (Germany) translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:30-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: de\n"
@@ -19,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: commands/chia_cli.py:66
+#: commands/chia_cli.py:67
 msgid "Updated config.yaml failed validation!"
 msgstr ""
 
diff --git a/api/translations/fr_FR/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po
index 45a432d1..b24e5034 100644
--- a/api/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/api/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:30-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: commands/chia_cli.py:66
+#: commands/chia_cli.py:67
 msgid "Updated config.yaml failed validation!"
 msgstr "Échec de la validation du fichier config.yaml mis à jour!"
 
diff --git a/api/translations/it_IT/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po
index 72888a6b..20aaa50b 100644
--- a/api/translations/it_IT/LC_MESSAGES/messages.po
+++ b/api/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:30-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: commands/chia_cli.py:66
+#: commands/chia_cli.py:67
 msgid "Updated config.yaml failed validation!"
 msgstr "Validazione del config.yaml aggiornato fallita."
 
diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..35c7fa18
--- /dev/null
+++ b/api/translations/nl_NL/LC_MESSAGES/messages.po
@@ -0,0 +1,53 @@
+# Dutch (Netherlands) translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"PO-Revision-Date: 2022-03-13 10:29-0600\n"
+"Last-Translator: FULL NAME \n"
+"Language: nl_NL\n"
+"Language-Team: nl_NL \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: commands/chia_cli.py:67
+msgid "Updated config.yaml failed validation!"
+msgstr ""
+
+#: commands/pools_cli.py:68
+msgid "No requested pool modifications were sent. Current settings are unchanged."
+msgstr ""
+
+#: commands/pools_cli.py:151
+msgid ""
+"Successfully left pool, switching to self-pooling. Please wait a few "
+"minutes or more to complete. DO NOT immediately re-submit your request. "
+"View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:195
+#, python-format
+msgid ""
+"Successfully joined %(pool_url)s pool by creating Chia NFT.  Please wait "
+"a few minutes or more to complete. DO NOT immediately re-submit your "
+"request. Be patient! View the log for details."
+msgstr ""
+
+#: commands/pools_cli.py:224
+msgid ""
+"Successfully created a NFT for self-pooling.  Please wait a few minutes "
+"or more to complete. DO NOT immediately re-submit your request. Be "
+"patient! View the log for details."
+msgstr ""
+
+#: views/ping/resources.py:28
+msgid "Pong!"
+msgstr ""
+
diff --git a/api/translations/pt_PT/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po
index bfab07e5..8cf2fe4c 100644
--- a/api/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/api/translations/pt_PT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:30-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: pt\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: commands/chia_cli.py:66
+#: commands/chia_cli.py:67
 msgid "Updated config.yaml failed validation!"
 msgstr "A validação do ficheiro config.yaml falhou!"
 
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 017283cd..72b6e9c8 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -1,14 +1,13 @@
-# Chinese translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# Chinese translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:30-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
@@ -19,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: commands/chia_cli.py:66
+#: commands/chia_cli.py:67
 msgid "Updated config.yaml failed validation!"
 msgstr ""
 
diff --git a/scripts/forks/flax_install.sh b/scripts/forks/flax_install.sh
index 8f0b3c14..df7b949c 100644
--- a/scripts/forks/flax_install.sh
+++ b/scripts/forks/flax_install.sh
@@ -4,8 +4,8 @@
 #
 
 FLAX_BRANCH=$1
-# On 2021-11-06
-HASH=80add4e545ad22a317244f7fd958d118a5a75c5d
+# On 2022-03-13
+HASH=e72b47ca1c7086330b0facba6a2e7fc5967000eb
 
 if [ -z ${FLAX_BRANCH} ]; then
 	echo 'Skipping Flax install as not requested.'
diff --git a/web/default_settings.py b/web/default_settings.py
index 027d7536..22649c0a 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -40,4 +40,4 @@ class DefaultConfig:
 
     # Note, babel looks in /machinaris/web/translations with this path.
     BABEL_TRANSLATION_DIRECTORIES = "translations"
-    LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'pt_PT', 'zh']
+    LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'nl_NL', 'pt_PT', 'zh']
diff --git a/web/translations/de_DE/LC_MESSAGES/messages.po b/web/translations/de_DE/LC_MESSAGES/messages.po
index 89e3c03b..ffe05d99 100644
--- a/web/translations/de_DE/LC_MESSAGES/messages.po
+++ b/web/translations/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:29-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
@@ -884,11 +884,11 @@ msgstr ""
 msgid "Yay! No issues currently."
 msgstr ""
 
-#: templates/farming/workers.html:114 templates/worker.html:183
+#: templates/farming/workers.html:116 templates/worker.html:183
 msgid "Disk Space Used (TB)"
 msgstr ""
 
-#: templates/farming/workers.html:120 templates/worker.html:189
+#: templates/farming/workers.html:122 templates/worker.html:189
 msgid "Disk Space Free (TB)"
 msgstr ""
 
@@ -1167,7 +1167,7 @@ msgid ""
 "running. Also please verify settings on the Alerts page."
 msgstr ""
 
-#: templates/farming/workers.html:93
+#: templates/farming/workers.html:94
 #, python-format
 msgid ""
 "No plots disk stats recorded recently for %(hostname)s with Chia "
diff --git a/web/translations/fr_FR/LC_MESSAGES/messages.po b/web/translations/fr_FR/LC_MESSAGES/messages.po
index 596fb091..a584a33c 100644
--- a/web/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/web/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:29-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: fr\n"
@@ -932,11 +932,11 @@ msgstr "Avertissements récents"
 msgid "Yay! No issues currently."
 msgstr "Yay! Aucun problème actuellement."
 
-#: templates/farming/workers.html:114 templates/worker.html:183
+#: templates/farming/workers.html:116 templates/worker.html:183
 msgid "Disk Space Used (TB)"
 msgstr "Espace disque utilisé (TB)"
 
-#: templates/farming/workers.html:120 templates/worker.html:189
+#: templates/farming/workers.html:122 templates/worker.html:189
 msgid "Disk Space Free (TB)"
 msgstr "Espace disque libre (TB)"
 
@@ -1233,7 +1233,7 @@ msgstr ""
 "est en cours d'exécution. Veuillez également vérifier les paramètres sur "
 "la page Alertes."
 
-#: templates/farming/workers.html:93
+#: templates/farming/workers.html:94
 #, python-format
 msgid ""
 "No plots disk stats recorded recently for %(hostname)s with Chia "
diff --git a/web/translations/it_IT/LC_MESSAGES/messages.po b/web/translations/it_IT/LC_MESSAGES/messages.po
index 1597df65..368e5787 100644
--- a/web/translations/it_IT/LC_MESSAGES/messages.po
+++ b/web/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:29-0600\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: it\n"
@@ -931,11 +931,11 @@ msgstr "Avvertimenti Recenti"
 msgid "Yay! No issues currently."
 msgstr "Evviva! Nessun problema attualmente."
 
-#: templates/farming/workers.html:114 templates/worker.html:183
+#: templates/farming/workers.html:116 templates/worker.html:183
 msgid "Disk Space Used (TB)"
 msgstr "Spazio Usato su Disco (TB)"
 
-#: templates/farming/workers.html:120 templates/worker.html:189
+#: templates/farming/workers.html:122 templates/worker.html:189
 msgid "Disk Space Free (TB)"
 msgstr "Spazio Libero su Disco (TB)"
 
@@ -1233,7 +1233,7 @@ msgstr ""
 "Controlla che il Machinaris container per questa blockchain sia in "
 "esecuzione. Verifica inoltre le impostazioni nella pagina Avvisi."
 
-#: templates/farming/workers.html:93
+#: templates/farming/workers.html:94
 #, python-format
 msgid ""
 "No plots disk stats recorded recently for %(hostname)s with Chia "
diff --git a/web/translations/nl_NL/LC_MESSAGES/messages.po b/web/translations/nl_NL/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..dd9284fe
--- /dev/null
+++ b/web/translations/nl_NL/LC_MESSAGES/messages.po
@@ -0,0 +1,1379 @@
+# Dutch (Netherlands) translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"PO-Revision-Date: 2022-03-13 10:29-0600\n"
+"Last-Translator: FULL NAME \n"
+"Language: nl_NL\n"
+"Language-Team: nl_NL \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: routes.py:77 routes.py:219
+msgid "Saved local currency setting."
+msgstr ""
+
+#: routes.py:96
+msgid "Blockchain download"
+msgstr ""
+
+#: routes.py:128
+msgid "Unknown plotting form"
+msgstr ""
+
+#: routes.py:178
+msgid "Error! Please see logs."
+msgstr ""
+
+#: routes.py:204
+msgid "Unknown alerts form"
+msgstr ""
+
+#: routes.py:224
+msgid "Saved cold wallet addresses."
+msgstr ""
+
+#: routes.py:279
+msgid ""
+"Saved mapping settings.  Please allow 10 minutes to generate location "
+"information for the map."
+msgstr ""
+
+#: routes.py:287
+msgid "Unknown form action"
+msgstr ""
+
+#: routes.py:393
+#, python-format
+msgid ""
+"No worker at %(worker)s for blockchain %(blockchain)s. Please select "
+"another blockchain."
+msgstr ""
+
+#: routes.py:399
+#, python-format
+msgid ""
+"For Alerts config, found no responding fullnode found for %(blockchain)s."
+" Please check your workers."
+msgstr ""
+
+#: routes.py:404
+#, python-format
+msgid ""
+"For Farming config, found no responding fullnode found for "
+"%(blockchain)s. Please check your workers."
+msgstr ""
+
+#: routes.py:411
+#, python-format
+msgid ""
+"For Plotting config, found no responding fullnode found for "
+"%(blockchain)s. Please check your workers."
+msgstr ""
+
+#: routes.py:416
+#, python-format
+msgid ""
+"No responding fullnode found for %(blockchain)s. Please check your "
+"workers."
+msgstr ""
+
+#: routes.py:435
+msgid "Unsupported log type"
+msgstr ""
+
+#: actions/chia.py:44
+msgid ""
+"Relax and grab a coffee. Status is being gathered from active workers.  "
+"Please allow 15 minutes..."
+msgstr ""
+
+#: actions/plotman.py:44 models/plotman.py:70
+msgid "Idle"
+msgstr ""
+
+#: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:196
+#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+msgid "Active"
+msgstr ""
+
+#: actions/plotman.py:49 models/plotman.py:64
+msgid "Suspended"
+msgstr ""
+
+#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
+#: actions/stats.py:110
+msgid "in last day."
+msgstr ""
+
+#: actions/stats.py:338
+msgid "secs"
+msgstr ""
+
+#: actions/stats.py:348 models/chia.py:236
+msgid "hour"
+msgstr ""
+
+#: actions/warnings.py:56
+msgid "Dismiss Warning"
+msgstr ""
+
+#: actions/warnings.py:57 templates/keys.html:58
+#, python-format
+msgid ""
+"Machinaris uses an online wallet for farming. It is strongly recommended "
+"that you use a cold wallet for your payout instructions. Tutorial on the "
+"%(wiki_link_open)swiki%(wiki_link_close)s. Please add \"Setup a Cold "
+"Wallet\" to your To-Do list!"
+msgstr ""
+
+#: actions/worker.py:106
+msgid "Worker not responding to pings."
+msgstr ""
+
+#: actions/worker.py:107
+msgid "Please check the worker container and restart if necessary."
+msgstr ""
+
+#: actions/worker.py:109
+msgid "Worker time is offset from controller."
+msgstr ""
+
+#: actions/worker.py:110
+msgid "Please ensure worker and controller share same timezone."
+msgstr ""
+
+#: actions/worker.py:116
+msgid "Machinaris version does not match controller."
+msgstr ""
+
+#: actions/worker.py:117
+msgid "Please use a consistent Machinaris version to avoid issues."
+msgstr ""
+
+#: models/chia.py:133 models/chia.py:230
+msgid "days"
+msgstr ""
+
+#: models/chia.py:198 templates/summary.html:99
+msgid "Syncing"
+msgstr ""
+
+#: models/chia.py:200 templates/index.html:54
+msgid "Not available"
+msgstr ""
+
+#: models/chia.py:202
+msgid "Not synced"
+msgstr ""
+
+#: models/chia.py:205 templates/index.html:54 templates/summary.html:95
+#: templates/worker.html:78 templates/workers.html:72
+msgid "Offline"
+msgstr ""
+
+#: models/chia.py:218
+msgid "years"
+msgstr ""
+
+#: models/chia.py:220
+msgid "year"
+msgstr ""
+
+#: models/chia.py:222
+msgid "months"
+msgstr ""
+
+#: models/chia.py:224
+msgid "month"
+msgstr ""
+
+#: models/chia.py:226
+msgid "weeks"
+msgstr ""
+
+#: models/chia.py:228
+msgid "week"
+msgstr ""
+
+#: models/chia.py:232
+msgid "day"
+msgstr ""
+
+#: models/chia.py:234
+msgid "hours"
+msgstr ""
+
+#: models/chia.py:238
+msgid "minutes"
+msgstr ""
+
+#: models/chia.py:240
+msgid "minute"
+msgstr ""
+
+#: models/chia.py:242
+msgid "Never (no plots)"
+msgstr ""
+
+#: models/chia.py:244
+msgid "Soon"
+msgstr ""
+
+#: models/chia.py:246
+msgid "and"
+msgstr ""
+
+#: templates/alerts.html:14
+msgid "Alerts: Recent Notifications"
+msgstr ""
+
+#: templates/alerts.html:72 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
+msgid "Worker"
+msgstr ""
+
+#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/settings/alerts.html:45 templates/settings/farming.html:46
+#: templates/settings/plotting.html:46 templates/settings/tools.html:45
+#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/workers.html:43
+msgid "Blockchain"
+msgstr ""
+
+#: templates/alerts.html:74
+msgid "Service"
+msgstr ""
+
+#: templates/alerts.html:75
+msgid "Notification"
+msgstr ""
+
+#: templates/alerts.html:76
+msgid "Recorded At"
+msgstr ""
+
+#: templates/alerts.html:77
+msgid "Priority"
+msgstr ""
+
+#: templates/alerts.html:99
+msgid "Remove Selected"
+msgstr ""
+
+#: templates/alerts.html:101
+msgid "Remove All"
+msgstr ""
+
+#: templates/alerts.html:105
+msgid "No notifications from Chiadog yet... so check back soon."
+msgstr ""
+
+#: templates/alerts.html:106
+msgid ""
+"Expect at least a summary notification once daily as long as running "
+"above."
+msgstr ""
+
+#: templates/alerts.html:120
+msgid "Chiadog Log on "
+msgstr ""
+
+#: templates/alerts.html:147 templates/plotting/jobs.html:367
+msgid "Starting..."
+msgstr ""
+
+#: templates/alerts.html:154 templates/plotting/jobs.html:377
+msgid "Stopping..."
+msgstr ""
+
+#: templates/alerts.html:161
+msgid "Removing..."
+msgstr ""
+
+#: templates/alerts.html:169
+msgid "Purging..."
+msgstr ""
+
+#: templates/base.html:11 templates/base.html:26 templates/base.html:171
+#: templates/controller.html:10
+msgid "Machinaris"
+msgstr ""
+
+#: templates/base.html:32
+msgid "Summary"
+msgstr ""
+
+#: templates/base.html:38 templates/base.html:109 templates/index.html:41
+#: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
+msgid "Plotting"
+msgstr ""
+
+#: templates/base.html:44 templates/base.html:103 templates/index.html:50
+#: templates/settings/farming.html:15
+msgid "Farming"
+msgstr ""
+
+#: templates/base.html:50
+msgid "Wallets"
+msgstr ""
+
+#: templates/base.html:56
+msgid "Keys"
+msgstr ""
+
+#: templates/base.html:63
+msgid "Blockchains"
+msgstr ""
+
+#: templates/base.html:70
+msgid "Connections"
+msgstr ""
+
+#: templates/base.html:76 templates/base.html:97
+#: templates/settings/alerts.html:14
+msgid "Alerts"
+msgstr ""
+
+#: templates/base.html:82 templates/base.html:115
+msgid "Pools"
+msgstr ""
+
+#: templates/base.html:86 templates/farming/plots.html:69
+#: templates/farming/workers.html:28 templates/plotting/jobs.html:94
+#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/workers.html:14
+msgid "Workers"
+msgstr ""
+
+#: templates/base.html:92 templates/connections.html:25
+#: templates/connections.html:59 templates/summary.html:25
+#: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
+msgid "Settings"
+msgstr ""
+
+#: templates/base.html:121 templates/settings/tools.html:14
+msgid "Tools"
+msgstr ""
+
+#: templates/base.html:132
+msgid "About"
+msgstr ""
+
+#: templates/base.html:135
+msgid "Install"
+msgstr ""
+
+#: templates/base.html:137
+msgid "Project"
+msgstr ""
+
+#: templates/base.html:139
+msgid "Wiki"
+msgstr ""
+
+#: templates/base.html:141
+msgid "Issues"
+msgstr ""
+
+#: templates/base.html:143
+msgid "License"
+msgstr ""
+
+#: templates/base.html:145
+msgid "Credits"
+msgstr ""
+
+#: templates/base.html:161
+msgid "Bladebit"
+msgstr ""
+
+#: templates/base.html:176
+msgid "Madmax"
+msgstr ""
+
+#: templates/base.html:180
+msgid "Plotman"
+msgstr ""
+
+#: templates/blockchains.html:23
+msgid "Blockchain Summary"
+msgstr ""
+
+#: templates/blockchains.html:32 templates/summary.html:74
+#: templates/wallet.html:109
+msgid "Status"
+msgstr ""
+
+#: templates/blockchains.html:33
+msgid "Peak Height"
+msgstr ""
+
+#: templates/blockchains.html:34
+msgid "Peak Time"
+msgstr ""
+
+#: templates/blockchains.html:35 templates/wallet.html:114
+msgid "Updated At"
+msgstr ""
+
+#: templates/blockchains.html:62
+msgid "Blockchain Details"
+msgstr ""
+
+#: templates/blockchains.html:87
+msgid "No blockchains found from any farmers. Not added?"
+msgstr ""
+
+#: templates/blockchains.html:88
+msgid "Try running \"chia show --state\" on your farmers to verify."
+msgstr ""
+
+#: templates/connections.html:34
+msgid "Maxmind Account (Required):"
+msgstr ""
+
+#: templates/connections.html:39
+msgid "Maxmind License Key (Required):"
+msgstr ""
+
+#: templates/connections.html:44
+msgid "Mapbox Access Token (Optional):"
+msgstr ""
+
+#: templates/connections.html:50 templates/plotting/jobs.html:16
+#: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
+#: templates/plotting/workers.html:16 templates/plotting/workers.html:34
+#: templates/settings/pools.html:39 templates/summary.html:44
+#: templates/wallet.html:65 templates/wallet.html:92
+msgid "Cancel"
+msgstr ""
+
+#: templates/connections.html:51 templates/settings/alerts.html:55
+#: templates/settings/farming.html:56 templates/settings/plotting.html:56
+#: templates/settings/pools.html:41 templates/settings/tools.html:55
+#: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
+msgid "Save"
+msgstr ""
+
+#: templates/connections.html:84
+msgid "Connections Map"
+msgstr ""
+
+#: templates/connections.html:105
+msgid "Connection Details"
+msgstr ""
+
+#: templates/connections.html:141
+msgid "Type"
+msgstr ""
+
+#: templates/connections.html:142 templates/worker.html:39
+msgid "IP Address"
+msgstr ""
+
+#: templates/connections.html:144
+msgid "City"
+msgstr ""
+
+#: templates/connections.html:145
+msgid "Country"
+msgstr ""
+
+#: templates/connections.html:147
+msgid "Ports"
+msgstr ""
+
+#: templates/connections.html:148
+msgid "SB Height"
+msgstr ""
+
+#: templates/connections.html:149
+msgid "Last Connect"
+msgstr ""
+
+#: templates/connections.html:150
+msgid "MiB Up"
+msgstr ""
+
+#: templates/connections.html:151
+msgid "MiB Down"
+msgstr ""
+
+#: templates/connections.html:186
+msgid "Disconnect Selected"
+msgstr ""
+
+#: templates/connections.html:192
+msgid "Check Port Forwarding"
+msgstr ""
+
+#: templates/connections.html:208
+msgid "Add New Connection"
+msgstr ""
+
+#: templates/connections.html:220
+msgid "No connections found from any farmers yet. Perhaps just starting?"
+msgstr ""
+
+#: templates/connections.html:221
+msgid ""
+"After a while, try running \"chia show --connections\" on your farmers to"
+" verify."
+msgstr ""
+
+#: templates/controller.html:23
+msgid "Machinaris Worker"
+msgstr ""
+
+#: templates/controller.html:26
+msgid "This Machinaris worker is controlled at:"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
+#: templates/index.html:72
+msgid "Total Plots"
+msgstr ""
+
+#: templates/index.html:79
+msgid "Total Plots Size"
+msgstr ""
+
+#: templates/index.html:89 templates/wallet.html:113
+msgid "Balance"
+msgstr ""
+
+#: templates/index.html:96
+msgid "Farmed"
+msgstr ""
+
+#: templates/index.html:105
+msgid "Netspace"
+msgstr ""
+
+#: templates/index.html:120
+msgid "Challenges from Harvesters"
+msgstr ""
+
+#: templates/index.html:136
+msgid "Partial Proofs for Pools"
+msgstr ""
+
+#: templates/farming/workers.html:80 templates/index.html:147
+msgid "Previous"
+msgstr ""
+
+#: templates/farming/workers.html:84 templates/index.html:151
+msgid "Next"
+msgstr ""
+
+#: templates/keys.html:43
+msgid "NOTE: Machinaris will never display your private key here."
+msgstr ""
+
+#: templates/keys.html:44
+msgid ""
+"However, you may view it yourself by executing this from within the "
+"Docker container."
+msgstr ""
+
+#: templates/keys.html:54
+msgid "Best Practices"
+msgstr ""
+
+#: templates/keys.html:71
+msgid "No keys found from any farmers. Not added?"
+msgstr ""
+
+#: templates/keys.html:72
+msgid "Try running \"chia keys show\" on your farmers to verify."
+msgstr ""
+
+#: templates/logs.html:11
+msgid "Machinaris Logs"
+msgstr ""
+
+#: templates/logs.html:62
+msgid "Autoscroll"
+msgstr ""
+
+#: templates/pools.html:61
+msgid "Pool:"
+msgstr ""
+
+#: templates/pools.html:66
+msgid "SELF_POOL"
+msgstr ""
+
+#: templates/pools.html:71
+msgid "Status:"
+msgstr ""
+
+#: templates/pools.html:72
+msgid "Current Difficulty:"
+msgstr ""
+
+#: templates/pools.html:73
+msgid "Current Points Balance:"
+msgstr ""
+
+#: templates/pools.html:74
+msgid "Points Found Since Start:"
+msgstr ""
+
+#: templates/pools.html:75
+msgid "Points Found in Last 24 Hours:"
+msgstr ""
+
+#: templates/pools.html:76
+msgid "Points Successful in Last 24 Hours:"
+msgstr ""
+
+#: templates/pools.html:77
+msgid "Number of Plots:"
+msgstr ""
+
+#: templates/pools.html:79
+msgid "Launcher ID:"
+msgstr ""
+
+#: templates/pools.html:97
+msgid "No pools have been found yet. Perhaps the wallet is still syncing?"
+msgstr ""
+
+#: templates/pools.html:98
+msgid ""
+"If you would like to join a pool, please select the \"Settings | Pools\" "
+"page to get started."
+msgstr ""
+
+#: templates/pools.html:99
+msgid "For more, see the Machinaris"
+msgstr ""
+
+#: templates/setup.html:27
+msgid "Welcome to Machinaris!"
+msgstr ""
+
+#: templates/setup.html:28
+#, python-format
+msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
+msgstr ""
+
+#: templates/setup.html:61
+#, python-format
+msgid ""
+"On very first launch, the Chia compressed blockchain database "
+"%(compressed)s is being downloaded from %(dl_link)s. At about "
+"%(uncompressed)s in uncompressed size (progress shown above), this will "
+"take a while. However minutes of download now, will save you multiple "
+"days of blockchain syncing later. Please be patient!"
+msgstr ""
+
+#: templates/setup.html:75
+#, python-format
+msgid ""
+"NOTE: If you would prefer to allow Chia to sync the blockchain over many "
+"days, see the %(init_link)s for details. Similarly, you may instead "
+"%(import_link_open)s import your own blockchain %(import_link_close)s if "
+"you have one from a previous Chia install."
+msgstr ""
+
+#: templates/setup.html:83
+#, python-format
+msgid ""
+"To get started with Machinaris as a Chia%(trademark)s fullnode, either "
+"import your existing 24-word mnemonic seed phrase"
+msgstr ""
+
+#: templates/setup.html:90
+msgid "Import Existing Key"
+msgstr ""
+
+#: templates/setup.html:91
+msgid "OR"
+msgstr ""
+
+#: templates/setup.html:93
+msgid ""
+"You can generate a brand-new mnemonic phrase that will be written to this"
+" in-container path"
+msgstr ""
+
+#: templates/setup.html:96
+msgid "Generate New Key"
+msgstr ""
+
+#: templates/setup.html:110
+#, python-format
+msgid ""
+"NOTE: If you would prefer to instead import your mnenmoic seed phrase "
+"yourself at the command-line, see the %(wiki_link)s for details."
+msgstr ""
+
+#: templates/summary.html:31 templates/wallet.html:52
+msgid "Local Currency:"
+msgstr ""
+
+#: templates/summary.html:75
+msgid "Height"
+msgstr ""
+
+#: templates/farming/plots.html:66 templates/farming/workers.html:25
+#: templates/summary.html:76
+msgid "Plots"
+msgstr ""
+
+#: templates/summary.html:78
+msgid "Max Resp."
+msgstr ""
+
+#: templates/summary.html:79
+msgid "Partials"
+msgstr ""
+
+#: templates/summary.html:80
+msgid "ETW"
+msgstr ""
+
+#: templates/summary.html:82
+msgid "Wallet"
+msgstr ""
+
+#: templates/summary.html:83 templates/summary.html:84
+msgid "EDV"
+msgstr ""
+
+#: templates/summary.html:97
+msgid "Synced"
+msgstr ""
+
+#: templates/summary.html:101
+msgid "Not Synced"
+msgstr ""
+
+#: templates/summary.html:124
+msgid "No blockchains found from any farmers. Just starting up?"
+msgstr ""
+
+#: templates/summary.html:125
+msgid "Please allow at least 15 minutes for blockchains to get started."
+msgstr ""
+
+#: templates/wallet.html:76
+msgid "Wallet Settings"
+msgstr ""
+
+#: templates/wallet.html:86
+msgid "Cold Wallet Address:"
+msgstr ""
+
+#: templates/wallet.html:100
+msgid "Wallet Summary"
+msgstr ""
+
+#: templates/wallet.html:110
+msgid "Wallet Balance"
+msgstr ""
+
+#: templates/wallet.html:111
+msgid "Cold Wallet Balance"
+msgstr ""
+
+#: templates/wallet.html:112
+msgid "Total Balance"
+msgstr ""
+
+#: templates/wallet.html:137
+msgid "Edit Wallet"
+msgstr ""
+
+#: templates/wallet.html:148
+msgid "Wallet Details"
+msgstr ""
+
+#: templates/wallet.html:172
+msgid ""
+"No wallet status received.  Perhaps just starting?  Please allow at least"
+" 10 minutes to update."
+msgstr ""
+
+#: templates/wallet.html:173
+msgid ""
+"You can also try running \"chia wallet show\" on your fullnode's in-"
+"container shell to verify."
+msgstr ""
+
+#: templates/worker.html:35
+msgid "Details"
+msgstr ""
+
+#: templates/worker.html:43 templates/workers.html:42
+msgid "Hostname"
+msgstr ""
+
+#: templates/worker.html:51
+msgid "Port"
+msgstr ""
+
+#: templates/worker.html:55 templates/workers.html:44
+msgid "Mode"
+msgstr ""
+
+#: templates/worker.html:59
+msgid "Last Status Received At"
+msgstr ""
+
+#: templates/worker.html:63
+msgid "Local Time on Worker"
+msgstr ""
+
+#: templates/worker.html:67
+msgid "Last Ping to Worker"
+msgstr ""
+
+#: templates/worker.html:70 templates/workers.html:64
+msgid "Responding"
+msgstr ""
+
+#: templates/worker.html:72 templates/workers.html:66
+msgid "Connection Refused"
+msgstr ""
+
+#: templates/worker.html:74 templates/workers.html:68
+msgid "Connection Timeout"
+msgstr ""
+
+#: templates/worker.html:76 templates/workers.html:70
+msgid "Connection Error"
+msgstr ""
+
+#: templates/worker.html:86
+msgid "Last Successful Ping to Worker"
+msgstr ""
+
+#: templates/worker.html:90 templates/workers.html:48
+msgid "Version"
+msgstr ""
+
+#: templates/worker.html:98
+msgid "Farmr ID"
+msgstr ""
+
+#: templates/worker.html:106
+msgid "Recent Warnings"
+msgstr ""
+
+#: templates/worker.html:121
+msgid "Yay! No issues currently."
+msgstr ""
+
+#: templates/farming/workers.html:116 templates/worker.html:183
+msgid "Disk Space Used (TB)"
+msgstr ""
+
+#: templates/farming/workers.html:122 templates/worker.html:189
+msgid "Disk Space Free (TB)"
+msgstr ""
+
+#: templates/worker_launch.html:50 templates/worker_launch.html:640
+#: templates/worker_launch.html:669
+msgid "Host Path"
+msgstr ""
+
+#: templates/worker_launch.html:55 templates/worker_launch.html:645
+#: templates/worker_launch.html:674
+msgid "Container Path"
+msgstr ""
+
+#: templates/worker_launch.html:60 templates/worker_launch.html:650
+#: templates/worker_launch.html:679
+msgid "Used for:"
+msgstr ""
+
+#: templates/worker_launch.html:63 templates/worker_launch.html:653
+#: templates/worker_launch.html:682
+msgid "Final Plots"
+msgstr ""
+
+#: templates/worker_launch.html:64 templates/worker_launch.html:654
+#: templates/worker_launch.html:683
+msgid "Plotting Temp"
+msgstr ""
+
+#: templates/worker_launch.html:65 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
+msgid "Other"
+msgstr ""
+
+#: templates/worker_launch.html:69 templates/worker_launch.html:659
+msgid "Location"
+msgstr ""
+
+#: templates/worker_launch.html:72 templates/worker_launch.html:662
+msgid "Local"
+msgstr ""
+
+#: templates/worker_launch.html:73 templates/worker_launch.html:663
+msgid "Remote"
+msgstr ""
+
+#: templates/worker_launch.html:252
+msgid "Unknown blockchain fork of selected:"
+msgstr ""
+
+#: templates/worker_launch.html:284
+msgid ""
+"Missing worker hostname.  Please provide a short name to identify your "
+"worker."
+msgstr ""
+
+#: templates/worker_launch.html:304
+msgid ""
+"Invalid host path ending with colon. Try adding a slash to the end like "
+"this"
+msgstr ""
+
+#: templates/worker_launch.html:307
+msgid "Empty host path provided for volume at "
+msgstr ""
+
+#: templates/worker_launch.html:307
+msgid "Please provide a host path."
+msgstr ""
+
+#: templates/worker_launch.html:309
+msgid "Empty container path provided for volume at "
+msgstr ""
+
+#: templates/worker_launch.html:309
+msgid "Please provide a container path."
+msgstr ""
+
+#: templates/worker_launch.html:355
+msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
+msgstr ""
+
+#: templates/worker_launch.html:361
+msgid ""
+"Missing worker IP address.  Please provide the IP the controller will "
+"connect to for commands."
+msgstr ""
+
+#: templates/worker_launch.html:411
+msgid "Machinaris Worker - Launch Config"
+msgstr ""
+
+#: templates/worker_launch.html:412
+msgid ""
+"Complete the form below to run new harvesters/plotters on other computers"
+" across your network. Save the generated docker-compose.yml file to a "
+"folder named \"machinaris\", then execute \"docker-compose up\" from a "
+"shell."
+msgstr ""
+
+#: templates/worker_launch.html:416
+msgid "Operating System"
+msgstr ""
+
+#: templates/worker_launch.html:422
+msgid "Linux"
+msgstr ""
+
+#: templates/worker_launch.html:429
+msgid "Macintosh"
+msgstr ""
+
+#: templates/worker_launch.html:436
+msgid "Windows"
+msgstr ""
+
+#: templates/worker_launch.html:442
+msgid "Machinaris Mode"
+msgstr ""
+
+#: templates/worker_launch.html:448
+msgid "Harvester"
+msgstr ""
+
+#: templates/worker_launch.html:455
+msgid "Plotter"
+msgstr ""
+
+#: templates/worker_launch.html:463
+msgid "Farmer Public Key"
+msgstr ""
+
+#: templates/worker_launch.html:468
+msgid "Pool Public Key"
+msgstr ""
+
+#: templates/worker_launch.html:473
+msgid "Pool Contract Address"
+msgstr ""
+
+#: templates/worker_launch.html:478
+msgid "Plot on Startup"
+msgstr ""
+
+#: templates/worker_launch.html:484
+msgid "True"
+msgstr ""
+
+#: templates/worker_launch.html:491
+msgid "False"
+msgstr ""
+
+#: templates/worker_launch.html:499
+msgid "Controller IP Address"
+msgstr ""
+
+#: templates/worker_launch.html:504
+msgid "Controller API Port"
+msgstr ""
+
+#: templates/worker_launch.html:511
+msgid "Worker Hostname"
+msgstr ""
+
+#: templates/worker_launch.html:516
+msgid "Worker IP Address"
+msgstr ""
+
+#: templates/worker_launch.html:523
+msgid "Blockchains to Farm"
+msgstr ""
+
+#: templates/worker_launch.html:636
+msgid "Volume Mounts"
+msgstr ""
+
+#: templates/worker_launch.html:693
+msgid "Add New Volume"
+msgstr ""
+
+#: templates/worker_launch.html:695
+msgid "Remove Last Volume"
+msgstr ""
+
+#: templates/worker_launch.html:702
+msgid "Copy"
+msgstr ""
+
+#: templates/worker_launch.html:706
+msgid "Docker Compose"
+msgstr ""
+
+#: templates/workers.html:45
+msgid "Last Status Received"
+msgstr ""
+
+#: templates/workers.html:46
+msgid "Last Ping"
+msgstr ""
+
+#: templates/workers.html:47
+msgid "Last Successful Ping"
+msgstr ""
+
+#: templates/workers.html:49
+msgid "Logs"
+msgstr ""
+
+#: templates/workers.html:94
+msgid "Prune Selected"
+msgstr ""
+
+#: templates/workers.html:96
+msgid "New Worker"
+msgstr ""
+
+#: templates/workers.html:104
+msgid "No Machinaris workers have reported status successfully."
+msgstr ""
+
+#: templates/workers.html:105
+msgid "Please check each expected worker's log files."
+msgstr ""
+
+#: templates/workers.html:106
+#, python-format
+msgid "For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
+msgstr ""
+
+#: templates/farming/plots.html:9
+msgid "Plotting Analysis"
+msgstr ""
+
+#: templates/farming/plots.html:13
+msgid "Analysis of the plotting job log shows time (seconds) spent in each phase:"
+msgstr ""
+
+#: templates/farming/plots.html:24
+msgid "Plot Check"
+msgstr ""
+
+#: templates/farming/plots.html:86 templates/plotting/jobs.html:117
+#: templates/plotting/workers.html:122
+msgid "Worker is offline."
+msgstr ""
+
+#: templates/farming/plots.html:88
+msgid "Farming not started successfully."
+msgstr ""
+
+#: templates/farming/plots.html:147
+msgid "Farming Log for "
+msgstr ""
+
+#: templates/farming/plots.html:196
+msgid "Good Plot"
+msgstr ""
+
+#: templates/farming/plots.html:198
+msgid "Bad Plot"
+msgstr ""
+
+#: templates/farming/workers.html:66
+msgid "Daily Summary"
+msgstr ""
+
+#: templates/farming/workers.html:70
+#, python-format
+msgid "No daily summary found for %(blockchain)s on %(displayname)s."
+msgstr ""
+
+#: templates/farming/workers.html:72
+msgid ""
+"Please check that your Machinaris container for this blockchain is "
+"running. Also please verify settings on the Alerts page."
+msgstr ""
+
+#: templates/farming/workers.html:94
+#, python-format
+msgid ""
+"No plots disk stats recorded recently for %(hostname)s with Chia "
+"blockchain. Please ensure all paths containing plots have been "
+"%(wiki_link_open)s configured %(wiki_link_close)s. Also ensure the Chia "
+"worker is reporting into the controller on the Workers page."
+msgstr ""
+
+#: templates/plotting/jobs.html:9
+msgid "Confirm Kill"
+msgstr ""
+
+#: templates/plotting/jobs.html:13
+msgid ""
+"This action will terminate the selected plots, whether running or "
+"stopped, and delete all their temporary files. If Plotman is still "
+"running, another plot will be immediately started, so please stop Plotman"
+" first from the top-right. Continue?"
+msgstr ""
+
+#: templates/plotting/jobs.html:17 templates/plotting/jobs.html:193
+msgid "Kill Selected"
+msgstr ""
+
+#: templates/plotting/jobs.html:27 templates/plotting/jobs.html:123
+msgid "Start Plotting"
+msgstr ""
+
+#: templates/plotting/jobs.html:31
+msgid ""
+"This action will start Plotman and launch a plotting run using your "
+"configured plotter. Be careful about running more than one plotter on a "
+"single machine at a time. Continue?"
+msgstr ""
+
+#: templates/plotting/jobs.html:35 templates/plotting/workers.html:17
+msgid "Start"
+msgstr ""
+
+#: templates/plotting/jobs.html:45 templates/plotting/jobs.html:120
+msgid "Stop Plotting"
+msgstr ""
+
+#: templates/plotting/jobs.html:49
+msgid ""
+"This action will stop Plotman from launching new plotting jobs.  Running "
+"jobs will run to completion. Continue?"
+msgstr ""
+
+#: templates/plotting/jobs.html:53 templates/plotting/workers.html:35
+msgid "Stop"
+msgstr ""
+
+#: templates/plotting/jobs.html:63 templates/plotting/workers.html:45
+#: templates/plotting/workers.html:63
+msgid "Worker Offline"
+msgstr ""
+
+#: templates/plotting/jobs.html:67 templates/plotting/workers.html:67
+msgid ""
+"This worker is not currently online and responding to pings from the "
+"controller.  Please check the Workers page and bring the system back "
+"online."
+msgstr ""
+
+#: templates/plotting/jobs.html:70 templates/plotting/workers.html:53
+#: templates/plotting/workers.html:70
+msgid "OK"
+msgstr ""
+
+#: templates/plotting/jobs.html:91 templates/plotting/workers.html:93
+msgid "Jobs"
+msgstr ""
+
+#: templates/plotting/jobs.html:189
+msgid "Suspend Selected"
+msgstr ""
+
+#: templates/plotting/jobs.html:191
+msgid "Resume Selected"
+msgstr ""
+
+#: templates/plotting/jobs.html:204
+#, python-format
+msgid "Plotting Speed - k%(k_size)s Plots"
+msgstr ""
+
+#: templates/plotting/jobs.html:341
+msgid "Suspending..."
+msgstr ""
+
+#: templates/plotting/jobs.html:349
+msgid "Resuming..."
+msgstr ""
+
+#: templates/plotting/jobs.html:358
+msgid "Killing..."
+msgstr ""
+
+#: templates/plotting/workers.html:9 templates/plotting/workers.html:128
+msgid "Start Archiving"
+msgstr ""
+
+#: templates/plotting/workers.html:13
+msgid ""
+"This action will start Plotman archiving from the configured dst folder. "
+"Completed plots will be disributed locally or transferred remotely. "
+"Continue?"
+msgstr ""
+
+#: templates/plotting/workers.html:27 templates/plotting/workers.html:125
+msgid "Stop Archiving"
+msgstr ""
+
+#: templates/plotting/workers.html:31
+msgid ""
+"This action will stop Plotman archiving from the configured dst folder, "
+"preventing further completed plot transfers. Continue?"
+msgstr ""
+
+#: templates/plotting/workers.html:49
+#, python-format
+msgid ""
+"This worker is not currently configured for Plotman "
+"%(wiki_link_open)sarchiving%(wiki_link_open)s to enable local or remote "
+"transfer of completed plots.  Please visit the Settings | Plotting page "
+"to configure this worker."
+msgstr ""
+
+#: templates/plotting/workers.html:103
+msgid "Archiving"
+msgstr ""
+
+#: templates/plotting/workers.html:119
+msgid "Archiving is disabled.  See Settings | Plotting page."
+msgstr ""
+
+#: templates/settings/alerts.html:57 templates/settings/farming.html:58
+#: templates/settings/plotting.html:58 templates/settings/tools.html:57
+msgid "Download"
+msgstr ""
+
+#: templates/settings/pools.html:32
+msgid "Confirm Pool Change"
+msgstr ""
+
+#: templates/settings/pools.html:36
+msgid ""
+"This action will switch your current pooling selection, possibly "
+"resulting in a small charge (few mojos) against your wallet. Continue "
+"anyway?"
+msgstr ""
+
+#: templates/settings/pools.html:85
+#, python-format
+msgid ""
+"Join a pool and get consistent farming rewards. The average returns are "
+"the same, %(break)sbut it is much less volatile. You can easily switch "
+"pools without having to re-plot."
+msgstr ""
+
+#: templates/settings/pools.html:88
+msgid "ERROR: Unable to join a pool because:"
+msgstr ""
+
+#: templates/settings/pools.html:111
+msgid "Self pool. When you win a block, you will earn rewards."
+msgstr ""
+
+#: templates/settings/pools.html:122
+msgid "Connected to pool:"
+msgstr ""
+
+#: templates/settings/pools.html:122
+msgid "Connect to pool:"
+msgstr ""
+
+#: templates/settings/pools.html:132
+msgid "Compare Pools"
+msgstr ""
+
+#: templates/settings/pools.html:135
+msgid "Get Mojos"
+msgstr ""
+
+#: templates/settings/pools.html:157
+msgid "Save Changes"
+msgstr ""
+
+#: templates/settings/pools.html:161
+msgid "View Log"
+msgstr ""
+
+#: templates/settings/pools.html:172
+msgid ""
+"No wallets found yet.  Perhaps this is a brand-new installation? If so, "
+"please wait for complete start-up."
+msgstr ""
+
+#: templates/settings/pools.html:173
+msgid "For more on Pooling, see the Machinaris"
+msgstr ""
+
+#: templates/settings/pools.html:173
+msgid "wiki"
+msgstr ""
+
+#: templates/settings/pools.html:185
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings/pools.html:197
+msgid "PlotNFT Log on "
+msgstr ""
+
diff --git a/web/translations/pt_PT/LC_MESSAGES/messages.po b/web/translations/pt_PT/LC_MESSAGES/messages.po
index 0fa50d6f..7825d5a0 100644
--- a/web/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/web/translations/pt_PT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:29-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: pt\n"
@@ -943,11 +943,11 @@ msgstr "Avisos recentes"
 msgid "Yay! No issues currently."
 msgstr "Yay! Sem problemas actualmente."
 
-#: templates/farming/workers.html:114 templates/worker.html:183
+#: templates/farming/workers.html:116 templates/worker.html:183
 msgid "Disk Space Used (TB)"
 msgstr "Espaço em disco usado (TB)"
 
-#: templates/farming/workers.html:120 templates/worker.html:189
+#: templates/farming/workers.html:122 templates/worker.html:189
 msgid "Disk Space Free (TB)"
 msgstr "Espaço em disco livre (TB)"
 
@@ -1245,7 +1245,7 @@ msgstr ""
 "Por favor verifique que o container Machinaris para este blockchain está "
 "a correr. Por favor verifique também as definições na página de Alertas."
 
-#: templates/farming/workers.html:93
+#: templates/farming/workers.html:94
 #, python-format
 msgid ""
 "No plots disk stats recorded recently for %(hostname)s with Chia "
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index fb720aca..2d0ca9a2 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# Chinese translations for PROJECT.
+# Chinese translations for Machinaris.
 # Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
+# This file is distributed under the same license as the Machinaris project.
 # FIRST AUTHOR , 2022.
 #
 msgid ""
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-09 13:07-0700\n"
+"POT-Creation-Date: 2022-03-13 10:29-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
@@ -882,11 +882,11 @@ msgstr ""
 msgid "Yay! No issues currently."
 msgstr ""
 
-#: templates/farming/workers.html:114 templates/worker.html:183
+#: templates/farming/workers.html:116 templates/worker.html:183
 msgid "Disk Space Used (TB)"
 msgstr ""
 
-#: templates/farming/workers.html:120 templates/worker.html:189
+#: templates/farming/workers.html:122 templates/worker.html:189
 msgid "Disk Space Free (TB)"
 msgstr ""
 
@@ -1163,7 +1163,7 @@ msgid ""
 "running. Also please verify settings on the Alerts page."
 msgstr ""
 
-#: templates/farming/workers.html:93
+#: templates/farming/workers.html:94
 #, python-format
 msgid ""
 "No plots disk stats recorded recently for %(hostname)s with Chia "

From 563367950149e4041cd7f3bccad4ce92e9cd6f70 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Mar 2022 13:25:34 -0600
Subject: [PATCH 0662/1625] Next version

---
 CHANGELOG.md           | 9 ++++++---
 VERSION                | 2 +-
 docker/dockerfile.base | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 153cc45b..b1ac6b57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,17 @@
 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).
 
 ## Known Issues
- - Chiadog will sporadically replay alerts when the Machinaris container is restarted. #588
- - Coin prices are unavailable from [AllTheBlocks](https://alltheblocks.net), so no fiat conversion in Machinaris currently.
+ - 
+
+## [0.7.1] - 2022-04-?
+ - 
 
 ## [0.7.0] - 2022-03-11
  - [Chia](https://chia.net) - [v1.3](https://www.reddit.com/r/chia/comments/t95vuk/13_is_live/), please note reports of issues in this new Chia release...  double-check your Wallet and Pools settings after upgrading!
  - [Internationalization](https://github.com/guydavis/machinaris/wiki/Localization) for locale-specific text, numbers, and currencies.  Huge thanks to @antcasq (pt_PT) and @fabriziocacicia (it_IT) for providing translations!
  - Geolocation of peer connections for each blockchain by their IP address. [Optionally enabled](https://github.com/guydavis/machinaris/wiki/Connections) using a free Maxmind account.
-  - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
+ - [Flax](https://github.com/Flax-Network/flax-blockchain) - updated to v0.1.6, supporting new v2 DB format.
+ - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
 
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
diff --git a/VERSION b/VERSION
index bcaffe19..7deb86fe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.0
\ No newline at end of file
+0.7.1
\ No newline at end of file
diff --git a/docker/dockerfile.base b/docker/dockerfile.base
index 320ad749..cfefee07 100644
--- a/docker/dockerfile.base
+++ b/docker/dockerfile.base
@@ -28,6 +28,7 @@ RUN apt-get update \
 		python3-dev \
 		python3-pip \
 		python-is-python3 \
+		smartmontools \
 		sqlite3 \
 		sudo \
 		tar \

From 3f9bede96e5760c8556484c19bbcec9b4648a3e7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Mar 2022 14:03:11 -0600
Subject: [PATCH 0663/1625] Placeholder for new features.

---
 api/commands/smartctl.py       |  7 +++++++
 api/gunicorn.conf.py           |  2 +-
 api/schedules/status_drives.py | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 api/commands/smartctl.py
 create mode 100644 api/schedules/status_drives.py

diff --git a/api/commands/smartctl.py b/api/commands/smartctl.py
new file mode 100644
index 00000000..b1fb7260
--- /dev/null
+++ b/api/commands/smartctl.py
@@ -0,0 +1,7 @@
+#
+# Collect stats on drives
+#
+
+def load_drives_status():
+    # TODO
+     return []
\ No newline at end of file
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 72a5ef40..2fefb027 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -75,7 +75,7 @@ def on_starting(server):
         scheduler.add_job(func=geolocate_peers.execute, name="geolocate_peers", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
 
     # Testing only
-    #scheduler.add_job(func=websvcs.get_prices, name="get_prices", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=status_drives.update, name="status_drives", trigger='interval', seconds=10) # Test immediately
 
     app.logger.debug("Starting background scheduler...")
     scheduler.start()
diff --git a/api/schedules/status_drives.py b/api/schedules/status_drives.py
new file mode 100644
index 00000000..8d3978d9
--- /dev/null
+++ b/api/schedules/status_drives.py
@@ -0,0 +1,37 @@
+#
+# Performs a REST call to controller (possibly localhost) of latest public keys status.
+#
+
+
+import datetime
+import http
+import json
+import os
+import requests
+import socket
+import sqlite3
+import traceback
+
+from flask import g
+
+from common.config import globals
+from api.commands import smartctl
+from api import app
+from api import utils
+
+def update():
+    with app.app_context():
+        try:
+            hostname = utils.get_hostname()
+            payload = []
+            for blockchain in globals.enabled_blockchains():
+                for drive in smartctl.load_drive_status():
+                    payload.append({
+                        "hostname": hostname,
+                        "blockchain": blockchain,
+                        "details": drive,
+                    })
+            utils.send_post('/drives/', payload, debug=True)
+        except:
+            app.logger.info("Failed to load and send drive status.")
+            app.logger.info(traceback.format_exc())

From 92583bc129bde9542d0a2f274d98ba8c607bd859 Mon Sep 17 00:00:00 2001
From: bernieTB 
Date: Sun, 13 Mar 2022 17:45:53 -0400
Subject: [PATCH 0664/1625] Created nl_NL translation

Created first nl_NL translation.
---
 .../nl_NL/LC_MESSAGES/messages.po             |  18 +-
 web/static/landings/nl_NL.txt                 |  68 ++
 .../nl_NL/LC_MESSAGES/messages.po             | 630 ++++++++++--------
 3 files changed, 441 insertions(+), 275 deletions(-)
 create mode 100644 web/static/landings/nl_NL.txt

diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po
index 35c7fa18..c050c498 100644
--- a/api/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/api/translations/nl_NL/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "POT-Creation-Date: 2022-03-13 10:30-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
-"Last-Translator: FULL NAME \n"
+"Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
 "Language-Team: nl_NL \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -19,11 +19,11 @@ msgstr ""
 
 #: commands/chia_cli.py:67
 msgid "Updated config.yaml failed validation!"
-msgstr ""
+msgstr "Gewijzigde config.yaml kon niet gevalideerd worden!"
 
 #: commands/pools_cli.py:68
 msgid "No requested pool modifications were sent. Current settings are unchanged."
-msgstr ""
+msgstr "Geen pool wijzigingen verstuurd. Huidige configuratie is ongewijzigd."
 
 #: commands/pools_cli.py:151
 msgid ""
@@ -31,6 +31,9 @@ msgid ""
 "minutes or more to complete. DO NOT immediately re-submit your request. "
 "View the log for details."
 msgstr ""
+"Pool succesvol verlaten, overgeschakeld naar self-pooling. Gelieve enkele minuten "
+"(of meer) te wachten. Stuur NIET ONMIDDELLIJK een nieuwe aanvraag maar controleer "
+"de logs voor meer details."
 
 #: commands/pools_cli.py:195
 #, python-format
@@ -39,6 +42,9 @@ msgid ""
 "a few minutes or more to complete. DO NOT immediately re-submit your "
 "request. Be patient! View the log for details."
 msgstr ""
+"Succesvol aangesloten bij de %(pool_url) pool door creatie van een Chia NFT. "
+"Gelieve enkele minuten (of meer) te wachten. Stuur NIET ONMIDDELLIJK een nieuwe "
+"aanvraag. Wees geduldig! Controleer de logs voor meer details."
 
 #: commands/pools_cli.py:224
 msgid ""
@@ -46,8 +52,10 @@ msgid ""
 "or more to complete. DO NOT immediately re-submit your request. Be "
 "patient! View the log for details."
 msgstr ""
+"Succesvol een NFT gemaakt voor self-pooling. Gelieve enkele minuten (of meer) "
+"te wachten. Stuur NIET ONMIDDELLIJK een nieuwe aanvraag. Wees geduldig! "
+"Controleer de logs voor meer details."
 
 #: views/ping/resources.py:28
 msgid "Pong!"
-msgstr ""
-
+msgstr "Pong!"
diff --git a/web/static/landings/nl_NL.txt b/web/static/landings/nl_NL.txt
new file mode 100644
index 00000000..5c626781
--- /dev/null
+++ b/web/static/landings/nl_NL.txt
@@ -0,0 +1,68 @@
+Kom binnen mislukkeling, we gaan naar de maan!
+Alle doge worden nu geladen...
+De Belastingdienst werd verwittigd.
+Ik had gehoord dat er Lamborghinis zouden zijn
+HODL!
+Goeie keuze voor een nieuwe hobby!
+Eerste regel omtrent forks... je praat nooit over forks op /r/chia.
+Farm the dip!
+Er passen zoveel slimme contracten in dit ding...
+"Verwachte Tijd om te Winnen"? Serieus?
+Psst! Heb je meer van deze schijfruimte?
+Hi-ho! Hi-ho! A schucking we will go.
+Ik maak wel mijn eigen Chia... met blackjack en hoeren!
+Keep calm and plot on.
+All your coins are belong to us.
+...formatteer alle harde schijven in 3 2 1...
+Life is like a box of shitcoins
+Rustig! Men zegt dat deze inflatie maar tijdelijk is.
+Altcoins? Gotta Catch 'Em All
+Het beste moment om te beginnen met plotten was 17 maart 2021, het tweeded beste is vandaag.
+Ch Ch Ch Chia
+Wat gebeurt op de blockchain blijft op de blockchain.
+Niet je grootmoeder's munt.
+Mijn chia huisdier was zo vervelend... Ik ga liever kijken hoe mijn crypto aan het groeien is.
+Cha-ching!
+Al geprobeerd met een herstart?
+Vertrouw nooit een chia farm dat je niet door het raam kunt gooien.
+De Euro wil dat je hiermee stopt!
+Machinaris is het perfecte geschenk voor kerstmis.
+"Remember GME" (Game Stop)
+Levensvoldoening en Chia coins winnen... eigenlijk hetzelfde.
+In twijfel, probeer een vork.
+Verhoogt de vraag naar harde schijven seder 2021
+Nu met lootboxes
+Machinaris was de bedrieger
+Weet je wat ongeloofelijk griezelig is? Geen WiFi
+Oh, gelukzak!
+Ik heb nog nooit een coin ontmoet dat ik niet aardig vond
+We zijn nooit voorbij Beta geraakt
+Mocht de politie bellen, zeg dan zeker niet dat je "iets aan het plotten" bent!
+Hoe is jouw electriciteitsrekening dezer dagen?
+Vandaag is iemand's verjaardag!
+Ik herinner ooit gewerkt te hebben
+Wanneer start je een echte job?
+Werken is so overschat
+Er zijn twee soorten mensen in deze wereld: zij die crypto farmen en zij die dat niet doen.
+Een fantastische community, vervoeg ons op Discord!
+Stonks!
+Keybase al geprobeerd?  Innige deelneming...
+When Moon?
+When Flamethrower?
+Weet Elon hiervan?
+BITCONNEEEEEEEEEECT!
+When the dust settles..... (too soon?)
+Geen SSDs werden gewond tijdens het maken van deze film.
+(Tip vand een Expert) Als je de map System32 verwijdert heb je meer plaats voor plots!
+[A]bort, [R]etry, [F]ail
+Please insert Disk 2 and press any key to continue...
+Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
+10 PRINT "SCHRIJF HIER IETS LEUKS"
+Remember...... Je kon ook GPUs gekocht hebben!
+Gefeliciteerd, u hebt €0.00 gewonnen! Gelieve de Gas fee te betalen om uw verdienste te ontvangen.
+Power surge! Is your UPS working?
+Light out! Are your hard drives with bad sectors now?
+Light out! Does the system still boot?
+Light out! Lets replot again!
+I wish daddy had given me an UPS last Christmas, now my hard drives are all dead!
+1337.png
\ No newline at end of file
diff --git a/web/translations/nl_NL/LC_MESSAGES/messages.po b/web/translations/nl_NL/LC_MESSAGES/messages.po
index dd9284fe..9e38277c 100644
--- a/web/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/web/translations/nl_NL/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "POT-Creation-Date: 2022-03-13 10:29-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
-"Last-Translator: FULL NAME \n"
+"Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
 "Language-Team: nl_NL \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -19,37 +19,39 @@ msgstr ""
 
 #: routes.py:77 routes.py:219
 msgid "Saved local currency setting."
-msgstr ""
+msgstr "Lokale munt instelling opgeslagen."
 
 #: routes.py:96
 msgid "Blockchain download"
-msgstr ""
+msgstr "Blockchain download"
 
 #: routes.py:128
 msgid "Unknown plotting form"
-msgstr ""
+msgstr "Ongekend plottingformaat"
 
 #: routes.py:178
 msgid "Error! Please see logs."
-msgstr ""
+msgstr "Error! Controleer de logs."
 
 #: routes.py:204
 msgid "Unknown alerts form"
-msgstr ""
+msgstr "Ongekend waarschuwingsformaat"
 
 #: routes.py:224
 msgid "Saved cold wallet addresses."
-msgstr ""
+msgstr "Adres koude portefeuille opgeslagen."
 
 #: routes.py:279
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
 msgstr ""
+"Kaart instellingen opgeslagen. Wacht 10 minuten terwijl lokatie informatie "
+"voor de kaart wordt gegenereerd."
 
 #: routes.py:287
 msgid "Unknown form action"
-msgstr ""
+msgstr "Ongekende formulier actie"
 
 #: routes.py:393
 #, python-format
@@ -57,6 +59,8 @@ msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
 "another blockchain."
 msgstr ""
+"Geen werker op %(worker)s voor blockchain %(blockchain)s. Gelieve een ander "
+"blockchain te kiezen."
 
 #: routes.py:399
 #, python-format
@@ -64,6 +68,8 @@ msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
 " Please check your workers."
 msgstr ""
+"Voor Waarschuwingsconfiguratie, geen reagerende fullnode voor %(blockchain)s gevonden."
+" Gelieve uw werkers te controleren."
 
 #: routes.py:404
 #, python-format
@@ -71,6 +77,8 @@ msgid ""
 "For Farming config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr ""
+"Voor Farming configuratie, geen reagerende fullnode voor %(blockchain)s gevonden."
+" Gelieve uw werkers te controleren."
 
 #: routes.py:411
 #, python-format
@@ -78,6 +86,8 @@ msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr ""
+"Voor Plotting configuratie, geen reagerende fullnode gevonden voor "
+"%(blockchain)s. Gelieve uw werkers te controleren."
 
 #: routes.py:416
 #, python-format
@@ -85,46 +95,50 @@ msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
 "workers."
 msgstr ""
+"Geen reagerende fullnode gevonden voor %(blockchain)s. Gelieve uw "
+"werkers te controleren."
 
 #: routes.py:435
 msgid "Unsupported log type"
-msgstr ""
+msgstr "Log type niet ondersteund"
 
 #: actions/chia.py:44
 msgid ""
 "Relax and grab a coffee. Status is being gathered from active workers.  "
 "Please allow 15 minutes..."
 msgstr ""
+"Relax en neem een koffie. Status van actieve werkers wordt verzameld. "
+"Dit kan 15 minuten duren..."
 
 #: actions/plotman.py:44 models/plotman.py:70
 msgid "Idle"
-msgstr ""
+msgstr "Inactief"
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:196
 #: models/plotman.py:67 templates/index.html:42 templates/index.html:52
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #: actions/plotman.py:49 models/plotman.py:64
 msgid "Suspended"
-msgstr ""
+msgstr "Opgeschort"
 
 #: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
 #: actions/stats.py:110
 msgid "in last day."
-msgstr ""
+msgstr "in voorbije dag."
 
 #: actions/stats.py:338
 msgid "secs"
-msgstr ""
+msgstr "seconden"
 
 #: actions/stats.py:348 models/chia.py:236
 msgid "hour"
-msgstr ""
+msgstr "uur"
 
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
-msgstr ""
+msgstr "Verwerp waarschuwing"
 
 #: actions/warnings.py:57 templates/keys.html:58
 #, python-format
@@ -134,113 +148,117 @@ msgid ""
 "%(wiki_link_open)swiki%(wiki_link_close)s. Please add \"Setup a Cold "
 "Wallet\" to your To-Do list!"
 msgstr ""
+"Machinaris gebruikt een online portefeuille voor farming. Het is ten sterkste "
+"aangeraden om een koude portefeuille te gebruiken voor uw uitbetalingsinstructies. "
+"Handleiding op de %(wiki_link_open)swiki%(wiki_link_close)s. Voeg \"Koude "
+"portefeuille maken\" toe aan uw takenlijst!"
 
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
-msgstr ""
+msgstr "Werker reageert niet op pings"
 
 #: actions/worker.py:107
 msgid "Please check the worker container and restart if necessary."
-msgstr ""
+msgstr "Gelieve uw werker container te controleren en indien nodig te herstarten."
 
 #: actions/worker.py:109
 msgid "Worker time is offset from controller."
-msgstr ""
+msgstr "Werker klok verschilt van de controller"
 
 #: actions/worker.py:110
 msgid "Please ensure worker and controller share same timezone."
-msgstr ""
+msgstr "Zorg dat werker en controller dezelfde tijdzone delen."
 
 #: actions/worker.py:116
 msgid "Machinaris version does not match controller."
-msgstr ""
+msgstr "Machinaris versie is niet dezelfde als de controller."
 
 #: actions/worker.py:117
 msgid "Please use a consistent Machinaris version to avoid issues."
-msgstr ""
+msgstr "Om problemen te voorkomen gebruik een consistente Machinaris versie."
 
 #: models/chia.py:133 models/chia.py:230
 msgid "days"
-msgstr ""
+msgstr "dagen"
 
 #: models/chia.py:198 templates/summary.html:99
 msgid "Syncing"
-msgstr ""
+msgstr "Synchronisatie"
 
 #: models/chia.py:200 templates/index.html:54
 msgid "Not available"
-msgstr ""
+msgstr "Niet beschikbaar"
 
 #: models/chia.py:202
 msgid "Not synced"
-msgstr ""
+msgstr "Niet gesynchroniseerd"
 
 #: models/chia.py:205 templates/index.html:54 templates/summary.html:95
 #: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
-msgstr ""
+msgstr "Offline"
 
 #: models/chia.py:218
 msgid "years"
-msgstr ""
+msgstr "jaren"
 
 #: models/chia.py:220
 msgid "year"
-msgstr ""
+msgstr "jaar"
 
 #: models/chia.py:222
 msgid "months"
-msgstr ""
+msgstr "maanden"
 
 #: models/chia.py:224
 msgid "month"
-msgstr ""
+msgstr "maand"
 
 #: models/chia.py:226
 msgid "weeks"
-msgstr ""
+msgstr "weken"
 
 #: models/chia.py:228
 msgid "week"
-msgstr ""
+msgstr "week"
 
 #: models/chia.py:232
 msgid "day"
-msgstr ""
+msgstr "dag"
 
 #: models/chia.py:234
 msgid "hours"
-msgstr ""
+msgstr "uren"
 
 #: models/chia.py:238
 msgid "minutes"
-msgstr ""
+msgstr "minuten"
 
 #: models/chia.py:240
 msgid "minute"
-msgstr ""
+msgstr "minuut"
 
 #: models/chia.py:242
 msgid "Never (no plots)"
-msgstr ""
+msgstr "Nooit (geen plots)"
 
 #: models/chia.py:244
 msgid "Soon"
-msgstr ""
+msgstr "Binnenkort"
 
 #: models/chia.py:246
 msgid "and"
-msgstr ""
+msgstr "en"
 
 #: templates/alerts.html:14
 msgid "Alerts: Recent Notifications"
-msgstr ""
+msgstr "Waarschuwingen: Recente notificaties"
 
 #: templates/alerts.html:72 templates/settings/alerts.html:36
 #: templates/settings/farming.html:37 templates/settings/plotting.html:37
 #: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
-msgstr ""
+msgstr "Werker"
 
 #: templates/alerts.html:73 templates/blockchains.html:31
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
@@ -248,207 +266,209 @@ msgstr ""
 #: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
-msgstr ""
+msgstr "Blockchain"
 
 #: templates/alerts.html:74
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #: templates/alerts.html:75
 msgid "Notification"
-msgstr ""
+msgstr "Notificatie"
 
 #: templates/alerts.html:76
 msgid "Recorded At"
-msgstr ""
+msgstr "Geregistreerd om"
 
 #: templates/alerts.html:77
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #: templates/alerts.html:99
 msgid "Remove Selected"
-msgstr ""
+msgstr "Verwijder geselecteerde"
 
 #: templates/alerts.html:101
 msgid "Remove All"
-msgstr ""
+msgstr "Verwijder alle"
 
 #: templates/alerts.html:105
 msgid "No notifications from Chiadog yet... so check back soon."
-msgstr ""
+msgstr "Nog geen notificaties van Chiadog... kom later eens terug."
 
 #: templates/alerts.html:106
 msgid ""
 "Expect at least a summary notification once daily as long as running "
 "above."
 msgstr ""
+"Verwacht minstens een dagelijkse sammenvattende notificatie zo lang als "
+"hierboven loopt."
 
 #: templates/alerts.html:120
 msgid "Chiadog Log on "
-msgstr ""
+msgstr "Chiadog Log van "
 
 #: templates/alerts.html:147 templates/plotting/jobs.html:367
 msgid "Starting..."
-msgstr ""
+msgstr "Starten..."
 
 #: templates/alerts.html:154 templates/plotting/jobs.html:377
 msgid "Stopping..."
-msgstr ""
+msgstr "Stoppen..."
 
 #: templates/alerts.html:161
 msgid "Removing..."
-msgstr ""
+msgstr "Verwijderen..."
 
 #: templates/alerts.html:169
 msgid "Purging..."
-msgstr ""
+msgstr "Eliminatie..."
 
 #: templates/base.html:11 templates/base.html:26 templates/base.html:171
 #: templates/controller.html:10
 msgid "Machinaris"
-msgstr ""
+msgstr "Marchinaris"
 
 #: templates/base.html:32
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #: templates/base.html:38 templates/base.html:109 templates/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
-msgstr ""
+msgstr "Plotting"
 
 #: templates/base.html:44 templates/base.html:103 templates/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
-msgstr ""
+msgstr "Farming"
 
 #: templates/base.html:50
 msgid "Wallets"
-msgstr ""
+msgstr "Portefeuilles"
 
 #: templates/base.html:56
 msgid "Keys"
-msgstr ""
+msgstr "Sleutels"
 
 #: templates/base.html:63
 msgid "Blockchains"
-msgstr ""
+msgstr "Blockchains"
 
 #: templates/base.html:70
 msgid "Connections"
-msgstr ""
+msgstr "Verbindingen"
 
 #: templates/base.html:76 templates/base.html:97
 #: templates/settings/alerts.html:14
 msgid "Alerts"
-msgstr ""
+msgstr "Waarschuwingen"
 
 #: templates/base.html:82 templates/base.html:115
 msgid "Pools"
-msgstr ""
+msgstr "Pools"
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
 #: templates/plotting/workers.html:96 templates/summary.html:77
 #: templates/workers.html:14
 msgid "Workers"
-msgstr ""
+msgstr "Werkers"
 
 #: templates/base.html:92 templates/connections.html:25
 #: templates/connections.html:59 templates/summary.html:25
 #: templates/summary.html:53 templates/wallet.html:23 templates/wallet.html:46
 msgid "Settings"
-msgstr ""
+msgstr "Instellingen"
 
 #: templates/base.html:121 templates/settings/tools.html:14
 msgid "Tools"
-msgstr ""
+msgstr "Hulpmiddelen"
 
 #: templates/base.html:132
 msgid "About"
-msgstr ""
+msgstr "Informatie"
 
 #: templates/base.html:135
 msgid "Install"
-msgstr ""
+msgstr "Installeren"
 
 #: templates/base.html:137
 msgid "Project"
-msgstr ""
+msgstr "Project"
 
 #: templates/base.html:139
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #: templates/base.html:141
 msgid "Issues"
-msgstr ""
+msgstr "Problemen"
 
 #: templates/base.html:143
 msgid "License"
-msgstr ""
+msgstr "Licentie"
 
 #: templates/base.html:145
 msgid "Credits"
-msgstr ""
+msgstr "Credits"
 
 #: templates/base.html:161
 msgid "Bladebit"
-msgstr ""
+msgstr "Bladebit"
 
 #: templates/base.html:176
 msgid "Madmax"
-msgstr ""
+msgstr "Madmax"
 
 #: templates/base.html:180
 msgid "Plotman"
-msgstr ""
+msgstr "Plotman"
 
 #: templates/blockchains.html:23
 msgid "Blockchain Summary"
-msgstr ""
+msgstr "Blockchain Samenvatting"
 
 #: templates/blockchains.html:32 templates/summary.html:74
 #: templates/wallet.html:109
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: templates/blockchains.html:33
 msgid "Peak Height"
-msgstr ""
+msgstr "Piek Hoogte"
 
 #: templates/blockchains.html:34
 msgid "Peak Time"
-msgstr ""
+msgstr "Piek Tijd"
 
 #: templates/blockchains.html:35 templates/wallet.html:114
 msgid "Updated At"
-msgstr ""
+msgstr "Bijgewerkt om"
 
 #: templates/blockchains.html:62
 msgid "Blockchain Details"
-msgstr ""
+msgstr "Blockchain Details"
 
 #: templates/blockchains.html:87
 msgid "No blockchains found from any farmers. Not added?"
-msgstr ""
+msgstr "Geen blockchains gevonden in uw farmers. Niet toegevoegd?"
 
 #: templates/blockchains.html:88
 msgid "Try running \"chia show --state\" on your farmers to verify."
-msgstr ""
+msgstr "Probeer \"chia show --state\" uit te voeren op uw farmers om te controleren."
 
 #: templates/connections.html:34
 msgid "Maxmind Account (Required):"
-msgstr ""
+msgstr "Maxmind Account (Verplicht):"
 
 #: templates/connections.html:39
 msgid "Maxmind License Key (Required):"
-msgstr ""
+msgstr "Maxmind License Key (Verplicht)"
 
 #: templates/connections.html:44
 msgid "Mapbox Access Token (Optional):"
-msgstr ""
+msgstr "Mapbox Access Token (Verplicht)"
 
 #: templates/connections.html:50 templates/plotting/jobs.html:16
 #: templates/plotting/jobs.html:34 templates/plotting/jobs.html:52
@@ -456,221 +476,227 @@ msgstr ""
 #: templates/settings/pools.html:39 templates/summary.html:44
 #: templates/wallet.html:65 templates/wallet.html:92
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #: templates/connections.html:51 templates/settings/alerts.html:55
 #: templates/settings/farming.html:56 templates/settings/plotting.html:56
 #: templates/settings/pools.html:41 templates/settings/tools.html:55
 #: templates/summary.html:45 templates/wallet.html:66 templates/wallet.html:93
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 #: templates/connections.html:84
 msgid "Connections Map"
-msgstr ""
+msgstr "Verbindingen Kaart"
 
 #: templates/connections.html:105
 msgid "Connection Details"
-msgstr ""
+msgstr "Verbindings Details"
 
 #: templates/connections.html:141
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: templates/connections.html:142 templates/worker.html:39
 msgid "IP Address"
-msgstr ""
+msgstr "IP Adres"
 
 #: templates/connections.html:144
 msgid "City"
-msgstr ""
+msgstr "Stad"
 
 #: templates/connections.html:145
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #: templates/connections.html:147
 msgid "Ports"
-msgstr ""
+msgstr "Poorten"
 
 #: templates/connections.html:148
 msgid "SB Height"
-msgstr ""
+msgstr "SB Hoogte"
 
 #: templates/connections.html:149
 msgid "Last Connect"
-msgstr ""
+msgstr "Laatste Verbinding"
 
 #: templates/connections.html:150
 msgid "MiB Up"
-msgstr ""
+msgstr "MiB Op"
 
 #: templates/connections.html:151
 msgid "MiB Down"
-msgstr ""
+msgstr "MiB Neer"
 
 #: templates/connections.html:186
 msgid "Disconnect Selected"
-msgstr ""
+msgstr "Geselecteerde Ontkoppelen"
 
 #: templates/connections.html:192
 msgid "Check Port Forwarding"
-msgstr ""
+msgstr "Controleer Port Forwarding"
 
 #: templates/connections.html:208
 msgid "Add New Connection"
-msgstr ""
+msgstr "Voeg nieuwe verbinding toe"
 
 #: templates/connections.html:220
 msgid "No connections found from any farmers yet. Perhaps just starting?"
-msgstr ""
+msgstr "Nog geen verbindingen van uw farmers gevonden. Nog aan het opstarten?"
 
 #: templates/connections.html:221
 msgid ""
 "After a while, try running \"chia show --connections\" on your farmers to"
 " verify."
 msgstr ""
+"Na enige tijd, probeer \"chia show --connections\" uit te voeren op uw "
+"werkers om dit te controleren."
 
 #: templates/controller.html:23
 msgid "Machinaris Worker"
-msgstr ""
+msgstr "Machinaris Werker"
 
 #: templates/controller.html:26
 msgid "This Machinaris worker is controlled at:"
-msgstr ""
+msgstr "Deze Machinaris werker wordt beheerd op: "
 
 #: templates/index.html:30
 msgid "Expected Time to Win"
-msgstr ""
+msgstr "Verwachte Tijd om te Winnen"
 
 #: templates/index.html:72
 msgid "Total Plots"
-msgstr ""
+msgstr "Totaal Aantal Plots"
 
 #: templates/index.html:79
 msgid "Total Plots Size"
-msgstr ""
+msgstr "Totale Omvang Plots"
 
 #: templates/index.html:89 templates/wallet.html:113
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #: templates/index.html:96
 msgid "Farmed"
-msgstr ""
+msgstr "Farmed"
 
 #: templates/index.html:105
 msgid "Netspace"
-msgstr ""
+msgstr "Netgrootte"
 
 #: templates/index.html:120
 msgid "Challenges from Harvesters"
-msgstr ""
+msgstr "Uitdagingen van Harvesters"
 
 #: templates/index.html:136
 msgid "Partial Proofs for Pools"
-msgstr ""
+msgstr "Gedeeltelijke bewijzen voor Pools"
 
 #: templates/farming/workers.html:80 templates/index.html:147
 msgid "Previous"
-msgstr ""
+msgstr "Vorige"
 
 #: templates/farming/workers.html:84 templates/index.html:151
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
-msgstr ""
+msgstr "NOTA: Machinaris zal hier nooit uw private sleutels tonen."
 
 #: templates/keys.html:44
 msgid ""
 "However, you may view it yourself by executing this from within the "
 "Docker container."
 msgstr ""
+"Alhoewel, u kunt het zelf zien door dit uit te voeren in de Docker "
+"container."
 
 #: templates/keys.html:54
 msgid "Best Practices"
-msgstr ""
+msgstr "Aanbevelingen"
 
 #: templates/keys.html:71
 msgid "No keys found from any farmers. Not added?"
-msgstr ""
+msgstr "Geen sleutels gevonden in uw farmers. Niet toegevoegd?"
 
 #: templates/keys.html:72
 msgid "Try running \"chia keys show\" on your farmers to verify."
-msgstr ""
+msgstr "Probeer \"chia keys show\" uit te voeren op uw farmers om dit na te zien"
 
 #: templates/logs.html:11
 msgid "Machinaris Logs"
-msgstr ""
+msgstr "Machinaris Logs"
 
 #: templates/logs.html:62
 msgid "Autoscroll"
-msgstr ""
+msgstr "Auto scrollen"
 
 #: templates/pools.html:61
 msgid "Pool:"
-msgstr ""
+msgstr "Pool:"
 
 #: templates/pools.html:66
 msgid "SELF_POOL"
-msgstr ""
+msgstr "SELF_POOL"
 
 #: templates/pools.html:71
 msgid "Status:"
-msgstr ""
+msgstr "Status:"
 
 #: templates/pools.html:72
 msgid "Current Difficulty:"
-msgstr ""
+msgstr "Huidige Moeilijkheid:"
 
 #: templates/pools.html:73
 msgid "Current Points Balance:"
-msgstr ""
+msgstr "Huidig Punten Saldo:"
 
 #: templates/pools.html:74
 msgid "Points Found Since Start:"
-msgstr ""
+msgstr "Punten gevonden sedert start:"
 
 #: templates/pools.html:75
 msgid "Points Found in Last 24 Hours:"
-msgstr ""
+msgstr "Punten gevonden in de laatste 24 uren:"
 
 #: templates/pools.html:76
 msgid "Points Successful in Last 24 Hours:"
-msgstr ""
+msgstr "Succesvolle punten in de laatste 24 uren:"
 
 #: templates/pools.html:77
 msgid "Number of Plots:"
-msgstr ""
+msgstr "Aantal Plots:"
 
 #: templates/pools.html:79
 msgid "Launcher ID:"
-msgstr ""
+msgstr "Launcher ID:"
 
 #: templates/pools.html:97
 msgid "No pools have been found yet. Perhaps the wallet is still syncing?"
-msgstr ""
+msgstr "Zover geen pools gevonden. Is uw portefeuille nog aan het synchroniseren?"
 
 #: templates/pools.html:98
 msgid ""
 "If you would like to join a pool, please select the \"Settings | Pools\" "
 "page to get started."
 msgstr ""
+"Indien u een pool wenst te vervoegen, selecteer de \"Settings | Pools\" "
+"pagina om te beginnen."
 
 #: templates/pools.html:99
 msgid "For more, see the Machinaris"
-msgstr ""
+msgstr "Voor meer info, zie Machinaris"
 
 #: templates/setup.html:27
 msgid "Welcome to Machinaris!"
-msgstr ""
+msgstr "Welkom bij Machinaris!"
 
 #: templates/setup.html:28
 #, python-format
 msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
-msgstr ""
+msgstr "Een gebruiksvriendelijke interface voor Chia%(trademark)s plotting en farming"
 
 #: templates/setup.html:61
 #, python-format
@@ -681,6 +707,12 @@ msgid ""
 "take a while. However minutes of download now, will save you multiple "
 "days of blockchain syncing later. Please be patient!"
 msgstr ""
+"Tijdens de allereerste start wordt de gecomprimeerde Chia blockchain "
+"databank %(compressed)s gedownload van %(dl_link)s. Met de huidge "
+"grootte van %(uncompressed)s in ongecomprimeerde vorm (zie vooruitgang "
+"hierboven) kan dit wel even duren. Echter, nu meerdere minuten downloaden "
+"zal meerdere dagen uitsparen in het synchroniseren van de blockchain. "
+"Heb geduld!"
 
 #: templates/setup.html:75
 #, python-format
@@ -690,6 +722,10 @@ msgid ""
 "%(import_link_open)s import your own blockchain %(import_link_close)s if "
 "you have one from a previous Chia install."
 msgstr ""
+"NOTA: Indien u echter prefereert om Chia toe te laten om de blockchain "
+"gedurende meerdere dagen te synchroniseren, zie dan %(init_link)s voor details. "
+"U kunt ook evenwel %(import_link_open)s uw eigen blockchain importeren %(import_link_close)s "
+"indien u er een heeft van een eerdere Chia installatie."
 
 #: templates/setup.html:83
 #, python-format
@@ -697,24 +733,28 @@ msgid ""
 "To get started with Machinaris as a Chia%(trademark)s fullnode, either "
 "import your existing 24-word mnemonic seed phrase"
 msgstr ""
+"Om Machinaris te starten als een Chia%(trademark)s fullnode, "
+"importeer uw bestaande mnemonische zin (24 woorden)"
 
 #: templates/setup.html:90
 msgid "Import Existing Key"
-msgstr ""
+msgstr "Importeer bestaande sleutel"
 
 #: templates/setup.html:91
 msgid "OR"
-msgstr ""
+msgstr "OF"
 
 #: templates/setup.html:93
 msgid ""
 "You can generate a brand-new mnemonic phrase that will be written to this"
 " in-container path"
 msgstr ""
+"U kan een gloednieuwe mnemonische zin genereren dewelke zal worden opgeslagen "
+"in dit container pad"
 
 #: templates/setup.html:96
 msgid "Generate New Key"
-msgstr ""
+msgstr "Genereer nieuwe sleutel"
 
 #: templates/setup.html:110
 #, python-format
@@ -722,259 +762,271 @@ msgid ""
 "NOTE: If you would prefer to instead import your mnenmoic seed phrase "
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
+"NOTA: Indien u prefereert om uw mnemonische zin zelf te importeren "
+"via de commandoprompt, zie de %(wiki_link)s voor details."
 
 #: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
-msgstr ""
+msgstr "Lokale Munt:"
 
 #: templates/summary.html:75
 msgid "Height"
-msgstr ""
+msgstr "Hoogte"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
 #: templates/summary.html:76
 msgid "Plots"
-msgstr ""
+msgstr "Plots"
 
 #: templates/summary.html:78
 msgid "Max Resp."
-msgstr ""
+msgstr "Max Resp."
 
 #: templates/summary.html:79
 msgid "Partials"
-msgstr ""
+msgstr "Partials"
 
 #: templates/summary.html:80
 msgid "ETW"
-msgstr ""
+msgstr "ETW"
 
 #: templates/summary.html:82
 msgid "Wallet"
-msgstr ""
+msgstr "Portefeuille"
 
 #: templates/summary.html:83 templates/summary.html:84
 msgid "EDV"
-msgstr ""
+msgstr "EDV"
 
 #: templates/summary.html:97
 msgid "Synced"
-msgstr ""
+msgstr "Gesynchroniseerd"
 
 #: templates/summary.html:101
 msgid "Not Synced"
-msgstr ""
+msgstr "Niet Gesynchroniseerd"
 
 #: templates/summary.html:124
 msgid "No blockchains found from any farmers. Just starting up?"
-msgstr ""
+msgstr "Geen blockchains gevonden in uw farmers. Nog aan het opstarten?"
 
 #: templates/summary.html:125
 msgid "Please allow at least 15 minutes for blockchains to get started."
-msgstr ""
+msgstr "Wacht minstens 15 minuten terwijl de blockchains opstarten."
 
 #: templates/wallet.html:76
 msgid "Wallet Settings"
-msgstr ""
+msgstr "Portefeuille Instellingen"
 
 #: templates/wallet.html:86
 msgid "Cold Wallet Address:"
-msgstr ""
+msgstr "Adres Koude Portefeuille"
 
 #: templates/wallet.html:100
 msgid "Wallet Summary"
-msgstr ""
+msgstr "Portefeuille Samenvatting"
 
 #: templates/wallet.html:110
 msgid "Wallet Balance"
-msgstr ""
+msgstr "Saldo Portefeuille"
 
 #: templates/wallet.html:111
 msgid "Cold Wallet Balance"
-msgstr ""
+msgstr "Saldo Koude Portefeuille"
 
 #: templates/wallet.html:112
 msgid "Total Balance"
-msgstr ""
+msgstr "Totale Saldo"
 
 #: templates/wallet.html:137
 msgid "Edit Wallet"
-msgstr ""
+msgstr "Wijzig Portefeuille"
 
 #: templates/wallet.html:148
 msgid "Wallet Details"
-msgstr ""
+msgstr "Portefeuille Details"
 
 #: templates/wallet.html:172
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
+"Geen portefeuille status ontvangen. Nog aan het opstarten? Wacht minstens"
+" 10 minuten voor updates."
 
 #: templates/wallet.html:173
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
 msgstr ""
+"U can ook \"chia wallet show\" uitvoeren binnen de container op uw fullnode "
+"om dit na te zien."
 
 #: templates/worker.html:35
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #: templates/worker.html:43 templates/workers.html:42
 msgid "Hostname"
-msgstr ""
+msgstr "Hostname"
 
 #: templates/worker.html:51
 msgid "Port"
-msgstr ""
+msgstr "Poort"
 
 #: templates/worker.html:55 templates/workers.html:44
 msgid "Mode"
-msgstr ""
+msgstr "Modus"
 
 #: templates/worker.html:59
 msgid "Last Status Received At"
-msgstr ""
+msgstr "Laatste status ontvangen op"
 
 #: templates/worker.html:63
 msgid "Local Time on Worker"
-msgstr ""
+msgstr "Lokale tijd op werker"
 
 #: templates/worker.html:67
 msgid "Last Ping to Worker"
-msgstr ""
+msgstr "Laatste ping naar werker"
 
 #: templates/worker.html:70 templates/workers.html:64
 msgid "Responding"
-msgstr ""
+msgstr "Antwoord"
 
 #: templates/worker.html:72 templates/workers.html:66
 msgid "Connection Refused"
-msgstr ""
+msgstr "Verbinding geweigerd"
 
 #: templates/worker.html:74 templates/workers.html:68
 msgid "Connection Timeout"
-msgstr ""
+msgstr "Verbinding time-out"
 
 #: templates/worker.html:76 templates/workers.html:70
 msgid "Connection Error"
-msgstr ""
+msgstr "Verbinding Error"
 
 #: templates/worker.html:86
 msgid "Last Successful Ping to Worker"
-msgstr ""
+msgstr "Laatste succesvolle ping naar werker"
 
 #: templates/worker.html:90 templates/workers.html:48
 msgid "Version"
-msgstr ""
+msgstr "Versie"
 
 #: templates/worker.html:98
 msgid "Farmr ID"
-msgstr ""
+msgstr "Farmer ID"
 
 #: templates/worker.html:106
 msgid "Recent Warnings"
-msgstr ""
+msgstr "Laatste waarschuwingen"
 
 #: templates/worker.html:121
 msgid "Yay! No issues currently."
-msgstr ""
+msgstr "Joepie! Momenteel geen problemen."
 
 #: templates/farming/workers.html:116 templates/worker.html:183
 msgid "Disk Space Used (TB)"
-msgstr ""
+msgstr "Gebruikte Schijfruimte (TB)"
 
 #: templates/farming/workers.html:122 templates/worker.html:189
 msgid "Disk Space Free (TB)"
-msgstr ""
+msgstr "Vrije Schijfruimte (TB)"
 
 #: templates/worker_launch.html:50 templates/worker_launch.html:640
 #: templates/worker_launch.html:669
 msgid "Host Path"
-msgstr ""
+msgstr "Host Pad"
 
 #: templates/worker_launch.html:55 templates/worker_launch.html:645
 #: templates/worker_launch.html:674
 msgid "Container Path"
-msgstr ""
+msgstr "Container Pad"
 
 #: templates/worker_launch.html:60 templates/worker_launch.html:650
 #: templates/worker_launch.html:679
 msgid "Used for:"
-msgstr ""
+msgstr "Gebruikt voor:"
 
 #: templates/worker_launch.html:63 templates/worker_launch.html:653
 #: templates/worker_launch.html:682
 msgid "Final Plots"
-msgstr ""
+msgstr "Finale Plots"
 
 #: templates/worker_launch.html:64 templates/worker_launch.html:654
 #: templates/worker_launch.html:683
 msgid "Plotting Temp"
-msgstr ""
+msgstr "Plotting Temp"
 
 #: templates/worker_launch.html:65 templates/worker_launch.html:655
 #: templates/worker_launch.html:684
 msgid "Other"
-msgstr ""
+msgstr "Andere"
 
 #: templates/worker_launch.html:69 templates/worker_launch.html:659
 msgid "Location"
-msgstr ""
+msgstr "Locatie"
 
 #: templates/worker_launch.html:72 templates/worker_launch.html:662
 msgid "Local"
-msgstr ""
+msgstr "Lokaal"
 
 #: templates/worker_launch.html:73 templates/worker_launch.html:663
 msgid "Remote"
-msgstr ""
+msgstr "Extern"
 
 #: templates/worker_launch.html:252
 msgid "Unknown blockchain fork of selected:"
-msgstr ""
+msgstr "Ongekende blockchain fork geselecteerd:"
 
 #: templates/worker_launch.html:284
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
 msgstr ""
+"Ontbrekende werker hostname.  Geef een korte naam om uw werker mee te "
+"identificeren."
 
 #: templates/worker_launch.html:304
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
 msgstr ""
+"Ongeldig pad eindigend met een dubbele punt. Probeer een slash toe te voegen "
+"aan het einde, als volgt"
 
 #: templates/worker_launch.html:307
 msgid "Empty host path provided for volume at "
-msgstr ""
+msgstr "Ongeldige host pad opgegeven voor volume op "
 
 #: templates/worker_launch.html:307
 msgid "Please provide a host path."
-msgstr ""
+msgstr "Gelieve een host pad op te geven."
 
 #: templates/worker_launch.html:309
 msgid "Empty container path provided for volume at "
-msgstr ""
+msgstr "Leeg container pad opgegeven voor volume op "
 
 #: templates/worker_launch.html:309
 msgid "Please provide a container path."
-msgstr ""
+msgstr "Gelieve een container pad op te geven."
 
 #: templates/worker_launch.html:355
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
-msgstr ""
+msgstr "Noch Harvester noch Plotter modus geselecteerd. Kies een of beide."
 
 #: templates/worker_launch.html:361
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
 msgstr ""
+"Werker IP adres ontbreekt. Gelieve een IP op te geven waarmee de controller "
+"zal verbinden voor commandos."
 
 #: templates/worker_launch.html:411
 msgid "Machinaris Worker - Launch Config"
-msgstr ""
+msgstr "Machinaris werker - Lanceer Configuratie"
 
 #: templates/worker_launch.html:412
 msgid ""
@@ -983,183 +1035,189 @@ msgid ""
 "folder named \"machinaris\", then execute \"docker-compose up\" from a "
 "shell."
 msgstr ""
+"Vervolledig onderstaand formulier om nieuwe harvesters/plotters te starten op "
+"computers in uw netwerk. Sla het gegenereerde docker-compose.yml bestand op in "
+"een map genaamd \"machinaris\", en voer dan het commando \"docker-compose up\" "
+"uit via de commandoprompt." 
 
 #: templates/worker_launch.html:416
 msgid "Operating System"
-msgstr ""
+msgstr "Besturingssysteem"
 
 #: templates/worker_launch.html:422
 msgid "Linux"
-msgstr ""
+msgstr "Linux"
 
 #: templates/worker_launch.html:429
 msgid "Macintosh"
-msgstr ""
+msgstr "Macintosh"
 
 #: templates/worker_launch.html:436
 msgid "Windows"
-msgstr ""
+msgstr "Windows"
 
 #: templates/worker_launch.html:442
 msgid "Machinaris Mode"
-msgstr ""
+msgstr "Machinaris Modus"
 
 #: templates/worker_launch.html:448
 msgid "Harvester"
-msgstr ""
+msgstr "Harvester"
 
 #: templates/worker_launch.html:455
 msgid "Plotter"
-msgstr ""
+msgstr "Plotter"
 
 #: templates/worker_launch.html:463
 msgid "Farmer Public Key"
-msgstr ""
+msgstr "Farmer publieke sleutel"
 
 #: templates/worker_launch.html:468
 msgid "Pool Public Key"
-msgstr ""
+msgstr "Pool publieke sleutel"
 
 #: templates/worker_launch.html:473
 msgid "Pool Contract Address"
-msgstr ""
+msgstr "Pool contract adres"
 
 #: templates/worker_launch.html:478
 msgid "Plot on Startup"
-msgstr ""
+msgstr "Plot on Startup"
 
 #: templates/worker_launch.html:484
 msgid "True"
-msgstr ""
+msgstr "True"
 
 #: templates/worker_launch.html:491
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #: templates/worker_launch.html:499
 msgid "Controller IP Address"
-msgstr ""
+msgstr "Controller IP adres"
 
 #: templates/worker_launch.html:504
 msgid "Controller API Port"
-msgstr ""
+msgstr "Controller API poort"
 
 #: templates/worker_launch.html:511
 msgid "Worker Hostname"
-msgstr ""
+msgstr "Werker hostname"
 
 #: templates/worker_launch.html:516
 msgid "Worker IP Address"
-msgstr ""
+msgstr "Werker IP adres"
 
 #: templates/worker_launch.html:523
 msgid "Blockchains to Farm"
-msgstr ""
+msgstr "Blockchains to Farm"
 
 #: templates/worker_launch.html:636
 msgid "Volume Mounts"
-msgstr ""
+msgstr "Volume Mounts"
 
 #: templates/worker_launch.html:693
 msgid "Add New Volume"
-msgstr ""
+msgstr "Voeg nieuw volume toe"
 
 #: templates/worker_launch.html:695
 msgid "Remove Last Volume"
-msgstr ""
+msgstr "Verwijder laatste volume"
 
 #: templates/worker_launch.html:702
 msgid "Copy"
-msgstr ""
+msgstr "Kopieer"
 
 #: templates/worker_launch.html:706
 msgid "Docker Compose"
-msgstr ""
+msgstr "Docker Compose"
 
 #: templates/workers.html:45
 msgid "Last Status Received"
-msgstr ""
+msgstr "Laatste status ontvangen"
 
 #: templates/workers.html:46
 msgid "Last Ping"
-msgstr ""
+msgstr "Laatste ping"
 
 #: templates/workers.html:47
 msgid "Last Successful Ping"
-msgstr ""
+msgstr "Laatste succesvolle ping"
 
 #: templates/workers.html:49
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #: templates/workers.html:94
 msgid "Prune Selected"
-msgstr ""
+msgstr "Verwijder geselecteerde"
 
 #: templates/workers.html:96
 msgid "New Worker"
-msgstr ""
+msgstr "Nieuwe werker"
 
 #: templates/workers.html:104
 msgid "No Machinaris workers have reported status successfully."
-msgstr ""
+msgstr "Geen Machinaris werkers hebben succesvol een status gerapporteerd."
 
 #: templates/workers.html:105
 msgid "Please check each expected worker's log files."
-msgstr ""
+msgstr "Verifieer de logs van iedere verwachte werker."
 
 #: templates/workers.html:106
 #, python-format
 msgid "For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
-msgstr ""
+msgstr "Voor meer info, zie de Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
 
 #: templates/farming/plots.html:9
 msgid "Plotting Analysis"
-msgstr ""
+msgstr "Plotting analyse"
 
 #: templates/farming/plots.html:13
 msgid "Analysis of the plotting job log shows time (seconds) spent in each phase:"
-msgstr ""
+msgstr "Analyse van de plotting job toont de tijd (seconden) voor iedere fase:"
 
 #: templates/farming/plots.html:24
 msgid "Plot Check"
-msgstr ""
+msgstr "Plot Controle"
 
 #: templates/farming/plots.html:86 templates/plotting/jobs.html:117
 #: templates/plotting/workers.html:122
 msgid "Worker is offline."
-msgstr ""
+msgstr "Werker is offline"
 
 #: templates/farming/plots.html:88
 msgid "Farming not started successfully."
-msgstr ""
+msgstr "Farming niet succesvol gestart."
 
 #: templates/farming/plots.html:147
 msgid "Farming Log for "
-msgstr ""
+msgstr "Farming log voor "
 
 #: templates/farming/plots.html:196
 msgid "Good Plot"
-msgstr ""
+msgstr "Goed plot"
 
 #: templates/farming/plots.html:198
 msgid "Bad Plot"
-msgstr ""
+msgstr "Slecht plot"
 
 #: templates/farming/workers.html:66
 msgid "Daily Summary"
-msgstr ""
+msgstr "Dagelijkse Samenvatting"
 
 #: templates/farming/workers.html:70
 #, python-format
 msgid "No daily summary found for %(blockchain)s on %(displayname)s."
-msgstr ""
+msgstr "Geen dagelijkse samenvatting gevonden voor %(blockchain)s op %(displayname)s."
 
 #: templates/farming/workers.html:72
 msgid ""
 "Please check that your Machinaris container for this blockchain is "
 "running. Also please verify settings on the Alerts page."
 msgstr ""
+"Gelieve na te zien of uw Machinaris container voor deze blockchain "
+"actief is. Verifieer ook de instellingen op de pagina Waarschuwingen."
 
 #: templates/farming/workers.html:94
 #, python-format
@@ -1169,10 +1227,14 @@ msgid ""
 "%(wiki_link_open)s configured %(wiki_link_close)s. Also ensure the Chia "
 "worker is reporting into the controller on the Workers page."
 msgstr ""
+"Geen plot schijf statistieken geregistreerd voor %(hostname)s op de Chia "
+"blockchain. Gelieve ervoor te zorgen dat alle schijven met plots werden "
+"%(wiki_link_open)s geconfigureerd %(wiki_link_close)s. Verifieer ook op "
+"de Werkers pagina of de Chia werker rapporteert naar de controller."
 
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
-msgstr ""
+msgstr "Bevestig Kill"
 
 #: templates/plotting/jobs.html:13
 msgid ""
@@ -1181,14 +1243,18 @@ msgid ""
 "running, another plot will be immediately started, so please stop Plotman"
 " first from the top-right. Continue?"
 msgstr ""
+"Deze actie beëindigt de geselecteerde plots, onafgezien of deze actief "
+"of gestopt zijn en verwijdert alle tijdelijke bestanden. Als Plotman nog "
+"actief is zal onmiddellijk een nieuwe plot starten, zorg er dus voor om "
+"eerst Plotman te stoppen (bovenaan rechts op de pagina). Verder gaan?" 
 
 #: templates/plotting/jobs.html:17 templates/plotting/jobs.html:193
 msgid "Kill Selected"
-msgstr ""
+msgstr "Kill geselecteerde"
 
 #: templates/plotting/jobs.html:27 templates/plotting/jobs.html:123
 msgid "Start Plotting"
-msgstr ""
+msgstr "Start Plotting"
 
 #: templates/plotting/jobs.html:31
 msgid ""
@@ -1196,29 +1262,34 @@ msgid ""
 "configured plotter. Be careful about running more than one plotter on a "
 "single machine at a time. Continue?"
 msgstr ""
+"Deze actie start Plotman en lanceert een plotting sessie met uw "
+"geconfigureerde plotter. Wees voorzichting met het starten van meer dan "
+"één plotter terzelfdertijd op eenzelfde machine. Verder gaan?"
 
 #: templates/plotting/jobs.html:35 templates/plotting/workers.html:17
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #: templates/plotting/jobs.html:45 templates/plotting/jobs.html:120
 msgid "Stop Plotting"
-msgstr ""
+msgstr "Stop plotting"
 
 #: templates/plotting/jobs.html:49
 msgid ""
 "This action will stop Plotman from launching new plotting jobs.  Running "
 "jobs will run to completion. Continue?"
 msgstr ""
+"Deze actie voorkomt dat Plotman nieuwe plotting jobs start. Actieve jobs "
+"blijven actief tot deze compleet zijn. Verder gaan?"
 
 #: templates/plotting/jobs.html:53 templates/plotting/workers.html:35
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: templates/plotting/jobs.html:63 templates/plotting/workers.html:45
 #: templates/plotting/workers.html:63
 msgid "Worker Offline"
-msgstr ""
+msgstr "Werker offline"
 
 #: templates/plotting/jobs.html:67 templates/plotting/workers.html:67
 msgid ""
@@ -1226,44 +1297,47 @@ msgid ""
 "controller.  Please check the Workers page and bring the system back "
 "online."
 msgstr ""
+"Deze werker is momenteel niet online noch antwoord op pings van de "
+"controller. Gelieve de pagina Werkers te controleren en het systeem "
+"terug online te brengen."
 
 #: templates/plotting/jobs.html:70 templates/plotting/workers.html:53
 #: templates/plotting/workers.html:70
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: templates/plotting/jobs.html:91 templates/plotting/workers.html:93
 msgid "Jobs"
-msgstr ""
+msgstr "Jobs"
 
 #: templates/plotting/jobs.html:189
 msgid "Suspend Selected"
-msgstr ""
+msgstr "Geselecteerde opschorten"
 
 #: templates/plotting/jobs.html:191
 msgid "Resume Selected"
-msgstr ""
+msgstr "Geselecteerde herstarten"
 
 #: templates/plotting/jobs.html:204
 #, python-format
 msgid "Plotting Speed - k%(k_size)s Plots"
-msgstr ""
+msgstr "Plotting snelheid - k%(k_size)s Plots"
 
 #: templates/plotting/jobs.html:341
 msgid "Suspending..."
-msgstr ""
+msgstr "Opschorten..."
 
 #: templates/plotting/jobs.html:349
 msgid "Resuming..."
-msgstr ""
+msgstr "Herstarten..."
 
 #: templates/plotting/jobs.html:358
 msgid "Killing..."
-msgstr ""
+msgstr "Killing..."
 
 #: templates/plotting/workers.html:9 templates/plotting/workers.html:128
 msgid "Start Archiving"
-msgstr ""
+msgstr "Start Archivering"
 
 #: templates/plotting/workers.html:13
 msgid ""
@@ -1271,16 +1345,21 @@ msgid ""
 "Completed plots will be disributed locally or transferred remotely. "
 "Continue?"
 msgstr ""
+"Deze actie start Plotman archivering vanuit de geconfigureerde dst map. "
+"Afgewerkte plots zullen locaal gedistribueerd of extern getransfereerd "
+"worden. Verder gaan?"
 
 #: templates/plotting/workers.html:27 templates/plotting/workers.html:125
 msgid "Stop Archiving"
-msgstr ""
+msgstr "Stop Archivering"
 
 #: templates/plotting/workers.html:31
 msgid ""
 "This action will stop Plotman archiving from the configured dst folder, "
 "preventing further completed plot transfers. Continue?"
 msgstr ""
+"Deze actie stopt Plotman archivering vanuit de geconfigureerde dst map "
+"en voorkomt verdere transferts van afgewerkte plots. Verder gaan?"
 
 #: templates/plotting/workers.html:49
 #, python-format
@@ -1290,23 +1369,27 @@ msgid ""
 "transfer of completed plots.  Please visit the Settings | Plotting page "
 "to configure this worker."
 msgstr ""
+"Deze werker is momenteel niet geconfigureerd voor Plotman "
+"%(wiki_link_open)sarchivering%(wiki_link_open)s om locale of externe "
+"transferts van afgewerkte plots uit te voeren. Gelieve de pagina "
+"Instellingen | Plotting te bezoeken om de werker te configureren."
 
 #: templates/plotting/workers.html:103
 msgid "Archiving"
-msgstr ""
+msgstr "Archivering"
 
 #: templates/plotting/workers.html:119
 msgid "Archiving is disabled.  See Settings | Plotting page."
-msgstr ""
+msgstr "Archivering is uitgeschakeld. Zie pagina Instellingen | Plotting."
 
 #: templates/settings/alerts.html:57 templates/settings/farming.html:58
 #: templates/settings/plotting.html:58 templates/settings/tools.html:57
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 #: templates/settings/pools.html:32
 msgid "Confirm Pool Change"
-msgstr ""
+msgstr "Bevestig pool wijziging"
 
 #: templates/settings/pools.html:36
 msgid ""
@@ -1314,6 +1397,8 @@ msgid ""
 "resulting in a small charge (few mojos) against your wallet. Continue "
 "anyway?"
 msgstr ""
+"Deze actie wisselt uw huidige pooling selectie, mogelijks leidend "
+"tot een kleine kost (enkele mojos) in uw portefeuille.  Verder gaan?"
 
 #: templates/settings/pools.html:85
 #, python-format
@@ -1322,58 +1407,63 @@ msgid ""
 "the same, %(break)sbut it is much less volatile. You can easily switch "
 "pools without having to re-plot."
 msgstr ""
+"Vervoeg een pool en ontvang consistente farming compensaties. Het gemiddelde "
+"rendement is gelijk, %(break)sechter het is minder volatiel. U kunt "
+"gemakkelijk pools wisselen zonder plots te hoeven hermaken."
 
 #: templates/settings/pools.html:88
 msgid "ERROR: Unable to join a pool because:"
-msgstr ""
+msgstr "ERROR: Pool kon niet worden vervoegd omdat:"
 
 #: templates/settings/pools.html:111
 msgid "Self pool. When you win a block, you will earn rewards."
-msgstr ""
+msgstr "Self pool. Wanneer u een block wint, krijgt u de compensatie."
 
 #: templates/settings/pools.html:122
 msgid "Connected to pool:"
-msgstr ""
+msgstr "Verbonden met pool: "
 
 #: templates/settings/pools.html:122
 msgid "Connect to pool:"
-msgstr ""
+msgstr "Verbind met pool:"
 
 #: templates/settings/pools.html:132
 msgid "Compare Pools"
-msgstr ""
+msgstr "Vergelijk pools"
 
 #: templates/settings/pools.html:135
 msgid "Get Mojos"
-msgstr ""
+msgstr "Ontvang Mojos"
 
 #: templates/settings/pools.html:157
 msgid "Save Changes"
-msgstr ""
+msgstr "Bewaar wijzigingen"
 
 #: templates/settings/pools.html:161
 msgid "View Log"
-msgstr ""
+msgstr "Bekijk log"
 
 #: templates/settings/pools.html:172
 msgid ""
 "No wallets found yet.  Perhaps this is a brand-new installation? If so, "
 "please wait for complete start-up."
 msgstr ""
+"Nog geen portefeuilles gevonden. Misschie is dit een gloednieuwe installatie? "
+"Indien zo, wacht tot het opstarten is beëindigt."
 
 #: templates/settings/pools.html:173
 msgid "For more on Pooling, see the Machinaris"
-msgstr ""
+msgstr "Voor meer omtrent Pooling, zie Machinaris"
 
 #: templates/settings/pools.html:173
 msgid "wiki"
-msgstr ""
+msgstr "wiki"
 
 #: templates/settings/pools.html:185
 msgid "Saving..."
-msgstr ""
+msgstr "Opslaan..."
 
 #: templates/settings/pools.html:197
 msgid "PlotNFT Log on "
-msgstr ""
+msgstr "PlotNFS log op "
 

From cb01302df46d708a09cdd6266526f0c6f4fc48e9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Mar 2022 19:49:56 -0600
Subject: [PATCH 0665/1625] Improving i18n support.  Thanks @bdeprez!

---
 CHANGELOG.md                                  |   2 +-
 CREDITS.md                                    |   3 +-
 .../de_DE/LC_MESSAGES/messages.po             |   4 +-
 .../fr_FR/LC_MESSAGES/messages.po             |   4 +-
 .../it_IT/LC_MESSAGES/messages.po             |   6 +-
 .../nl_NL/LC_MESSAGES/messages.po             |  23 +--
 .../pt_PT/LC_MESSAGES/messages.po             |   6 +-
 api/translations/zh/LC_MESSAGES/messages.po   |   4 +-
 web/__init__.py                               |  15 +-
 web/actions/chia.py                           |   8 +-
 web/models/chia.py                            |   6 +-
 web/routes.py                                 |  19 ++-
 .../de_DE/LC_MESSAGES/messages.po             |   4 +-
 .../fr_FR/LC_MESSAGES/messages.po             |   4 +-
 .../it_IT/LC_MESSAGES/messages.po             |   6 +-
 .../nl_NL/LC_MESSAGES/messages.po             | 131 ++++++++++--------
 .../pt_PT/LC_MESSAGES/messages.po             |   6 +-
 web/translations/zh/LC_MESSAGES/messages.po   |   4 +-
 18 files changed, 144 insertions(+), 111 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ac6b57..5ffcea61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. The format
  - 
 
 ## [0.7.1] - 2022-04-?
- - 
+ - Dutch translations (nl_NL) provided by Bernie Deprez.  Thanks!
 
 ## [0.7.0] - 2022-03-11
  - [Chia](https://chia.net) - [v1.3](https://www.reddit.com/r/chia/comments/t95vuk/13_is_live/), please note reports of issues in this new Chia release...  double-check your Wallet and Pools settings after upgrading!
diff --git a/CREDITS.md b/CREDITS.md
index 7c9467d0..6af6ca77 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -97,7 +97,8 @@ A big thanks to all that contributed with dev and test including:
 * tjb_altf4
 * halfroom (aka Sagittarius)
 * @antcasq (Antonio Casqueiro)
-* @fabriziocacicia
+* @fabriziocacicia (Fabrizio Cacicia)
+* @bdeprez (Bernie Deprez)
 
 ## 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.*
\ No newline at end of file
diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po
index 391d1489..04ff7879 100644
--- a/api/translations/de_DE/LC_MESSAGES/messages.po
+++ b/api/translations/de_DE/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: de\n"
diff --git a/api/translations/fr_FR/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po
index b24e5034..08aca980 100644
--- a/api/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/api/translations/fr_FR/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
diff --git a/api/translations/it_IT/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po
index 20aaa50b..d316444c 100644
--- a/api/translations/it_IT/LC_MESSAGES/messages.po
+++ b/api/translations/it_IT/LC_MESSAGES/messages.po
@@ -5,11 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
-"Last-Translator: FULL NAME\n"
+"Last-Translator: Fabrizio Cacicia\n"
 "Language: it\n"
 "Language-Team: it \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po
index c050c498..05a7218d 100644
--- a/api/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/api/translations/nl_NL/LC_MESSAGES/messages.po
@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
 "Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
@@ -31,9 +32,9 @@ msgid ""
 "minutes or more to complete. DO NOT immediately re-submit your request. "
 "View the log for details."
 msgstr ""
-"Pool succesvol verlaten, overgeschakeld naar self-pooling. Gelieve enkele minuten "
-"(of meer) te wachten. Stuur NIET ONMIDDELLIJK een nieuwe aanvraag maar controleer "
-"de logs voor meer details."
+"Pool succesvol verlaten, overgeschakeld naar self-pooling. Gelieve enkele"
+" minuten (of meer) te wachten. Stuur NIET ONMIDDELLIJK een nieuwe "
+"aanvraag maar controleer de logs voor meer details."
 
 #: commands/pools_cli.py:195
 #, python-format
@@ -42,9 +43,10 @@ msgid ""
 "a few minutes or more to complete. DO NOT immediately re-submit your "
 "request. Be patient! View the log for details."
 msgstr ""
-"Succesvol aangesloten bij de %(pool_url) pool door creatie van een Chia NFT. "
-"Gelieve enkele minuten (of meer) te wachten. Stuur NIET ONMIDDELLIJK een nieuwe "
-"aanvraag. Wees geduldig! Controleer de logs voor meer details."
+"Succesvol aangesloten bij de %(pool_url) pool door creatie van een Chia "
+"NFT. Gelieve enkele minuten (of meer) te wachten. Stuur NIET ONMIDDELLIJK"
+" een nieuwe aanvraag. Wees geduldig! Controleer de logs voor meer "
+"details."
 
 #: commands/pools_cli.py:224
 msgid ""
@@ -52,10 +54,11 @@ msgid ""
 "or more to complete. DO NOT immediately re-submit your request. Be "
 "patient! View the log for details."
 msgstr ""
-"Succesvol een NFT gemaakt voor self-pooling. Gelieve enkele minuten (of meer) "
-"te wachten. Stuur NIET ONMIDDELLIJK een nieuwe aanvraag. Wees geduldig! "
-"Controleer de logs voor meer details."
+"Succesvol een NFT gemaakt voor self-pooling. Gelieve enkele minuten (of "
+"meer) te wachten. Stuur NIET ONMIDDELLIJK een nieuwe aanvraag. Wees "
+"geduldig! Controleer de logs voor meer details."
 
 #: views/ping/resources.py:28
 msgid "Pong!"
 msgstr "Pong!"
+
diff --git a/api/translations/pt_PT/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po
index 8cf2fe4c..9bf5b381 100644
--- a/api/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/api/translations/pt_PT/LC_MESSAGES/messages.po
@@ -5,11 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
-"Last-Translator: FULL NAME\n"
+"Last-Translator: Antonio Casqueiro\n"
 "Language: pt\n"
 "Language-Team: pt \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 72b6e9c8..8f1e7fc4 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:30-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
diff --git a/web/__init__.py b/web/__init__.py
index 6c01981f..8220c425 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -20,9 +20,18 @@
 
 @babel.localeselector
 def get_locale():
-    #for d in babel.translation_directories:
-    #    app.logger.info(d)
-    #app.logger.info("WEB=> Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+    try:
+        accept = request.headers['Accept-Language']
+        match = request.accept_languages.best_match(app.config['LANGUAGES'])
+        # Workaround for dumb babel match method suggesting 'en' for 'nl' instead of 'nl_NL'
+        if match == 'en' and not accept.startswith('en'):
+            first_accept = accept.split(',')[0]  # Like 'nl'
+            alternative = "{0}_{1}".format(first_accept, first_accept.upper())
+            if alternative in app.config['LANGUAGES']:
+                return alternative
+        app.logger.info("INIT: Accept-Language: {0}  ---->  matched locale: {1}".format(accept, match))
+    except:
+        app.logger.info("INIT: Request had no Accept-Language, returning default locale of en.")
     return request.accept_languages.best_match(app.config['LANGUAGES'])
 
 @event.listens_for(Engine, "connect")
diff --git a/web/actions/chia.py b/web/actions/chia.py
index 90c1672c..d16a9758 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -131,14 +131,14 @@ def load_blockchains():
     return None
 
 def load_summaries():
-    app.logger.info("Loading Summary page data...")
+    app.logger.debug("Loading Summary page data...")
     try:
         blockchains = load_blockchains()
-        app.logger.info("Found {0} blockchains states for summary page.".format(len(blockchains.rows)))
+        app.logger.debug("Found {0} blockchains states for summary page.".format(len(blockchains.rows)))
         farms = load_farm_summary()
-        app.logger.info("Found {0} blockchain farms for summary page.".format(len(farms.farms)))
+        app.logger.debug("Found {0} blockchain farms for summary page.".format(len(farms.farms)))
         summary_stats = stats.load_summary_stats(blockchains.rows)
-        app.logger.info("Found {0} blockchain stats.".format(len(summary_stats)))
+        app.logger.debug("Found {0} blockchain stats.".format(len(summary_stats)))
         return Summaries(blockchains, farms.farms, farms.wallets, summary_stats)
     except Exception as ex:
         app.logger.error("Error loading summary: {0}".format(str(ex)))
diff --git a/web/models/chia.py b/web/models/chia.py
index 0d1983e0..858c1b38 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -22,7 +22,7 @@ class Summaries:
     def __init__(self, blockchains, farms, wallets, stats):
         self.rows = []
         for blockchain in blockchains.rows:
-            app.logger.info("Adding summary row for {0}".format(blockchain['blockchain']))
+            app.logger.debug("Adding summary row for {0}".format(blockchain['blockchain']))
             farm = self.find_farm(farms, blockchain['blockchain'])
             if not farm:
                 app.logger.error("No farm summary found for {0}".format(blockchain['blockchain']))
@@ -310,10 +310,10 @@ def __init__(self, wallets, cold_wallet_addresses={}):
         self.rows = []
         self.cold_wallet_addresses = cold_wallet_addresses
         for wallet in wallets:
-            app.logger.info("Wallets.init(): Parsing wallet for blockchain: {0}".format(wallet.blockchain))
+            app.logger.debug("Wallets.init(): Parsing wallet for blockchain: {0}".format(wallet.blockchain))
             worker_status = None
             try:
-                app.logger.info("Wallets.init(): Found worker with hostname '{0}'".format(wallet.hostname))
+                app.logger.debug("Wallets.init(): Found worker with hostname '{0}'".format(wallet.hostname))
                 worker = w.get_worker(wallet.hostname, wallet.blockchain)
                 worker_status = worker.connection_status()
                 displayname = worker.displayname
diff --git a/web/routes.py b/web/routes.py
index 310673cd..c2acd417 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -20,11 +20,20 @@
         log_handler, stats, warnings, forktools, mapping
 
 def get_lang(request):
-    lang = request.accept_languages.best_match(app.config['LANGUAGES'])
-    if not lang:
-        lang = 'en'
-    app.logger.info("USING LANG={0}".format(lang))
-    return lang 
+    try:
+        accept = request.headers['Accept-Language']
+        match = request.accept_languages.best_match(app.config['LANGUAGES'])
+        # Workaround for dumb babel match method suggesting 'en' for 'nl' instead of 'nl_NL'
+        if match == 'en' and not accept.startswith('en'):
+            first_accept = accept.split(',')[0]  # Like 'nl'
+            alternative = "{0}_{1}".format(first_accept, first_accept.upper())
+            if alternative in app.config['LANGUAGES']:
+                return alternative
+        app.logger.info("ROUTES: Accept-Language: {0}  ---->  matched locale: {1}".format(accept, match))
+        return request.accept_languages.best_match(app.config['LANGUAGES'])
+    except:
+        app.logger.info("ROUTES: Request had no Accept-Language, returning default locale of 'en'")
+        return "en" 
 
 def find_selected_worker(hosts, hostname, blockchain= None):
     if len(hosts) == 0:
diff --git a/web/translations/de_DE/LC_MESSAGES/messages.po b/web/translations/de_DE/LC_MESSAGES/messages.po
index ffe05d99..6bd789dd 100644
--- a/web/translations/de_DE/LC_MESSAGES/messages.po
+++ b/web/translations/de_DE/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: de\n"
diff --git a/web/translations/fr_FR/LC_MESSAGES/messages.po b/web/translations/fr_FR/LC_MESSAGES/messages.po
index a584a33c..740ba34f 100644
--- a/web/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/web/translations/fr_FR/LC_MESSAGES/messages.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: fr\n"
diff --git a/web/translations/it_IT/LC_MESSAGES/messages.po b/web/translations/it_IT/LC_MESSAGES/messages.po
index 368e5787..cdf12ad9 100644
--- a/web/translations/it_IT/LC_MESSAGES/messages.po
+++ b/web/translations/it_IT/LC_MESSAGES/messages.po
@@ -5,11 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
-"Last-Translator: FULL NAME\n"
+"Last-Translator: Fabrizio Cacicia\n"
 "Language: it\n"
 "Language-Team: it \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
diff --git a/web/translations/nl_NL/LC_MESSAGES/messages.po b/web/translations/nl_NL/LC_MESSAGES/messages.po
index 9e38277c..9857dc64 100644
--- a/web/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/web/translations/nl_NL/LC_MESSAGES/messages.po
@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
 "Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
@@ -46,8 +47,8 @@ msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
 msgstr ""
-"Kaart instellingen opgeslagen. Wacht 10 minuten terwijl lokatie informatie "
-"voor de kaart wordt gegenereerd."
+"Kaart instellingen opgeslagen. Wacht 10 minuten terwijl lokatie "
+"informatie voor de kaart wordt gegenereerd."
 
 #: routes.py:287
 msgid "Unknown form action"
@@ -59,8 +60,8 @@ msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
 "another blockchain."
 msgstr ""
-"Geen werker op %(worker)s voor blockchain %(blockchain)s. Gelieve een ander "
-"blockchain te kiezen."
+"Geen werker op %(worker)s voor blockchain %(blockchain)s. Gelieve een "
+"ander blockchain te kiezen."
 
 #: routes.py:399
 #, python-format
@@ -68,8 +69,8 @@ msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
 " Please check your workers."
 msgstr ""
-"Voor Waarschuwingsconfiguratie, geen reagerende fullnode voor %(blockchain)s gevonden."
-" Gelieve uw werkers te controleren."
+"Voor Waarschuwingsconfiguratie, geen reagerende fullnode voor "
+"%(blockchain)s gevonden. Gelieve uw werkers te controleren."
 
 #: routes.py:404
 #, python-format
@@ -77,8 +78,8 @@ msgid ""
 "For Farming config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr ""
-"Voor Farming configuratie, geen reagerende fullnode voor %(blockchain)s gevonden."
-" Gelieve uw werkers te controleren."
+"Voor Farming configuratie, geen reagerende fullnode voor %(blockchain)s "
+"gevonden. Gelieve uw werkers te controleren."
 
 #: routes.py:411
 #, python-format
@@ -95,8 +96,8 @@ msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
 "workers."
 msgstr ""
-"Geen reagerende fullnode gevonden voor %(blockchain)s. Gelieve uw "
-"werkers te controleren."
+"Geen reagerende fullnode gevonden voor %(blockchain)s. Gelieve uw werkers"
+" te controleren."
 
 #: routes.py:435
 msgid "Unsupported log type"
@@ -107,8 +108,8 @@ msgid ""
 "Relax and grab a coffee. Status is being gathered from active workers.  "
 "Please allow 15 minutes..."
 msgstr ""
-"Relax en neem een koffie. Status van actieve werkers wordt verzameld. "
-"Dit kan 15 minuten duren..."
+"Relax en neem een koffie. Status van actieve werkers wordt verzameld. Dit"
+" kan 15 minuten duren..."
 
 #: actions/plotman.py:44 models/plotman.py:70
 msgid "Idle"
@@ -148,10 +149,11 @@ msgid ""
 "%(wiki_link_open)swiki%(wiki_link_close)s. Please add \"Setup a Cold "
 "Wallet\" to your To-Do list!"
 msgstr ""
-"Machinaris gebruikt een online portefeuille voor farming. Het is ten sterkste "
-"aangeraden om een koude portefeuille te gebruiken voor uw uitbetalingsinstructies. "
-"Handleiding op de %(wiki_link_open)swiki%(wiki_link_close)s. Voeg \"Koude "
-"portefeuille maken\" toe aan uw takenlijst!"
+"Machinaris gebruikt een online portefeuille voor farming. Het is ten "
+"sterkste aangeraden om een koude portefeuille te gebruiken voor uw "
+"uitbetalingsinstructies. Handleiding op de "
+"%(wiki_link_open)swiki%(wiki_link_close)s. Voeg \"Koude portefeuille "
+"maken\" toe aan uw takenlijst!"
 
 #: actions/worker.py:106
 msgid "Worker not responding to pings."
@@ -456,7 +458,9 @@ msgstr "Geen blockchains gevonden in uw farmers. Niet toegevoegd?"
 
 #: templates/blockchains.html:88
 msgid "Try running \"chia show --state\" on your farmers to verify."
-msgstr "Probeer \"chia show --state\" uit te voeren op uw farmers om te controleren."
+msgstr ""
+"Probeer \"chia show --state\" uit te voeren op uw farmers om te "
+"controleren."
 
 #: templates/connections.html:34
 msgid "Maxmind Account (Required):"
@@ -696,7 +700,9 @@ msgstr "Welkom bij Machinaris!"
 #: templates/setup.html:28
 #, python-format
 msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
-msgstr "Een gebruiksvriendelijke interface voor Chia%(trademark)s plotting en farming"
+msgstr ""
+"Een gebruiksvriendelijke interface voor Chia%(trademark)s plotting en "
+"farming"
 
 #: templates/setup.html:61
 #, python-format
@@ -708,10 +714,10 @@ msgid ""
 "days of blockchain syncing later. Please be patient!"
 msgstr ""
 "Tijdens de allereerste start wordt de gecomprimeerde Chia blockchain "
-"databank %(compressed)s gedownload van %(dl_link)s. Met de huidge "
-"grootte van %(uncompressed)s in ongecomprimeerde vorm (zie vooruitgang "
-"hierboven) kan dit wel even duren. Echter, nu meerdere minuten downloaden "
-"zal meerdere dagen uitsparen in het synchroniseren van de blockchain. "
+"databank %(compressed)s gedownload van %(dl_link)s. Met de huidge grootte"
+" van %(uncompressed)s in ongecomprimeerde vorm (zie vooruitgang "
+"hierboven) kan dit wel even duren. Echter, nu meerdere minuten downloaden"
+" zal meerdere dagen uitsparen in het synchroniseren van de blockchain. "
 "Heb geduld!"
 
 #: templates/setup.html:75
@@ -723,9 +729,10 @@ msgid ""
 "you have one from a previous Chia install."
 msgstr ""
 "NOTA: Indien u echter prefereert om Chia toe te laten om de blockchain "
-"gedurende meerdere dagen te synchroniseren, zie dan %(init_link)s voor details. "
-"U kunt ook evenwel %(import_link_open)s uw eigen blockchain importeren %(import_link_close)s "
-"indien u er een heeft van een eerdere Chia installatie."
+"gedurende meerdere dagen te synchroniseren, zie dan %(init_link)s voor "
+"details. U kunt ook evenwel %(import_link_open)s uw eigen blockchain "
+"importeren %(import_link_close)s indien u er een heeft van een eerdere "
+"Chia installatie."
 
 #: templates/setup.html:83
 #, python-format
@@ -733,8 +740,8 @@ msgid ""
 "To get started with Machinaris as a Chia%(trademark)s fullnode, either "
 "import your existing 24-word mnemonic seed phrase"
 msgstr ""
-"Om Machinaris te starten als een Chia%(trademark)s fullnode, "
-"importeer uw bestaande mnemonische zin (24 woorden)"
+"Om Machinaris te starten als een Chia%(trademark)s fullnode, importeer uw"
+" bestaande mnemonische zin (24 woorden)"
 
 #: templates/setup.html:90
 msgid "Import Existing Key"
@@ -749,8 +756,8 @@ msgid ""
 "You can generate a brand-new mnemonic phrase that will be written to this"
 " in-container path"
 msgstr ""
-"U kan een gloednieuwe mnemonische zin genereren dewelke zal worden opgeslagen "
-"in dit container pad"
+"U kan een gloednieuwe mnemonische zin genereren dewelke zal worden "
+"opgeslagen in dit container pad"
 
 #: templates/setup.html:96
 msgid "Generate New Key"
@@ -762,8 +769,8 @@ msgid ""
 "NOTE: If you would prefer to instead import your mnenmoic seed phrase "
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
-"NOTA: Indien u prefereert om uw mnemonische zin zelf te importeren "
-"via de commandoprompt, zie de %(wiki_link)s voor details."
+"NOTA: Indien u prefereert om uw mnemonische zin zelf te importeren via de"
+" commandoprompt, zie de %(wiki_link)s voor details."
 
 #: templates/summary.html:31 templates/wallet.html:52
 msgid "Local Currency:"
@@ -859,8 +866,8 @@ msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
 msgstr ""
-"U can ook \"chia wallet show\" uitvoeren binnen de container op uw fullnode "
-"om dit na te zien."
+"U can ook \"chia wallet show\" uitvoeren binnen de container op uw "
+"fullnode om dit na te zien."
 
 #: templates/worker.html:35
 msgid "Details"
@@ -993,8 +1000,8 @@ msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
 msgstr ""
-"Ongeldig pad eindigend met een dubbele punt. Probeer een slash toe te voegen "
-"aan het einde, als volgt"
+"Ongeldig pad eindigend met een dubbele punt. Probeer een slash toe te "
+"voegen aan het einde, als volgt"
 
 #: templates/worker_launch.html:307
 msgid "Empty host path provided for volume at "
@@ -1021,8 +1028,8 @@ msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
 msgstr ""
-"Werker IP adres ontbreekt. Gelieve een IP op te geven waarmee de controller "
-"zal verbinden voor commandos."
+"Werker IP adres ontbreekt. Gelieve een IP op te geven waarmee de "
+"controller zal verbinden voor commandos."
 
 #: templates/worker_launch.html:411
 msgid "Machinaris Worker - Launch Config"
@@ -1035,10 +1042,10 @@ msgid ""
 "folder named \"machinaris\", then execute \"docker-compose up\" from a "
 "shell."
 msgstr ""
-"Vervolledig onderstaand formulier om nieuwe harvesters/plotters te starten op "
-"computers in uw netwerk. Sla het gegenereerde docker-compose.yml bestand op in "
-"een map genaamd \"machinaris\", en voer dan het commando \"docker-compose up\" "
-"uit via de commandoprompt." 
+"Vervolledig onderstaand formulier om nieuwe harvesters/plotters te "
+"starten op computers in uw netwerk. Sla het gegenereerde docker-"
+"compose.yml bestand op in een map genaamd \"machinaris\", en voer dan het"
+" commando \"docker-compose up\" uit via de commandoprompt."
 
 #: templates/worker_launch.html:416
 msgid "Operating System"
@@ -1167,7 +1174,9 @@ msgstr "Verifieer de logs van iedere verwachte werker."
 #: templates/workers.html:106
 #, python-format
 msgid "For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
-msgstr "Voor meer info, zie de Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
+msgstr ""
+"Voor meer info, zie de Machinaris "
+"%(wiki_link_open)swiki%(wiki_link_close)s."
 
 #: templates/farming/plots.html:9
 msgid "Plotting Analysis"
@@ -1209,15 +1218,17 @@ msgstr "Dagelijkse Samenvatting"
 #: templates/farming/workers.html:70
 #, python-format
 msgid "No daily summary found for %(blockchain)s on %(displayname)s."
-msgstr "Geen dagelijkse samenvatting gevonden voor %(blockchain)s op %(displayname)s."
+msgstr ""
+"Geen dagelijkse samenvatting gevonden voor %(blockchain)s op "
+"%(displayname)s."
 
 #: templates/farming/workers.html:72
 msgid ""
 "Please check that your Machinaris container for this blockchain is "
 "running. Also please verify settings on the Alerts page."
 msgstr ""
-"Gelieve na te zien of uw Machinaris container voor deze blockchain "
-"actief is. Verifieer ook de instellingen op de pagina Waarschuwingen."
+"Gelieve na te zien of uw Machinaris container voor deze blockchain actief"
+" is. Verifieer ook de instellingen op de pagina Waarschuwingen."
 
 #: templates/farming/workers.html:94
 #, python-format
@@ -1243,10 +1254,10 @@ msgid ""
 "running, another plot will be immediately started, so please stop Plotman"
 " first from the top-right. Continue?"
 msgstr ""
-"Deze actie beëindigt de geselecteerde plots, onafgezien of deze actief "
-"of gestopt zijn en verwijdert alle tijdelijke bestanden. Als Plotman nog "
+"Deze actie beëindigt de geselecteerde plots, onafgezien of deze actief of"
+" gestopt zijn en verwijdert alle tijdelijke bestanden. Als Plotman nog "
 "actief is zal onmiddellijk een nieuwe plot starten, zorg er dus voor om "
-"eerst Plotman te stoppen (bovenaan rechts op de pagina). Verder gaan?" 
+"eerst Plotman te stoppen (bovenaan rechts op de pagina). Verder gaan?"
 
 #: templates/plotting/jobs.html:17 templates/plotting/jobs.html:193
 msgid "Kill Selected"
@@ -1298,8 +1309,8 @@ msgid ""
 "online."
 msgstr ""
 "Deze werker is momenteel niet online noch antwoord op pings van de "
-"controller. Gelieve de pagina Werkers te controleren en het systeem "
-"terug online te brengen."
+"controller. Gelieve de pagina Werkers te controleren en het systeem terug"
+" online te brengen."
 
 #: templates/plotting/jobs.html:70 templates/plotting/workers.html:53
 #: templates/plotting/workers.html:70
@@ -1358,8 +1369,8 @@ msgid ""
 "This action will stop Plotman archiving from the configured dst folder, "
 "preventing further completed plot transfers. Continue?"
 msgstr ""
-"Deze actie stopt Plotman archivering vanuit de geconfigureerde dst map "
-"en voorkomt verdere transferts van afgewerkte plots. Verder gaan?"
+"Deze actie stopt Plotman archivering vanuit de geconfigureerde dst map en"
+" voorkomt verdere transferts van afgewerkte plots. Verder gaan?"
 
 #: templates/plotting/workers.html:49
 #, python-format
@@ -1397,8 +1408,8 @@ msgid ""
 "resulting in a small charge (few mojos) against your wallet. Continue "
 "anyway?"
 msgstr ""
-"Deze actie wisselt uw huidige pooling selectie, mogelijks leidend "
-"tot een kleine kost (enkele mojos) in uw portefeuille.  Verder gaan?"
+"Deze actie wisselt uw huidige pooling selectie, mogelijks leidend tot een"
+" kleine kost (enkele mojos) in uw portefeuille.  Verder gaan?"
 
 #: templates/settings/pools.html:85
 #, python-format
@@ -1407,9 +1418,9 @@ msgid ""
 "the same, %(break)sbut it is much less volatile. You can easily switch "
 "pools without having to re-plot."
 msgstr ""
-"Vervoeg een pool en ontvang consistente farming compensaties. Het gemiddelde "
-"rendement is gelijk, %(break)sechter het is minder volatiel. U kunt "
-"gemakkelijk pools wisselen zonder plots te hoeven hermaken."
+"Vervoeg een pool en ontvang consistente farming compensaties. Het "
+"gemiddelde rendement is gelijk, %(break)sechter het is minder volatiel. U"
+" kunt gemakkelijk pools wisselen zonder plots te hoeven hermaken."
 
 #: templates/settings/pools.html:88
 msgid "ERROR: Unable to join a pool because:"
@@ -1448,8 +1459,8 @@ msgid ""
 "No wallets found yet.  Perhaps this is a brand-new installation? If so, "
 "please wait for complete start-up."
 msgstr ""
-"Nog geen portefeuilles gevonden. Misschie is dit een gloednieuwe installatie? "
-"Indien zo, wacht tot het opstarten is beëindigt."
+"Nog geen portefeuilles gevonden. Misschie is dit een gloednieuwe "
+"installatie? Indien zo, wacht tot het opstarten is beëindigt."
 
 #: templates/settings/pools.html:173
 msgid "For more on Pooling, see the Machinaris"
diff --git a/web/translations/pt_PT/LC_MESSAGES/messages.po b/web/translations/pt_PT/LC_MESSAGES/messages.po
index 7825d5a0..0746a917 100644
--- a/web/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/web/translations/pt_PT/LC_MESSAGES/messages.po
@@ -5,11 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
-"Last-Translator: FULL NAME\n"
+"Last-Translator: Antonio Casqueiro\n"
 "Language: pt\n"
 "Language-Team: pt \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index 2d0ca9a2..ac691b20 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
-"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues"
 "Creation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-03-13 10:29-0600\n"
+"POT-Creation-Date: 2022-03-13 17:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"

From f7ad5080dfdba18e10e6e87c3699adb071228ceb Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Mar 2022 20:37:08 -0600
Subject: [PATCH 0666/1625] Include hddtemp

---
 docker/dockerfile.base | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/dockerfile.base b/docker/dockerfile.base
index cfefee07..9e9701ea 100644
--- a/docker/dockerfile.base
+++ b/docker/dockerfile.base
@@ -14,6 +14,7 @@ RUN apt-get update \
 		cifs-utils \
 		curl \
 		git \
+		hddtemp \
 		iproute2 \
 		iputils-ping \
 		jq \

From 05b7480c85607147cc53909a8a98101b56f97322 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 16 Mar 2022 20:21:06 -0600
Subject: [PATCH 0667/1625] Chia 1.3.1 patch

---
 .github/workflows/develop-chia.yaml | 2 +-
 .github/workflows/develop-mmx.yaml  | 2 +-
 .github/workflows/main-chia.yaml    | 2 +-
 .github/workflows/main-mmx.yaml     | 2 +-
 .github/workflows/test-chia.yaml    | 2 +-
 .github/workflows/test-mmx.yaml     | 2 +-
 CHANGELOG.md                        | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 3d8f2fc1..2f202e5f 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -41,7 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=develop"
-            "CHIA_BRANCH=1.3.0"
+            "CHIA_BRANCH=1.3.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 5a2ab845..75cda503 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
-            "CHIA_BRANCH=1.3.0"
+            "CHIA_BRANCH=1.3.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 89cfb011..d502de3c 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -42,7 +42,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=1.3.0"
+            "CHIA_BRANCH=1.3.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index e3109018..94d0f23f 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -43,7 +43,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=latest"
             "MMX_BRANCH=master"
-            "CHIA_BRANCH=1.3.0"
+            "CHIA_BRANCH=1.3.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index ea5fc524..a7ccfe1d 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -41,7 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
-            "CHIA_BRANCH=1.3.0"
+            "CHIA_BRANCH=1.3.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index cf3ae298..ae3afed0 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=test"
             "MMX_BRANCH=master"
-            "CHIA_BRANCH=1.3.0"
+            "CHIA_BRANCH=1.3.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ffcea61..9d74e46e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.7.1] - 2022-04-?
  - Dutch translations (nl_NL) provided by Bernie Deprez.  Thanks!
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.3.1) - v1.3.1 patch release
 
 ## [0.7.0] - 2022-03-11
  - [Chia](https://chia.net) - [v1.3](https://www.reddit.com/r/chia/comments/t95vuk/13_is_live/), please note reports of issues in this new Chia release...  double-check your Wallet and Pools settings after upgrading!

From de09a0ed672e73a9735571cee6bc61f5d4126a11 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 16 Mar 2022 21:00:31 -0600
Subject: [PATCH 0668/1625] Latest Chia hash.

---
 scripts/forks/chia_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 425e53e9..b3ce4201 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -4,8 +4,8 @@
 #
 
 CHIA_BRANCH=$1
-# On 2022-03-08
-HASH=0e7cc5a88393ef02b4057dd4bf894be2e73bc00b
+# On 2022-03-16
+HASH=bf2976a2a9dfdd1b71db48030ef79a4a571feae0
 
 if [ -z ${CHIA_BRANCH} ]; then
 	echo 'Skipping Chia install as not requested.'

From a4fa3f090f99964ce741acbda7fe555b6e263110 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 18 Mar 2022 14:14:14 -0600
Subject: [PATCH 0669/1625] Initial start on drive status monitoring.

---
 api/commands/smartctl.py                 |  39 ++-
 api/default_settings.py                  |   1 +
 api/gunicorn.conf.py                     |   3 +-
 api/migrations/README                    |   2 +-
 api/migrations/versions/e5c6d9a6d9c3_.py | 358 +++++++++++++++++++++++
 api/models/drives.py                     |  55 ++++
 api/schedules/stats_disk.py              |   2 -
 api/schedules/status_drives.py           |  17 +-
 api/schedules/status_wallets.py          |   2 +-
 api/views/__init__.py                    |   2 +
 api/views/drives/__init__.py             |   1 +
 api/views/drives/resources.py            |  52 ++++
 api/views/drives/schemas.py              |  27 ++
 common/models/__init__.py                |   1 +
 common/models/drives.py                  |  28 ++
 scripts/setup_databases.sh               |   4 +-
 web/actions/drives.py                    |  24 ++
 web/default_settings.py                  |   1 +
 web/models/drives.py                     |  35 +++
 web/routes.py                            |   9 +-
 web/templates/base.html                  |   4 +
 web/templates/drives.html                | 128 ++++++++
 22 files changed, 780 insertions(+), 15 deletions(-)
 create mode 100644 api/migrations/versions/e5c6d9a6d9c3_.py
 create mode 100644 api/models/drives.py
 create mode 100644 api/views/drives/__init__.py
 create mode 100644 api/views/drives/resources.py
 create mode 100644 api/views/drives/schemas.py
 create mode 100644 common/models/drives.py
 create mode 100644 web/actions/drives.py
 create mode 100644 web/models/drives.py
 create mode 100644 web/templates/drives.html

diff --git a/api/commands/smartctl.py b/api/commands/smartctl.py
index b1fb7260..1da987ef 100644
--- a/api/commands/smartctl.py
+++ b/api/commands/smartctl.py
@@ -1,7 +1,40 @@
 #
-# Collect stats on drives
+# Collect stats on drives using smartctl
 #
 
+from flask import Flask, jsonify, abort, request, flash
+from subprocess import Popen, TimeoutExpired, PIPE, STDOUT
+
+from api import app
+from api.models import drives
+
 def load_drives_status():
-    # TODO
-     return []
\ No newline at end of file
+    with app.app_context():
+        proc = Popen("smartctl --scan", stdout=PIPE, stderr=PIPE, shell=True)
+        try:
+            outs, errs = proc.communicate(timeout=90)
+        except TimeoutExpired:
+            proc.kill()
+            proc.communicate()
+            abort(500, description="The timeout is expired!")
+        if errs:
+            app.logger.info("Error from smartctl scan because {0}".format(outs.decode('utf-8')))
+        devices = []
+        for line in outs.decode('utf-8').splitlines():
+            device = line.split()[0]
+            info = load_drive_info(device)
+            devices.append(drives.DriveStatus(line, info))
+        return devices
+
+def load_drive_info(device):
+    proc = Popen("smartctl -a {0}".format(device), stdout=PIPE, stderr=PIPE, shell=True)
+    try:
+        outs, errs = proc.communicate(timeout=90)
+    except TimeoutExpired:
+        proc.kill()
+        proc.communicate()
+        app.logger.info("Error from smartctl -a {0} because timeout expired".format(device))
+        return None
+    if errs:
+        app.logger.debug("Error from smartctl all because {0}".format(outs.decode('utf-8')))
+    return outs.decode('utf-8')
diff --git a/api/default_settings.py b/api/default_settings.py
index 1dfb3b6e..a9b4e6d2 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -17,6 +17,7 @@ class DefaultConfig:
         'blockchains':      'sqlite:////root/.chia/machinaris/dbs/blockchains.db',
         'challenges':       'sqlite:////root/.chia/machinaris/dbs/challenges.db',
         'connections':      'sqlite:////root/.chia/machinaris/dbs/connections.db',
+        'drives':           'sqlite:////root/.chia/machinaris/dbs/drives.db',
         'farms':            'sqlite:////root/.chia/machinaris/dbs/farms.db',
         'keys':             'sqlite:////root/.chia/machinaris/dbs/keys.db',
         'partials':         'sqlite:////root/.chia/machinaris/dbs/partials.db',
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 2fefb027..874ca233 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -10,7 +10,7 @@ def on_starting(server):
     from api.schedules import status_worker, status_farm, status_plotting, \
         status_plots, status_challenges, status_wallets, status_blockchains, \
         status_connections, status_keys, status_alerts, status_controller, \
-        status_plotnfts, status_pools, status_partials
+        status_plotnfts, status_pools, status_partials, status_drives
     from api.schedules import stats_disk, stats_farm, nft_recover, plots_check, \
         log_rotate, db_backup, restart_stuck_farmer, geolocate_peers
     from common.config import globals
@@ -36,6 +36,7 @@ def on_starting(server):
     # Collect disk stats from all modes where blockchain is chia, avoiding duplicate disks from multiple forks on same host
     if 'chia' in globals.enabled_blockchains():
         scheduler.add_job(func=stats_disk.collect, name="stats_disk", trigger='cron', minute="*/10") # Every 10 minutes
+        scheduler.add_job(func=status_drives.update, name="status_drives", trigger='cron', minute="*/5") # Every 5 minutes
         
     # MMX needs to report plots from harvesters directly as they are not listed via the fullnode like Chia does
     if not utils.is_fullnode() and globals.harvesting_enabled() and 'mmx' in globals.enabled_blockchains():
diff --git a/api/migrations/README b/api/migrations/README
index ce70ce26..b3dc5ffa 100644
--- a/api/migrations/README
+++ b/api/migrations/README
@@ -8,7 +8,7 @@ cd /code/machinaris/api
 FLASK_APP=__init__.py flask db migrate
 chown -R 1000.users .
 ```
-This creates migration based on current model.
+This creates migration based on current model.  Sometimes need 'flask db stamp head' before migrate.
 
 ## Testing a migration
 
diff --git a/api/migrations/versions/e5c6d9a6d9c3_.py b/api/migrations/versions/e5c6d9a6d9c3_.py
new file mode 100644
index 00000000..8be978f5
--- /dev/null
+++ b/api/migrations/versions/e5c6d9a6d9c3_.py
@@ -0,0 +1,358 @@
+"""empty message
+
+Revision ID: e5c6d9a6d9c3
+Revises: 53d13c2cdac7
+Create Date: 2022-03-17 21:10:46.722438
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e5c6d9a6d9c3'
+down_revision = '53d13c2cdac7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade(engine_name):
+    globals()["upgrade_%s" % engine_name]()
+
+
+def downgrade(engine_name):
+    globals()["downgrade_%s" % engine_name]()
+
+
+
+
+
+def upgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_alerts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_alerts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_blockchains():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_blockchains():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_challenges():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_challenges():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_connections():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_connections():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_drives():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('drives',
+    sa.Column('serial_number', sa.String(), nullable=False),
+    sa.Column('hostname', sa.String(length=255), nullable=False),
+    sa.Column('blockchain', sa.String(length=64), nullable=False),
+    sa.Column('model_family', sa.String(), nullable=True),
+    sa.Column('device_model', sa.String(), nullable=True),
+    sa.Column('device', sa.String(), nullable=True),
+    sa.Column('status', sa.String(), nullable=True),
+    sa.Column('type', sa.String(), nullable=True),
+    sa.Column('comment', sa.String(), nullable=True),
+    sa.Column('temperature', sa.REAL(), nullable=True),
+    sa.Column('power_on_hours', sa.REAL(), nullable=True),
+    sa.Column('size_gibs', sa.REAL(), nullable=True),
+    sa.Column('capacity', sa.String(), nullable=True),
+    sa.Column('smart_info', sa.String(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('serial_number')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade_drives():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('drives')
+    # ### end Alembic commands ###
+
+
+def upgrade_farms():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_farms():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_keys():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_keys():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_partials():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_partials():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plotnfts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plotnfts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plottings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plottings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plots():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plots():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_pools():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_pools():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_wallets():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_wallets():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_workers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_workers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plot_count():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plot_count():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_total_coins():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_total_coins():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_netspace_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_netspace_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_time_to_win():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_time_to_win():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
diff --git a/api/models/drives.py b/api/models/drives.py
new file mode 100644
index 00000000..0d5e0685
--- /dev/null
+++ b/api/models/drives.py
@@ -0,0 +1,55 @@
+import os
+import re
+import traceback
+
+from datetime import datetime
+
+from api import app, utils
+from common.config import globals
+
+class DriveStatus:
+
+    def __init__(self, device_line, info):
+        # First parse the single device line from smartctl --scan
+        # Example "/dev/sda -d sat # /dev/sda [SAT], ATA device"
+        values = device_line.split('#')
+        self.comment = values[1].strip()
+        values = values[0].split('-d')
+        self.device = values[0].strip()
+        self.type = values[1].strip()
+        self.smart_info = info  # From smartctl -a
+        self.set_info_attributes(info.splitlines())
+
+    def set_info_attributes(self, data):
+        self.model_family = ''
+        self.device_model = ''
+        self.serial_number = ''
+        self.size_gibs = 0
+        self.capacity = ''
+        self.status = ''
+        self.power_on_hours = ''
+        self.temperature = ''
+        for line in data:
+            if line.startswith('Model Family'):
+                # Example: "Model Family:     Seagate BarraCuda 3.5"
+                self.model_family = line.split(':')[1].strip()
+            elif line.startswith('Device Model'):
+                # Example: "Device Model:     ST8000DM004-2CX188"
+                self.device_model = line.split(':')[1].strip()
+            elif line.startswith('Serial Number'):
+                # Example: "Serial Number:    ZR106HWB"
+                self.serial_number = line.split(':')[1].strip()
+            elif line.startswith('User Capacity'):
+                # Example: "User Capacity:    8,001,563,222,016 bytes [8.00 TB]""
+                size = line.split(':')[1].strip()
+                self.size_gibs = round(float(int(size.split('bytes')[0].strip().replace(',', '')) / 1024 / 1024 / 1024), 3)
+                self.capacity = size.split('bytes')[1].strip()[1:-1] # Drop square brackets
+            elif line.startswith('SMART overall-health self-assessment test result:'):
+                # Example: "SMART overall-health self-assessment test result: PASSED"
+                self.status = line.split(':')[1].strip()
+            elif 'Power_On_Hours' in line:
+                # Example: "  9 Power_On_Hours          0x0032   092   092   000    Old_age   Always       -       7185 (119 239 0)"
+                self.power_on_hours = line.split()[9].strip()
+            elif 'Temperature_Celsius' in line:
+                # Example: "194 Temperature_Celsius     0x0022   038   049   000    Old_age   Always       -       38 (0 21 0 0 0)"
+                self.temperature = line.split()[9].strip()
diff --git a/api/schedules/stats_disk.py b/api/schedules/stats_disk.py
index 49243d8e..aa895562 100644
--- a/api/schedules/stats_disk.py
+++ b/api/schedules/stats_disk.py
@@ -9,8 +9,6 @@
 import socket
 import traceback
 
-from flask import g
-
 from common.config import globals
 from common.models import stats
 from api import app, utils, db
diff --git a/api/schedules/status_drives.py b/api/schedules/status_drives.py
index 8d3978d9..12dfb5ae 100644
--- a/api/schedules/status_drives.py
+++ b/api/schedules/status_drives.py
@@ -25,13 +25,24 @@ def update():
             hostname = utils.get_hostname()
             payload = []
             for blockchain in globals.enabled_blockchains():
-                for drive in smartctl.load_drive_status():
+                for drive in smartctl.load_drives_status():
                     payload.append({
+                        "serial_number": drive.serial_number,
                         "hostname": hostname,
                         "blockchain": blockchain,
-                        "details": drive,
+                        "model_family": drive.model_family,
+                        "device_model": drive.device_model,
+                        "device": drive.device,
+                        "type": drive.type,
+                        "comment": drive.comment,
+                        "status": drive.status,
+                        "temperature": drive.temperature,
+                        "power_on_hours": drive.power_on_hours,
+                        "size_gibs": drive.size_gibs,
+                        "capacity": drive.capacity,
+                        "smart_info": drive.smart_info,
                     })
-            utils.send_post('/drives/', payload, debug=True)
+            utils.send_post('/drives/', payload, debug=False)
         except:
             app.logger.info("Failed to load and send drive status.")
             app.logger.info(traceback.format_exc())
diff --git a/api/schedules/status_wallets.py b/api/schedules/status_wallets.py
index 8dfea354..a6675fcb 100644
--- a/api/schedules/status_wallets.py
+++ b/api/schedules/status_wallets.py
@@ -34,7 +34,7 @@ def update():
                     "details": public_wallet.text.replace('\r', ''),
                 }
                 #app.logger.info(payload)
-                utils.send_post('/wallets/', payload, debug=True)
+                utils.send_post('/wallets/', payload, debug=False)
         except:
             app.logger.info("Failed to load and send public wallet status.")
             app.logger.info(traceback.format_exc())
diff --git a/api/views/__init__.py b/api/views/__init__.py
index 401b2e00..93e1b2fb 100644
--- a/api/views/__init__.py
+++ b/api/views/__init__.py
@@ -6,6 +6,7 @@
 from . import challenges
 from . import configs
 from . import connections
+from . import drives
 from . import farms
 from . import keys
 from . import logs
@@ -32,6 +33,7 @@
     certificates,
     configs,
     connections,
+    drives,
     farms,
     keys,
     logs,
diff --git a/api/views/drives/__init__.py b/api/views/drives/__init__.py
new file mode 100644
index 00000000..172d2b79
--- /dev/null
+++ b/api/views/drives/__init__.py
@@ -0,0 +1 @@
+from .resources import blp  # noqa
\ No newline at end of file
diff --git a/api/views/drives/resources.py b/api/views/drives/resources.py
new file mode 100644
index 00000000..eff63932
--- /dev/null
+++ b/api/views/drives/resources.py
@@ -0,0 +1,52 @@
+import datetime as dt
+
+from flask.views import MethodView
+
+from api import app
+from api.extensions.api import Blueprint, SQLCursorPage
+from common.extensions.database import db
+from common.models import Drive
+
+from .schemas import DriveSchema, DriveQueryArgsSchema, BatchOfDriveSchema, BatchOfDriveQueryArgsSchema
+
+
+blp = Blueprint(
+    'Drive',
+    __name__,
+    url_prefix='/drives',
+    description="Details on all drives recorded on the worker."
+)
+
+
+@blp.route('/')
+class Drives(MethodView):
+
+    @blp.etag
+    @blp.arguments(BatchOfDriveQueryArgsSchema, location='query')
+    @blp.response(200, DriveSchema(many=True))
+    @blp.paginate(SQLCursorPage)
+    def get(self, args):
+        ret = db.session.query(Drive).filter_by(**args)
+        return ret
+
+    @blp.etag
+    @blp.arguments(BatchOfDriveSchema)
+    @blp.response(201, DriveSchema(many=True))
+    def post(self, new_items):
+        if len(new_items) == 0:
+            return "No drives provided.", 400
+        items = []
+        for new_item in new_items:
+            item = db.session.query(Drive).get(new_item['serial_number'])
+            if item: # upsert
+                #app.logger.info("Upserting: {0}".format(new_item['serial_number']))
+                new_item['created_at'] = item.created_at
+                new_item['updated_at'] = dt.datetime.now()
+                DriveSchema().update(item, new_item)
+            else: # insert
+                #app.logger.info("Inserting: {0}".format(new_item['serial_number']))
+                new_item['created_at'] = new_item['updated_at'] = dt.datetime.now()
+                item = Drive(**new_item)
+            db.session.add(item)
+        db.session.commit()
+        return items
diff --git a/api/views/drives/schemas.py b/api/views/drives/schemas.py
new file mode 100644
index 00000000..0d251f4a
--- /dev/null
+++ b/api/views/drives/schemas.py
@@ -0,0 +1,27 @@
+import marshmallow as ma
+from marshmallow_sqlalchemy import field_for
+from marshmallow_toplevel import TopLevelSchema
+
+from api.extensions.api import Schema, AutoSchema
+from common.models.drives import Drive
+
+class DriveSchema(AutoSchema):
+    serial_number = field_for(Drive, "serial_number")
+
+    class Meta(AutoSchema.Meta):
+        table = Drive.__table__
+
+
+class DriveQueryArgsSchema(Schema):
+    serial_number = ma.fields.Str()
+    hostname = ma.fields.Str()
+
+class BatchOfDriveSchema(TopLevelSchema):
+    _toplevel = ma.fields.Nested(
+        DriveSchema,
+        required=True,
+        many=True
+    )
+
+class BatchOfDriveQueryArgsSchema(Schema):
+    hostname = ma.fields.Str()
diff --git a/common/models/__init__.py b/common/models/__init__.py
index d74b6032..fc5b68ac 100644
--- a/common/models/__init__.py
+++ b/common/models/__init__.py
@@ -2,6 +2,7 @@
 from .blockchains import Blockchain
 from .challenges import Challenge
 from .connections import Connection
+from .drives import Drive
 from .farms import Farm 
 from .keys import Key
 from .partials import Partial
diff --git a/common/models/drives.py b/common/models/drives.py
new file mode 100644
index 00000000..16b9c09f
--- /dev/null
+++ b/common/models/drives.py
@@ -0,0 +1,28 @@
+import datetime as dt
+import sqlalchemy as sa
+
+from sqlalchemy.sql import func
+
+from common.extensions.database import db
+
+class Drive(db.Model):
+    __bind_key__ = 'drives'
+    __tablename__ = "drives"
+
+    serial_number = sa.Column(sa.String(), primary_key=True)
+    hostname = sa.Column(sa.String(length=255), nullable=False)
+    blockchain = sa.Column(sa.String(length=64), nullable=False)
+    model_family = sa.Column(sa.String(), nullable=True)
+    device_model = sa.Column(sa.String(), nullable=True)
+    device = sa.Column(sa.String(), nullable=True)
+    status = sa.Column(sa.String(), nullable=True)
+    type = sa.Column(sa.String(), nullable=True)
+    comment = sa.Column(sa.String(), nullable=True)
+    temperature = sa.Column(sa.REAL, nullable=True)
+    power_on_hours = sa.Column(sa.REAL, nullable=True)
+    size_gibs = sa.Column(sa.REAL, nullable=True)
+    capacity = sa.Column(sa.String(), nullable=True)
+    smart_info = sa.Column(sa.String(), nullable=True)
+    created_at = sa.Column(sa.DateTime(), server_default=func.now())
+    updated_at = sa.Column(sa.DateTime(), onupdate=func.now())
+    
\ No newline at end of file
diff --git a/scripts/setup_databases.sh b/scripts/setup_databases.sh
index ec46767e..cf0d22b7 100644
--- a/scripts/setup_databases.sh
+++ b/scripts/setup_databases.sh
@@ -7,10 +7,8 @@ mkdir -p /root/.chia/machinaris/logs
 mkdir -p /root/.chia/machinaris/dbs
 mkdir -p /root/.chia/machinaris/cache
 
-# Optional reset parameter will remove broken DBs, allowing fresh setup of status
 if [[ $1 == "reset" ]]; then
-    mv /root/.chia/machinaris/dbs/machinaris.db /root/.chia/machinaris/dbs/machinaris.db.bak
-    mv /root/.chia/machinaris/dbs/stats.db /root/.chia/machinaris/dbs/stats.db.bak
+    rm -f /root/.chia/machinaris/dbs/*.db
 fi
 
 # Perform database migration, if any
diff --git a/web/actions/drives.py b/web/actions/drives.py
new file mode 100644
index 00000000..a8f1e215
--- /dev/null
+++ b/web/actions/drives.py
@@ -0,0 +1,24 @@
+#
+# Details for drives attached to workers
+#
+
+import datetime
+import os
+import psutil
+import re
+import signal
+import shutil
+import socket
+import time
+import traceback
+import yaml
+
+from flask import Flask, jsonify, abort, request, flash
+
+from common.models import drives as d
+from web import app, db, utils
+from web.models import drives
+
+def load_drive_summary():
+    drvs = db.session.query(d.Drive).order_by(d.Drive.hostname).all()
+    return drives.Drives(drvs)
\ No newline at end of file
diff --git a/web/default_settings.py b/web/default_settings.py
index 22649c0a..4b0d3ce2 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -9,6 +9,7 @@ class DefaultConfig:
         'blockchains':      'sqlite:////root/.chia/machinaris/dbs/blockchains.db',
         'challenges':       'sqlite:////root/.chia/machinaris/dbs/challenges.db',
         'connections':      'sqlite:////root/.chia/machinaris/dbs/connections.db',
+        'drives':           'sqlite:////root/.chia/machinaris/dbs/drives.db',
         'farms':            'sqlite:////root/.chia/machinaris/dbs/farms.db',
         'keys':             'sqlite:////root/.chia/machinaris/dbs/keys.db',
         'partials':         'sqlite:////root/.chia/machinaris/dbs/partials.db',
diff --git a/web/models/drives.py b/web/models/drives.py
new file mode 100644
index 00000000..bd0f9c14
--- /dev/null
+++ b/web/models/drives.py
@@ -0,0 +1,35 @@
+import traceback
+
+from web import app
+from web.actions import worker
+
+class Drives:
+
+    def __init__(self, drives):
+        self.rows = []
+        for drive in drives:
+            try:
+                w = worker.get_worker(drive.hostname)
+                displayname = w.displayname
+            except:
+                app.logger.debug("Failed to find worker for hostname: {0}".format(drive.hostname))
+                displayname = drive.hostname
+            self.rows.append({
+                'serial_number': drive.serial_number,
+                'hostname': drive.hostname,
+                'worker': displayname,
+                'blockchain': drive.blockchain,
+                'model_family': drive.model_family,
+                'device_model': drive.device_model,
+                'device': drive.device,
+                'status': drive.status,
+                'type': drive.type,
+                'comment': drive.comment,
+                'temperature': drive.temperature,
+                'power_on_hours': drive.power_on_hours,
+                'size_gibs': drive.size_gibs,
+                'capacity': drive.capacity,
+                'smart_info': drive.smart_info,
+                'created_at': drive.created_at,
+                'updated_at': drive.updated_at
+            })
\ No newline at end of file
diff --git a/web/routes.py b/web/routes.py
index c2acd417..84d77c4a 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -17,7 +17,7 @@
 from common.models import pools as po
 from web import app, utils
 from web.actions import chia, pools as p, plotman, chiadog, worker, \
-        log_handler, stats, warnings, forktools, mapping
+        log_handler, stats, warnings, forktools, mapping, drives as d
 
 def get_lang(request):
     try:
@@ -270,6 +270,13 @@ def worker_route():
         plotting_disk_usage=plotting_disk_usage, warnings=warnings, global_config=gc,
         lang=get_lang(request))
 
+@app.route('/drives')
+def drives():
+    gc = globals.load()
+    drvs = d.load_drive_summary()
+    return render_template('drives.html', reload_seconds=120, 
+        drives=drvs, global_config=gc, lang=get_lang(request))
+
 @app.route('/blockchains')
 def blockchains():
     gc = globals.load()
diff --git a/web/templates/base.html b/web/templates/base.html
index 4b711ec4..007ef21d 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -85,6 +85,10 @@
                             
                                  {{_('Workers')}}
                         
+                        
  • 
+                            
+                                 {{_('Drives')}}
+                        
    • 
                         {% endif %}
                         
  • 
                             
+  
    
+      
+          
+      
+  
    
+
+
+
    
+  {{_('Drives')}}
+
    
+
+
    
+  {% with messages = get_flashed_messages(with_categories=true) %}
+  {% if messages %}
+  {% for category, message in messages %}
+  {% if category == 'message' %}
+  
+
+  {% if drives.rows|length > 0 %}
+  
+    
    
+      
    • 
         
           
    HostnameIP Address
             {{worker.hostname}}
           
    
           
    Port{{worker.port}}Hostname{{worker.displayname}}
           
    
           
    Display Name{{worker.displayname}}Blockchain{{worker.blockchain}}
    Port{{worker.port}}
           
    
           
    
             System Type
    
             
-              {{worker.displayname}}
             {{worker.blockchain}}
             {{worker.mode}}{{worker.versions.machinaris}}
             
-              
+              
               {% if worker.mode == "fullnode" and worker.blockchain == "chia" %}
-              
+              
               {% endif %}
             
           
    
         
         
    
                 Blockchain
                 StatusWallet
                 Height
                 PlotsETWHarvestersWorkers
                 Max Resp.PartialsETWWalletUSD*
                 
                 
                 {{summary.wallet}}
                 {{summary.height}}
                 {{summary.plots}}{{summary.etw}}
                 {{summary.harvesters}}
                 {{summary.max_resp}}{{summary.partials_per_hour}}{{summary.etw}}{{summary.wallet}}{{summary.usd}}
                 
             
    
                 
    Wallet Balance
                 Cold Wallet Balance
                 Total BalanceUSD*
                 Updated At
                 
             
    
                 
    {{wallet.hot_balance}}
                 {{wallet.cold_balance}}
                 {{wallet.total_balance}}{{wallet.usd_balance}}
                 {{wallet.updated_at | datetimefilter}}
                 
Date: Fri, 21 Jan 2022 11:24:09 -0700
Subject: [PATCH 0542/1625] Include EDV on the Summary page.

---
 api/commands/farmr_cli.py      |   3 +-
 api/commands/fd_cli.py         |  29 +---
 api/gunicorn.conf.py           |   4 +-
 common/config/blockchains.json | 256 +++++++++++++++++++++++++++++++++
 common/config/globals.py       | 160 ++++++---------------
 web/actions/stats.py           |  36 ++++-
 web/models/chia.py             |  13 +-
 web/templates/summary.html     |  10 +-
 8 files changed, 345 insertions(+), 166 deletions(-)
 create mode 100644 common/config/blockchains.json

diff --git a/api/commands/farmr_cli.py b/api/commands/farmr_cli.py
index 0a03cb53..776fdaff 100644
--- a/api/commands/farmr_cli.py
+++ b/api/commands/farmr_cli.py
@@ -21,7 +21,8 @@ def load_device_id():
             return None
         try:
             id = id_json['ids'][0]
-            return "{0}-{1}".format(id, globals.get_blockchain_symbol().lower())
+            blockchain = os.environ['blockchains']
+            return "{0}-{1}".format(id, globals.get_blockchain_symbol(blockchain).lower())
         except Exception as ex:
             app.logger.error("Farmr id.json missing ids: {0}".format(str(ex)))
             app.logger.info(id_json)
diff --git a/api/commands/fd_cli.py b/api/commands/fd_cli.py
index c5b92cec..5477f29c 100644
--- a/api/commands/fd_cli.py
+++ b/api/commands/fd_cli.py
@@ -13,37 +13,10 @@
 from common.config import globals
 from api import app
 
-# No need to reward recover for either Chia or Chives
-def get_full_node_rpc_port(blockchain):
-    if blockchain == 'btcgreen':
-        return 18942
-    if blockchain == 'cactus':
-        return 11555
-    if blockchain == 'cryptodoge':
-        return 16795
-    if blockchain == 'flax':
-        return 6755
-    if blockchain == 'flora':
-        return 18755
-    if blockchain == 'hddcoin':
-        return 28555
-    if blockchain == 'maize':
-        return 8755
-    if blockchain == 'nchain':
-        return 38555
-    if blockchain == 'shibgreen':
-        return 18793
-    if blockchain == 'staicoin':
-        return 1758
-    if blockchain == 'stor':
-        return 8155
-    app.logger.info(f"Unknown rpc_port for blockchain: {blockchain}")
-    return None
-
 def reward_recovery(wallet_id, launcher_id, pool_contract_address):
     app.logger.info("NFT reward recovery requested for {wallet_id} {launcher_id} {pool_contract_address}")
     blockchain = globals.enabled_blockchains()[0]
-    rpc_port = get_full_node_rpc_port(blockchain)
+    rpc_port = globals.get_full_node_rpc_port(blockchain)
     if not rpc_port:
         app.logger.info("Skipping NFT reward recovery on unsupported blockchain: {0}".format(blockchain))
         return
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 2fcaf7ef..183a2355 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -57,8 +57,8 @@ def on_starting(server):
         scheduler.add_job(func=status_plots.update, name="plots", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=status_plotnfts.update, name="plotnfts", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=status_pools.update, name="pools", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
-        scheduler.add_job(func=db_backup.execute, name="db_backup", trigger='cron', hour=0, jitter=(JOB_JITTER*3600))  # Daily
-        scheduler.add_job(func=restart_stuck_farmer.execute, name="restart_stuck_farmer", trigger='interval', minutes=5, jitter=0) 
+        #scheduler.add_job(func=db_backup.execute, name="db_backup", trigger='cron', hour=0, jitter=(JOB_JITTER*3600))  # Daily
+        scheduler.add_job(func=restart_stuck_farmer.execute, name="restart_farmer_if_stuck", trigger='interval', minutes=5, jitter=0) 
         scheduler.add_job(func=status_partials.update, name="partials", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
 
     # Status for single Machinaris controller only, should be blockchain=chia
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
new file mode 100644
index 00000000..4d205dc9
--- /dev/null
+++ b/common/config/blockchains.json
@@ -0,0 +1,256 @@
+{
+    "btcgreen": {
+        "name": "BTCgreen",
+        "symbol": "XBTC",
+        "binary":  "/btcgreen-blockchain/venv/bin/btcgreen",
+        "network_path": "/root/.btcgreen/mainnet",
+        "network_name": "mainnet",
+        "network_port": 9282,
+        "farmer_port": 18655,
+        "fullnode_rpc_port": 18942,
+        "worker_port": 8938,
+        "reward": 1.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/BTCgreen-Network/btcgreen-blockchain",
+        "discord_url": "https://discord.gg/PKr7BcaWvx",
+        "website_url": "https://www.btcgreen.us/"
+    },
+    "cactus": {
+        "name": "Cactus",
+        "symbol": "CAC" ,
+        "binary":  "/cactus-blockchain/venv/bin/cactus",
+        "network_path": "/root/.cactus/mainnet",
+        "network_name": "mainnet",
+        "network_port": 11444,
+        "farmer_port": 11447,
+        "fullnode_rpc_port": 11555,
+        "worker_port": 8936,
+        "reward": 2.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/Cactus-Network/cactus-blockchain",
+        "discord_url": "https://discord.gg/VAu4VfVkwg",
+        "website_url": "https://www.cactus-network.net/"
+    },
+    "chia": {
+        "name": "Chia",
+        "symbol": "XCH" ,
+        "binary":  "/chia-blockchain/venv/bin/chia",
+        "network_path": "/root/.chia/mainnet",
+        "network_name": "mainnet",
+        "network_port": 8444,
+        "farmer_port": 8447,
+        "fullnode_rpc_port": 8555,
+        "worker_port": 8927,
+        "reward": 2.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/Chia-Network/chia-blockchain",
+        "discord_url": "https://discord.gg/mX4AtMTt87",
+        "website_url": "https://www.chia.net/"
+    },
+    "chives": {
+        "name": "Chives",
+        "symbol": "XCC" ,
+        "binary":  "/chives-blockchain/venv/bin/chives",
+        "network_path": "/root/.chives/mainnet",
+        "network_name": "mainnet",
+        "network_port": 9699,
+        "farmer_port": 9647,
+        "fullnode_rpc_port": 9755,
+        "worker_port": 8931,
+        "reward": 180.0,
+        "mojos_per_coin": 100000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/HiveProject2021/chives-blockchain",
+        "discord_url": "https://discord.gg/9aAbYNqjtA",
+        "website_url": "https://www.chivescoin.org/"
+    },
+    "cryptodoge": {
+        "name": "Cryptodoge",
+        "symbol": "XCD" ,
+        "binary":  "/cryptodoge-blockchain/venv/bin/cryptodoge",
+        "network_path": "/root/.cryptodoge/mainnet",
+        "network_name": "mainnet",
+        "network_port": 15994,
+        "farmer_port": 16895,
+        "fullnode_rpc_port": 16795,
+        "worker_port": 8937,
+        "reward": 20000.0,
+        "mojos_per_coin": 1000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/CryptoDoge-Network/cryptodoge",
+        "discord_url": "https://discord.gg/fRBK4chVds",
+        "website_url": "http://cryptodoge.cc/"
+    },
+    "flax": {
+        "name": "Flax",
+        "symbol": "XFX" ,
+        "binary":  "/flax-blockchain/venv/bin/flax",
+        "network_path": "/root/.flax/mainnet",
+        "network_name": "mainnet",
+        "network_port": 6888,
+        "farmer_port": 6885,
+        "fullnode_rpc_port": 6755,
+        "worker_port": 8928,
+        "reward": 2.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/Flax-Network/flax-blockchain",
+        "discord_url": "https://discord.gg/y3KqSdw8v2",
+        "website_url": "https://flaxnetwork.org/"
+    },
+    "flora": {
+        "name": "Flora",
+        "symbol": "XFL" ,
+        "binary":  "/flora-blockchain/venv/bin/flora",
+        "network_path": "/root/.flora/mainnet",
+        "network_name": "mainnet",
+        "network_port": 18644,
+        "farmer_port": 18647,
+        "fullnode_rpc_port": 18755,
+        "worker_port": 8932,
+        "reward": 4.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/Flora-Network/flora-blockchain",
+        "discord_url": "https://discord.gg/GvwQhW4Yk3",
+        "website_url": "http://floracoin.farm/"
+    },
+    "hddcoin": {
+        "name": "HDDcoin",
+        "symbol": "HDD" ,
+        "binary":  "/hddcoin-blockchain/venv/bin/hddcoin",
+        "network_path": "/root/.hddcoin/mainnet",
+        "network_name": "mainnet",
+        "network_port": 28444,
+        "farmer_port": 28447,
+        "fullnode_rpc_port": 28555,
+        "worker_port": 8930,
+        "reward": 2.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/HDDcoin-Network/hddcoin-blockchain",
+        "discord_url": "https://discord.gg/ZTtQ9922zp",
+        "website_url": "https://hddcoin.org/"
+    },
+    "maize": {
+        "name": "Maize",
+        "symbol": "XMZ" ,
+        "binary":  "/maize-blockchain/venv/bin/maize",
+        "network_path": "/root/.maize/mainnet",
+        "network_name": "mainnet",
+        "network_port": 8644,
+        "farmer_port": 8647,
+        "fullnode_rpc_port": 8755,
+        "worker_port": 8933,
+        "reward": 2.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/Maize-Network/maize-blockchain",
+        "discord_url": "https://discord.gg/9GWRKHjTec",
+        "website_url": "https://maize.farm/"
+    },
+    "mmx": {
+        "name": "MMX",
+        "symbol": "MMX" ,
+        "binary":  "/mmx-node/build/mmx",
+        "network_path": "/root/.chia/mmx",
+        "network_name": "testnet4",
+        "network_port": 12334,
+        "farmer_port": 11330,
+        "worker_port": 8940,
+        "reward": 0.19,
+        "mojos_per_coin": 1000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/madMAx43v3r/mmx-node",
+        "discord_url": "https://discord.gg/pQwkebKnPB",
+        "website_url": "https://github.com/madMAx43v3r/mmx-node"
+    },
+    "nchain": {
+        "name": "N-Chain",
+        "symbol": "NCH" ,
+        "binary":  "/ext9-blockchain/venv/bin/chia",
+        "network_path": "/root/.chia/ext9",
+        "network_name": "ext9",
+        "network_port": 58445,
+        "farmer_port": 38447,
+        "fullnode_rpc_port": 38555,
+        "worker_port": 8929,
+        "reward": 2.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://gitee.com/ext9/ext9-blockchain",
+        "discord_url": "https://discord.gg/AdwYxxVnas",
+        "website_url": "http://n-chain.org/"
+    },
+    "shibgreen": {
+        "name": "SHIBgreen",
+        "symbol": "XSHIB" ,
+        "binary":  "/shibgreen-blockchain/venv/bin/shibgreen",
+        "network_path": "/root/.shibgreen/mainnet",
+        "network_name": "mainnet",
+        "network_port": 7442,
+        "farmer_port": 18974,
+        "fullnode_rpc_port": 18793,
+        "worker_port": 8939,
+        "reward": 20000.0,
+        "mojos_per_coin": 1000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/SHIBgreen-Network/shibgreen-blockchain",
+        "discord_url": "https://discord.gg/yZSKtPf8",
+        "website_url": "https://shibgreen.com/"
+    },
+    "silicoin": {
+        "name": "Silicoin",
+        "symbol": "SIT" ,
+        "binary":  "/silicoin-blockchain/venv/bin/sit",
+        "network_path": "/root/.sit/mainnet",
+        "network_name": "mainnet",
+        "network_port": 22222,
+        "farmer_port": "TBD",
+        "fullnode_rpc_port": "TBD",
+        "worker_port": 8941,
+        "reward": 1.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/silicoin-network/silicoin-blockchain",
+        "discord_url": "https://discord.gg/p7GYjnUJdz",
+        "website_url": "https://www.silicoin.cc/"
+    },
+    "staicoin": {
+        "name": "Stai",
+        "symbol": "STAI" ,
+        "binary":  "/staicoin-blockchain/venv/bin/stai",
+        "network_path": "/root/.stai/mainnet",
+        "network_name": "mainnet",
+        "network_port": 1999,
+        "farmer_port": 1692,
+        "fullnode_rpc_port": 1758,
+        "worker_port": 8934,
+        "reward": 5.0,
+        "mojos_per_coin": 1000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/STATION-I/staicoin-blockchain",
+        "discord_url": "https://discord.gg/7MhBBGaB3d",
+        "website_url": "https://www.station-i.de/stai"
+    },
+    "stor": {
+        "name": "Stor",
+        "symbol": "STOR",
+        "binary":  "/stor-blockchain/venv/bin/stor" ,
+        "network_path": "/root/.stor/mainnet",
+        "network_name": "mainnet",
+        "network_port": 8668,
+        "farmer_port": 8337,
+        "fullnode_rpc_port": 8155,
+        "worker_port": 8935,
+        "reward": 4.0,
+        "mojos_per_coin": 1000000000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/Stor-Network/stor-blockchain",
+        "discord_url": "https://discord.gg/eXMCYDA3Xe",
+        "website_url": "https://stor.network/"
+    }
+}
\ No newline at end of file
diff --git a/common/config/globals.py b/common/config/globals.py
index d6fda8ee..24681e98 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -3,6 +3,7 @@
 #
 
 import datetime
+import json
 import logging
 import os
 import pathlib
@@ -22,42 +23,6 @@
 from common.utils import converters
 from common.models import plottings as pl
 
-SUPPORTED_BLOCKCHAINS = [
-    'btcgreen',
-    'cactus',
-    'chia',
-    'chives',
-    'cryptodoge',
-    'flax',
-    'flora',
-    'hddcoin',
-    'maize',
-    'mmx',
-    'nchain',
-    'shibgreen',
-    'silicoin',
-    'staicoin',
-    'stor'
-]
-
-CURRENCY_SYMBOLS = {
-    "btcgreen": "XBTC",
-    "cactus": "CAC",
-    "chia": "XCH",
-    "chives": "XCC",
-    "cryptodoge": "XCD",
-    "flax": "XFX",
-    "flora": "XFL",
-    "hddcoin": "HDD",
-    "maize": "XMZ",
-    "mmx": "MMX",
-    "nchain": "NCH",
-    "shibgreen": 'XSHIB',
-    "silicoin": "SIT",
-    "staicoin": "STAI",
-    "stor": "STOR",
-}
-
 PLOTMAN_CONFIG = '/root/.chia/plotman/plotman.yaml'
 PLOTMAN_SAMPLE = '/machinaris/config/plotman.sample.yaml'
 
@@ -66,97 +31,38 @@
 BLADEBIT_BINARY = '/usr/bin/bladebit'
 CHIADOG_PATH = '/chiadog'
 
-BTCGREEN_BINARY = '/btcgreen-blockchain/venv/bin/btcgreen'
-CACTUS_BINARY = '/cactus-blockchain/venv/bin/cactus'
-CHIA_BINARY = '/chia-blockchain/venv/bin/chia'
-CHIVES_BINARY = '/chives-blockchain/venv/bin/chives'
-CRYPTODOGE_BINARY = '/cryptodoge-blockchain/venv/bin/cryptodoge'
-FLAX_BINARY = '/flax-blockchain/venv/bin/flax'
-FLORA_BINARY = '/flora-blockchain/venv/bin/flora'
-HDDCOIN_BINARY = '/hddcoin-blockchain/venv/bin/hddcoin'
-MAIZE_BINARY = '/maize-blockchain/venv/bin/maize'
-MMX_BINARY = '/mmx-node/build/mmx'
-NCHAIN_BINARY = '/ext9-blockchain/venv/bin/chia'
-SHIBGREEN_BINARY = '/shibgreen-blockchain/venv/bin/shibgreen'
-SILICOIN_BINARY = '/silicoin-blockchain/venv/bin/sit'
-STAICOIN_BINARY = '/staicoin-blockchain/venv/bin/stai'
-STOR_BINARY = '/stor-blockchain/venv/bin/stor'
-
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
 
+# TODO Remove /code from path
+INFO_FILE = '/code/machinaris/common/config/blockchains.json'
+
+def get_supported_blockchains():
+    try:
+        data = json.load(open(INFO_FILE))
+        return sorted(data.keys())
+    except:
+        raise Exception("No blockchain info found at {0}.".format(INFO_FILE))
+
 def get_blockchain_binary(blockchain):
-    if blockchain == "btcgreen":
-        return BTCGREEN_BINARY
-    if blockchain == "cactus":
-        return CACTUS_BINARY
-    if blockchain == "chia":
-        return CHIA_BINARY
-    if blockchain == "chives":
-        return CHIVES_BINARY
-    if blockchain == "cryptodoge":
-        return CRYPTODOGE_BINARY
-    if blockchain == "flax":
-        return FLAX_BINARY
-    if blockchain == "flora":
-        return FLORA_BINARY
-    if blockchain == "hddcoin":
-        return HDDCOIN_BINARY
-    if blockchain == "maize":
-        return MAIZE_BINARY
-    if blockchain == "mmx":
-        return MMX_BINARY
-    if blockchain == "nchain":
-        return NCHAIN_BINARY
-    if blockchain == "shibgreen":
-        return SHIBGREEN_BINARY
-    if blockchain == "silicoin":
-        return SILICOIN_BINARY
-    if blockchain == "staicoin":
-        return STAICOIN_BINARY
-    if blockchain == "stor":
-        return STOR_BINARY
-    raise Exception("Invalid blockchain: ".format(blockchain))
+    return load_blockchain_info(blockchain, 'binary')
 
 def get_blockchain_network_path(blockchain):
-    if blockchain == 'btcgreen':
-        return "/root/.btcgreen/mainnet"
-    if blockchain == 'cactus':
-        return "/root/.cactus/mainnet"
-    if blockchain == 'chia':
-        return "/root/.chia/mainnet"
-    if blockchain == 'chives':
-        return "/root/.chives/mainnet"
-    if blockchain == 'cryptodoge':
-        return "/root/.cryptodoge/mainnet"
-    if blockchain == 'flax':
-        return "/root/.flax/mainnet"
-    if blockchain == 'flora':
-        return "/root/.flora/mainnet"
-    if blockchain == 'hddcoin':
-        return "/root/.hddcoin/mainnet"
-    if blockchain == 'maize':
-        return "/root/.maize/mainnet"
-    if blockchain == 'mmx':
-        return "/root/.chia/mmx"
-    if blockchain == 'nchain':
-        return "/root/.chia/ext9"
-    if blockchain == 'shibgreen':
-        return "/root/.shibgreen/mainnet"
-    if blockchain == 'silicoin':
-        return "/root/.sit/mainnet"
-    if blockchain == 'staicoin':
-        return "/root/.stai/mainnet"
-    if blockchain == 'stor':
-        return "/root/.stor/mainnet"
-    raise Exception("No mainnet folder for unknown blockchain: {0}".format(blockchain))
+    return load_blockchain_info(blockchain, 'network_path')
 
 def get_blockchain_network_name(blockchain):
-    if blockchain == 'nchain':
-        return "ext9"
-    return "mainnet"
+    return load_blockchain_info(blockchain, 'network_name')
+
+def get_blockchain_symbol(blockchain):
+    return load_blockchain_info(blockchain, 'symbol')
 
-def get_blockchain_symbol():
-    return CURRENCY_SYMBOLS[enabled_blockchains()[0]]
+def get_full_node_rpc_port(blockchain):
+    return load_blockchain_info(blockchain, 'fullnode_rpc_port')
+
+def get_blocks_per_day(blockchain):
+    return load_blockchain_info(blockchain, 'blocks_per_day')
+
+def get_block_reward(blockchain):
+    return load_blockchain_info(blockchain, 'reward')
 
 def load():
     cfg = {}
@@ -178,6 +84,19 @@ def load():
         os.environ['controller_host'] if 'controller_host' in os.environ else 'localhost')
     return cfg
 
+def load_blockchain_info(blockchain, key):
+    try:
+        data = json.load(open(INFO_FILE))
+        if blockchain in data:
+            if key in data[blockchain]:
+                return data[blockchain][key]
+            else:
+                raise Exception("Blockchain info key not found for {0}/{1}".format(blockchain, key))
+        else:
+            raise Exception("Blockchain info not found for {0}/{1}".format(blockchain, key))
+    except:
+        raise Exception("No blockchain info found at {0} for {1}/{2}".format(INFO_FILE, blockchain, key))
+
 def get_stats_db():
     db = getattr(g, '_stats_database', None)
     if db is None:
@@ -254,10 +173,11 @@ def plotting_enabled():
         and enabled_blockchains()[0] in pl.PLOTTABLE_BLOCKCHAINS
 
 def enabled_blockchains():
+    supported_blockchains = get_supported_blockchains()
     blockchains = []
     if "blockchains" in os.environ:
         for blockchain in os.environ['blockchains'].split():
-            if blockchain.lower() in SUPPORTED_BLOCKCHAINS:
+            if blockchain.lower() in supported_blockchains:
                 blockchains.append(blockchain.lower())
     return blockchains
 
diff --git a/web/actions/stats.py b/web/actions/stats.py
index 6b61c916..c1e7bbe8 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -9,9 +9,11 @@
 from flask import g
 from sqlalchemy import or_
 
+from common.config import globals
 from common.utils import converters
 from common.models.alerts import Alert
 from common.models.challenges import Challenge
+from common.models.farms import Farm
 from common.models.pools import POOLABLE_BLOCKCHAINS
 from common.models.plots import Plot
 from common.models.partials import Partial
@@ -277,6 +279,32 @@ def load_plotting_stats():
     #app.logger.info(summary_by_size.keys())
     return summary_by_size
 
+def calc_estimated_daily_value(blockchain):
+    edv = None
+    edv_usd = None
+    result = []
+    try:
+        farm = db.session.query(Farm).filter(Farm.blockchain == blockchain).first()
+        blocks_per_day = globals.get_blocks_per_day(blockchain)
+        block_reward = globals.get_block_reward(blockchain)
+        symbol = globals.get_blockchain_symbol(blockchain).lower()
+        edv = blocks_per_day * block_reward * farm.plots_size / farm.netspace_size
+    except Exception as ex:
+        app.logger.info("Failed to calculate EDV for {0} because {1}".format(blockchain, str(ex)))
+    if edv:
+        result.append("{:,.3f} {}".format(edv, symbol))
+    else:
+        result.append('')
+    try:
+        edv_usd = converters.to_usd(blockchain, edv)
+    except Exception as ex:
+        app.logger.info("Failed to calculate EDV_USD for {0} because {1}".format(blockchain, str(ex)))
+    if edv:
+        result.append(edv_usd)
+    else:
+        result.append('')
+    return result
+
 def load_summary_stats(blockchains):
     all_farmers = worker.load_worker_summary().farmers_harvesters()
     stats = {}
@@ -293,7 +321,7 @@ def load_summary_stats(blockchains):
                         app.logger.info(wk['farming_status'])
                         if wk['farming_status'] in ['farming', 'harvesting']: 
                             harvsters_online += 1
-            harvesters = "{0}/{1}".format(harvsters_online, harvesters_total)
+            harvesters = "{0} / {1}".format(harvsters_online, harvesters_total)
         except Exception as ex:
             app.logger.error(ex)
             app.logger.info("No recent challenge response times found for {0}".format(blockchain))
@@ -310,14 +338,16 @@ def load_summary_stats(blockchains):
             try:
                 day_ago = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y-%m-%d %H:%M")
                 partial_records = db.session.query(Partial).filter(Partial.blockchain==blockchain, Partial.created_at >= day_ago ).order_by(Partial.created_at.desc()).all()
-                partials_per_hour = "%.2f per hour" % (len(partial_records) / 24)
+                partials_per_hour = "%.2f / hour" % (len(partial_records) / 24)
             except Exception as ex:
                 app.logger.error(ex)
                 app.logger.info("No recent partials submitted for {0}".format(blockchain))
+        [edv, edv_usd] = calc_estimated_daily_value(blockchain)
         stats[blockchain] = {
             'harvesters': harvesters,
             'max_resp': max_response,
             'partials_per_hour': partials_per_hour,
-            'plottings': "TODO"
+            'edv': edv,
+            'edv_usd': edv_usd
         }
     return stats
\ No newline at end of file
diff --git a/web/models/chia.py b/web/models/chia.py
index 780c1b2b..bf582b51 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -34,8 +34,9 @@ def __init__(self, blockchains, farms, wallets, stats):
                 'plots': farm['plot_count'],
                 'harvesters': stats[blockchain['blockchain']]['harvesters'], 
                 'max_resp': stats[blockchain['blockchain']]['max_resp'], 
-                'plottings': stats[blockchain['blockchain']]['plottings'], 
-                'partials_per_hour': stats[blockchain['blockchain']]['partials_per_hour'], 
+                'partials_per_hour': stats[blockchain['blockchain']]['partials_per_hour'],
+                'edv': stats[blockchain['blockchain']]['edv'], 
+                'edv_usd': stats[blockchain['blockchain']]['edv_usd'], 
                 'etw': self.etw_to_days(blockchain['blockchain'], farm['expected_time_to_win']),
             })
 
@@ -100,7 +101,7 @@ def __init__(self, farm_recs, wallet_recs):
                     "display_status": self.status_if_responding(displayname, farm_rec.blockchain, connection_status, farm_rec.status),
                     "total_coins": total_coins,
                     "wallet_balance": wallet_balance,
-                    "currency_symbol": globals.CURRENCY_SYMBOLS[farm_rec.blockchain],
+                    "currency_symbol": globals.get_blockchain_symbol(farm_rec.blockchain),
                     "netspace_display_size": '?' if not farm_rec.netspace_size else converters.gib_to_fmt(farm_rec.netspace_size),
                     "netspace_size": farm_rec.netspace_size,
                     "expected_time_to_win": farm_rec.expected_time_to_win,
@@ -247,16 +248,16 @@ def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=Tru
         return '?'
 
     def sum_mmx_wallet_balance(self, hostname, blockchain, include_cold_balance=True):
-        numeric_const_pattern = '^Balance:\s+((?: (?: \d* \. \d+ ) | (?: \d+ \.? ) )(?: [Ee] [+-]? \d+ )?)'
+        numeric_const_pattern = 'Balance:\s+((?: (?: \d*\.\d+ ) | (?: \d+\.? ) )(?: [Ee] [+-]? \d+ )?)'
         rx = re.compile(numeric_const_pattern, re.VERBOSE)
         found_balance = False
         sum = 0
         for wallet in self.wallets:
             if wallet.hostname == hostname and wallet.blockchain == blockchain:
                 try:
+                    #app.logger.info(wallet.details)
                     for balance in rx.findall(wallet.details):
-                        #app.logger.info("Found balance of {0} for for {1} - {2}".format(balance, 
-                        # wallet.hostname, wallet.blockchain))
+                        #app.logger.info("Found balance of {0} for for {1} - {2}".format(balance, wallet.hostname, wallet.blockchain))
                         sum += locale.atof(balance)
                         found_balance = True
                 except Exception as ex:
diff --git a/web/templates/summary.html b/web/templates/summary.html
index ccdcd287..773a3497 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -34,12 +34,10 @@
                 ETW
                 
                 WalletUSD*EDVEDV $
                 
                 
             
    
         
         
    {{summary.etw}}
                 
                 {{summary.wallet}}{{summary.usd}}{{summary.edv}}{{summary.edv_usd}}
             
    Wallet
                 EDVEDV $EDV US
                 
                 
             
    {{warning.title}} {{warning.message|safe}}
+              
+              {{warning.title|safe}}
    
+              {{warning.message|safe}}
+                		
           
    Yay! No warnings currently.Yay! No issues currently.
           
    
               {% if worker.latest_ping_result == 'Responding' %}
                 
-              {% elif worker.connection_status() == 'Connection Refused' %}
+              {% elif worker.connection_status() == 'Connection Refused' or worker.connection_status() == 'Connection Timeout' %}
                 
               {% else %}
                 

From 693b184ec57c442e5166dcb49993eceda7fb9b07 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 26 Jan 2022 15:42:51 -0700
Subject: [PATCH 0553/1625] Add MMX to New Worker wizard.

---
 api/gunicorn.conf.py             |  4 ++++
 web/templates/worker_launch.html | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index a621208c..9b226ff6 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -36,6 +36,10 @@ def on_starting(server):
     if 'chia' in globals.enabled_blockchains():
         scheduler.add_job(func=stats_disk.collect, name="stats_disk", trigger='cron', minute="*/10") # Every 10 minutes
         
+    # MMX needs to report plots from harvesters directly as they are not listed via the fullnode like Chia does
+    if not utils.is_fullnode() and globals.harvesting_enabled() and 'mmx' in globals.enabled_blockchains():
+        scheduler.add_job(func=status_plots.update, name="plots", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
+    
     # Status for both farmers and harvesters (includes fullnodes)
     if globals.farming_enabled() or globals.harvesting_enabled():
         scheduler.add_job(func=status_challenges.update, name="challenges", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 124a84b1..ef91d87f 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -167,6 +167,9 @@
             if (blockchain == 'maize') {
                 return 8933;
             }
+            if (blockchain == 'mmx') {
+                return 8940;
+            }
             if (blockchain == 'shibgreen') {
                 return 8939;
             }
@@ -210,6 +213,9 @@
             if (blockchain == 'maize') {
                 return 8647;
             }
+            if (blockchain == 'mmx') {
+                return 11330;
+            }
             if (blockchain == 'shibgreen') {
                 return 18974;
             }
@@ -542,6 +548,13 @@ 
    Machinaris Worker - Launch Config
    
                                 Maize
                             
                         
+                        
    
+                            
+                            
+                        
    
                         
    
                             
@@ -570,7 +583,7 @@ 
    Machinaris Worker - Launch Config
    
                                 Stor
                             
                         
    
-                        
     
    
+                        
                     
                 
             

From 2c727bea6ede1f89b59ec5be2ca7aa8d205c6cee Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 27 Jan 2022 17:05:18 -0700
Subject: [PATCH 0554/1625] Initial work on GPU support for MMX.

---
 docker/dockerfile            | 3 +++
 scripts/forks/mmx_install.sh | 2 +-
 scripts/forks/mmx_launch.sh  | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 96a212f4..0f13f848 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -72,6 +72,9 @@ ENV controller_web_port=8926
 ENV controller_api_port=8927
 ENV worker_address="null"
 ENV worker_api_port=8927
+# Some placeholders for Nvidia GPU support in MMX
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 
 # Set env vars requried by forktools
 ENV FORKTOOLSDIR=/forktools
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 44b76ce0..846d111e 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -12,7 +12,7 @@ if [ -z ${MMX_BRANCH} ]; then
 else
 	rm -rf /root/.cache
 	apt-get update
-	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen librocksdb-dev
+	apt-get install -y sudo apt install git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
 	git clone --branch ${MMX_BRANCH} --single-branch https://github.com/madMAx43v3r/mmx-node.git /mmx-node
 	cd /mmx-node
 	git submodule update --init --recursive 
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index 9598b0e0..09e0ecc9 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -30,6 +30,11 @@ ln -s /root/.chia/mmx/config /mmx-node/config
 escaped_plot_dirs=$(printf '%s\n' "$plot_dirs" | sed -e 's/[\/&]/\\&/g')
 sed -i "s/\"plot_dirs\":.*$/\"plot_dirs\": [ $escaped_plot_dirs ]/g" ./config/local/Harvester.json
 
+if [[ ${OPENCL_GPU} == 'nvidia' ]]; then    
+    mkdir -p /etc/OpenCL/vendors
+    echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
+fi
+
 # Symlink the NETWORK file, use 'test4' for now
 #if [ ! -f /root/.chia/mmx/NETWORK ]; then
 echo 'test4' > /root/.chia/mmx/NETWORK

From 40c84e7036f53138ba09fa923af93a48746ac518 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 27 Jan 2022 17:13:19 -0700
Subject: [PATCH 0555/1625] Fix MMX lib install line.

---
 scripts/forks/mmx_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 846d111e..7337a3f9 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -12,7 +12,7 @@ if [ -z ${MMX_BRANCH} ]; then
 else
 	rm -rf /root/.cache
 	apt-get update
-	apt-get install -y sudo apt install git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
+	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
 	git clone --branch ${MMX_BRANCH} --single-branch https://github.com/madMAx43v3r/mmx-node.git /mmx-node
 	cd /mmx-node
 	git submodule update --init --recursive 

From af9c79a35e681bc87b4e464ab903ca48d0a38557 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 28 Jan 2022 10:32:40 -0700
Subject: [PATCH 0556/1625] Don't show sparse 2 minutes of most recent
 challenges.

---
 CREDITS.md                           | 1 +
 web/actions/chia.py                  | 4 +++-
 web/templates/settings/alerts.html   | 2 +-
 web/templates/settings/farming.html  | 2 +-
 web/templates/settings/plotting.html | 2 +-
 web/templates/settings/pools.html    | 2 +-
 web/templates/settings/tools.html    | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index ca5c8154..961ed5dc 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -88,6 +88,7 @@ A big thanks to all that contributed with dev and test including:
 * Nold360
 * karaliux
 * bafff
+* tjb_altf4
 
 ## 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.*
\ No newline at end of file
diff --git a/web/actions/chia.py b/web/actions/chia.py
index bd7cac5c..1771867b 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -108,9 +108,11 @@ def load_plots(args):
 
 def challenges_chart_data(farm_summary):
     chart_start_time = (datetime.datetime.now() - datetime.timedelta(minutes=app.config['MAX_CHART_CHALLENGES_MINS'])).strftime("%Y-%m-%d %H:%M:%S.000")
+    chart_end_time = (datetime.datetime.now() - datetime.timedelta(minutes=2)).strftime("%Y-%m-%d %H:%M:%S.000")
     for blockchain in farm_summary.farms:
         challenges = db.session.query(c.Challenge).filter(c.Challenge.blockchain==blockchain,
-            c.Challenge.created_at >= chart_start_time).order_by(
+            c.Challenge.created_at >= chart_start_time,
+            c.Challenge.created_at <= chart_end_time).order_by(
             c.Challenge.created_at.desc(), c.Challenge.hostname).all()
         farm_summary.farms[blockchain]['challenges'] = ChallengesChartData(challenges)
 
diff --git a/web/templates/settings/alerts.html b/web/templates/settings/alerts.html
index f286b2be..be952f74 100644
--- a/web/templates/settings/alerts.html
+++ b/web/templates/settings/alerts.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 
    
-    
    
+    
    
         
             
         
diff --git a/web/templates/settings/farming.html b/web/templates/settings/farming.html
index 3da51a40..a2a71d83 100644
--- a/web/templates/settings/farming.html
+++ b/web/templates/settings/farming.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 
    
-    
    
+    
    
         
             
         
diff --git a/web/templates/settings/plotting.html b/web/templates/settings/plotting.html
index 89bc229e..981d0e79 100644
--- a/web/templates/settings/plotting.html
+++ b/web/templates/settings/plotting.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 
    
-    
    
+    
    
         
             
         
diff --git a/web/templates/settings/pools.html b/web/templates/settings/pools.html
index 56338a2d..0a5715c6 100644
--- a/web/templates/settings/pools.html
+++ b/web/templates/settings/pools.html
@@ -19,7 +19,7 @@
     }
 
 
    
-    
    
+    
    
         
             
         
diff --git a/web/templates/settings/tools.html b/web/templates/settings/tools.html
index 8f93ccfa..ba746f0d 100644
--- a/web/templates/settings/tools.html
+++ b/web/templates/settings/tools.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 
    
-    
    
+    
    
         
             
         

From 37f77e53fa3939300e0baf1f1822fba23b3b4ff7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 29 Jan 2022 13:33:14 -0700
Subject: [PATCH 0557/1625] Improvements for Settings pages, specficially for
 MMX.

---
 api/commands/mmx_cli.py            |  8 ++++---
 api/views/configs/resources.py     |  7 ++++--
 common/config/globals.py           |  1 +
 scripts/forks/mmx_launch.sh        |  2 ++
 web/routes.py                      | 37 ++++++++++++++++++++----------
 web/templates/settings/alerts.html |  5 ++--
 web/templates/settings/tools.html  |  4 ++--
 7 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/api/commands/mmx_cli.py b/api/commands/mmx_cli.py
index 62142ab3..b88518a0 100644
--- a/api/commands/mmx_cli.py
+++ b/api/commands/mmx_cli.py
@@ -59,16 +59,18 @@ def list_plots():
 
 def load_config(blockchain):
     mainnet = globals.get_blockchain_network_path(blockchain)
-    return open(f'{mainnet}/config/Node.json','r').read()
+    test = globals.MMX_CONFIG
+    return open(f'{mainnet}/config/{test}/Farmer.json','r').read()
 
 def save_config(config, blockchain):
     try:
         mainnet = globals.get_blockchain_network_path(blockchain)
+        test = globals.MMX_CONFIG
         # Validate the json first
         json.load(config)
         # Save a copy of the old config file
-        src=f'{mainnet}/config/Node.json'
-        dst=f'{mainnet}/config/Node.json' + time.strftime("%Y%m%d-%H%M%S")+".yaml"
+        src=f'{mainnet}/config/{test}/Farmer.json'
+        dst=f'{mainnet}/config/{test}/Farmer.json' + time.strftime("%Y%m%d-%H%M%S")+".yaml"
         shutil.copy(src,dst)
         # Now save the new contents to main config file
         with open(src, 'w') as writer:
diff --git a/api/views/configs/resources.py b/api/views/configs/resources.py
index 9e65f908..bf8d5750 100644
--- a/api/views/configs/resources.py
+++ b/api/views/configs/resources.py
@@ -8,7 +8,7 @@
 from api import app
 from api.extensions.api import Blueprint
 
-from api.commands import chiadog_cli, chia_cli, plotman_cli, forktools_cli
+from api.commands import chiadog_cli, chia_cli, plotman_cli, forktools_cli, mmx_cli
 
 blp = Blueprint(
     'Config',
@@ -31,7 +31,10 @@ class ConfigByType(MethodView):
 
     def get(self, type, blockchain):
         if type == "farming":
-            config = chia_cli.load_config(blockchain)
+            if blockchain == 'mmx':
+                config = mmx_cli.load_config(blockchain)
+            else:
+                config = chia_cli.load_config(blockchain)
         elif type == "alerts":
             config = chiadog_cli.load_config(blockchain)
         elif type == "plotting":
diff --git a/common/config/globals.py b/common/config/globals.py
index a3c82daf..38ba35b0 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -32,6 +32,7 @@
 CHIADOG_PATH = '/chiadog'
 
 MMX_NETWORK = 'testnet4'
+MMX_CONFIG = 'test4'
 
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
 
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index 09e0ecc9..ae58deba 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -24,6 +24,8 @@ if [ ! -d /root/.chia/mmx/config ]; then
 	"plot_dirs": [ ${plot_dirs} ]
 }
 EOF
+	# For a fresh install of Machinaris-MMX, disable timelord by default to save CPU usage
+	echo false > /root/.chia/mmx/config/local/timelord
 fi
 rm -rf ./config
 ln -s /root/.chia/mmx/config /mmx-node/config
diff --git a/web/routes.py b/web/routes.py
index 07b643c3..5041c8e9 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -3,6 +3,7 @@
 import pytz
 import os
 import random
+import requests
 import time
 import traceback
 
@@ -299,12 +300,12 @@ def settings_alerts():
         selected_worker_hostname = request.form.get('worker')
         selected_blockchain = request.form.get('blockchain')
         chiadog.save_config(worker.get_worker(selected_worker_hostname, selected_blockchain), selected_blockchain, request.form.get("config"))
-    workers_summary = worker.load_worker_summary()
-    selected_worker = find_selected_worker(workers_summary.farmers_harvesters(), selected_worker_hostname, selected_blockchain)
+    farmers = chiadog.load_farmers()
+    selected_worker = find_selected_worker(farmers, selected_worker_hostname, selected_blockchain)
     if not selected_blockchain:
         selected_blockchain = selected_worker['blockchain']
     return render_template('settings/alerts.html', blockchains=blockchains, selected_blockchain=selected_blockchain,
-        workers=workers_summary.farmers_harvesters, selected_worker=selected_worker['hostname'], global_config=gc)
+        workers=farmers, selected_worker=selected_worker['hostname'], global_config=gc)
 
 @app.route('/settings/pools', methods=['GET', 'POST'])
 def settings_pools():
@@ -338,12 +339,12 @@ def settings_tools():
         selected_worker_hostname = request.form.get('worker')
         selected_blockchain = request.form.get('blockchain')
         forktools.save_config(worker.get_worker(selected_worker_hostname, selected_blockchain), selected_blockchain, request.form.get("config"))
-    workers_summary = worker.load_worker_summary()
-    selected_worker = find_selected_worker(workers_summary.farmers_harvesters(), selected_worker_hostname, selected_blockchain)
+    farmers = chiadog.load_farmers()
+    selected_worker = find_selected_worker(farmers, selected_worker_hostname, selected_blockchain)
     if not selected_blockchain:
         selected_blockchain = selected_worker['blockchain']
     return render_template('settings/tools.html', blockchains=blockchains, selected_blockchain=selected_blockchain,
-        workers=workers_summary.farmers_harvesters, selected_worker=selected_worker['hostname'], global_config=gc)
+        workers=farmers, selected_worker=selected_worker['hostname'], global_config=gc)
 
 @app.route('/settings/config', defaults={'path': ''})
 @app.route('/settings/config/')
@@ -355,15 +356,27 @@ def views_settings_config(path):
                 request.args.get('worker'), request.args.get('blockchain')))
         abort(404)
     if config_type == "alerts":
-        response = make_response(chiadog.load_config(w, request.args.get('blockchain')), 200)
+        try:
+            response = make_response(chiadog.load_config(w, request.args.get('blockchain')), 200)
+        except requests.exceptions.ConnectionError as ex:
+            response = make_response("For Alerts config, found no responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
     elif config_type == "farming":
-        response = make_response(chia.load_config(w, request.args.get('blockchain')), 200)
+        try:
+            response = make_response(chia.load_config(w, request.args.get('blockchain')), 200)
+        except requests.exceptions.ConnectionError as ex:
+            response = make_response("For Farming config, found no responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
     elif config_type == "plotting":
-        [replaced, config] = plotman.load_config(w, request.args.get('blockchain'))
-        response = make_response(config, 200)
-        response.headers.set('ConfigReplacementsOccurred', replaced)
+        try:
+            [replaced, config] = plotman.load_config(w, request.args.get('blockchain'))
+            response = make_response(config, 200)
+            response.headers.set('ConfigReplacementsOccurred', replaced)
+        except requests.exceptions.ConnectionError as ex:
+            response = make_response("For Plotting config, found no responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
     elif config_type == "tools":
-        response = make_response(forktools.load_config(w, request.args.get('blockchain')), 200)
+        try:
+            response = make_response(forktools.load_config(w, request.args.get('blockchain')), 200)
+        except requests.exceptions.ConnectionError as ex:
+            response = make_response("No responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
     else:
         abort("Unsupported config type: {0}".format(config_type), 400)
     response.mimetype = "application/x-yaml"
diff --git a/web/templates/settings/alerts.html b/web/templates/settings/alerts.html
index be952f74..598b48b1 100644
--- a/web/templates/settings/alerts.html
+++ b/web/templates/settings/alerts.html
@@ -36,7 +36,7 @@
                 
                 
    
                     
-                        {% for host in workers() %}
+                        {% for host in workers %}
                         
                         {% endfor %}
@@ -90,7 +90,7 @@
 
         function update_blockchain_options(hostname) {
             var hostsMap = {};
-            {% for worker in workers() %}
+            {% for worker in workers %}
             hostsMap["{{worker.hostname}}"] = [
                 {% for container in worker.workers %} 
                     "{{ container.blockchain }}",

From 4fd8db8e45fdd044d66c5d0d1fc670481bdd6dfc Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 29 Jan 2022 18:01:39 -0700
Subject: [PATCH 0558/1625] Spurious symlink message on MMX restart.

---
 scripts/forks/mmx_launch.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index ae58deba..2b7373bc 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -8,7 +8,9 @@ cd /mmx-node
 rm -rf ./logs
 mkdir -p /root/.chia/mmx/logs
 ln -s /root/.chia/mmx/logs /mmx-node/logs
-ln -s /root/.chia/mmx /root/.mmx 
+if [ ! -L /root/.mmx ]; then
+	ln -s /root/.chia/mmx /root/.mmx
+fi
 
 IFS=':' read -r -a array <<< "$plots_dir"
 joined=$(printf ", \"%s\"" "${array[@]}")

From af21c1de2a92e196610589b5fc5b6fe3f860254e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 30 Jan 2022 11:43:52 -0700
Subject: [PATCH 0559/1625] Fix for pip build error in Chia blockchain.

---
 scripts/forks/chia_install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index dac6fecf..df47ab5b 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -15,5 +15,7 @@ else
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
 	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 fi

From f81775e70cc9f766faeb6b025f94abcfb0b5b00c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 30 Jan 2022 16:54:38 -0700
Subject: [PATCH 0560/1625] Fix for hidden breakage in blockchain builds.

---
 scripts/forks/btcgreen_install.sh   | 4 +++-
 scripts/forks/cactus_install.sh     | 2 ++
 scripts/forks/chives_install.sh     | 4 +++-
 scripts/forks/cryptodoge_install.sh | 2 ++
 scripts/forks/flax_install.sh       | 4 +++-
 scripts/forks/flora_install.sh      | 4 +++-
 scripts/forks/hddcoin_install.sh    | 4 +++-
 scripts/forks/maize_install.sh      | 4 +++-
 scripts/forks/nchain_install.sh     | 2 ++
 scripts/forks/shibgreen_install.sh  | 4 +++-
 scripts/forks/staicoin_install.sh   | 2 ++
 scripts/forks/stor_install.sh       | 2 ++
 12 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/scripts/forks/btcgreen_install.sh b/scripts/forks/btcgreen_install.sh
index 054152c7..f0807c1f 100644
--- a/scripts/forks/btcgreen_install.sh
+++ b/scripts/forks/btcgreen_install.sh
@@ -15,7 +15,9 @@ else
 	cd /btcgreen-blockchain 
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index 5f8369cb..a915f3e4 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -15,6 +15,8 @@ else
 	git submodule update --init mozilla-ca
 	git checkout $HASH
 	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/chives_install.sh b/scripts/forks/chives_install.sh
index c52f46c7..f81cd0af 100644
--- a/scripts/forks/chives_install.sh
+++ b/scripts/forks/chives_install.sh
@@ -14,7 +14,9 @@ else
 	cd /chives-blockchain 
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/cryptodoge_install.sh b/scripts/forks/cryptodoge_install.sh
index ea10d8ac..02d63ed0 100644
--- a/scripts/forks/cryptodoge_install.sh
+++ b/scripts/forks/cryptodoge_install.sh
@@ -15,6 +15,8 @@ else
 	git submodule update --init mozilla-ca
 	git checkout $HASH
 	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/flax_install.sh b/scripts/forks/flax_install.sh
index 7c53ac56..8f0b3c14 100644
--- a/scripts/forks/flax_install.sh
+++ b/scripts/forks/flax_install.sh
@@ -15,7 +15,9 @@ else
 	cd /flax-blockchain
 	git checkout $HASH
 	git submodule update --init mozilla-ca
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/flora_install.sh b/scripts/forks/flora_install.sh
index 70c91b2d..6a2d48a9 100644
--- a/scripts/forks/flora_install.sh
+++ b/scripts/forks/flora_install.sh
@@ -15,7 +15,9 @@ else
 	cd /flora-blockchain 
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index a323e565..4607b089 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -14,7 +14,9 @@ else
 	cd /hddcoin-blockchain
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/maize_install.sh b/scripts/forks/maize_install.sh
index 06773080..d018bd9b 100644
--- a/scripts/forks/maize_install.sh
+++ b/scripts/forks/maize_install.sh
@@ -15,7 +15,9 @@ else
 	cd /maize-blockchain 
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/nchain_install.sh b/scripts/forks/nchain_install.sh
index f830139f..67f1149f 100644
--- a/scripts/forks/nchain_install.sh
+++ b/scripts/forks/nchain_install.sh
@@ -15,6 +15,8 @@ else
 	git submodule update --init mozilla-ca
 	git checkout $HASH
 	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/shibgreen_install.sh b/scripts/forks/shibgreen_install.sh
index 60cd331e..1d387a1a 100644
--- a/scripts/forks/shibgreen_install.sh
+++ b/scripts/forks/shibgreen_install.sh
@@ -15,7 +15,9 @@ else
 	cd /shibgreen-blockchain 
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
-	chmod +x install.sh 
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/staicoin_install.sh b/scripts/forks/staicoin_install.sh
index 17608ab5..8feb758b 100644
--- a/scripts/forks/staicoin_install.sh
+++ b/scripts/forks/staicoin_install.sh
@@ -15,6 +15,8 @@ else
 	cd /staicoin-blockchain
 	git submodule update --init mozilla-ca
 	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then
diff --git a/scripts/forks/stor_install.sh b/scripts/forks/stor_install.sh
index b6212a28..835b969c 100644
--- a/scripts/forks/stor_install.sh
+++ b/scripts/forks/stor_install.sh
@@ -15,6 +15,8 @@ else
 	git submodule update --init mozilla-ca
 	git checkout $HASH
 	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 
 	if [ ! -d /chia-blockchain/venv ]; then

From f130c8982e1a015dfb4c1c78612dcc025652acb9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 31 Jan 2022 10:36:08 -0700
Subject: [PATCH 0561/1625] If not in a pool, don't show 0 partial submissions
 on Summary page.

---
 web/actions/stats.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/web/actions/stats.py b/web/actions/stats.py
index 9a7e5a68..ed32e043 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -16,6 +16,7 @@
 from common.models.farms import Farm
 from common.models.pools import POOLABLE_BLOCKCHAINS
 from common.models.plots import Plot
+from common.models.pools import Pool
 from common.models.partials import Partial
 from common.models.stats import StatPlotCount, StatPlotsSize, StatTotalCoins, StatNetspaceSize, StatTimeToWin, \
         StatPlotsTotalUsed, StatPlotsDiskUsed, StatPlotsDiskFree, StatPlottingTotalUsed, \
@@ -338,13 +339,14 @@ def load_summary_stats(blockchains):
             app.logger.info("No recent challenge response times found for {0}".format(blockchain))
         partials_per_hour = ''
         if blockchain in POOLABLE_BLOCKCHAINS:
-            try:
-                day_ago = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y-%m-%d %H:%M")
-                partial_records = db.session.query(Partial).filter(Partial.blockchain==blockchain, Partial.created_at >= day_ago ).order_by(Partial.created_at.desc()).all()
-                partials_per_hour = "%.2f / hour" % (len(partial_records) / 24)
-            except Exception as ex:
-                app.logger.error(ex)
-                app.logger.info("No recent partials submitted for {0}".format(blockchain))
+            if len(db.session.query(Pool).filter(Pool.blockchain==blockchain).all()) > 0:
+                try:
+                    day_ago = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y-%m-%d %H:%M")
+                    partial_records = db.session.query(Partial).filter(Partial.blockchain==blockchain, Partial.created_at >= day_ago ).order_by(Partial.created_at.desc()).all()
+                    partials_per_hour = "%.2f / hour" % (len(partial_records) / 24)
+                except Exception as ex:
+                    app.logger.error(ex)
+                    app.logger.info("No recent partials submitted for {0}".format(blockchain))
         [edv, edv_usd] = calc_estimated_daily_value(blockchain)
         stats[blockchain] = {
             'harvesters': harvesters,

From 4b7c1f3e62ef0a47095b0034c6cf35a65da8fa8f Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 31 Jan 2022 10:42:36 -0700
Subject: [PATCH 0562/1625] Guard against uninitialized var.

---
 web/actions/stats.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/actions/stats.py b/web/actions/stats.py
index ed32e043..72fe07c8 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -191,6 +191,7 @@ def load_current_disk_usage(disk_type, hostname=None):
         paths = []
         used = []
         free = []
+        used_result = free_result = None
         if disk_type == 'plots':
             created_at_max = db.session.query(StatPlotsDiskUsed).order_by(StatPlotsDiskUsed.created_at.desc()).first()
             if created_at_max:

From ad39f4e370c315fb450951ad350d4228fd5109ac Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 1 Feb 2022 10:27:10 -0700
Subject: [PATCH 0563/1625] Fixes for Settings | Pools with multiple unused
 plotnfts.

---
 api/commands/pools_cli.py         | 14 ++++++++++----
 web/templates/settings/pools.html |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index 163f0984..8c726b0c 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -30,12 +30,12 @@
 
 def get_job_parameter(job, key, index):
     if key in job:
-        if index in job[key]:
+        if index < len(job[key]):
             value = job[key][index].strip()
             if value and value != 'None':
                 return value
         else:
-            app.logger.info("No index {0} for key {1} found in job: {2}".format(index, key, job))
+            app.logger.info("No index {0} for key {1} found in: {2}".format(index, key, job[key]))
     else:
         app.logger.info("No key {0} found in job: {1}".format(key, job))
     return None
@@ -46,6 +46,7 @@ def dispatch_action(job):
         raise Exception("Only pooling requests handled here!")
     action = job['action']
     if action == "save":
+        app.logger.info("Processing pool save: {0}".format(job))
         # Loop thru the provided launcher_ids
         msg = ""
         blockchain = job["blockchain"]
@@ -55,13 +56,17 @@ def dispatch_action(job):
             choice = get_job_parameter(job,"choices", i)
             pool_url = get_job_parameter(job,"pool_urls", i)
             current_pool_url = get_job_parameter(job,"current_pool_urls", i)
-            msg += process_pool_save(blockchain, choice, pool_wallet_id, pool_url, current_pool_url, launcher_id)
+            result = process_pool_save(blockchain, choice, pool_wallet_id, pool_url, current_pool_url, launcher_id)
+            if result:
+                msg += result + ' '
+            else:
+                app.logger.info("process_pool_save returned None for launcher_id index {0}".format(i))
         if msg.strip():
             return msg
         else:
             return "No requested pool modifications were sent.  Current settings are unchanged."
     else:
-        raise Exception("Unsupported action {0} for monitoring.".format(action))
+        raise Exception("Unsupported action {0} for pools.".format(action))
 
 def get_plotnft_log():
     try:
@@ -113,6 +118,7 @@ def process_pool_save(blockchain, choice, pool_wallet_id, pool_url, current_pool
             app.logger.info('Already pooling with {0}.  No changes made to {1}'.format(pool_url, launcher_id))
             return ""
         return process_pool_join(blockchain, pool_url, pool_wallet_id)
+    raise Exception("Unknown pool save choice provided: {0}".format(choice))
 
 def process_pool_leave(blockchain, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
diff --git a/web/templates/settings/pools.html b/web/templates/settings/pools.html
index 0a5715c6..e177b44a 100644
--- a/web/templates/settings/pools.html
+++ b/web/templates/settings/pools.html
@@ -105,7 +105,7 @@ 
    Wallet ID: {{ plotnft.wallet_num }}
    
                                 
    
                                     
+                                    {% if not plotnft.current_pool_url() %} checked {% endif %}/>
                                     

From bc60db6f13d35fab11cb9101f93dc28fe5aa4b63 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 1 Feb 2022 12:20:46 -0700
Subject: [PATCH 0564/1625] Testing AMD GPU support.

---
 scripts/forks/mmx_install.sh | 7 ++++++-
 scripts/forks/mmx_launch.sh  | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 7337a3f9..d1144a11 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -12,7 +12,12 @@ if [ -z ${MMX_BRANCH} ]; then
 else
 	rm -rf /root/.cache
 	apt-get update
-	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
+	# Install dependencies
+	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers
+	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
+	curl -O http://repo.radeon.com/amdgpu-install/21.40.2/ubuntu/focal/amdgpu-install_21.40.2.40502-1_all.deb
+	apt install -y ./amdgpu-install_21.40.2.40502-1_all.deb
+	# Clone and install MMX
 	git clone --branch ${MMX_BRANCH} --single-branch https://github.com/madMAx43v3r/mmx-node.git /mmx-node
 	cd /mmx-node
 	git submodule update --init --recursive 
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index 2b7373bc..ee8706c1 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -37,6 +37,13 @@ sed -i "s/\"plot_dirs\":.*$/\"plot_dirs\": [ $escaped_plot_dirs ]/g" ./config/lo
 if [[ ${OPENCL_GPU} == 'nvidia' ]]; then    
     mkdir -p /etc/OpenCL/vendors
     echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
+elif [[ ${OPENCL_GPU} == 'amd' ]]; then
+	cd /tmp
+	apt update
+    amdgpu-install -y --opencl=legacy,rocr --accept-eula
+	mkdir -p /etc/OpenCL/vendors
+	echo "libamdocl64.so" > /etc/OpenCL/vendors/amdocl64.icd
+	ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 /usr/lib/libOpenCL.so
 fi
 
 # Symlink the NETWORK file, use 'test4' for now

From 690556805b650dc9f0919dd47b16f4f7349a6364 Mon Sep 17 00:00:00 2001
From: Vincent 
Date: Wed, 2 Feb 2022 20:20:13 +0800
Subject: [PATCH 0565/1625] AMD GPU test

---
 scripts/forks/mmx_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index d1144a11..a690ce2d 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -13,7 +13,7 @@ else
 	rm -rf /root/.cache
 	apt-get update
 	# Install dependencies
-	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers
+	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
 	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
 	curl -O http://repo.radeon.com/amdgpu-install/21.40.2/ubuntu/focal/amdgpu-install_21.40.2.40502-1_all.deb
 	apt install -y ./amdgpu-install_21.40.2.40502-1_all.deb

From 5a6713846c93f2a71d88c13c2936345f7721c2b2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 2 Feb 2022 09:21:20 -0700
Subject: [PATCH 0566/1625] Fix for mmx harvester path.

---
 CREDITS.md                       | 1 +
 web/templates/worker_launch.html | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CREDITS.md b/CREDITS.md
index 961ed5dc..02a039c3 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -89,6 +89,7 @@ A big thanks to all that contributed with dev and test including:
 * karaliux
 * bafff
 * tjb_altf4
+* halfroom
 
 ## 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.*
\ No newline at end of file
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index ef91d87f..1b04f24c 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -284,6 +284,9 @@
                         if ((blockchain == "chives") && ($('#volume_type' + index).val() == 'plots')) {
                             volume_host_path += '/chives'
                         }
+                        if ((blockchain == "mmx") && ($('#volume_type' + index).val() == 'plots')) {
+                            volume_host_path += '/mmx'
+                        }
                         cmd += '            - "' + volume_host_path + ':' + volume_container_path + '"' + line_end;
                         if ($('#volume_type' + index).val() == 'plots') {
                             plots_dir.push(volume_container_path)

From a9086954713fd84662e051f8a01dea2bb81ee55b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 2 Feb 2022 11:18:31 -0700
Subject: [PATCH 0567/1625] Another blockchain DB download fix.

---
 scripts/forks/chia_launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index cdc45efc..61c67d7e 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -39,7 +39,7 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Please be patient as takes minutes now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
   # Latest Blockchain DB download from direct from https://www.chia-database.com/
-  file_time=$(curl -s https://chia-database.com | grep -Po "blockchain_v1_mainnet-\K(\d|-)+")
+  file_time=$(curl -s https://chia-database.com | grep -Po "nginx.chia-database.com/blockchain_v1_mainnet-\K(\d|-)+")
   curl -skLJ -o - https://nginx.chia-database.com/blockchain_v1_mainnet-${file_time}.zip | zcat >> blockchain_v1_mainnet.sqlite
   cd /root/.chia/mainnet/db
   mv /root/.chia/mainnet/db/chia/blockchain_v1_mainnet.sqlite .

From b698c1010767aee0261426c3b8f95870c0397f28 Mon Sep 17 00:00:00 2001
From: Vincent Chan 
Date: Thu, 3 Feb 2022 02:27:50 +0800
Subject: [PATCH 0568/1625] Add AMD GPU support. AMD APU Ryzen 2400GE has been
 tested.

---
 scripts/forks/mmx_install.sh | 4 ++--
 scripts/forks/mmx_launch.sh  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index a690ce2d..ebf90d13 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -15,8 +15,8 @@ else
 	# Install dependencies
 	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
 	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
-	curl -O http://repo.radeon.com/amdgpu-install/21.40.2/ubuntu/focal/amdgpu-install_21.40.2.40502-1_all.deb
-	apt install -y ./amdgpu-install_21.40.2.40502-1_all.deb
+	curl -O http://repo.radeon.com/amdgpu-install/21.40/ubuntu/focal/amdgpu-install-21.40.40500-1_all.deb
+	apt install -y ./amdgpu-install-21.40.40500-1_all.deb
 	# Clone and install MMX
 	git clone --branch ${MMX_BRANCH} --single-branch https://github.com/madMAx43v3r/mmx-node.git /mmx-node
 	cd /mmx-node
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index ee8706c1..22f7ef8d 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -40,10 +40,10 @@ if [[ ${OPENCL_GPU} == 'nvidia' ]]; then
 elif [[ ${OPENCL_GPU} == 'amd' ]]; then
 	cd /tmp
 	apt update
-    amdgpu-install -y --opencl=legacy,rocr --accept-eula
-	mkdir -p /etc/OpenCL/vendors
-	echo "libamdocl64.so" > /etc/OpenCL/vendors/amdocl64.icd
-	ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 /usr/lib/libOpenCL.so
+	amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula
+	# If AMD GPU is older than vega 10,use under command, but can't promise work normally.
+	# Because, with --opencl=legacy, dkms will must be installed, it may pollute your kernel
+	# amdgpu-install -y --usecase=opencl --opencl=rocr,legacy --no-32 --accept-eula
 fi
 
 # Symlink the NETWORK file, use 'test4' for now

From d1d33cee71bf1e2b74063f0ecff7039bd8cf01d9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 2 Feb 2022 13:08:50 -0700
Subject: [PATCH 0569/1625] Randomize download mirror to use for Chia
 blockchain DB.

---
 CREDITS.md                   | 2 +-
 scripts/forks/chia_launch.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index 02a039c3..3d818092 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -89,7 +89,7 @@ A big thanks to all that contributed with dev and test including:
 * karaliux
 * bafff
 * tjb_altf4
-* halfroom
+* halfroom (aka Sagittarius)
 
 ## 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.*
\ No newline at end of file
diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 61c67d7e..0eeb0988 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -39,8 +39,10 @@ if [[ "${blockchain_db_download}" == 'true' ]] \
   echo "Please be patient as takes minutes now, but saves days of syncing time later."
   mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia
   # Latest Blockchain DB download from direct from https://www.chia-database.com/
-  file_time=$(curl -s https://chia-database.com | grep -Po "nginx.chia-database.com/blockchain_v1_mainnet-\K(\d|-)+")
-  curl -skLJ -o - https://nginx.chia-database.com/blockchain_v1_mainnet-${file_time}.zip | zcat >> blockchain_v1_mainnet.sqlite
+  db_url=$(curl -s https://chia-database.com | grep -Po "https:.*/blockchain_v1_mainnet-\d{2}-\d{2}-\d{4}.zip" | shuf -n 1)
+  echo "Please be patient! Downloading blockchain database from: "
+  echo "    ${db_url}"
+  curl -skLJ -o - ${db_url} | zcat >> blockchain_v1_mainnet.sqlite
   cd /root/.chia/mainnet/db
   mv /root/.chia/mainnet/db/chia/blockchain_v1_mainnet.sqlite .
   rm -rf /root/.chia/mainnet/db/chia

From 611194db6646c49b1fb59b955efa4bd0152317ac Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 3 Feb 2022 14:10:02 -0700
Subject: [PATCH 0570/1625] Fix MMX branch.

---
 .github/workflows/main-mmx.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 688f2540..8f1191e3 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -42,7 +42,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=latest"
-            "MMX_BRANCH=main"
+            "MMX_BRANCH=master"
             "CHIA_BRANCH=1.2.11"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest

From 7f65875b198960fc0883de7d3bfcd194534a4cde Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 3 Feb 2022 21:30:43 -0700
Subject: [PATCH 0571/1625] Another fix for MMX release workflow.

---
 .github/workflows/main-mmx.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 8f1191e3..b808d591 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -38,7 +38,7 @@ jobs:
         with:
           file: docker/dockerfile
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           build-args: |
             "MACHINARIS_STREAM=latest"

From 3b83967426710ca0c036bce55071c149b56be3d0 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 5 Feb 2022 14:28:30 -0700
Subject: [PATCH 0572/1625] Silicoin as per Discord.

---
 .github/workflows/develop-silicoin.yaml |  46 +++++++++
 .github/workflows/main-silicoin.yaml    |  50 ++++++++++
 .github/workflows/test-silicoin.yaml    |  47 +++++++++
 CHANGELOG.md                            |   3 +
 VERSION                                 |   2 +-
 api/views/certificates/resources.py     |   3 +
 common/config/blockchains.json          |   4 +-
 docker/dockerfile                       |   4 +-
 scripts/farmr_setup.sh                  |   3 +
 scripts/forks/hddcoin_install.sh        |   2 +-
 scripts/forks/silicoin_install.sh       |  29 ++++++
 scripts/forks/silicoin_launch.sh        | 121 ++++++++++++++++++++++++
 scripts/worker_port_warning.sh          |   3 +
 web/models/chia.py                      |   6 +-
 web/templates/worker_launch.html        |  19 +++-
 15 files changed, 333 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/develop-silicoin.yaml
 create mode 100644 .github/workflows/main-silicoin.yaml
 create mode 100644 .github/workflows/test-silicoin.yaml
 create mode 100644 scripts/forks/silicoin_install.sh
 create mode 100644 scripts/forks/silicoin_launch.sh

diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
new file mode 100644
index 00000000..f8cb6d82
--- /dev/null
+++ b/.github/workflows/develop-silicoin.yaml
@@ -0,0 +1,46 @@
+name: develop-silicoin
+
+on:
+  push:
+    branches:
+      - 'develop'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "MACHINARIS_STREAM=develop"
+            "SILICOIN_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:develop
diff --git a/.github/workflows/main-silicoin.yaml b/.github/workflows/main-silicoin.yaml
new file mode 100644
index 00000000..839def9e
--- /dev/null
+++ b/.github/workflows/main-silicoin.yaml
@@ -0,0 +1,50 @@
+name: release-silicoin
+
+on: 
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release Version' 
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            "MACHINARIS_STREAM=latest"
+            "SILICOIN_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:v${{ github.event.inputs.version }}
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:latest
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-silicoin.yaml b/.github/workflows/test-silicoin.yaml
new file mode 100644
index 00000000..4484ecdc
--- /dev/null
+++ b/.github/workflows/test-silicoin.yaml
@@ -0,0 +1,47 @@
+name: test-silicoin
+
+on:
+  push:
+    branches:
+      - 'integration'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            "MACHINARIS_STREAM=test"
+            "SILICOIN_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:test
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b60ee37d..1ffd4c2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 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).
 
+## [0.7.0] - 2022-03-04
+ - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
+
 ## [0.6.9] - 2022-02-04
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - support for this new blockchain, which requires its own plot files.
  - [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases) - update to version 2.0.0
diff --git a/VERSION b/VERSION
index 18640022..bcaffe19 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.9
\ No newline at end of file
+0.7.0
\ No newline at end of file
diff --git a/api/views/certificates/resources.py b/api/views/certificates/resources.py
index 62731ad0..9bd7bbd8 100644
--- a/api/views/certificates/resources.py
+++ b/api/views/certificates/resources.py
@@ -63,6 +63,9 @@ def get(self):
         elif type == "shibgreen":
             blockchain = "shibgreen"
             dir = "/root/.shibgreen/mainnet/config/ssl/ca"
+        elif type == "silicoin":
+            blockchain = "silicoin"
+            dir = "/root/.sit/mainnet/config/ssl/ca"
         elif type == "stai":
             blockchain = "staicoin"
             dir = "/root/.stai/mainnet/config/ssl/ca"
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 624b3093..2ecf22fd 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -209,8 +209,8 @@
         "network_path": "/root/.sit/mainnet",
         "network_name": "mainnet",
         "network_port": 22222,
-        "farmer_port": "TBD",
-        "fullnode_rpc_port": "TBD",
+        "farmer_port":  22447,
+        "fullnode_rpc_port": 22555,
         "worker_port": 8941,
         "reward": 1.0,
         "mojos_per_coin": 1000000000000,
diff --git a/docker/dockerfile b/docker/dockerfile
index 0f13f848..883b39f5 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -15,6 +15,7 @@ ARG MAIZE_BRANCH
 ARG MMX_BRANCH
 ARG NCHAIN_BRANCH
 ARG SHIBGREEN_BRANCH
+ARG SILICOIN_BRANCH
 ARG STAICOIN_BRANCH
 ARG STOR_BRANCH
 
@@ -38,9 +39,10 @@ RUN \
 	&& /usr/bin/bash /machinaris/scripts/forks/mmx_install.sh ${MMX_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/nchain_install.sh ${NCHAIN_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/shibgreen_install.sh ${SHIBGREEN_BRANCH} \
+	&& /usr/bin/bash /machinaris/scripts/forks/silicoin_install.sh ${SILICOIN_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/staicoin_install.sh ${STAICOIN_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/stor_install.sh ${STOR_BRANCH} \
-  && /usr/bin/bash /machinaris/scripts/pull_3rd_party_libs.sh \
+    && /usr/bin/bash /machinaris/scripts/pull_3rd_party_libs.sh \
 	&& /usr/bin/bash /machinaris/scripts/machinaris_install.sh \
 	&& rm -rf \
 		/root/.cache \
diff --git a/scripts/farmr_setup.sh b/scripts/farmr_setup.sh
index 04dca878..b5d54d97 100644
--- a/scripts/farmr_setup.sh
+++ b/scripts/farmr_setup.sh
@@ -71,6 +71,9 @@ if [[ "${farmr_skip_launch}" == 'false' &&  (${mode} == 'fullnode' || ${mode} =~
 	elif [[ ${blockchains} == 'nchain' ]]; then
 		cp -n blockchain/nch.json.template blockchain/nch.json
 		echo "/chia-blockchain/venv/bin/chia" > override-nch-binary.txt
+	elif [[ ${blockchains} == 'silicoin' ]]; then
+		cp -n blockchain/sit.json.template blockchain/sit.json
+		echo "/silicoin-blockchain/venv/bin/sit" > override-sit-binary.txt
 	elif [[ ${blockchains} == 'staicoin' ]]; then
 		cp -n blockchain/stai.json.template blockchain/stai.json
 		echo "/staicoin-blockchain/venv/bin/staicoin" > override-stai-binary.txt
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index 4607b089..4c544378 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -5,7 +5,7 @@
 
 HDDCOIN_BRANCH=$1
 # On 2022-01-22
-HASH=1b7f475af43dd251d6b8e866066a0834712f45ec
+HASH=75d13c065a417f97f335849adf41ed5592f49543
 
 if [ -z ${HDDCOIN_BRANCH} ]; then
 	echo 'Skipping HDDCoin install as not requested.'
diff --git a/scripts/forks/silicoin_install.sh b/scripts/forks/silicoin_install.sh
new file mode 100644
index 00000000..2db926a8
--- /dev/null
+++ b/scripts/forks/silicoin_install.sh
@@ -0,0 +1,29 @@
+#!/bin/env bash
+#
+# Installs Silicoin as per https://github.com/silicoin-network/silicoin-blockchain
+#
+
+SILICOIN_BRANCH=$1
+# On 2022-02-05
+HASH=ca482fa66f05e883891705c86bfdff63e101e3a4
+
+if [ -z ${SILICOIN_BRANCH} ]; then
+	echo 'Skipping Silicoin install as not requested.'
+else
+	rm -rf /root/.cache
+	git clone --branch ${SILICOIN_BRANCH} --single-branch https://github.com/silicoin-network/silicoin-blockchain /silicoin-blockchain
+	cd /silicoin-blockchain 
+	git submodule update --init mozilla-ca 
+	git checkout $HASH
+	chmod +x install.sh
+	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+	/usr/bin/sh ./install.sh
+
+	if [ ! -d /chia-blockchain/venv ]; then
+		cd /
+		rmdir /chia-blockchain
+		ln -s /silicoin-blockchain /chia-blockchain
+		ln -s /silicoin-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+	fi
+fi
diff --git a/scripts/forks/silicoin_launch.sh b/scripts/forks/silicoin_launch.sh
new file mode 100644
index 00000000..a247ef6c
--- /dev/null
+++ b/scripts/forks/silicoin_launch.sh
@@ -0,0 +1,121 @@
+#!/bin/env bash
+#
+# Initialize Silicoin service, depending on mode of system requested
+#
+
+cd /silicoin-blockchain
+
+. ./activate
+
+# Only the /root/.chia folder is volume-mounted so store sit within
+mkdir -p /root/.chia/sit
+rm -f /root/.sit
+ln -s /root/.chia/sit /root/.sit 
+
+mkdir -p /root/.sit/mainnet/log
+sit init >> /root/.sit/mainnet/log/init.log 2>&1 
+
+if [[ "${blockchain_db_download}" == 'true' ]] \
+  && [[ "${mode}" == 'fullnode' ]] \
+  && [[ ! -f /root/.sit/mainnet/db/blockchain_v1_mainnet.sqlite ]]; then
+  mkdir -p /root/.sit/mainnet/db/ && cd /root/.sit/mainnet/db/
+  echo "Sorry, Silicoin does not offer a recent blockchain DB for download via script.  Standard sync will happen over a few days..."
+  echo "It is recommended to add some peer node connections on the Connections page of Machinaris from: https://alltheblocks.net/sit"
+fi
+
+echo 'Configuring Silicoin...'
+if [ -f /root/.sit/mainnet/config/config.yaml ]; then
+  sed -i 's/log_stdout: true/log_stdout: false/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/localhost/127.0.0.1/g' /root/.sit/mainnet/config/config.yaml
+  # Fix port conflicts with other blockchains
+  sed -i 's/11000/22000/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11222/22222/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11256/22256/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11445/22445/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11446/22446/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11447/22447/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11448/22448/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11449/22449/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11555/22555/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11559/22559/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/11560/22560/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/12444/22444/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/21234/22234/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/22222/22222/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/: 514/: 22514/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/56400/22400/g' /root/.sit/mainnet/config/config.yaml
+  sed -i 's/56402/22402/g' /root/.sit/mainnet/config/config.yaml
+fi
+
+# Loop over provided list of key paths
+for k in ${keys//:/ }; do
+  if [[ "${k}" == "persistent" ]]; then
+    echo "Not touching key directories."
+  elif [ -s ${k} ]; then
+    echo "Adding key at path: ${k}"
+    sit keys add -f ${k} > /dev/null
+  fi
+done
+
+# Loop over provided list of completed plot directories
+IFS=':' read -r -a array <<< "$plots_dir"
+joined=$(printf ", %s" "${array[@]}")
+echo "Adding plot directories at: ${joined:1}"
+for p in ${plots_dir//:/ }; do
+    sit plots add -d ${p}
+done
+
+chmod 755 -R /root/.sit/mainnet/config/ssl/ &> /dev/null
+sit init --fix-ssl-permissions > /dev/null 
+
+# Start services based on mode selected. Default is 'fullnode'
+if [[ ${mode} == 'fullnode' ]]; then
+  for k in ${keys//:/ }; do
+    while [[ "${k}" != "persistent" ]] && [[ ! -s ${k} ]]; do
+      echo 'Waiting for key to be created/imported into mnemonic.txt. See: http://localhost:8926'
+      sleep 10  # Wait 10 seconds before checking for mnemonic.txt presence
+      if [ -s ${k} ]; then
+        sit keys add -f ${k}
+        sleep 10
+      fi
+    done
+  done
+  sit start farmer
+elif [[ ${mode} =~ ^farmer.* ]]; then
+  if [ ! -f ~/.sit/mainnet/config/ssl/wallet/public_wallet.key ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your Chia mnemonic.txt to the ~/.machinaris/ folder and restart."
+  else
+    sit start farmer-only
+  fi
+elif [[ ${mode} =~ ^harvester.* ]]; then
+  if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
+    echo "A farmer peer address and port are required."
+    exit
+  else
+    if [ ! -f /root/.sit/farmer_ca/private_ca.crt ]; then
+      mkdir -p /root/.sit/farmer_ca
+      response=$(curl --write-out '%{http_code}' --silent http://${farmer_address}:8941/certificates/?type=silicoin --output /tmp/certs.zip)
+      if [ $response == '200' ]; then
+        unzip /tmp/certs.zip -d /root/.sit/farmer_ca
+      else
+        echo "Certificates response of ${response} from http://${farmer_address}:8941/certificates/?type=silicoin.  Try clicking 'New Worker' button on 'Workers' page first."
+      fi
+      rm -f /tmp/certs.zip 
+    fi
+    if [ -f /root/.sit/farmer_ca/private_ca.crt ]; then
+      sit init -c /root/.sit/farmer_ca 2>&1 > /root/.sit/mainnet/log/init.log
+      chmod 755 -R /root/.sit/mainnet/config/ssl/ &> /dev/null
+      sit init --fix-ssl-permissions > /dev/null 
+    else
+      echo "Did not find your farmer's certificates within /root/.sit/farmer_ca."
+      echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
+    fi
+    echo "Configuring farmer peer at ${farmer_address}:${farmer_port}"
+    sit configure --set-farmer-peer ${farmer_address}:${farmer_port}
+    sit configure --enable-upnp false
+    sit start harvester -r
+  fi
+elif [[ ${mode} == 'plotter' ]]; then
+    echo "Starting in Plotter-only mode.  Run Plotman from either CLI or WebUI."
+fi
diff --git a/scripts/worker_port_warning.sh b/scripts/worker_port_warning.sh
index 0b2a125f..44b5c0fd 100644
--- a/scripts/worker_port_warning.sh
+++ b/scripts/worker_port_warning.sh
@@ -35,6 +35,9 @@ fi
 if [[ "${blockchains}"  == "shibgreen" && "${worker_api_port}" != '8939' ]]; then
   echo "Shibgreen worker with non-standard worker_api_port of ${worker_api_port} found.  Did you mean to use 8939?"
 fi
+if [[ "${blockchains}"  == "silicoin" && "${worker_api_port}" != '8941' ]]; then
+  echo "Silicoin worker with non-standard worker_api_port of ${worker_api_port} found.  Did you mean to use 8941?"
+fi
 if [[ "${blockchains}"  == "staicoin" && "${worker_api_port}" != '8934' ]]; then
   echo "Staicoin worker with non-standard worker_api_port of ${worker_api_port} found.  Did you mean to use 8934?"
 fi
diff --git a/web/models/chia.py b/web/models/chia.py
index 28d55553..95c3a963 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -439,9 +439,11 @@ def get_add_connection_example(self, blockchain):
         if blockchain == 'maize':
             return "212.159.183.209:8644"
         if blockchain == 'nchain':
-            return "218.88.205.216:58445"
+            return "218.88.205.216:58445"     
         if blockchain == 'shibgreen':
             return "218.89.239.144:7442"
+        if blockchain == 'silicoin':
+            return "67.172.84.54:22222"
         if blockchain == 'staicoin':
             return "173.54.12.193:1999"
         if blockchain == 'stor':
@@ -470,6 +472,8 @@ def blockchain_port(self,blockchain):
             return 12331
         if blockchain == 'maize':
             return 8644
+        if blockchain == 'silicoin':
+            return 22447
         if blockchain == 'shibgreen':
             return 7442
         if blockchain == 'silicoin':
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 1b04f24c..9bcd7b19 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -173,6 +173,9 @@
             if (blockchain == 'shibgreen') {
                 return 8939;
             }
+            if (blockchain == 'silicoin') {
+                return 8941;
+            }
             if (blockchain == 'staicoin') {
                 return 8934;
             }
@@ -219,6 +222,9 @@
             if (blockchain == 'shibgreen') {
                 return 18974;
             }
+            if (blockchain == 'silicoin') {
+                return 22447;
+            }
             if (blockchain == 'staicoin') {
                 return 1692;
             }
@@ -535,8 +541,6 @@ 
    Machinaris Worker - Launch Config
    
                                 Flora
                             
                         
    
-                    
    
-                    
    
                         
    
                             
@@ -544,6 +548,8 @@ 
    Machinaris Worker - Launch Config
    
                                 HDDCoin
                             
                         
    
+                    
    
+                    
    
                         
    
                             
@@ -572,6 +578,13 @@ 
    Machinaris Worker - Launch Config
    
                                 SHIBGreen
                             
                         
    
+                        
    
+                            
+                            
+                        
    
                         
    
                             
@@ -586,7 +599,7 @@ 
    Machinaris Worker - Launch Config
    
                                 Stor
                             
                         
    
-                        
+                        
     
    
                     
    
                 
    
             
    

From ff9ae0702a7bf7e88d2951fe4ab585447f828412 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 5 Feb 2022 21:48:57 -0700
Subject: [PATCH 0573/1625] Fix certs path lookup for Silicoin.

---
 api/views/certificates/resources.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/api/views/certificates/resources.py b/api/views/certificates/resources.py
index 9bd7bbd8..42571c5d 100644
--- a/api/views/certificates/resources.py
+++ b/api/views/certificates/resources.py
@@ -57,9 +57,6 @@ def get(self):
         elif type == "maize":
             blockchain = "maize"
             dir = "/root/.maize/mainnet/config/ssl/ca"
-        elif type == "silicoin":
-            blockchain = "silicoin"
-            dir = "/root/.silicoin/mainnet/config/ssl/ca"
         elif type == "shibgreen":
             blockchain = "shibgreen"
             dir = "/root/.shibgreen/mainnet/config/ssl/ca"

From 71b9e2be9fbfb95efd360200e32db06f8acd00c7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 6 Feb 2022 08:32:54 -0700
Subject: [PATCH 0574/1625] Add 'All' page length option to Workers page -
 table listing.

---
 web/templates/workers.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/templates/workers.html b/web/templates/workers.html
index 3b4d658d..8c66f7bf 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -127,6 +127,7 @@ 
    For more, see the Machinaris 
Date: Mon, 7 Feb 2022 07:14:12 +0000
Subject: [PATCH 0575/1625] Bump actions/setup-python from 2.3.1 to 2.3.2

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v2.3.2)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
---
 .github/workflows/unit-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 1e236a6e..b3ca2374 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.9
-        uses: actions/setup-python@v2.3.1
+        uses: actions/setup-python@v2.3.2
         with:
           python-version: 3.9
       - name: Install dependencies

From 29884e348d1ab75a2e9fba4a5c673ef530d7a537 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 11:33:10 -0700
Subject: [PATCH 0576/1625] Farmr + Silicoin - ports update

---
 scripts/farmr_setup.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/farmr_setup.sh b/scripts/farmr_setup.sh
index b5d54d97..ca0dcc49 100644
--- a/scripts/farmr_setup.sh
+++ b/scripts/farmr_setup.sh
@@ -72,6 +72,11 @@ if [[ "${farmr_skip_launch}" == 'false' &&  (${mode} == 'fullnode' || ${mode} =~
 		cp -n blockchain/nch.json.template blockchain/nch.json
 		echo "/chia-blockchain/venv/bin/chia" > override-nch-binary.txt
 	elif [[ ${blockchains} == 'silicoin' ]]; then
+		sed -i 's/11560/22560/g' blockchain/sit.json.template
+		sed -i 's/11559/22559/g' blockchain/sit.json.template
+		sed -i 's/11555/22555/g' blockchain/sit.json.template
+		sed -i 's/11256/22256/g' blockchain/sit.json.template
+		sed -i 's/56402/22402/g' blockchain/sit.json.template
 		cp -n blockchain/sit.json.template blockchain/sit.json
 		echo "/silicoin-blockchain/venv/bin/sit" > override-sit-binary.txt
 	elif [[ ${blockchains} == 'staicoin' ]]; then

From c3d0cd8f3c4e0b78562d2ab5d10dcadb6db03d46 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 12:09:24 -0700
Subject: [PATCH 0577/1625] Testing Chia main branch - DO NOT RUN!

---
 .github/workflows/develop-chia.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 01f6bf05..cf7b619b 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -41,7 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=develop"
-            "CHIA_BRANCH=1.2.11"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

From 3614ecc16442e426e623c55fadbef7976bcabeff Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 12:13:48 -0700
Subject: [PATCH 0578/1625] Latest hash, disable pip fix to test.

---
 scripts/forks/chia_install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index df47ab5b..5582c584 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -4,8 +4,8 @@
 #
 
 CHIA_BRANCH=$1
-# On 2021-11-06
-HASH=b74a3f3849cadeece2fac3efa3cb55d7d3a0647f
+# On 2022-02-07
+HASH=f2fe1dca6266f9b1f8ab61798ad40e5985f50b23
 
 if [ -z ${CHIA_BRANCH} ]; then
 	echo 'Skipping Chia install as not requested.'
@@ -16,6 +16,6 @@ else
 	git checkout $HASH
 	chmod +x install.sh
 	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+	#sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 fi

From 8dc5ac6f0bdc7c79d1cd1ce29777962b7d795870 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 13:49:07 -0700
Subject: [PATCH 0579/1625] Temporarily disable add-ons to isolate Chia
 blockchain breakage.

---
 docker/entrypoint.sh          | 14 +++++++-------
 scripts/forks/chia_install.sh |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index cc9a88e3..b11942dd 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -54,10 +54,10 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   trap "chia stop all -d; exit 0" SIGINT SIGTERM
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
-  /usr/bin/bash /machinaris/scripts/plotman_setup.sh > /tmp/plotman_setup.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/plotman_setup.sh > /tmp/plotman_setup.log 2>&1
 
   # Conditionally install chiadog on harvesters and fullnodes
-  /usr/bin/bash /machinaris/scripts/chiadog_setup.sh > /tmp/chiadog_setup.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/chiadog_setup.sh > /tmp/chiadog_setup.log 2>&1
 
   # During concurrent startup of multiple fork containers, stagger less important setups
   sleep $[ ( $RANDOM % 180 )  + 1 ]s
@@ -66,19 +66,19 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   /usr/bin/bash /machinaris/scripts/farmr_setup.sh > /tmp/farmr_setup.log 2>&1
 
   # Conditionally install fd-cli on fullnodes, excluding Chia and Chives
-  /usr/bin/bash /machinaris/scripts/fd-cli_setup.sh > /tmp/fd-cli_setup.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/fd-cli_setup.sh > /tmp/fd-cli_setup.log 2>&1
 
   # Conditionally build bladebit on plotters and fullnodes, sleep a bit first
-  /usr/bin/bash /machinaris/scripts/bladebit_setup.sh > /tmp/bladebit_setup.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/bladebit_setup.sh > /tmp/bladebit_setup.log 2>&1
 
   # Conditionally madmax on plotters and fullnodes, sleep a bit first
-  /usr/bin/bash /machinaris/scripts/madmax_setup.sh > /tmp/madmax_setup.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/madmax_setup.sh > /tmp/madmax_setup.log 2>&1
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
-  /usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
 
   # Conditionally install forktools on fullnodes
-  /usr/bin/bash /machinaris/scripts/forktools_setup.sh > /tmp/forktools_setup.log 2>&1
+  #/usr/bin/bash /machinaris/scripts/forktools_setup.sh > /tmp/forktools_setup.log 2>&1
 
 fi
 
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 5582c584..3a63803a 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -15,7 +15,5 @@ else
 	git submodule update --init mozilla-ca 
 	git checkout $HASH
 	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	#sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
 	/usr/bin/sh ./install.sh
 fi

From 4117ff6d30ea51265b0bc6c92c9a900935a1e5f8 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 14:43:00 -0700
Subject: [PATCH 0580/1625] Packaging lib issue.

---
 scripts/plotman_setup.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/plotman_setup.sh b/scripts/plotman_setup.sh
index 4dc6f4cf..e398e1f3 100644
--- a/scripts/plotman_setup.sh
+++ b/scripts/plotman_setup.sh
@@ -3,13 +3,17 @@
 # Installs Plotman for plotting management; customized for non-interactive use by Machinaris
 #
 
-PLOTMAN_REPO_URL=https://github.com/guydavis/plotman@development
+PLOTMAN_BRANCH=development
 
 if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx') ]]; then
     if [[ ! -f /chia-blockchain/venv/bin/plotman ]]; then
-        cd /chia-blockchain
         echo 'Installing Plotman...'
-        venv/bin/pip3 install git+${PLOTMAN_REPO_URL} || venv/bin/pip3 install git+${PLOTMAN_REPO_URL}
+        cd /
+        git clone --branch ${PLOTMAN_BRANCH} https://github.com/guydavis/plotman.git
+        cd plotman
+        # Chia 1.3 requires packaging==21.0
+        sed -i 's/20.9/21.0/g' setup.cfg
+        /chia-blockchain/venv/bin/python setup.py install
         apt update && apt install -y rsync
     fi
 fi
\ No newline at end of file

From 74289ed04ee34c7825407ad1ec75f909ee5622c3 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 14:58:28 -0700
Subject: [PATCH 0581/1625] Re-enable add-ons after fixing Plotman library
 versioning.

---
 docker/entrypoint.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b11942dd..cc9a88e3 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -54,10 +54,10 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   trap "chia stop all -d; exit 0" SIGINT SIGTERM
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
-  #/usr/bin/bash /machinaris/scripts/plotman_setup.sh > /tmp/plotman_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/plotman_setup.sh > /tmp/plotman_setup.log 2>&1
 
   # Conditionally install chiadog on harvesters and fullnodes
-  #/usr/bin/bash /machinaris/scripts/chiadog_setup.sh > /tmp/chiadog_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/chiadog_setup.sh > /tmp/chiadog_setup.log 2>&1
 
   # During concurrent startup of multiple fork containers, stagger less important setups
   sleep $[ ( $RANDOM % 180 )  + 1 ]s
@@ -66,19 +66,19 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   /usr/bin/bash /machinaris/scripts/farmr_setup.sh > /tmp/farmr_setup.log 2>&1
 
   # Conditionally install fd-cli on fullnodes, excluding Chia and Chives
-  #/usr/bin/bash /machinaris/scripts/fd-cli_setup.sh > /tmp/fd-cli_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/fd-cli_setup.sh > /tmp/fd-cli_setup.log 2>&1
 
   # Conditionally build bladebit on plotters and fullnodes, sleep a bit first
-  #/usr/bin/bash /machinaris/scripts/bladebit_setup.sh > /tmp/bladebit_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/bladebit_setup.sh > /tmp/bladebit_setup.log 2>&1
 
   # Conditionally madmax on plotters and fullnodes, sleep a bit first
-  #/usr/bin/bash /machinaris/scripts/madmax_setup.sh > /tmp/madmax_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/madmax_setup.sh > /tmp/madmax_setup.log 2>&1
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
-  #/usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
+  /usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
 
   # Conditionally install forktools on fullnodes
-  #/usr/bin/bash /machinaris/scripts/forktools_setup.sh > /tmp/forktools_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/forktools_setup.sh > /tmp/forktools_setup.log 2>&1
 
 fi
 

From 86c97563ac11a9ff9ba7f5728531e81c476b5661 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 15:17:47 -0700
Subject: [PATCH 0582/1625] Exclude CAT wallet types from sum.

---
 CHANGELOG.md       |  1 +
 web/models/chia.py | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ffd4c2e..a4670044 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,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).
 
 ## [0.7.0] - 2022-03-04
+ - [Chia](https://github.com/Chia-Network/chia-blockchain) - testing of upcoming v1.3 release (labelled as v1.2.12 now)
  - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
 
 ## [0.6.9] - 2022-02-04
diff --git a/web/models/chia.py b/web/models/chia.py
index 95c3a963..5ee1719d 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -224,6 +224,19 @@ def __init__(self, wallets, cold_wallet_addresses={}):
                 'usd_balance': converters.to_usd(wallet.blockchain, total_balance),
                 'updated_at': wallet.updated_at }) 
 
+    def exclude_cat_wallets(self, wallet_details):
+        skip = 0
+        details = []
+        for line in wallet_details.split('\n'):
+            if "type CAT" in line:
+                skip = 3 # Skip next 3 lines for this CAT wallet
+            elif skip > 0:
+                skip = skip -1 
+            else:
+                details.append(line)
+        print('\n'.join(details))
+        return '\n'.join(details)
+
     def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=True):
         numeric_const_pattern = '-Total\sBalance:\s+((?: (?: \d* \. \d+ ) | (?: \d+ \.? ) )(?: [Ee] [+-]? \d+ )?)'
         rx = re.compile(numeric_const_pattern, re.VERBOSE)
@@ -232,7 +245,7 @@ def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=Tru
         for wallet in self.wallets:
             if wallet.hostname == hostname and wallet.blockchain == blockchain:
                 try:
-                    for balance in rx.findall(wallet.details):
+                    for balance in rx.findall(self.exclude_cat_wallets(wallet.details)):
                         #app.logger.info("Found balance of {0} for for {1} - {2}".format(balance, 
                         # wallet.hostname, wallet.blockchain))
                         sum += locale.atof(balance)

From 6cb98052cdffff6d2c4e218e2da1788654cbb69c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 7 Feb 2022 18:05:31 -0700
Subject: [PATCH 0583/1625] More debugging for Summary page issue report in
 Discord.

---
 web/actions/chia.py       | 4 ++++
 web/models/chia.py        | 2 +-
 web/templates/alerts.html | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/actions/chia.py b/web/actions/chia.py
index 1771867b..0564b7e4 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -130,10 +130,14 @@ def load_blockchains():
     return None
 
 def load_summaries():
+    app.logger.info("Loading Summary page data...")
     try:
         blockchains = load_blockchains()
+        app.logger.info("Found {0} blockchains states for summary page.".format(len(blockchains.rows)))
         farms = load_farm_summary()
+        app.logger.info("Found {0} blockchain farms for summary page.".format(len(farms.farms)))
         summary_stats = stats.load_summary_stats(blockchains.rows)
+        app.logger.info("Found {0} blockchain stats.".format(len(summary_stats)))
         return Summaries(blockchains, farms.farms, farms.wallets, summary_stats)
     except Exception as ex:
         app.logger.error("Error loading summary: {0}".format(str(ex)))
diff --git a/web/models/chia.py b/web/models/chia.py
index 5ee1719d..2fbc2f52 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -23,6 +23,7 @@ def __init__(self, blockchains, farms, wallets, stats):
         for blockchain in blockchains.rows:
             farm = self.find_farm(farms, blockchain['blockchain'])
             wallet = self.find_wallet(wallets, blockchain['blockchain'])
+            app.logger.info("Adding summary row for {0}".format(blockchain['blockchain']))
             self.rows.append({
                 'blockchain': blockchain['blockchain'],
                 'status': blockchain['status'],
@@ -234,7 +235,6 @@ def exclude_cat_wallets(self, wallet_details):
                 skip = skip -1 
             else:
                 details.append(line)
-        print('\n'.join(details))
         return '\n'.join(details)
 
     def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=True):
diff --git a/web/templates/alerts.html b/web/templates/alerts.html
index 727e2366..2b108f46 100644
--- a/web/templates/alerts.html
+++ b/web/templates/alerts.html
@@ -131,7 +131,8 @@ 
    Expect at least a summary notification once daily as long as running above.<
         }
         $(document).ready(function () {
             $('#data').DataTable({
-                "order": [[5, "desc"]],
+                "pageLength": 10,
+                "lengthMenu": [ [10, 25, 50, 100, 200, -1], [10, 25, 50, 100, 200, "All"] ],
                 "columnDefs": [{ "orderable": false, targets: [0] }],
             });
             $("#btnStart").click(function () {

From 38145bb2706508f874e0777f28a62c1c986e21da Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 8 Feb 2022 15:32:37 -0700
Subject: [PATCH 0584/1625] Fix connection parsing for MMX to match their
 latest behavior.

---
 api/commands/pools_cli.py         | 14 ++++++------
 web/models/chia.py                | 36 +++++++++++++++++++++----------
 web/routes.py                     |  4 +++-
 web/templates/connections.html    |  7 +++++-
 web/templates/settings/pools.html | 10 ++++-----
 5 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index 8c726b0c..49b0ee06 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -122,7 +122,7 @@ def process_pool_save(blockchain, choice, pool_wallet_id, pool_url, current_pool
 
 def process_pool_leave(blockchain, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    cmd = "{0} plotnft leave -y -i {1}".format(chia_binary, pool_wallet_id)
+    cmd = "wallet_num{0} plotnft leave -y -i {1}".format(chia_binary, pool_wallet_id)
     app.logger.info("Attempting to leave pool: {0}".format(cmd))
     result = ""
     child = pexpect.spawn(cmd)
@@ -147,7 +147,7 @@ def process_pool_leave(blockchain, pool_wallet_id):
     for line in stdout_lines:
         if "Error" in line:
             raise Exception('Error while leaving pool: ' + line)
-    return 'Successfully left pool, switching to self plotting.  Please wait a while to complete, then refresh page. View the log for details.'
+    return 'Successfully left pool, switching to self plotting.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. View the log for details.'
 
 def process_pool_join(blockchain, pool_url, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
@@ -162,10 +162,10 @@ def process_pool_join(blockchain, pool_url, pool_wallet_id):
     if not result.netloc:
         raise Exception("No hostname or IP provided.")
     if pool_wallet_id: # Just joining a pool with existing NFT
-        cmd = "{0} plotnft join -y -u {1} -i {2}".format(chia_binary, pool_url, pool_wallet_id)
+        cmd = "wallet_num{0} plotnft join -y -u {1} -i {2}".format(chia_binary, pool_url, pool_wallet_id)
         pool_wallet_id = pool_wallet_id
     else:  # Both creating NFT and joining pool in one setp
-        cmd = "{0} plotnft create -y -u {1} -s pool".format(chia_binary, pool_url)
+        cmd = "wallet_num{0} plotnft create -y -u {1} -s pool".format(chia_binary, pool_url)
         pool_wallet_id = 1
     app.logger.info("Executing: {0}".format(cmd))
     result = ""
@@ -191,11 +191,11 @@ def process_pool_join(blockchain, pool_url, pool_wallet_id):
         for line in stdout_lines:
             if "Error" in line:
                 raise Exception('Error while joining Chia pool. Please double-check pool URL: {0} {1}'.format(pool_url, line))
-    return 'Successfully joined {0} pool by creating Chia NFT.  Please wait a while to complete, then refresh this page. DO NOT immediately re-submit the request. Be patient! View the log for details.'.format(pool_url)
+    return 'Successfully joined {0} pool by creating Chia NFT.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. Be patient! View the log for details.'.format(pool_url)
 
 def process_self_pool(blockchain, pool_wallet_id):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    cmd = "{0} plotnft create -y -s local".format(chia_binary)
+    cmd = "wallet_num{0} plotnft create -y -s local".format(chia_binary)
     app.logger.info("Attempting to create NFT for self-pooling. {0}".format(cmd))
     result = ""
     child = pexpect.spawn(cmd)
@@ -220,4 +220,4 @@ def process_self_pool(blockchain, pool_wallet_id):
     for line in stdout_lines:
         if "Error" in line:
             raise Exception('Error while creating self-pooling NFT: {0}'.format(line))
-    return 'Successfully created a NFT for self-pooling.  Please wait a while to complete, then refresh the page. DO NOT immediately re-submit the request. Be patient! View the log for details.'
+    return 'Successfully created a NFT for self-pooling.  Please wait a few minutes or more to complete. DO NOT immediately re-submit your request. Be patient! View the log for details.'
diff --git a/web/models/chia.py b/web/models/chia.py
index 2fbc2f52..2348fa95 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -482,7 +482,7 @@ def blockchain_port(self,blockchain):
         if blockchain == 'nchain':
             return 58445
         if blockchain == 'mmx':
-            return 12331
+            return 12334
         if blockchain == 'maize':
             return 8644
         if blockchain == 'silicoin':
@@ -502,7 +502,9 @@ def parse_chia(self, connection, blockchain):
         conns = []
         for line in connection.details.split('\n'):
             try:
-                if line.strip().startswith('Connections:'):
+                if line.strip().startswith('Connections:') or \
+                    line.strip().startswith('Connection error.') or \
+                    line.strip().startswith('This is normal if full node'):
                     pass
                 elif line.strip().startswith('Type'):
                     self.columns = line.lower().replace('last connect', 'last_connect') \
@@ -522,14 +524,13 @@ def parse_chia(self, connection, blockchain):
                 else:
                     vals = line.strip().split()
                     if len(vals) > 7:
+                        last_connect = str(datetime.datetime.today().year) + ' ' + vals[4] + ' ' + vals[5] + ' ' + vals[6]
                         connection = {
                             'type': vals[0],
                             'ip': vals[1],
                             'ports': vals[2],
                             'nodeid': vals[3].replace('...',''),
-                            'last_connect': datetime.datetime.strptime( \
-                                str(datetime.datetime.today().year) + ' ' + vals[4] + ' ' + vals[5] + ' ' + vals[6], 
-                                '%Y %b %d %H:%M:%S'),
+                            'last_connect': datetime.datetime.strptime(last_connect, '%Y %b %d %H:%M:%S'),
                             'mib_up': float(vals[7].split('|')[0]),
                             'mib_down': float(vals[7].split('|')[1])
                         }
@@ -541,6 +542,7 @@ def parse_chia(self, connection, blockchain):
                     else:
                         app.logger.info("Bad connection line: {0}".format(line))
             except:
+                app.logger.info("Exception parsing connection line: {0}".format(line))
                 app.logger.info(traceback.format_exc())
         return conns
 
@@ -549,18 +551,18 @@ def parse_mmx(self, connection, blockchain):
         for line in connection.details.split('\n'):
             try:
                 #app.logger.info(line)
-                m = re.match("\[(.+)\]   height =  (\d+), (\d+\.?\d*) MB recv, (\d*\.?\d*) MB sent, timeout = (\d+\.?\d*) sec", line.strip(), re.IGNORECASE)
+                m = re.match("\[(.+)\]\s+height\s+=\s+(\!?\d+), (\w+) \(\d+\.\d+\), (\d+\.?\d*) (\w)B/s recv, (\d*\.?\d*) (\w)B/s send,.* since (\d+) min, .* (\d+\.?\d?) sec timeout", line.strip(), re.IGNORECASE)
                 if m:
                     connection = {
-                        'type': 'peer',
+                        'type': m.group(3),
                         'ip': m.group(1),
                         'height': m.group(2),
                         'ports': '',
                         'nodeid': '',
-                        'last_connect': '',
-                        'mib_up': m.group(4),
-                        'mib_down': m.group(3),
-                        'timeout': m.group(5)
+                        'last_connect': 'since {0} min'.format(m.group(8)),
+                        'mib_up': "%.1f"% round(self.rate_to_mb(m.group(6), m.group(7)) * int(m.group(8)) * 60, 2),
+                        'mib_down': "%.1f"% round(self.rate_to_mb(m.group(4), m.group(5)) * int(m.group(8)) * 60, 2),
+                        'timeout': m.group(9)
                     }
                     conns.append(connection)
                 elif line.strip():
@@ -569,3 +571,15 @@ def parse_mmx(self, connection, blockchain):
                 app.logger.info(traceback.format_exc())
         return conns
 
+    def rate_to_mb(self, rate, unit):
+        if unit.lower() == 'k':
+            try:
+                return float(rate) / 1024
+            except:
+                app.logger.error("Invalid transmission rate in KB/sec provided: {0}".format(rate))
+                return rate
+        elif unit.lower() == 'm':
+            return float(rate)
+        else:
+            app.logger.error("Unknown transmission rate unit character of {0} encountered.".format(unit))
+            return rate
diff --git a/web/routes.py b/web/routes.py
index 5041c8e9..f2dde069 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -316,7 +316,9 @@ def settings_pools():
         selected_fullnode = worker.get_fullnode(selected_blockchain)
         launcher_ids = request.form.getlist('{0}-launcher_id'.format(selected_blockchain))
         wallet_nums = request.form.getlist('{0}-wallet_num'.format(selected_blockchain))
-        choices = request.form.getlist('{0}-choice'.format(selected_blockchain))
+        choices = []
+        for num in wallet_nums:
+            choices.append(request.form.get('{0}-choice-{1}'.format(selected_blockchain, num)))
         pool_urls = request.form.getlist('{0}-pool_url'.format(selected_blockchain))
         current_pool_urls = request.form.getlist('{0}-current_pool_url'.format(selected_blockchain))
         p.send_request(selected_fullnode, selected_blockchain, launcher_ids, choices, pool_urls, wallet_nums, current_pool_urls)
diff --git a/web/templates/connections.html b/web/templates/connections.html
index ca7ac63c..3d08f2e4 100644
--- a/web/templates/connections.html
+++ b/web/templates/connections.html
@@ -103,12 +103,13 @@
                         
    
                             
    
                                 
    
+                                    {% if connection.blockchain != 'mmx' %}
                                     
+                                    {% endif %}
                                 
    
-
                                 
    
@@ -116,16 +117,20 @@
                                     
                                 
    
                                 
    
+                                    {% if connection.blockchain != 'mmx' %}
                                     
+                                    {% endif %}
                                 
    
                                 
    
+                                    {% if connection.blockchain != 'mmx' %}
                                     
+                                    {% endif %}
                                 
    
                         
    
                     
diff --git a/web/templates/settings/pools.html b/web/templates/settings/pools.html
index e177b44a..66648f13 100644
--- a/web/templates/settings/pools.html
+++ b/web/templates/settings/pools.html
@@ -103,8 +103,8 @@ 
    Wallet ID: {{ plotnft.wallet_num }}
    
                                 
    
                                 {% endif %}
                                 
    
-                                    
                                     
    
                             
    
                                 
    
-                                    
                                      
                                     
                                 
    
                                 
    
-                                    
                                 
    

From 77d5e6c86b8ce358b791d0ded48fa4968aa066b9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 9 Feb 2022 09:35:44 -0700
Subject: [PATCH 0585/1625] Chiadog config for Silicoin.

---
 config/chiadog/silicoin.sample.yaml | 91 +++++++++++++++++++++++++++++
 scripts/chiadog_setup.sh            |  2 +-
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 config/chiadog/silicoin.sample.yaml

diff --git a/config/chiadog/silicoin.sample.yaml b/config/chiadog/silicoin.sample.yaml
new file mode 100644
index 00000000..99276c3b
--- /dev/null
+++ b/config/chiadog/silicoin.sample.yaml
@@ -0,0 +1,91 @@
+# This is useful to differentiate multiple
+# instances monitoring multiple harvesters
+notification_title_prefix: '$HOSTNAME-silicoin'
+log_level: INFO
+coin_name: 'silicoin'
+coin_symbol: 'sit'
+
+# Only one consumer can be enabled at a time, you can
+# delete the section for the consumer which you aren't using
+# DON'T CHANGE file_path IT'S ALREADY SET IN-CONTAINER FOR MACHINARIS!
+chia_logs:
+  file_log_consumer:
+    enable: true
+    prefix: 'chia'
+    file_path: '~/.chia/sit/mainnet/log/debug.log'
+
+# Enable this and chiadog will ping a remote server every 5 minutes
+# That way you can know that the monitoring is running as expected
+#keep_alive_monitor:
+#  enable_remote_ping: false
+#  ping_url: ''
+
+# Enable this and you'll receive a daily summary notification
+# on your farm performance at the specified time of the day.
+daily_stats:
+  enable: true
+  time_of_day: 21
+
+# We support a lot of notifiers, please check the README for more
+# information. You can delete the sections which you aren't using.
+# You can also enable more than one notifier and send different
+# notifications to each of them. E.g. enable daily_stats only to E-mail.
+# If you enable wallet_events you'll get notifications anytime your
+# wallet receives some XCH (e.g. farming reward).
+notifier:
+  pushover:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      api_token: 'dummy_token'
+      user_key: 'dummy_key'
+  telegram:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      bot_token: 'dummy_bot_token'
+      chat_id: 'dummy_chat_id'
+  smtp:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      sender: 'silicoin@example.com'
+      sender_name: 'Machinaris'
+      recipient: 'you@example.com'
+      username_smtp: 'username'
+      password_smtp: 'password'
+      host: 'smtp.example.com'
+      port: 587
+  script:
+    # DON'T CHANGE THIS SCRIPT NOTIFIER, IT'S USED BY MACHINARIS!
+    enable: true
+    daily_stats: true
+    wallet_events: true
+    script_path: '/root/.chia/chiadog/notifier.sh'
+  discord:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      webhook_url: 'https://discord.com/api/webhooks/...'
+  slack:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+     webhook_url: 'https://hooks.slack.com/services/...'
+  mqtt:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    topic: silicoin/silicoindog/alert
+    qos: 1
+    retain: false
+    credentials:
+      host: '192.168.0.10'
+      port: 8883
+      username: ''
+      password: ''
diff --git a/scripts/chiadog_setup.sh b/scripts/chiadog_setup.sh
index 147d686f..fce751c2 100644
--- a/scripts/chiadog_setup.sh
+++ b/scripts/chiadog_setup.sh
@@ -22,7 +22,7 @@ if [[ (${mode} == 'fullnode' || ${mode} =~ "harvester") && ${blockchains} != 'mm
     echo 'Configuring Chiadog...'
     mkdir -p /root/.chia/chiadog/logs
     cp -n /machinaris/config/chiadog/${blockchains}.sample.yaml /root/.chia/chiadog/config.yaml
-    sed "s/\$HOSTNAME/`hostname -s`/g" /root/.chia/chiadog/config.yaml
+    sed -i "s/\$HOSTNAME/`hostname -s`/g" /root/.chia/chiadog/config.yaml
     cp -f /machinaris/scripts/chiadog_notifier.sh /root/.chia/chiadog/notifier.sh && chmod 755 /root/.chia/chiadog/notifier.sh
     echo 'Starting Chiadog...'
     cd /chiadog

From 7dc87ca7ba6e94f4b9eb5dde686466046ebb0dff Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 11 Feb 2022 10:45:21 -0700
Subject: [PATCH 0586/1625] Use Chia main branch.

---
 .github/workflows/develop-mmx.yaml | 2 +-
 .github/workflows/main-chia.yaml   | 2 +-
 .github/workflows/main-mmx.yaml    | 2 +-
 .github/workflows/test-chia.yaml   | 2 +-
 .github/workflows/test-mmx.yaml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 3f46a7ab..7b6810c6 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
-            "CHIA_BRANCH=1.2.11"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 93f143c7..c4cdcb27 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -42,7 +42,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=1.2.11"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index b808d591..73f8b44c 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -43,7 +43,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=latest"
             "MMX_BRANCH=master"
-            "CHIA_BRANCH=1.2.11"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index f3589be2..52f98121 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -41,7 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
-            "CHIA_BRANCH=1.2.11"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index 6b4f57cb..ec0f3374 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=test"
             "MMX_BRANCH=master"
-            "CHIA_BRANCH=1.2.11"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test

From 2c342b0b77f5b5874fd39a5c424fa06490007fb4 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 12 Feb 2022 15:20:14 -0700
Subject: [PATCH 0587/1625] Link to Chia 1.3 beta.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4670044..367e7a69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,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).
 
 ## [0.7.0] - 2022-03-04
- - [Chia](https://github.com/Chia-Network/chia-blockchain) - testing of upcoming v1.3 release (labelled as v1.2.12 now)
+ - [Chia](https://www.chia.net/2022/02/09/1.3-beta-release.en.html) - beta of v1.3 release (chia version reports v1.2.12dev254 currently)
  - [Silicoin](https://github.com/silicoin-network/silicoin-blockchain) - supported again as per Discord votes.
 
 ## [0.6.9] - 2022-02-04

From f2eb5ab101c0a14f61e39466638c76d6fe894e88 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 12 Feb 2022 15:52:51 -0700
Subject: [PATCH 0588/1625] Start on localization.

---
 docker/dockerfile.base | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/dockerfile.base b/docker/dockerfile.base
index a58429c3..320ad749 100644
--- a/docker/dockerfile.base
+++ b/docker/dockerfile.base
@@ -17,6 +17,8 @@ RUN apt-get update \
 		iproute2 \
 		iputils-ping \
 		jq \
+		locales \
+		locales-all \
 		logrotate \
 		lsb-release \
 		openssl \

From e0ecc79c17ab1ab8af9030b446886aa2e0e542ca Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 12 Feb 2022 15:57:58 -0700
Subject: [PATCH 0589/1625] Default locale.

---
 docker/dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/dockerfile b/docker/dockerfile
index 883b39f5..086c1a27 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -85,6 +85,9 @@ ENV FORKTOOLSHIDDENDIRS=/root
 
 ENV PATH="${PATH}:/chia-blockchain/venv/bin:/forktools:/mmx-node/build"
 ENV TZ=Etc/UTC
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
 ENV FLASK_ENV=production
 ENV XDG_CONFIG_HOME=/root/.chia
 ENV AUTO_PLOT=false

From 1fbbbcc1069bea123665c4e6093fbdf990a46979 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Feb 2022 20:11:54 -0700
Subject: [PATCH 0590/1625] Start on translations.

---
 api/__init__.py                             |   9 +-
 api/babel.cfg                               |   3 +
 api/default_settings.py                     |   2 +
 api/translations/de/LC_MESSAGES/messages.po |  20 +++
 api/translations/fr/LC_MESSAGES/messages.po |  20 +++
 common/config/globals.py                    |   2 +-
 docker/dockerfile                           |   1 +
 scripts/forks/mmx_launch.sh                 |   5 +
 scripts/i18n/compile.sh                     |  21 ++++
 scripts/i18n/extract.sh                     |  17 +++
 scripts/i18n/init.sh                        |  20 +++
 web/__init__.py                             |   9 +-
 web/babel.cfg                               |   3 +
 web/default_settings.py                     |   2 +
 web/routes.py                               |  26 ++--
 web/templates/setup.html                    |  50 ++++----
 web/translations/de/LC_MESSAGES/messages.po | 129 +++++++++++++++++++
 web/translations/fr/LC_MESSAGES/messages.po | 130 ++++++++++++++++++++
 18 files changed, 425 insertions(+), 44 deletions(-)
 create mode 100644 api/babel.cfg
 create mode 100644 api/translations/de/LC_MESSAGES/messages.po
 create mode 100644 api/translations/fr/LC_MESSAGES/messages.po
 create mode 100644 scripts/i18n/compile.sh
 create mode 100644 scripts/i18n/extract.sh
 create mode 100644 scripts/i18n/init.sh
 create mode 100644 web/babel.cfg
 create mode 100644 web/translations/de/LC_MESSAGES/messages.po
 create mode 100644 web/translations/fr/LC_MESSAGES/messages.po

diff --git a/api/__init__.py b/api/__init__.py
index 1f49401f..70c3b9e7 100644
--- a/api/__init__.py
+++ b/api/__init__.py
@@ -5,7 +5,7 @@
 
 import logging
 
-from flask import Flask
+from flask import Flask, request
 from flask_babel import Babel
 from flask_migrate import Migrate
 from sqlalchemy.engine import Engine
@@ -32,6 +32,13 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 app.config.from_envvar('API_SETTINGS_FILE', silent=True)
 babel = Babel(app)
 
+@babel.localeselector
+def get_locale():
+    for d in babel.translation_directories:
+        app.logger.debug(d)
+    app.logger.debug("Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+    return request.accept_languages.best_match(app.config['LANGUAGES'])
+
 from common.extensions.database import db
 migrate = Migrate(app, db)
 
diff --git a/api/babel.cfg b/api/babel.cfg
new file mode 100644
index 00000000..0cc0baca
--- /dev/null
+++ b/api/babel.cfg
@@ -0,0 +1,3 @@
+[python: **.py]
+[jinja2: **/templates/**.html]
+extensions=jinja2.ext.autoescape,jinja2.ext.with_
\ No newline at end of file
diff --git a/api/default_settings.py b/api/default_settings.py
index 2c87a676..a275a31c 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -49,3 +49,5 @@ class DefaultConfig:
 
     STATUS_EVERY_X_MINUTES = 2  # Run status collection once every two minutes by default
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
+
+    LANGUAGES = ['de', 'fr']
diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..c327094c
--- /dev/null
+++ b/api/translations/de/LC_MESSAGES/messages.po
@@ -0,0 +1,20 @@
+# German translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-13 15:24-0700\n"
+"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: de\n"
+"Language-Team: de \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..157c0932
--- /dev/null
+++ b/api/translations/fr/LC_MESSAGES/messages.po
@@ -0,0 +1,20 @@
+# French translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-13 15:24-0700\n"
+"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: fr\n"
+"Language-Team: fr \n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
diff --git a/common/config/globals.py b/common/config/globals.py
index 38ba35b0..3a6514c5 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -148,7 +148,7 @@ def is_setup():
 CHIA_BLOCKCHAIN_DB_SIZE = 45 * 1024 * 1024 * 1024 # Almost 45 uncompressed GB in early 2022
 def blockchain_downloading():
     db_path = '/root/.chia/mainnet/db'
-    if path.exists(f"{db_path}/blockchain_v1_mainnet.sqlite"):
+    if path.exists(f"{db_path}/blockchain_v1_mainnet.sqlite") or path.exists(f"{db_path}/blockchain_v2_mainnet.sqlite"):
         return [100, None]
     tmp_path =  f"{db_path}/chia"
     if not path.exists(tmp_path):
diff --git a/docker/dockerfile b/docker/dockerfile
index 086c1a27..84dc6866 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -44,6 +44,7 @@ RUN \
 	&& /usr/bin/bash /machinaris/scripts/forks/stor_install.sh ${STOR_BRANCH} \
     && /usr/bin/bash /machinaris/scripts/pull_3rd_party_libs.sh \
 	&& /usr/bin/bash /machinaris/scripts/machinaris_install.sh \
+	&& /usr/bin/bash /machinaris/scripts/i18n/compile.sh \
 	&& rm -rf \
 		/root/.cache \
 		/tmp/* \
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index 22f7ef8d..231ee0bf 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -44,6 +44,11 @@ elif [[ ${OPENCL_GPU} == 'amd' ]]; then
 	# If AMD GPU is older than vega 10,use under command, but can't promise work normally.
 	# Because, with --opencl=legacy, dkms will must be installed, it may pollute your kernel
 	# amdgpu-install -y --usecase=opencl --opencl=rocr,legacy --no-32 --accept-eula
+elif [[ ${OPENCL_GPU} == 'intel' ]]; then
+	apt update
+	apt install -y intel-opencl-icd
+else
+	echo "No OPENCL_GPU provided.  MMX blockchain will use use CPU instead."
 fi
 
 # Symlink the NETWORK file, use 'test4' for now
diff --git a/scripts/i18n/compile.sh b/scripts/i18n/compile.sh
new file mode 100644
index 00000000..bcd0263a
--- /dev/null
+++ b/scripts/i18n/compile.sh
@@ -0,0 +1,21 @@
+#
+# Compile current messages.po into messages.mo for use at runtime.
+#
+
+# If building on Github servers, change to deployment root
+if [ `pwd` != '/code/machinaris' ]; then  # else stay in code root
+    cd /machinaris
+fi
+
+for d in 'web' 'api'; 
+do
+    pushd $d >/dev/null
+    LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" ./default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
+    IFS=',';
+    for lang in $LANGS; 
+    do 
+        pybabel compile -d ./translations
+        chmod 777 ./translations/$lang/LC_MESSAGES/*
+    done
+    popd >/dev/null
+done
diff --git a/scripts/i18n/extract.sh b/scripts/i18n/extract.sh
new file mode 100644
index 00000000..a80e3c65
--- /dev/null
+++ b/scripts/i18n/extract.sh
@@ -0,0 +1,17 @@
+#
+# Generate messages for internationalization.
+#
+
+for d in 'web' 'api'; 
+do
+    pushd $d >/dev/null
+    LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" ./default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
+    IFS=',';
+    for lang in $LANGS; 
+    do 
+        pybabel extract -F babel.cfg -k _l -o messages.pot .
+        pybabel update -i messages.pot -d ./translations
+        chmod 777 ./translations/$lang/LC_MESSAGES/*
+    done
+    popd >/dev/null
+done
diff --git a/scripts/i18n/init.sh b/scripts/i18n/init.sh
new file mode 100644
index 00000000..8565b0ee
--- /dev/null
+++ b/scripts/i18n/init.sh
@@ -0,0 +1,20 @@
+#
+# Initialize translation files for each supported language.
+#
+
+for d in 'web' 'api'; 
+do
+    pushd $d >/dev/null
+    LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" ./default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
+    IFS=',';
+    for lang in $LANGS; 
+    do 
+        #if [ -d ./translations/$lang ]; then
+        #    echo "Skipping initialization of $d/$lang as translations folder already exists."
+        #else
+            pybabel init -i messages.pot -d ./translations -l $lang
+            chmod 777 ./translations/$lang/LC_MESSAGES/*
+        #fi
+    done
+    popd >/dev/null
+done
diff --git a/web/__init__.py b/web/__init__.py
index 4a0299fc..ff95f360 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -3,7 +3,7 @@
 import pytz
 import re
 
-from flask import Flask
+from flask import Flask, request
 from flask_babel import Babel
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.engine import Engine
@@ -18,6 +18,13 @@
 app.config.from_envvar('WEB_SETTINGS_FILE', silent=True)
 babel = Babel(app)
 
+@babel.localeselector
+def get_locale():
+    for d in babel.translation_directories:
+        app.logger.debug(d)
+    app.logger.debug("Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+    return request.accept_languages.best_match(app.config['LANGUAGES'])
+
 @event.listens_for(Engine, "connect")
 def set_sqlite_pragma(dbapi_connection, connection_record):
     cursor = dbapi_connection.cursor()
diff --git a/web/babel.cfg b/web/babel.cfg
new file mode 100644
index 00000000..0cc0baca
--- /dev/null
+++ b/web/babel.cfg
@@ -0,0 +1,3 @@
+[python: **.py]
+[jinja2: **/templates/**.html]
+extensions=jinja2.ext.autoescape,jinja2.ext.with_
\ No newline at end of file
diff --git a/web/default_settings.py b/web/default_settings.py
index ddb43012..e6483446 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -37,3 +37,5 @@ class DefaultConfig:
     CONTROLLER_PORT = os.environ['controller_api_port'] if 'controller_api_port' in os.environ else '8926'
 
     MAX_CHART_CHALLENGES_MINS = 15
+
+    LANGUAGES = ['de', 'fr']
diff --git a/web/routes.py b/web/routes.py
index f2dde069..b5754f9a 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -10,6 +10,8 @@
 from datetime import datetime
 from flask import Flask, flash, redirect, render_template, abort, \
         request, session, url_for, send_from_directory, make_response
+from flask_babel import _
+from flask_babel import lazy_gettext as _l
 
 from common.config import globals
 from common.models import pools as po
@@ -63,7 +65,7 @@ def setup():
         elif request.form.get('action') == 'import':
             show_setup = not chia.import_key(key_paths[0], request.form.get('mnemonic'), globals.enabled_blockchains()[0])
     [download_percentage, blockchain_download_size] = globals.blockchain_downloading()
-    app.logger.info(f"Blockchain download @ {download_percentage}% - {blockchain_download_size}")
+    app.logger.info(_("Blockchain download") + f" @ {download_percentage}% - {blockchain_download_size}")
     if show_setup:
         return render_template('setup.html', key_paths = key_paths, 
             blockchain_download_size=blockchain_download_size, download_percentage=download_percentage)
@@ -95,7 +97,7 @@ def plotting_jobs():
             plot_ids = request.form.getlist('plot_id')
             plotman.action_plots(action, plot_ids)
         else:
-            app.logger.info("Unknown plotting form: {0}".format(request.form))
+            app.logger.info(_("Unknown plotting form") + ": {0}".format(request.form))
         return redirect(url_for('plotting_jobs')) # Force a redirect to allow time to update status
     plotters = plotman.load_plotters()
     plotting = plotman.load_plotting_summary()
@@ -144,7 +146,7 @@ def farming_data():
         return make_response({'draw': draw, 'recordsTotal': recordsTotal, 'recordsFiltered': recordsFiltered, "data": data}, 200)
     except: 
         traceback.print_exc()
-    return make_response("Error! Please see logs.", 500)
+    return make_response(_("Error! Please see logs."), 500)
 
 @app.route('/farming/workers')
 def farming_workers():
@@ -170,7 +172,7 @@ def alerts():
         elif request.form.get('action') == 'purge':
             chiadog.remove_all_alerts()
         else:
-            app.logger.info("Unknown alerts form: {0}".format(request.form))
+            app.logger.info(_("Unknown alerts form") + ": {0}".format(request.form))
         return redirect(url_for('alerts')) # Force a redirect to allow time to update status
     farmers = chiadog.load_farmers()
     notifications = chiadog.get_notifications()
@@ -239,7 +241,7 @@ def connections():
         elif request.form.get('action') == 'remove':
             chia.remove_connection(request.form.getlist('nodeid'), request.form.get('hostname'), request.form.get('blockchain'))
         else:
-            app.logger.info("Unknown form action: {0}".format(request.form))
+            app.logger.info(_("Unknown form action") + ": {0}".format(request.form))
     connections = chia.load_connections()
     return render_template('connections.html', reload_seconds=120, selected_blockchain = selected_blockchain,
         connections=connections, global_config=gc)
@@ -354,31 +356,31 @@ def views_settings_config(path):
     config_type = request.args.get('type')
     w = worker.get_worker(request.args.get('worker'), request.args.get('blockchain'))
     if not w:
-        app.logger.info("No worker at {0} for fork {1}. Please select another fork.".format(
-                request.args.get('worker'), request.args.get('blockchain')))
+        app.logger.info(_l("No worker at %{worker} for fork %{blockchain}. Please select another fork.",
+            worker=request.args.get('worker'), blockchain=request.args.get('blockchain')))
         abort(404)
     if config_type == "alerts":
         try:
             response = make_response(chiadog.load_config(w, request.args.get('blockchain')), 200)
         except requests.exceptions.ConnectionError as ex:
-            response = make_response("For Alerts config, found no responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
+            response = make_response(_("For Alerts config, found no responding fullnode found for %{blockchain}. Please check your workers.", blockchain=request.args.get('blockchain')))
     elif config_type == "farming":
         try:
             response = make_response(chia.load_config(w, request.args.get('blockchain')), 200)
         except requests.exceptions.ConnectionError as ex:
-            response = make_response("For Farming config, found no responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
+            response = make_response(_("For Farming config, found no responding fullnode found for %{blockchain}. Please check your workers.", blockchain=request.args.get('blockchain')))
     elif config_type == "plotting":
         try:
             [replaced, config] = plotman.load_config(w, request.args.get('blockchain'))
             response = make_response(config, 200)
             response.headers.set('ConfigReplacementsOccurred', replaced)
         except requests.exceptions.ConnectionError as ex:
-            response = make_response("For Plotting config, found no responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
+            response = make_response(_("For Plotting config, found no responding fullnode found for %{blockchain}. Please check your workers.", blockchain=request.args.get('blockchain')))
     elif config_type == "tools":
         try:
             response = make_response(forktools.load_config(w, request.args.get('blockchain')), 200)
         except requests.exceptions.ConnectionError as ex:
-            response = make_response("No responding fullnode found for {0}. Please check your workers.".format(request.args.get('blockchain')))
+            response = make_response(_("No responding fullnode found for %{blockchain}. Please check your workers.", blockchain=request.args.get('blockchain')))
     else:
         abort("Unsupported config type: {0}".format(config_type), 400)
     response.mimetype = "application/x-yaml"
@@ -397,7 +399,7 @@ def logfile():
         blockchain = request.args.get("blockchain")
         return log_handler.get_log_lines(w, log_type, log_id, blockchain)
     else:
-        abort(500, "Unsupported log type: {0}".format(log_type))
+        abort(500, _("Unsupported log type") + ": {0}".format(log_type))
 
 @app.route('/worker_launch')
 def worker_launch():
diff --git a/web/templates/setup.html b/web/templates/setup.html
index 0c8c6b7a..4c2b2a32 100644
--- a/web/templates/setup.html
+++ b/web/templates/setup.html
@@ -24,8 +24,8 @@
                     
                     
    
-                        
    Welcome to Machinaris!
    
-                        
    An easy-to-use WebUI for Chia™ plotting and farming.
    
+                        
    {{_('Welcome to Machinaris!')}}
    
+                        
    {{_('An easy-to-use WebUI for Chia%(trademark)s plotting and farming.', trademark='™')}}
    
                     
    
                     
    
                     
    
@@ -58,13 +58,11 @@
                         
    
                         
    
 
-                        
    On very first launch, the Chia blockchain database (~20 GB compressed) is being downloaded from
-                        https://www.chia-database.com/.  
-                        At about 45 GB in uncompressed size (progress shown above), this will take a while.
    
-
-                        
    However minutes of download now, will save you multiple days of blockchain syncing later. 
-                            Please be patient!
    
-
+                        
    {{_(
+                            'On very first launch, the Chia compressed blockchain database %(compressed)s is being downloaded from %(dl_link)s. At about %(uncompressed)s in uncompressed size (progress shown above), this will take a while. However minutes of download now, will save you multiple days of blockchain syncing later. Please be patient!', 
+                            compressed="(~20 GB)", uncompressed="45 GB",
+                            dl_link='https://www.chia-database.com/'
+                        )}}
    
                         
    
                         
    
                         
    
@@ -74,33 +72,28 @@
                         
    
                         
    
 
-                        
    NOTE: If you would prefer to allow Chia to sync the blockchain over many days,
-                            see the Wiki for details. Similarly, you may instead
-                                import your own blockchain if you have one from a previous Chia install.
-                        
    
+                        
    {{_(
+                                'NOTE: If you would prefer to allow Chia to sync the blockchain over many days, see the %(init_link)s for details. Similarly, you may instead %(import_link_open)s import your own blockchain %(import_link_close)s if you have one from a previous Chia install.',
+                                init_link='Wiki',
+                                import_link_open='', import_link_close=''
+                        )}}
    
 
                         {% else %}
 
-                        
    To get started with Machinaris as a Chia™ fullnode, either import your existing
-                            24-word
-                            mnemonic seed phrase: 
    
+                        
    {{_('To get started with Machinaris as a Chia%(trademark)s fullnode, either import your existing 24-word mnemonic seed phrase', trademark='™')}}: 
    
                         
                         
    
                             
                             
    
-                            
-                            
    OR
    
+                            
+                            
    {{_('OR')}}
    
 
-                            
    You can generate a brand-new mnemonic phrase that will be written to this in-container
-                                path: {{ key_paths[0] }}
+                            
    {{_('You can generate a brand-new mnemonic phrase that will be written to this in-container path')}}:
+                                {{ key_paths[0] }}
                             
    
-                            
+                            
                         
    
 
                         
    
@@ -112,10 +105,9 @@ 
    OR
    
                         
    
                         
    
 
-                        
    NOTE: If you would prefer to instead import your mnenmoic seed phrase yourself
-                            at the command-line,
-                            see the Wiki for details.
    
+                        
    {{_('NOTE: If you would prefer to instead import your mnenmoic seed phrase yourself at the command-line, see the %(wiki_link)s for details.', 
+                            wiki_link='Wiki')}}
+                        
    
 
                         {% endif %}
                     
    
diff --git a/web/translations/de/LC_MESSAGES/messages.po b/web/translations/de/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..2e6b4d90
--- /dev/null
+++ b/web/translations/de/LC_MESSAGES/messages.po
@@ -0,0 +1,129 @@
+# German translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-13 15:24-0700\n"
+"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: de\n"
+"Language-Team: de \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: routes.py:68
+msgid "Blockchain download"
+msgstr ""
+
+#: routes.py:100
+msgid "Unknown plotting form"
+msgstr ""
+
+#: routes.py:149
+msgid "Error! Please see logs."
+msgstr ""
+
+#: routes.py:175
+msgid "Unknown alerts form"
+msgstr ""
+
+#: routes.py:244
+msgid "Unknown form action"
+msgstr ""
+
+#: routes.py:360
+msgid "No worker at %{worker} for fork %{blockchain}. Please select another fork."
+msgstr ""
+
+#: routes.py:366
+msgid ""
+"For Alerts config, found no responding fullnode found for %{blockchain}. "
+"Please check your workers."
+msgstr ""
+
+#: routes.py:371
+msgid ""
+"For Farming config, found no responding fullnode found for %{blockchain}."
+" Please check your workers."
+msgstr ""
+
+#: routes.py:378
+msgid ""
+"For Plotting config, found no responding fullnode found for "
+"%{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:383
+msgid "No responding fullnode found for %{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:402
+msgid "Unsupported log type"
+msgstr ""
+
+#: templates/setup.html:27
+msgid "Welcome to Machinaris!"
+msgstr "Willkommen zu"
+
+#: templates/setup.html:28
+#, python-format
+msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
+msgstr ""
+
+#: templates/setup.html:61
+#, python-format
+msgid ""
+"On very first launch, the Chia compressed blockchain database "
+"%(compressed)s is being downloaded from %(dl_link)s. At about "
+"%(uncompressed)s in uncompressed size (progress shown above), this will "
+"take a while. However minutes of download now, will save you multiple "
+"days of blockchain syncing later. Please be patient!"
+msgstr ""
+
+#: templates/setup.html:75
+#, python-format
+msgid ""
+"NOTE: If you would prefer to allow Chia to sync the blockchain over many "
+"days, see the %(init_link)s for details. Similarly, you may instead "
+"%(import_link_open)s import your own blockchain %(import_link_close)s if "
+"you have one from a previous Chia install."
+msgstr ""
+
+#: templates/setup.html:83
+#, python-format
+msgid ""
+"To get started with Machinaris as a Chia%(trademark)s fullnode, either "
+"import your existing 24-word mnemonic seed phrase"
+msgstr ""
+
+#: templates/setup.html:90
+msgid "Import Existing Key"
+msgstr ""
+
+#: templates/setup.html:91
+msgid "OR"
+msgstr ""
+
+#: templates/setup.html:93
+msgid ""
+"You can generate a brand-new mnemonic phrase that will be written to this"
+" in-container path"
+msgstr ""
+
+#: templates/setup.html:96
+msgid "Generate New Key"
+msgstr ""
+
+#: templates/setup.html:108
+#, python-format
+msgid ""
+"NOTE: If you would prefer to instead import your mnenmoic seed phrase "
+"yourself at the command-line, see the %(wiki_link)s for details."
+msgstr ""
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..c19803dd
--- /dev/null
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -0,0 +1,130 @@
+# French translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-13 15:24-0700\n"
+"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: fr\n"
+"Language-Team: fr \n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: routes.py:68
+msgid "Blockchain download"
+msgstr ""
+
+#: routes.py:100
+msgid "Unknown plotting form"
+msgstr ""
+
+#: routes.py:149
+msgid "Error! Please see logs."
+msgstr ""
+
+#: routes.py:175
+msgid "Unknown alerts form"
+msgstr ""
+
+#: routes.py:244
+msgid "Unknown form action"
+msgstr ""
+
+#: routes.py:360
+msgid "No worker at %{worker} for fork %{blockchain}. Please select another fork."
+msgstr ""
+
+#: routes.py:366
+msgid ""
+"For Alerts config, found no responding fullnode found for %{blockchain}. "
+"Please check your workers."
+msgstr ""
+
+#: routes.py:371
+msgid ""
+"For Farming config, found no responding fullnode found for %{blockchain}."
+" Please check your workers."
+msgstr ""
+
+#: routes.py:378
+msgid ""
+"For Plotting config, found no responding fullnode found for "
+"%{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:383
+msgid "No responding fullnode found for %{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:402
+msgid "Unsupported log type"
+msgstr ""
+
+#: templates/setup.html:27
+msgid "Welcome to Machinaris!"
+msgstr "Bienvenue à Machinaris!"
+
+#: templates/setup.html:28
+#, python-format
+msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
+msgstr ""
+
+#: templates/setup.html:61
+#, python-format
+msgid ""
+"On very first launch, the Chia compressed blockchain database "
+"%(compressed)s is being downloaded from %(dl_link)s. At about "
+"%(uncompressed)s in uncompressed size (progress shown above), this will "
+"take a while. However minutes of download now, will save you multiple "
+"days of blockchain syncing later. Please be patient!"
+msgstr ""
+
+#: templates/setup.html:75
+#, python-format
+msgid ""
+"NOTE: If you would prefer to allow Chia to sync the blockchain over many "
+"days, see the %(init_link)s for details. Similarly, you may instead "
+"%(import_link_open)s import your own blockchain %(import_link_close)s if "
+"you have one from a previous Chia install."
+msgstr ""
+
+#: templates/setup.html:83
+#, python-format
+msgid ""
+"To get started with Machinaris as a Chia%(trademark)s fullnode, either "
+"import your existing 24-word mnemonic seed phrase"
+msgstr ""
+
+#: templates/setup.html:90
+msgid "Import Existing Key"
+msgstr ""
+
+#: templates/setup.html:91
+msgid "OR"
+msgstr ""
+
+#: templates/setup.html:93
+msgid ""
+"You can generate a brand-new mnemonic phrase that will be written to this"
+" in-container path"
+msgstr ""
+
+#: templates/setup.html:96
+msgid "Generate New Key"
+msgstr ""
+
+#: templates/setup.html:108
+#, python-format
+msgid ""
+"NOTE: If you would prefer to instead import your mnenmoic seed phrase "
+"yourself at the command-line, see the %(wiki_link)s for details."
+msgstr ""
+

From a3c0d16512dc856e30d64a71b471ee69c359dcaf Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Feb 2022 20:54:31 -0700
Subject: [PATCH 0591/1625] Build fix.

---
 scripts/i18n/compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/i18n/compile.sh b/scripts/i18n/compile.sh
index bcd0263a..499b9cda 100644
--- a/scripts/i18n/compile.sh
+++ b/scripts/i18n/compile.sh
@@ -3,7 +3,7 @@
 #
 
 # If building on Github servers, change to deployment root
-if [ `pwd` != '/code/machinaris' ]; then  # else stay in code root
+if [ "$PWD" != '/code/machinaris' ]; then  # else stay in code root
     cd /machinaris
 fi
 

From fe08a6f0f1baf940d5b5ad8ba3ae7e46ebe7a56d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Feb 2022 21:04:41 -0700
Subject: [PATCH 0592/1625] Full path to pybabel.

---
 scripts/i18n/compile.sh | 2 +-
 scripts/i18n/extract.sh | 4 ++--
 scripts/i18n/init.sh    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/i18n/compile.sh b/scripts/i18n/compile.sh
index 499b9cda..e4fc2349 100644
--- a/scripts/i18n/compile.sh
+++ b/scripts/i18n/compile.sh
@@ -14,7 +14,7 @@ do
     IFS=',';
     for lang in $LANGS; 
     do 
-        pybabel compile -d ./translations
+        /chia-blockchain/venv/bin/pybabel compile -d ./translations
         chmod 777 ./translations/$lang/LC_MESSAGES/*
     done
     popd >/dev/null
diff --git a/scripts/i18n/extract.sh b/scripts/i18n/extract.sh
index a80e3c65..25e3544a 100644
--- a/scripts/i18n/extract.sh
+++ b/scripts/i18n/extract.sh
@@ -9,8 +9,8 @@ do
     IFS=',';
     for lang in $LANGS; 
     do 
-        pybabel extract -F babel.cfg -k _l -o messages.pot .
-        pybabel update -i messages.pot -d ./translations
+        /chia-blockchain/venv/bin/pybabel extract -F babel.cfg -k _l -o messages.pot .
+        /chia-blockchain/venv/bin/pybabel update -i messages.pot -d ./translations
         chmod 777 ./translations/$lang/LC_MESSAGES/*
     done
     popd >/dev/null
diff --git a/scripts/i18n/init.sh b/scripts/i18n/init.sh
index 8565b0ee..e7ff0dff 100644
--- a/scripts/i18n/init.sh
+++ b/scripts/i18n/init.sh
@@ -9,10 +9,10 @@ do
     IFS=',';
     for lang in $LANGS; 
     do 
-        #if [ -d ./translations/$lang ]; then
-        #    echo "Skipping initialization of $d/$lang as translations folder already exists."
-        #else
-            pybabel init -i messages.pot -d ./translations -l $lang
+        if [ -d ./translations/$lang ]; then
+            echo "Skipping initialization of $d/$lang as translations folder already exists."
+        else
+            /chia-blockchain/venv/bin/pybabel init -i messages.pot -d ./translations -l $lang
             chmod 777 ./translations/$lang/LC_MESSAGES/*
         #fi
     done

From 92716fad81d97c4ef101a814c19039ec53bebb03 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 15 Feb 2022 16:08:55 -0700
Subject: [PATCH 0593/1625] More translation support.

---
 CREDITS.md                                  |   2 +
 api/__init__.py                             |   2 +-
 api/default_settings.py                     |   3 +-
 api/translations/de/LC_MESSAGES/messages.po |   8 +-
 api/translations/fr/LC_MESSAGES/messages.po |   8 +-
 api/translations/it/LC_MESSAGES/messages.po |  24 +++
 api/translations/zh/LC_MESSAGES/messages.po |  24 +++
 api/views/logs/resources.py                 |   1 +
 api/views/ping/resources.py                 |   9 +-
 scripts/i18n/compile.sh                     |   9 +-
 scripts/i18n/extract.sh                     |  11 +-
 scripts/i18n/init.sh                        |   2 +-
 web/__init__.py                             |   2 +-
 web/actions/log_handler.py                  |   4 +-
 web/default_settings.py                     |   4 +-
 web/routes.py                               |  37 ++--
 web/templates/index.html                    |  24 +--
 web/templates/setup.html                    |   7 +-
 web/translations/de/LC_MESSAGES/messages.po |  84 +++++++--
 web/translations/fr/LC_MESSAGES/messages.po | 126 ++++++++++---
 web/translations/it/LC_MESSAGES/messages.po | 185 ++++++++++++++++++++
 web/translations/zh/LC_MESSAGES/messages.po | 185 ++++++++++++++++++++
 web/utils.py                                |  19 +-
 23 files changed, 679 insertions(+), 101 deletions(-)
 create mode 100644 api/translations/it/LC_MESSAGES/messages.po
 create mode 100644 api/translations/zh/LC_MESSAGES/messages.po
 create mode 100644 web/translations/it/LC_MESSAGES/messages.po
 create mode 100644 web/translations/zh/LC_MESSAGES/messages.po

diff --git a/CREDITS.md b/CREDITS.md
index 3d818092..45721767 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -23,6 +23,7 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [Toplevel](https://github.com/and-semakin/marshmallow-toplevel): Used for list of objects sent to REST API.
 * [DataTables.js](https://datatables.net/): Filter/search/pagination of dynamic tables, as per [this tutorial](https://blog.miguelgrinberg.com/post/beautiful-interactive-tables-for-your-flask-templates).
 * [Charts.js](https://www.chartjs.org/): dynamic charting library.
+* [Flask-Babel](https://pythonhosted.org/Flask-BabelEx/): internationaliztion and localization, as per [this tutorial](https://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-xiii-i18n-and-l10n).
 
 ## Blockchains
 * [BTCgreen](https://github.com/BTCgreen-Network/btcgreen-blockchain)
@@ -90,6 +91,7 @@ A big thanks to all that contributed with dev and test including:
 * bafff
 * tjb_altf4
 * halfroom (aka Sagittarius)
+* vfarmer.antcasq
 
 ## 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.*
\ No newline at end of file
diff --git a/api/__init__.py b/api/__init__.py
index 70c3b9e7..7e0e977f 100644
--- a/api/__init__.py
+++ b/api/__init__.py
@@ -36,7 +36,7 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 def get_locale():
     for d in babel.translation_directories:
         app.logger.debug(d)
-    app.logger.debug("Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+    app.logger.debug("API=> Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
     return request.accept_languages.best_match(app.config['LANGUAGES'])
 
 from common.extensions.database import db
diff --git a/api/default_settings.py b/api/default_settings.py
index a275a31c..a30da8f4 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -50,4 +50,5 @@ class DefaultConfig:
     STATUS_EVERY_X_MINUTES = 2  # Run status collection once every two minutes by default
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
 
-    LANGUAGES = ['de', 'fr']
+    BABEL_TRANSLATION_DIRECTORIES = "api/translations"
+    LANGUAGES = ['de', 'fr', 'it', 'zh']
diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de/LC_MESSAGES/messages.po
index c327094c..c5230150 100644
--- a/api/translations/de/LC_MESSAGES/messages.po
+++ b/api/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-13 15:24-0700\n"
-"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: de\n"
 "Language-Team: de \n"
@@ -18,3 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: views/ping/resources.py:26
+msgid "Pong!"
+msgstr ""
+
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr/LC_MESSAGES/messages.po
index 157c0932..7fe5d6e2 100644
--- a/api/translations/fr/LC_MESSAGES/messages.po
+++ b/api/translations/fr/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-13 15:24-0700\n"
-"PO-Revision-Date: 2022-02-13 13:45-0700\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: fr\n"
 "Language-Team: fr \n"
@@ -18,3 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
+#: views/ping/resources.py:26
+msgid "Pong!"
+msgstr "Le pong!"
+
diff --git a/api/translations/it/LC_MESSAGES/messages.po b/api/translations/it/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..df856d22
--- /dev/null
+++ b/api/translations/it/LC_MESSAGES/messages.po
@@ -0,0 +1,24 @@
+# Italian translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"PO-Revision-Date: 2022-02-15 14:29-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: it\n"
+"Language-Team: it \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: views/ping/resources.py:26
+msgid "Pong!"
+msgstr ""
+
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..5719670a
--- /dev/null
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -0,0 +1,24 @@
+# Chinese translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"PO-Revision-Date: 2022-02-15 14:29-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: zh\n"
+"Language-Team: zh \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: views/ping/resources.py:26
+msgid "Pong!"
+msgstr ""
+
diff --git a/api/views/logs/resources.py b/api/views/logs/resources.py
index f6fee774..fc276562 100644
--- a/api/views/logs/resources.py
+++ b/api/views/logs/resources.py
@@ -31,6 +31,7 @@ def get(self):
 class LogByType(MethodView):
 
     def get(self, type):
+        app.logger.info(request.headers)
         log = log_parser.get_log_lines(type, log_id=request.args.get('log_id'), blockchain=request.args.get('blockchain'))
         response = make_response(log, 200)
         response.mimetype = "plain/text"
diff --git a/api/views/ping/resources.py b/api/views/ping/resources.py
index b90b7d12..ef74ae28 100644
--- a/api/views/ping/resources.py
+++ b/api/views/ping/resources.py
@@ -4,6 +4,7 @@
 
 from flask import request, make_response, abort
 from flask.views import MethodView
+from flask_babel import _, lazy_gettext as _l
 
 from api import app
 from api.extensions.api import Blueprint
@@ -20,9 +21,13 @@
 class Logs(MethodView):
 
     def get(self):
+        app.logger.info("IN PING, LANGUAGES ARE {0}".format(app.config['LANGUAGES']))
+        app.logger.info("IN PING, LANG={0}".format(request.headers['Accept-Language']))
+        app.logger.info("IN PING, MATCH IS {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+        app.logger.info("IN PING, PONG IS {0}".format(_('Pong!')))
         response = make_response(
-            """Pong!
-""", 200)
+            """{0}
+""".format(_('Pong!')), 200)
         response.mimetype = "plain/text"
         return response
 
diff --git a/scripts/i18n/compile.sh b/scripts/i18n/compile.sh
index e4fc2349..c6c65e0b 100644
--- a/scripts/i18n/compile.sh
+++ b/scripts/i18n/compile.sh
@@ -10,12 +10,7 @@ fi
 for d in 'web' 'api'; 
 do
     pushd $d >/dev/null
-    LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" ./default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
-    IFS=',';
-    for lang in $LANGS; 
-    do 
-        /chia-blockchain/venv/bin/pybabel compile -d ./translations
-        chmod 777 ./translations/$lang/LC_MESSAGES/*
-    done
+    /chia-blockchain/venv/bin/pybabel compile -d ./translations
+    chmod -R 777 $PWD/translations
     popd >/dev/null
 done
diff --git a/scripts/i18n/extract.sh b/scripts/i18n/extract.sh
index 25e3544a..1af7eb4f 100644
--- a/scripts/i18n/extract.sh
+++ b/scripts/i18n/extract.sh
@@ -5,13 +5,8 @@
 for d in 'web' 'api'; 
 do
     pushd $d >/dev/null
-    LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" ./default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
-    IFS=',';
-    for lang in $LANGS; 
-    do 
-        /chia-blockchain/venv/bin/pybabel extract -F babel.cfg -k _l -o messages.pot .
-        /chia-blockchain/venv/bin/pybabel update -i messages.pot -d ./translations
-        chmod 777 ./translations/$lang/LC_MESSAGES/*
-    done
+    /chia-blockchain/venv/bin/pybabel extract -F babel.cfg -k _l -o messages.pot .
+    /chia-blockchain/venv/bin/pybabel update -i messages.pot -d ./translations
+    chmod -R 777 $PWD/translations
     popd >/dev/null
 done
diff --git a/scripts/i18n/init.sh b/scripts/i18n/init.sh
index e7ff0dff..db350c68 100644
--- a/scripts/i18n/init.sh
+++ b/scripts/i18n/init.sh
@@ -14,7 +14,7 @@ do
         else
             /chia-blockchain/venv/bin/pybabel init -i messages.pot -d ./translations -l $lang
             chmod 777 ./translations/$lang/LC_MESSAGES/*
-        #fi
+        fi
     done
     popd >/dev/null
 done
diff --git a/web/__init__.py b/web/__init__.py
index ff95f360..a1f590b4 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -22,7 +22,7 @@
 def get_locale():
     for d in babel.translation_directories:
         app.logger.debug(d)
-    app.logger.debug("Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+    app.logger.debug("WEB=> Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
     return request.accept_languages.best_match(app.config['LANGUAGES'])
 
 @event.listens_for(Engine, "connect")
diff --git a/web/actions/log_handler.py b/web/actions/log_handler.py
index a5f1785d..252bc2b7 100644
--- a/web/actions/log_handler.py
+++ b/web/actions/log_handler.py
@@ -17,14 +17,14 @@
 
 from web import app, db, utils
 
-def get_log_lines(worker, log_type, log_id, blockchain):
+def get_log_lines(lang, worker, log_type, log_id, blockchain):
     try:
         payload = {"type": log_type }
         if log_id != 'undefined':
             payload['log_id'] = log_id
         if blockchain != 'undefined':
             payload['blockchain'] = blockchain
-        response = utils.send_get(worker, "/logs/{0}".format(log_type), payload, debug=False)
+        response = utils.send_get(lang, worker, "/logs/{0}".format(log_type), payload, debug=True)
         return response.content.decode('utf-8')
     except:
         app.logger.info(traceback.format_exc())
diff --git a/web/default_settings.py b/web/default_settings.py
index e6483446..70616e97 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -38,4 +38,6 @@ class DefaultConfig:
 
     MAX_CHART_CHALLENGES_MINS = 15
 
-    LANGUAGES = ['de', 'fr']
+    # Note, babel looks in /machinaris/web/translations with this path.
+    BABEL_TRANSLATION_DIRECTORIES = "translations"
+    LANGUAGES = ['de', 'fr', 'it', 'zh']
diff --git a/web/routes.py b/web/routes.py
index b5754f9a..a4ef4ee2 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -10,14 +10,30 @@
 from datetime import datetime
 from flask import Flask, flash, redirect, render_template, abort, \
         request, session, url_for, send_from_directory, make_response
-from flask_babel import _
-from flask_babel import lazy_gettext as _l
+from flask_babel import _, lazy_gettext as _l
 
 from common.config import globals
 from common.models import pools as po
 from web import app, utils
 from web.actions import chia, pools as p, plotman, chiadog, worker, log_handler, stats, warnings, forktools
 
+def get_lang(request):
+    lang = None
+    if "Accept-Language" in request.headers:
+        lang = request.headers["Accept-Language"]
+    return lang 
+
+def find_selected_worker(hosts, hostname, blockchain= None):
+    if len(hosts) == 0:
+        return None
+    if not blockchain:
+        hosts[0].workers[0]
+    for host in hosts:
+        for worker in host.workers:
+            if worker['hostname'] == hostname and worker['blockchain'] == blockchain:
+                return worker
+    return hosts[0].workers[0]
+
 @app.route('/')
 def landing():
     gc = globals.load()
@@ -246,17 +262,6 @@ def connections():
     return render_template('connections.html', reload_seconds=120, selected_blockchain = selected_blockchain,
         connections=connections, global_config=gc)
 
-def find_selected_worker(hosts, hostname, blockchain= None):
-    if len(hosts) == 0:
-        return None
-    if not blockchain:
-        hosts[0].workers[0]
-    for host in hosts:
-        for worker in host.workers:
-            if worker['hostname'] == hostname and worker['blockchain'] == blockchain:
-                return worker
-    return hosts[0].workers[0]
-
 @app.route('/settings/plotting', methods=['GET', 'POST'])
 def settings_plotting():
     selected_worker_hostname = None
@@ -356,7 +361,7 @@ def views_settings_config(path):
     config_type = request.args.get('type')
     w = worker.get_worker(request.args.get('worker'), request.args.get('blockchain'))
     if not w:
-        app.logger.info(_l("No worker at %{worker} for fork %{blockchain}. Please select another fork.",
+        app.logger.info(_l("No worker at %{worker} for blockchain %{blockchain}. Please select another blockchain.",
             worker=request.args.get('worker'), blockchain=request.args.get('blockchain')))
         abort(404)
     if config_type == "alerts":
@@ -388,7 +393,7 @@ def views_settings_config(path):
 
 @app.route('/logs')
 def logs():
-    return render_template('logs.html')
+    return render_template('logs.html') 
 
 @app.route('/logfile')
 def logfile():
@@ -397,7 +402,7 @@ def logfile():
     if log_type in [ 'alerts', 'farming', 'plotting', 'archiving', 'apisrv', 'webui', 'pooling']:
         log_id = request.args.get("log_id")
         blockchain = request.args.get("blockchain")
-        return log_handler.get_log_lines(w, log_type, log_id, blockchain)
+        return log_handler.get_log_lines(get_lang(request), w, log_type, log_id, blockchain)
     else:
         abort(500, _("Unsupported log type") + ": {0}".format(log_type))
 
diff --git a/web/templates/index.html b/web/templates/index.html
index bc008390..77e967c2 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -27,7 +27,7 @@
         
    
           
    
             
    
-              
    {{ blockchain|capitalize }} - Expected Time to Win:
+              
    {{ blockchain|capitalize }} - {{_('Expected Time to Win')}}:
                 {{ farms[blockchain].expected_time_to_win }}
               
    
             
    
@@ -38,7 +38,7 @@ 
    {{ blockchain|capitalize }} - Expected Time to Win:
         
    
           
    
             
    
-              
    Plotting:
+              
    {{_('Plotting')}}:
                 
                   {{ plotting[blockchain] }}
                 
@@ -47,7 +47,7 @@ 
    Plotting:
           
    
           
    
             
    
-              
    Farming:
+              
    {{_('Farming')}}:
                 Farming:
             
    
               
    {{farms[blockchain].plot_count }}
    
-              
    Total Plots
    
+              
    {{_('Total Plots')}}
    
             
    
           
    
           
    
             
    
               
    {{farms[blockchain].plots_display_size }}
    
-              
    Total Plots Size
    
+              
    {{_('Total Plots Size')}}
    
             
    
           
    
         
    
@@ -86,14 +86,14 @@ 
    Total Plots Size
    
             
    
               
    {{farms[blockchain].wallet_balance }}
    
-              
    {{ farms[blockchain].currency_symbol }} Balance
    
+              
    {{ farms[blockchain].currency_symbol }} {{_('Balance')}}
    
             
    
           
    
           
    
             
    
               
    {{farms[blockchain].total_coins }}
    
-              
    {{ farms[blockchain].currency_symbol }} Farmed
    
+              
    {{ farms[blockchain].currency_symbol }} {{_('Farmed')}}
    
             
    
           
    
           
    
@@ -102,7 +102,7 @@ 
    {{ farms[blockchain].currency_symbol }} Farmed
               
    {{farms[blockchain].netspace_display_size }}
               
    
-              
    {{ blockchain|capitalize }} Netspace
    
+              
    {{ blockchain|capitalize }} {{_('Netspace')}}
    
             
    
           
    
         
    
@@ -117,7 +117,7 @@ 
    {{ blockchain|capitalize }} Netspace
    
                 
               
    
             
    
-            
    {{blockchain|capitalize}} - Challenges from Harvesters
    
+            
    {{blockchain|capitalize}} - {{_('Challenges from Harvesters')}}
    
             
           
    
         
    
@@ -133,7 +133,7 @@ 
    {{blockchain|capitalize}} - Challenges from Ha
                 
               
    
             
    
-            
    {{blockchain|capitalize}} - Partial Proofs for Pools
    
+            
    {{blockchain|capitalize}} - {{_('Partial Proofs for Pools')}}
    
             
           
    
         
    
@@ -144,11 +144,11 @@ 
    {{blockchain|capitalize}} - Partial Proofs for
 
     
     
   
    
 
diff --git a/web/templates/setup.html b/web/templates/setup.html
index 4c2b2a32..515142c0 100644
--- a/web/templates/setup.html
+++ b/web/templates/setup.html
@@ -105,10 +105,13 @@ 
    {{_('OR')}}
    
                         
    
                         
    
 
-                        
    {{_('NOTE: If you would prefer to instead import your mnenmoic seed phrase yourself at the command-line, see the %(wiki_link)s for details.', 
+                        {% autoescape false %}
+                        
    
+                            {{_('NOTE: If you would prefer to instead import your mnenmoic seed phrase yourself at the command-line, see the %(wiki_link)s for details.', 
                             wiki_link='Wiki')}}
                         
    
-
+                        {% endautoescape %}
+                        
                         {% endif %}
                     
    
                 
    
diff --git a/web/translations/de/LC_MESSAGES/messages.po b/web/translations/de/LC_MESSAGES/messages.po
index 2e6b4d90..cd64856c 100644
--- a/web/translations/de/LC_MESSAGES/messages.po
+++ b/web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-13 15:24-0700\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: de\n"
@@ -18,56 +18,106 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:68
+#: routes.py:84
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:100
+#: routes.py:116
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:149
+#: routes.py:165
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:175
+#: routes.py:191
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:244
+#: routes.py:260
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:360
-msgid "No worker at %{worker} for fork %{blockchain}. Please select another fork."
+#: routes.py:365
+msgid ""
+"No worker at %{worker} for blockchain %{blockchain}. Please select "
+"another blockchain."
 msgstr ""
 
-#: routes.py:366
+#: routes.py:371
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
 
-#: routes.py:371
+#: routes.py:376
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:378
+#: routes.py:383
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:383
+#: routes.py:388
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
 
-#: routes.py:402
+#: routes.py:407
 msgid "Unsupported log type"
 msgstr ""
 
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
+#: templates/index.html:41
+msgid "Plotting"
+msgstr ""
+
+#: templates/index.html:50
+msgid "Farming"
+msgstr ""
+
+#: templates/index.html:72
+msgid "Total Plots"
+msgstr ""
+
+#: templates/index.html:79
+msgid "Total Plots Size"
+msgstr ""
+
+#: templates/index.html:89
+msgid "Balance"
+msgstr ""
+
+#: templates/index.html:96
+msgid "Farmed"
+msgstr ""
+
+#: templates/index.html:105
+msgid "Netspace"
+msgstr ""
+
+#: templates/index.html:120
+msgid "Challenges from Harvesters"
+msgstr ""
+
+#: templates/index.html:136
+msgid "Partial Proofs for Pools"
+msgstr ""
+
+#: templates/index.html:147
+msgid "Previous"
+msgstr ""
+
+#: templates/index.html:151
+msgid "Next"
+msgstr ""
+
 #: templates/setup.html:27
 msgid "Welcome to Machinaris!"
 msgstr "Willkommen zu"
@@ -121,9 +171,15 @@ msgstr ""
 msgid "Generate New Key"
 msgstr ""
 
-#: templates/setup.html:108
+#: templates/setup.html:110
 #, python-format
 msgid ""
 "NOTE: If you would prefer to instead import your mnenmoic seed phrase "
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
+
+#~ msgid ""
+#~ "No worker at %{worker} for fork "
+#~ "%{blockchain}. Please select another fork."
+#~ msgstr ""
+
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
index c19803dd..b2bfe226 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-13 15:24-0700\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: fr\n"
@@ -18,55 +18,115 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: routes.py:68
+#: routes.py:84
 msgid "Blockchain download"
-msgstr ""
+msgstr "Télécharger le blockchain"
 
-#: routes.py:100
+#: routes.py:116
 msgid "Unknown plotting form"
-msgstr ""
+msgstr "Forme inconnue"
 
-#: routes.py:149
+#: routes.py:165
 msgid "Error! Please see logs."
-msgstr ""
+msgstr "Erreur! Veuillez consulter les journaux."
 
-#: routes.py:175
+#: routes.py:191
 msgid "Unknown alerts form"
-msgstr ""
+msgstr "Forme inconnue"
 
-#: routes.py:244
+#: routes.py:260
 msgid "Unknown form action"
-msgstr ""
+msgstr "Action inconnue"
 
-#: routes.py:360
-msgid "No worker at %{worker} for fork %{blockchain}. Please select another fork."
+#: routes.py:365
+msgid ""
+"No worker at %{worker} for blockchain %{blockchain}. Please select "
+"another blockchain."
 msgstr ""
+"Aucun travailleur %{worker} pour la blockchain %{blockchain}. Veuillez "
+"sélectionner une autre blockchain."
 
-#: routes.py:366
+#: routes.py:371
 msgid ""
 "For Alerts config, found no responding fullnode found for %{blockchain}. "
 "Please check your workers."
 msgstr ""
+"Aucun fullnode répondant n'a été trouvé pour notifier%{blockchain}. "
+"Veuillez vérifier vos travailleurs."
 
-#: routes.py:371
+#: routes.py:376
 msgid ""
 "For Farming config, found no responding fullnode found for %{blockchain}."
 " Please check your workers."
 msgstr ""
+"Aucun fullnode répondant n'a été trouvé pour cultiver%{blockchain}. "
+"Veuillez vérifier vos travailleurs."
 
-#: routes.py:378
+#: routes.py:383
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%{blockchain}. Please check your workers."
 msgstr ""
+"Aucun fullnode répondant n'a été trouvé pour parceller%{blockchain}. "
+"Veuillez vérifier vos travailleurs."
 
-#: routes.py:383
+#: routes.py:388
 msgid "No responding fullnode found for %{blockchain}. Please check your workers."
 msgstr ""
+"Aucun fullnode répondant n'a été trouvé pour %{blockchain}. Veuillez "
+"vérifier vos travailleurs."
 
-#: routes.py:402
+#: routes.py:407
 msgid "Unsupported log type"
-msgstr ""
+msgstr "Type de journal non pris en charge"
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr "Temps prévu pour gagner"
+
+#: templates/index.html:41
+msgid "Plotting"
+msgstr "Parcelle"
+
+#: templates/index.html:50
+msgid "Farming"
+msgstr "Cultiver"
+
+#: templates/index.html:72
+msgid "Total Plots"
+msgstr "Parcelles totales"
+
+#: templates/index.html:79
+msgid "Total Plots Size"
+msgstr "Taille totale des parcelles"
+
+#: templates/index.html:89
+msgid "Balance"
+msgstr "Total"
+
+#: templates/index.html:96
+msgid "Farmed"
+msgstr "A gagné"
+
+#: templates/index.html:105
+msgid "Netspace"
+msgstr "Netspace"
+
+#: templates/index.html:120
+msgid "Challenges from Harvesters"
+msgstr "Défis des moissonneurs"
+
+#: templates/index.html:136
+msgid "Partial Proofs for Pools"
+msgstr "Preuves partielles pour les pools"
+
+#: templates/index.html:147
+msgid "Previous"
+msgstr "Précédent"
+
+#: templates/index.html:151
+msgid "Next"
+msgstr "Suivant"
 
 #: templates/setup.html:27
 msgid "Welcome to Machinaris!"
@@ -75,7 +135,7 @@ msgstr "Bienvenue à Machinaris!"
 #: templates/setup.html:28
 #, python-format
 msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
-msgstr ""
+msgstr "Une WebUI facile pour cultiver Chia%(trademark)s."
 
 #: templates/setup.html:61
 #, python-format
@@ -86,6 +146,12 @@ msgid ""
 "take a while. However minutes of download now, will save you multiple "
 "days of blockchain syncing later. Please be patient!"
 msgstr ""
+"Lors du tout premier lancement, la base de données blockchain compressée "
+"de Chia %(compressed)s est en cours de téléchargement depuis %(dl_link)s."
+" À environ %(uncompressed)s en taille non compressée (progression "
+"indiquée ci-dessus), cela prendre un certain temps. Cependant, quelques "
+"minutes de téléchargement maintenant vous feront économiser plusieurs "
+"jours de synchronisation blockchain plus tard. Soyez patient!"
 
 #: templates/setup.html:75
 #, python-format
@@ -95,6 +161,11 @@ msgid ""
 "%(import_link_open)s import your own blockchain %(import_link_close)s if "
 "you have one from a previous Chia install."
 msgstr ""
+"REMARQUE: si vous préférez autoriser Chia à synchroniser la blockchain "
+"sur plusieurs jours, consultez les %(init_link)s pour plus de détails. De"
+" même, vous pouvez %(import_link_open)s importe votre propre blockchain "
+"%(import_link_close)s si vous en avez un d'une installation précédente de"
+" Chia."
 
 #: templates/setup.html:83
 #, python-format
@@ -102,29 +173,36 @@ msgid ""
 "To get started with Machinaris as a Chia%(trademark)s fullnode, either "
 "import your existing 24-word mnemonic seed phrase"
 msgstr ""
+"Pour démarrer avec Machinaris en tant que fullnode Chia%(trademark)s, "
+"soit importez votre phrase de départ mnémonique existante de 24 mots"
 
 #: templates/setup.html:90
 msgid "Import Existing Key"
-msgstr ""
+msgstr "Importez votre clé"
 
 #: templates/setup.html:91
 msgid "OR"
-msgstr ""
+msgstr "OU"
 
 #: templates/setup.html:93
 msgid ""
 "You can generate a brand-new mnemonic phrase that will be written to this"
 " in-container path"
 msgstr ""
+"Vous pouvez générer une toute nouvelle phrase mnémonique qui sera écrite "
+"icichemin dans le conteneur"
 
 #: templates/setup.html:96
 msgid "Generate New Key"
-msgstr ""
+msgstr "Créer une nouvelle clé"
 
-#: templates/setup.html:108
+#: templates/setup.html:110
 #, python-format
 msgid ""
 "NOTE: If you would prefer to instead import your mnenmoic seed phrase "
 "yourself at the command-line, see the %(wiki_link)s for details."
 msgstr ""
+"REMARQUE: Si vous préférez plutôt importer votre phrase de départ "
+"mnenmoic vous-même sur la ligne de commande, consultez les %(wiki_link)s "
+"pour plus de détails."
 
diff --git a/web/translations/it/LC_MESSAGES/messages.po b/web/translations/it/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..fa816b7d
--- /dev/null
+++ b/web/translations/it/LC_MESSAGES/messages.po
@@ -0,0 +1,185 @@
+# Italian translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"PO-Revision-Date: 2022-02-15 10:14-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: it\n"
+"Language-Team: it \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: routes.py:84
+msgid "Blockchain download"
+msgstr ""
+
+#: routes.py:116
+msgid "Unknown plotting form"
+msgstr ""
+
+#: routes.py:165
+msgid "Error! Please see logs."
+msgstr ""
+
+#: routes.py:191
+msgid "Unknown alerts form"
+msgstr ""
+
+#: routes.py:260
+msgid "Unknown form action"
+msgstr ""
+
+#: routes.py:365
+msgid ""
+"No worker at %{worker} for blockchain %{blockchain}. Please select "
+"another blockchain."
+msgstr ""
+
+#: routes.py:371
+msgid ""
+"For Alerts config, found no responding fullnode found for %{blockchain}. "
+"Please check your workers."
+msgstr ""
+
+#: routes.py:376
+msgid ""
+"For Farming config, found no responding fullnode found for %{blockchain}."
+" Please check your workers."
+msgstr ""
+
+#: routes.py:383
+msgid ""
+"For Plotting config, found no responding fullnode found for "
+"%{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:388
+msgid "No responding fullnode found for %{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:407
+msgid "Unsupported log type"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
+#: templates/index.html:41
+msgid "Plotting"
+msgstr ""
+
+#: templates/index.html:50
+msgid "Farming"
+msgstr ""
+
+#: templates/index.html:72
+msgid "Total Plots"
+msgstr ""
+
+#: templates/index.html:79
+msgid "Total Plots Size"
+msgstr ""
+
+#: templates/index.html:89
+msgid "Balance"
+msgstr ""
+
+#: templates/index.html:96
+msgid "Farmed"
+msgstr ""
+
+#: templates/index.html:105
+msgid "Netspace"
+msgstr ""
+
+#: templates/index.html:120
+msgid "Challenges from Harvesters"
+msgstr ""
+
+#: templates/index.html:136
+msgid "Partial Proofs for Pools"
+msgstr ""
+
+#: templates/index.html:147
+msgid "Previous"
+msgstr ""
+
+#: templates/index.html:151
+msgid "Next"
+msgstr ""
+
+#: templates/setup.html:27
+msgid "Welcome to Machinaris!"
+msgstr ""
+
+#: templates/setup.html:28
+#, python-format
+msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
+msgstr ""
+
+#: templates/setup.html:61
+#, python-format
+msgid ""
+"On very first launch, the Chia compressed blockchain database "
+"%(compressed)s is being downloaded from %(dl_link)s. At about "
+"%(uncompressed)s in uncompressed size (progress shown above), this will "
+"take a while. However minutes of download now, will save you multiple "
+"days of blockchain syncing later. Please be patient!"
+msgstr ""
+
+#: templates/setup.html:75
+#, python-format
+msgid ""
+"NOTE: If you would prefer to allow Chia to sync the blockchain over many "
+"days, see the %(init_link)s for details. Similarly, you may instead "
+"%(import_link_open)s import your own blockchain %(import_link_close)s if "
+"you have one from a previous Chia install."
+msgstr ""
+
+#: templates/setup.html:83
+#, python-format
+msgid ""
+"To get started with Machinaris as a Chia%(trademark)s fullnode, either "
+"import your existing 24-word mnemonic seed phrase"
+msgstr ""
+
+#: templates/setup.html:90
+msgid "Import Existing Key"
+msgstr ""
+
+#: templates/setup.html:91
+msgid "OR"
+msgstr ""
+
+#: templates/setup.html:93
+msgid ""
+"You can generate a brand-new mnemonic phrase that will be written to this"
+" in-container path"
+msgstr ""
+
+#: templates/setup.html:96
+msgid "Generate New Key"
+msgstr ""
+
+#: templates/setup.html:110
+#, python-format
+msgid ""
+"NOTE: If you would prefer to instead import your mnenmoic seed phrase "
+"yourself at the command-line, see the %(wiki_link)s for details."
+msgstr ""
+
+#~ msgid ""
+#~ "No worker at %{worker} for fork "
+#~ "%{blockchain}. Please select another fork."
+#~ msgstr ""
+
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..0d4f653c
--- /dev/null
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -0,0 +1,185 @@
+# Chinese translations for PROJECT.
+# Copyright (C) 2022 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"PO-Revision-Date: 2022-02-15 10:14-0700\n"
+"Last-Translator: FULL NAME \n"
+"Language: zh\n"
+"Language-Team: zh \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.1\n"
+
+#: routes.py:84
+msgid "Blockchain download"
+msgstr ""
+
+#: routes.py:116
+msgid "Unknown plotting form"
+msgstr ""
+
+#: routes.py:165
+msgid "Error! Please see logs."
+msgstr ""
+
+#: routes.py:191
+msgid "Unknown alerts form"
+msgstr ""
+
+#: routes.py:260
+msgid "Unknown form action"
+msgstr ""
+
+#: routes.py:365
+msgid ""
+"No worker at %{worker} for blockchain %{blockchain}. Please select "
+"another blockchain."
+msgstr ""
+
+#: routes.py:371
+msgid ""
+"For Alerts config, found no responding fullnode found for %{blockchain}. "
+"Please check your workers."
+msgstr ""
+
+#: routes.py:376
+msgid ""
+"For Farming config, found no responding fullnode found for %{blockchain}."
+" Please check your workers."
+msgstr ""
+
+#: routes.py:383
+msgid ""
+"For Plotting config, found no responding fullnode found for "
+"%{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:388
+msgid "No responding fullnode found for %{blockchain}. Please check your workers."
+msgstr ""
+
+#: routes.py:407
+msgid "Unsupported log type"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
+#: templates/index.html:41
+msgid "Plotting"
+msgstr ""
+
+#: templates/index.html:50
+msgid "Farming"
+msgstr ""
+
+#: templates/index.html:72
+msgid "Total Plots"
+msgstr ""
+
+#: templates/index.html:79
+msgid "Total Plots Size"
+msgstr ""
+
+#: templates/index.html:89
+msgid "Balance"
+msgstr ""
+
+#: templates/index.html:96
+msgid "Farmed"
+msgstr ""
+
+#: templates/index.html:105
+msgid "Netspace"
+msgstr ""
+
+#: templates/index.html:120
+msgid "Challenges from Harvesters"
+msgstr ""
+
+#: templates/index.html:136
+msgid "Partial Proofs for Pools"
+msgstr ""
+
+#: templates/index.html:147
+msgid "Previous"
+msgstr ""
+
+#: templates/index.html:151
+msgid "Next"
+msgstr ""
+
+#: templates/setup.html:27
+msgid "Welcome to Machinaris!"
+msgstr ""
+
+#: templates/setup.html:28
+#, python-format
+msgid "An easy-to-use WebUI for Chia%(trademark)s plotting and farming."
+msgstr ""
+
+#: templates/setup.html:61
+#, python-format
+msgid ""
+"On very first launch, the Chia compressed blockchain database "
+"%(compressed)s is being downloaded from %(dl_link)s. At about "
+"%(uncompressed)s in uncompressed size (progress shown above), this will "
+"take a while. However minutes of download now, will save you multiple "
+"days of blockchain syncing later. Please be patient!"
+msgstr ""
+
+#: templates/setup.html:75
+#, python-format
+msgid ""
+"NOTE: If you would prefer to allow Chia to sync the blockchain over many "
+"days, see the %(init_link)s for details. Similarly, you may instead "
+"%(import_link_open)s import your own blockchain %(import_link_close)s if "
+"you have one from a previous Chia install."
+msgstr ""
+
+#: templates/setup.html:83
+#, python-format
+msgid ""
+"To get started with Machinaris as a Chia%(trademark)s fullnode, either "
+"import your existing 24-word mnemonic seed phrase"
+msgstr ""
+
+#: templates/setup.html:90
+msgid "Import Existing Key"
+msgstr ""
+
+#: templates/setup.html:91
+msgid "OR"
+msgstr ""
+
+#: templates/setup.html:93
+msgid ""
+"You can generate a brand-new mnemonic phrase that will be written to this"
+" in-container path"
+msgstr ""
+
+#: templates/setup.html:96
+msgid "Generate New Key"
+msgstr ""
+
+#: templates/setup.html:110
+#, python-format
+msgid ""
+"NOTE: If you would prefer to instead import your mnenmoic seed phrase "
+"yourself at the command-line, see the %(wiki_link)s for details."
+msgstr ""
+
+#~ msgid ""
+#~ "No worker at %{worker} for fork "
+#~ "%{blockchain}. Please select another fork."
+#~ msgstr ""
+
diff --git a/web/utils.py b/web/utils.py
index e7759391..9caf81f3 100644
--- a/web/utils.py
+++ b/web/utils.py
@@ -10,31 +10,40 @@
 
 from web import app
 
-def send_get(worker, path, query_params={}, timeout=30, debug=False):
+def send_get(worker, path, query_params={}, timeout=30, debug=False, lang=None):
     if debug:
         http.client.HTTPConnection.debuglevel = 1
-    response = requests.get(worker.url + path, params = query_params, timeout=timeout)
+    headers = []
+    if lang:
+        headers['Accept-Language'] = lang
+    response = requests.get(worker.url + path, headers = headers, params = query_params, timeout=timeout)
     http.client.HTTPConnection.debuglevel = 0
     return response
 
-def send_post(worker, path, payload, debug=False):
+def send_post(worker, path, payload, debug=False, lang=None):
     headers = {'Content-type': 'application/json', 'Accept': 'application/json'}
+    if lang:
+        headers['Accept-Language'] = lang
     if debug:
         http.client.HTTPConnection.debuglevel = 1
     response = requests.post(worker.url + path, headers = headers, data = json.dumps(payload))
     http.client.HTTPConnection.debuglevel = 0
     return response
 
-def send_put(worker, path, payload, debug=False):
+def send_put(worker, path, payload, debug=False, lang=None):
     headers = {'Content-type': 'application/json', 'Accept': 'application/json'}
+    if lang:
+        headers['Accept-Language'] = lang
     if debug:
         http.client.HTTPConnection.debuglevel = 1
     response = requests.put(worker.url + path, headers = headers, data = json.dumps(payload))
     http.client.HTTPConnection.debuglevel = 0
     return response
 
-def send_delete(worker, path, debug=False):
+def send_delete(worker, path, debug=False, lang=None):
     headers = {'Content-type': 'application/json', 'Accept': 'application/json'}
+    if lang:
+        headers['Accept-Language'] = lang
     if debug:
         http.client.HTTPConnection.debuglevel = 1
     response = requests.delete(worker.url + path, headers = headers)

From 6878b81f047201af53f7e3245d5b82adbe4fc1d9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 15 Feb 2022 19:22:22 -0700
Subject: [PATCH 0594/1625] Disable ping language debugging.

---
 api/views/ping/resources.py                 | 2 --
 web/translations/fr/LC_MESSAGES/messages.po | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/api/views/ping/resources.py b/api/views/ping/resources.py
index ef74ae28..64e3e959 100644
--- a/api/views/ping/resources.py
+++ b/api/views/ping/resources.py
@@ -21,8 +21,6 @@
 class Logs(MethodView):
 
     def get(self):
-        app.logger.info("IN PING, LANGUAGES ARE {0}".format(app.config['LANGUAGES']))
-        app.logger.info("IN PING, LANG={0}".format(request.headers['Accept-Language']))
         app.logger.info("IN PING, MATCH IS {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
         app.logger.info("IN PING, PONG IS {0}".format(_('Pong!')))
         response = make_response(
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
index b2bfe226..36b6b545 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -106,7 +106,7 @@ msgstr "Total"
 
 #: templates/index.html:96
 msgid "Farmed"
-msgstr "A gagné"
+msgstr "A Gagné"
 
 #: templates/index.html:105
 msgid "Netspace"

From defc48470c7bc7638208630fa2d39a3d1ac59d28 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 16 Feb 2022 11:49:52 -0700
Subject: [PATCH 0595/1625] More i18n message extraction.

---
 api/default_settings.py                      |   2 +-
 api/translations/de/LC_MESSAGES/messages.po  |   4 +-
 api/translations/fr/LC_MESSAGES/messages.po  |   4 +-
 api/translations/it/LC_MESSAGES/messages.po  |   4 +-
 api/translations/zh/LC_MESSAGES/messages.po  |   4 +-
 scripts/i18n/init.sh                         |   3 +
 web/__init__.py                              |   2 +-
 web/actions/chia.py                          |   1 +
 web/actions/log_handler.py                   |   2 +-
 web/default_settings.py                      |   2 +-
 web/routes.py                                |   7 +-
 web/static/{landings.txt => landings/de.txt} |  22 ++--
 web/static/landings/en.txt                   |  63 +++++++++++
 web/static/landings/fr.txt                   |  63 +++++++++++
 web/static/landings/it.txt                   |  63 +++++++++++
 web/static/landings/zh.txt                   |  63 +++++++++++
 web/templates/base.html                      |  60 +++++------
 web/translations/de/LC_MESSAGES/messages.po  |  95 ++++++++++++++++-
 web/translations/fr/LC_MESSAGES/messages.po  | 106 +++++++++++++++++--
 web/translations/it/LC_MESSAGES/messages.po  |  94 +++++++++++++++-
 web/translations/zh/LC_MESSAGES/messages.po  |  94 +++++++++++++++-
 web/utils.py                                 |   2 +-
 22 files changed, 674 insertions(+), 86 deletions(-)
 rename web/static/{landings.txt => landings/de.txt} (72%)
 create mode 100644 web/static/landings/en.txt
 create mode 100644 web/static/landings/fr.txt
 create mode 100644 web/static/landings/it.txt
 create mode 100644 web/static/landings/zh.txt

diff --git a/api/default_settings.py b/api/default_settings.py
index a30da8f4..c57747be 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -51,4 +51,4 @@ class DefaultConfig:
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
 
     BABEL_TRANSLATION_DIRECTORIES = "api/translations"
-    LANGUAGES = ['de', 'fr', 'it', 'zh']
+    LANGUAGES = ['en', 'de', 'fr', 'it', 'zh']
diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de/LC_MESSAGES/messages.po
index c5230150..ecc9c424 100644
--- a/api/translations/de/LC_MESSAGES/messages.po
+++ b/api/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: de\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:26
+#: views/ping/resources.py:25
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr/LC_MESSAGES/messages.po
index 7fe5d6e2..1c4bc1a2 100644
--- a/api/translations/fr/LC_MESSAGES/messages.po
+++ b/api/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: fr\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:26
+#: views/ping/resources.py:25
 msgid "Pong!"
 msgstr "Le pong!"
 
diff --git a/api/translations/it/LC_MESSAGES/messages.po b/api/translations/it/LC_MESSAGES/messages.po
index df856d22..24cc721c 100644
--- a/api/translations/it/LC_MESSAGES/messages.po
+++ b/api/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: it\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:26
+#: views/ping/resources.py:25
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 5719670a..9bf174a0 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: zh\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:26
+#: views/ping/resources.py:25
 msgid "Pong!"
 msgstr ""
 
diff --git a/scripts/i18n/init.sh b/scripts/i18n/init.sh
index db350c68..42f55eba 100644
--- a/scripts/i18n/init.sh
+++ b/scripts/i18n/init.sh
@@ -9,6 +9,9 @@ do
     IFS=',';
     for lang in $LANGS; 
     do 
+        if [[ "$lang" == 'en' ]]; then
+            continue  # No separate translation files for default locale
+        fi
         if [ -d ./translations/$lang ]; then
             echo "Skipping initialization of $d/$lang as translations folder already exists."
         else
diff --git a/web/__init__.py b/web/__init__.py
index a1f590b4..86286a70 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -22,7 +22,7 @@
 def get_locale():
     for d in babel.translation_directories:
         app.logger.debug(d)
-    app.logger.debug("WEB=> Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
+    app.logger.info("WEB=> Returning locale: {0}".format(request.accept_languages.best_match(app.config['LANGUAGES'])))
     return request.accept_languages.best_match(app.config['LANGUAGES'])
 
 @event.listens_for(Engine, "connect")
diff --git a/web/actions/chia.py b/web/actions/chia.py
index 0564b7e4..fc5da16b 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -141,6 +141,7 @@ def load_summaries():
         return Summaries(blockchains, farms.farms, farms.wallets, summary_stats)
     except Exception as ex:
         app.logger.error("Error loading summary: {0}".format(str(ex)))
+        traceback.print_exc()
     return None
 
 def load_connections():
diff --git a/web/actions/log_handler.py b/web/actions/log_handler.py
index 252bc2b7..7fdd10bf 100644
--- a/web/actions/log_handler.py
+++ b/web/actions/log_handler.py
@@ -24,7 +24,7 @@ def get_log_lines(lang, worker, log_type, log_id, blockchain):
             payload['log_id'] = log_id
         if blockchain != 'undefined':
             payload['blockchain'] = blockchain
-        response = utils.send_get(lang, worker, "/logs/{0}".format(log_type), payload, debug=True)
+        response = utils.send_get(worker, "/logs/{0}".format(log_type), payload, debug=False, lang=lang)
         return response.content.decode('utf-8')
     except:
         app.logger.info(traceback.format_exc())
diff --git a/web/default_settings.py b/web/default_settings.py
index 70616e97..b18342f3 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -40,4 +40,4 @@ class DefaultConfig:
 
     # Note, babel looks in /machinaris/web/translations with this path.
     BABEL_TRANSLATION_DIRECTORIES = "translations"
-    LANGUAGES = ['de', 'fr', 'it', 'zh']
+    LANGUAGES = ['en', 'de', 'fr', 'it', 'zh']
diff --git a/web/routes.py b/web/routes.py
index a4ef4ee2..bead55cc 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -39,7 +39,12 @@ def landing():
     gc = globals.load()
     if not globals.is_setup():
         return redirect(url_for('setup'))
-    msg = random.choice(list(open('web/static/landings.txt')))
+    for accept in request.accept_languages.values():
+        app.logger.info("ACCEPT IS {0}".format(accept))
+    app.logger.info("LANGUAGES IS {0}".format(app.config['LANGUAGES']))
+    lang = request.accept_languages.best_match(app.config['LANGUAGES'])
+    app.logger.info("LANG IS {0}".format(lang))
+    msg = random.choice(list(open('web/static/landings/{0}.txt'.format(lang))))
     if msg.endswith(".png"):
         msg = "".format(url_for('static', filename='/landings/' + msg))
     return render_template('landing.html', random_message=msg)
diff --git a/web/static/landings.txt b/web/static/landings/de.txt
similarity index 72%
rename from web/static/landings.txt
rename to web/static/landings/de.txt
index b7bd5057..23fc8543 100644
--- a/web/static/landings.txt
+++ b/web/static/landings/de.txt
@@ -6,7 +6,6 @@ HODL!
 Good choice for a new hobby.
 First rule of forks... you don't talk about forks on /r/chia.
 Farm the dip!
-Departing for El Salvador now...
 You can fit so many smart contracts in this bad boy.
 "Expected time to win"? Really?
 Psst! You got any more of that disk space?
@@ -14,30 +13,24 @@ Hi-ho! Hi-ho! A schucking we will go.
 I'll make my own Chia... with blackjack and hookers!
 Keep calm and plot on.
 All your coins are belong to us.
-..formatting all hard drives in 3 2 1..
+...formatting all hard drives in 3 2 1...
 Life is like a box of shitcoins
 Relax! They say this inflation is only transitory.
 Altcoins? Gotta Catch 'Em All
-Chia pet!
 The best time to begin plotting was March 17 2021, the second best time is today.
 Ch Ch Ch Chia
 What happens on the blockchain stays on the blockchain.
 Not your grandma's currency.
 My chia pet was so boring... I'd rather go watch my cryptocurrency grow.
 Cha-ching!
-"I just couldn't stop... no really I can't stop... how do you stop this thing?" - A satisfied user
-This statement is false
 Have you tried restarting it?
-Delete machinaris.db and wait 10 minutes patiently...
 Never trust a chia farm you can't throw out a window.
-Fact: Chia coins rarely eat people
-Don't push the big red button... it does nothing.
 The American dollar wants you to stop.
 Machinaris makes a great Christmas present.
 "Remember GME" (Game Stop)
 Life satisfaction and winning Chia coins... are basically the same thing.
 If in doubt, you could always try a fork.
-Raising the demand for hardrives since 2020
+Raising the demand for hardrives since 2021
 Now with lootboxes
 Machinaris was the imposter
 You know what is really scary... No WiFi
@@ -47,12 +40,11 @@ We've never left Beta
 If and when the FBI calls... please don't tell them you're "plotting something"
 How's the electric bill these days?
 Today is someone's birthday!
-I remember working once
+I remember working once...
 When are you going to get a "real" job?
 Working is so overrated
 There are two types of people in this world, those that farm cryptocurrency and those who do not.
 It's a great community, join our Discord!
-The difference between farming cryptocurrency and working at a job... is that one of them makes you money and the other is your job.
 Stonks!
 Have you tried Keybase?  My condolences...
 When Moon?
@@ -60,12 +52,12 @@ When Flamethrower?
 Does Elon know?
 BITCONNEEEEEEEEEECT!
 When the dust settles..... (too soon?)
-No SSD's were harmed in the making of this movie.
+No SSDs were harmed in the making of this movie.
 (Pro Tip) If you delete System32 you can fit in more plots
 [A]bort, [R]etry, [F]ail
-Please insert Disk 2 and press any key to continue.....
+Please insert Disk 2 and press any key to continue...
 Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
 10 PRINT "WITTY TEXT GOES HERE"
-Just Remember...... You could have bought GPU's instead
-Congratulations you've won $0.00 please pay the Gas fee to receive you winnings.
+Just Remember...... You could have bought GPUs instead
+Congratulations you've won $0.00! Please pay the Gas fee to receive your winnings.
 1337.png
\ No newline at end of file
diff --git a/web/static/landings/en.txt b/web/static/landings/en.txt
new file mode 100644
index 00000000..23fc8543
--- /dev/null
+++ b/web/static/landings/en.txt
@@ -0,0 +1,63 @@
+Get in loser, we're going to the moon!
+Loading all the doge now...
+The IRS has been notified.
+I was told... there would be lambos.
+HODL!
+Good choice for a new hobby.
+First rule of forks... you don't talk about forks on /r/chia.
+Farm the dip!
+You can fit so many smart contracts in this bad boy.
+"Expected time to win"? Really?
+Psst! You got any more of that disk space?
+Hi-ho! Hi-ho! A schucking we will go.
+I'll make my own Chia... with blackjack and hookers!
+Keep calm and plot on.
+All your coins are belong to us.
+...formatting all hard drives in 3 2 1...
+Life is like a box of shitcoins
+Relax! They say this inflation is only transitory.
+Altcoins? Gotta Catch 'Em All
+The best time to begin plotting was March 17 2021, the second best time is today.
+Ch Ch Ch Chia
+What happens on the blockchain stays on the blockchain.
+Not your grandma's currency.
+My chia pet was so boring... I'd rather go watch my cryptocurrency grow.
+Cha-ching!
+Have you tried restarting it?
+Never trust a chia farm you can't throw out a window.
+The American dollar wants you to stop.
+Machinaris makes a great Christmas present.
+"Remember GME" (Game Stop)
+Life satisfaction and winning Chia coins... are basically the same thing.
+If in doubt, you could always try a fork.
+Raising the demand for hardrives since 2021
+Now with lootboxes
+Machinaris was the imposter
+You know what is really scary... No WiFi
+Wow lucky!
+I've never met a coin I didn't like
+We've never left Beta
+If and when the FBI calls... please don't tell them you're "plotting something"
+How's the electric bill these days?
+Today is someone's birthday!
+I remember working once...
+When are you going to get a "real" job?
+Working is so overrated
+There are two types of people in this world, those that farm cryptocurrency and those who do not.
+It's a great community, join our Discord!
+Stonks!
+Have you tried Keybase?  My condolences...
+When Moon?
+When Flamethrower?
+Does Elon know?
+BITCONNEEEEEEEEEECT!
+When the dust settles..... (too soon?)
+No SSDs were harmed in the making of this movie.
+(Pro Tip) If you delete System32 you can fit in more plots
+[A]bort, [R]etry, [F]ail
+Please insert Disk 2 and press any key to continue...
+Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
+10 PRINT "WITTY TEXT GOES HERE"
+Just Remember...... You could have bought GPUs instead
+Congratulations you've won $0.00! Please pay the Gas fee to receive your winnings.
+1337.png
\ No newline at end of file
diff --git a/web/static/landings/fr.txt b/web/static/landings/fr.txt
new file mode 100644
index 00000000..f8cd5bc0
--- /dev/null
+++ b/web/static/landings/fr.txt
@@ -0,0 +1,63 @@
+Entrez perdant, nous allons sur la lune!
+Chargement de tous les doges maintenant...
+L'IRS a été avisé.
+On m'a dit... qu'il y aurait des lambos.
+HODL!
+Bon choix pour un nouveau passe-temps.
+Première règle des forks... on ne parle pas de forks sur /r/chia.
+Farm le dip!
+Vous pouvez intégrer autant de contrats intelligents dans ce bad boy ici.
+"Expected time to win"? Sérieusement?
+Psst ! Vous avez plus de cet espace disque ?
+Hi-ho! Hi-ho! A schucking we will go.
+Je ferai ma propre Chia... avec du blackjack et des hookers!
+Restez calme et "plot on".
+Toutes vos pièces "are belong to us".
+...formatage de tous les disques durs en 3 2 1...
+La vie est comme une boîte de shitcoins
+Relaxer! Ils disent que cette inflation n'est que transitoire.
+Altcoins? Gotta Catch 'Em All
+Le meilleur moment pour commencer à plot était le 17 mars 2021, le deuxième meilleur moment est aujourd'hui.
+Ch Ch Ch Chia
+Ce qui se passe sur la blockchain reste sur la blockchain.
+Pas la monnaie de ta grand-mère.
+Mon animal de compagnie chia était si ennuyeux... Je préfère aller voir ma cryptocurrency grandir.
+Cha-ching!
+As-tu essayé de le redémarrer ?
+Ne faites jamais confiance à une ferme de chia que vous ne pouvez pas jeter par la fenêtre.
+The American dollar wants you to stop.
+Machinaris fait un excellent cadeau de Noël.
+Souvenez-vous de GME (Game Stop)
+Satisfaction de vivre et gagner des pièces Chia... c'est fondamentalement la même chose.
+En cas de doute, vous pouvez toujours essayer une fourchette.
+Augmentation de la demande de disques durs depuis 2021
+Maintenant avec des lootboxes
+Machinaris était l'imposteur
+Vous savez ce qui est vraiment effrayant... Pas de WiFi
+Quelle chance!
+Je n'ai jamais rencontré une pièce que je n'aimais pas
+Nous n'avons jamais quitté Beta
+Si et quand le FBI appelle... s'il vous plait, ne leur dites pas que vous "complotez quelque chose"
+Comment est la facture d'électricité ces jours-ci ?
+Aujourd'hui c'est l'anniversaire de quelqu'un !
+Je me souviens avoir travaillé une fois...
+Quand vas-tu trouver un "vrai" travail?
+Travailler est tellement surestimé
+Il existe deux types de personnes dans ce monde, celles qui cultivent la cryptocurrency et celles qui ne le font pas.
+C'est une grande communauté, rejoignez notre Discord!
+Stonks!
+Avez-vous essayé Keybase ? Mes condoléances...
+A quand la Lune ?
+A quand Lance-flammes ?
+Est-ce qu'Elon le sait ?
+BITCONNEEEEEEEEEECT!
+Quand la poussière retombe..... (trop tôt ?)
+Aucun SSD n'a été endommagé lors de la réalisation de ce film.
+(Pro Tip) Si vous supprimez System32, vous pouvez intégrer plus des plots
+[A]bort, [R]etry, [F]ail
+Veuillez insérer le disque 2 et appuyer sur n'importe quelle touche pour continuer...
+Erreur dans le rapport d'erreur, impossible d'erreur @$Error. Démarrage de Log4j dans 3... 2... 1...
+10 PRINT "WITTY TEXTE VA ICI"
+N'oubliez pas ...... Vous auriez pu acheter des GPU à la place
+Félicitations, vous avez gagné 0,00$ Veuillez payer les frais d'essence pour recevoir vos gains.
+1337.png
\ No newline at end of file
diff --git a/web/static/landings/it.txt b/web/static/landings/it.txt
new file mode 100644
index 00000000..23fc8543
--- /dev/null
+++ b/web/static/landings/it.txt
@@ -0,0 +1,63 @@
+Get in loser, we're going to the moon!
+Loading all the doge now...
+The IRS has been notified.
+I was told... there would be lambos.
+HODL!
+Good choice for a new hobby.
+First rule of forks... you don't talk about forks on /r/chia.
+Farm the dip!
+You can fit so many smart contracts in this bad boy.
+"Expected time to win"? Really?
+Psst! You got any more of that disk space?
+Hi-ho! Hi-ho! A schucking we will go.
+I'll make my own Chia... with blackjack and hookers!
+Keep calm and plot on.
+All your coins are belong to us.
+...formatting all hard drives in 3 2 1...
+Life is like a box of shitcoins
+Relax! They say this inflation is only transitory.
+Altcoins? Gotta Catch 'Em All
+The best time to begin plotting was March 17 2021, the second best time is today.
+Ch Ch Ch Chia
+What happens on the blockchain stays on the blockchain.
+Not your grandma's currency.
+My chia pet was so boring... I'd rather go watch my cryptocurrency grow.
+Cha-ching!
+Have you tried restarting it?
+Never trust a chia farm you can't throw out a window.
+The American dollar wants you to stop.
+Machinaris makes a great Christmas present.
+"Remember GME" (Game Stop)
+Life satisfaction and winning Chia coins... are basically the same thing.
+If in doubt, you could always try a fork.
+Raising the demand for hardrives since 2021
+Now with lootboxes
+Machinaris was the imposter
+You know what is really scary... No WiFi
+Wow lucky!
+I've never met a coin I didn't like
+We've never left Beta
+If and when the FBI calls... please don't tell them you're "plotting something"
+How's the electric bill these days?
+Today is someone's birthday!
+I remember working once...
+When are you going to get a "real" job?
+Working is so overrated
+There are two types of people in this world, those that farm cryptocurrency and those who do not.
+It's a great community, join our Discord!
+Stonks!
+Have you tried Keybase?  My condolences...
+When Moon?
+When Flamethrower?
+Does Elon know?
+BITCONNEEEEEEEEEECT!
+When the dust settles..... (too soon?)
+No SSDs were harmed in the making of this movie.
+(Pro Tip) If you delete System32 you can fit in more plots
+[A]bort, [R]etry, [F]ail
+Please insert Disk 2 and press any key to continue...
+Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
+10 PRINT "WITTY TEXT GOES HERE"
+Just Remember...... You could have bought GPUs instead
+Congratulations you've won $0.00! Please pay the Gas fee to receive your winnings.
+1337.png
\ No newline at end of file
diff --git a/web/static/landings/zh.txt b/web/static/landings/zh.txt
new file mode 100644
index 00000000..23fc8543
--- /dev/null
+++ b/web/static/landings/zh.txt
@@ -0,0 +1,63 @@
+Get in loser, we're going to the moon!
+Loading all the doge now...
+The IRS has been notified.
+I was told... there would be lambos.
+HODL!
+Good choice for a new hobby.
+First rule of forks... you don't talk about forks on /r/chia.
+Farm the dip!
+You can fit so many smart contracts in this bad boy.
+"Expected time to win"? Really?
+Psst! You got any more of that disk space?
+Hi-ho! Hi-ho! A schucking we will go.
+I'll make my own Chia... with blackjack and hookers!
+Keep calm and plot on.
+All your coins are belong to us.
+...formatting all hard drives in 3 2 1...
+Life is like a box of shitcoins
+Relax! They say this inflation is only transitory.
+Altcoins? Gotta Catch 'Em All
+The best time to begin plotting was March 17 2021, the second best time is today.
+Ch Ch Ch Chia
+What happens on the blockchain stays on the blockchain.
+Not your grandma's currency.
+My chia pet was so boring... I'd rather go watch my cryptocurrency grow.
+Cha-ching!
+Have you tried restarting it?
+Never trust a chia farm you can't throw out a window.
+The American dollar wants you to stop.
+Machinaris makes a great Christmas present.
+"Remember GME" (Game Stop)
+Life satisfaction and winning Chia coins... are basically the same thing.
+If in doubt, you could always try a fork.
+Raising the demand for hardrives since 2021
+Now with lootboxes
+Machinaris was the imposter
+You know what is really scary... No WiFi
+Wow lucky!
+I've never met a coin I didn't like
+We've never left Beta
+If and when the FBI calls... please don't tell them you're "plotting something"
+How's the electric bill these days?
+Today is someone's birthday!
+I remember working once...
+When are you going to get a "real" job?
+Working is so overrated
+There are two types of people in this world, those that farm cryptocurrency and those who do not.
+It's a great community, join our Discord!
+Stonks!
+Have you tried Keybase?  My condolences...
+When Moon?
+When Flamethrower?
+Does Elon know?
+BITCONNEEEEEEEEEECT!
+When the dust settles..... (too soon?)
+No SSDs were harmed in the making of this movie.
+(Pro Tip) If you delete System32 you can fit in more plots
+[A]bort, [R]etry, [F]ail
+Please insert Disk 2 and press any key to continue...
+Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
+10 PRINT "WITTY TEXT GOES HERE"
+Just Remember...... You could have bought GPUs instead
+Congratulations you've won $0.00! Please pay the Gas fee to receive your winnings.
+1337.png
\ No newline at end of file
diff --git a/web/templates/base.html b/web/templates/base.html
index 0e6e9e9e..e2ddd999 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -7,7 +7,7 @@
     
     
     
-    Machinaris
+    {{_('Machinaris')}}
     {% if reload_seconds %}
     
     {% endif %}
@@ -22,104 +22,102 @@
                 
    
                     
-                         Machinaris
+                         {{_('Machinaris')}}
                     
                     
    
                 
    
@@ -159,7 +157,7 @@
                         
    
                         {% if global_config.bladebit_version %}
                         
    
-                            Bladebit {{ global_config.bladebit_version }}
+                            {{_('Bladebit')}} {{ global_config.bladebit_version }}
                         
    
                         {% endif %}
                         
    
@@ -169,16 +167,16 @@
                             Chiadog {{ global_config.chiadog_version }}
                         
    
                         
    
-                            Machinaris {{
+                            {{_('Machinaris')}} {{
                                     global_config.machinaris_version }}
                         
    
                         {% if global_config.madmax_version %}
                         
    
-                            Madmax {{ global_config.madmax_version }}
+                            {{_('Madmax')}} {{ global_config.madmax_version }}
                         
    
                         {% endif %}
                         
    
-                            Plotman {{ global_config.plotman_version }}
+                            {{_('Plotman')}} {{ global_config.plotman_version }}
                         
    
                     
                 
diff --git a/web/translations/de/LC_MESSAGES/messages.po b/web/translations/de/LC_MESSAGES/messages.po
index cd64856c..5a79a74a 100644
--- a/web/translations/de/LC_MESSAGES/messages.po
+++ b/web/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: de\n"
@@ -70,18 +70,103 @@ msgstr ""
 msgid "Unsupported log type"
 msgstr ""
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
+#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+#, fuzzy
+msgid "Machinaris"
+msgstr "Willkommen zu"
+
+#: templates/base.html:31
+msgid "Summary"
 msgstr ""
 
-#: templates/index.html:41
+#: templates/base.html:37 templates/base.html:108 templates/index.html:41
 msgid "Plotting"
 msgstr ""
 
-#: templates/index.html:50
+#: templates/base.html:43 templates/base.html:102 templates/index.html:50
 msgid "Farming"
 msgstr ""
 
+#: templates/base.html:49
+msgid "Wallets"
+msgstr ""
+
+#: templates/base.html:55
+msgid "Keys"
+msgstr ""
+
+#: templates/base.html:62
+msgid "Blockchains"
+msgstr ""
+
+#: templates/base.html:69
+msgid "Connections"
+msgstr ""
+
+#: templates/base.html:75 templates/base.html:96
+msgid "Alerts"
+msgstr ""
+
+#: templates/base.html:81 templates/base.html:114
+msgid "Pools"
+msgstr ""
+
+#: templates/base.html:85
+msgid "Workers"
+msgstr ""
+
+#: templates/base.html:91
+msgid "Settings"
+msgstr ""
+
+#: templates/base.html:120
+msgid "Tools"
+msgstr ""
+
+#: templates/base.html:131
+msgid "About"
+msgstr ""
+
+#: templates/base.html:134
+msgid "Install"
+msgstr ""
+
+#: templates/base.html:136
+msgid "Project"
+msgstr ""
+
+#: templates/base.html:138
+msgid "Wiki"
+msgstr ""
+
+#: templates/base.html:140
+msgid "Issues"
+msgstr ""
+
+#: templates/base.html:142
+msgid "License"
+msgstr ""
+
+#: templates/base.html:144
+msgid "Credits"
+msgstr ""
+
+#: templates/base.html:160
+msgid "Bladebit"
+msgstr ""
+
+#: templates/base.html:175
+msgid "Madmax"
+msgstr ""
+
+#: templates/base.html:179
+msgid "Plotman"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
 #: templates/index.html:72
 msgid "Total Plots"
 msgstr ""
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/web/translations/fr/LC_MESSAGES/messages.po
index 36b6b545..a8654d52 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/web/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: fr\n"
@@ -80,25 +80,109 @@ msgstr ""
 msgid "Unsupported log type"
 msgstr "Type de journal non pris en charge"
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr "Temps prévu pour gagner"
+#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+msgid "Machinaris"
+msgstr ""
 
-#: templates/index.html:41
+#: templates/base.html:31
+msgid "Summary"
+msgstr "Sommaire"
+
+#: templates/base.html:37 templates/base.html:108 templates/index.html:41
 msgid "Plotting"
-msgstr "Parcelle"
+msgstr "Plotting"
 
-#: templates/index.html:50
+#: templates/base.html:43 templates/base.html:102 templates/index.html:50
 msgid "Farming"
-msgstr "Cultiver"
+msgstr "Farming"
+
+#: templates/base.html:49
+msgid "Wallets"
+msgstr "Portefeuilles"
+
+#: templates/base.html:55
+msgid "Keys"
+msgstr "Clés"
+
+#: templates/base.html:62
+msgid "Blockchains"
+msgstr ""
+
+#: templates/base.html:69
+msgid "Connections"
+msgstr "Connexions"
+
+#: templates/base.html:75 templates/base.html:96
+msgid "Alerts"
+msgstr "Alertes"
+
+#: templates/base.html:81 templates/base.html:114
+msgid "Pools"
+msgstr "Pools"
+
+#: templates/base.html:85
+msgid "Workers"
+msgstr "Workers"
+
+#: templates/base.html:91
+msgid "Settings"
+msgstr "Paramètres"
+
+#: templates/base.html:120
+msgid "Tools"
+msgstr "Outils"
+
+#: templates/base.html:131
+msgid "About"
+msgstr "À propos"
+
+#: templates/base.html:134
+msgid "Install"
+msgstr "Installer"
+
+#: templates/base.html:136
+msgid "Project"
+msgstr "Projet"
+
+#: templates/base.html:138
+msgid "Wiki"
+msgstr "Wiki"
+
+#: templates/base.html:140
+msgid "Issues"
+msgstr "Problèmes"
+
+#: templates/base.html:142
+msgid "License"
+msgstr "Licence"
+
+#: templates/base.html:144
+msgid "Credits"
+msgstr "Crédits"
+
+#: templates/base.html:160
+msgid "Bladebit"
+msgstr "Bladebit"
+
+#: templates/base.html:175
+msgid "Madmax"
+msgstr "Madmax"
+
+#: templates/base.html:179
+msgid "Plotman"
+msgstr "Plotman"
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr "Temps prévu pour gagner"
 
 #: templates/index.html:72
 msgid "Total Plots"
-msgstr "Parcelles totales"
+msgstr "Plots totales"
 
 #: templates/index.html:79
 msgid "Total Plots Size"
-msgstr "Taille totale des parcelles"
+msgstr "Taille totale des plots"
 
 #: templates/index.html:89
 msgid "Balance"
@@ -106,7 +190,7 @@ msgstr "Total"
 
 #: templates/index.html:96
 msgid "Farmed"
-msgstr "A Gagné"
+msgstr "Farmed"
 
 #: templates/index.html:105
 msgid "Netspace"
diff --git a/web/translations/it/LC_MESSAGES/messages.po b/web/translations/it/LC_MESSAGES/messages.po
index fa816b7d..0778d820 100644
--- a/web/translations/it/LC_MESSAGES/messages.po
+++ b/web/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: it\n"
@@ -70,18 +70,102 @@ msgstr ""
 msgid "Unsupported log type"
 msgstr ""
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
+#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+msgid "Machinaris"
+msgstr ""
+
+#: templates/base.html:31
+msgid "Summary"
 msgstr ""
 
-#: templates/index.html:41
+#: templates/base.html:37 templates/base.html:108 templates/index.html:41
 msgid "Plotting"
 msgstr ""
 
-#: templates/index.html:50
+#: templates/base.html:43 templates/base.html:102 templates/index.html:50
 msgid "Farming"
 msgstr ""
 
+#: templates/base.html:49
+msgid "Wallets"
+msgstr ""
+
+#: templates/base.html:55
+msgid "Keys"
+msgstr ""
+
+#: templates/base.html:62
+msgid "Blockchains"
+msgstr ""
+
+#: templates/base.html:69
+msgid "Connections"
+msgstr ""
+
+#: templates/base.html:75 templates/base.html:96
+msgid "Alerts"
+msgstr ""
+
+#: templates/base.html:81 templates/base.html:114
+msgid "Pools"
+msgstr ""
+
+#: templates/base.html:85
+msgid "Workers"
+msgstr ""
+
+#: templates/base.html:91
+msgid "Settings"
+msgstr ""
+
+#: templates/base.html:120
+msgid "Tools"
+msgstr ""
+
+#: templates/base.html:131
+msgid "About"
+msgstr ""
+
+#: templates/base.html:134
+msgid "Install"
+msgstr ""
+
+#: templates/base.html:136
+msgid "Project"
+msgstr ""
+
+#: templates/base.html:138
+msgid "Wiki"
+msgstr ""
+
+#: templates/base.html:140
+msgid "Issues"
+msgstr ""
+
+#: templates/base.html:142
+msgid "License"
+msgstr ""
+
+#: templates/base.html:144
+msgid "Credits"
+msgstr ""
+
+#: templates/base.html:160
+msgid "Bladebit"
+msgstr ""
+
+#: templates/base.html:175
+msgid "Madmax"
+msgstr ""
+
+#: templates/base.html:179
+msgid "Plotman"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
 #: templates/index.html:72
 msgid "Total Plots"
 msgstr ""
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index 0d4f653c..a9fa0e01 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-15 14:38-0700\n"
+"POT-Creation-Date: 2022-02-16 08:55-0700\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: FULL NAME \n"
 "Language: zh\n"
@@ -70,18 +70,102 @@ msgstr ""
 msgid "Unsupported log type"
 msgstr ""
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
+#: templates/base.html:10 templates/base.html:25 templates/base.html:170
+msgid "Machinaris"
+msgstr ""
+
+#: templates/base.html:31
+msgid "Summary"
 msgstr ""
 
-#: templates/index.html:41
+#: templates/base.html:37 templates/base.html:108 templates/index.html:41
 msgid "Plotting"
 msgstr ""
 
-#: templates/index.html:50
+#: templates/base.html:43 templates/base.html:102 templates/index.html:50
 msgid "Farming"
 msgstr ""
 
+#: templates/base.html:49
+msgid "Wallets"
+msgstr ""
+
+#: templates/base.html:55
+msgid "Keys"
+msgstr ""
+
+#: templates/base.html:62
+msgid "Blockchains"
+msgstr ""
+
+#: templates/base.html:69
+msgid "Connections"
+msgstr ""
+
+#: templates/base.html:75 templates/base.html:96
+msgid "Alerts"
+msgstr ""
+
+#: templates/base.html:81 templates/base.html:114
+msgid "Pools"
+msgstr ""
+
+#: templates/base.html:85
+msgid "Workers"
+msgstr ""
+
+#: templates/base.html:91
+msgid "Settings"
+msgstr ""
+
+#: templates/base.html:120
+msgid "Tools"
+msgstr ""
+
+#: templates/base.html:131
+msgid "About"
+msgstr ""
+
+#: templates/base.html:134
+msgid "Install"
+msgstr ""
+
+#: templates/base.html:136
+msgid "Project"
+msgstr ""
+
+#: templates/base.html:138
+msgid "Wiki"
+msgstr ""
+
+#: templates/base.html:140
+msgid "Issues"
+msgstr ""
+
+#: templates/base.html:142
+msgid "License"
+msgstr ""
+
+#: templates/base.html:144
+msgid "Credits"
+msgstr ""
+
+#: templates/base.html:160
+msgid "Bladebit"
+msgstr ""
+
+#: templates/base.html:175
+msgid "Madmax"
+msgstr ""
+
+#: templates/base.html:179
+msgid "Plotman"
+msgstr ""
+
+#: templates/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
 #: templates/index.html:72
 msgid "Total Plots"
 msgstr ""
diff --git a/web/utils.py b/web/utils.py
index 9caf81f3..17cadd7b 100644
--- a/web/utils.py
+++ b/web/utils.py
@@ -13,7 +13,7 @@
 def send_get(worker, path, query_params={}, timeout=30, debug=False, lang=None):
     if debug:
         http.client.HTTPConnection.debuglevel = 1
-    headers = []
+    headers = {}
     if lang:
         headers['Accept-Language'] = lang
     response = requests.get(worker.url + path, headers = headers, params = query_params, timeout=timeout)

From 3db0f9be7b45241e3867e56bb00b39f8d210252d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 16 Feb 2022 18:51:21 -0700
Subject: [PATCH 0596/1625] i18n for data tables

---
 api/translations/de/LC_MESSAGES/messages.po |  17 +-
 api/translations/fr/LC_MESSAGES/messages.po |  18 +-
 api/translations/it/LC_MESSAGES/messages.po |  18 +-
 api/translations/zh/LC_MESSAGES/messages.po |  18 +-
 api/views/logs/resources.py                 |   1 -
 scripts/pull_3rd_party_libs.sh              |  17 ++
 web/actions/worker.py                       |   1 +
 web/routes.py                               |  22 +-
 web/templates/alerts.html                   |   5 +
 web/templates/blockchains.html              |   5 +
 web/templates/connections.html              |   5 +
 web/templates/farming/plots.html            |  23 +-
 web/templates/farming/workers.html          |  23 +-
 web/templates/plotting/jobs.html            |  80 +++---
 web/templates/summary.html                  |   5 +
 web/templates/wallet.html                   |   5 +
 web/templates/worker.html                   |   5 +
 web/templates/workers.html                  |   5 +
 web/translations/de/LC_MESSAGES/messages.po | 283 ++++++++++++++++++--
 web/translations/fr/LC_MESSAGES/messages.po | 234 ++++++++++++++--
 web/translations/it/LC_MESSAGES/messages.po | 283 ++++++++++++++++++--
 web/translations/zh/LC_MESSAGES/messages.po | 283 ++++++++++++++++++--
 22 files changed, 1155 insertions(+), 201 deletions(-)

diff --git a/api/translations/de/LC_MESSAGES/messages.po b/api/translations/de/LC_MESSAGES/messages.po
index ecc9c424..6d22dd4e 100644
--- a/api/translations/de/LC_MESSAGES/messages.po
+++ b/api/translations/de/LC_MESSAGES/messages.po
@@ -1,15 +1,14 @@
-# German translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# German translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-16 08:55-0700\n"
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issues/353\n"
+"POT-Creation-Date: 2022-02-16 17:48-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
-"Last-Translator: FULL NAME \n"
+"Last-Translator: FULL NAME\n"
 "Language: de\n"
 "Language-Team: de \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -18,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:25
+#: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/fr/LC_MESSAGES/messages.po b/api/translations/fr/LC_MESSAGES/messages.po
index 1c4bc1a2..7ad89784 100644
--- a/api/translations/fr/LC_MESSAGES/messages.po
+++ b/api/translations/fr/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# French translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# French translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-16 08:55-0700\n"
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Creation-Date: 2022-02-16 15:00-0700\n"
+"POT-Creation-Date: 2022-02-16 17:48-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
-"Last-Translator: FULL NAME \n"
+"Last-Translator: Guy Davis\n"
 "Language: fr\n"
 "Language-Team: fr \n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:25
+#: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr "Le pong!"
 
diff --git a/api/translations/it/LC_MESSAGES/messages.po b/api/translations/it/LC_MESSAGES/messages.po
index 24cc721c..1ff56244 100644
--- a/api/translations/it/LC_MESSAGES/messages.po
+++ b/api/translations/it/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# Italian translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# Italian translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-16 08:55-0700\n"
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Creation-Date: 2022-02-16 15:00-0700\n"
+"POT-Creation-Date: 2022-02-16 17:48-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
-"Last-Translator: FULL NAME \n"
+"Last-Translator: FULL NAME\n"
 "Language: it\n"
 "Language-Team: it \n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:25
+#: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 9bf174a0..609dfb10 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# Chinese translations for PROJECT.
-# Copyright (C) 2022 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2022.
+# Chinese translations for Machinaris.
+# Copyright (C) 2022 Guy Davis
+# This file is distributed under the same license as the Machinaris project.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-02-16 08:55-0700\n"
+"Project-Id-Version: Machinaris VERSION\n"
+"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
+"Creation-Date: 2022-02-16 15:00-0700\n"
+"POT-Creation-Date: 2022-02-16 17:48-0700\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
-"Last-Translator: FULL NAME \n"
+"Last-Translator: FULL NAME\n"
 "Language: zh\n"
 "Language-Team: zh \n"
 "Plural-Forms: nplurals=1; plural=0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.1\n"
 
-#: views/ping/resources.py:25
+#: views/ping/resources.py:25 views/ping/resources.py:28
 msgid "Pong!"
 msgstr ""
 
diff --git a/api/views/logs/resources.py b/api/views/logs/resources.py
index fc276562..f6fee774 100644
--- a/api/views/logs/resources.py
+++ b/api/views/logs/resources.py
@@ -31,7 +31,6 @@ def get(self):
 class LogByType(MethodView):
 
     def get(self, type):
-        app.logger.info(request.headers)
         log = log_parser.get_log_lines(type, log_id=request.args.get('log_id'), blockchain=request.args.get('blockchain'))
         response = make_response(log, 200)
         response.mimetype = "plain/text"
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index 31fe21dc..bd95d82c 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -33,3 +33,20 @@ rm -f ${BASEPATH}/bsi-icons.zip
 wget -O ${BASEPATH}/bs.zip -nv "https://github.com/twbs/bootstrap/releases/download/v${BOOTSTRAP_VERSION}/bootstrap-${BOOTSTRAP_VERSION}-dist.zip" && \
 unzip -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/css/bootstrap.min.css* bootstrap-${BOOTSTRAP_VERSION}*/js/bootstrap.bundle.min.js*  && \
 rm -f ${BASEPATH}/bs.zip
+
+# Pull localization files for DataTables.js
+mkdir -p $BASEPATH/i18n/
+LANGS=$(grep -oP "LANGUAGES = \[\K(.*)\]" $BASEPATH/../../default_settings.py | cut -d ']' -f 1 | tr -d \'\" | tr -d ' ')
+IFS=',';
+for lang in $LANGS; 
+do
+  if [[ "$lang" == 'en' ]]; then
+      continue  # No separate translation files for default locale
+  fi
+  # First try $lang.json
+  wget -nv -O ${BASEPATH}/i18n/datatables.${lang}.json https://raw.githubusercontent.com/DataTables/Plugins/master/i18n/${lang}.json
+  if [ $? != 0 ]; then # Then try $lang_$lang.json  (Example French)
+    echo "Going for ${lang}_${lang}.json"
+    wget -nv -O ${BASEPATH}/i18n/datatables.${lang}.json https://raw.githubusercontent.com/DataTables/Plugins/master/i18n/${lang}_${lang}.json
+  fi
+done
diff --git a/web/actions/worker.py b/web/actions/worker.py
index 5a525077..0ea116fb 100644
--- a/web/actions/worker.py
+++ b/web/actions/worker.py
@@ -125,4 +125,5 @@ def generate_warnings(worker):
     # TODO - Warning if any blockchain challenges are missing in last hour (some percentage like that chart)
     # TODO - Warning if worker's time drifts more than 3 minutes off fullnode's WHEN responding with ping seconds ago
     # TODO - Warning if farmer sync status falls behind while running (at 5 mins, before a later restart is attempted)
+    # TODO - Warning if fullnode/harvester is not reporting disk stats
     return warnings
\ No newline at end of file
diff --git a/web/routes.py b/web/routes.py
index bead55cc..082a539e 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -71,7 +71,8 @@ def index():
 def summary():
     gc = globals.load()
     summaries = chia.load_summaries()
-    return render_template('summary.html', reload_seconds=120, summaries=summaries, global_config=gc)
+    return render_template('summary.html', reload_seconds=120, summaries=summaries, global_config=gc,
+        lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/setup', methods=['GET', 'POST'])
 def setup():
@@ -124,7 +125,7 @@ def plotting_jobs():
     plotting = plotman.load_plotting_summary()
     job_stats = stats.load_plotting_stats()
     return render_template('plotting/jobs.html', reload_seconds=120,  plotting=plotting, 
-        plotters=plotters, job_stats=job_stats, global_config=gc)
+        plotters=plotters, job_stats=job_stats, global_config=gc, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/plotting/workers', methods=['GET', 'POST'])
 def plotting_workers():
@@ -158,7 +159,8 @@ def farming_plots():
     gc = globals.load()
     farmers = chia.load_farmers()
     plots = chia.load_plots_farming()
-    return render_template('farming/plots.html', farmers=farmers, plots=plots, global_config=gc)
+    return render_template('farming/plots.html', farmers=farmers, plots=plots, global_config=gc, 
+        lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/farming/data')
 def farming_data():
@@ -198,7 +200,7 @@ def alerts():
     farmers = chiadog.load_farmers()
     notifications = chiadog.get_notifications()
     return render_template('alerts.html', reload_seconds=120, farmers=farmers,
-        notifications=notifications, global_config=gc)
+        notifications=notifications, global_config=gc, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/wallet', methods=['GET', 'POST'])    
 def wallet():
@@ -208,7 +210,8 @@ def wallet():
         selected_blockchain = request.form.get('blockchain')
         chia.save_cold_wallet_addresses(request.form.get('blockchain'), request.form.get('cold_wallet_address'))
     wallets = chia.load_wallets()
-    return render_template('wallet.html', wallets=wallets, global_config=gc, selected_blockchain = selected_blockchain, reload_seconds=120)
+    return render_template('wallet.html', wallets=wallets, global_config=gc, selected_blockchain = selected_blockchain, 
+        reload_seconds=120, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/keys')
 def keys():
@@ -227,7 +230,7 @@ def workers():
             worker.prune_workers_status(request.form.getlist('worker'))
     wkrs = worker.load_worker_summary()
     return render_template('workers.html', reload_seconds=120, 
-        workers=wkrs, global_config=gc)
+        workers=wkrs, global_config=gc, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/worker', methods=['GET'])
 def worker_route():
@@ -241,7 +244,8 @@ def worker_route():
     warnings = worker.generate_warnings(wkr)
     return render_template('worker.html', worker=wkr, 
         plotting=plotting, plots_disk_usage=plots_disk_usage, 
-        plotting_disk_usage=plotting_disk_usage, warnings=warnings, global_config=gc)
+        plotting_disk_usage=plotting_disk_usage, warnings=warnings, global_config=gc,
+        lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/blockchains')
 def blockchains():
@@ -249,7 +253,7 @@ def blockchains():
     selected_blockchain = worker.default_blockchain()
     blockchains = chia.load_blockchains()
     return render_template('blockchains.html', reload_seconds=120, selected_blockchain = selected_blockchain, 
-        blockchains=blockchains, global_config=gc)
+        blockchains=blockchains, global_config=gc, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/connections', methods=['GET', 'POST'])
 def connections():
@@ -265,7 +269,7 @@ def connections():
             app.logger.info(_("Unknown form action") + ": {0}".format(request.form))
     connections = chia.load_connections()
     return render_template('connections.html', reload_seconds=120, selected_blockchain = selected_blockchain,
-        connections=connections, global_config=gc)
+        connections=connections, global_config=gc, lang=request.accept_languages.best_match(app.config['LANGUAGES']))
 
 @app.route('/settings/plotting', methods=['GET', 'POST'])
 def settings_plotting():
diff --git a/web/templates/alerts.html b/web/templates/alerts.html
index 2b108f46..6c8c3ff3 100644
--- a/web/templates/alerts.html
+++ b/web/templates/alerts.html
@@ -131,6 +131,11 @@ 
    Expect at least a summary notification once daily as long as running above.<
         }
         $(document).ready(function () {
             $('#data').DataTable({
+                {% if lang != 'en' %}
+                "language": {
+                    "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
+                },
+                {% endif %}
                 "pageLength": 10,
                 "lengthMenu": [ [10, 25, 50, 100, 200, -1], [10, 25, 50, 100, 200, "All"] ],
                 "columnDefs": [{ "orderable": false, targets: [0] }],
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 1348aaea..afc1876e 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -95,6 +95,11 @@ 
    Try running 'chia show --state' on your farmers to verify.
    
 
-    Machinaris
+    {{_('Machinaris')}}
     
 
 
@@ -20,10 +20,10 @@
                 
    
                     
    
                         
-                        Machinaris Worker
+                        {{_('Machinaris Worker')}}
                     
    
                     
    
-                    
    This Machinaris worker is controlled at: {{ controller_url}}
    
+                    
    {{_('This Machinaris worker is controlled at:')}} {{ controller_url}}
    
                 
    
             
         
diff --git a/web/templates/keys.html b/web/templates/keys.html
index 7ad6ddc5..1a9980fc 100644
--- a/web/templates/keys.html
+++ b/web/templates/keys.html
@@ -40,8 +40,8 @@
                 
    
                 
    {{ key.details}}
    
                 


    
-                
    NOTE: Machinaris will never display your private key here.
    
-                
    However, you may view it yourself by executing this from within the Docker container.
    
+                
    {{_('NOTE: Machinaris will never display your private key here.')}}
    
+                
    {{_('However, you may view it yourself by executing this from within the Docker container.')}}
    
                 
    
                     {% if key.blockchain == 'mmx' %}
                     mmx wallet get seed
@@ -51,15 +51,10 @@
                 
    
                 
    
                 {% if key.blockchain != 'mmx' %}
-                
    Best Practices
    
+                
    {{_('Best Practices')}}
    
                 
      
-                    
-                    
    • Machinaris uses an online wallet for farming. It is strongly recommended that you use a cold wallet 
-                        for your payout instructions. Tutorial on the wiki.
-                        Please add "Setup a Cold Wallet" to your To-Do list!
+                    
    • {{_('Machinaris uses an online wallet for farming. It is strongly recommended that you use a cold wallet for your payout instructions. Tutorial on the %(wiki_link_open)swiki%(wiki_link_close). Please add "Setup a Cold Wallet" to your To-Do list!',
+                        wiki_link_open='' wiki_link_close='')}}
                     
      • 
                 
    
                 {% endif %}
@@ -70,8 +65,8 @@ 
    Best Practices
    
 
 {% else %}
 
    
-    
    No keys found from any farmers. Not added?
    
-    
    Try running 'chia keys show' on your farmers to verify.
    
+    
    {{_('No keys found from any farmers. Not added?')}}
    
+    
    {{_('Try running 'chia keys show' on your farmers to verify.')}}
    
 
    
 {% endif %}
 
diff --git a/web/templates/logs.html b/web/templates/logs.html
index 6034e4ac..27a77793 100644
--- a/web/templates/logs.html
+++ b/web/templates/logs.html
@@ -8,7 +8,7 @@
     
     
     
-    Machinaris Logs
+    {{_('Machinaris Logs')}}
     
 
+
+
     		{{_('Wallet Balance')}}
                 {{_('Cold Wallet Balance')}}
                 {{_('Total Balance')}}{{_('USD*')}}{{_('Balance')}} {{local_cur_sym}}
                 {{_('Updated At')}}
                 
             
    
                 
                 
    {{wallet.hot_balance}}
                 {{wallet.cold_balance}}{{wallet.total_balance}}{{wallet.usd_balance}}{{wallet.total_balance}} {{wallet.blockchain_symbol}}{{wallet.fiat_balance}}
                 {{wallet.updated_at | datetimefilter}}{{_('Wallet')}}
                 {{_('EDV')}}{{_('EDV')}} {{local_cur_sym}}{{_('EDV')}} {{local_cur_sym|upper}}
                 
                 
             
    
                                         {{_('Type')}}
                                         {{_('IP Address')}}{{_('City')}}{{_('Country')}}{{_('Ports')}}{{_('Node ID')}}
                                         {{_('SB Height')}}
                                         {{_('Last Connect')}}
                                         {{_('MiB Up')}}
                                         {{row.type}}
                                         {{row.ip}}{{row.city}}{{row.country}}{{row.ports}}{{row.nodeid}}
                                         {{row.height}}
                                         {{row.last_connect}}
                                         {{row.mib_up}}
           
    
             
             
    
+        
+          
+            
+            
+            
+            
+            
+            
+            
+          
+        
+        
+          {% for drive in drives.rows %}
+          
+            
+            
+            
+            
+            
+            
+            
+            
+          
+          {% endfor %}
+        
+      
    {{_('Worker')}}{{_('Device')}}{{_('Model')}}{{_('Capacity')}}{{_('Status')}}{{_('Temperature')}}{{_('Updated At')}}
    {{drive.worker}}{{drive.device}} {% if drive.model_family %}
+                   {{drive.model_family}}
+                 {% else %}
+                  {{drive.device_model}}
+                 {% endif %}
+            {{drive.capacity}}
+              {% if drive.status == 'PASSED' %}
+                 {{_('Passed')}}
+              {% else %}
+                
+                {{_(drive.status)}}
+              {% endif %}
+            
+              {% if drive.temperature < 40 %}
+                 {{ drive.temperature }}
+              {% elif drive.temperature < 50 %}
+                 {{ drive.temperature }}
+              {% else %}
+                 {{ drive.temperature }}
+              {% endif %}
+            {{drive.updated_at | datetimefilter}}
    
+  
+
+  {% else %}
+
+  {% autoescape false %}
+  
    
+    
    {{_('No drives accessible to smartctl inside the Machinaris containers.')}}
    
+    
    {{_('Please configure Docker to allow smartctl access to host devices.')}}
    
+    
    {{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.', 
+        wiki_link_open='',
+        wiki_link_close='')}}
+    
    
+  
    
+  {% endautoescape %}
+  
    
+  
    
+  {% endif %}
+
+
+  {% endblock %}
+
+  {% block scripts %}
+  
+  {% endblock %}
\ No newline at end of file

From 989015571afd95e60f2d65eafc661338fd980f99 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 18 Mar 2022 14:38:31 -0600
Subject: [PATCH 0670/1625] Fix for broken DB upgrade.

---
 api/migrations/versions/53d13c2cdac7_.py | 5 +++++
 api/migrations/versions/da71a39b8e21_.py | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/api/migrations/versions/53d13c2cdac7_.py b/api/migrations/versions/53d13c2cdac7_.py
index fd97cdf5..2c980410 100644
--- a/api/migrations/versions/53d13c2cdac7_.py
+++ b/api/migrations/versions/53d13c2cdac7_.py
@@ -346,3 +346,8 @@ def downgrade_stat_plotting_disk_free():
     pass
     # ### end Alembic commands ###
 
+def upgrade_drives():
+    pass
+
+def downgrade_drives():
+    pass
\ No newline at end of file
diff --git a/api/migrations/versions/da71a39b8e21_.py b/api/migrations/versions/da71a39b8e21_.py
index 2785a6dd..6c44727e 100644
--- a/api/migrations/versions/da71a39b8e21_.py
+++ b/api/migrations/versions/da71a39b8e21_.py
@@ -538,3 +538,8 @@ def downgrade_stat_plotting_disk_free():
     op.drop_table('stat_plotting_disk_free')
     # ### end Alembic commands ###
 
+def upgrade_drives():
+    pass
+
+def downgrade_drives():
+    pass

From d1ebe6dbb12b69e9a142858faa402b2571ff8e10 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 20 Mar 2022 21:17:12 -0600
Subject: [PATCH 0671/1625] Updated blockchain and tool versions.

---
 CHANGELOG.md                       | 2 ++
 scripts/forks/btcgreen_install.sh  | 4 ++--
 scripts/forks/hddcoin_install.sh   | 4 ++--
 scripts/forks/mmx_install.sh       | 4 ++--
 scripts/forks/shibgreen_install.sh | 4 ++--
 scripts/forks/silicoin_install.sh  | 4 ++--
 scripts/forks/staicoin_install.sh  | 4 ++--
 scripts/madmax_setup.sh            | 4 ++--
 8 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d74e46e..ff7164b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,10 @@ All notable changes to this project will be documented in this file. The format
  - 
 
 ## [0.7.1] - 2022-04-?
+ - Drive monitoring using Smartctl (still a work-in-progress)
  - Dutch translations (nl_NL) provided by Bernie Deprez.  Thanks!
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.3.1) - v1.3.1 patch release
+ - Updates to various fork blockchains and tools including BTCGreen, HDDCoin, Madmax, and Shibgreen
 
 ## [0.7.0] - 2022-03-11
  - [Chia](https://chia.net) - [v1.3](https://www.reddit.com/r/chia/comments/t95vuk/13_is_live/), please note reports of issues in this new Chia release...  double-check your Wallet and Pools settings after upgrading!
diff --git a/scripts/forks/btcgreen_install.sh b/scripts/forks/btcgreen_install.sh
index f0807c1f..0227306d 100644
--- a/scripts/forks/btcgreen_install.sh
+++ b/scripts/forks/btcgreen_install.sh
@@ -4,8 +4,8 @@
 #
 
 BTCGREEN_BRANCH=$1
-# On 2022-01-22
-HASH=2ab991f6b207872b17ce237ebe409defb96cd524
+# On 2022-03-20
+HASH=f8c04e152ae17ee6893756d22db16ca700221b35
 
 if [ -z ${BTCGREEN_BRANCH} ]; then
 	echo 'Skipping BTCGreen install as not requested.'
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index 4c544378..97f1fbdc 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 HDDCOIN_BRANCH=$1
-# On 2022-01-22
-HASH=75d13c065a417f97f335849adf41ed5592f49543
+# On 2022-03-20
+HASH=42403754da1d819632b0442964eabc2962e30484
 
 if [ -z ${HDDCOIN_BRANCH} ]; then
 	echo 'Skipping HDDCoin install as not requested.'
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index ebf90d13..1cbb3adc 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2021-12-29 - temporarily disable as no releases are happening
-#HASH=00fdc419a6b5d9ad7c00839dbf9af93014673a18
+# On 2022-03-20
+HASH=2d1161588ac7e1de777e4b92a303fd5afa5c6494
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
diff --git a/scripts/forks/shibgreen_install.sh b/scripts/forks/shibgreen_install.sh
index 1d387a1a..1052eb54 100644
--- a/scripts/forks/shibgreen_install.sh
+++ b/scripts/forks/shibgreen_install.sh
@@ -4,8 +4,8 @@
 #
 
 SHIBGREEN_BRANCH=$1
-# On 2021-12-12
-HASH=d2e08a3cad84b1cb72c7952c9870aa44ff9d7104
+# On 2022-03-20
+HASH=b1e41e82ad849775543aa36fefc0c0d03e13f6e8
 
 if [ -z ${SHIBGREEN_BRANCH} ]; then
 	echo 'Skipping SHIBGreen install as not requested.'
diff --git a/scripts/forks/silicoin_install.sh b/scripts/forks/silicoin_install.sh
index 2db926a8..7905dfcb 100644
--- a/scripts/forks/silicoin_install.sh
+++ b/scripts/forks/silicoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 SILICOIN_BRANCH=$1
-# On 2022-02-05
-HASH=ca482fa66f05e883891705c86bfdff63e101e3a4
+# On 2022-03-20
+HASH=ebe7880e24b22d8f3bf8d0c8b31ad5397b3e7af3
 
 if [ -z ${SILICOIN_BRANCH} ]; then
 	echo 'Skipping Silicoin install as not requested.'
diff --git a/scripts/forks/staicoin_install.sh b/scripts/forks/staicoin_install.sh
index 8feb758b..b8f0ec68 100644
--- a/scripts/forks/staicoin_install.sh
+++ b/scripts/forks/staicoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 STAICOIN_BRANCH=$1
-# On 2022-01-13
-HASH=a8ca05cbd2602eee7c2e4ce49c74c447a091ef0f
+# On 2022-03-20
+HASH=6096e50031e338d5e1770bdcdfca4c2d0d7a0754
 
 if [ -z ${STAICOIN_BRANCH} ]; then
 	echo 'Skipping Staicoin install as not requested.'
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index d8197909..d9e476f9 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -4,8 +4,8 @@
 # See https://github.com/madMAx43v3r/chia-plotter
 #
 
-# As of 2022-01-03
-HASH=9d7fd929919d1adde6404cb4718a665a81bcef6d
+# As of 2022-03-20
+HASH=ecec17d25cd547fa4bb64b2eb7455b831c8a2882
 MADMAX_BRANCH=master
 
 if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx') ]]; then

From eba5e29eba77b1e4198bbfb3342f0c351453c74e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 21 Mar 2022 22:49:18 -0600
Subject: [PATCH 0672/1625] Grid vs table view of drive status.

---
 web/actions/worker.py          |  1 +
 web/models/drives.py           | 17 ++++++++-
 web/routes.py                  |  6 ++-
 web/templates/base.html        | 20 +++++-----
 web/templates/blockchains.html | 19 +++++++++-
 web/templates/drives.html      | 67 +++++++++++++++++++++++++++++++---
 web/templates/summary.html     | 17 ++++++++-
 7 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/web/actions/worker.py b/web/actions/worker.py
index 0b2c0c2c..9d721964 100644
--- a/web/actions/worker.py
+++ b/web/actions/worker.py
@@ -63,6 +63,7 @@ def get_fullnodes_by_blockchain():
     fullnodes = {}
     for worker in db.session.query(workers.Worker).filter(workers.Worker.mode=='fullnode').all():
         fullnodes[worker.blockchain] = worker
+        app.logger.debug("{0} -> {1}".format(worker.blockchain, worker.hostname))
     return fullnodes
 
 def default_blockchain():
diff --git a/web/models/drives.py b/web/models/drives.py
index bd0f9c14..03f6b81b 100644
--- a/web/models/drives.py
+++ b/web/models/drives.py
@@ -1,5 +1,7 @@
 import traceback
 
+from flask_babel import _, lazy_gettext as _l
+
 from web import app
 from web.actions import worker
 
@@ -26,10 +28,21 @@ def __init__(self, drives):
                 'type': drive.type,
                 'comment': drive.comment,
                 'temperature': drive.temperature,
-                'power_on_hours': drive.power_on_hours,
+                'power_on_hours': self.convert_hours_days_etc(drive.power_on_hours),
                 'size_gibs': drive.size_gibs,
                 'capacity': drive.capacity,
                 'smart_info': drive.smart_info,
                 'created_at': drive.created_at,
                 'updated_at': drive.updated_at
-            })
\ No newline at end of file
+            })
+
+    def convert_hours_days_etc(self, hours):
+        if hours < 24:
+            return "{0} ".format(round(hours, 1)) + _('hours')
+        if hours < 24 * 7:
+            return "{0} ".format(round(hours/24, 1)) + _('days')
+        if hours < 24 * 7 * 5:
+            return "{0} ".format(round(hours/24/7, 1)) + _('weeks')
+        if hours < 24 * 365:
+            return "{0} ".format(round(hours/24/365*12, 1)) + _('months')
+        return "{0} ".format(round(hours/24/365, 1)) + _('years')
\ No newline at end of file
diff --git a/web/routes.py b/web/routes.py
index 84d77c4a..19289a90 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -85,9 +85,10 @@ def summary():
         fiat.save_local_currency(request.form.get('local_currency'))
         flash(_("Saved local currency setting."), 'success')
     summaries = chia.load_summaries()
+    fullnodes = worker.get_fullnodes_by_blockchain()
     return render_template('summary.html', reload_seconds=120, summaries=summaries, global_config=gc,
         exchange_rates=fiat.load_exchange_rates_cache(), local_currency=fiat.get_local_currency(), 
-        local_cur_sym=fiat.get_local_currency_symbol(), lang=get_lang(request))
+        local_cur_sym=fiat.get_local_currency_symbol(), fullnodes=fullnodes, lang=get_lang(request))
 
 @app.route('/setup', methods=['GET', 'POST'])
 def setup():
@@ -282,8 +283,9 @@ def blockchains():
     gc = globals.load()
     selected_blockchain = worker.default_blockchain()
     blockchains = chia.load_blockchains()
+    fullnodes = worker.get_fullnodes_by_blockchain()
     return render_template('blockchains.html', reload_seconds=120, selected_blockchain = selected_blockchain, 
-        blockchains=blockchains, global_config=gc, lang=get_lang(request))
+        blockchains=blockchains, fullnodes=fullnodes, global_config=gc, lang=get_lang(request))
 
 @app.route('/connections', methods=['GET', 'POST'])
 def connections():
diff --git a/web/templates/base.html b/web/templates/base.html
index 007ef21d..031620a2 100644
--- a/web/templates/base.html
+++ b/web/templates/base.html
@@ -97,32 +97,32 @@
                             
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 10727818..01f0f302 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -33,12 +33,13 @@
                 {{_('Peak Height')}}
                 {{_('Peak Time')}}
                 {{_('Updated At')}}
+                {{_('Logs')}}
             
         
         
             {% for blockchain in blockchains.rows %}
             
-                {{blockchain.blockchain}}
+                {{blockchain.blockchain}}
                 
                     {% if blockchain.status == 'Offline' %}
                       
@@ -52,6 +53,9 @@
                 {{blockchain.peak_height}}
                 {{blockchain.peak_time}}
                 {{blockchain.updated_at | datetimefilter}}
+                
+                    
+                
             
             {% endfor %}
         
@@ -93,9 +97,22 @@ 
    {{_('Try running "chia show --state" on your farmers to verify.')}}
    
 
 {% block scripts %}
 
+
+
+
+    
    
+        
+    
    
+    
    Loaded at: {{ global_config.now }}
    
+    
+    
+    
+    
+    
+    
+
+
diff --git a/web/templates/index/chart_farmed.html b/web/templates/index/chart_farmed.html
new file mode 100644
index 00000000..b170e6a3
--- /dev/null
+++ b/web/templates/index/chart_farmed.html
@@ -0,0 +1,128 @@
+
+
+
+
+    
+    
+    
+    
+    
+    {{ chart_data.title }}
+    {% if reload_seconds %}
+    
+    {% endif %}
+    
+    
+    
+    
+
+
+
+    
    
+        
+    
    
+    
    Loaded at: {{ global_config.now }}
    
+    
+    
+    
+    
+    
+    
+
+
diff --git a/web/templates/index.html b/web/templates/index/index.html
similarity index 90%
rename from web/templates/index.html
rename to web/templates/index/index.html
index f7e6543c..bc286843 100644
--- a/web/templates/index.html
+++ b/web/templates/index/index.html
@@ -84,12 +84,14 @@ 
    {{_('Total Plots Size')}}
    
         
    
           
    
             
    
+              
               
    {{farms[blockchain].wallet_balance }}
    
               
    {{ farms[blockchain].currency_symbol }} {{_('Balance')}}
    
             
    
           
    
           
    
+            
             
    
               
    {{farms[blockchain].total_coins }}
    
@@ -158,6 +160,14 @@ 
    {{blockchain|capitalize}} - {{_('Partial Proof
   {% if global_config.farming_enabled %}
   
   {% endif %}
   {% endblock %}
\ No newline at end of file

From dcaac87234bb1387eff41e0c112dcc3bf9e13987 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 1 Jun 2022 19:44:19 -0600
Subject: [PATCH 0754/1625] Latest MMX testnet6.

---
 CHANGELOG.md                            |  2 +
 api/commands/chia_cli.py                |  2 +-
 api/commands/websvcs.py                 |  8 +---
 api/models/chia.py                      |  6 ++-
 api/models/log.py                       | 16 +++----
 common/config/globals.py                |  5 +++
 scripts/forks/mmx_install.sh            |  4 +-
 scripts/forks/mmx_launch.sh             | 18 ++++----
 web/__init__.py                         | 10 ++++-
 web/actions/stats.py                    | 24 ++++++++++-
 web/models/chia.py                      | 23 +++++++++-
 web/routes.py                           |  9 ++--
 web/templates/blockchains.html          |  2 +-
 web/templates/drives.html               |  4 +-
 web/templates/index/chart_balances.html |  9 ----
 web/templates/index/chart_farmed.html   | 56 +++++++++++++++++++++----
 web/templates/index/index.html          |  7 ++--
 web/templates/keys.html                 | 10 ++---
 web/templates/plotting/jobs.html        |  2 +-
 web/templates/summary.html              | 25 +++++++++--
 web/templates/wallet.html               | 18 ++++++--
 web/templates/workers.html              |  2 +-
 22 files changed, 188 insertions(+), 74 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7265e406..649c5346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,12 @@
 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).
 
 ## [0.7.3] - 2022-06-?
+ - Wallets - chart each blockchain's farmed coins and wallet balances over the past month.
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain) - v1.3.4, matches Chia 1.3.4, please run: `cactus db upgrade`
  - [Chives](https://github.com/HiveProject2021/chives-blockchain) - v1.3.1, please run: `chives db upgrade`
  - [Cryptodoge](https://github.com/CryptoDoge-Network/cryptodoge) - v1.3.4, matches Chia 1.3.4, please run: `cryptodoge db upgrade`
  - [Flax](https://github.com/Flax-Network/flax-blockchain) - v0.1.8, matches Chia 1.3.3, please run: `flax db upgrade` if you haven't yet
+ - [MMX](https://github.com/madMAx43v3r/mmx-node) - updated version for their `testnet6` network.
 
 ## [0.7.2] - 2022-05-17
  - Drives monitoring page - allow [overrides of smartctl commands](https://github.com/guydavis/machinaris/wiki/Drives#override-command) for special hardware. Drive failure alerts thru our enhanced Chiadog.
diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 32f6e2d8..0655a852 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -121,7 +121,7 @@ def load_connections_show(blockchain):
 
 def load_keys_show(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    proc = Popen("{0} keys show".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
+    proc = Popen("{0} keys show -d".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
     try:
         outs, errs = proc.communicate(timeout=90)
     except TimeoutExpired:
diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 1a7e3462..fafe3ca8 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -10,6 +10,7 @@
 import requests
 import traceback
 
+from common.config import globals
 from api import app
 
 ALLTHEBLOCKS_REQUEST_INTERVAL_MINS = 15
@@ -65,11 +66,6 @@ def save_cold_wallet_cache(cold_wallet_cache):
     except Exception as ex:
         app.logger.error("Failed to store cold wallet cache in {0} because {1}".format(COLD_WALLET_CACHE_FILE, str(ex)))
 
-def get_alltheblocks_name(blockchain):
-    if blockchain == 'staicoin':
-        return 'stai' # Special case for staicoin's inconsistent naming convention
-    return blockchain
-
 def request_cold_wallet_balance(blockchain, cold_wallet_cache, alltheblocks_blockchain, address, debug=False):
     app.logger.info("Requesting {0} wallet balance for {1}".format(alltheblocks_blockchain, address))
     url = f"https://api.alltheblocks.net/{alltheblocks_blockchain}/address/{address}"
@@ -90,7 +86,7 @@ def request_cold_wallet_balance(blockchain, cold_wallet_cache, alltheblocks_bloc
 def cold_wallet_balance(blockchain):
     global last_cold_wallet_request_time
     total_balance = 0.0
-    alltheblocks_blockchain = get_alltheblocks_name(blockchain)
+    alltheblocks_blockchain = globals.get_alltheblocks_name(blockchain)
     addresses_per_blockchain = load_cold_wallet_addresses()
     cold_wallet_cache = load_cold_wallet_cache()
     if blockchain in addresses_per_blockchain:
diff --git a/api/models/chia.py b/api/models/chia.py
index 715a17b9..64a76b78 100644
--- a/api/models/chia.py
+++ b/api/models/chia.py
@@ -106,7 +106,7 @@ def exclude_cat_wallets(self, wallet_details):
                 if re.match('^\s+-Type:\s+CAT$', line):
                     is_cat_wallet = True
             if is_cat_wallet:
-                app.logger.info("Ignoring balance of CAT type wallet named: {0}".format(lines[0][:-1]))
+                app.logger.debug("Ignoring balance of CAT type wallet named: {0}".format(lines[0][:-1]))
             else:
                 details.extend(chunk.split('\n'))
         return '\n'.join(details)
@@ -116,7 +116,9 @@ def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=Tru
         rx = re.compile(numeric_const_pattern, re.VERBOSE)
         sum = 0
         for wallet in self.wallets:
-            if wallet.hostname == hostname and wallet.blockchain == blockchain:
+            if not 'Sync status: Synced' in wallet.details:
+                raise Exception('{0} wallet is not synced, so balance is unknown.')
+            elif wallet.hostname == hostname and wallet.blockchain == blockchain:
                 try:
                     for balance in rx.findall(self.exclude_cat_wallets(wallet.details)):
                         #app.logger.info("Found balance of {0} for for {1} - {2}".format(balance, 
diff --git a/api/models/log.py b/api/models/log.py
index 9166f00d..04b353dd 100644
--- a/api/models/log.py
+++ b/api/models/log.py
@@ -76,7 +76,7 @@ def __init__(self, cli_stdout):
         self.columns = [ 'challenge_id', 'plot_files', 'proofs_found', 'time_taken', 'farmed_block', 'created_at']
         self.rows = []
         plot_files = []
-        challenge_id = plots_past_filter = proofs_found = time_taken = farmed_block = None
+        challenge_id = plots_past_filter = proofs_found = time_taken = farmed_block = created_at = None
         cli_stdout.append('--') # add a trailing -- to force last parse
         for line in cli_stdout:
             try:
@@ -107,13 +107,13 @@ def __init__(self, cli_stdout):
                         plots_past_filter = proofs_found = time_taken = farmed_block = None
                         plot_files = []
                     else:
-                        app.logger.info("challenge_id: {0}".format(challenge_id))
-                        app.logger.info("plot_files: {0}".format(plot_files))
-                        app.logger.info("plots_past_filter: {0}".format(plots_past_filter))
-                        app.logger.info("proofs_found: {0}".format(proofs_found))
-                        app.logger.info("time_taken: {0}".format(time_taken))
-                        app.logger.info("created_at: {0}".format(created_at))
-                        app.logger.info("Missing farmed blocks data for farmed_block {0}".format(farmed_block))
+                        app.logger.debug("challenge_id: {0}".format(challenge_id))
+                        app.logger.debug("plot_files: {0}".format(plot_files))
+                        app.logger.debug("plots_past_filter: {0}".format(plots_past_filter))
+                        app.logger.debug("proofs_found: {0}".format(proofs_found))
+                        app.logger.debug("time_taken: {0}".format(time_taken))
+                        app.logger.debug("created_at: {0}".format(created_at))
+                        app.logger.debug("Missing farmed blocks data for farmed_block {0}".format(farmed_block))
             except:
                 app.logger.info("Failed to parse blocks line: {0}".format(line))
                 app.logger.info(traceback.format_exc())
diff --git a/common/config/globals.py b/common/config/globals.py
index 09bc590d..9a6abc17 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -411,3 +411,8 @@ def get_disks(disk_type):
             logging.info("Unable to find any plotting for stats.")
             logging.info(traceback.format_exc())
             return []
+
+def get_alltheblocks_name(blockchain):
+    if blockchain == 'staicoin':
+        return 'stai' # Special case for staicoin's inconsistent naming convention
+    return blockchain
\ No newline at end of file
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 2bbae4a7..bbf900b9 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-05-18
-HASH=4ce5daa60a2e83471f1ea1731dd2091138f3890b
+# On 2022-06-01
+HASH=92c909291d3d82f57b1680639b9b4f3c4c0ba05e
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index 1b6b91eb..f9cfa7de 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -28,9 +28,9 @@ if [ ! -d /root/.chia/mmx/config ]; then
 EOF
 	# For a fresh install of Machinaris-MMX, disable timelord by default to save CPU usage
 	echo false > /root/.chia/mmx/config/local/timelord
-elif [ ! -d /root/.chia/mmx/config/testnet5 ]; then # Handle an upgrade from older testnet
+elif [ ! -d /root/.chia/mmx/config/testnet6 ]; then # Handle an upgrade from older testnet
 	echo 'Copying over new testnet configs to /root/.chia/mmx/config/'
-	cp -r ./config/testnet5 /root/.chia/mmx/config/
+	cp -r ./config/testnet6 /root/.chia/mmx/config/
 fi
 rm -rf ./config
 ln -s /root/.chia/mmx/config /mmx-node/config
@@ -54,19 +54,19 @@ else
 	echo "No OPENCL_GPU provided.  MMX blockchain will use use CPU instead."
 fi
 
-# Symlink the NETWORK file, use 'testnet5' for now
+# Symlink the NETWORK file, use 'testnet6' for now
 #if [ ! -f /root/.chia/mmx/NETWORK ]; then
-echo 'testnet5' > /root/.chia/mmx/NETWORK
+echo 'testnet6' > /root/.chia/mmx/NETWORK
 #fi
 rm -f ./NETWORK
 ln -s /root/.chia/mmx/NETWORK /mmx-node/NETWORK
 
-# Symlink the testnet5 folder
-if [ ! -d /root/.chia/mmx/testnet5 ]; then
-	mkdir /root/.chia/mmx/testnet5
+# Symlink the testnet6 folder
+if [ ! -d /root/.chia/mmx/testnet6 ]; then
+	mkdir /root/.chia/mmx/testnet6
 fi
-rm -rf ./testnet5
-ln -s /root/.chia/mmx/testnet5 /mmx-node/testnet5
+rm -rf ./testnet6
+ln -s /root/.chia/mmx/testnet6 /mmx-node/testnet6
 
 # Create a key if none found from previous runs
 if [[ ${mode} == 'fullnode' ]]; then
diff --git a/web/__init__.py b/web/__init__.py
index e551c9f4..76d84ecd 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -11,6 +11,8 @@
 
 from web.default_settings import DefaultConfig
 
+from common.config import globals
+
 app = Flask(__name__)
 app.secret_key = b'$}#P)eu0A.O,s0Mz'
 app.config.from_object(DefaultConfig)
@@ -96,4 +98,10 @@ def launcheridshortener(value):
     #app.logger.info("Shorten: {0}".format(value))
     return value[:12] + '...'
 
-app.jinja_env.filters['launcheridshortener'] = launcheridshortener
\ No newline at end of file
+app.jinja_env.filters['launcheridshortener'] = launcheridshortener
+
+def alltheblocks_blocklink(block, blockchain):
+    alltheblocks_blockchain = globals.get_alltheblocks_name(blockchain)
+    return '{1}'.format(alltheblocks_blockchain, block)
+
+app.jinja_env.filters['alltheblocks_blocklink'] = alltheblocks_blocklink
\ No newline at end of file
diff --git a/web/actions/stats.py b/web/actions/stats.py
index 4114a7ab..f4725ee0 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -3,6 +3,7 @@
 #
 
 import datetime
+from decimal import ROUND_HALF_DOWN
 import sqlite3
 
 from flask import g
@@ -391,4 +392,25 @@ def load_wallet_balances(blockchain):
             last_value = s.value
     #app.logger.info(dates)
     #app.logger.info(values)
-    return { 'title': blockchain.capitalize() + ' - ' + _('Wallet Balances'), 'dates': dates, 'vals': values}
\ No newline at end of file
+    return { 'title': blockchain.capitalize() + ' - ' + _('Wallet Balances'), 'dates': dates, 'vals': values}
+
+def load_farmed_blocks(blockchain):
+    blocks = []
+    result = db.session.query(StatFarmedBlocks).order_by(StatFarmedBlocks.created_at.desc()).filter(
+            StatFarmedBlocks.blockchain == blockchain).all()
+    for row in result:
+        try:
+            w = worker.get_worker(row.hostname)
+            displayname = w.displayname
+        except:
+            app.logger.debug("Failed to find worker for hostname: {0}".format(ResourceWarning.hostname))
+            displayname = ROUND_HALF_DOWN.hostname
+        blocks.append({
+            'hostname': displayname,
+            'blockchain': blockchain,
+            'created_at': row.created_at,
+            'farmed_block': row.farmed_block,
+            'plot_files': row.plot_files, 
+        })
+    app.logger.info(blocks)
+    return blocks
\ No newline at end of file
diff --git a/web/models/chia.py b/web/models/chia.py
index 04535dec..a1dedc30 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -372,7 +372,7 @@ def exclude_cat_wallets(self, wallet_details):
                 if re.match('^\s+-Type:\s+CAT$', line):
                     is_cat_wallet = True
             if is_cat_wallet:
-                app.logger.info("Ignoring balance of CAT type wallet named: {0}".format(lines[0][:-1]))
+                app.logger.debug("Ignoring balance of CAT type wallet named: {0}".format(lines[0][:-1]))
             else:
                 details.extend(chunk.split('\n'))
         return '\n'.join(details)
@@ -449,13 +449,32 @@ def __init__(self, keys):
             except:
                 app.logger.info("Keys.init(): Unable to find a worker with hostname '{0}'".format(key.hostname))
                 displayname = key.hostname
+            parsed_details = key.details
+            try:
+                parsed_details = self.link_first_wallet_address(key.blockchain, key.details)
+            except:
+                traceback.print_exc()
+                parsed_details = key.details
             self.rows.append({ 
                 'displayname': displayname, 
                 'hostname': key.hostname,
                 'blockchain': key.blockchain,
                 'status': worker_status,
-                'details': key.details,
+                'details': parsed_details,
                 'updated_at': key.updated_at }) 
+    
+    def link_first_wallet_address(self, blockchain, details):
+        alltheblocks_blockchain = globals.get_alltheblocks_name(blockchain)
+        lines = []
+        for line in details.split('\n'):
+            if line.startswith('First wallet address'):
+                label = line.split(':')[0]
+                address = line.split(':')[1].strip()
+                link = "https://alltheblocks.net/{0}/address/{1}".format(alltheblocks_blockchain, address)
+                lines.append("{0}: {2}".format(label, link, address))
+            else:
+                lines.append(line)
+        return '\n'.join(lines)
 
 class Blockchains:
 
diff --git a/web/routes.py b/web/routes.py
index ddf36712..cb8767d7 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -88,11 +88,12 @@ def index_chart():
     chart_type = request.args.get('type')
     blockchain = request.args.get('blockchain')
     if chart_type == 'wallet_balances':
-        data = stats.load_wallet_balances(blockchain)
-        return render_template('index/chart_balances.html', reload_seconds=120, global_config=gc, chart_data=data) 
+        chart_data = stats.load_wallet_balances(blockchain)
+        return render_template('index/chart_balances.html', reload_seconds=120, global_config=gc, chart_data=chart_data, lang=get_lang(request)) 
     elif chart_type == 'farmed_blocks':
-        data = stats.load_farmed_coins(blockchain)
-        return render_template('index/chart_farmed.html', reload_seconds=120, global_config=gc, chart_data=data)   
+        chart_data = stats.load_farmed_coins(blockchain)
+        farmed_blocks = stats.load_farmed_blocks(blockchain)
+        return render_template('index/chart_farmed.html', reload_seconds=120, global_config=gc, chart_data=chart_data, farmed_blocks=farmed_blocks, lang=get_lang(request))
 
 @app.route('/summary', methods=['GET', 'POST'])
 def summary():
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 01f0f302..0f8557db 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -54,7 +54,7 @@
                 {{blockchain.peak_time}}
                 {{blockchain.updated_at | datetimefilter}}
                 
-                    
+                    
                 
             
             {% endfor %}
diff --git a/web/templates/drives.html b/web/templates/drives.html
index a4b9aa42..cc90e364 100644
--- a/web/templates/drives.html
+++ b/web/templates/drives.html
@@ -130,7 +130,7 @@ 
    Temperatures
    
             
             {{drive.updated_at | datetimefilter}}
             
-               
+               
               
           
           {% endfor %}
@@ -145,7 +145,7 @@ 
    Temperatures
    
           
    
             
    
               
+                onclick='SmartctlDeviceInfo("{{ drive.hostname }}", "{{ drive.device }}", "{{ drive.worker }}", "{{ drive.device_model }}", "{{ drive.model_family }}");return false;'>
                  {{drive.worker}} - {{drive.device}} -
                  {% if drive.model_family %}
                    {{drive.model_family}}
diff --git a/web/templates/index/chart_balances.html b/web/templates/index/chart_balances.html
index b170e6a3..b1177849 100644
--- a/web/templates/index/chart_balances.html
+++ b/web/templates/index/chart_balances.html
@@ -28,9 +28,6 @@
             margin: 10px;
             padding: 10px;
             padding-top: 20px;
-            white-space: pre-wrap;
-            font-family: monospace;
-            overflow-y: auto;
         }
     
     
 
 
@@ -49,9 +43,6 @@
         
     
    
     
    Loaded at: {{ global_config.now }}
    
-    
     
     
     
diff --git a/web/templates/index/chart_farmed.html b/web/templates/index/chart_farmed.html
index b170e6a3..64bab740 100644
--- a/web/templates/index/chart_farmed.html
+++ b/web/templates/index/chart_farmed.html
@@ -7,6 +7,7 @@
     
     
     
+    
     {{ chart_data.title }}
     {% if reload_seconds %}
     
@@ -28,9 +29,6 @@
             margin: 10px;
             padding: 10px;
             padding-top: 20px;
-            white-space: pre-wrap;
-            font-family: monospace;
-            overflow-y: auto;
         }
     
     
 
 
@@ -48,15 +43,58 @@
     
    
         
     
    
+    {% if farmed_blocks|length > 0 %}
+    
    
+        
    {{_('Farmed Blocks')}}
    
+        
+            
+                
+                    
+                    
+                    
+                    
+                
+            
+            
+                {% for farmed_block in farmed_blocks %}
+                
+                    
+                    
+                    
+                    
+                
+                {% endfor %}
+            
+        
    {{_('Worker')}}{{_('Plot File')}}{{_('Farmed Block')}}{{_('Farmed At')}}
    {{farmed_block.hostname}}{{farmed_block.plot_files}}{{farmed_block.farmed_block|alltheblocks_blocklink(farmed_block.blockchain)|safe}}{{farmed_block.created_at[:-7]}}
    
+    
    
+    {% endif %}
+
     
    Loaded at: {{ global_config.now }}
    
-    
     
+    
+    
+    
     
     
     
     
   {% endif %}
   {% endblock %}
\ No newline at end of file
diff --git a/web/templates/keys.html b/web/templates/keys.html
index a8733d0f..6d2b999f 100644
--- a/web/templates/keys.html
+++ b/web/templates/keys.html
@@ -38,15 +38,15 @@
             {% for key in keys.rows %}
             
    
                 
    
-                
    {{ key.details}}
    
-                


    
+                
    {{ key.details|safe}}
    
+                
    
                 
    {{_('NOTE: Machinaris will never display your private key here.')}}
    
                 
    {{_('However, you may view it yourself by executing this from within the Docker container.')}}
    
                 
    
                     {% if key.blockchain == 'mmx' %}
-                    mmx wallet get seed
+                    mmx wallet get seed
                     {% else %}
-                    chia keys show --show-mnemonic-seed
+                    chia keys show --show-mnemonic-seed
                     {% endif %}
                 
    
                 
    
@@ -56,7 +56,7 @@ 
    {{_('Best Practices')}}
    
                     {% autoescape false %}
                     
  • 
                         {{_('Machinaris uses an online wallet for farming. It is strongly recommended that you use a cold wallet for your payout instructions. Tutorial on the %(wiki_link_open)swiki%(wiki_link_close)s. Please add "Setup a Cold Wallet" to your To-Do list!', 
-                            wiki_link_open='', wiki_link_close='')}}
+                            wiki_link_open='', wiki_link_close='')}}
                     
    • 
                     {% endautoescape %}
                 

diff --git a/web/templates/plotting/jobs.html b/web/templates/plotting/jobs.html
index 752bb614..04f49d92 100644
--- a/web/templates/plotting/jobs.html
+++ b/web/templates/plotting/jobs.html
@@ -185,7 +185,7 @@ 
                             
                                 
                                 
-                                    
+                                    
                                 
                             
                         
diff --git a/web/templates/summary.html b/web/templates/summary.html
index 33d5e9f5..2b733af1 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -63,6 +63,10 @@ 
     button.active.nav-link {
         background-color: #3d3f42 !important
     }
+    td.icon_cell {
+        text-align: center;
+        padding:0px 5px 0px 0px;
+    }
 
 
 {% if summaries.rows|length > 0 %}
@@ -84,7 +88,8 @@ 
                 {{_('EDV')}} {{local_cur_sym|upper}}
                 
                 
-                {{_('Logs')}}
+                
+                
             
         
         
@@ -114,8 +119,12 @@ 
                 {{summary.wallet}}
                 {{summary.edv}}
                 {{summary.edv_fiat}}
-                
-                    
+                
+                    
+                
+                    
+                        
                 
             
             {% endfor %}
@@ -142,6 +151,14 @@ 
{{_('Please allow at least 15 minutes for blockchains to get started.')}}{{_('Please allow at least 15 minutes for blockchains to get started.')}}{{_('Wallet Settings')}}

                 {{_('Balance')}} {{local_cur_sym}}
                 {{_('Updated At')}}
                 
+                
             
         
         
@@ -137,7 +138,10 @@ 
                 {{wallet.total_balance}} {{wallet.blockchain_symbol}}
                 {{wallet.fiat_balance}}
                 {{wallet.updated_at | datetimefilter}}
-                
+                  
+                
@@ -184,7 +188,7 @@ 
{{_('You can also try running "chia wallet show" on your fullnode\'s in-cont
         $(document).ready(function () {
             $('#data').DataTable({
                 "pageLength": 25,
-                "columnDefs": [{ "orderable": false, targets: [7] }],
+                "columnDefs": [{ "orderable": false, targets: [7,8] }],
                 {% if lang != 'en' %}
                 "language": {
                     "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"
@@ -220,5 +224,13 @@ 
{{_('You can also try running "chia wallet show" on your fullnode\'s in-cont
                 modalTitle.textContent = 'Wallet Settings - ' + blockchain
             })
         })
+        function PopupChart(chart_type, blockchain) {
+          var d = new Date();
+          var height = 600;
+          var width = 900;
+          var top = (screen.height - height) / 2;
+          var left = (screen.width - width) / 2;
+          window.open("{{ url_for('index_chart') }}?type=" + chart_type + "&blockchain=" + blockchain, blockchain + ' - ' + chart_type, 'resizeable=yes,scrollbars=yes,height=' + height + ',width=' + width + ',top=' + top + ',left=' + left).focus();
+        }
 
 {% endblock %}
\ No newline at end of file
diff --git a/web/templates/workers.html b/web/templates/workers.html
index f0a31cf2..f2bcf8c3 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -79,7 +79,7 @@
             {{worker.versions.machinaris}}
             
-              
+              
               {% if worker.mode == "fullnode" and worker.blockchain == "chia" %}
               
               {% endif %}

From c67999b935cb1ed35a1969166234c4b4a632acf7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 1 Jun 2022 20:52:24 -0600
Subject: [PATCH 0755/1625] Fix for index page error.

---
 scripts/forks/mmx_install.sh | 2 +-
 web/__init__.py              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index bbf900b9..124ba8d9 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -5,7 +5,7 @@
 
 MMX_BRANCH=$1
 # On 2022-06-01
-HASH=92c909291d3d82f57b1680639b9b4f3c4c0ba05e
+HASH=163b59956930a7d164c9c9450f74e160eb320717
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
diff --git a/web/__init__.py b/web/__init__.py
index 76d84ecd..cdfaeb7b 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -100,6 +100,12 @@ def launcheridshortener(value):
 
 app.jinja_env.filters['launcheridshortener'] = launcheridshortener
 
+def alltheblocks_blockchainlink(blockchain):
+   alltheblocks_blockchain = globals.get_alltheblocks_name(blockchain)
+   return 'https://alltheblocks.net/{0}'.format(alltheblocks_blockchain)
+
+app.jinja_env.filters['alltheblocks_blockchainlink'] = alltheblocks_blockchainlink
+
 def alltheblocks_blocklink(block, blockchain):
     alltheblocks_blockchain = globals.get_alltheblocks_name(blockchain)
     return '{1}'.format(alltheblocks_blockchain, block)

From 82b002162841bd2bdc85e8fca7ffc2edd55fe7c1 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 2 Jun 2022 20:16:12 -0600
Subject: [PATCH 0756/1625] Fixes from MMX testnet6 testing.

---
 api/commands/mmx_cli.py        |  2 +-
 api/commands/websvcs.py        |  1 -
 api/models/mmx.py              |  2 ++
 api/rpc/chia.py                | 52 ++++++++++++++++++++++++++++++++--
 api/schedules/stats_blocks.py  | 13 +++++----
 common/config/globals.py       |  4 +--
 scripts/forks/mmx_install.sh   |  4 +--
 web/templates/index/index.html |  2 ++
 8 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/api/commands/mmx_cli.py b/api/commands/mmx_cli.py
index b88518a0..a4b6c850 100644
--- a/api/commands/mmx_cli.py
+++ b/api/commands/mmx_cli.py
@@ -83,7 +83,7 @@ def save_config(config, blockchain):
 
 def load_wallet_show(blockchain):
     mmx_binary = globals.get_blockchain_binary(blockchain)
-    proc = Popen("({0} node info | grep Synced) && {0} wallet show".format(mmx_binary), stdout=PIPE, stderr=PIPE, shell=True)
+    proc = Popen("({0} node info | grep 'Synced: No') && {0} wallet show".format(mmx_binary), stdout=PIPE, stderr=PIPE, shell=True)
     try:
         outs, errs = proc.communicate(timeout=90)
     except TimeoutExpired:
diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index fafe3ca8..062e2c99 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -202,4 +202,3 @@ def save_exchange_rates(debug=False):
             app.logger.error("Received {0} from {1}".format(resp.status_code, url))
     except Exception as ex:
             app.logger.error("Failed to store exchange cache in {0} because {1}".format(EXCHANGE_RATES_CACHE_FILE, str(ex)))
- 
\ No newline at end of file
diff --git a/api/models/mmx.py b/api/models/mmx.py
index 2236733a..f3f7a752 100644
--- a/api/models/mmx.py
+++ b/api/models/mmx.py
@@ -26,6 +26,8 @@ def __init__(self, cli_stdout, blockchain):
                 elif line.startswith('Synced'):
                     if 'Yes' == line.split(':')[1].strip():
                         self.calc_status('Farming')
+                    elif 'No' == line.split(':')[1].strip():
+                        self.calc_status('Syncing')
                     else:
                         self.calc_status(line.strip())
             if self.plots_size == "Total space: 0 TiB":
diff --git a/api/rpc/chia.py b/api/rpc/chia.py
index ed85f708..21b25aee 100644
--- a/api/rpc/chia.py
+++ b/api/rpc/chia.py
@@ -13,74 +13,84 @@
 if importlib.util.find_spec("btcgreen"):
     from btcgreen.rpc.full_node_rpc_client import FullNodeRpcClient
     from btcgreen.rpc.farmer_rpc_client import FarmerRpcClient
+    from btcgreen.rpc.farmer_rpc_client import WalletRpcClient
     from btcgreen.util.default_root import DEFAULT_ROOT_PATH
     from btcgreen.util.ints import uint16
     from btcgreen.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("cactus"):
     from cactus.rpc.full_node_rpc_client import FullNodeRpcClient
     from cactus.rpc.farmer_rpc_client import FarmerRpcClient
+    from cactus.rpc.farmer_rpc_client import WalletRpcClient
     from cactus.util.default_root import DEFAULT_ROOT_PATH
     from cactus.util.ints import uint16
     from cactus.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("chia"):
     from chia.rpc.full_node_rpc_client import FullNodeRpcClient
     from chia.rpc.farmer_rpc_client import FarmerRpcClient
+    from chia.rpc.farmer_rpc_client import WalletRpcClient
     from chia.util.default_root import DEFAULT_ROOT_PATH
     from chia.util.ints import uint16
     from chia.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("chives"):
     from chives.rpc.full_node_rpc_client import FullNodeRpcClient
     from chives.rpc.farmer_rpc_client import FarmerRpcClient
-    from chives.rpc.harvester_rpc_client import HarvesterRpcClient
+    from chives.rpc.farmer_rpc_client import WalletRpcClient
     from chives.util.default_root import DEFAULT_ROOT_PATH
     from chives.util.ints import uint16
     from chives.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("cryptodoge"):
     from cryptodoge.rpc.full_node_rpc_client import FullNodeRpcClient
     from cryptodoge.rpc.farmer_rpc_client import FarmerRpcClient
-    from cryptodoge.rpc.harvester_rpc_client import HarvesterRpcClient
+    from cryptodoge.rpc.farmer_rpc_client import WalletRpcClient
     from cryptodoge.util.default_root import DEFAULT_ROOT_PATH
     from cryptodoge.util.ints import uint16
     from cryptodoge.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("flax"):
     from flax.rpc.full_node_rpc_client import FullNodeRpcClient
     from flax.rpc.farmer_rpc_client import FarmerRpcClient
+    from flax.rpc.farmer_rpc_client import WalletRpcClient
     from flax.util.default_root import DEFAULT_ROOT_PATH
     from flax.util.ints import uint16
     from flax.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("flora"):
     from flora.rpc.full_node_rpc_client import FullNodeRpcClient
     from flora.rpc.farmer_rpc_client import FarmerRpcClient
+    from flora.rpc.farmer_rpc_client import WalletRpcClient
     from flora.util.default_root import DEFAULT_ROOT_PATH
     from flora.util.ints import uint16
     from flora.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("hddcoin"):
     from hddcoin.rpc.full_node_rpc_client import FullNodeRpcClient
     from hddcoin.rpc.farmer_rpc_client import FarmerRpcClient
+    from hddcoin.rpc.farmer_rpc_client import WalletRpcClient
     from hddcoin.util.default_root import DEFAULT_ROOT_PATH
     from hddcoin.util.ints import uint16
     from hddcoin.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("maize"):
     from maize.rpc.full_node_rpc_client import FullNodeRpcClient
     from maize.rpc.farmer_rpc_client import FarmerRpcClient
+    from maize.rpc.farmer_rpc_client import WalletRpcClient
     from maize.util.default_root import DEFAULT_ROOT_PATH
     from maize.util.ints import uint16
     from maize.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("shibgreen"):
     from shibgreen.rpc.full_node_rpc_client import FullNodeRpcClient
     from shibgreen.rpc.farmer_rpc_client import FarmerRpcClient
+    from shibgreen.rpc.farmer_rpc_client import WalletRpcClient
     from shibgreen.util.default_root import DEFAULT_ROOT_PATH
     from shibgreen.util.ints import uint16
     from shibgreen.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("stai"):
     from stai.rpc.full_node_rpc_client import FullNodeRpcClient
     from stai.rpc.farmer_rpc_client import FarmerRpcClient
+    from stai.rpc.farmer_rpc_client import WalletRpcClient
     from stai.util.default_root import DEFAULT_ROOT_PATH
     from stai.util.ints import uint16
     from stai.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("stor"):
     from stor.rpc.full_node_rpc_client import FullNodeRpcClient
     from stor.rpc.farmer_rpc_client import FarmerRpcClient
+    from stor.rpc.farmer_rpc_client import WalletRpcClient
     from stor.util.default_root import DEFAULT_ROOT_PATH
     from stor.util.ints import uint16
     from stor.util.config import load_config as load_fork_config
@@ -167,3 +177,41 @@ async def load_all_plots():
     except Exception as ex:
         app.logger.info("Error getting plots via RPC: {0}".format(str(ex)))
     return all_plots
+
+# Used to load farmed blocks via RPC
+def get_transactions(address):
+    farmed_blocks = asyncio.run(load_farmed_blocks())
+    return farmed_blocks
+
+async def load_farmed_blocks(address):
+    farmed_blocks = []
+    try:
+        config = load_fork_config(DEFAULT_ROOT_PATH, 'config.yaml')
+        wallet_rpc_port = config["wallet"]["rpc_port"]
+        wallet = await WalletRpcClient.create(
+            'localhost', uint16(wallet_rpc_port), DEFAULT_ROOT_PATH, config
+        )
+        result = await wallet.get_farm_block(address)
+        wallet.close()
+        await wallet.await_closed()
+        for harvester in result["harvesters"]:
+            # app.logger.info(harvester.keys()) Returns: ['connection', 'failed_to_open_filenames', 'no_key_filenames', 'plots']
+            # app.logger.info(harvester['connection']) Returns: {'host': '192.168.1.100', 'node_id': '602eb9...90378', 'port': 62599}
+            host = harvester["connection"]["host"]
+            plots = harvester["plots"]
+            app.logger.info("Listing plots found {0} plots on {1}.".format(len(plots), host))
+            for plot in plots:
+                all_plots.append({
+                    "hostname": host,
+                    "type": "solo" if (plot["pool_contract_puzzle_hash"] is None) else "portable",
+                    "plot_id": plot['plot_id'],
+                    "file_size": plot['file_size'], # bytes
+                    "filename": plot['filename'], # full path and name
+                    "plot_public_key": plot['plot_public_key'],
+                    "pool_contract_puzzle_hash": plot['pool_contract_puzzle_hash'],
+                    "pool_public_key": plot['pool_public_key'],
+                })
+    except Exception as ex:
+        app.logger.info("Error getting plots via RPC: {0}".format(str(ex)))
+    return all_plots
+
diff --git a/api/schedules/stats_blocks.py b/api/schedules/stats_blocks.py
index 15710d31..db0ef6e9 100644
--- a/api/schedules/stats_blocks.py
+++ b/api/schedules/stats_blocks.py
@@ -24,12 +24,13 @@ def collect():
                 "Skipping block win stats collection as not farming on this Machinaris instance.")
             return
         #app.logger.info("Collecting stats about won blocks.")
-        for blockchain in globals.enabled_blockchains():
-            if not blockchain == 'mmx':
-                blocks = log_parser.recent_farmed_blocks(blockchain)
-            store_locally(blockchain, blocks)
-            if not gc['is_controller']:
-                send_to_controller(blockchain, blocks)
+        blockchain = globals.enabled_blockchains()[0]
+        if blockchain == 'mmx':
+            return
+        blocks = log_parser.recent_farmed_blocks(blockchain)
+        store_locally(blockchain, blocks)
+        if not gc['is_controller']:
+            send_to_controller(blockchain, blocks)
 
 def store_locally(blockchain, blocks):
     hostname = utils.get_hostname()
diff --git a/common/config/globals.py b/common/config/globals.py
index 9a6abc17..f8974489 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -31,8 +31,8 @@
 BLADEBIT_BINARY = '/usr/bin/bladebit'
 CHIADOG_PATH = '/chiadog'
 
-MMX_NETWORK = 'testnet5'
-MMX_CONFIG = 'testnet5'
+MMX_NETWORK = 'testnet6'
+MMX_CONFIG = 'testnet6'
 
 RELOAD_MINIMUM_DAYS = 1  # Don't run binaries for version again until this time expires
 
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 124ba8d9..c53561bf 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-06-01
-HASH=163b59956930a7d164c9c9450f74e160eb320717
+# On 2022-06-02
+HASH=f8ea5be1b2fb61160898d0164cad152da25f4c45
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
diff --git a/web/templates/index/index.html b/web/templates/index/index.html
index 88225e1e..faa3ea78 100644
--- a/web/templates/index/index.html
+++ b/web/templates/index/index.html
@@ -99,7 +99,9 @@ 
{{ farms[blockchain].currency_symbol }} {{_('F
             
           
           

+            {% if blockchain != 'mmx' %}
             
+            {% endif %}
             

               

Date: Thu, 2 Jun 2022 20:50:15 -0600
Subject: [PATCH 0757/1625] Start on effort calculation.

---
 api/gunicorn.conf.py          |  4 +-
 api/rpc/chia.py               | 77 ++++++++++++++++++-----------------
 api/schedules/stats_effort.py | 33 +++++++++++++++
 3 files changed, 75 insertions(+), 39 deletions(-)
 create mode 100644 api/schedules/stats_effort.py

diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index d4a672a2..7e19bf0b 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -12,7 +12,7 @@ def on_starting(server):
         status_connections, status_keys, status_alerts, status_controller, \
         status_plotnfts, status_pools, status_partials, status_drives, \
         stats_blocks, stats_balances, stats_disk, stats_farm, nft_recover, plots_check, \
-        log_rotate, db_backup, restart_stuck_farmer, geolocate_peers
+        log_rotate, db_backup, restart_stuck_farmer, geolocate_peers, stats_effort
     from common.config import globals
 
     from api.commands import websvcs
@@ -78,7 +78,7 @@ def on_starting(server):
         scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0)  # Hourly
         
     # Testing only
-    #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=stats_effort.calculate, name="stats_effort", trigger='interval', seconds=10) # Test immediately
 
     app.logger.debug("Starting background scheduler...")
     scheduler.start()
diff --git a/api/rpc/chia.py b/api/rpc/chia.py
index 21b25aee..ab438934 100644
--- a/api/rpc/chia.py
+++ b/api/rpc/chia.py
@@ -13,84 +13,84 @@
 if importlib.util.find_spec("btcgreen"):
     from btcgreen.rpc.full_node_rpc_client import FullNodeRpcClient
     from btcgreen.rpc.farmer_rpc_client import FarmerRpcClient
-    from btcgreen.rpc.farmer_rpc_client import WalletRpcClient
+    from btcgreen.rpc.wallet_rpc_client import WalletRpcClient
     from btcgreen.util.default_root import DEFAULT_ROOT_PATH
     from btcgreen.util.ints import uint16
     from btcgreen.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("cactus"):
     from cactus.rpc.full_node_rpc_client import FullNodeRpcClient
     from cactus.rpc.farmer_rpc_client import FarmerRpcClient
-    from cactus.rpc.farmer_rpc_client import WalletRpcClient
+    from cactus.rpc.wallet_rpc_client import WalletRpcClient
     from cactus.util.default_root import DEFAULT_ROOT_PATH
     from cactus.util.ints import uint16
     from cactus.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("chia"):
     from chia.rpc.full_node_rpc_client import FullNodeRpcClient
     from chia.rpc.farmer_rpc_client import FarmerRpcClient
-    from chia.rpc.farmer_rpc_client import WalletRpcClient
+    from chia.rpc.wallet_rpc_client import WalletRpcClient
     from chia.util.default_root import DEFAULT_ROOT_PATH
     from chia.util.ints import uint16
     from chia.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("chives"):
     from chives.rpc.full_node_rpc_client import FullNodeRpcClient
     from chives.rpc.farmer_rpc_client import FarmerRpcClient
-    from chives.rpc.farmer_rpc_client import WalletRpcClient
+    from chives.rpc.wallet_rpc_client import WalletRpcClient
     from chives.util.default_root import DEFAULT_ROOT_PATH
     from chives.util.ints import uint16
     from chives.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("cryptodoge"):
     from cryptodoge.rpc.full_node_rpc_client import FullNodeRpcClient
     from cryptodoge.rpc.farmer_rpc_client import FarmerRpcClient
-    from cryptodoge.rpc.farmer_rpc_client import WalletRpcClient
+    from cryptodoge.rpc.wallet_rpc_client import WalletRpcClient
     from cryptodoge.util.default_root import DEFAULT_ROOT_PATH
     from cryptodoge.util.ints import uint16
     from cryptodoge.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("flax"):
     from flax.rpc.full_node_rpc_client import FullNodeRpcClient
     from flax.rpc.farmer_rpc_client import FarmerRpcClient
-    from flax.rpc.farmer_rpc_client import WalletRpcClient
+    from flax.rpc.wallet_rpc_client import WalletRpcClient
     from flax.util.default_root import DEFAULT_ROOT_PATH
     from flax.util.ints import uint16
     from flax.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("flora"):
     from flora.rpc.full_node_rpc_client import FullNodeRpcClient
     from flora.rpc.farmer_rpc_client import FarmerRpcClient
-    from flora.rpc.farmer_rpc_client import WalletRpcClient
+    from flora.rpc.wallet_rpc_client import WalletRpcClient
     from flora.util.default_root import DEFAULT_ROOT_PATH
     from flora.util.ints import uint16
     from flora.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("hddcoin"):
     from hddcoin.rpc.full_node_rpc_client import FullNodeRpcClient
     from hddcoin.rpc.farmer_rpc_client import FarmerRpcClient
-    from hddcoin.rpc.farmer_rpc_client import WalletRpcClient
+    from hddcoin.rpc.wallet_rpc_client import WalletRpcClient
     from hddcoin.util.default_root import DEFAULT_ROOT_PATH
     from hddcoin.util.ints import uint16
     from hddcoin.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("maize"):
     from maize.rpc.full_node_rpc_client import FullNodeRpcClient
     from maize.rpc.farmer_rpc_client import FarmerRpcClient
-    from maize.rpc.farmer_rpc_client import WalletRpcClient
+    from maize.rpc.wallet_rpc_client import WalletRpcClient
     from maize.util.default_root import DEFAULT_ROOT_PATH
     from maize.util.ints import uint16
     from maize.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("shibgreen"):
     from shibgreen.rpc.full_node_rpc_client import FullNodeRpcClient
     from shibgreen.rpc.farmer_rpc_client import FarmerRpcClient
-    from shibgreen.rpc.farmer_rpc_client import WalletRpcClient
+    from shibgreen.rpc.wallet_rpc_client import WalletRpcClient
     from shibgreen.util.default_root import DEFAULT_ROOT_PATH
     from shibgreen.util.ints import uint16
     from shibgreen.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("stai"):
     from stai.rpc.full_node_rpc_client import FullNodeRpcClient
     from stai.rpc.farmer_rpc_client import FarmerRpcClient
-    from stai.rpc.farmer_rpc_client import WalletRpcClient
+    from stai.rpc.wallet_rpc_client import WalletRpcClient
     from stai.util.default_root import DEFAULT_ROOT_PATH
     from stai.util.ints import uint16
     from stai.util.config import load_config as load_fork_config
 elif importlib.util.find_spec("stor"):
     from stor.rpc.full_node_rpc_client import FullNodeRpcClient
     from stor.rpc.farmer_rpc_client import FarmerRpcClient
-    from stor.rpc.farmer_rpc_client import WalletRpcClient
+    from stor.rpc.wallet_rpc_client import WalletRpcClient
     from stor.util.default_root import DEFAULT_ROOT_PATH
     from stor.util.ints import uint16
     from stor.util.config import load_config as load_fork_config
@@ -178,40 +178,43 @@ async def load_all_plots():
         app.logger.info("Error getting plots via RPC: {0}".format(str(ex)))
     return all_plots
 
-# Used to load farmed blocks via RPC
-def get_transactions(address):
-    farmed_blocks = asyncio.run(load_farmed_blocks())
-    return farmed_blocks
+def get_wallets():
+    wallets = asyncio.run(load_wallets())
+    return wallets
 
-async def load_farmed_blocks(address):
-    farmed_blocks = []
+async def load_wallets():
+    wallets = []
     try:
         config = load_fork_config(DEFAULT_ROOT_PATH, 'config.yaml')
         wallet_rpc_port = config["wallet"]["rpc_port"]
         wallet = await WalletRpcClient.create(
             'localhost', uint16(wallet_rpc_port), DEFAULT_ROOT_PATH, config
         )
-        result = await wallet.get_farm_block(address)
+        result = await wallet.get_wallets()
         wallet.close()
         await wallet.await_closed()
-        for harvester in result["harvesters"]:
-            # app.logger.info(harvester.keys()) Returns: ['connection', 'failed_to_open_filenames', 'no_key_filenames', 'plots']
-            # app.logger.info(harvester['connection']) Returns: {'host': '192.168.1.100', 'node_id': '602eb9...90378', 'port': 62599}
-            host = harvester["connection"]["host"]
-            plots = harvester["plots"]
-            app.logger.info("Listing plots found {0} plots on {1}.".format(len(plots), host))
-            for plot in plots:
-                all_plots.append({
-                    "hostname": host,
-                    "type": "solo" if (plot["pool_contract_puzzle_hash"] is None) else "portable",
-                    "plot_id": plot['plot_id'],
-                    "file_size": plot['file_size'], # bytes
-                    "filename": plot['filename'], # full path and name
-                    "plot_public_key": plot['plot_public_key'],
-                    "pool_contract_puzzle_hash": plot['pool_contract_puzzle_hash'],
-                    "pool_public_key": plot['pool_public_key'],
-                })
+        print(result)
     except Exception as ex:
         app.logger.info("Error getting plots via RPC: {0}".format(str(ex)))
-    return all_plots
+    return wallets
+
+def get_transactions(wallet_id):
+    transactions = asyncio.run(load_transactions(wallet_id))
+    return transactions
+
+async def load_transactions(wallet_id):
+    transactions = []
+    try:
+        config = load_fork_config(DEFAULT_ROOT_PATH, 'config.yaml')
+        wallet_rpc_port = config["wallet"]["rpc_port"]
+        wallet = await WalletRpcClient.create(
+            'localhost', uint16(wallet_rpc_port), DEFAULT_ROOT_PATH, config
+        )
+        result = await wallet.get_transactions(wallet_id)
+        wallet.close()
+        await wallet.await_closed()
+        print(result)
+    except Exception as ex:
+        app.logger.info("Error getting plots via RPC: {0}".format(str(ex)))
+    return transactions
 
diff --git a/api/schedules/stats_effort.py b/api/schedules/stats_effort.py
new file mode 100644
index 00000000..17cb1faa
--- /dev/null
+++ b/api/schedules/stats_effort.py
@@ -0,0 +1,33 @@
+#
+# Calculates effort per blockchain
+#
+
+
+import datetime
+import http
+import json
+import os
+import requests
+import socket
+import sqlite3
+import traceback
+
+from flask import g
+
+from common.config import globals
+from api.rpc import chia
+from api import app, utils, db
+
+def calculate():
+    with app.app_context():
+        gc = globals.load()
+        current_datetime = datetime.datetime.now().strftime("%Y%m%d%H%M")
+        try:
+            wallets = chia.get_wallets()
+            for wallet in wallets:
+                print(wallet)
+                app.logger.info("Getting transactions in wallet #{0}: {1}".format(wallet['id'], wallet['name']))
+                chia.get_transactions(wallet['id'])
+        except:
+            app.logger.info("Failed to calculate blockchain effort.")
+            app.logger.info(traceback.format_exc())

From 377457e7c53215957be10c5575be6fca345886f8 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 3 Jun 2022 16:43:51 -0600
Subject: [PATCH 0758/1625] Start testing upcoming Chia v1.4 in
 machinaris:develop stream only.

---
 .github/workflows/develop-chia.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index ab64cc88..82479afd 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=latest"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

From 03123dbded309d60eff88ebf28b2f703d3762f47 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 3 Jun 2022 16:44:26 -0600
Subject: [PATCH 0759/1625] Revert

---
 .github/workflows/develop-chia.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 82479afd..ab64cc88 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=main"
+            "CHIA_BRANCH=latest"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

From 3af894c8ea75586778b99d69418da5e2e61e8b1f Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 3 Jun 2022 16:54:02 -0600
Subject: [PATCH 0760/1625] Start testing upcoming Chia v1.4 in
 machinaris:develop stream only.

---
 .github/workflows/develop-chia.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index ab64cc88..82479afd 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=latest"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

From 3d1ec7a5c033d8e9b02784e51ec722813c1f8b34 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 3 Jun 2022 17:40:57 -0600
Subject: [PATCH 0761/1625] Chia prompt changed last month. #682

---
 api/commands/chia_cli.py  | 2 +-
 api/commands/pools_cli.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 0655a852..f74589de 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -77,7 +77,7 @@ def load_wallet_show(blockchain):
     child = pexpect.spawn("{0} wallet show".format(chia_binary))
     wallet_index = 1
     while True:
-        i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
+        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index f6f3d82f..99da0039 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -89,7 +89,7 @@ def load_plotnft_show(blockchain):
     child = pexpect.spawn("{0} plotnft show".format(chia_binary))
     pool_wallet_id = 1
     while True:
-        i = child.expect(["Wallet height:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
+        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
@@ -129,7 +129,7 @@ def process_pool_leave(blockchain, pool_wallet_id):
     child = pexpect.spawn(cmd)
     child.logfile = sys.stdout.buffer
     while True:
-        i = child.expect(["Choose wallet key:.*\r\n", pexpect.EOF])
+        i = child.expect(["Wallet keys:.*\r\n", pexpect.EOF])
         if i == 0:
             app.logger.info("plotnft got index prompt so selecting #{0}".format(pool_wallet_id))
             child.sendline("{0}".format(pool_wallet_id))
@@ -173,7 +173,7 @@ def process_pool_join(blockchain, pool_url, pool_wallet_id):
     child = pexpect.spawn(cmd)
     child.logfile = sys.stdout.buffer
     while True:
-        i = child.expect(["Choose wallet key:.*\r\n", pexpect.EOF])
+        i = child.expect(["Wallet keys:.*\r\n", pexpect.EOF])
         if i == 0:
             app.logger.info("plotnft got index prompt so selecting #{0}".format(pool_wallet_id))
             child.sendline("{0}".format(pool_wallet_id))
@@ -202,7 +202,7 @@ def process_self_pool(blockchain, pool_wallet_id):
     child = pexpect.spawn(cmd)
     child.logfile = sys.stdout.buffer
     while True:
-        i = child.expect(["Choose wallet key:.*\r\n", pexpect.EOF])
+        i = child.expect(["Wallet keys:.*\r\n", pexpect.EOF])
         if i == 0:
             app.logger.info("plotnft got index prompt so selecting #{0}".format(pool_wallet_id))
             child.sendline("{0}".format(pool_wallet_id))

From ee96f10b0d8baaf421246914c99ce1b67e7ff580 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 4 Jun 2022 19:57:27 -0600
Subject: [PATCH 0762/1625] Wallet chart on index page.

---
 common/utils/fiat.py                      |  2 +-
 web/actions/stats.py                      | 37 +++++++++++-
 web/routes.py                             |  1 +
 web/templates/blockchains.html            | 21 +++++--
 web/templates/index/index.html            | 21 ++++++-
 web/templates/summary.html                |  2 +-
 web/templates/views/index_script_block.js | 74 +++++++++++++++++++++++
 7 files changed, 146 insertions(+), 12 deletions(-)

diff --git a/common/utils/fiat.py b/common/utils/fiat.py
index 40a17e31..2def4325 100644
--- a/common/utils/fiat.py
+++ b/common/utils/fiat.py
@@ -23,7 +23,7 @@ def to_fiat(blockchain, coins):
                     usd_per_coin = float(data[blockchain])
                     fiat_per_usd = get_fiat_exchange_to_usd()
                     fiat_cur_sym = get_local_currency_symbol().lower()
-                    if usd_per_coin and fiat_per_usd:
+                    if usd_per_coin and fiat_per_usd and coins:
                         #print("Converting {0} coins of {1} with {2}".format(coins, usd_per_coin, fiat_per_usd))
                         fiat_localized = format_currency(round(usd_per_coin * fiat_per_usd * coins, 2), '')
                         return "{0} {1}".format(fiat_localized, fiat_cur_sym)
diff --git a/web/actions/stats.py b/web/actions/stats.py
index f4725ee0..152b8f4c 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -3,7 +3,6 @@
 #
 
 import datetime
-from decimal import ROUND_HALF_DOWN
 import sqlite3
 
 from flask import g
@@ -404,7 +403,7 @@ def load_farmed_blocks(blockchain):
             displayname = w.displayname
         except:
             app.logger.debug("Failed to find worker for hostname: {0}".format(ResourceWarning.hostname))
-            displayname = ROUND_HALF_DOWN.hostname
+            displayname = hostname
         blocks.append({
             'hostname': displayname,
             'blockchain': blockchain,
@@ -413,4 +412,36 @@ def load_farmed_blocks(blockchain):
             'plot_files': row.plot_files, 
         })
     app.logger.info(blocks)
-    return blocks
\ No newline at end of file
+    return blocks
+
+def wallet_chart_data(farm_summary):
+    for blockchain in farm_summary.farms:
+        balances = load_wallet_balances(blockchain)
+        coins = load_farmed_coins(blockchain)
+        chart_data = { 'dates': [], 'balances': [], 'coins': []}
+        i = j = 0
+        # First push thru wallet balances list
+        while i < len(balances['dates']):
+            balance_date = balances['dates'][i]
+            if j < len(coins['dates']):
+                coin_date = coins['dates'][j]
+            else:
+                coin_date = '2100-01-01' # far in future
+            if balance_date < coin_date:
+                chart_data['dates'].append(balance_date)
+                chart_data['balances'].append(converters.round_balance(balances['vals'][i]))
+                chart_data['coins'].append('null') # Javascript null
+                i += 1
+            else:
+                chart_data['dates'].append(coin_date)
+                chart_data['coins'].append(converters.round_balance(coins['vals'][j]))
+                chart_data['balances'].append('null') # Javascript null
+                j += 1
+        # Then add any remaining farmed coins
+        while j < len(coins['dates']):
+            chart_data['dates'].append(coins['dates'][j])
+            chart_data['coins'].append(converters.round_balance(coins['vals'][j]))
+            chart_data['balances'].append('null') # Javascript null
+            j += 1
+        #app.logger.info("{0} -> {1}".format(blockchain, chart_data))
+        farm_summary.farms[blockchain]['wallets'] = chart_data
diff --git a/web/routes.py b/web/routes.py
index cb8767d7..c77f1d2c 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -78,6 +78,7 @@ def index():
     chia.challenges_chart_data(farm_summary)
     p.partials_chart_data(farm_summary)
     stats.load_daily_diff(farm_summary)
+    stats.wallet_chart_data(farm_summary)
     warnings.check_warnings(request.args)
     return render_template('index/index.html', reload_seconds=120, farms=farm_summary.farms, \
         plotting=plotting, workers=workers, global_config=gc, selected_blockchain=selected_blockchain)
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 0f8557db..700fd587 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -17,6 +17,10 @@
     button.active.nav-link {
         background-color: #3d3f42 !important
     }
+    td.icon_cell {
+        text-align: center;
+        padding:0px 5px 0px 0px;
+    }
 
 
 

@@ -33,7 +37,8 @@
                 {{_('Peak Height')}}
                 {{_('Peak Time')}}
                 {{_('Updated At')}}
-                {{_('Logs')}}
+                
+                
             
         
         
@@ -53,8 +58,16 @@
                 {{blockchain.peak_height}}
                 {{blockchain.peak_time}}
                 {{blockchain.updated_at | datetimefilter}}
-                
-                    
+                {% 
+                    if blockchain == 'mmx' 
+                    %}{% 
+                     else 
+                     %}{% 
+                    endif 
+                    %}
+                
+                    
+                        
                 
             
             {% endfor %}
@@ -110,7 +123,7 @@ 
{{_('Try running "chia show --state" on your farmers to verify.')}}

         "pageLength": 25,
         "columnDefs": [
             {
-                targets: [5], "orderable": false,
+                targets: [5,6], "orderable": false,
             }
         ],
         {% if lang != 'en' %}
diff --git a/web/templates/index/index.html b/web/templates/index/index.html
index faa3ea78..02da6a44 100644
--- a/web/templates/index/index.html
+++ b/web/templates/index/index.html
@@ -99,9 +99,7 @@ 
{{ farms[blockchain].currency_symbol }} {{_('F
             

           

           

-            {% if blockchain != 'mmx' %}
-            
-            {% endif %}
+            
             

               
{{ blockchain|capitalize }} {{_('Netspace')}}<
           

         

 
+        {% if farms[blockchain].wallets.dates|length > 0 %}
+        

+          

+            

+              

+                
+                  
+                
+              

+            

+            
{{blockchain|capitalize}} - {{_('Wallets')}}

+            
+          

+        

+        {% endif %}
+
         {% if farms[blockchain].challenges.labels|length > 0 %}
         

           

@@ -143,6 +157,7 @@ 
{{blockchain|capitalize}} - {{_('Partial Proof
           

         

         {% endif %}
+
       
       {% endfor %}
     
diff --git a/web/templates/summary.html b/web/templates/summary.html
index 2b733af1..53141bde 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -123,7 +123,7 @@ 

                     href="#" title="{{_('Chart Wallet')}}" onclick='PopupChart("wallet_balances","{{ summary.blockchain }}");return false;'>
                     
                 
-                    
+                    
                         
                 
             
diff --git a/web/templates/views/index_script_block.js b/web/templates/views/index_script_block.js
index 8f2ca5a0..32ad8777 100644
--- a/web/templates/views/index_script_block.js
+++ b/web/templates/views/index_script_block.js
@@ -40,6 +40,80 @@ $('[data-toggle="tooltip"]').tooltip();
 
 {% for blockchain in farms %}
 
+{% if farms[blockchain].wallets.dates|length > 0 %}
+var ctx = document.getElementById('{{blockchain}}_wallets_chart');
+var myChart = new Chart(ctx, {
+    type: 'line',
+    data: {
+        labels: {{ farms[blockchain].wallets.dates | safe }},
+        datasets: [
+            {
+                label: "{{_('Farmed Coins')}}",
+                data: {{ farms[blockchain].wallets.coins | safe }},
+                backgroundColor: color(0),
+            },
+            {
+              label: "{{_('Total Balance')}}",
+              data: {{ farms[blockchain].wallets.balances | safe }},
+              backgroundColor: color(1),
+            },
+        ],
+    },
+    borderWidth: 1,
+    options: {
+      plugins: {  
+        legend: {
+            labels: {
+            color: "#c7c7c7",  
+            font: {
+              size: 18 
+            }
+          }
+        }
+      },
+      scales: {
+          x: {
+              type: 'time',
+              time: {
+                  tooltipFormat: 'DD T'
+              },
+              ticks: {
+                  color: "#c7c7c7",
+                  font: {
+                    size: 16 
+                  }  
+              },
+              title: {
+                  display: true,
+                  text: "{{_('Date')}}",
+                  color: "#c7c7c7",  
+                  font: {
+                    size: 18 
+                  }
+              }
+          },
+          y: {
+              ticks: {
+                  color: "#c7c7c7",  
+                  font: {
+                    size: 16 
+                  }
+              },
+              beginAtZero: true,
+              title: {
+                  display: true,
+                  text: "{{_('Coins')}}",
+                  color: "#c7c7c7",  
+                  font: {
+                    size: 18 
+                  }
+              }
+          }
+      }
+    }
+  });
+  {% endif %}
+
 {% if farms[blockchain].challenges.labels|length > 0 %}
 var ctx = document.getElementById('{{blockchain}}_challenges_chart');
 var myChart = new Chart(ctx, {

From 5a42666ef5630f4ac8244310321f82d929beff1b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 4 Jun 2022 22:25:33 -0600
Subject: [PATCH 0763/1625] More charts!

---
 common/utils/converters.py                |   2 +-
 web/actions/stats.py                      |  56 ++++++++++
 web/routes.py                             |   9 ++
 web/templates/index/chart_netspace.html   | 126 ++++++++++++++++++++++
 web/templates/index/chart_plot_count.html | 119 ++++++++++++++++++++
 web/templates/index/chart_plots_size.html | 119 ++++++++++++++++++++
 web/templates/index/index.html            |  16 ++-
 web/templates/views/index_script_block.js |   6 ++
 8 files changed, 448 insertions(+), 5 deletions(-)
 create mode 100644 web/templates/index/chart_netspace.html
 create mode 100644 web/templates/index/chart_plot_count.html
 create mode 100644 web/templates/index/chart_plots_size.html

diff --git a/common/utils/converters.py b/common/utils/converters.py
index 3dcbde45..41570040 100644
--- a/common/utils/converters.py
+++ b/common/utils/converters.py
@@ -22,7 +22,7 @@ def sizeof_fmt(num, suffix='B'):
 
 def convert_size(size_bytes):
    if size_bytes == 0:
-       return "0B"
+       return "0 B"
    size_name = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
    i = int(math.floor(math.log(size_bytes, 1024)))
    p = math.pow(1024, i)
diff --git a/web/actions/stats.py b/web/actions/stats.py
index 152b8f4c..a45f81f1 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -393,6 +393,25 @@ def load_wallet_balances(blockchain):
     #app.logger.info(values)
     return { 'title': blockchain.capitalize() + ' - ' + _('Wallet Balances'), 'dates': dates, 'vals': values}
 
+def load_netspace_size(blockchain):
+    dates = []
+    values = []
+    result = db.session.query(StatNetspaceSize).order_by(StatNetspaceSize.created_at.asc()).filter(
+            StatNetspaceSize.blockchain == blockchain).all()
+    for i in range(len(result)):
+        s = result[i]
+        converted_date = converters.convert_date_for_luxon(s.created_at)
+        if (i == 0) or (i % 24 == 0) or (i == len(result) - 1):
+            dates.append(converted_date)
+            values.append(s.value)
+    #app.logger.info(dates)
+    # TODO Handle data crossing single unit boundary (either up or down)
+    unit = converters.gib_to_fmt(max(values)).split()[1]
+    converted_values = list(map(lambda x: float(converters.gib_to_fmt(x).split()[0]), values))
+    app.logger.info(converted_values)
+    return { 'title': blockchain.capitalize() + ' - ' + _('Netspace Size'), 'dates': dates, 'vals': converted_values, 
+        'y_axis_title': _('Size') + ' (' + unit + ')'}
+
 def load_farmed_blocks(blockchain):
     blocks = []
     result = db.session.query(StatFarmedBlocks).order_by(StatFarmedBlocks.created_at.desc()).filter(
@@ -414,6 +433,43 @@ def load_farmed_blocks(blockchain):
     app.logger.info(blocks)
     return blocks
 
+def load_plot_count(blockchain):
+    dates = []
+    values = []
+    result = db.session.query(StatPlotCount).order_by(StatPlotCount.created_at.asc()).filter(
+            StatPlotCount.blockchain == blockchain).all()
+    last_value = None
+    for i in range(len(result)):
+        s = result[i]
+        converted_date = converters.convert_date_for_luxon(s.created_at)
+        if (last_value != s.value) or (i % 24 == 0) or (i == len(result) - 1):
+            dates.append(converted_date)
+            values.append(s.value)
+            last_value = s.value
+    #app.logger.info(dates)
+    #app.logger.info(values)
+    return { 'title': blockchain.capitalize() + ' - ' + _('Plot Counts'), 'dates': dates, 'vals': values}
+
+def load_plots_size(blockchain):
+    dates = []
+    values = []
+    result = db.session.query(StatPlotsSize).order_by(StatPlotsSize.created_at.asc()).filter(
+            StatPlotsSize.blockchain == blockchain).all()
+    last_value = None
+    for i in range(len(result)):
+        s = result[i]
+        converted_date = converters.convert_date_for_luxon(s.created_at)
+        if (last_value != s.value) or (i % 24 == 0) or (i == len(result) - 1):
+            dates.append(converted_date)
+            values.append(s.value)
+            last_value = s.value
+    # TODO Handle data crossing single unit boundary (either up or down)
+    unit = converters.gib_to_fmt(max(values)).split()[1]
+    converted_values = list(map(lambda x: float(converters.gib_to_fmt(x).split()[0]), values))
+    app.logger.info(converted_values)
+    return { 'title': blockchain.capitalize() + ' - ' + _('Plots Size'), 'dates': dates, 'vals': converted_values, 
+        'y_axis_title': _('Size') + ' (' + unit + ')'}
+
 def wallet_chart_data(farm_summary):
     for blockchain in farm_summary.farms:
         balances = load_wallet_balances(blockchain)
diff --git a/web/routes.py b/web/routes.py
index c77f1d2c..c8a053a3 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -95,6 +95,15 @@ def index_chart():
         chart_data = stats.load_farmed_coins(blockchain)
         farmed_blocks = stats.load_farmed_blocks(blockchain)
         return render_template('index/chart_farmed.html', reload_seconds=120, global_config=gc, chart_data=chart_data, farmed_blocks=farmed_blocks, lang=get_lang(request))
+    elif chart_type == 'netspace_size':
+        chart_data = stats.load_netspace_size(blockchain)
+        return render_template('index/chart_netspace.html', reload_seconds=120, global_config=gc, chart_data=chart_data, lang=get_lang(request))
+    elif chart_type == 'plot_count':
+        chart_data = stats.load_plot_count(blockchain)
+        return render_template('index/chart_plot_count.html', reload_seconds=120, global_config=gc, chart_data=chart_data, lang=get_lang(request)) 
+    elif chart_type == 'plots_size':
+        chart_data = stats.load_plots_size(blockchain)
+        return render_template('index/chart_plots_size.html', reload_seconds=120, global_config=gc, chart_data=chart_data, lang=get_lang(request)) 
 
 @app.route('/summary', methods=['GET', 'POST'])
 def summary():
diff --git a/web/templates/index/chart_netspace.html b/web/templates/index/chart_netspace.html
new file mode 100644
index 00000000..c3b25b2b
--- /dev/null
+++ b/web/templates/index/chart_netspace.html
@@ -0,0 +1,126 @@
+
+
+
+
+    
+    
+    
+    
+    
+    
+    {{ chart_data.title }}
+    {% if reload_seconds %}
+    
+    {% endif %}
+    
+    
+    
+    
+
+
+
+    

+        
+    

+
+    
Loaded at: {{ global_config.now }}

+    
+    
+    
+    
+    
+    
+    
+    
+
+
diff --git a/web/templates/index/chart_plot_count.html b/web/templates/index/chart_plot_count.html
new file mode 100644
index 00000000..4c1e9e12
--- /dev/null
+++ b/web/templates/index/chart_plot_count.html
@@ -0,0 +1,119 @@
+
+
+
+
+    
+    
+    
+    
+    
+    {{ chart_data.title }}
+    {% if reload_seconds %}
+    
+    {% endif %}
+    
+    
+    
+    
+
+
+
+    

+        
+    

+    
Loaded at: {{ global_config.now }}

+    
+    
+    
+    
+    
+
+
diff --git a/web/templates/index/chart_plots_size.html b/web/templates/index/chart_plots_size.html
new file mode 100644
index 00000000..c375af54
--- /dev/null
+++ b/web/templates/index/chart_plots_size.html
@@ -0,0 +1,119 @@
+
+
+
+
+    
+    
+    
+    
+    
+    {{ chart_data.title }}
+    {% if reload_seconds %}
+    
+    {% endif %}
+    
+    
+    
+    
+
+
+
+    

+        
+    

+    
Loaded at: {{ global_config.now }}

+    
+    
+    
+    
+    
+
+
diff --git a/web/templates/index/index.html b/web/templates/index/index.html
index 02da6a44..a38f1d0d 100644
--- a/web/templates/index/index.html
+++ b/web/templates/index/index.html
@@ -67,6 +67,7 @@ 
{{_('Farming')}}:
         

           

             

+              
               
{{farms[blockchain].plot_count }}

               
{{_('Total Plots')}}

@@ -74,6 +75,7 @@ 
{{_('Total Plots')}}

           

           

             

+              
               
{{farms[blockchain].plots_display_size }}

               
{{_('Total Plots Size')}}

@@ -99,7 +101,7 @@ 
{{ farms[blockchain].currency_symbol }} {{_('F
             

           

           

-            
+            
             

               
{{ blockchain|capitalize }} {{_('Netspace')}}<
               

             

             
{{blockchain|capitalize}} - {{_('Wallets')}}

-            
+            

+              
+            

           

         

         {% endif %}
@@ -137,7 +141,9 @@ 
{{blockchain|capitalize}} - {{_('Wallets')}}
             
             
{{blockchain|capitalize}} - {{_('Challenges from Harvesters')}}

-            
+            

+              
+            

           
         
         {% endif %}
@@ -153,7 +159,9 @@ 
{{blockchain|capitalize}} - {{_('Challenges fr
               
             
             
{{blockchain|capitalize}} - {{_('Partial Proofs for Pools')}}

-            
+            

+              
+            

           
         
         {% endif %}
diff --git a/web/templates/views/index_script_block.js b/web/templates/views/index_script_block.js
index 32ad8777..2d7c812b 100644
--- a/web/templates/views/index_script_block.js
+++ b/web/templates/views/index_script_block.js
@@ -61,6 +61,8 @@ var myChart = new Chart(ctx, {
     },
     borderWidth: 1,
     options: {
+      responsive: true,
+      maintainAspectRatio: false,
       plugins: {  
         legend: {
             labels: {
@@ -132,6 +134,8 @@ var myChart = new Chart(ctx, {
     },
     borderWidth: 1,
     options: {
+        responsive: true,
+        maintainAspectRatio: false,
         plugins: {  
           legend: {
               labels: {
@@ -203,6 +207,8 @@ var myChart = new Chart(ctx, {
     },
     borderWidth: 1,
     options: {
+        responsive: true,
+        maintainAspectRatio: false,
         plugins: {  
           legend: {
               labels: {

From e8cb0f95a3cd07e2aab0f7c2ce9a86ef29a9a3db Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 5 Jun 2022 11:08:32 -0600
Subject: [PATCH 0764/1625] Handle target_unit conversions.

---
 api/commands/chia_cli.py     |  6 +++---
 api/commands/pools_cli.py    |  6 +++---
 api/schedules/nft_recover.py |  2 +-
 common/utils/converters.py   | 17 +++++++++++++++--
 web/actions/stats.py         | 13 ++++++-------
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index f74589de..0de0bb7f 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -77,16 +77,16 @@ def load_wallet_show(blockchain):
     child = pexpect.spawn("{0} wallet show".format(chia_binary))
     wallet_index = 1
     while True:
-        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
+        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
-        elif i == 1:
+        elif i == 1 or i == 2:
             app.logger.debug("wallet show got index prompt so selecting #{0}".format(wallet_index))
             child.sendline("{0}".format(wallet_index))
             wallet_index += 1
-        elif i == 2:
+        elif i == 3:
             child.sendline("S")
         else:
             app.logger.debug("pexpect returned {0}".format(i))
diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index 99da0039..1aaa08e9 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -89,16 +89,16 @@ def load_plotnft_show(blockchain):
     child = pexpect.spawn("{0} plotnft show".format(chia_binary))
     pool_wallet_id = 1
     while True:
-        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
+        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
-        elif i == 1:
+        elif i == 1 or i == 2:
             app.logger.debug("wallet show got index prompt so selecting #{0}".format(pool_wallet_id))
             child.sendline("{0}".format(pool_wallet_id))
             pool_wallet_id += 1
-        elif i == 2:
+        elif i == 3:
             child.sendline("S")
         else:
             app.logger.debug("pexpect returned {0}".format(i))
diff --git a/api/schedules/nft_recover.py b/api/schedules/nft_recover.py
index 3baa6f97..e94b5bac 100644
--- a/api/schedules/nft_recover.py
+++ b/api/schedules/nft_recover.py
@@ -56,7 +56,7 @@ def execute():
                     'pool_contract_address': pool_contract_address
                 }
                 try:
-                    utils.send_worker_post(fullnode, '/rewards/', payload, debug=True)
+                    utils.send_worker_post(fullnode, '/rewards/', payload, debug=False)
                 except Exception as ex:
                     app.logger.error("Failed to request reward recovery for {0} to {1}:{2} because {3}.".format(
                         fullnode.blockchain, fullnode.hostname, fullnode.port, str(ex)))
diff --git a/common/utils/converters.py b/common/utils/converters.py
index 41570040..b2ef1ed5 100644
--- a/common/utils/converters.py
+++ b/common/utils/converters.py
@@ -20,6 +20,16 @@ def sizeof_fmt(num, suffix='B'):
         return "0"
     return value
 
+def sizeof_fmt_unit(num, target_unit):
+    for unit in ['','KiB','MiB','GiB','TiB','PiB','EiB','ZiB']:
+        if target_unit == unit:
+            return "{0} {1}".format(flask_babel.format_decimal(num), unit)
+        num /= 1024.0
+    value = "{0} {1}".format(flask_babel.format_decimal(num, 'YiB'))
+    if value == "0.000 B":
+        return "0"
+    return value
+
 def convert_size(size_bytes):
    if size_bytes == 0:
        return "0 B"
@@ -29,8 +39,11 @@ def convert_size(size_bytes):
    s = round(size_bytes / p, 2)
    return "%s %s" % (s, size_name[i])
 
-def gib_to_fmt(gibs):
-    return sizeof_fmt(gibs * 1024 * 1024 * 1024)
+def gib_to_fmt(gibs, target_unit=None):
+    if target_unit:
+        return sizeof_fmt_unit(gibs * 1024 * 1024 * 1024, target_unit=target_unit)
+    else:
+        return sizeof_fmt(gibs * 1024 * 1024 * 1024)
 
 def str_to_gibs(str):
     if str == "Unknown":
diff --git a/web/actions/stats.py b/web/actions/stats.py
index a45f81f1..1f1e3f2e 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -405,10 +405,9 @@ def load_netspace_size(blockchain):
             dates.append(converted_date)
             values.append(s.value)
     #app.logger.info(dates)
-    # TODO Handle data crossing single unit boundary (either up or down)
     unit = converters.gib_to_fmt(max(values)).split()[1]
-    converted_values = list(map(lambda x: float(converters.gib_to_fmt(x).split()[0]), values))
-    app.logger.info(converted_values)
+    converted_values = list(map(lambda x: float(converters.gib_to_fmt(x, target_unit=unit).split()[0]), values))
+    #app.logger.info(converted_values)
     return { 'title': blockchain.capitalize() + ' - ' + _('Netspace Size'), 'dates': dates, 'vals': converted_values, 
         'y_axis_title': _('Size') + ' (' + unit + ')'}
 
@@ -422,7 +421,7 @@ def load_farmed_blocks(blockchain):
             displayname = w.displayname
         except:
             app.logger.debug("Failed to find worker for hostname: {0}".format(ResourceWarning.hostname))
-            displayname = hostname
+            displayname = row.hostname
         blocks.append({
             'hostname': displayname,
             'blockchain': blockchain,
@@ -463,10 +462,10 @@ def load_plots_size(blockchain):
             dates.append(converted_date)
             values.append(s.value)
             last_value = s.value
-    # TODO Handle data crossing single unit boundary (either up or down)
+    #app.logger.info(dates)
     unit = converters.gib_to_fmt(max(values)).split()[1]
-    converted_values = list(map(lambda x: float(converters.gib_to_fmt(x).split()[0]), values))
-    app.logger.info(converted_values)
+    converted_values = list(map(lambda x: float(converters.gib_to_fmt(x, target_unit=unit).split()[0]), values))
+    #app.logger.info(converted_values)
     return { 'title': blockchain.capitalize() + ' - ' + _('Plots Size'), 'dates': dates, 'vals': converted_values, 
         'y_axis_title': _('Size') + ' (' + unit + ')'}
 

From ea98f691ff063f97bc1e1a799bb2a68aeadc9bb6 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 5 Jun 2022 14:11:10 -0600
Subject: [PATCH 0765/1625] Support old and new Chia CLI formats.

---
 api/commands/chia_cli.py  | 6 +++---
 api/commands/pools_cli.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 0de0bb7f..cd024113 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -77,16 +77,16 @@ def load_wallet_show(blockchain):
     child = pexpect.spawn("{0} wallet show".format(chia_binary))
     wallet_index = 1
     while True:
-        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
+        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "Choose a wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
-        elif i == 1 or i == 2:
+        elif i == 1 or i == 2 or i == 3:
             app.logger.debug("wallet show got index prompt so selecting #{0}".format(wallet_index))
             child.sendline("{0}".format(wallet_index))
             wallet_index += 1
-        elif i == 3:
+        elif i == 4:
             child.sendline("S")
         else:
             app.logger.debug("pexpect returned {0}".format(i))
diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index 1aaa08e9..a948ad43 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -89,16 +89,16 @@ def load_plotnft_show(blockchain):
     child = pexpect.spawn("{0} plotnft show".format(chia_binary))
     pool_wallet_id = 1
     while True:
-        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
+        i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "Choose a wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
-        elif i == 1 or i == 2:
+        elif i == 1 or i == 2 or i == 3:
             app.logger.debug("wallet show got index prompt so selecting #{0}".format(pool_wallet_id))
             child.sendline("{0}".format(pool_wallet_id))
             pool_wallet_id += 1
-        elif i == 3:
+        elif i == 4:
             child.sendline("S")
         else:
             app.logger.debug("pexpect returned {0}".format(i))

From f41f3cc88f107dacbfbe11ce937e1b8e343aacd3 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 5 Jun 2022 16:06:06 -0600
Subject: [PATCH 0766/1625] Fixes in upstream Chiadog for Chia log changes.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 649c5346..fe7368ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.7.3] - 2022-06-?
  - Wallets - chart each blockchain's farmed coins and wallet balances over the past month.
+ - [Chia](https://github.com/Chia-Network/chia-blockchain) - v1.3.6 pre-release for testing
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain) - v1.3.4, matches Chia 1.3.4, please run: `cactus db upgrade`
  - [Chives](https://github.com/HiveProject2021/chives-blockchain) - v1.3.1, please run: `chives db upgrade`
  - [Cryptodoge](https://github.com/CryptoDoge-Network/cryptodoge) - v1.3.4, matches Chia 1.3.4, please run: `cryptodoge db upgrade`

From 8b11e269e94357b1ff61064617854054d1d2a201 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 5 Jun 2022 20:42:49 -0600
Subject: [PATCH 0767/1625] Fix links on Blockchains page. Wiki link.

---
 web/templates/blockchains.html | 6 +++---
 web/templates/index/index.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 700fd587..7d77b42c 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -59,10 +59,10 @@
                 {{blockchain.peak_time}}
                 {{blockchain.updated_at | datetimefilter}}
                 {% 
-                    if blockchain == 'mmx' 
-                    %}{% 
+                    if blockchain.blockchain == 'mmx' 
+                    %}{% 
                      else 
-                     %}{% 
+                     %}{% 
                     endif 
                     %}
                 
diff --git a/web/templates/index/index.html b/web/templates/index/index.html
index a38f1d0d..3bd67cdb 100644
--- a/web/templates/index/index.html
+++ b/web/templates/index/index.html
@@ -117,7 +117,7 @@ 
{{ blockchain|capitalize }} {{_('Netspace')}}<
           

             

               

-                
+                
                   
                 
               


From 9f0903b59dc61ea98eb30b38e8441b483002e779 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 6 Jun 2022 14:09:20 -0600
Subject: [PATCH 0768/1625] Farmed block easter egg.

---
 api/schedules/stats_farm.py    |   2 +-
 web/actions/stats.py           |  22 +++++++++++++++++++++-
 web/static/mario_coin.gif      | Bin 0 -> 46317 bytes
 web/templates/index/index.html |   3 ++-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 web/static/mario_coin.gif

diff --git a/api/schedules/stats_farm.py b/api/schedules/stats_farm.py
index d905e2bd..39e6c7de 100644
--- a/api/schedules/stats_farm.py
+++ b/api/schedules/stats_farm.py
@@ -17,7 +17,7 @@
 DELETE_OLD_STATS_AFTER_DAYS = 30
 
 TABLES = [ stats.StatPlotCount, stats.StatPlotsSize, stats.StatTotalCoins,
-           stats.StatNetspaceSize, stats.StatTimeToWin ]
+           stats.StatNetspaceSize, stats.StatTimeToWin, stats.StatWalletBalances, ]
 
 def delete_old_stats():
     try:
diff --git a/web/actions/stats.py b/web/actions/stats.py
index 1f1e3f2e..f1209b53 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -40,7 +40,8 @@ def load_daily_diff(farm_summary):
         since_str = since_date.strftime("%Y%m%d%H%M%S")
         summary['plot_count'] = plot_count_diff(since_str, blockchain)
         summary['plots_size'] = plots_size_diff(since_str, blockchain)
-        summary['total_coin'] = total_coin_diff(since_str, blockchain)
+        summary['total_coins'] = total_coin_diff(since_str, blockchain)
+        summary['wallet_balance'] = wallet_balance_diff(since_str, blockchain)
         summary['netspace_size'] = netspace_size_diff(since_str, blockchain)
         #app.logger.info("{0} -> {1}".format(blockchain, summary))
         farm_summary.farms[blockchain]['daily_diff'] = summary
@@ -88,11 +89,30 @@ def total_coin_diff(since, blockchain):
         #app.logger.info(before.value)
         if (latest.value - before.value) != 0:
             result = ("%+6g " % (latest.value - before.value)) + _('in last day.')
+            #app.logger.info("Total coins daily diff: {0}".format(result))
     except Exception as ex:
         app.logger.debug("Failed to query for day diff of total_coin because {0}".format(str(ex)))
     #app.logger.info("Result is: {0}".format(result))
     return result
 
+def wallet_balance_diff(since, blockchain):
+    result = ''
+    try:
+        latest = db.session.query(StatWalletBalances).filter(StatWalletBalances.blockchain==blockchain).order_by(StatWalletBalances.created_at.desc()).limit(1).first()
+        #if blockchain == 'cactus':
+        #    app.logger.info(latest.value)
+        before = db.session.query(StatWalletBalances).filter(StatWalletBalances.blockchain==blockchain, StatWalletBalances.created_at <= since).order_by(StatWalletBalances.created_at.desc()).limit(1).first()
+        #if blockchain == 'cactus':
+        #    app.logger.info(before.value)
+        if (latest.value - before.value) != 0:
+            result = ("%+6g " % (latest.value - before.value)) + _('in last day.')
+            #app.logger.info("Total coins daily diff: {0}".format(result))
+    except Exception as ex:
+        app.logger.info("Failed to query for day diff of wallet_balances because {0}".format(str(ex)))
+    #if blockchain == 'cactus':
+    #    app.logger.info("Result is: {0}".format(result))
+    return result
+
 def netspace_size_diff(since, blockchain):
     result = ''
     try:
diff --git a/web/static/mario_coin.gif b/web/static/mario_coin.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba3ea9565229b80d854ce929360011282fadd7c3
GIT binary patch
literal 46317
zcmeIbWl&sux9*E4XdDX?B)A2FYe<3yl8}TDoFuqIg1ftGBaK4~&@|GxyIXK~XxuH$
zB}?A5*52>FcURqW>g+nze5H%(+4LN9jAuN*|063eBP6V6gUNxpkMYM(syF$}C$du+
zs;hdJtLgTut1G%Q9DLmC-*WtV#jn?5V54qUPN8@@!Q$-a+$KSiW>2%qS{8`dT3J{e@kwA_mj?yo&nDE8$W*F
zjE$uaPO%P;+!&w8n_gy|9a+GcT-kcGHoCC6efV&9et+rc;_gZM#=$B6VH=g;r>HfzwNT
z(!{X{>8^7T#RG`Co|*TE%Orb&TxI!YPK&7Gj%KYZ0;`5_ELI2Mt3%C{q*gRnV00zG
zRXVo(wJn~WWX5^?-Ev9_wjrKB|I?}bY^Bkc;v?`4%@dWnoCj6>YvTz(y4HLJLBkoK
ziy|J4rqGv#n9wR2E=uwPy}nc+7n5r~d;VxR?)z(~`
z>@Id0>ZaBHyf{5T&i2*Sp{}ludfIS2a7c~jJWuhWI7zgbl^$T-D{n}`f4sg5^uS|VOY`0y$4(Dm0sDrW-?KX@tl2&#ZlkL0$RzuSlcuaz_-5fSTKr=9KXg!m??VK?L00
zZ3f6_VzrQ87+d34V@-X@d}!bQ1kqPO!F!V-8UXEJc8=hMuxF0h+~gjj*k_}#CYc4KC;yT_B(?|2ZC-(OqVw>lzf1Y2BX=L%zKZjdz0y(P6M#|{t$
zoh}ePOZE@RuLh#sOGq&Vn4y4Px^uO
z8w{S1bRt7?0?HW!Z=!^B5`DGjG&8sT3C7ZIJCippV_0KKPto1cGiqkQdK4(4nSlWi
zdiIdA5fzkMPyZAv?z-~O2dk?#*4A{I`UznH-#>AH7kdzvC2$)1A@!~ME)Fdi>*&a*=
zHm~sE!+MQYxMTUA(uwH@)H$}kNj<(VC4Lb2+If2@^=I;`-E9`W82G^WgUaA_HM}2jg}KL7GpUq{5_!GL%XD%ejn94=qhClR^|+<%~SXx
zK+C@&T`-{nPVED0Y8i8#j6TDUISMfJl~T7ZSG`dZ>q{C^ukn`rW2wQeZ{w7Q=mp{<
z;o*08_iQQM*~E{;M0RPhOZ9ro@vmJs_<;dh95|E@#~Tei;3rK`J-Vb%y%rNUame7xnLp7tq4e8^+>Fn9e
z`H|%@?cvp_#oR5>4rDL?pzx^Zr1-4#0`arrDqt%h&NwB`qy9F5V(wOAlmBf7g=D#+
zg@=|z4Xn*VsED~TZ;B4{`(%S!@(#?)*;$A|ZABOEqn0JXAsrLW7#Gzfu4A
z`8A$TZ@~B2LlWG?_ls}CM0;?G2*!885(L&v(AZo=j=y%`oxM!H2tRTpo1!UIsfv4R5^TOWL#-~jGn?#+y*mBTV{frNnoO;?
zx?+FDKUz_CrrODKwL9}Q&|+Hn`D3cvz7hJVE&2#r#4q}Z9TbWO-Ws!uV6~Hv>`RrvW0)jO}A${%T4pV%d@7T#MGvdrCj!M-8x#E%|in~5V4+}
zY;w+;ovtlnl4UW#3^M$YIKq~JwL2OIZg)LqGe+<#eEtp+31EfvR8Vq2;qaHp!j$D?
z0sx%txKca6o|hR~(%ibr;nC#Fv`~7cU$q%qth$z;KS#;FUEUE_6&J9UGpS#`R0>fq
zLbftnnjC^(&ejZd8d+3dE|_puPvdg%_}KNx#5H<8;fQN;e?}D7+*lz%+Tx-&72E1l
z)-jUFF{5UZVdohV*I}J*7S|c!R887t{9S|>9A_fJ*ZrkKlP^y+dV;TqcJh+1SL^ZL
z?$(g&yY&MG_}ATf6Fl;Ji)#L)yXq<&&*Q7H!33xvuDzD0lIT~9ntDU5@JdQ6oSA?!
zw5i^jm5Ma6U!7M$NdnZ(Du5g|tEkx-+<3s?zhb)su<)Cd+$Y*T9~L-=RO3VF8N_%*E(A@4_^K@
zEcfw7
zC^Ej=`wb&s8F5!=>{l*#ocPaGs1TYSD4OkRx4FhosBqwMf6=#NH;l8Vp!}K~Bdmxb
ze6Tl}J0dXoF0_yj(GSr>&`gg#o$m`K%!v)KLx5&#Ut-=0lPJw{lQ#b>?7^l`g9~w_Ndb{
z1hvOWqHMkAO{Tm#FMI*nN3P3HSmu3jgidu`@Ko~Xyhydxr2HP5jLrK#@)Md5xaDWK
z5X5mek3N{kWR2e8$q37Q$n1FD7cU_v#A3L(9dmue3sPf7PuZ1R&&XG#6xz{m=sz*~
z5K4_NMXNG(0ONK8BeEma+=R1YUZ{XP5?=VRG9`Xt`}7!qW!0vSX$xodNcq$$obB=*
zYs}Eas!OP#L~aCYc0aEiHzgGTR@Zpbm;o;1XHS2{SM;
z%(CZI*vQR*i!g!@^gE1mL2&?sywpJ_BWTV!KG+W43pPpn=tTyF?cPC|W&>W)i-O_0
zl&0Cm9nxKl#Z~7fTZLf5Nk&q)05}a0Vp^@d~IoOpSv47W?
z8*l-?(5gLWQY)-K$*451)1eQ^FTH69;wiv*J`Rf|5b!UEza#pJr;eD{elLpRU3F2y
z17}U1b~-`fqGoFDlf5KXz6y9JC%Zpa>YXcxw3d?vB3SPOfC~~!VwLb|-*fgiCDpQo
zTZMxYIa4KF;)nPBJN=tZE?Mkdlp)DqYOHb2Iyx+x#LiyCTid)JuDw{
zR)0x==@Lheg5g@pEaA@9SB)%g5PG|8LXb%(*o~wgO9Uc9%_I$XmJ!!wyo?o3p
zoN(s#c&vy-=_Y*lHA-a)EZ`U|O``i_Jg%NPydIC$F78~9#|?RABDUSR?<2yQY$BZW|r#eT*hXZHhmgiR6b*GU=^QntDdtVL!>rp44
z&$2FPjtCEKbxFOrfw-@!YWZH8lW-kJ^N>gJg(Y#J{?k=dUVrPW2Sr5eGEt-LQ7q;u
zuR3^1z2kWF@_XYcE~s6Ea)3kV&~2n85P!Kze@>IxQ-4Ph=#t}dc5WL1l$Bt
z9RFGaVqQ(oP|BCyIx30&D6E@Jv+U0gRYhoiFL*Gfny*$YZ@SS^YQNK6%Xx*R%<5p(
z5p0Ot^H@!FN-N?yoj}eB`TA$B0EWe34jXuF*9&2t4kD5MPlK`Jab;^1a~lO2`Dt#Z
z@yAb7*R;EowhBud#*94sa-1dvpU>R)eHfp20kN6dHVfZ+HwI(7J0`kYO2S@svNfgU
z*heBE2H6|yN~#Ofb{-_fS?B`3u0y#HZt2u}=w6Smxgn$cWZ;Chd6(PO!#&>1@6G%VRcqp#6VuvjxAgrzAKqu(e{JPv!M&MHNy
zKzchT4lBZuG2xjV&x(Vo%G`21htIfyoo&$iW57FbVvfi6+Q8K~i|s@mpnWTAUWz1}
z8Z*8!CBQH(aNm(7(LD}inB}e9$rK)jCDIT{K)+$^99r;*IWnEgX+1V&gPbkX@@`-@
zq)?g?5>^ZbEakuCy=jsU+z)~j=3%jeVNeCsP0ymjI53p3TY+t{nBfJxIeeJOh!d1-
z0NE-_Ql4akAJ%-bKwQu%E>@_*gE>PsI@c_s4_4SVt7S(N&8o5H6tik`_7!(rR_Jef
z7L(i*gSp^#8DcgPvm|pjXb+z7RN^acX4XA?c!|;c+@zYJjlns&sGKl?)hc*TD+G?k
zcF@J^apw`0Z8cxj<#x};iY8yHSacV>*D439i+z=kq{Y8_qEr-4>=RVtt`I-=Z0Mup
zG-TioZ^U7U+PmAwIE-Y(2Lsygh>r(9X>gW}G}*Z7P5k^|4ji(GCKhbB;a1D8<|}qt
zLAcrDJIt|?)N;gQjD?;C1W8I|&p*+XNG*r@$X1svM|??r)|5<3eukUokK!MujInT<
zPW_U0zHt<)eAo`@CpjYgYrZm#%!`s>6r7q1a9zPvdqG2p{aO*c2g}jdl^&&&tNEr0aC`v
zlvh^Lc&=Z{FqHN!CA)gkbW$72aG-h-Jh-h9{f@BizS$G-LS_hld=!y=oTjQ9v81xu
zt)kK{2roCDCLesIBbUAJam~=-S`QGnDup^+z`U%iXQ7wVPSCRO&9j})(?bU`W1r5L
z_-F1q>Mq23v4@MgvL7V&U#R*sidS*X(+r5w^2mYp6?N*amh#d+Udd9LTH^D;os(%{?L{2zK;
zoY6ucOU|_($5A$>hso1=U2wQ8uJt(Hkvz;Wv5f@GaG`T@%m_h|qQ*!$`ZI<|VS&h{
zXnC#<#t<24(V5SaQxnHq}e%3L;`8Q
zN3Ms80yxt{8q5mf_n~A1yEj%ELx8QPY>610eM=^28!d67Ujt0Q=4Qdn~><*BAj6gGRK@(?lLWHRCThbEDJ+QR|M3u
zo5Ql<7h4s3cf0aHEBlj$bpcqKh4tfi#f)=D=|c({arvqX>u<|W`8Hh=P|~*^uUycz
z&2^gMwX2&D(RaK9OqsWM7Dz$6=#gD;44!E9gGz~RqP3o+eKV^Tv5yXh=mh=>Dn
zm?|sASvVy!)YCjp!|q`}@XZi|AH%&EikP!s1Ru}eA#$_8enUX891>mH)z07R_J!~)
zI!aQ$Vl}SV+h=9vFE(iTf)8iB((nQKVoS>s{4Q<6uu3
zz&TRqvuj$cbH|snOunh2!bT*V55ug9$l$3Gky9=yPd}-Q$=T6J?whV79~ULieyn`89=alu
z!tZDYeSFV|JL$k`n=goPT@<*QFk=I_#U>0Y%PVV~2xaHUe-yiLa86*x3z=)Ld9>_F95IfSfZrBgMJ}S3*R_}Lj=rel{SFyQ`ZN?VCC#`{w@olY~
zi(;GVo)?d~NzVliRr+`*0W`ss-*`qtfWk64pAI($@5*;2xk8VPd*5nIx`~S&f0_H}
zdsSOAS-h}Hoc>&vLyPBV!>#bkXjj|`|I(-LvtPBzY(MSEci7|6LaNSMcXl$|J0)yg
zRJV~Dizzy;D65~QJs%%j}#)0Ud&melpfEi;vK8fd4cu>_0;a@fJrE9J$~Iy2Sx0>@RL8{UM$T_2P&3%Lm6##*Lt|L$6ry9@z#c0#Z5I$@$6
zL0b-&0~=c&+fCgKP+pFcH<+0tVgr(g!azbH85_^AiyPTY3!w0RBu@E0C6c6Zf~~1g
zm<9D_6I8{efdnCVVNejyqu|ZroX_lLrL8JfTSe0Vo_vfcX^jR%t=~mM`Lcm?LFI%=
zmuVH2gGWL6ZfzAu&GAZQa}AON=~arN!L+LDu9f1+$6HOZXvBteA?rvM39UhQ$vB!D
z&Q&0=)^{PI+(nNh>1+ym8qZrgigPYEIyve#c-wBZxme%VdE;VBE-YAWOD1l~u}k&r
zB*G-@<+Y^UCIED5D}Q}U>G@EeObzr04N|If$VzIubog*0q!jk0kLqCTTGT%rsmPcX
zNV~&9j5+z$-IagJ)|-=a+A?#VpOUQoC&sKRaPNe|6S>7U533YMQU}g*a8G8e($gS@
zqb;?BF(VDlamqt1XM`*6dMKB##VcBf%;v4;SEdmxC7Ptt^lN)Areg0JY&!IY8E)0h
zS|AFtn@Bu1Kiqijxz%-x+jh^N%R_7wK%nD#;Fd`wo>|?uesOe>jviL%&_J5
zdb?N&*ld5Ju+a5_GtJWEG6Q}kRT7*VE}4DKrvt~>t+~Rqa-$GR#{7A|ejwZ2)5k=2
zBM7(QCjD(}0%%$?hSm|~lN^0)lO;dIzWHv@3~R`((?7_Nooqd)6jp`5&l@AWoykz?dX=+|{6I=upp
z6Hh(%zV4(!2h%pk*W0AP{-X-w@Y`uOJ2Y87^vv_=hxFzQryZ$x8z3}e;tAsPYV@`2
zyA_jqbxxdnv^!<3_J7J2?wo!8Zs$(v_`%25)hytJr&q{BKl2Frpf52LQR)fI_r1K6
zmE(-kNdRftH^5+EUix+I%O-){$bVBzSc<41s)9@7H8wT>B`o*#4-5_s{}>q^8=sgQ
z!Je6&n_pO5#9UcfTHjb&T|@35w=j1PH@A*X=l0JoFD_3}r~yKjUFrs}4HEhidyDi2
zXOer;A?^LtEjIVK{oduFtTALmX}SHfSPHW`qFLU7H9O$hUGY3$I+Nv#b9$15Y&WI?
z;WO<4lGJ!wLihCsykv2iej-YATEk`lE71hItna}R`F71BZ`kDu=^LW%6UIQ_6u%gt
z{16U&A^l!GUdnDY$wOIZFTRh`Lq
zH9sNruT45xnjH{+J(@iI&3<_HgTJBp%y-AJRsG!Dni)Iish#f!+cnd+uKhn=&N5R=
zI-suR&mJIX?JyNiXulsg#>CrRZ&T;IZ_5a&ao<-pn)f9)$eZ`0vio=4+uB0#Z{6F|
z5u?RWp_PBsy@V;a9IK4B*Via(pT@7z$zq@z3@WO^9d}d>C|<^?T6AQ`XuEZMy^j@R
zeBHg(?n(n_FFjY148doZN%zX}nUiglrE+oXW-4+4?#Ju7iH-`ljVRnvpNuerNUvKs
zYc3JPtf+lfoGc$z6PD~)iB8r`AlHOZYN`R)FwZxP%@Cwtu%4Tf1ejnYPFTQ)fK3+O
zAd_HTY>=!*2dYO
ztV@+`JIUBXV~ch}qRXNRR!g`8weN-)Q+nrEaXmisgK;zdRNv)h!2HO=LyvpU3ifby
z1DV@273Iv_Y^6e#-~8a>0@ixRxhucL$ZM0i)iTH|r(?R;%A);sf!HT7vWWLct+l03?^Ch4$*oBIR&RM&_^uI0%=oMmriJ-zV8GlqOC_7O
zi#C}!F3($df)#lIMT^_sThtgjRecqNTGd@Ogms?1ZH39z+db@smgRC{65D8@~=G;Cp;=I*@3>BS`n+3AE(ckd)_N4Ri^`i~A
z5fmH{_An%pGCGDlE}k?Ia637L1ehl6k$KC>EzcS30Hwf#6~TXLQi$?vO{%)4wywV6
z&mz-|eZ9T9E;0j{!^4B4V}n0N#;3<8F=rMgCKp$F=T0_YcO7j+cI%
z9WGy9?`PH*nXJ_7z4~_PsM2ohHF@2_^-8*Ku3Cc0`AnwTQAL?;;g6mNQOU!9D>CX-
zWP3V_ZrlegC4#ovN)CdP%bNC9bj2yF9+k-TcPxq-grTj^HzHVHhA0<`ot(Y6Az(C~{<#UP`PcR;en|~(yu)@>hR~TQa;-}dKS!+1W&1|ctW=G0
zKdTAFWwsDGGhWV%&owBhJTqB^0ug@OBIl;YrSsdU5Tf0ZPoqY(*aeDJWm}Www#XT+
zNSIj@%r#e)y8OtprQr^3ZuOLnZFe8P?5fzb?f3rCmxjzWzlsd_BeS8{%$`;I@?&@R
z8j0hx@%7NU8#CGt4t|D?e_A%I6Y1xEw`}~ThyPJzuJ!Q$k0K)>SO0sFd9wZNy2#ws
z{SqeDSpFqk40V$+%#7%|xq3zg`Wi0Jwayr-B*D5I{8stw>us#BznZHkDd~9EM-9sf
z8cySw3E7&@RsaSn9yvEm3WN=k?p1&CBDLw2&rMMtGiFY~y_9Draf`!WOZ1~5FeLId
z0p%qHvMCs4d8!cPrI{;luw*1j1c4F(24~sH;UmWDX&g@#3_!7VY{uZ2m5z;E?Xom*
zYHBKg6$$ruY;_bKhN
z!?Y+`2-7gBSgCb-Ss8xJnj10=k7TYM>%6cC*~@vtU3;|Q%pG#p%F0<|dUpz1hI^32
zQ~z_YKfmFNbTV_}SB2{A7E=|fqQ(cdF3|jG?ai<48UQJH-0Rfj{F`iq5%5kX$mM>=
z6QCGh2a_fnZwTYkSaF-j3KeJP6O>El0QVr|3})qIIVwL)21Khr|#tFheEmX*T&xfyN=S$zD#dVdbIvLn$njv5$v;AHD8$#x7b3&dmOL`
z-TY2QBLMc+$rqZf5+FHVG=D8i;~hz=TkErO+e+JKmBd3^KjKaR$*&^QYt-}zr@FF)
zpY|0elD3@0d+Xs`FJzN$ZAP@41N%y}r{SKYSZ@o1yGwf!AF%qM>jEY9kNR@|y1wB2
zX$jl;vxyP=?=~@}>Ps&ThoO6HT`CC8IC}z;q}JEPB%yGy;-=lMYgp6DA+RQSc5Fw{
z^@X*I7rDEyAG29t5OIJ-n7ngj6iI|bT(D6nAi)z59+Q~PpP80T0DJ?=@reaN@-qsv
z^5MnGxzLL83XIyCsyc8}b3<`EqP4EGsJpQ=uWzurqkr^AbNyJ?MBDUm2rRpId46@a
zXDxkYYcqA11Ml$Y_~i8L{NnQGAHy3gt-<@(@YW8aYsCD0JN~%^gZzp5b$uE5EE7uo
z-0qTGDoZ|`_BA+0&L+Dnj_X5Xh_MY*PlSM_O*iPCeru}GJFIEeZ+WjHWVlI{L?W4o
zFqIQ!ltg~8bX;%8O{P2l-FAE=`h$Nft_Z?VE5+V&CA&h5ilU2n&K)t7-(
znQ14)m&iKrV+m@PrHz)Rd$jJ!)q6H`eZCAw)YA?J?W4?wh1EZ8PP%6W{ddGrwrBmT
zvbpwJHYal%FGeA8eNG~KQ-4{)KG7KhZ4U9rQk`2`1k-GBc@dB7ZkdqL+23>eNasKn
z6i?^)5HL#TL<=UPciyfUee{i4!T!;AR&~Jz7w!?nf-5JR5QFCvN;UfT5X?V^w^H*j
z|GnWY?pG6&16l!?fg>A}tQyA^lE1YI8>To+(95T~%yby0#9gwkrM)FGF-rBN0p}$v
zacr;%i;J-t-^Y4ya%~ACOTCmOf?MgyqnnL^p4@st1`tdL>Lvi`q~G(9&XFjePj1O%iA6
zfJG3bq`~ikgQTaEjk64zQI!u~Vlw4|Z}*CFRcywoTV`j?R23k$2InlRmlxQ;WxIDd
z3L3!l(1J!HL89#@99fs$=5)4dSW7%Oy{OU4<&{-CeYB!Y$Lg^syriZTfYlZ^cMflP
zQbmQ;9o6n~-Na0qVfH#&i4}vN^KHT!Uit%`7RVwmi~Am6Ondi>-qR`_Aivg}hH>Pk
zvDy;22<+O}L(D;A288v}6If~H#}md?;sR3!UBm)}O@7o^pzr&xr5IfW5hvNKr_{Og
z8hwgvGt;Rxg1N5GQTB68nMB*=xB+#Ej1fFMV0iRnc
z(>_JUwsDEBl*HfO*(xt4x`0-%%2#aH23mayQdxAUt2Ghw2LA-uzYhhx)*OHIjz%)DTVh@#s4LhT8Ji1I
z+hRM0TN@zNW}UFn>E!V)g`WF;f&VCQ7qUYK!YHM&25o>}b_k
zHC0DqlNHViI;<=`$Rdl-XtX}-q!1QF(WT&M+_lCWUN(%BWp)!f6irlFZV|v^FMF?R
z!&s8|^ixsuStem~l!W_T0w>txfehC0&ZTiaf}#7LQo(_2A4qM0@5fk>%?~36w&2gbPSm{d=y@8Oy5t(g51FWi<_E3fFWE+Jq%NsRTIF{
z2>Ki&J!7<*;;;f*O?5eTOo{wP&&r%;3Kw2V^5hlHiwaa9XNe0ppJ$r1m|q&nIiES!0O`-WMMs?D1&A*
zsp)1>I}-}B3GWs_ZWi~;uy2(NtD0_=j{REEP1zy05Oa4m+RB%r9;#NX#W`D4ZUTxd
zsy1s0xhqwAOm}MDO+hTH&bE<-6|XPZVGn58+Dmn0Q>@||SBeJHt
zXQ)}!sH>M;)clZn%9@haTeGQY!^{(o!@kpRqs~-v-4l`CoA>VK$9{64MnBj68#rtifBv&*Shfl3Ir#2f|MyN7s}%ko$;nOW;ZHG|
z`#m3X^X*#AOgE1w@3x6slYM(_b~5;ONlQ>t0pI-foHF4HAq9DA?edpF?l1P+zMpb_
z=!itEiVH7U$f52pCu-CRuNWAmM$N_=YMxIz+tP@v=?8>iucsu@h;GQQx>hzL3bjP1
zE4ZgbrwlK)s_GiKU8MI2u7X_}+qera_j?$w#P$csBwhEIeK;^U*G2fMFx1_bk9MDY
z5AQvhzrw_Bn#x4}+|VaXy)llD(AmDo4<{BNJ+!9`CatZje)Nz&
zSuSX9Po`&`4}PWyR9hW1w*~9;
z{Net;wl}yL?=SyY)Ir78p>%#Oo!uaHYR5F9^6aL_qw@Oswpyh3D5SFfSJgfse#BqUs|iXczz3x+&MS&JdS_-ORrK_oeR0qdYT!;POwHF
zK}eAJDCz;PV|p}&bVYg$waQs~EZt|}jJU@(jv4W+1??G8#8GFDBJTi%=@NM0tPFss
zU`NK}XO+TP38Cqui`QlIm;1l-WH8N#^x9$ZoBKaR;995u<^Io#QT^5GO=T#v0QQ@V
zbEmAZO!5-Locd^Ua)SDAgUcviLcp~I5D>hVz~nyG5*S%feJzX?(q1+oVO8hnn6P^{
zQHmTzt;!xyoKCI_XyK3ydwxNW!W(mnA>|}<%ozjG7l;-&XS0eGX?C27u^b3z<$4$)
zclm+aLyO}5GNf6}_>8GpZ3T)gziMaWAvf_RuOh6jb|GRHhBIUet03ufHg6`Xd$ZR}
z#@)?bd-E36Ud1REAx|^Ijs|ZLv*FZECr2T>P3PUFYSS*-T+;)XaewkYtwcD{w|<;k
zN{0>hR9hC5qd73X$4dUYPZ{58@bEKy_-MsX|LGpA^r5IIXZ{$^Vl~HjbA}dt+*nb(
zY*N3AsCc4!kdt$=X(Aso^P~@EJDrJgJs|Mfp>~+Zf_ao<$=JgM1?>?*r1i4$%{`15nB9xNIWq2yIfkJWrb8tDzpd~NCGvKj4f>o_N<
z^TGNmcCn4R;?(UuoENVy_S-~ts*Add_qGmdRV7=Gh71c`NvGI%ex3k=Cx1RI_M7z<
zy9KlKy&$fi^|>VM5BK?rG1tc?PO?U8GsSc|(W)vSjMdrWfmuQ^-@jL%$8#eNAlKF-!uPH{KMNlXwrvrAee8Vg8rZ?0XcjEGIV8q1u@xmMqQ^G>X%;QjJW?CxEA
zC;rpm`lufB_rX=K3F9`MNV433-iyEoe5%#tD5*@@U^2;|_wCkM9Z^g#GhVG*Kkf?Q
z(oqRvz4x^l!1H_|8DyKQ6e2-;OjH@cG=M1+$V6N@%-r^?nx!cGZtMQ%;5ryVu|Aa99&Ow
zw4;(Q{7}e>;_+YAOuMJD6gdiOaKqDbD$@%^*p8r*ofp>{s<5vlsH%6ZrrN$^m!?eF
z?=|<4$y$p2v_AUB;3_z6eLS-w))uV#+DUk4?3YpWb=@_~^wzVAtXJC|<#IN8bt6NB`5{x{~tokqs@|39T)i2x8uexlC}u`7uE`y*umqD4j~?yx||}
zdp>CKzuY?N3*)^1ZR_Z`OrvhM{uoo!jWs7$FO1b7(ZH!g24Gf3@gm78?93qfo5`=i
zRn^fj^*bKj@7@V~MxqVkJ6=qbEa}wb>YWdQWI9=J!<;aTvjUYxo@GBa@-)r?*lghB
zCYz{BfdC6q8yPtQohFdDRv23vOy!&n3Z8KS7vyA!7#EaOQkv!0@)B$UeLthrkvY{l
zosG~St|}y~Tmpj39VAsWBJB54Fe|Q8SKKNY;DY3Hj47~h<_6Iq^DCF&?0HqIer%Ri
z{8@yS)h8%h$dgx+3~~TG|?|2wi)8sluv8fZ+7#g$lNfI
z9+YP2DZx;b)LI>S6D)N!{93l>>By_3e$zCysNL)_K?e3GH+2NfACGInsd?*DCiDs?
zK2)Y;Pfs|Bp8)mjdCF$>33b6U(KIyzbLI@F(9GRXn)K?R+Z&NQ|9Cic#mYd;7MI
z&mPI6y4A!xEVq0P2&K49>(sk04ysk(0r`6A61ww`r@bY`PaZh{T}M}$wQ2^CNkGgW
zTftYDm+Qqkbrv*OOq`&L&qnFW#<X-ZL
zd=78OYCW(h1g=4oYpI@-$ml;y^?%z3uG@J0z7MS6^LPyu^Cnn6ySLV#`8*g;sx!uD
zAm@!WTd2Z!whwu#g}goBBbLzu={m3P=eE$%T!W?zCB+ez$yC$XmHX`W7+Mwfvn%?L
zlE3zW{{b{1Dqo)|iSIF>siH7jEdZAK)rwS_OjQaf%6h
zqg$qRK*~MUT&MBQRE@cGLHAV3XM9-)5g9H|&Ob7E2ofYPc#2YvF?dO`ku!Qf7g1yM
zkyVh>^W~cuWpv}*IAL^`H&9#lduu23IOG%9;c>9y#DkQ;ufI!a71T0jW$P2CWr`RlY2bv+kSJPIbX!cCmyW=bpyf!f$%5(~u(JiU
zH^X_WW_f{!3%*u){YUn&AUlXlCq=8qvkms$0>VPDX%ps!}S9
zv<<_XW54}44!YMto$JEhPFFkyrsVPFkn5qG4Job_*_pDWmBKEL(;-r!6#s5{?4;6mM%(J6d>zqA{^1Yrt`SRdUFy;iQ`;@xal<4fj0w*6
zO_MykzG~?i=t2(ygX5CZW7g#cN^susVXxqVU2(+LG~HTd-jaDE;q7gLa0CEr+24l7
zzOhn7!g4mUOQd2wR>wkmB}-$@F}+ZdL!<-{PlH@XtzMK{I16zuFK
zk=32=wO19m;NKA3sqSxOX8)N9er~yS6lU;Rx@>CEZEt_XfA(zq2caqI?C9LX7;h)(
zjwH^3?b|x+6L%3-yt8n1*2^nXtZ5k@sSx=d9Ngq*Sc0(nN@^Gm@%!Y-+ow`DNG&Yg
zqjeW~9G(%_-S(nb(p`8_{_Iv*zt7{Te~gUT*CmYwL;jEL;}K7pJbQ5YSWofN+|o0>
zijeS%bZAcM)@h@)0DGxDc7@h)%>x({RaubCeO^#8jMB&GaQ!`R);m+*%KE$I_j&5s
z?Tj8Q@xA6W0O-drRmnf>b^Sg^UEFshZ!P1_>S^ceAY|k366_Z0;rJ}vCo(KHBG4|E3oX3B;mklT?4sC6nhaE}WKl
zTK^`k-oI%(`g?*u@6kZbpt2sj*`L0eD^
zEk~5z$N%+)e}70-T)$o1-`+5}+MhJ!Sn6*_062a6bp(LI-(LLJ)urDAkN$ae&j0S}
z?&Y=(Y&+Ld^Efcv4wj{1G;ZYKu33!`R#FZB_*tO*r*O88$(TrMT&W>p_M}=a^>!Y2
zEzw};G5&=W^YHGa=O9VF=25L;ZZ){lO0lDQv(!$eknP$
zkKYJ!WC;}T!Sa>(i%PDQl|lrl0$yAF`z8K<$^rUI`+v`u_V@qjfAdR=Pw?j<7lRn&
ze{KiNi3^$Pf^q>TkU7pN4!o@QM2l50`GTvx=ZTZ9Dm2pM+rwRn){cYoU7B8`vx}DP``6^dJaL>NRAV9)J1_dRh3YBK?^qNwHPK8ue
zSxt^z1E@)@NK(r=$y=mibqgh7D4Wf#xUY
zac37O-(=KJLKZ99D$5xtl~3%O&PIFUOfl%9^5;^m2T8A7qESyeTKTCXU0&Q9?0Bhn
zhd?R{{JNQ(0pwOUhy5N+axQ5s%(F%Y@r0fS=wQ%88Z9dB{vm
zL*)2j{Z3MBw7wGPag*8y&!e%i`}$8zTw6b+OcY95`)t|Ry-<&_vM$Xwu`@5PS=*Sv
z5aZra)z#9g#C`Z4s$=U@OxcR{L$|I|j{A!?*s*x1H#M`D;!h#*kJ0;IJL79lN>7rV
z=WM+<;f|Ji`QBW!JgrWu%i;cF&#IUpO_IlNjAmQv=X0yE$);fD{%O(Ojm04yZp&H>
zr=#`pB==i7)h;_wByv_#{0fD-T0cTidf@mmr5S8q)^o
zMUBrVst17#;*Ci0b0Rf**A0@L6&!M{SPD9rQok+SG)(eV$2Uq*s{N#%=Cy*K9SC_w
zxo#O9m$2v;-;hO8@U!0#}vz%
zV3h>wn5F_sJ=i@`lyfG$3hZYFAG`A~zsMfk2@M`iRo^IOF>qchrnS-dY{xn^L0>+t
zT*YC}kN}~pTm(O4sMu1u;HstyddO8pUyfv`eYlatUH5RxiLsnS{bNDV4ap=P$0N#0
zsit;`YFIPD8!Bka9l<1P@Ttudcay0BkGAh3e!Ptp*44SSGgGiX+<|SV8(y9B`H@lg
ze2>{&k0kb}4W8&1D>zJmFy+wlIZ_ioz{^1WbV!k`zvL!A*4#l80ll#Fh=#3J+Nj!z
zQReXH@ci{r1Jh8u35=*3%rVQR8sHS0oT;FTgO1qFj7y=G_lyVa&-r^kWHZHcJd6e9
zcCND*_VY!|!X);~k`iHOl`%~QjuT1F&}W`KXAq3_jzkiSjb>1qWMZRUy0@`(R?ME
zuSD~eXucB7S6&|yf#xgGd?lK%MDvwsz7ow>qWMZRUy0@`(R}6q&-1|0d?lK%MDvws
zz7ow>{&g@Any*Cjm1w>a%~$@PIjRiJSN;(Vgyt*Jd?lK%MDvw@CKmriAfow7G+&8^
zg8x@T!DznnI<#mV%~zuNN;F@I<}1;BB|5(nonML0uSDlpqVp@!`IYGWN_2iDI=>Q~
zUy07IMCVtc^DEK$mFWCRbbh5D%R&I--_pnb7NdgBuSDlpqVp@!`IYGWN_2iDI=>Q~
zUy07IMCVtc^DEK$mFWD+A&3q-zY?8aiO#P?=U1ZhE7AFt==@4_ekBG+B*s6|c+vTl
z==@4_ekD4;5}jX};0XwiNlfR@Ov@$!z5(U<{4bEw(0nDDuSDlpqVp@!`IYGWN|pb)
U`IWf0egzn!^DF;-ex>OD1F>S?IsgCw

literal 0
HcmV?d00001

diff --git a/web/templates/index/index.html b/web/templates/index/index.html
index 3bd67cdb..583d591b 100644
--- a/web/templates/index/index.html
+++ b/web/templates/index/index.html
@@ -86,13 +86,14 @@ 
{{_('Total Plots Size')}}

         

           

             

-              
+              
               
{{farms[blockchain].wallet_balance }}

               
{{ farms[blockchain].currency_symbol }} {{_('Balance')}}

             

           

           

+            
             
             

               

Date: Mon, 6 Jun 2022 18:01:14 -0600
Subject: [PATCH 0769/1625] Fixes for charts.

---
 .github/workflows/test-btcgreen.yaml   |  1 +
 .github/workflows/test-cactus.yaml     |  1 +
 .github/workflows/test-chia.yaml       |  1 +
 .github/workflows/test-chives.yaml     |  1 +
 .github/workflows/test-cryptodoge.yaml |  1 +
 .github/workflows/test-flax.yaml       |  1 +
 .github/workflows/test-flora.yaml      |  1 +
 .github/workflows/test-hddcoin.yaml    |  1 +
 .github/workflows/test-maize.yaml      |  1 +
 .github/workflows/test-nchain.yaml     |  1 +
 .github/workflows/test-shibgreen.yaml  |  1 +
 .github/workflows/test-silicoin.yaml   |  1 +
 .github/workflows/test-staicoin.yaml   |  1 +
 .github/workflows/test-stor.yaml       |  1 +
 api/gunicorn.conf.py                   |  1 +
 api/models/chia.py                     | 17 +++++------
 scripts/madmax_setup.sh                |  4 +--
 web/actions/stats.py                   | 40 ++++++++++++++------------
 web/templates/index/index.html         |  2 +-
 19 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/test-btcgreen.yaml b/.github/workflows/test-btcgreen.yaml
index ed5a0613..9f620071 100644
--- a/.github/workflows/test-btcgreen.yaml
+++ b/.github/workflows/test-btcgreen.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "BTCGREEN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-btcgreen:test
diff --git a/.github/workflows/test-cactus.yaml b/.github/workflows/test-cactus.yaml
index 80503312..9fe4a7cb 100644
--- a/.github/workflows/test-cactus.yaml
+++ b/.github/workflows/test-cactus.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "CACTUS_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:test
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 53cd6fee..5e2f1398 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=latest"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index c4a55756..65a746d8 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "CHIVES_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test
diff --git a/.github/workflows/test-cryptodoge.yaml b/.github/workflows/test-cryptodoge.yaml
index b3456aec..4a61152b 100644
--- a/.github/workflows/test-cryptodoge.yaml
+++ b/.github/workflows/test-cryptodoge.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "CRYPTODOGE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cryptodoge:test
diff --git a/.github/workflows/test-flax.yaml b/.github/workflows/test-flax.yaml
index c8889264..0192e6bd 100644
--- a/.github/workflows/test-flax.yaml
+++ b/.github/workflows/test-flax.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flax:test
diff --git a/.github/workflows/test-flora.yaml b/.github/workflows/test-flora.yaml
index 4e447deb..7f1d1ade 100644
--- a/.github/workflows/test-flora.yaml
+++ b/.github/workflows/test-flora.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "FLORA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:test
diff --git a/.github/workflows/test-hddcoin.yaml b/.github/workflows/test-hddcoin.yaml
index 8bd7d9ca..cde549b8 100644
--- a/.github/workflows/test-hddcoin.yaml
+++ b/.github/workflows/test-hddcoin.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "HDDCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:test
diff --git a/.github/workflows/test-maize.yaml b/.github/workflows/test-maize.yaml
index 0975021d..d962bfb4 100644
--- a/.github/workflows/test-maize.yaml
+++ b/.github/workflows/test-maize.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "MAIZE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-maize:test
diff --git a/.github/workflows/test-nchain.yaml b/.github/workflows/test-nchain.yaml
index 7b01482c..7b41a0f7 100644
--- a/.github/workflows/test-nchain.yaml
+++ b/.github/workflows/test-nchain.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "NCHAIN_BRANCH=net9.dev"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-nchain:test
diff --git a/.github/workflows/test-shibgreen.yaml b/.github/workflows/test-shibgreen.yaml
index 33ec46f3..3f49f7cd 100644
--- a/.github/workflows/test-shibgreen.yaml
+++ b/.github/workflows/test-shibgreen.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "SHIBGREEN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-shibgreen:test
diff --git a/.github/workflows/test-silicoin.yaml b/.github/workflows/test-silicoin.yaml
index 3d630fc5..c76b9532 100644
--- a/.github/workflows/test-silicoin.yaml
+++ b/.github/workflows/test-silicoin.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "SILICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:test
diff --git a/.github/workflows/test-staicoin.yaml b/.github/workflows/test-staicoin.yaml
index d9b90ec3..6b85777a 100644
--- a/.github/workflows/test-staicoin.yaml
+++ b/.github/workflows/test-staicoin.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "STAICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-staicoin:test
diff --git a/.github/workflows/test-stor.yaml b/.github/workflows/test-stor.yaml
index fbce9f3c..e0fe9475 100644
--- a/.github/workflows/test-stor.yaml
+++ b/.github/workflows/test-stor.yaml
@@ -41,6 +41,7 @@ jobs:
           push: true
           build-args: |
             "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
             "STOR_BRANCH=master"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-stor:test
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 7e19bf0b..519df518 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -78,6 +78,7 @@ def on_starting(server):
         scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0)  # Hourly
         
     # Testing only
+    #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_effort.calculate, name="stats_effort", trigger='interval', seconds=10) # Test immediately
 
     app.logger.debug("Starting background scheduler...")
diff --git a/api/models/chia.py b/api/models/chia.py
index 64a76b78..f4f6ea6c 100644
--- a/api/models/chia.py
+++ b/api/models/chia.py
@@ -90,11 +90,14 @@ def __init__(self, wallets, cold_wallet_addresses={}):
                 total_balance = float(hot_balance) + float(cold_balance)
             except:
                 total_balance = hot_balance
-            self.rows.append({ 
-                'hostname': wallet.hostname,
-                'blockchain': wallet.blockchain,
-                'total_balance': total_balance,
-                'updated_at': wallet.updated_at }) 
+            if hot_balance:
+                self.rows.append({ 
+                    'hostname': wallet.hostname,
+                    'blockchain': wallet.blockchain,
+                    'total_balance': total_balance,
+                    'updated_at': wallet.updated_at })
+            else:
+                app.logger.info("Skipping blockchain {0}".format(wallet.blockchain))
 
     def exclude_cat_wallets(self, wallet_details):
         details = []
@@ -116,9 +119,7 @@ def sum_chia_wallet_balance(self, hostname, blockchain, include_cold_balance=Tru
         rx = re.compile(numeric_const_pattern, re.VERBOSE)
         sum = 0
         for wallet in self.wallets:
-            if not 'Sync status: Synced' in wallet.details:
-                raise Exception('{0} wallet is not synced, so balance is unknown.')
-            elif wallet.hostname == hostname and wallet.blockchain == blockchain:
+            if wallet.hostname == hostname and wallet.blockchain == blockchain and wallet.is_synced():
                 try:
                     for balance in rx.findall(self.exclude_cat_wallets(wallet.details)):
                         #app.logger.info("Found balance of {0} for for {1} - {2}".format(balance, 
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index 43ea5ea0..f1427840 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -4,8 +4,8 @@
 # See https://github.com/madMAx43v3r/chia-plotter
 #
 
-# As of 2022-05-18
-HASH=514c51610e70991bfb8160782b12a08bd62259a1
+# As of 2022-06-06
+HASH=ced900e9ea72a5d0e5db785f34be37d98bcda6a9
 MADMAX_BRANCH=master
 
 if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx') ]]; then
diff --git a/web/actions/stats.py b/web/actions/stats.py
index f1209b53..80fe9ddd 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -53,7 +53,7 @@ def plot_count_diff(since, blockchain):
         #app.logger.info(latest.value)
         before = db.session.query(StatPlotCount).filter(StatPlotCount.blockchain==blockchain, StatPlotCount.created_at <= since).order_by(StatPlotCount.created_at.desc()).limit(1).first()
         #app.logger.info(before.value)
-        if (latest.value - before.value) != 0:
+        if (latest and before) and (latest.value - before.value) != 0:
             result = ("%+0g " % (latest.value - before.value)) + _('in last day.')
     except Exception as ex:
         app.logger.debug("Failed to query for day diff of plot_count because {0}".format(str(ex)))
@@ -67,14 +67,15 @@ def plots_size_diff(since, blockchain):
         #app.logger.info(latest.value)
         before = db.session.query(StatPlotsSize).filter(StatPlotsSize.blockchain==blockchain, StatPlotsSize.created_at <= since).order_by(StatPlotsSize.created_at.desc()).limit(1).first()
         #app.logger.info(before.value)
-        gibs = (latest.value - before.value)
-        fmtted = converters.gib_to_fmt(gibs)
-        if fmtted == "0 B":
-            result = ""
-        elif not fmtted.startswith('-'):
-            result = "+{0} in last day.".format(fmtted)
-        else:
-            result = fmtted
+        if (latest and before):
+            gibs = (latest.value - before.value)
+            fmtted = converters.gib_to_fmt(gibs)
+            if fmtted == "0 B":
+                result = ""
+            elif not fmtted.startswith('-'):
+                result = "+{0} in last day.".format(fmtted)
+            else:
+                result = fmtted
     except Exception as ex:
         app.logger.debug("Failed to query for day diff of plots_size because {0}".format(str(ex)))
     #app.logger.info("Result is: {0}".format(result))
@@ -87,7 +88,7 @@ def total_coin_diff(since, blockchain):
         #app.logger.info(latest.value)
         before = db.session.query(StatTotalCoins).filter(StatTotalCoins.blockchain==blockchain, StatTotalCoins.created_at <= since).order_by(StatTotalCoins.created_at.desc()).limit(1).first()
         #app.logger.info(before.value)
-        if (latest.value - before.value) != 0:
+        if (latest and before) and (latest.value - before.value) != 0:
             result = ("%+6g " % (latest.value - before.value)) + _('in last day.')
             #app.logger.info("Total coins daily diff: {0}".format(result))
     except Exception as ex:
@@ -104,7 +105,7 @@ def wallet_balance_diff(since, blockchain):
         before = db.session.query(StatWalletBalances).filter(StatWalletBalances.blockchain==blockchain, StatWalletBalances.created_at <= since).order_by(StatWalletBalances.created_at.desc()).limit(1).first()
         #if blockchain == 'cactus':
         #    app.logger.info(before.value)
-        if (latest.value - before.value) != 0:
+        if (latest and before) and (latest.value - before.value) != 0:
             result = ("%+6g " % (latest.value - before.value)) + _('in last day.')
             #app.logger.info("Total coins daily diff: {0}".format(result))
     except Exception as ex:
@@ -120,14 +121,15 @@ def netspace_size_diff(since, blockchain):
         #app.logger.info(latest.value)
         before = db.session.query(StatNetspaceSize).filter(StatNetspaceSize.blockchain==blockchain, StatNetspaceSize.created_at <= since).order_by(StatNetspaceSize.created_at.desc()).limit(1).first()
         #app.logger.info(before.value)
-        gibs = (latest.value - before.value)
-        fmtted = converters.gib_to_fmt(gibs)
-        if fmtted == "0 B":
-            result = ""
-        elif not fmtted.startswith('-'):
-            result = ("+{0} ".format(fmtted))  + _('in last day.')
-        else:
-            result = ("{0} ".format(fmtted)) + _('in last day.')
+        if (latest and before):
+            gibs = (latest.value - before.value)
+            fmtted = converters.gib_to_fmt(gibs)
+            if fmtted == "0 B":
+                result = ""
+            elif not fmtted.startswith('-'):
+                result = ("+{0} ".format(fmtted))  + _('in last day.')
+            else:
+                result = ("{0} ".format(fmtted)) + _('in last day.')
     except Exception as ex:
         app.logger.debug("Failed to query for day diff of netspace_size because {0}".format(str(ex)))
     #app.logger.debug("Result is: {0}".format(result))
diff --git a/web/templates/index/index.html b/web/templates/index/index.html
index 583d591b..90801732 100644
--- a/web/templates/index/index.html
+++ b/web/templates/index/index.html
@@ -93,7 +93,7 @@ 
{{ farms[blockchain].currency_symbol }} {{_('B
             

           

           

-            
+            
             
             

               

Date: Mon, 6 Jun 2022 19:22:22 -0600
Subject: [PATCH 0770/1625] Run Chia main on test branch now.

---
 .github/workflows/test-chia.yaml | 2 +-
 api/gunicorn.conf.py             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 5e2f1398..2003cebd 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -42,7 +42,7 @@ jobs:
           build-args: |
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=latest"
+            "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 519df518..3f1f30d0 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -78,6 +78,7 @@ def on_starting(server):
         scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0)  # Hourly
         
     # Testing only
+    #scheduler.add_job(func=restart_stuck_farmer.execute, name="restart_farmer_if_stuck", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_effort.calculate, name="stats_effort", trigger='interval', seconds=10) # Test immediately
 

From e74daf49013bba21daa9ace9e18127ca8e2e0ea8 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 6 Jun 2022 20:51:07 -0600
Subject: [PATCH 0771/1625] Extract messages.

---
 .../de_DE/LC_MESSAGES/messages.po             |   2 +-
 .../fr_FR/LC_MESSAGES/messages.po             |   2 +-
 .../it_IT/LC_MESSAGES/messages.po             |   2 +-
 .../nl_NL/LC_MESSAGES/messages.po             |   2 +-
 .../pt_PT/LC_MESSAGES/messages.po             |   2 +-
 api/translations/zh/LC_MESSAGES/messages.po   |   2 +-
 web/templates/index/chart_balances.html       |   1 +
 .../de_DE/LC_MESSAGES/messages.po             | 392 ++++++++++-------
 .../fr_FR/LC_MESSAGES/messages.po             | 396 +++++++++++-------
 .../it_IT/LC_MESSAGES/messages.po             | 395 ++++++++++-------
 .../nl_NL/LC_MESSAGES/messages.po             | 396 +++++++++++-------
 .../pt_PT/LC_MESSAGES/messages.po             | 396 +++++++++++-------
 web/translations/zh/LC_MESSAGES/messages.po   | 387 ++++++++++-------
 13 files changed, 1405 insertions(+), 970 deletions(-)

diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po
index 0aa19d6c..9a81e82a 100644
--- a/api/translations/de_DE/LC_MESSAGES/messages.po
+++ b/api/translations/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: ApfelBirneKreis\n"
 "Language: de\n"
diff --git a/api/translations/fr_FR/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po
index 59b29781..a63d5ee7 100644
--- a/api/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/api/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
diff --git a/api/translations/it_IT/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po
index 946ad856..7c5c6d4f 100644
--- a/api/translations/it_IT/LC_MESSAGES/messages.po
+++ b/api/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Fabrizio Cacicia\n"
 "Language: it\n"
diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po
index 2dfb1d07..7c50daac 100644
--- a/api/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/api/translations/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-03-13 10:30-0600\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
 "Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
diff --git a/api/translations/pt_PT/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po
index bcdfd04f..cb303b8b 100644
--- a/api/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/api/translations/pt_PT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: Antonio Casqueiro\n"
 "Language: pt\n"
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 2445242e..73e243c1 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
diff --git a/web/templates/index/chart_balances.html b/web/templates/index/chart_balances.html
index b1177849..d45f265e 100644
--- a/web/templates/index/chart_balances.html
+++ b/web/templates/index/chart_balances.html
@@ -77,6 +77,7 @@
                     x: {
                         type: 'time',
                         time: {
+                            unit: 'day',
                             tooltipFormat: 'DD T'
                         },
                         title: {
diff --git a/web/translations/de_DE/LC_MESSAGES/messages.po b/web/translations/de_DE/LC_MESSAGES/messages.po
index c940ae28..8c62ac10 100644
--- a/web/translations/de_DE/LC_MESSAGES/messages.po
+++ b/web/translations/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: ApfelBirneKreisLanguage: de\n"
 "Language: de_DE\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.1\n"
 
-#: routes.py:90 routes.py:233
+#: routes.py:113 routes.py:256
 msgid "Saved local currency setting."
 msgstr "Lokale Währungseinstellung gespeichert"
 
-#: routes.py:110
+#: routes.py:133
 msgid "Blockchain download"
 msgstr "Blockchain herunterladen"
 
-#: routes.py:142
+#: routes.py:165
 msgid "Unknown plotting form"
 msgstr "Unbekannte Plotting Configuration"
 
-#: routes.py:192
+#: routes.py:215
 msgid "Error! Please see logs."
 msgstr "FEHLER! Bitte prüfe die Logs"
 
-#: routes.py:218
+#: routes.py:241
 msgid "Unknown alerts form"
 msgstr "Unbekannte Alarm Configuration"
 
-#: routes.py:238
+#: routes.py:261
 msgid "Saved cold wallet addresses."
 msgstr "Cold Wallet Adressen gespeichert"
 
-#: routes.py:306
+#: routes.py:329
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
@@ -50,11 +50,11 @@ msgstr ""
 "Kartendaten gespeichert. Bitte warte bis zu 10 min bis diekartendaten "
 "generiert wurden"
 
-#: routes.py:314
+#: routes.py:337
 msgid "Unknown form action"
 msgstr "Unbekannte Aktions konfiguration"
 
-#: routes.py:420
+#: routes.py:443
 #, python-format
 msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
@@ -63,35 +63,35 @@ msgstr ""
 "Kein passender Worker für %(blockchain)s auf %(worker)s gefundenBitte "
 "andere Blockchain wählen"
 
-#: routes.py:426
+#: routes.py:449
 #, python-format
 msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
 " Please check your workers."
 msgstr "Keine Fullnode für %(blockchain)s Alerts gefundenBitte Worker überprüfen"
 
-#: routes.py:431
+#: routes.py:454
 #, python-format
 msgid ""
 "For Farming config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr "Keine Fullnode für %(blockchain)s Farming gefundenBitte Worker überprüfen"
 
-#: routes.py:438
+#: routes.py:461
 #, python-format
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr "Keine Fullnode für %(blockchain)s Plotting gefundenBitte Worker überprüfen"
 
-#: routes.py:443
+#: routes.py:466
 #, python-format
 msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
 "workers."
 msgstr "Keine Fullnode für %(blockchain)s gefundenBitte Worker überprüfen"
 
-#: routes.py:462
+#: routes.py:485
 msgid "Unsupported log type"
 msgstr "Nicht unterstützter Log Typ"
 
@@ -120,7 +120,8 @@ msgid "Idle"
 msgstr "Untätig"
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:211
-#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+#: models/plotman.py:67 templates/index/index.html:42
+#: templates/index/index.html:52
 msgid "Active"
 msgstr "Aktiv"
 
@@ -128,19 +129,45 @@ msgstr "Aktiv"
 msgid "Suspended"
 msgstr "Beendet"
 
-#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
-#: actions/stats.py:110
+#: actions/stats.py:57 actions/stats.py:92 actions/stats.py:109
+#: actions/stats.py:130 actions/stats.py:132
 msgid "in last day."
 msgstr "währen des letzten tags"
 
-#: actions/stats.py:338
+#: actions/stats.py:360
 msgid "secs"
 msgstr "Sekunden"
 
-#: actions/stats.py:348 models/chia.py:251
+#: actions/stats.py:370 models/chia.py:251
 msgid "hour"
 msgstr "Stunde"
 
+#: actions/stats.py:399 templates/views/index_script_block.js:51
+msgid "Farmed Coins"
+msgstr ""
+
+#: actions/stats.py:416
+#, fuzzy
+msgid "Wallet Balances"
+msgstr "Wallet Bilanz"
+
+#: actions/stats.py:433 templates/index/index.html:105
+msgid "Netspace Size"
+msgstr ""
+
+#: actions/stats.py:434 actions/stats.py:492
+msgid "Size"
+msgstr ""
+
+#: actions/stats.py:472
+msgid "Plot Counts"
+msgstr ""
+
+#: actions/stats.py:491 templates/index/index.html:78
+#, fuzzy
+msgid "Plots Size"
+msgstr "Gesamte Plot Größe"
+
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
 msgstr "Warnung entfernen"
@@ -189,11 +216,11 @@ msgstr ""
 msgid "days"
 msgstr "Tage"
 
-#: models/chia.py:213 templates/summary.html:100 templates/wallet.html:128
+#: models/chia.py:213 templates/summary.html:105 templates/wallet.html:129
 msgid "Syncing"
 msgstr "Synchronisierung"
 
-#: models/chia.py:215 templates/index.html:54
+#: models/chia.py:215 templates/index/index.html:54
 msgid "Not available"
 msgstr "Nicht erreichbar"
 
@@ -201,9 +228,10 @@ msgstr "Nicht erreichbar"
 msgid "Not synced"
 msgstr "Nicht Syncronisiert"
 
-#: models/chia.py:220 templates/index.html:54 templates/plotting/jobs.html:114
-#: templates/plotting/workers.html:116 templates/summary.html:96
-#: templates/wallet.html:124 templates/worker.html:78 templates/workers.html:72
+#: models/chia.py:220 templates/index/index.html:54
+#: templates/plotting/jobs.html:114 templates/plotting/workers.html:116
+#: templates/summary.html:101 templates/wallet.html:125
+#: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr "Offline"
 
@@ -264,16 +292,16 @@ msgid "Alerts: Recent Notifications"
 msgstr "Alerts: Kürzliche Nachrichten"
 
 #: templates/alerts.html:72 templates/drives.html:86
-#: templates/settings/alerts.html:36 templates/settings/farming.html:37
-#: templates/settings/plotting.html:37 templates/settings/tools.html:36
-#: templates/worker.html:14
+#: templates/index/chart_farmed.html:52 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
 msgstr "Worker"
 
-#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/alerts.html:73 templates/blockchains.html:35
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/summary.html:77 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr "Blockchain"
@@ -341,17 +369,17 @@ msgstr "Machinaris"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: templates/base.html:38 templates/base.html:113 templates/index.html:41
+#: templates/base.html:38 templates/base.html:113 templates/index/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:44 templates/base.html:107 templates/index.html:50
+#: templates/base.html:44 templates/base.html:107 templates/index/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:50
+#: templates/base.html:50 templates/index/index.html:126
 msgid "Wallets"
 msgstr ""
 
@@ -378,7 +406,7 @@ msgstr ""
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/plotting/workers.html:96 templates/summary.html:81
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
@@ -438,48 +466,52 @@ msgstr ""
 msgid "Plotman"
 msgstr ""
 
-#: templates/blockchains.html:23
+#: templates/blockchains.html:27
 msgid "Blockchain Summary"
 msgstr "Blockchain Zusammenfassung"
 
-#: templates/blockchains.html:32 templates/drives.html:91
-#: templates/summary.html:74 templates/wallet.html:109
+#: templates/blockchains.html:36 templates/drives.html:91
+#: templates/summary.html:78 templates/wallet.html:109
 msgid "Status"
 msgstr ""
 
-#: templates/blockchains.html:33
+#: templates/blockchains.html:37
 msgid "Peak Height"
 msgstr ""
 
-#: templates/blockchains.html:34
+#: templates/blockchains.html:38
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/drives.html:93
+#: templates/blockchains.html:39 templates/drives.html:93
 #: templates/wallet.html:114
 msgid "Updated At"
 msgstr ""
 
-#: templates/blockchains.html:36 templates/summary.html:87
-#: templates/workers.html:49
-msgid "Logs"
+#: templates/blockchains.html:63
+msgid "View Blockchain Details"
 msgstr ""
 
-#: templates/blockchains.html:66
+#: templates/blockchains.html:65 templates/blockchains.html:79
 msgid "Blockchain Details"
 msgstr ""
 
-#: templates/blockchains.html:91
+#: templates/blockchains.html:69 templates/summary.html:126
+#, fuzzy
+msgid "View Blockchain Log"
+msgstr "Blockchain herunterladen"
+
+#: templates/blockchains.html:104
 msgid "No blockchains found from any farmers. Not added?"
 msgstr ""
 "Es konnten keine Blockchains gefunden werden. Wurden Blockchains "
 "hinzugefügt?"
 
-#: templates/blockchains.html:92
+#: templates/blockchains.html:105
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr "Versuche \"chia show --state\" "
 
-#: templates/blockchains.html:106 templates/summary.html:143
+#: templates/blockchains.html:119 templates/summary.html:152
 msgid "Fullnode Log for "
 msgstr "Fullnode Log für"
 
@@ -650,46 +682,6 @@ msgstr ""
 "Für mehr, schau dir das Machinaris "
 "%(wiki_link_open)swiki%(wiki_link_close)s an"
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr "Erwartete TTW"
-
-#: templates/index.html:72
-msgid "Total Plots"
-msgstr "Gesamte Plots"
-
-#: templates/index.html:79
-msgid "Total Plots Size"
-msgstr "Gesamte Plot Größe"
-
-#: templates/index.html:89 templates/wallet.html:113
-msgid "Balance"
-msgstr "Bilanz"
-
-#: templates/index.html:96
-msgid "Farmed"
-msgstr "Erfarmt"
-
-#: templates/index.html:105
-msgid "Netspace"
-msgstr ""
-
-#: templates/index.html:120
-msgid "Challenges from Harvesters"
-msgstr "Challenges der Harvester"
-
-#: templates/index.html:136
-msgid "Partial Proofs for Pools"
-msgstr "Partial Proofs der Pools"
-
-#: templates/farming/workers.html:80 templates/index.html:147
-msgid "Previous"
-msgstr "Vorherige"
-
-#: templates/farming/workers.html:84 templates/index.html:151
-msgid "Next"
-msgstr "Nächste"
-
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
 msgstr "ACHTUNG: Machinaris wird hier nie deinen privaten Key anzeigen"
@@ -849,50 +841,55 @@ msgstr ""
 msgid "Local Currency:"
 msgstr "Lokale Währung"
 
-#: templates/summary.html:75
+#: templates/summary.html:79
 msgid "Height"
 msgstr "Höhe"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:76
+#: templates/summary.html:80
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:78
+#: templates/summary.html:82
 msgid "Max Resp."
 msgstr "Max. Antwortdauer"
 
-#: templates/summary.html:79
+#: templates/summary.html:83
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:80
+#: templates/summary.html:84
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:82
+#: templates/summary.html:86
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:83 templates/summary.html:84
+#: templates/summary.html:87 templates/summary.html:88
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:98 templates/wallet.html:126
+#: templates/summary.html:103 templates/wallet.html:127
 msgid "Synced"
 msgstr "Synchronisiert"
 
-#: templates/summary.html:102 templates/wallet.html:130
+#: templates/summary.html:107 templates/wallet.html:131
 msgid "Not Synced"
 msgstr "Nicht Synchronisiert"
 
-#: templates/summary.html:128
+#: templates/summary.html:123 templates/wallet.html:142
+#, fuzzy
+msgid "Chart Wallet"
+msgstr "Wallet editieren"
+
+#: templates/summary.html:137
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 "Es konnte keine Blockchain gefunden werden. Wurde gerade erst neu "
 "gestartet?"
 
-#: templates/summary.html:129
+#: templates/summary.html:138
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Bitte warte 15 min damit die Blockchain statrten kann"
 
@@ -908,7 +905,7 @@ msgstr "Cold Wallet Adresse:"
 msgid "Wallet Summary"
 msgstr "Wallet Zusammenfassung"
 
-#: templates/wallet.html:110
+#: templates/index/index.html:89 templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr "Wallet Bilanz"
 
@@ -916,19 +913,23 @@ msgstr "Wallet Bilanz"
 msgid "Cold Wallet Balance"
 msgstr "Cold Wallet Bilanz"
 
-#: templates/wallet.html:112
+#: templates/views/index_script_block.js:56 templates/wallet.html:112
 msgid "Total Balance"
 msgstr "Totale Bilanz"
 
-#: templates/wallet.html:140
+#: templates/index/index.html:92 templates/wallet.html:113
+msgid "Balance"
+msgstr "Bilanz"
+
+#: templates/wallet.html:144
 msgid "Edit Wallet"
 msgstr "Wallet editieren"
 
-#: templates/wallet.html:151
+#: templates/wallet.html:155
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:175
+#: templates/wallet.html:179
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -936,7 +937,7 @@ msgstr ""
 "Es wurde keine Wallet gefunden. Wurde gerade erst gestartet? Es kann bis "
 "zu 10 min dauern"
 
-#: templates/wallet.html:176
+#: templates/wallet.html:180
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1022,45 +1023,45 @@ msgstr ""
 msgid "Disk Space Free (GB)"
 msgstr ""
 
-#: templates/worker_launch.html:50 templates/worker_launch.html:640
-#: templates/worker_launch.html:669
+#: templates/worker_launch.html:50 templates/worker_launch.html:642
+#: templates/worker_launch.html:671
 msgid "Host Path"
 msgstr "Host Pfad"
 
-#: templates/worker_launch.html:55 templates/worker_launch.html:645
-#: templates/worker_launch.html:674
+#: templates/worker_launch.html:55 templates/worker_launch.html:647
+#: templates/worker_launch.html:676
 msgid "Container Path"
 msgstr "Container Pfad"
 
-#: templates/worker_launch.html:60 templates/worker_launch.html:650
-#: templates/worker_launch.html:679
+#: templates/worker_launch.html:60 templates/worker_launch.html:652
+#: templates/worker_launch.html:681
 msgid "Used for:"
 msgstr "Benutzt für:"
 
-#: templates/worker_launch.html:63 templates/worker_launch.html:653
-#: templates/worker_launch.html:682
+#: templates/worker_launch.html:63 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
 msgid "Final Plots"
 msgstr "Finale Plots"
 
-#: templates/worker_launch.html:64 templates/worker_launch.html:654
-#: templates/worker_launch.html:683
+#: templates/worker_launch.html:64 templates/worker_launch.html:656
+#: templates/worker_launch.html:685
 msgid "Plotting Temp"
 msgstr ""
 
-#: templates/worker_launch.html:65 templates/worker_launch.html:655
-#: templates/worker_launch.html:684
+#: templates/worker_launch.html:65 templates/worker_launch.html:657
+#: templates/worker_launch.html:686
 msgid "Other"
 msgstr "Andere"
 
-#: templates/worker_launch.html:69 templates/worker_launch.html:659
+#: templates/worker_launch.html:69 templates/worker_launch.html:661
 msgid "Location"
 msgstr "Ort"
 
-#: templates/worker_launch.html:72 templates/worker_launch.html:662
+#: templates/worker_launch.html:72 templates/worker_launch.html:664
 msgid "Local"
 msgstr ""
 
-#: templates/worker_launch.html:73 templates/worker_launch.html:663
+#: templates/worker_launch.html:73 templates/worker_launch.html:665
 msgid "Remote"
 msgstr ""
 
@@ -1068,51 +1069,51 @@ msgstr ""
 msgid "Unknown blockchain fork of selected:"
 msgstr "Unbekannter Blockschain Fork der ausgewählten:"
 
-#: templates/worker_launch.html:284
+#: templates/worker_launch.html:285
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
 msgstr "Der Worker Hostname fehlt. Bitte einen kurzen Namen vergeben"
 
-#: templates/worker_launch.html:304
+#: templates/worker_launch.html:305
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
 msgstr "Der Host pfad endet mit einem Komma. Versuche es mit Slash wie hier"
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Empty host path provided for volume at "
 msgstr "Leerer Host Pfad für Volumen "
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Please provide a host path."
 msgstr "Bitte Hostpfad angeben"
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Empty container path provided for volume at "
 msgstr "Leerer container Pfad für Volumen "
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Please provide a container path."
 msgstr "Bitte Containerpfad angeben"
 
-#: templates/worker_launch.html:355
+#: templates/worker_launch.html:356
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
 msgstr ""
 "Weder Harvester noch Plotter Modus ausgewählt. Bitte einen oder beide "
 "wählen"
 
-#: templates/worker_launch.html:361
+#: templates/worker_launch.html:362
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
 msgstr "Worker IP Adresse fehlt"
 
-#: templates/worker_launch.html:411
+#: templates/worker_launch.html:413
 msgid "Machinaris Worker - Launch Config"
 msgstr "Machinaris Worker - Configuration starten"
 
-#: templates/worker_launch.html:412
+#: templates/worker_launch.html:414
 msgid ""
 "Complete the form below to run new harvesters/plotters on other computers"
 " across your network. Save the generated docker-compose.yml file to a "
@@ -1122,95 +1123,95 @@ msgstr ""
 "Um die Harvester/Plotter auf einem anderen System laufen zu lassen,bitte "
 "folgendes ausfüllen"
 
-#: templates/worker_launch.html:416
+#: templates/worker_launch.html:418
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: templates/worker_launch.html:422
+#: templates/worker_launch.html:424
 msgid "Linux"
 msgstr ""
 
-#: templates/worker_launch.html:429
+#: templates/worker_launch.html:431
 msgid "Macintosh"
 msgstr ""
 
-#: templates/worker_launch.html:436
+#: templates/worker_launch.html:438
 msgid "Windows"
 msgstr ""
 
-#: templates/worker_launch.html:442
+#: templates/worker_launch.html:444
 msgid "Machinaris Mode"
 msgstr "Machinaris Modus"
 
-#: templates/worker_launch.html:448
+#: templates/worker_launch.html:450
 msgid "Harvester"
 msgstr ""
 
-#: templates/worker_launch.html:455
+#: templates/worker_launch.html:457
 msgid "Plotter"
 msgstr ""
 
-#: templates/worker_launch.html:463
+#: templates/worker_launch.html:465
 msgid "Farmer Public Key"
 msgstr ""
 
-#: templates/worker_launch.html:468
+#: templates/worker_launch.html:470
 msgid "Pool Public Key"
 msgstr ""
 
-#: templates/worker_launch.html:473
+#: templates/worker_launch.html:475
 msgid "Pool Contract Address"
 msgstr ""
 
-#: templates/worker_launch.html:478
+#: templates/worker_launch.html:480
 msgid "Plot on Startup"
 msgstr ""
 
-#: templates/worker_launch.html:484
+#: templates/worker_launch.html:486
 msgid "True"
 msgstr ""
 
-#: templates/worker_launch.html:491
+#: templates/worker_launch.html:493
 msgid "False"
 msgstr ""
 
-#: templates/worker_launch.html:499
+#: templates/worker_launch.html:501
 msgid "Controller IP Address"
 msgstr ""
 
-#: templates/worker_launch.html:504
+#: templates/worker_launch.html:506
 msgid "Controller API Port"
 msgstr ""
 
-#: templates/worker_launch.html:511
+#: templates/worker_launch.html:513
 msgid "Worker Hostname"
 msgstr ""
 
-#: templates/worker_launch.html:516
+#: templates/worker_launch.html:518
 msgid "Worker IP Address"
 msgstr "Worker IP Adresse"
 
-#: templates/worker_launch.html:523
+#: templates/worker_launch.html:525
 msgid "Blockchains to Farm"
 msgstr "Gefarmte Blockchains"
 
-#: templates/worker_launch.html:636
+#: templates/worker_launch.html:638
 msgid "Volume Mounts"
 msgstr ""
 
-#: templates/worker_launch.html:693
+#: templates/worker_launch.html:695
 msgid "Add New Volume"
 msgstr "Neues Volumen hinzufügen"
 
-#: templates/worker_launch.html:695
+#: templates/worker_launch.html:697
 msgid "Remove Last Volume"
 msgstr "Letztes Volumen entfernen"
 
-#: templates/worker_launch.html:702
+#: templates/worker_launch.html:704
 msgid "Copy"
 msgstr "Kopieren"
 
-#: templates/worker_launch.html:706
+#: templates/worker_launch.html:708
 msgid "Docker Compose"
 msgstr ""
 
@@ -1226,6 +1227,10 @@ msgstr "Letzter Ping"
 msgid "Last Successful Ping"
 msgstr "Letzter erfolgreicher Ping"
 
+#: templates/workers.html:49
+msgid "Logs"
+msgstr ""
+
 #: templates/workers.html:94
 msgid "Prune Selected"
 msgstr "Entferne ausgewählte"
@@ -1294,6 +1299,14 @@ msgstr ""
 "Bitte überprüfe ob der Container der entsprechenden Blockchain "
 "läuft.Überprüfe auch die Einstellung der Benachrichtigungen"
 
+#: templates/farming/workers.html:80 templates/index/index.html:176
+msgid "Previous"
+msgstr "Vorherige"
+
+#: templates/farming/workers.html:84 templates/index/index.html:180
+msgid "Next"
+msgstr "Nächste"
+
 #: templates/farming/workers.html:94
 #, python-format
 msgid ""
@@ -1303,6 +1316,69 @@ msgid ""
 "worker is reporting into the controller on the Workers page."
 msgstr ""
 
+#: templates/index/chart_balances.html:85 templates/index/chart_farmed.html:131
+#: templates/index/chart_netspace.html:91
+#: templates/index/chart_plot_count.html:84
+#: templates/index/chart_plots_size.html:84 templates/plotting/jobs.html:285
+#: templates/views/index_script_block.js:90
+msgid "Date"
+msgstr ""
+
+#: templates/index/chart_balances.html:102
+#: templates/index/chart_farmed.html:148
+#: templates/views/index_script_block.js:107
+msgid "Coins"
+msgstr ""
+
+#: templates/index/chart_farmed.html:48 templates/index/index.html:97
+msgid "Farmed Blocks"
+msgstr ""
+
+#: templates/index/chart_farmed.html:53
+msgid "Plot File"
+msgstr ""
+
+#: templates/index/chart_farmed.html:54
+msgid "Farmed Block"
+msgstr ""
+
+#: templates/index/chart_farmed.html:55
+#, fuzzy
+msgid "Farmed At"
+msgstr "Erfarmt"
+
+#: templates/index/chart_plot_count.html:101 templates/index/index.html:70
+msgid "Plot Count"
+msgstr ""
+
+#: templates/index/index.html:30
+msgid "Expected Time to Win"
+msgstr "Erwartete TTW"
+
+#: templates/index/index.html:73
+msgid "Total Plots"
+msgstr "Gesamte Plots"
+
+#: templates/index/index.html:81
+msgid "Total Plots Size"
+msgstr "Gesamte Plot Größe"
+
+#: templates/index/index.html:101
+msgid "Farmed"
+msgstr "Erfarmt"
+
+#: templates/index/index.html:111
+msgid "Netspace"
+msgstr ""
+
+#: templates/index/index.html:144
+msgid "Challenges from Harvesters"
+msgstr "Challenges der Harvester"
+
+#: templates/index/index.html:162
+msgid "Partial Proofs for Pools"
+msgstr "Partial Proofs der Pools"
+
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
 msgstr "Bestätige Abbruch"
@@ -1396,10 +1472,6 @@ msgstr "ausgewählte wiederaufnehmen"
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr ""
 
-#: templates/plotting/jobs.html:285
-msgid "Date"
-msgstr ""
-
 #: templates/plotting/jobs.html:302
 msgid "Time (minutes)"
 msgstr ""
@@ -1455,7 +1527,7 @@ msgid "Archiving is disabled.  See Settings | Plotting page."
 msgstr "Archivierung ist ausgeschaltet"
 
 #: templates/plotting/workers.html:256
-#: templates/views/index_script_block.js:152
+#: templates/views/index_script_block.js:232
 msgid "Time - Last 24 Hours"
 msgstr ""
 
@@ -1543,15 +1615,15 @@ msgstr "Speichern..."
 msgid "PlotNFT Log on "
 msgstr "PlotNFT Login"
 
-#: templates/views/index_script_block.js:85
+#: templates/views/index_script_block.js:163
 msgid "Time - Recent"
 msgstr ""
 
-#: templates/views/index_script_block.js:102
+#: templates/views/index_script_block.js:180
 msgid "Time Taken (seconds)"
 msgstr ""
 
-#: templates/views/index_script_block.js:169
+#: templates/views/index_script_block.js:249
 msgid "Partials Submitted"
 msgstr ""
 
diff --git a/web/translations/fr_FR/LC_MESSAGES/messages.po b/web/translations/fr_FR/LC_MESSAGES/messages.po
index b5c84544..1575d98f 100644
--- a/web/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/web/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: FULL NAME\n"
 "Language: fr\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.1\n"
 
-#: routes.py:90 routes.py:233
+#: routes.py:113 routes.py:256
 msgid "Saved local currency setting."
 msgstr "Paramètre de devise locale enregistré."
 
-#: routes.py:110
+#: routes.py:133
 msgid "Blockchain download"
 msgstr "Télécharger le blockchain"
 
-#: routes.py:142
+#: routes.py:165
 msgid "Unknown plotting form"
 msgstr "Forme inconnue"
 
-#: routes.py:192
+#: routes.py:215
 msgid "Error! Please see logs."
 msgstr "Erreur! Veuillez consulter les journaux."
 
-#: routes.py:218
+#: routes.py:241
 msgid "Unknown alerts form"
 msgstr "Forme inconnue"
 
-#: routes.py:238
+#: routes.py:261
 msgid "Saved cold wallet addresses."
 msgstr "Adresses de portefeuille froid enregistrées."
 
-#: routes.py:306
+#: routes.py:329
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
@@ -50,11 +50,11 @@ msgstr ""
 "Paramètres de cartographie enregistrés. Veuillez patienter 10 minutes "
 "pour générer l'emplacementinformations pour la carte."
 
-#: routes.py:314
+#: routes.py:337
 msgid "Unknown form action"
 msgstr "Action inconnue"
 
-#: routes.py:420
+#: routes.py:443
 #, python-format
 msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
@@ -63,7 +63,7 @@ msgstr ""
 "Aucun travailleur %(worker)s pour la blockchain %(blockchain)s. Veuillez "
 "sélectionner une autre blockchain."
 
-#: routes.py:426
+#: routes.py:449
 #, python-format
 msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
@@ -72,7 +72,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour notifier %(blockchain)s. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:431
+#: routes.py:454
 #, python-format
 msgid ""
 "For Farming config, found no responding fullnode found for "
@@ -81,7 +81,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour cultiver %(blockchain)s. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:438
+#: routes.py:461
 #, python-format
 msgid ""
 "For Plotting config, found no responding fullnode found for "
@@ -90,7 +90,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour parceller %(blockchain)s. "
 "Veuillez vérifier vos travailleurs."
 
-#: routes.py:443
+#: routes.py:466
 #, python-format
 msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
@@ -99,7 +99,7 @@ msgstr ""
 "Aucun fullnode répondant n'a été trouvé pour %(blockchain)s. Veuillez "
 "vérifier vos travailleurs."
 
-#: routes.py:462
+#: routes.py:485
 msgid "Unsupported log type"
 msgstr "Type de journal non pris en charge"
 
@@ -130,7 +130,8 @@ msgid "Idle"
 msgstr "Inactif"
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:211
-#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+#: models/plotman.py:67 templates/index/index.html:42
+#: templates/index/index.html:52
 msgid "Active"
 msgstr "Sauvegarder"
 
@@ -138,19 +139,46 @@ msgstr "Sauvegarder"
 msgid "Suspended"
 msgstr "Suspendu"
 
-#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
-#: actions/stats.py:110
+#: actions/stats.py:57 actions/stats.py:92 actions/stats.py:109
+#: actions/stats.py:130 actions/stats.py:132
 msgid "in last day."
 msgstr "au dernier jour."
 
-#: actions/stats.py:338
+#: actions/stats.py:360
 msgid "secs"
 msgstr "secs"
 
-#: actions/stats.py:348 models/chia.py:251
+#: actions/stats.py:370 models/chia.py:251
 msgid "hour"
 msgstr "heure"
 
+#: actions/stats.py:399 templates/views/index_script_block.js:51
+msgid "Farmed Coins"
+msgstr ""
+
+#: actions/stats.py:416
+#, fuzzy
+msgid "Wallet Balances"
+msgstr "Solde du portefeuille"
+
+#: actions/stats.py:433 templates/index/index.html:105
+#, fuzzy
+msgid "Netspace Size"
+msgstr "Netspace"
+
+#: actions/stats.py:434 actions/stats.py:492
+msgid "Size"
+msgstr ""
+
+#: actions/stats.py:472
+msgid "Plot Counts"
+msgstr ""
+
+#: actions/stats.py:491 templates/index/index.html:78
+#, fuzzy
+msgid "Plots Size"
+msgstr "Taille totale des plots"
+
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
 msgstr "Ignorer l'avertissement"
@@ -201,11 +229,11 @@ msgstr ""
 msgid "days"
 msgstr "jours"
 
-#: models/chia.py:213 templates/summary.html:100 templates/wallet.html:128
+#: models/chia.py:213 templates/summary.html:105 templates/wallet.html:129
 msgid "Syncing"
 msgstr "Synchronisation"
 
-#: models/chia.py:215 templates/index.html:54
+#: models/chia.py:215 templates/index/index.html:54
 msgid "Not available"
 msgstr "Indisponible"
 
@@ -213,9 +241,10 @@ msgstr "Indisponible"
 msgid "Not synced"
 msgstr "Non synchronisé"
 
-#: models/chia.py:220 templates/index.html:54 templates/plotting/jobs.html:114
-#: templates/plotting/workers.html:116 templates/summary.html:96
-#: templates/wallet.html:124 templates/worker.html:78 templates/workers.html:72
+#: models/chia.py:220 templates/index/index.html:54
+#: templates/plotting/jobs.html:114 templates/plotting/workers.html:116
+#: templates/summary.html:101 templates/wallet.html:125
+#: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr "Hors ligne"
 
@@ -276,16 +305,16 @@ msgid "Alerts: Recent Notifications"
 msgstr "Alertes: notifications récentes"
 
 #: templates/alerts.html:72 templates/drives.html:86
-#: templates/settings/alerts.html:36 templates/settings/farming.html:37
-#: templates/settings/plotting.html:37 templates/settings/tools.html:36
-#: templates/worker.html:14
+#: templates/index/chart_farmed.html:52 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
 msgstr "Worker"
 
-#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/alerts.html:73 templates/blockchains.html:35
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/summary.html:77 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr "Blockchain"
@@ -355,17 +384,17 @@ msgstr "Machinaris"
 msgid "Summary"
 msgstr "Résumé"
 
-#: templates/base.html:38 templates/base.html:113 templates/index.html:41
+#: templates/base.html:38 templates/base.html:113 templates/index/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr "Plotting"
 
-#: templates/base.html:44 templates/base.html:107 templates/index.html:50
+#: templates/base.html:44 templates/base.html:107 templates/index/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr "Farming"
 
-#: templates/base.html:50
+#: templates/base.html:50 templates/index/index.html:126
 msgid "Wallets"
 msgstr "Portefeuilles"
 
@@ -392,7 +421,7 @@ msgstr "Pools"
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/plotting/workers.html:96 templates/summary.html:81
 #: templates/workers.html:14
 msgid "Workers"
 msgstr "Workers"
@@ -452,46 +481,51 @@ msgstr "Madmax"
 msgid "Plotman"
 msgstr "Plotman"
 
-#: templates/blockchains.html:23
+#: templates/blockchains.html:27
 msgid "Blockchain Summary"
 msgstr "Blockchain"
 
-#: templates/blockchains.html:32 templates/drives.html:91
-#: templates/summary.html:74 templates/wallet.html:109
+#: templates/blockchains.html:36 templates/drives.html:91
+#: templates/summary.html:78 templates/wallet.html:109
 msgid "Status"
 msgstr "Statut"
 
-#: templates/blockchains.html:33
+#: templates/blockchains.html:37
 msgid "Peak Height"
 msgstr "Hauteur maximale"
 
-#: templates/blockchains.html:34
+#: templates/blockchains.html:38
 msgid "Peak Time"
 msgstr "Heure de pointe"
 
-#: templates/blockchains.html:35 templates/drives.html:93
+#: templates/blockchains.html:39 templates/drives.html:93
 #: templates/wallet.html:114
 msgid "Updated At"
 msgstr "Mis à jour à"
 
-#: templates/blockchains.html:36 templates/summary.html:87
-#: templates/workers.html:49
-msgid "Logs"
-msgstr "Journaux"
+#: templates/blockchains.html:63
+#, fuzzy
+msgid "View Blockchain Details"
+msgstr "Détails de le blockchain"
 
-#: templates/blockchains.html:66
+#: templates/blockchains.html:65 templates/blockchains.html:79
 msgid "Blockchain Details"
 msgstr "Détails de le blockchain"
 
-#: templates/blockchains.html:91
+#: templates/blockchains.html:69 templates/summary.html:126
+#, fuzzy
+msgid "View Blockchain Log"
+msgstr "Télécharger le blockchain"
+
+#: templates/blockchains.html:104
 msgid "No blockchains found from any farmers. Not added?"
 msgstr "Aucune blockchain trouvée chez les farmers. Pas ajouté?"
 
-#: templates/blockchains.html:92
+#: templates/blockchains.html:105
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr "Essayez d'exécuter \"chia show --state\" sur vos farmers pour vérifier."
 
-#: templates/blockchains.html:106 templates/summary.html:143
+#: templates/blockchains.html:119 templates/summary.html:152
 msgid "Fullnode Log for "
 msgstr ""
 
@@ -666,46 +700,6 @@ msgstr ""
 "Pour en savoir plus, consultez le "
 "%(wiki_link_open)swiki%(wiki_link_close)s Machinaris."
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr "Temps prévu pour gagner"
-
-#: templates/index.html:72
-msgid "Total Plots"
-msgstr "Plots totales"
-
-#: templates/index.html:79
-msgid "Total Plots Size"
-msgstr "Taille totale des plots"
-
-#: templates/index.html:89 templates/wallet.html:113
-msgid "Balance"
-msgstr "Total"
-
-#: templates/index.html:96
-msgid "Farmed"
-msgstr "Farmed"
-
-#: templates/index.html:105
-msgid "Netspace"
-msgstr "Netspace"
-
-#: templates/index.html:120
-msgid "Challenges from Harvesters"
-msgstr "Défis des moissonneurs"
-
-#: templates/index.html:136
-msgid "Partial Proofs for Pools"
-msgstr "Preuves partielles pour les pools"
-
-#: templates/farming/workers.html:80 templates/index.html:147
-msgid "Previous"
-msgstr "Précédent"
-
-#: templates/farming/workers.html:84 templates/index.html:151
-msgid "Next"
-msgstr "Suivant"
-
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
 msgstr ""
@@ -876,48 +870,53 @@ msgstr ""
 msgid "Local Currency:"
 msgstr "Monnaie locale:"
 
-#: templates/summary.html:75
+#: templates/summary.html:79
 msgid "Height"
 msgstr "Hauteur"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:76
+#: templates/summary.html:80
 msgid "Plots"
 msgstr "Plots"
 
-#: templates/summary.html:78
+#: templates/summary.html:82
 msgid "Max Resp."
 msgstr "Resp. Max"
 
-#: templates/summary.html:79
+#: templates/summary.html:83
 msgid "Partials"
 msgstr "Partiels"
 
-#: templates/summary.html:80
+#: templates/summary.html:84
 msgid "ETW"
 msgstr "ETW"
 
-#: templates/summary.html:82
+#: templates/summary.html:86
 msgid "Wallet"
 msgstr "Portefeuille"
 
-#: templates/summary.html:83 templates/summary.html:84
+#: templates/summary.html:87 templates/summary.html:88
 msgid "EDV"
 msgstr "EDV"
 
-#: templates/summary.html:98 templates/wallet.html:126
+#: templates/summary.html:103 templates/wallet.html:127
 msgid "Synced"
 msgstr "Synchronisé"
 
-#: templates/summary.html:102 templates/wallet.html:130
+#: templates/summary.html:107 templates/wallet.html:131
 msgid "Not Synced"
 msgstr "Non synchronisé"
 
-#: templates/summary.html:128
+#: templates/summary.html:123 templates/wallet.html:142
+#, fuzzy
+msgid "Chart Wallet"
+msgstr "Modifier le portefeuille"
+
+#: templates/summary.html:137
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr "Aucune blockchain trouvée chez les farmers. Pas ajouté?"
 
-#: templates/summary.html:129
+#: templates/summary.html:138
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Veuillez prévoir au moins 15 minutes pour que les blockchains commencent."
 
@@ -933,7 +932,7 @@ msgstr "Adresse du portefeuille froid:"
 msgid "Wallet Summary"
 msgstr "Résumé quotidien"
 
-#: templates/wallet.html:110
+#: templates/index/index.html:89 templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr "Solde du portefeuille"
 
@@ -941,19 +940,23 @@ msgstr "Solde du portefeuille"
 msgid "Cold Wallet Balance"
 msgstr "Solde de portefeuille froid"
 
-#: templates/wallet.html:112
+#: templates/views/index_script_block.js:56 templates/wallet.html:112
 msgid "Total Balance"
 msgstr "Solde total"
 
-#: templates/wallet.html:140
+#: templates/index/index.html:92 templates/wallet.html:113
+msgid "Balance"
+msgstr "Total"
+
+#: templates/wallet.html:144
 msgid "Edit Wallet"
 msgstr "Modifier le portefeuille"
 
-#: templates/wallet.html:151
+#: templates/wallet.html:155
 msgid "Wallet Details"
 msgstr "Détails du portefeuille"
 
-#: templates/wallet.html:175
+#: templates/wallet.html:179
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -961,7 +964,7 @@ msgstr ""
 "Aucun statut de portefeuille reçu. Peut-être que vous venez juste de "
 "commencer? Veuillez autoriser au moins 10 minutes pour mettre à jour."
 
-#: templates/wallet.html:176
+#: templates/wallet.html:180
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1047,45 +1050,45 @@ msgstr "Espace disque utilisé (GB)"
 msgid "Disk Space Free (GB)"
 msgstr "Espace disque libre (GB)"
 
-#: templates/worker_launch.html:50 templates/worker_launch.html:640
-#: templates/worker_launch.html:669
+#: templates/worker_launch.html:50 templates/worker_launch.html:642
+#: templates/worker_launch.html:671
 msgid "Host Path"
 msgstr "Chemin de l'hôte"
 
-#: templates/worker_launch.html:55 templates/worker_launch.html:645
-#: templates/worker_launch.html:674
+#: templates/worker_launch.html:55 templates/worker_launch.html:647
+#: templates/worker_launch.html:676
 msgid "Container Path"
 msgstr "Chemin du conteneur"
 
-#: templates/worker_launch.html:60 templates/worker_launch.html:650
-#: templates/worker_launch.html:679
+#: templates/worker_launch.html:60 templates/worker_launch.html:652
+#: templates/worker_launch.html:681
 msgid "Used for:"
 msgstr "Utilisé pour:"
 
-#: templates/worker_launch.html:63 templates/worker_launch.html:653
-#: templates/worker_launch.html:682
+#: templates/worker_launch.html:63 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
 msgid "Final Plots"
 msgstr "Plots finale"
 
-#: templates/worker_launch.html:64 templates/worker_launch.html:654
-#: templates/worker_launch.html:683
+#: templates/worker_launch.html:64 templates/worker_launch.html:656
+#: templates/worker_launch.html:685
 msgid "Plotting Temp"
 msgstr "Plotting Temporaire"
 
-#: templates/worker_launch.html:65 templates/worker_launch.html:655
-#: templates/worker_launch.html:684
+#: templates/worker_launch.html:65 templates/worker_launch.html:657
+#: templates/worker_launch.html:686
 msgid "Other"
 msgstr "Autre"
 
-#: templates/worker_launch.html:69 templates/worker_launch.html:659
+#: templates/worker_launch.html:69 templates/worker_launch.html:661
 msgid "Location"
 msgstr "Location"
 
-#: templates/worker_launch.html:72 templates/worker_launch.html:662
+#: templates/worker_launch.html:72 templates/worker_launch.html:664
 msgid "Local"
 msgstr "Local"
 
-#: templates/worker_launch.html:73 templates/worker_launch.html:663
+#: templates/worker_launch.html:73 templates/worker_launch.html:665
 msgid "Remote"
 msgstr "À distance"
 
@@ -1093,7 +1096,7 @@ msgstr "À distance"
 msgid "Unknown blockchain fork of selected:"
 msgstr "Blockchain inconnue de la sélection:"
 
-#: templates/worker_launch.html:284
+#: templates/worker_launch.html:285
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
@@ -1101,7 +1104,7 @@ msgstr ""
 "Nom d'hôte du worker de calcul manquant. Veuillez fournir un nom court "
 "pour identifier votre ouvrier."
 
-#: templates/worker_launch.html:304
+#: templates/worker_launch.html:305
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
@@ -1109,29 +1112,29 @@ msgstr ""
 "Chemin d'hôte non valide se terminant par deux-points. Essayez d'ajouter "
 "une barre oblique à la fin comme ce"
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Empty host path provided for volume at "
 msgstr "Chemin d'hôte vide fourni pour le volume à"
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Please provide a host path."
 msgstr "Veuillez fournir un chemin d'accès à l'hôte."
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Empty container path provided for volume at "
 msgstr "Chemin de conteneur vide fourni pour le volume à "
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Please provide a container path."
 msgstr "Veuillez fournir un chemin de conteneur."
 
-#: templates/worker_launch.html:355
+#: templates/worker_launch.html:356
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
 msgstr ""
 "Aucun mode Harvester ou Plotter n'est sélectionné. Veuillez en choisir un"
 " ou les deux."
 
-#: templates/worker_launch.html:361
+#: templates/worker_launch.html:362
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
@@ -1139,11 +1142,11 @@ msgstr ""
 "Adresse IP du worker manquante. Veuillez fournir l'adresse IP que le "
 "contrôleur se connecter à pour les commandes."
 
-#: templates/worker_launch.html:411
+#: templates/worker_launch.html:413
 msgid "Machinaris Worker - Launch Config"
 msgstr "Machinaris Worker - Lancer la configuration"
 
-#: templates/worker_launch.html:412
+#: templates/worker_launch.html:414
 msgid ""
 "Complete the form below to run new harvesters/plotters on other computers"
 " across your network. Save the generated docker-compose.yml file to a "
@@ -1156,95 +1159,95 @@ msgstr ""
 "\"machinaris\", puis exécutez \"docker-compose up\" à partir d'un "
 "coquille."
 
-#: templates/worker_launch.html:416
+#: templates/worker_launch.html:418
 msgid "Operating System"
 msgstr "Système opérateur"
 
-#: templates/worker_launch.html:422
+#: templates/worker_launch.html:424
 msgid "Linux"
 msgstr "Linux"
 
-#: templates/worker_launch.html:429
+#: templates/worker_launch.html:431
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: templates/worker_launch.html:436
+#: templates/worker_launch.html:438
 msgid "Windows"
 msgstr "Windows"
 
-#: templates/worker_launch.html:442
+#: templates/worker_launch.html:444
 msgid "Machinaris Mode"
 msgstr "Mode Machinaris"
 
-#: templates/worker_launch.html:448
+#: templates/worker_launch.html:450
 msgid "Harvester"
 msgstr "Harvester"
 
-#: templates/worker_launch.html:455
+#: templates/worker_launch.html:457
 msgid "Plotter"
 msgstr "Plotter"
 
-#: templates/worker_launch.html:463
+#: templates/worker_launch.html:465
 msgid "Farmer Public Key"
 msgstr "Clé publique de farmer"
 
-#: templates/worker_launch.html:468
+#: templates/worker_launch.html:470
 msgid "Pool Public Key"
 msgstr "Clé publique de pool"
 
-#: templates/worker_launch.html:473
+#: templates/worker_launch.html:475
 msgid "Pool Contract Address"
 msgstr "Adresse du contrat de pool"
 
-#: templates/worker_launch.html:478
+#: templates/worker_launch.html:480
 msgid "Plot on Startup"
 msgstr "Plot au démarrage"
 
-#: templates/worker_launch.html:484
+#: templates/worker_launch.html:486
 msgid "True"
 msgstr "Vrai"
 
-#: templates/worker_launch.html:491
+#: templates/worker_launch.html:493
 msgid "False"
 msgstr "Faux"
 
-#: templates/worker_launch.html:499
+#: templates/worker_launch.html:501
 msgid "Controller IP Address"
 msgstr "Adresse IP du contrôleur"
 
-#: templates/worker_launch.html:504
+#: templates/worker_launch.html:506
 msgid "Controller API Port"
 msgstr "Port API du contrôleur"
 
-#: templates/worker_launch.html:511
+#: templates/worker_launch.html:513
 msgid "Worker Hostname"
 msgstr "Nom d'hôte du worker"
 
-#: templates/worker_launch.html:516
+#: templates/worker_launch.html:518
 msgid "Worker IP Address"
 msgstr "Adresse IP du worker"
 
-#: templates/worker_launch.html:523
+#: templates/worker_launch.html:525
 msgid "Blockchains to Farm"
 msgstr "Blockchains a Farm"
 
-#: templates/worker_launch.html:636
+#: templates/worker_launch.html:638
 msgid "Volume Mounts"
 msgstr "Montages de volume"
 
-#: templates/worker_launch.html:693
+#: templates/worker_launch.html:695
 msgid "Add New Volume"
 msgstr "Ajouter un nouveau volume"
 
-#: templates/worker_launch.html:695
+#: templates/worker_launch.html:697
 msgid "Remove Last Volume"
 msgstr "Supprimer le dernier volume"
 
-#: templates/worker_launch.html:702
+#: templates/worker_launch.html:704
 msgid "Copy"
 msgstr "Copie"
 
-#: templates/worker_launch.html:706
+#: templates/worker_launch.html:708
 msgid "Docker Compose"
 msgstr "Docker Compose"
 
@@ -1260,6 +1263,10 @@ msgstr "Dernier ping"
 msgid "Last Successful Ping"
 msgstr "Dernier ping réussi"
 
+#: templates/workers.html:49
+msgid "Logs"
+msgstr "Journaux"
+
 #: templates/workers.html:94
 msgid "Prune Selected"
 msgstr "Taille sélectionnée"
@@ -1329,6 +1336,14 @@ msgstr ""
 "est en cours d'exécution. Veuillez également vérifier les paramètres sur "
 "la page Alertes."
 
+#: templates/farming/workers.html:80 templates/index/index.html:176
+msgid "Previous"
+msgstr "Précédent"
+
+#: templates/farming/workers.html:84 templates/index/index.html:180
+msgid "Next"
+msgstr "Suivant"
+
 #: templates/farming/workers.html:94
 #, python-format
 msgid ""
@@ -1343,6 +1358,69 @@ msgstr ""
 " Assurez-vous également que le worker Chia fait rapport au contrôleur sur"
 " la page Workers."
 
+#: templates/index/chart_balances.html:85 templates/index/chart_farmed.html:131
+#: templates/index/chart_netspace.html:91
+#: templates/index/chart_plot_count.html:84
+#: templates/index/chart_plots_size.html:84 templates/plotting/jobs.html:285
+#: templates/views/index_script_block.js:90
+msgid "Date"
+msgstr "Date"
+
+#: templates/index/chart_balances.html:102
+#: templates/index/chart_farmed.html:148
+#: templates/views/index_script_block.js:107
+msgid "Coins"
+msgstr ""
+
+#: templates/index/chart_farmed.html:48 templates/index/index.html:97
+msgid "Farmed Blocks"
+msgstr ""
+
+#: templates/index/chart_farmed.html:53
+msgid "Plot File"
+msgstr ""
+
+#: templates/index/chart_farmed.html:54
+msgid "Farmed Block"
+msgstr ""
+
+#: templates/index/chart_farmed.html:55
+#, fuzzy
+msgid "Farmed At"
+msgstr "Farmed"
+
+#: templates/index/chart_plot_count.html:101 templates/index/index.html:70
+msgid "Plot Count"
+msgstr ""
+
+#: templates/index/index.html:30
+msgid "Expected Time to Win"
+msgstr "Temps prévu pour gagner"
+
+#: templates/index/index.html:73
+msgid "Total Plots"
+msgstr "Plots totales"
+
+#: templates/index/index.html:81
+msgid "Total Plots Size"
+msgstr "Taille totale des plots"
+
+#: templates/index/index.html:101
+msgid "Farmed"
+msgstr "Farmed"
+
+#: templates/index/index.html:111
+msgid "Netspace"
+msgstr "Netspace"
+
+#: templates/index/index.html:144
+msgid "Challenges from Harvesters"
+msgstr "Défis des moissonneurs"
+
+#: templates/index/index.html:162
+msgid "Partial Proofs for Pools"
+msgstr "Preuves partielles pour les pools"
+
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
 msgstr "Confirmer tuer"
@@ -1447,10 +1525,6 @@ msgstr "Continuer la sélection"
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr "Vitesse de Plotting - k%(k_size)s Plots"
 
-#: templates/plotting/jobs.html:285
-msgid "Date"
-msgstr "Date"
-
 #: templates/plotting/jobs.html:302
 msgid "Time (minutes)"
 msgstr "Temps (minutes)"
@@ -1515,7 +1589,7 @@ msgid "Archiving is disabled.  See Settings | Plotting page."
 msgstr "L'archivage est désactivé. Voir page Paramètres | Traçage."
 
 #: templates/plotting/workers.html:256
-#: templates/views/index_script_block.js:152
+#: templates/views/index_script_block.js:232
 msgid "Time - Last 24 Hours"
 msgstr "Heure - Dernières 24 heures"
 
@@ -1609,15 +1683,15 @@ msgstr "Commencer..."
 msgid "PlotNFT Log on "
 msgstr "Journaux PlotNFT de"
 
-#: templates/views/index_script_block.js:85
+#: templates/views/index_script_block.js:163
 msgid "Time - Recent"
 msgstr "Heure - Récent"
 
-#: templates/views/index_script_block.js:102
+#: templates/views/index_script_block.js:180
 msgid "Time Taken (seconds)"
 msgstr "Temps pris (secondes)"
 
-#: templates/views/index_script_block.js:169
+#: templates/views/index_script_block.js:249
 msgid "Partials Submitted"
 msgstr "Partiels soumis"
 
diff --git a/web/translations/it_IT/LC_MESSAGES/messages.po b/web/translations/it_IT/LC_MESSAGES/messages.po
index 700fdf53..ef60cc2f 100644
--- a/web/translations/it_IT/LC_MESSAGES/messages.po
+++ b/web/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-15 10:14-0700\n"
 "Last-Translator: Fabrizio Cacicia\n"
 "Language: it\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.1\n"
 
-#: routes.py:90 routes.py:233
+#: routes.py:113 routes.py:256
 msgid "Saved local currency setting."
 msgstr "Impostazione valuta locale salvata."
 
-#: routes.py:110
+#: routes.py:133
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:142
+#: routes.py:165
 msgid "Unknown plotting form"
 msgstr "Formato plotting sconosciuto"
 
-#: routes.py:192
+#: routes.py:215
 msgid "Error! Please see logs."
 msgstr "Errore! Controlla i logs."
 
-#: routes.py:218
+#: routes.py:241
 msgid "Unknown alerts form"
 msgstr "Formato avvisi sconosciuto"
 
-#: routes.py:238
+#: routes.py:261
 msgid "Saved cold wallet addresses."
 msgstr "Indirizzi cold wallet salvati."
 
-#: routes.py:306
+#: routes.py:329
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
@@ -50,11 +50,11 @@ msgstr ""
 "Impostazioni salvate. Attendi 10 minuti affinché le informazioni vengano "
 "generate."
 
-#: routes.py:314
+#: routes.py:337
 msgid "Unknown form action"
 msgstr "Azione sconosciuta."
 
-#: routes.py:420
+#: routes.py:443
 #, python-format
 msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
@@ -63,7 +63,7 @@ msgstr ""
 "Nessun worker in %(worker)s per la blockchain %(blockchain)s. Scegli "
 "un'altra blockchain."
 
-#: routes.py:426
+#: routes.py:449
 #, python-format
 msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
@@ -72,7 +72,7 @@ msgstr ""
 "Per le configurazioni degli Avvisi, non è stato trovato alcun fullnode "
 "per %(blockchain)s. Controlla i tuoi worker."
 
-#: routes.py:431
+#: routes.py:454
 #, python-format
 msgid ""
 "For Farming config, found no responding fullnode found for "
@@ -81,7 +81,7 @@ msgstr ""
 "Per le configurazioni del Farming, non è stato trovato alcun fullnode per"
 " %(blockchain)s. Controlla i tuoi worker."
 
-#: routes.py:438
+#: routes.py:461
 #, python-format
 msgid ""
 "For Plotting config, found no responding fullnode found for "
@@ -90,7 +90,7 @@ msgstr ""
 "Per le configurazioni del Plotting, non è stato trovato alcun fullnode "
 "per %(blockchain)s. Controlla i tuoi worker."
 
-#: routes.py:443
+#: routes.py:466
 #, python-format
 msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
@@ -99,7 +99,7 @@ msgstr ""
 "Non è stato trovato alcun fullnode che risponden per %(blockchain)s. "
 "Controlla i tuoi workers."
 
-#: routes.py:462
+#: routes.py:485
 msgid "Unsupported log type"
 msgstr "Formato log non supportato"
 
@@ -132,7 +132,8 @@ msgid "Idle"
 msgstr "Inattivo"
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:211
-#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+#: models/plotman.py:67 templates/index/index.html:42
+#: templates/index/index.html:52
 msgid "Active"
 msgstr "Attivo"
 
@@ -140,19 +141,46 @@ msgstr "Attivo"
 msgid "Suspended"
 msgstr "Sospeso"
 
-#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
-#: actions/stats.py:110
+#: actions/stats.py:57 actions/stats.py:92 actions/stats.py:109
+#: actions/stats.py:130 actions/stats.py:132
 msgid "in last day."
 msgstr "nell'ultimo giorno."
 
-#: actions/stats.py:338
+#: actions/stats.py:360
 msgid "secs"
 msgstr "secondi"
 
-#: actions/stats.py:348 models/chia.py:251
+#: actions/stats.py:370 models/chia.py:251
 msgid "hour"
 msgstr "ora"
 
+#: actions/stats.py:399 templates/views/index_script_block.js:51
+msgid "Farmed Coins"
+msgstr ""
+
+#: actions/stats.py:416
+#, fuzzy
+msgid "Wallet Balances"
+msgstr "Saldo portafoglio"
+
+#: actions/stats.py:433 templates/index/index.html:105
+#, fuzzy
+msgid "Netspace Size"
+msgstr "Spazio Rete"
+
+#: actions/stats.py:434 actions/stats.py:492
+msgid "Size"
+msgstr ""
+
+#: actions/stats.py:472
+msgid "Plot Counts"
+msgstr ""
+
+#: actions/stats.py:491 templates/index/index.html:78
+#, fuzzy
+msgid "Plots Size"
+msgstr "Dimensione Totale PLots"
+
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
 msgstr "Ignora Avvertenza"
@@ -199,11 +227,11 @@ msgstr "Usa una versione di Machinaris coerente per evitare problemi."
 msgid "days"
 msgstr "giorni"
 
-#: models/chia.py:213 templates/summary.html:100 templates/wallet.html:128
+#: models/chia.py:213 templates/summary.html:105 templates/wallet.html:129
 msgid "Syncing"
 msgstr "Sincronizzazione"
 
-#: models/chia.py:215 templates/index.html:54
+#: models/chia.py:215 templates/index/index.html:54
 msgid "Not available"
 msgstr "Non disponibile"
 
@@ -211,9 +239,10 @@ msgstr "Non disponibile"
 msgid "Not synced"
 msgstr "non sincronizzato"
 
-#: models/chia.py:220 templates/index.html:54 templates/plotting/jobs.html:114
-#: templates/plotting/workers.html:116 templates/summary.html:96
-#: templates/wallet.html:124 templates/worker.html:78 templates/workers.html:72
+#: models/chia.py:220 templates/index/index.html:54
+#: templates/plotting/jobs.html:114 templates/plotting/workers.html:116
+#: templates/summary.html:101 templates/wallet.html:125
+#: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
@@ -274,16 +303,16 @@ msgid "Alerts: Recent Notifications"
 msgstr "Avvisi: Notifiche Recenti"
 
 #: templates/alerts.html:72 templates/drives.html:86
-#: templates/settings/alerts.html:36 templates/settings/farming.html:37
-#: templates/settings/plotting.html:37 templates/settings/tools.html:36
-#: templates/worker.html:14
+#: templates/index/chart_farmed.html:52 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
 msgstr ""
 
-#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/alerts.html:73 templates/blockchains.html:35
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/summary.html:77 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -353,17 +382,17 @@ msgstr ""
 msgid "Summary"
 msgstr "Riepilogo"
 
-#: templates/base.html:38 templates/base.html:113 templates/index.html:41
+#: templates/base.html:38 templates/base.html:113 templates/index/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:44 templates/base.html:107 templates/index.html:50
+#: templates/base.html:44 templates/base.html:107 templates/index/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:50
+#: templates/base.html:50 templates/index/index.html:126
 msgid "Wallets"
 msgstr "Portafogli"
 
@@ -390,7 +419,7 @@ msgstr ""
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/plotting/workers.html:96 templates/summary.html:81
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
@@ -450,46 +479,50 @@ msgstr ""
 msgid "Plotman"
 msgstr ""
 
-#: templates/blockchains.html:23
+#: templates/blockchains.html:27
 msgid "Blockchain Summary"
 msgstr "Riepilogo Blockchain"
 
-#: templates/blockchains.html:32 templates/drives.html:91
-#: templates/summary.html:74 templates/wallet.html:109
+#: templates/blockchains.html:36 templates/drives.html:91
+#: templates/summary.html:78 templates/wallet.html:109
 msgid "Status"
 msgstr "Stato"
 
-#: templates/blockchains.html:33
+#: templates/blockchains.html:37
 msgid "Peak Height"
 msgstr ""
 
-#: templates/blockchains.html:34
+#: templates/blockchains.html:38
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/drives.html:93
+#: templates/blockchains.html:39 templates/drives.html:93
 #: templates/wallet.html:114
 msgid "Updated At"
 msgstr "Aggiornato a"
 
-#: templates/blockchains.html:36 templates/summary.html:87
-#: templates/workers.html:49
-msgid "Logs"
-msgstr ""
+#: templates/blockchains.html:63
+#, fuzzy
+msgid "View Blockchain Details"
+msgstr "Dettagli Blockchain"
 
-#: templates/blockchains.html:66
+#: templates/blockchains.html:65 templates/blockchains.html:79
 msgid "Blockchain Details"
 msgstr "Dettagli Blockchain"
 
-#: templates/blockchains.html:91
+#: templates/blockchains.html:69 templates/summary.html:126
+msgid "View Blockchain Log"
+msgstr ""
+
+#: templates/blockchains.html:104
 msgid "No blockchains found from any farmers. Not added?"
 msgstr "Nessuna blockchain trovata da nessun farmer. Non ancora aggiunte?"
 
-#: templates/blockchains.html:92
+#: templates/blockchains.html:105
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr "Prova ad eseguire \"chia show --state\" sui tuoi farmer per verificare."
 
-#: templates/blockchains.html:106 templates/summary.html:143
+#: templates/blockchains.html:119 templates/summary.html:152
 msgid "Fullnode Log for "
 msgstr ""
 
@@ -667,46 +700,6 @@ msgstr ""
 "Per maggiori informazioni, guarda "
 "%(wiki_link_open)swiki%(wiki_link_close)s."
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr "Tempo Previsto per Vincere"
-
-#: templates/index.html:72
-msgid "Total Plots"
-msgstr "Plots Totali"
-
-#: templates/index.html:79
-msgid "Total Plots Size"
-msgstr "Dimensione Totale PLots"
-
-#: templates/index.html:89 templates/wallet.html:113
-msgid "Balance"
-msgstr "Saldo"
-
-#: templates/index.html:96
-msgid "Farmed"
-msgstr "Farmati"
-
-#: templates/index.html:105
-msgid "Netspace"
-msgstr "Spazio Rete"
-
-#: templates/index.html:120
-msgid "Challenges from Harvesters"
-msgstr "Challenges per Harvester"
-
-#: templates/index.html:136
-msgid "Partial Proofs for Pools"
-msgstr "Partial Proofs per Pool"
-
-#: templates/farming/workers.html:80 templates/index.html:147
-msgid "Previous"
-msgstr "Precedente"
-
-#: templates/farming/workers.html:84 templates/index.html:151
-msgid "Next"
-msgstr "Successivo"
-
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
 msgstr "NOTA: Machinaris non mostrerà mai la tua chiave privata qui."
@@ -876,48 +869,53 @@ msgstr ""
 msgid "Local Currency:"
 msgstr "Valuta Locale:"
 
-#: templates/summary.html:75
+#: templates/summary.html:79
 msgid "Height"
 msgstr "Altezza"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:76
+#: templates/summary.html:80
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:78
+#: templates/summary.html:82
 msgid "Max Resp."
 msgstr "Max Risp."
 
-#: templates/summary.html:79
+#: templates/summary.html:83
 msgid "Partials"
 msgstr "Parziali"
 
-#: templates/summary.html:80
+#: templates/summary.html:84
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:82
+#: templates/summary.html:86
 msgid "Wallet"
 msgstr "Portafogli"
 
-#: templates/summary.html:83 templates/summary.html:84
+#: templates/summary.html:87 templates/summary.html:88
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:98 templates/wallet.html:126
+#: templates/summary.html:103 templates/wallet.html:127
 msgid "Synced"
 msgstr "Sincronizzato"
 
-#: templates/summary.html:102 templates/wallet.html:130
+#: templates/summary.html:107 templates/wallet.html:131
 msgid "Not Synced"
 msgstr "Non Sincronizzato"
 
-#: templates/summary.html:128
+#: templates/summary.html:123 templates/wallet.html:142
+#, fuzzy
+msgid "Chart Wallet"
+msgstr "Modifica Portafoglio"
+
+#: templates/summary.html:137
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr "Nessuna blockchain trovata da nessun farmer. Hai appena avviato?"
 
-#: templates/summary.html:129
+#: templates/summary.html:138
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Attendi almeno 15 minuti affinché le blockchain si avviino."
 
@@ -933,7 +931,7 @@ msgstr "Indirizzo Cold Wallet:"
 msgid "Wallet Summary"
 msgstr "Riepilogo Portafoglio"
 
-#: templates/wallet.html:110
+#: templates/index/index.html:89 templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr "Saldo portafoglio"
 
@@ -941,19 +939,23 @@ msgstr "Saldo portafoglio"
 msgid "Cold Wallet Balance"
 msgstr "Saldo Cold Wallet"
 
-#: templates/wallet.html:112
+#: templates/views/index_script_block.js:56 templates/wallet.html:112
 msgid "Total Balance"
 msgstr "Saldo Totale"
 
-#: templates/wallet.html:140
+#: templates/index/index.html:92 templates/wallet.html:113
+msgid "Balance"
+msgstr "Saldo"
+
+#: templates/wallet.html:144
 msgid "Edit Wallet"
 msgstr "Modifica Portafoglio"
 
-#: templates/wallet.html:151
+#: templates/wallet.html:155
 msgid "Wallet Details"
 msgstr "Dettagli Portafoglio"
 
-#: templates/wallet.html:175
+#: templates/wallet.html:179
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -961,7 +963,7 @@ msgstr ""
 "Stato del portafogli non ricevuto. Forse hai appena avviato? Attendi "
 "almeno 10 minuti affinché si aggiorni."
 
-#: templates/wallet.html:176
+#: templates/wallet.html:180
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1049,46 +1051,46 @@ msgstr "Spazio Usato su Disco (GB)"
 msgid "Disk Space Free (GB)"
 msgstr "Spazio Libero su Disco (GB)"
 
-#: templates/worker_launch.html:50 templates/worker_launch.html:640
-#: templates/worker_launch.html:669
+#: templates/worker_launch.html:50 templates/worker_launch.html:642
+#: templates/worker_launch.html:671
 msgid "Host Path"
 msgstr "Percorso Host"
 
-#: templates/worker_launch.html:55 templates/worker_launch.html:645
-#: templates/worker_launch.html:674
+#: templates/worker_launch.html:55 templates/worker_launch.html:647
+#: templates/worker_launch.html:676
 msgid "Container Path"
 msgstr "Percorso Container"
 
-#: templates/worker_launch.html:60 templates/worker_launch.html:650
-#: templates/worker_launch.html:679
+#: templates/worker_launch.html:60 templates/worker_launch.html:652
+#: templates/worker_launch.html:681
 msgid "Used for:"
 msgstr "Usato per:"
 
-#: templates/worker_launch.html:63 templates/worker_launch.html:653
-#: templates/worker_launch.html:682
+#: templates/worker_launch.html:63 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
 msgid "Final Plots"
 msgstr "Plots Completati"
 
-#: templates/worker_launch.html:64 templates/worker_launch.html:654
-#: templates/worker_launch.html:683
+#: templates/worker_launch.html:64 templates/worker_launch.html:656
+#: templates/worker_launch.html:685
 msgid "Plotting Temp"
 msgstr "Plotting"
 
-#: templates/worker_launch.html:65 templates/worker_launch.html:655
-#: templates/worker_launch.html:684
+#: templates/worker_launch.html:65 templates/worker_launch.html:657
+#: templates/worker_launch.html:686
 msgid "Other"
 msgstr "Altro"
 
-#: templates/worker_launch.html:69 templates/worker_launch.html:659
+#: templates/worker_launch.html:69 templates/worker_launch.html:661
 #, fuzzy
 msgid "Location"
 msgstr "Notifica"
 
-#: templates/worker_launch.html:72 templates/worker_launch.html:662
+#: templates/worker_launch.html:72 templates/worker_launch.html:664
 msgid "Local"
 msgstr ""
 
-#: templates/worker_launch.html:73 templates/worker_launch.html:663
+#: templates/worker_launch.html:73 templates/worker_launch.html:665
 msgid "Remote"
 msgstr ""
 
@@ -1096,7 +1098,7 @@ msgstr ""
 msgid "Unknown blockchain fork of selected:"
 msgstr "Fork sconosciuto per:"
 
-#: templates/worker_launch.html:284
+#: templates/worker_launch.html:285
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
@@ -1104,7 +1106,7 @@ msgstr ""
 "Nome host del worker mancante. Fornisci un nome breve per identificare il"
 " tuo worker."
 
-#: templates/worker_launch.html:304
+#: templates/worker_launch.html:305
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
@@ -1112,29 +1114,29 @@ msgstr ""
 "Percorso host non valido, non può finire con i due punti. Prova ad "
 "aggiungere uno slash alla fine, in questo modo"
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Empty host path provided for volume at "
 msgstr "Hai fornito un percorso host vuoto per il volume a "
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Please provide a host path."
 msgstr "Fornisci un percorso host."
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Empty container path provided for volume at "
 msgstr "Hai fornito un percorso container vuoto per il volume a "
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Please provide a container path."
 msgstr "Fornisci un percorso container."
 
-#: templates/worker_launch.html:355
+#: templates/worker_launch.html:356
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
 msgstr ""
 "Non hai selezionato né modalità Harvester né plotter. Scegline una o "
 "entrambe."
 
-#: templates/worker_launch.html:361
+#: templates/worker_launch.html:362
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
@@ -1142,11 +1144,11 @@ msgstr ""
 "Indirizzo IP worker mancante. Fornisci l'indirizzo IP a cui il controller"
 " si connetterà per i comandi."
 
-#: templates/worker_launch.html:411
+#: templates/worker_launch.html:413
 msgid "Machinaris Worker - Launch Config"
 msgstr "Machinaris Worker - Avvia Configurazione"
 
-#: templates/worker_launch.html:412
+#: templates/worker_launch.html:414
 msgid ""
 "Complete the form below to run new harvesters/plotters on other computers"
 " across your network. Save the generated docker-compose.yml file to a "
@@ -1158,95 +1160,95 @@ msgstr ""
 "cartella chiamata \"machinaris\", ed esegui il comando \"docker-compose "
 "up\" dalla shell."
 
-#: templates/worker_launch.html:416
+#: templates/worker_launch.html:418
 msgid "Operating System"
 msgstr "Sistema Operativo"
 
-#: templates/worker_launch.html:422
+#: templates/worker_launch.html:424
 msgid "Linux"
 msgstr ""
 
-#: templates/worker_launch.html:429
+#: templates/worker_launch.html:431
 msgid "Macintosh"
 msgstr ""
 
-#: templates/worker_launch.html:436
+#: templates/worker_launch.html:438
 msgid "Windows"
 msgstr ""
 
-#: templates/worker_launch.html:442
+#: templates/worker_launch.html:444
 msgid "Machinaris Mode"
 msgstr "Modalità"
 
-#: templates/worker_launch.html:448
+#: templates/worker_launch.html:450
 msgid "Harvester"
 msgstr ""
 
-#: templates/worker_launch.html:455
+#: templates/worker_launch.html:457
 msgid "Plotter"
 msgstr ""
 
-#: templates/worker_launch.html:463
+#: templates/worker_launch.html:465
 msgid "Farmer Public Key"
 msgstr "Chiave Pubblica Farmer"
 
-#: templates/worker_launch.html:468
+#: templates/worker_launch.html:470
 msgid "Pool Public Key"
 msgstr "Chiave Pubblica Pool"
 
-#: templates/worker_launch.html:473
+#: templates/worker_launch.html:475
 msgid "Pool Contract Address"
 msgstr ""
 
-#: templates/worker_launch.html:478
+#: templates/worker_launch.html:480
 msgid "Plot on Startup"
 msgstr "Plotta all'avvio"
 
-#: templates/worker_launch.html:484
+#: templates/worker_launch.html:486
 msgid "True"
 msgstr "Vero"
 
-#: templates/worker_launch.html:491
+#: templates/worker_launch.html:493
 msgid "False"
 msgstr "Falso"
 
-#: templates/worker_launch.html:499
+#: templates/worker_launch.html:501
 msgid "Controller IP Address"
 msgstr "Indirizzo IP Controller"
 
-#: templates/worker_launch.html:504
+#: templates/worker_launch.html:506
 msgid "Controller API Port"
 msgstr "Porta API Controller"
 
-#: templates/worker_launch.html:511
+#: templates/worker_launch.html:513
 msgid "Worker Hostname"
 msgstr "Nome host Worker"
 
-#: templates/worker_launch.html:516
+#: templates/worker_launch.html:518
 msgid "Worker IP Address"
 msgstr "Indirizzo IP Worker"
 
-#: templates/worker_launch.html:523
+#: templates/worker_launch.html:525
 msgid "Blockchains to Farm"
 msgstr "Blockchains da Farmare"
 
-#: templates/worker_launch.html:636
+#: templates/worker_launch.html:638
 msgid "Volume Mounts"
 msgstr "Volumi da Montare"
 
-#: templates/worker_launch.html:693
+#: templates/worker_launch.html:695
 msgid "Add New Volume"
 msgstr "Aggiungi Nuovo Volume"
 
-#: templates/worker_launch.html:695
+#: templates/worker_launch.html:697
 msgid "Remove Last Volume"
 msgstr "Rimuovi Ultimo Volume"
 
-#: templates/worker_launch.html:702
+#: templates/worker_launch.html:704
 msgid "Copy"
 msgstr "Copia"
 
-#: templates/worker_launch.html:706
+#: templates/worker_launch.html:708
 msgid "Docker Compose"
 msgstr ""
 
@@ -1262,6 +1264,10 @@ msgstr "Ultimo Ping"
 msgid "Last Successful Ping"
 msgstr "Ultimo Ping con successo"
 
+#: templates/workers.html:49
+msgid "Logs"
+msgstr ""
+
 #: templates/workers.html:94
 msgid "Prune Selected"
 msgstr "Togli Selezionati"
@@ -1332,6 +1338,14 @@ msgstr ""
 "Controlla che il Machinaris container per questa blockchain sia in "
 "esecuzione. Verifica inoltre le impostazioni nella pagina Avvisi."
 
+#: templates/farming/workers.html:80 templates/index/index.html:176
+msgid "Previous"
+msgstr "Precedente"
+
+#: templates/farming/workers.html:84 templates/index/index.html:180
+msgid "Next"
+msgstr "Successivo"
+
 #: templates/farming/workers.html:94
 #, python-format
 msgid ""
@@ -1346,6 +1360,69 @@ msgstr ""
 "Assicurati inoltre che il worker di Chia stia rispondendo nel controller "
 "dalla pagina Workers."
 
+#: templates/index/chart_balances.html:85 templates/index/chart_farmed.html:131
+#: templates/index/chart_netspace.html:91
+#: templates/index/chart_plot_count.html:84
+#: templates/index/chart_plots_size.html:84 templates/plotting/jobs.html:285
+#: templates/views/index_script_block.js:90
+msgid "Date"
+msgstr ""
+
+#: templates/index/chart_balances.html:102
+#: templates/index/chart_farmed.html:148
+#: templates/views/index_script_block.js:107
+msgid "Coins"
+msgstr ""
+
+#: templates/index/chart_farmed.html:48 templates/index/index.html:97
+msgid "Farmed Blocks"
+msgstr ""
+
+#: templates/index/chart_farmed.html:53
+msgid "Plot File"
+msgstr ""
+
+#: templates/index/chart_farmed.html:54
+msgid "Farmed Block"
+msgstr ""
+
+#: templates/index/chart_farmed.html:55
+#, fuzzy
+msgid "Farmed At"
+msgstr "Farmati"
+
+#: templates/index/chart_plot_count.html:101 templates/index/index.html:70
+msgid "Plot Count"
+msgstr ""
+
+#: templates/index/index.html:30
+msgid "Expected Time to Win"
+msgstr "Tempo Previsto per Vincere"
+
+#: templates/index/index.html:73
+msgid "Total Plots"
+msgstr "Plots Totali"
+
+#: templates/index/index.html:81
+msgid "Total Plots Size"
+msgstr "Dimensione Totale PLots"
+
+#: templates/index/index.html:101
+msgid "Farmed"
+msgstr "Farmati"
+
+#: templates/index/index.html:111
+msgid "Netspace"
+msgstr "Spazio Rete"
+
+#: templates/index/index.html:144
+msgid "Challenges from Harvesters"
+msgstr "Challenges per Harvester"
+
+#: templates/index/index.html:162
+msgid "Partial Proofs for Pools"
+msgstr "Partial Proofs per Pool"
+
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
 msgstr "Conferma Terminazione"
@@ -1451,10 +1528,6 @@ msgstr "Riprendi Selezionati"
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr "Velocità di Plotting - k%(k_size)s Plots"
 
-#: templates/plotting/jobs.html:285
-msgid "Date"
-msgstr ""
-
 #: templates/plotting/jobs.html:302
 msgid "Time (minutes)"
 msgstr ""
@@ -1522,7 +1595,7 @@ msgstr ""
 "Plotting\"."
 
 #: templates/plotting/workers.html:256
-#: templates/views/index_script_block.js:152
+#: templates/views/index_script_block.js:232
 msgid "Time - Last 24 Hours"
 msgstr ""
 
@@ -1616,15 +1689,15 @@ msgstr "Salvataggio in corso..."
 msgid "PlotNFT Log on "
 msgstr ""
 
-#: templates/views/index_script_block.js:85
+#: templates/views/index_script_block.js:163
 msgid "Time - Recent"
 msgstr ""
 
-#: templates/views/index_script_block.js:102
+#: templates/views/index_script_block.js:180
 msgid "Time Taken (seconds)"
 msgstr ""
 
-#: templates/views/index_script_block.js:169
+#: templates/views/index_script_block.js:249
 msgid "Partials Submitted"
 msgstr ""
 
diff --git a/web/translations/nl_NL/LC_MESSAGES/messages.po b/web/translations/nl_NL/LC_MESSAGES/messages.po
index 75b827cc..d2d56e14 100644
--- a/web/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/web/translations/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-03-13 10:29-0600\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
 "Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.1\n"
 
-#: routes.py:90 routes.py:233
+#: routes.py:113 routes.py:256
 msgid "Saved local currency setting."
 msgstr "Lokale munt instelling opgeslagen."
 
-#: routes.py:110
+#: routes.py:133
 msgid "Blockchain download"
 msgstr "Blockchain download"
 
-#: routes.py:142
+#: routes.py:165
 msgid "Unknown plotting form"
 msgstr "Ongekend plottingformaat"
 
-#: routes.py:192
+#: routes.py:215
 msgid "Error! Please see logs."
 msgstr "Error! Controleer de logs."
 
-#: routes.py:218
+#: routes.py:241
 msgid "Unknown alerts form"
 msgstr "Ongekend waarschuwingsformaat"
 
-#: routes.py:238
+#: routes.py:261
 msgid "Saved cold wallet addresses."
 msgstr "Adres koude portefeuille opgeslagen."
 
-#: routes.py:306
+#: routes.py:329
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
@@ -50,11 +50,11 @@ msgstr ""
 "Kaart instellingen opgeslagen. Wacht 10 minuten terwijl lokatie "
 "informatie voor de kaart wordt gegenereerd."
 
-#: routes.py:314
+#: routes.py:337
 msgid "Unknown form action"
 msgstr "Ongekende formulier actie"
 
-#: routes.py:420
+#: routes.py:443
 #, python-format
 msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
@@ -63,7 +63,7 @@ msgstr ""
 "Geen werker op %(worker)s voor blockchain %(blockchain)s. Gelieve een "
 "ander blockchain te kiezen."
 
-#: routes.py:426
+#: routes.py:449
 #, python-format
 msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
@@ -72,7 +72,7 @@ msgstr ""
 "Voor Waarschuwingsconfiguratie, geen reagerende fullnode voor "
 "%(blockchain)s gevonden. Gelieve uw werkers te controleren."
 
-#: routes.py:431
+#: routes.py:454
 #, python-format
 msgid ""
 "For Farming config, found no responding fullnode found for "
@@ -81,7 +81,7 @@ msgstr ""
 "Voor Farming configuratie, geen reagerende fullnode voor %(blockchain)s "
 "gevonden. Gelieve uw werkers te controleren."
 
-#: routes.py:438
+#: routes.py:461
 #, python-format
 msgid ""
 "For Plotting config, found no responding fullnode found for "
@@ -90,7 +90,7 @@ msgstr ""
 "Voor Plotting configuratie, geen reagerende fullnode gevonden voor "
 "%(blockchain)s. Gelieve uw werkers te controleren."
 
-#: routes.py:443
+#: routes.py:466
 #, python-format
 msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
@@ -99,7 +99,7 @@ msgstr ""
 "Geen reagerende fullnode gevonden voor %(blockchain)s. Gelieve uw werkers"
 " te controleren."
 
-#: routes.py:462
+#: routes.py:485
 msgid "Unsupported log type"
 msgstr "Log type niet ondersteund"
 
@@ -130,7 +130,8 @@ msgid "Idle"
 msgstr "Inactief"
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:211
-#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+#: models/plotman.py:67 templates/index/index.html:42
+#: templates/index/index.html:52
 msgid "Active"
 msgstr "Actief"
 
@@ -138,19 +139,46 @@ msgstr "Actief"
 msgid "Suspended"
 msgstr "Opgeschort"
 
-#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
-#: actions/stats.py:110
+#: actions/stats.py:57 actions/stats.py:92 actions/stats.py:109
+#: actions/stats.py:130 actions/stats.py:132
 msgid "in last day."
 msgstr "in voorbije dag."
 
-#: actions/stats.py:338
+#: actions/stats.py:360
 msgid "secs"
 msgstr "seconden"
 
-#: actions/stats.py:348 models/chia.py:251
+#: actions/stats.py:370 models/chia.py:251
 msgid "hour"
 msgstr "uur"
 
+#: actions/stats.py:399 templates/views/index_script_block.js:51
+msgid "Farmed Coins"
+msgstr ""
+
+#: actions/stats.py:416
+#, fuzzy
+msgid "Wallet Balances"
+msgstr "Saldo Portefeuille"
+
+#: actions/stats.py:433 templates/index/index.html:105
+#, fuzzy
+msgid "Netspace Size"
+msgstr "Netgrootte"
+
+#: actions/stats.py:434 actions/stats.py:492
+msgid "Size"
+msgstr ""
+
+#: actions/stats.py:472
+msgid "Plot Counts"
+msgstr ""
+
+#: actions/stats.py:491 templates/index/index.html:78
+#, fuzzy
+msgid "Plots Size"
+msgstr "Totale Omvang Plots"
+
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
 msgstr "Verwerp waarschuwing"
@@ -197,11 +225,11 @@ msgstr "Om problemen te voorkomen gebruik een consistente Machinaris versie."
 msgid "days"
 msgstr "dagen"
 
-#: models/chia.py:213 templates/summary.html:100 templates/wallet.html:128
+#: models/chia.py:213 templates/summary.html:105 templates/wallet.html:129
 msgid "Syncing"
 msgstr "Synchronisatie"
 
-#: models/chia.py:215 templates/index.html:54
+#: models/chia.py:215 templates/index/index.html:54
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
@@ -209,9 +237,10 @@ msgstr "Niet beschikbaar"
 msgid "Not synced"
 msgstr "Niet gesynchroniseerd"
 
-#: models/chia.py:220 templates/index.html:54 templates/plotting/jobs.html:114
-#: templates/plotting/workers.html:116 templates/summary.html:96
-#: templates/wallet.html:124 templates/worker.html:78 templates/workers.html:72
+#: models/chia.py:220 templates/index/index.html:54
+#: templates/plotting/jobs.html:114 templates/plotting/workers.html:116
+#: templates/summary.html:101 templates/wallet.html:125
+#: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr "Offline"
 
@@ -272,16 +301,16 @@ msgid "Alerts: Recent Notifications"
 msgstr "Waarschuwingen: Recente notificaties"
 
 #: templates/alerts.html:72 templates/drives.html:86
-#: templates/settings/alerts.html:36 templates/settings/farming.html:37
-#: templates/settings/plotting.html:37 templates/settings/tools.html:36
-#: templates/worker.html:14
+#: templates/index/chart_farmed.html:52 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
 msgstr "Werker"
 
-#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/alerts.html:73 templates/blockchains.html:35
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/summary.html:77 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr "Blockchain"
@@ -351,17 +380,17 @@ msgstr "Marchinaris"
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: templates/base.html:38 templates/base.html:113 templates/index.html:41
+#: templates/base.html:38 templates/base.html:113 templates/index/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr "Plotting"
 
-#: templates/base.html:44 templates/base.html:107 templates/index.html:50
+#: templates/base.html:44 templates/base.html:107 templates/index/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr "Farming"
 
-#: templates/base.html:50
+#: templates/base.html:50 templates/index/index.html:126
 msgid "Wallets"
 msgstr "Portefeuilles"
 
@@ -388,7 +417,7 @@ msgstr "Pools"
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/plotting/workers.html:96 templates/summary.html:81
 #: templates/workers.html:14
 msgid "Workers"
 msgstr "Werkers"
@@ -448,48 +477,53 @@ msgstr "Madmax"
 msgid "Plotman"
 msgstr "Plotman"
 
-#: templates/blockchains.html:23
+#: templates/blockchains.html:27
 msgid "Blockchain Summary"
 msgstr "Blockchain Samenvatting"
 
-#: templates/blockchains.html:32 templates/drives.html:91
-#: templates/summary.html:74 templates/wallet.html:109
+#: templates/blockchains.html:36 templates/drives.html:91
+#: templates/summary.html:78 templates/wallet.html:109
 msgid "Status"
 msgstr "Status"
 
-#: templates/blockchains.html:33
+#: templates/blockchains.html:37
 msgid "Peak Height"
 msgstr "Piek Hoogte"
 
-#: templates/blockchains.html:34
+#: templates/blockchains.html:38
 msgid "Peak Time"
 msgstr "Piek Tijd"
 
-#: templates/blockchains.html:35 templates/drives.html:93
+#: templates/blockchains.html:39 templates/drives.html:93
 #: templates/wallet.html:114
 msgid "Updated At"
 msgstr "Bijgewerkt om"
 
-#: templates/blockchains.html:36 templates/summary.html:87
-#: templates/workers.html:49
-msgid "Logs"
-msgstr "Logs"
+#: templates/blockchains.html:63
+#, fuzzy
+msgid "View Blockchain Details"
+msgstr "Blockchain Details"
 
-#: templates/blockchains.html:66
+#: templates/blockchains.html:65 templates/blockchains.html:79
 msgid "Blockchain Details"
 msgstr "Blockchain Details"
 
-#: templates/blockchains.html:91
+#: templates/blockchains.html:69 templates/summary.html:126
+#, fuzzy
+msgid "View Blockchain Log"
+msgstr "Blockchain download"
+
+#: templates/blockchains.html:104
 msgid "No blockchains found from any farmers. Not added?"
 msgstr "Geen blockchains gevonden in uw farmers. Niet toegevoegd?"
 
-#: templates/blockchains.html:92
+#: templates/blockchains.html:105
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr ""
 "Probeer \"chia show --state\" uit te voeren op uw farmers om te "
 "controleren."
 
-#: templates/blockchains.html:106 templates/summary.html:143
+#: templates/blockchains.html:119 templates/summary.html:152
 msgid "Fullnode Log for "
 msgstr ""
 
@@ -663,46 +697,6 @@ msgstr ""
 "Voor meer info, zie de Machinaris "
 "%(wiki_link_open)swiki%(wiki_link_close)s."
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr "Verwachte Tijd om te Winnen"
-
-#: templates/index.html:72
-msgid "Total Plots"
-msgstr "Totaal Aantal Plots"
-
-#: templates/index.html:79
-msgid "Total Plots Size"
-msgstr "Totale Omvang Plots"
-
-#: templates/index.html:89 templates/wallet.html:113
-msgid "Balance"
-msgstr "Saldo"
-
-#: templates/index.html:96
-msgid "Farmed"
-msgstr "Farmed"
-
-#: templates/index.html:105
-msgid "Netspace"
-msgstr "Netgrootte"
-
-#: templates/index.html:120
-msgid "Challenges from Harvesters"
-msgstr "Uitdagingen van Harvesters"
-
-#: templates/index.html:136
-msgid "Partial Proofs for Pools"
-msgstr "Gedeeltelijke bewijzen voor Pools"
-
-#: templates/farming/workers.html:80 templates/index.html:147
-msgid "Previous"
-msgstr "Vorige"
-
-#: templates/farming/workers.html:84 templates/index.html:151
-msgid "Next"
-msgstr "Volgende"
-
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
 msgstr "NOTA: Machinaris zal hier nooit uw private sleutels tonen."
@@ -874,48 +868,53 @@ msgstr ""
 msgid "Local Currency:"
 msgstr "Lokale Munt:"
 
-#: templates/summary.html:75
+#: templates/summary.html:79
 msgid "Height"
 msgstr "Hoogte"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:76
+#: templates/summary.html:80
 msgid "Plots"
 msgstr "Plots"
 
-#: templates/summary.html:78
+#: templates/summary.html:82
 msgid "Max Resp."
 msgstr "Max Resp."
 
-#: templates/summary.html:79
+#: templates/summary.html:83
 msgid "Partials"
 msgstr "Partials"
 
-#: templates/summary.html:80
+#: templates/summary.html:84
 msgid "ETW"
 msgstr "ETW"
 
-#: templates/summary.html:82
+#: templates/summary.html:86
 msgid "Wallet"
 msgstr "Portefeuille"
 
-#: templates/summary.html:83 templates/summary.html:84
+#: templates/summary.html:87 templates/summary.html:88
 msgid "EDV"
 msgstr "EDV"
 
-#: templates/summary.html:98 templates/wallet.html:126
+#: templates/summary.html:103 templates/wallet.html:127
 msgid "Synced"
 msgstr "Gesynchroniseerd"
 
-#: templates/summary.html:102 templates/wallet.html:130
+#: templates/summary.html:107 templates/wallet.html:131
 msgid "Not Synced"
 msgstr "Niet Gesynchroniseerd"
 
-#: templates/summary.html:128
+#: templates/summary.html:123 templates/wallet.html:142
+#, fuzzy
+msgid "Chart Wallet"
+msgstr "Wijzig Portefeuille"
+
+#: templates/summary.html:137
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr "Geen blockchains gevonden in uw farmers. Nog aan het opstarten?"
 
-#: templates/summary.html:129
+#: templates/summary.html:138
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Wacht minstens 15 minuten terwijl de blockchains opstarten."
 
@@ -931,7 +930,7 @@ msgstr "Adres Koude Portefeuille"
 msgid "Wallet Summary"
 msgstr "Portefeuille Samenvatting"
 
-#: templates/wallet.html:110
+#: templates/index/index.html:89 templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr "Saldo Portefeuille"
 
@@ -939,19 +938,23 @@ msgstr "Saldo Portefeuille"
 msgid "Cold Wallet Balance"
 msgstr "Saldo Koude Portefeuille"
 
-#: templates/wallet.html:112
+#: templates/views/index_script_block.js:56 templates/wallet.html:112
 msgid "Total Balance"
 msgstr "Totale Saldo"
 
-#: templates/wallet.html:140
+#: templates/index/index.html:92 templates/wallet.html:113
+msgid "Balance"
+msgstr "Saldo"
+
+#: templates/wallet.html:144
 msgid "Edit Wallet"
 msgstr "Wijzig Portefeuille"
 
-#: templates/wallet.html:151
+#: templates/wallet.html:155
 msgid "Wallet Details"
 msgstr "Portefeuille Details"
 
-#: templates/wallet.html:175
+#: templates/wallet.html:179
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -959,7 +962,7 @@ msgstr ""
 "Geen portefeuille status ontvangen. Nog aan het opstarten? Wacht minstens"
 " 10 minuten voor updates."
 
-#: templates/wallet.html:176
+#: templates/wallet.html:180
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1047,45 +1050,45 @@ msgstr "Gebruikte Schijfruimte (GB)"
 msgid "Disk Space Free (GB)"
 msgstr "Vrije Schijfruimte (GB)"
 
-#: templates/worker_launch.html:50 templates/worker_launch.html:640
-#: templates/worker_launch.html:669
+#: templates/worker_launch.html:50 templates/worker_launch.html:642
+#: templates/worker_launch.html:671
 msgid "Host Path"
 msgstr "Host Pad"
 
-#: templates/worker_launch.html:55 templates/worker_launch.html:645
-#: templates/worker_launch.html:674
+#: templates/worker_launch.html:55 templates/worker_launch.html:647
+#: templates/worker_launch.html:676
 msgid "Container Path"
 msgstr "Container Pad"
 
-#: templates/worker_launch.html:60 templates/worker_launch.html:650
-#: templates/worker_launch.html:679
+#: templates/worker_launch.html:60 templates/worker_launch.html:652
+#: templates/worker_launch.html:681
 msgid "Used for:"
 msgstr "Gebruikt voor:"
 
-#: templates/worker_launch.html:63 templates/worker_launch.html:653
-#: templates/worker_launch.html:682
+#: templates/worker_launch.html:63 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
 msgid "Final Plots"
 msgstr "Finale Plots"
 
-#: templates/worker_launch.html:64 templates/worker_launch.html:654
-#: templates/worker_launch.html:683
+#: templates/worker_launch.html:64 templates/worker_launch.html:656
+#: templates/worker_launch.html:685
 msgid "Plotting Temp"
 msgstr "Plotting Temp"
 
-#: templates/worker_launch.html:65 templates/worker_launch.html:655
-#: templates/worker_launch.html:684
+#: templates/worker_launch.html:65 templates/worker_launch.html:657
+#: templates/worker_launch.html:686
 msgid "Other"
 msgstr "Andere"
 
-#: templates/worker_launch.html:69 templates/worker_launch.html:659
+#: templates/worker_launch.html:69 templates/worker_launch.html:661
 msgid "Location"
 msgstr "Locatie"
 
-#: templates/worker_launch.html:72 templates/worker_launch.html:662
+#: templates/worker_launch.html:72 templates/worker_launch.html:664
 msgid "Local"
 msgstr "Lokaal"
 
-#: templates/worker_launch.html:73 templates/worker_launch.html:663
+#: templates/worker_launch.html:73 templates/worker_launch.html:665
 msgid "Remote"
 msgstr "Extern"
 
@@ -1093,7 +1096,7 @@ msgstr "Extern"
 msgid "Unknown blockchain fork of selected:"
 msgstr "Ongekende blockchain fork geselecteerd:"
 
-#: templates/worker_launch.html:284
+#: templates/worker_launch.html:285
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
@@ -1101,7 +1104,7 @@ msgstr ""
 "Ontbrekende werker hostname.  Geef een korte naam om uw werker mee te "
 "identificeren."
 
-#: templates/worker_launch.html:304
+#: templates/worker_launch.html:305
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
@@ -1109,27 +1112,27 @@ msgstr ""
 "Ongeldig pad eindigend met een dubbele punt. Probeer een slash toe te "
 "voegen aan het einde, als volgt"
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Empty host path provided for volume at "
 msgstr "Ongeldige host pad opgegeven voor volume op "
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Please provide a host path."
 msgstr "Gelieve een host pad op te geven."
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Empty container path provided for volume at "
 msgstr "Leeg container pad opgegeven voor volume op "
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Please provide a container path."
 msgstr "Gelieve een container pad op te geven."
 
-#: templates/worker_launch.html:355
+#: templates/worker_launch.html:356
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
 msgstr "Noch Harvester noch Plotter modus geselecteerd. Kies een of beide."
 
-#: templates/worker_launch.html:361
+#: templates/worker_launch.html:362
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
@@ -1137,11 +1140,11 @@ msgstr ""
 "Werker IP adres ontbreekt. Gelieve een IP op te geven waarmee de "
 "controller zal verbinden voor commandos."
 
-#: templates/worker_launch.html:411
+#: templates/worker_launch.html:413
 msgid "Machinaris Worker - Launch Config"
 msgstr "Machinaris werker - Lanceer Configuratie"
 
-#: templates/worker_launch.html:412
+#: templates/worker_launch.html:414
 msgid ""
 "Complete the form below to run new harvesters/plotters on other computers"
 " across your network. Save the generated docker-compose.yml file to a "
@@ -1153,95 +1156,95 @@ msgstr ""
 "compose.yml bestand op in een map genaamd \"machinaris\", en voer dan het"
 " commando \"docker-compose up\" uit via de commandoprompt."
 
-#: templates/worker_launch.html:416
+#: templates/worker_launch.html:418
 msgid "Operating System"
 msgstr "Besturingssysteem"
 
-#: templates/worker_launch.html:422
+#: templates/worker_launch.html:424
 msgid "Linux"
 msgstr "Linux"
 
-#: templates/worker_launch.html:429
+#: templates/worker_launch.html:431
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: templates/worker_launch.html:436
+#: templates/worker_launch.html:438
 msgid "Windows"
 msgstr "Windows"
 
-#: templates/worker_launch.html:442
+#: templates/worker_launch.html:444
 msgid "Machinaris Mode"
 msgstr "Machinaris Modus"
 
-#: templates/worker_launch.html:448
+#: templates/worker_launch.html:450
 msgid "Harvester"
 msgstr "Harvester"
 
-#: templates/worker_launch.html:455
+#: templates/worker_launch.html:457
 msgid "Plotter"
 msgstr "Plotter"
 
-#: templates/worker_launch.html:463
+#: templates/worker_launch.html:465
 msgid "Farmer Public Key"
 msgstr "Farmer publieke sleutel"
 
-#: templates/worker_launch.html:468
+#: templates/worker_launch.html:470
 msgid "Pool Public Key"
 msgstr "Pool publieke sleutel"
 
-#: templates/worker_launch.html:473
+#: templates/worker_launch.html:475
 msgid "Pool Contract Address"
 msgstr "Pool contract adres"
 
-#: templates/worker_launch.html:478
+#: templates/worker_launch.html:480
 msgid "Plot on Startup"
 msgstr "Plot on Startup"
 
-#: templates/worker_launch.html:484
+#: templates/worker_launch.html:486
 msgid "True"
 msgstr "True"
 
-#: templates/worker_launch.html:491
+#: templates/worker_launch.html:493
 msgid "False"
 msgstr "False"
 
-#: templates/worker_launch.html:499
+#: templates/worker_launch.html:501
 msgid "Controller IP Address"
 msgstr "Controller IP adres"
 
-#: templates/worker_launch.html:504
+#: templates/worker_launch.html:506
 msgid "Controller API Port"
 msgstr "Controller API poort"
 
-#: templates/worker_launch.html:511
+#: templates/worker_launch.html:513
 msgid "Worker Hostname"
 msgstr "Werker hostname"
 
-#: templates/worker_launch.html:516
+#: templates/worker_launch.html:518
 msgid "Worker IP Address"
 msgstr "Werker IP adres"
 
-#: templates/worker_launch.html:523
+#: templates/worker_launch.html:525
 msgid "Blockchains to Farm"
 msgstr "Blockchains to Farm"
 
-#: templates/worker_launch.html:636
+#: templates/worker_launch.html:638
 msgid "Volume Mounts"
 msgstr "Volume Mounts"
 
-#: templates/worker_launch.html:693
+#: templates/worker_launch.html:695
 msgid "Add New Volume"
 msgstr "Voeg nieuw volume toe"
 
-#: templates/worker_launch.html:695
+#: templates/worker_launch.html:697
 msgid "Remove Last Volume"
 msgstr "Verwijder laatste volume"
 
-#: templates/worker_launch.html:702
+#: templates/worker_launch.html:704
 msgid "Copy"
 msgstr "Kopieer"
 
-#: templates/worker_launch.html:706
+#: templates/worker_launch.html:708
 msgid "Docker Compose"
 msgstr "Docker Compose"
 
@@ -1257,6 +1260,10 @@ msgstr "Laatste ping"
 msgid "Last Successful Ping"
 msgstr "Laatste succesvolle ping"
 
+#: templates/workers.html:49
+msgid "Logs"
+msgstr "Logs"
+
 #: templates/workers.html:94
 msgid "Prune Selected"
 msgstr "Verwijder geselecteerde"
@@ -1325,6 +1332,14 @@ msgstr ""
 "Gelieve na te zien of uw Machinaris container voor deze blockchain actief"
 " is. Verifieer ook de instellingen op de pagina Waarschuwingen."
 
+#: templates/farming/workers.html:80 templates/index/index.html:176
+msgid "Previous"
+msgstr "Vorige"
+
+#: templates/farming/workers.html:84 templates/index/index.html:180
+msgid "Next"
+msgstr "Volgende"
+
 #: templates/farming/workers.html:94
 #, python-format
 msgid ""
@@ -1338,6 +1353,69 @@ msgstr ""
 "%(wiki_link_open)s geconfigureerd %(wiki_link_close)s. Verifieer ook op "
 "de Werkers pagina of de Chia werker rapporteert naar de controller."
 
+#: templates/index/chart_balances.html:85 templates/index/chart_farmed.html:131
+#: templates/index/chart_netspace.html:91
+#: templates/index/chart_plot_count.html:84
+#: templates/index/chart_plots_size.html:84 templates/plotting/jobs.html:285
+#: templates/views/index_script_block.js:90
+msgid "Date"
+msgstr ""
+
+#: templates/index/chart_balances.html:102
+#: templates/index/chart_farmed.html:148
+#: templates/views/index_script_block.js:107
+msgid "Coins"
+msgstr ""
+
+#: templates/index/chart_farmed.html:48 templates/index/index.html:97
+msgid "Farmed Blocks"
+msgstr ""
+
+#: templates/index/chart_farmed.html:53
+msgid "Plot File"
+msgstr ""
+
+#: templates/index/chart_farmed.html:54
+msgid "Farmed Block"
+msgstr ""
+
+#: templates/index/chart_farmed.html:55
+#, fuzzy
+msgid "Farmed At"
+msgstr "Farmed"
+
+#: templates/index/chart_plot_count.html:101 templates/index/index.html:70
+msgid "Plot Count"
+msgstr ""
+
+#: templates/index/index.html:30
+msgid "Expected Time to Win"
+msgstr "Verwachte Tijd om te Winnen"
+
+#: templates/index/index.html:73
+msgid "Total Plots"
+msgstr "Totaal Aantal Plots"
+
+#: templates/index/index.html:81
+msgid "Total Plots Size"
+msgstr "Totale Omvang Plots"
+
+#: templates/index/index.html:101
+msgid "Farmed"
+msgstr "Farmed"
+
+#: templates/index/index.html:111
+msgid "Netspace"
+msgstr "Netgrootte"
+
+#: templates/index/index.html:144
+msgid "Challenges from Harvesters"
+msgstr "Uitdagingen van Harvesters"
+
+#: templates/index/index.html:162
+msgid "Partial Proofs for Pools"
+msgstr "Gedeeltelijke bewijzen voor Pools"
+
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
 msgstr "Bevestig Kill"
@@ -1441,10 +1519,6 @@ msgstr "Geselecteerde herstarten"
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr "Plotting snelheid - k%(k_size)s Plots"
 
-#: templates/plotting/jobs.html:285
-msgid "Date"
-msgstr ""
-
 #: templates/plotting/jobs.html:302
 msgid "Time (minutes)"
 msgstr ""
@@ -1509,7 +1583,7 @@ msgid "Archiving is disabled.  See Settings | Plotting page."
 msgstr "Archivering is uitgeschakeld. Zie pagina Instellingen | Plotting."
 
 #: templates/plotting/workers.html:256
-#: templates/views/index_script_block.js:152
+#: templates/views/index_script_block.js:232
 msgid "Time - Last 24 Hours"
 msgstr ""
 
@@ -1602,15 +1676,15 @@ msgstr "Opslaan..."
 msgid "PlotNFT Log on "
 msgstr "PlotNFS log op "
 
-#: templates/views/index_script_block.js:85
+#: templates/views/index_script_block.js:163
 msgid "Time - Recent"
 msgstr ""
 
-#: templates/views/index_script_block.js:102
+#: templates/views/index_script_block.js:180
 msgid "Time Taken (seconds)"
 msgstr ""
 
-#: templates/views/index_script_block.js:169
+#: templates/views/index_script_block.js:249
 msgid "Partials Submitted"
 msgstr ""
 
diff --git a/web/translations/pt_PT/LC_MESSAGES/messages.po b/web/translations/pt_PT/LC_MESSAGES/messages.po
index d17d6dd9..30799a27 100644
--- a/web/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/web/translations/pt_PT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: Antonio Casqueiro\n"
 "Language: pt\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.1\n"
 
-#: routes.py:90 routes.py:233
+#: routes.py:113 routes.py:256
 msgid "Saved local currency setting."
 msgstr "Gravar definições da moeda local"
 
-#: routes.py:110
+#: routes.py:133
 msgid "Blockchain download"
 msgstr "Descarregando o Blockchain"
 
-#: routes.py:142
+#: routes.py:165
 msgid "Unknown plotting form"
 msgstr "Plotting form desconhecido"
 
-#: routes.py:192
+#: routes.py:215
 msgid "Error! Please see logs."
 msgstr "Erro! Por favor consulte os logs."
 
-#: routes.py:218
+#: routes.py:241
 msgid "Unknown alerts form"
 msgstr "Alerts form desconhecido"
 
-#: routes.py:238
+#: routes.py:261
 msgid "Saved cold wallet addresses."
 msgstr "O endereço da Cold Wallet foi gravado."
 
-#: routes.py:306
+#: routes.py:329
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
@@ -50,11 +50,11 @@ msgstr ""
 "A definições do mapa foram gravadas. Por favor aguarde 10 minutos para "
 "que o mapa seja actualizado com a geolocalização."
 
-#: routes.py:314
+#: routes.py:337
 msgid "Unknown form action"
 msgstr "Form action desconhecida"
 
-#: routes.py:420
+#: routes.py:443
 #, fuzzy, python-format
 msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
@@ -63,7 +63,7 @@ msgstr ""
 "Não existe worker no %(worker)s para o blockchain %(blockchain)s. Por "
 "favor seleccione outro blockchain."
 
-#: routes.py:426
+#: routes.py:449
 #, fuzzy, python-format
 msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
@@ -72,7 +72,7 @@ msgstr ""
 "Na configuração dos Alertas, foi encontrado um fullnode que não responde "
 "para o %(blockchain)s. Por favor verifica os teus workers."
 
-#: routes.py:431
+#: routes.py:454
 #, fuzzy, python-format
 msgid ""
 "For Farming config, found no responding fullnode found for "
@@ -81,7 +81,7 @@ msgstr ""
 "Na configuração de Farming, foi encontrado um fullnode que não responde "
 "para o %(blockchain)s. Por favor verifica os teus workers."
 
-#: routes.py:438
+#: routes.py:461
 #, fuzzy, python-format
 msgid ""
 "For Plotting config, found no responding fullnode found for "
@@ -90,7 +90,7 @@ msgstr ""
 "Na configuração de Plotting, foi encontrado um fullnode que não responde "
 "para o %(blockchain)s. Por favor verifica os teus workers."
 
-#: routes.py:443
+#: routes.py:466
 #, fuzzy, python-format
 msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
@@ -99,7 +99,7 @@ msgstr ""
 "Foi encontrado um fullnode que não responde para o %(blockchain)s. Por "
 "favor verifica os teus workers."
 
-#: routes.py:462
+#: routes.py:485
 msgid "Unsupported log type"
 msgstr "Tipo de log não suportado"
 
@@ -128,7 +128,8 @@ msgid "Idle"
 msgstr ""
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:211
-#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+#: models/plotman.py:67 templates/index/index.html:42
+#: templates/index/index.html:52
 #, fuzzy
 msgid "Active"
 msgstr "Gravar"
@@ -138,19 +139,46 @@ msgstr "Gravar"
 msgid "Suspended"
 msgstr "Suspender os seleccionados"
 
-#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
-#: actions/stats.py:110
+#: actions/stats.py:57 actions/stats.py:92 actions/stats.py:109
+#: actions/stats.py:130 actions/stats.py:132
 msgid "in last day."
 msgstr "no último dia."
 
-#: actions/stats.py:338
+#: actions/stats.py:360
 msgid "secs"
 msgstr "segs"
 
-#: actions/stats.py:348 models/chia.py:251
+#: actions/stats.py:370 models/chia.py:251
 msgid "hour"
 msgstr "hora"
 
+#: actions/stats.py:399 templates/views/index_script_block.js:51
+msgid "Farmed Coins"
+msgstr ""
+
+#: actions/stats.py:416
+#, fuzzy
+msgid "Wallet Balances"
+msgstr "Wallet: Saldo"
+
+#: actions/stats.py:433 templates/index/index.html:105
+#, fuzzy
+msgid "Netspace Size"
+msgstr "Netspace"
+
+#: actions/stats.py:434 actions/stats.py:492
+msgid "Size"
+msgstr ""
+
+#: actions/stats.py:472
+msgid "Plot Counts"
+msgstr ""
+
+#: actions/stats.py:491 templates/index/index.html:78
+#, fuzzy
+msgid "Plots Size"
+msgstr "Plots: Total de espaço ocupado"
+
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
 msgstr ""
@@ -200,11 +228,11 @@ msgstr ""
 msgid "days"
 msgstr "dias"
 
-#: models/chia.py:213 templates/summary.html:100 templates/wallet.html:128
+#: models/chia.py:213 templates/summary.html:105 templates/wallet.html:129
 msgid "Syncing"
 msgstr "A sincronizar"
 
-#: models/chia.py:215 templates/index.html:54
+#: models/chia.py:215 templates/index/index.html:54
 msgid "Not available"
 msgstr ""
 
@@ -213,9 +241,10 @@ msgstr ""
 msgid "Not synced"
 msgstr "Não sincronizado"
 
-#: models/chia.py:220 templates/index.html:54 templates/plotting/jobs.html:114
-#: templates/plotting/workers.html:116 templates/summary.html:96
-#: templates/wallet.html:124 templates/worker.html:78 templates/workers.html:72
+#: models/chia.py:220 templates/index/index.html:54
+#: templates/plotting/jobs.html:114 templates/plotting/workers.html:116
+#: templates/summary.html:101 templates/wallet.html:125
+#: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr "Offline"
 
@@ -276,16 +305,16 @@ msgid "Alerts: Recent Notifications"
 msgstr "Alertas: Notificações recentes"
 
 #: templates/alerts.html:72 templates/drives.html:86
-#: templates/settings/alerts.html:36 templates/settings/farming.html:37
-#: templates/settings/plotting.html:37 templates/settings/tools.html:36
-#: templates/worker.html:14
+#: templates/index/chart_farmed.html:52 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
 msgstr "Worker"
 
-#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/alerts.html:73 templates/blockchains.html:35
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/summary.html:77 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr "Blockchain"
@@ -357,17 +386,17 @@ msgstr "Machinaris"
 msgid "Summary"
 msgstr "Sumário"
 
-#: templates/base.html:38 templates/base.html:113 templates/index.html:41
+#: templates/base.html:38 templates/base.html:113 templates/index/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr "Plotting"
 
-#: templates/base.html:44 templates/base.html:107 templates/index.html:50
+#: templates/base.html:44 templates/base.html:107 templates/index/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr "Farming"
 
-#: templates/base.html:50
+#: templates/base.html:50 templates/index/index.html:126
 msgid "Wallets"
 msgstr "Wallets"
 
@@ -394,7 +423,7 @@ msgstr "Pools"
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/plotting/workers.html:96 templates/summary.html:81
 #: templates/workers.html:14
 msgid "Workers"
 msgstr "Workers"
@@ -454,48 +483,53 @@ msgstr "Madmax"
 msgid "Plotman"
 msgstr "Plotman"
 
-#: templates/blockchains.html:23
+#: templates/blockchains.html:27
 msgid "Blockchain Summary"
 msgstr "Blockchain sumário"
 
-#: templates/blockchains.html:32 templates/drives.html:91
-#: templates/summary.html:74 templates/wallet.html:109
+#: templates/blockchains.html:36 templates/drives.html:91
+#: templates/summary.html:78 templates/wallet.html:109
 msgid "Status"
 msgstr "Estado"
 
-#: templates/blockchains.html:33
+#: templates/blockchains.html:37
 msgid "Peak Height"
 msgstr "Peak Height\""
 
-#: templates/blockchains.html:34
+#: templates/blockchains.html:38
 msgid "Peak Time"
 msgstr "Peak Time"
 
-#: templates/blockchains.html:35 templates/drives.html:93
+#: templates/blockchains.html:39 templates/drives.html:93
 #: templates/wallet.html:114
 msgid "Updated At"
 msgstr "Actualizado em"
 
-#: templates/blockchains.html:36 templates/summary.html:87
-#: templates/workers.html:49
-msgid "Logs"
-msgstr "Logs"
+#: templates/blockchains.html:63
+#, fuzzy
+msgid "View Blockchain Details"
+msgstr "Blockchain: Detalhes"
 
-#: templates/blockchains.html:66
+#: templates/blockchains.html:65 templates/blockchains.html:79
 msgid "Blockchain Details"
 msgstr "Blockchain: Detalhes"
 
-#: templates/blockchains.html:91
+#: templates/blockchains.html:69 templates/summary.html:126
+#, fuzzy
+msgid "View Blockchain Log"
+msgstr "Descarregando o Blockchain"
+
+#: templates/blockchains.html:104
 msgid "No blockchains found from any farmers. Not added?"
 msgstr ""
 "Não foi encontrado nenhum blockchain para os farmers. Não foram "
 "adicionados?"
 
-#: templates/blockchains.html:92
+#: templates/blockchains.html:105
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr "Tente correr \"chia show --state\" nos seus farmers para verificar."
 
-#: templates/blockchains.html:106 templates/summary.html:143
+#: templates/blockchains.html:119 templates/summary.html:152
 msgid "Fullnode Log for "
 msgstr ""
 
@@ -671,46 +705,6 @@ msgstr ""
 "Para mais informação, veja o Machinaris "
 "%(wiki_link_open)swiki%(wiki_link_close)s."
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr "Tempo expectável para ganhar"
-
-#: templates/index.html:72
-msgid "Total Plots"
-msgstr "Plots: Total"
-
-#: templates/index.html:79
-msgid "Total Plots Size"
-msgstr "Plots: Total de espaço ocupado"
-
-#: templates/index.html:89 templates/wallet.html:113
-msgid "Balance"
-msgstr "Saldo"
-
-#: templates/index.html:96
-msgid "Farmed"
-msgstr "Farmed"
-
-#: templates/index.html:105
-msgid "Netspace"
-msgstr "Netspace"
-
-#: templates/index.html:120
-msgid "Challenges from Harvesters"
-msgstr "Challenges das Harvesters"
-
-#: templates/index.html:136
-msgid "Partial Proofs for Pools"
-msgstr "Partial Proofs das Pools"
-
-#: templates/farming/workers.html:80 templates/index.html:147
-msgid "Previous"
-msgstr "Anterior"
-
-#: templates/farming/workers.html:84 templates/index.html:151
-msgid "Next"
-msgstr "Seguinte"
-
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
 msgstr "NOTA: Machinaris nunca irá mostrar a tua chave privada aqui."
@@ -882,50 +876,55 @@ msgstr ""
 msgid "Local Currency:"
 msgstr "Moeda local:"
 
-#: templates/summary.html:75
+#: templates/summary.html:79
 msgid "Height"
 msgstr "Height"
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:76
+#: templates/summary.html:80
 msgid "Plots"
 msgstr "Plots"
 
-#: templates/summary.html:78
+#: templates/summary.html:82
 msgid "Max Resp."
 msgstr "Max Resp."
 
-#: templates/summary.html:79
+#: templates/summary.html:83
 msgid "Partials"
 msgstr "Partials"
 
-#: templates/summary.html:80
+#: templates/summary.html:84
 msgid "ETW"
 msgstr "ETW"
 
-#: templates/summary.html:82
+#: templates/summary.html:86
 msgid "Wallet"
 msgstr "Wallet"
 
-#: templates/summary.html:83 templates/summary.html:84
+#: templates/summary.html:87 templates/summary.html:88
 msgid "EDV"
 msgstr "EDV"
 
-#: templates/summary.html:98 templates/wallet.html:126
+#: templates/summary.html:103 templates/wallet.html:127
 msgid "Synced"
 msgstr "Sincronizado"
 
-#: templates/summary.html:102 templates/wallet.html:130
+#: templates/summary.html:107 templates/wallet.html:131
 msgid "Not Synced"
 msgstr "Não sincronizado"
 
-#: templates/summary.html:128
+#: templates/summary.html:123 templates/wallet.html:142
+#, fuzzy
+msgid "Chart Wallet"
+msgstr "Editar wallet"
+
+#: templates/summary.html:137
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 "Não foram encontrados blockchains para nenhum dos farmers. Acabaste de "
 "arrancar o sistema?"
 
-#: templates/summary.html:129
+#: templates/summary.html:138
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr "Por favor aguarde pelo menos 15 minutos para os blockchains iniciarem."
 
@@ -941,7 +940,7 @@ msgstr "Endereço da Cold Wallet:"
 msgid "Wallet Summary"
 msgstr "Wallet: Sumário"
 
-#: templates/wallet.html:110
+#: templates/index/index.html:89 templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr "Wallet: Saldo"
 
@@ -949,19 +948,23 @@ msgstr "Wallet: Saldo"
 msgid "Cold Wallet Balance"
 msgstr "Cold Wallet: Saldo"
 
-#: templates/wallet.html:112
+#: templates/views/index_script_block.js:56 templates/wallet.html:112
 msgid "Total Balance"
 msgstr "Saldo"
 
-#: templates/wallet.html:140
+#: templates/index/index.html:92 templates/wallet.html:113
+msgid "Balance"
+msgstr "Saldo"
+
+#: templates/wallet.html:144
 msgid "Edit Wallet"
 msgstr "Editar wallet"
 
-#: templates/wallet.html:151
+#: templates/wallet.html:155
 msgid "Wallet Details"
 msgstr "Detalhes da Wallet"
 
-#: templates/wallet.html:175
+#: templates/wallet.html:179
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
@@ -969,7 +972,7 @@ msgstr ""
 "O estado da Wallet ainda não foi recebido. Acabaste de arrancar o "
 "sistema? Por favor aguarda pelo menos 10 minutos para a actualização."
 
-#: templates/wallet.html:176
+#: templates/wallet.html:180
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -1057,46 +1060,46 @@ msgstr "Espaço em disco usado (GB)"
 msgid "Disk Space Free (GB)"
 msgstr "Espaço em disco livre (GB)"
 
-#: templates/worker_launch.html:50 templates/worker_launch.html:640
-#: templates/worker_launch.html:669
+#: templates/worker_launch.html:50 templates/worker_launch.html:642
+#: templates/worker_launch.html:671
 msgid "Host Path"
 msgstr "Host path"
 
-#: templates/worker_launch.html:55 templates/worker_launch.html:645
-#: templates/worker_launch.html:674
+#: templates/worker_launch.html:55 templates/worker_launch.html:647
+#: templates/worker_launch.html:676
 msgid "Container Path"
 msgstr "Container path"
 
-#: templates/worker_launch.html:60 templates/worker_launch.html:650
-#: templates/worker_launch.html:679
+#: templates/worker_launch.html:60 templates/worker_launch.html:652
+#: templates/worker_launch.html:681
 msgid "Used for:"
 msgstr "Usado para:"
 
-#: templates/worker_launch.html:63 templates/worker_launch.html:653
-#: templates/worker_launch.html:682
+#: templates/worker_launch.html:63 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
 msgid "Final Plots"
 msgstr "Plots finais"
 
-#: templates/worker_launch.html:64 templates/worker_launch.html:654
-#: templates/worker_launch.html:683
+#: templates/worker_launch.html:64 templates/worker_launch.html:656
+#: templates/worker_launch.html:685
 msgid "Plotting Temp"
 msgstr "Plotting temp"
 
-#: templates/worker_launch.html:65 templates/worker_launch.html:655
-#: templates/worker_launch.html:684
+#: templates/worker_launch.html:65 templates/worker_launch.html:657
+#: templates/worker_launch.html:686
 msgid "Other"
 msgstr "Outros"
 
-#: templates/worker_launch.html:69 templates/worker_launch.html:659
+#: templates/worker_launch.html:69 templates/worker_launch.html:661
 #, fuzzy
 msgid "Location"
 msgstr "Notifcação"
 
-#: templates/worker_launch.html:72 templates/worker_launch.html:662
+#: templates/worker_launch.html:72 templates/worker_launch.html:664
 msgid "Local"
 msgstr ""
 
-#: templates/worker_launch.html:73 templates/worker_launch.html:663
+#: templates/worker_launch.html:73 templates/worker_launch.html:665
 msgid "Remote"
 msgstr ""
 
@@ -1104,7 +1107,7 @@ msgstr ""
 msgid "Unknown blockchain fork of selected:"
 msgstr "Unknown blockchain fork of selected:"
 
-#: templates/worker_launch.html:284
+#: templates/worker_launch.html:285
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
@@ -1112,7 +1115,7 @@ msgstr ""
 "Falta o hostname do Worker. Por favor indique um nome cursto para "
 "identificar o Worker."
 
-#: templates/worker_launch.html:304
+#: templates/worker_launch.html:305
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
@@ -1120,29 +1123,29 @@ msgstr ""
 "Host path inválido terminado com dois pontos. Tente adicionar o caracter "
 "'/' no final assim"
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Empty host path provided for volume at "
 msgstr "Foi indicado um host path vazio para o volume em "
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Please provide a host path."
 msgstr "Por favor indique um host path."
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Empty container path provided for volume at "
 msgstr "Foi indicado um container path vazio para o volume em "
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Please provide a container path."
 msgstr "Por favor indique um container path."
 
-#: templates/worker_launch.html:355
+#: templates/worker_launch.html:356
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
 msgstr ""
 "Não foi seleccionado o modo Harvester nem o modo Plottter. Por favor "
 "escolha um ou ambos."
 
-#: templates/worker_launch.html:361
+#: templates/worker_launch.html:362
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
@@ -1150,11 +1153,11 @@ msgstr ""
 "Falta o endereço IP do Worker. Por favor indique o endereço IP que o "
 "controlador irá ligar-se para comandos."
 
-#: templates/worker_launch.html:411
+#: templates/worker_launch.html:413
 msgid "Machinaris Worker - Launch Config"
 msgstr "Machinaris Worker - Configuração de arranque"
 
-#: templates/worker_launch.html:412
+#: templates/worker_launch.html:414
 msgid ""
 "Complete the form below to run new harvesters/plotters on other computers"
 " across your network. Save the generated docker-compose.yml file to a "
@@ -1166,95 +1169,95 @@ msgstr ""
 "numa pasta chamada \"machinaris\", depois executa \"docker-compose up\" a"
 " partir da linha de comandos."
 
-#: templates/worker_launch.html:416
+#: templates/worker_launch.html:418
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: templates/worker_launch.html:422
+#: templates/worker_launch.html:424
 msgid "Linux"
 msgstr "Linux"
 
-#: templates/worker_launch.html:429
+#: templates/worker_launch.html:431
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: templates/worker_launch.html:436
+#: templates/worker_launch.html:438
 msgid "Windows"
 msgstr "Windows"
 
-#: templates/worker_launch.html:442
+#: templates/worker_launch.html:444
 msgid "Machinaris Mode"
 msgstr "Modo do Machinaris"
 
-#: templates/worker_launch.html:448
+#: templates/worker_launch.html:450
 msgid "Harvester"
 msgstr "Harvester"
 
-#: templates/worker_launch.html:455
+#: templates/worker_launch.html:457
 msgid "Plotter"
 msgstr "Plotter"
 
-#: templates/worker_launch.html:463
+#: templates/worker_launch.html:465
 msgid "Farmer Public Key"
 msgstr "Farmer chave pública"
 
-#: templates/worker_launch.html:468
+#: templates/worker_launch.html:470
 msgid "Pool Public Key"
 msgstr "Pool chave pública"
 
-#: templates/worker_launch.html:473
+#: templates/worker_launch.html:475
 msgid "Pool Contract Address"
 msgstr "Pool endereço do contrato"
 
-#: templates/worker_launch.html:478
+#: templates/worker_launch.html:480
 msgid "Plot on Startup"
 msgstr "Iniciar plotting ao arrancar"
 
-#: templates/worker_launch.html:484
+#: templates/worker_launch.html:486
 msgid "True"
 msgstr "Verdadeiro"
 
-#: templates/worker_launch.html:491
+#: templates/worker_launch.html:493
 msgid "False"
 msgstr "False"
 
-#: templates/worker_launch.html:499
+#: templates/worker_launch.html:501
 msgid "Controller IP Address"
 msgstr "Controlador: Endereço IP"
 
-#: templates/worker_launch.html:504
+#: templates/worker_launch.html:506
 msgid "Controller API Port"
 msgstr "Controlador: Porto da API"
 
-#: templates/worker_launch.html:511
+#: templates/worker_launch.html:513
 msgid "Worker Hostname"
 msgstr "Worker: Hostname"
 
-#: templates/worker_launch.html:516
+#: templates/worker_launch.html:518
 msgid "Worker IP Address"
 msgstr "Worker: Endereço IP"
 
-#: templates/worker_launch.html:523
+#: templates/worker_launch.html:525
 msgid "Blockchains to Farm"
 msgstr "Blockchains to Farm"
 
-#: templates/worker_launch.html:636
+#: templates/worker_launch.html:638
 msgid "Volume Mounts"
 msgstr "Volumes montados"
 
-#: templates/worker_launch.html:693
+#: templates/worker_launch.html:695
 msgid "Add New Volume"
 msgstr "Adicionar um novo volume"
 
-#: templates/worker_launch.html:695
+#: templates/worker_launch.html:697
 msgid "Remove Last Volume"
 msgstr "Remover o último volume"
 
-#: templates/worker_launch.html:702
+#: templates/worker_launch.html:704
 msgid "Copy"
 msgstr "Copiar"
 
-#: templates/worker_launch.html:706
+#: templates/worker_launch.html:708
 msgid "Docker Compose"
 msgstr "Docker Compose"
 
@@ -1270,6 +1273,10 @@ msgstr "Último ping"
 msgid "Last Successful Ping"
 msgstr "Último ping com sucesso"
 
+#: templates/workers.html:49
+msgid "Logs"
+msgstr "Logs"
+
 #: templates/workers.html:94
 msgid "Prune Selected"
 msgstr "Eliminar os seleccionados"
@@ -1340,6 +1347,14 @@ msgstr ""
 "Por favor verifique que o container Machinaris para este blockchain está "
 "a correr. Por favor verifique também as definições na página de Alertas."
 
+#: templates/farming/workers.html:80 templates/index/index.html:176
+msgid "Previous"
+msgstr "Anterior"
+
+#: templates/farming/workers.html:84 templates/index/index.html:180
+msgid "Next"
+msgstr "Seguinte"
+
 #: templates/farming/workers.html:94
 #, python-format
 msgid ""
@@ -1354,6 +1369,69 @@ msgstr ""
 "%(wiki_link_close)s. Verifique ainda que o Chia worker está a reportar "
 "para o Conttrolador na página dos Workers."
 
+#: templates/index/chart_balances.html:85 templates/index/chart_farmed.html:131
+#: templates/index/chart_netspace.html:91
+#: templates/index/chart_plot_count.html:84
+#: templates/index/chart_plots_size.html:84 templates/plotting/jobs.html:285
+#: templates/views/index_script_block.js:90
+msgid "Date"
+msgstr ""
+
+#: templates/index/chart_balances.html:102
+#: templates/index/chart_farmed.html:148
+#: templates/views/index_script_block.js:107
+msgid "Coins"
+msgstr ""
+
+#: templates/index/chart_farmed.html:48 templates/index/index.html:97
+msgid "Farmed Blocks"
+msgstr ""
+
+#: templates/index/chart_farmed.html:53
+msgid "Plot File"
+msgstr ""
+
+#: templates/index/chart_farmed.html:54
+msgid "Farmed Block"
+msgstr ""
+
+#: templates/index/chart_farmed.html:55
+#, fuzzy
+msgid "Farmed At"
+msgstr "Farmed"
+
+#: templates/index/chart_plot_count.html:101 templates/index/index.html:70
+msgid "Plot Count"
+msgstr ""
+
+#: templates/index/index.html:30
+msgid "Expected Time to Win"
+msgstr "Tempo expectável para ganhar"
+
+#: templates/index/index.html:73
+msgid "Total Plots"
+msgstr "Plots: Total"
+
+#: templates/index/index.html:81
+msgid "Total Plots Size"
+msgstr "Plots: Total de espaço ocupado"
+
+#: templates/index/index.html:101
+msgid "Farmed"
+msgstr "Farmed"
+
+#: templates/index/index.html:111
+msgid "Netspace"
+msgstr "Netspace"
+
+#: templates/index/index.html:144
+msgid "Challenges from Harvesters"
+msgstr "Challenges das Harvesters"
+
+#: templates/index/index.html:162
+msgid "Partial Proofs for Pools"
+msgstr "Partial Proofs das Pools"
+
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
 msgstr "Confirmar que é para matar"
@@ -1457,10 +1535,6 @@ msgstr "Retomar os seleccionados"
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr "Velocidade de Plotting - k%(k_size)s Plots"
 
-#: templates/plotting/jobs.html:285
-msgid "Date"
-msgstr ""
-
 #: templates/plotting/jobs.html:302
 msgid "Time (minutes)"
 msgstr ""
@@ -1526,7 +1600,7 @@ msgid "Archiving is disabled.  See Settings | Plotting page."
 msgstr "Arquivar: Desactivado. Veja a página Definições | Plotting."
 
 #: templates/plotting/workers.html:256
-#: templates/views/index_script_block.js:152
+#: templates/views/index_script_block.js:232
 msgid "Time - Last 24 Hours"
 msgstr ""
 
@@ -1622,15 +1696,15 @@ msgstr "Gravando..."
 msgid "PlotNFT Log on "
 msgstr "PlotNFT Log de "
 
-#: templates/views/index_script_block.js:85
+#: templates/views/index_script_block.js:163
 msgid "Time - Recent"
 msgstr ""
 
-#: templates/views/index_script_block.js:102
+#: templates/views/index_script_block.js:180
 msgid "Time Taken (seconds)"
 msgstr ""
 
-#: templates/views/index_script_block.js:169
+#: templates/views/index_script_block.js:249
 msgid "Partials Submitted"
 msgstr ""
 
diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po
index a96e3747..32d98f30 100644
--- a/web/translations/zh/LC_MESSAGES/messages.po
+++ b/web/translations/zh/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-04-23 11:14-0600\n"
+"POT-Creation-Date: 2022-06-06 20:47-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
@@ -19,76 +19,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.10.1\n"
 
-#: routes.py:90 routes.py:233
+#: routes.py:113 routes.py:256
 msgid "Saved local currency setting."
 msgstr ""
 
-#: routes.py:110
+#: routes.py:133
 msgid "Blockchain download"
 msgstr ""
 
-#: routes.py:142
+#: routes.py:165
 msgid "Unknown plotting form"
 msgstr ""
 
-#: routes.py:192
+#: routes.py:215
 msgid "Error! Please see logs."
 msgstr ""
 
-#: routes.py:218
+#: routes.py:241
 msgid "Unknown alerts form"
 msgstr ""
 
-#: routes.py:238
+#: routes.py:261
 msgid "Saved cold wallet addresses."
 msgstr ""
 
-#: routes.py:306
+#: routes.py:329
 msgid ""
 "Saved mapping settings.  Please allow 10 minutes to generate location "
 "information for the map."
 msgstr ""
 
-#: routes.py:314
+#: routes.py:337
 msgid "Unknown form action"
 msgstr ""
 
-#: routes.py:420
+#: routes.py:443
 #, python-format
 msgid ""
 "No worker at %(worker)s for blockchain %(blockchain)s. Please select "
 "another blockchain."
 msgstr ""
 
-#: routes.py:426
+#: routes.py:449
 #, python-format
 msgid ""
 "For Alerts config, found no responding fullnode found for %(blockchain)s."
 " Please check your workers."
 msgstr ""
 
-#: routes.py:431
+#: routes.py:454
 #, python-format
 msgid ""
 "For Farming config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr ""
 
-#: routes.py:438
+#: routes.py:461
 #, python-format
 msgid ""
 "For Plotting config, found no responding fullnode found for "
 "%(blockchain)s. Please check your workers."
 msgstr ""
 
-#: routes.py:443
+#: routes.py:466
 #, python-format
 msgid ""
 "No responding fullnode found for %(blockchain)s. Please check your "
 "workers."
 msgstr ""
 
-#: routes.py:462
+#: routes.py:485
 msgid "Unsupported log type"
 msgstr ""
 
@@ -116,7 +116,8 @@ msgid "Idle"
 msgstr ""
 
 #: actions/plotman.py:47 actions/plotman.py:48 models/chia.py:211
-#: models/plotman.py:67 templates/index.html:42 templates/index.html:52
+#: models/plotman.py:67 templates/index/index.html:42
+#: templates/index/index.html:52
 msgid "Active"
 msgstr ""
 
@@ -124,19 +125,43 @@ msgstr ""
 msgid "Suspended"
 msgstr ""
 
-#: actions/stats.py:56 actions/stats.py:90 actions/stats.py:108
-#: actions/stats.py:110
+#: actions/stats.py:57 actions/stats.py:92 actions/stats.py:109
+#: actions/stats.py:130 actions/stats.py:132
 msgid "in last day."
 msgstr ""
 
-#: actions/stats.py:338
+#: actions/stats.py:360
 msgid "secs"
 msgstr ""
 
-#: actions/stats.py:348 models/chia.py:251
+#: actions/stats.py:370 models/chia.py:251
 msgid "hour"
 msgstr ""
 
+#: actions/stats.py:399 templates/views/index_script_block.js:51
+msgid "Farmed Coins"
+msgstr ""
+
+#: actions/stats.py:416
+msgid "Wallet Balances"
+msgstr ""
+
+#: actions/stats.py:433 templates/index/index.html:105
+msgid "Netspace Size"
+msgstr ""
+
+#: actions/stats.py:434 actions/stats.py:492
+msgid "Size"
+msgstr ""
+
+#: actions/stats.py:472
+msgid "Plot Counts"
+msgstr ""
+
+#: actions/stats.py:491 templates/index/index.html:78
+msgid "Plots Size"
+msgstr ""
+
 #: actions/warnings.py:56
 msgid "Dismiss Warning"
 msgstr ""
@@ -178,11 +203,11 @@ msgstr ""
 msgid "days"
 msgstr ""
 
-#: models/chia.py:213 templates/summary.html:100 templates/wallet.html:128
+#: models/chia.py:213 templates/summary.html:105 templates/wallet.html:129
 msgid "Syncing"
 msgstr ""
 
-#: models/chia.py:215 templates/index.html:54
+#: models/chia.py:215 templates/index/index.html:54
 msgid "Not available"
 msgstr ""
 
@@ -190,9 +215,10 @@ msgstr ""
 msgid "Not synced"
 msgstr ""
 
-#: models/chia.py:220 templates/index.html:54 templates/plotting/jobs.html:114
-#: templates/plotting/workers.html:116 templates/summary.html:96
-#: templates/wallet.html:124 templates/worker.html:78 templates/workers.html:72
+#: models/chia.py:220 templates/index/index.html:54
+#: templates/plotting/jobs.html:114 templates/plotting/workers.html:116
+#: templates/summary.html:101 templates/wallet.html:125
+#: templates/worker.html:78 templates/workers.html:72
 msgid "Offline"
 msgstr ""
 
@@ -253,16 +279,16 @@ msgid "Alerts: Recent Notifications"
 msgstr ""
 
 #: templates/alerts.html:72 templates/drives.html:86
-#: templates/settings/alerts.html:36 templates/settings/farming.html:37
-#: templates/settings/plotting.html:37 templates/settings/tools.html:36
-#: templates/worker.html:14
+#: templates/index/chart_farmed.html:52 templates/settings/alerts.html:36
+#: templates/settings/farming.html:37 templates/settings/plotting.html:37
+#: templates/settings/tools.html:36 templates/worker.html:14
 msgid "Worker"
 msgstr ""
 
-#: templates/alerts.html:73 templates/blockchains.html:31
+#: templates/alerts.html:73 templates/blockchains.html:35
 #: templates/settings/alerts.html:45 templates/settings/farming.html:46
 #: templates/settings/plotting.html:46 templates/settings/tools.html:45
-#: templates/summary.html:73 templates/wallet.html:108 templates/worker.html:47
+#: templates/summary.html:77 templates/wallet.html:108 templates/worker.html:47
 #: templates/workers.html:43
 msgid "Blockchain"
 msgstr ""
@@ -330,17 +356,17 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
-#: templates/base.html:38 templates/base.html:113 templates/index.html:41
+#: templates/base.html:38 templates/base.html:113 templates/index/index.html:41
 #: templates/plotting/jobs.html:101 templates/settings/plotting.html:14
 msgid "Plotting"
 msgstr ""
 
-#: templates/base.html:44 templates/base.html:107 templates/index.html:50
+#: templates/base.html:44 templates/base.html:107 templates/index/index.html:50
 #: templates/settings/farming.html:15
 msgid "Farming"
 msgstr ""
 
-#: templates/base.html:50
+#: templates/base.html:50 templates/index/index.html:126
 msgid "Wallets"
 msgstr ""
 
@@ -367,7 +393,7 @@ msgstr ""
 
 #: templates/base.html:86 templates/farming/plots.html:69
 #: templates/farming/workers.html:28 templates/plotting/jobs.html:94
-#: templates/plotting/workers.html:96 templates/summary.html:77
+#: templates/plotting/workers.html:96 templates/summary.html:81
 #: templates/workers.html:14
 msgid "Workers"
 msgstr ""
@@ -427,46 +453,49 @@ msgstr ""
 msgid "Plotman"
 msgstr ""
 
-#: templates/blockchains.html:23
+#: templates/blockchains.html:27
 msgid "Blockchain Summary"
 msgstr ""
 
-#: templates/blockchains.html:32 templates/drives.html:91
-#: templates/summary.html:74 templates/wallet.html:109
+#: templates/blockchains.html:36 templates/drives.html:91
+#: templates/summary.html:78 templates/wallet.html:109
 msgid "Status"
 msgstr ""
 
-#: templates/blockchains.html:33
+#: templates/blockchains.html:37
 msgid "Peak Height"
 msgstr ""
 
-#: templates/blockchains.html:34
+#: templates/blockchains.html:38
 msgid "Peak Time"
 msgstr ""
 
-#: templates/blockchains.html:35 templates/drives.html:93
+#: templates/blockchains.html:39 templates/drives.html:93
 #: templates/wallet.html:114
 msgid "Updated At"
 msgstr ""
 
-#: templates/blockchains.html:36 templates/summary.html:87
-#: templates/workers.html:49
-msgid "Logs"
+#: templates/blockchains.html:63
+msgid "View Blockchain Details"
 msgstr ""
 
-#: templates/blockchains.html:66
+#: templates/blockchains.html:65 templates/blockchains.html:79
 msgid "Blockchain Details"
 msgstr ""
 
-#: templates/blockchains.html:91
+#: templates/blockchains.html:69 templates/summary.html:126
+msgid "View Blockchain Log"
+msgstr ""
+
+#: templates/blockchains.html:104
 msgid "No blockchains found from any farmers. Not added?"
 msgstr ""
 
-#: templates/blockchains.html:92
+#: templates/blockchains.html:105
 msgid "Try running \"chia show --state\" on your farmers to verify."
 msgstr ""
 
-#: templates/blockchains.html:106 templates/summary.html:143
+#: templates/blockchains.html:119 templates/summary.html:152
 msgid "Fullnode Log for "
 msgstr ""
 
@@ -633,46 +662,6 @@ msgstr ""
 msgid "For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s."
 msgstr ""
 
-#: templates/index.html:30
-msgid "Expected Time to Win"
-msgstr ""
-
-#: templates/index.html:72
-msgid "Total Plots"
-msgstr ""
-
-#: templates/index.html:79
-msgid "Total Plots Size"
-msgstr ""
-
-#: templates/index.html:89 templates/wallet.html:113
-msgid "Balance"
-msgstr ""
-
-#: templates/index.html:96
-msgid "Farmed"
-msgstr ""
-
-#: templates/index.html:105
-msgid "Netspace"
-msgstr ""
-
-#: templates/index.html:120
-msgid "Challenges from Harvesters"
-msgstr ""
-
-#: templates/index.html:136
-msgid "Partial Proofs for Pools"
-msgstr ""
-
-#: templates/farming/workers.html:80 templates/index.html:147
-msgid "Previous"
-msgstr ""
-
-#: templates/farming/workers.html:84 templates/index.html:151
-msgid "Next"
-msgstr ""
-
 #: templates/keys.html:43
 msgid "NOTE: Machinaris will never display your private key here."
 msgstr ""
@@ -821,48 +810,52 @@ msgstr ""
 msgid "Local Currency:"
 msgstr ""
 
-#: templates/summary.html:75
+#: templates/summary.html:79
 msgid "Height"
 msgstr ""
 
 #: templates/farming/plots.html:66 templates/farming/workers.html:25
-#: templates/summary.html:76
+#: templates/summary.html:80
 msgid "Plots"
 msgstr ""
 
-#: templates/summary.html:78
+#: templates/summary.html:82
 msgid "Max Resp."
 msgstr ""
 
-#: templates/summary.html:79
+#: templates/summary.html:83
 msgid "Partials"
 msgstr ""
 
-#: templates/summary.html:80
+#: templates/summary.html:84
 msgid "ETW"
 msgstr ""
 
-#: templates/summary.html:82
+#: templates/summary.html:86
 msgid "Wallet"
 msgstr ""
 
-#: templates/summary.html:83 templates/summary.html:84
+#: templates/summary.html:87 templates/summary.html:88
 msgid "EDV"
 msgstr ""
 
-#: templates/summary.html:98 templates/wallet.html:126
+#: templates/summary.html:103 templates/wallet.html:127
 msgid "Synced"
 msgstr ""
 
-#: templates/summary.html:102 templates/wallet.html:130
+#: templates/summary.html:107 templates/wallet.html:131
 msgid "Not Synced"
 msgstr ""
 
-#: templates/summary.html:128
+#: templates/summary.html:123 templates/wallet.html:142
+msgid "Chart Wallet"
+msgstr ""
+
+#: templates/summary.html:137
 msgid "No blockchains found from any farmers. Just starting up?"
 msgstr ""
 
-#: templates/summary.html:129
+#: templates/summary.html:138
 msgid "Please allow at least 15 minutes for blockchains to get started."
 msgstr ""
 
@@ -878,7 +871,7 @@ msgstr ""
 msgid "Wallet Summary"
 msgstr ""
 
-#: templates/wallet.html:110
+#: templates/index/index.html:89 templates/wallet.html:110
 msgid "Wallet Balance"
 msgstr ""
 
@@ -886,25 +879,29 @@ msgstr ""
 msgid "Cold Wallet Balance"
 msgstr ""
 
-#: templates/wallet.html:112
+#: templates/views/index_script_block.js:56 templates/wallet.html:112
 msgid "Total Balance"
 msgstr ""
 
-#: templates/wallet.html:140
+#: templates/index/index.html:92 templates/wallet.html:113
+msgid "Balance"
+msgstr ""
+
+#: templates/wallet.html:144
 msgid "Edit Wallet"
 msgstr ""
 
-#: templates/wallet.html:151
+#: templates/wallet.html:155
 msgid "Wallet Details"
 msgstr ""
 
-#: templates/wallet.html:175
+#: templates/wallet.html:179
 msgid ""
 "No wallet status received.  Perhaps just starting?  Please allow at least"
 " 10 minutes to update."
 msgstr ""
 
-#: templates/wallet.html:176
+#: templates/wallet.html:180
 msgid ""
 "You can also try running \"chia wallet show\" on your fullnode's in-"
 "container shell to verify."
@@ -990,45 +987,45 @@ msgstr ""
 msgid "Disk Space Free (GB)"
 msgstr ""
 
-#: templates/worker_launch.html:50 templates/worker_launch.html:640
-#: templates/worker_launch.html:669
+#: templates/worker_launch.html:50 templates/worker_launch.html:642
+#: templates/worker_launch.html:671
 msgid "Host Path"
 msgstr ""
 
-#: templates/worker_launch.html:55 templates/worker_launch.html:645
-#: templates/worker_launch.html:674
+#: templates/worker_launch.html:55 templates/worker_launch.html:647
+#: templates/worker_launch.html:676
 msgid "Container Path"
 msgstr ""
 
-#: templates/worker_launch.html:60 templates/worker_launch.html:650
-#: templates/worker_launch.html:679
+#: templates/worker_launch.html:60 templates/worker_launch.html:652
+#: templates/worker_launch.html:681
 msgid "Used for:"
 msgstr ""
 
-#: templates/worker_launch.html:63 templates/worker_launch.html:653
-#: templates/worker_launch.html:682
+#: templates/worker_launch.html:63 templates/worker_launch.html:655
+#: templates/worker_launch.html:684
 msgid "Final Plots"
 msgstr ""
 
-#: templates/worker_launch.html:64 templates/worker_launch.html:654
-#: templates/worker_launch.html:683
+#: templates/worker_launch.html:64 templates/worker_launch.html:656
+#: templates/worker_launch.html:685
 msgid "Plotting Temp"
 msgstr ""
 
-#: templates/worker_launch.html:65 templates/worker_launch.html:655
-#: templates/worker_launch.html:684
+#: templates/worker_launch.html:65 templates/worker_launch.html:657
+#: templates/worker_launch.html:686
 msgid "Other"
 msgstr ""
 
-#: templates/worker_launch.html:69 templates/worker_launch.html:659
+#: templates/worker_launch.html:69 templates/worker_launch.html:661
 msgid "Location"
 msgstr ""
 
-#: templates/worker_launch.html:72 templates/worker_launch.html:662
+#: templates/worker_launch.html:72 templates/worker_launch.html:664
 msgid "Local"
 msgstr ""
 
-#: templates/worker_launch.html:73 templates/worker_launch.html:663
+#: templates/worker_launch.html:73 templates/worker_launch.html:665
 msgid "Remote"
 msgstr ""
 
@@ -1036,49 +1033,49 @@ msgstr ""
 msgid "Unknown blockchain fork of selected:"
 msgstr ""
 
-#: templates/worker_launch.html:284
+#: templates/worker_launch.html:285
 msgid ""
 "Missing worker hostname.  Please provide a short name to identify your "
 "worker."
 msgstr ""
 
-#: templates/worker_launch.html:304
+#: templates/worker_launch.html:305
 msgid ""
 "Invalid host path ending with colon. Try adding a slash to the end like "
 "this"
 msgstr ""
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Empty host path provided for volume at "
 msgstr ""
 
-#: templates/worker_launch.html:307
+#: templates/worker_launch.html:308
 msgid "Please provide a host path."
 msgstr ""
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Empty container path provided for volume at "
 msgstr ""
 
-#: templates/worker_launch.html:309
+#: templates/worker_launch.html:310
 msgid "Please provide a container path."
 msgstr ""
 
-#: templates/worker_launch.html:355
+#: templates/worker_launch.html:356
 msgid "Neither Harvester or Plottter mode selected.  Please choose one or both."
 msgstr ""
 
-#: templates/worker_launch.html:361
+#: templates/worker_launch.html:362
 msgid ""
 "Missing worker IP address.  Please provide the IP the controller will "
 "connect to for commands."
 msgstr ""
 
-#: templates/worker_launch.html:411
+#: templates/worker_launch.html:413
 msgid "Machinaris Worker - Launch Config"
 msgstr ""
 
-#: templates/worker_launch.html:412
+#: templates/worker_launch.html:414
 msgid ""
 "Complete the form below to run new harvesters/plotters on other computers"
 " across your network. Save the generated docker-compose.yml file to a "
@@ -1086,95 +1083,95 @@ msgid ""
 "shell."
 msgstr ""
 
-#: templates/worker_launch.html:416
+#: templates/worker_launch.html:418
 msgid "Operating System"
 msgstr ""
 
-#: templates/worker_launch.html:422
+#: templates/worker_launch.html:424
 msgid "Linux"
 msgstr ""
 
-#: templates/worker_launch.html:429
+#: templates/worker_launch.html:431
 msgid "Macintosh"
 msgstr ""
 
-#: templates/worker_launch.html:436
+#: templates/worker_launch.html:438
 msgid "Windows"
 msgstr ""
 
-#: templates/worker_launch.html:442
+#: templates/worker_launch.html:444
 msgid "Machinaris Mode"
 msgstr ""
 
-#: templates/worker_launch.html:448
+#: templates/worker_launch.html:450
 msgid "Harvester"
 msgstr ""
 
-#: templates/worker_launch.html:455
+#: templates/worker_launch.html:457
 msgid "Plotter"
 msgstr ""
 
-#: templates/worker_launch.html:463
+#: templates/worker_launch.html:465
 msgid "Farmer Public Key"
 msgstr ""
 
-#: templates/worker_launch.html:468
+#: templates/worker_launch.html:470
 msgid "Pool Public Key"
 msgstr ""
 
-#: templates/worker_launch.html:473
+#: templates/worker_launch.html:475
 msgid "Pool Contract Address"
 msgstr ""
 
-#: templates/worker_launch.html:478
+#: templates/worker_launch.html:480
 msgid "Plot on Startup"
 msgstr ""
 
-#: templates/worker_launch.html:484
+#: templates/worker_launch.html:486
 msgid "True"
 msgstr ""
 
-#: templates/worker_launch.html:491
+#: templates/worker_launch.html:493
 msgid "False"
 msgstr ""
 
-#: templates/worker_launch.html:499
+#: templates/worker_launch.html:501
 msgid "Controller IP Address"
 msgstr ""
 
-#: templates/worker_launch.html:504
+#: templates/worker_launch.html:506
 msgid "Controller API Port"
 msgstr ""
 
-#: templates/worker_launch.html:511
+#: templates/worker_launch.html:513
 msgid "Worker Hostname"
 msgstr ""
 
-#: templates/worker_launch.html:516
+#: templates/worker_launch.html:518
 msgid "Worker IP Address"
 msgstr ""
 
-#: templates/worker_launch.html:523
+#: templates/worker_launch.html:525
 msgid "Blockchains to Farm"
 msgstr ""
 
-#: templates/worker_launch.html:636
+#: templates/worker_launch.html:638
 msgid "Volume Mounts"
 msgstr ""
 
-#: templates/worker_launch.html:693
+#: templates/worker_launch.html:695
 msgid "Add New Volume"
 msgstr ""
 
-#: templates/worker_launch.html:695
+#: templates/worker_launch.html:697
 msgid "Remove Last Volume"
 msgstr ""
 
-#: templates/worker_launch.html:702
+#: templates/worker_launch.html:704
 msgid "Copy"
 msgstr ""
 
-#: templates/worker_launch.html:706
+#: templates/worker_launch.html:708
 msgid "Docker Compose"
 msgstr ""
 
@@ -1190,6 +1187,10 @@ msgstr ""
 msgid "Last Successful Ping"
 msgstr ""
 
+#: templates/workers.html:49
+msgid "Logs"
+msgstr ""
+
 #: templates/workers.html:94
 msgid "Prune Selected"
 msgstr ""
@@ -1254,6 +1255,14 @@ msgid ""
 "running. Also please verify settings on the Alerts page."
 msgstr ""
 
+#: templates/farming/workers.html:80 templates/index/index.html:176
+msgid "Previous"
+msgstr ""
+
+#: templates/farming/workers.html:84 templates/index/index.html:180
+msgid "Next"
+msgstr ""
+
 #: templates/farming/workers.html:94
 #, python-format
 msgid ""
@@ -1263,6 +1272,68 @@ msgid ""
 "worker is reporting into the controller on the Workers page."
 msgstr ""
 
+#: templates/index/chart_balances.html:85 templates/index/chart_farmed.html:131
+#: templates/index/chart_netspace.html:91
+#: templates/index/chart_plot_count.html:84
+#: templates/index/chart_plots_size.html:84 templates/plotting/jobs.html:285
+#: templates/views/index_script_block.js:90
+msgid "Date"
+msgstr ""
+
+#: templates/index/chart_balances.html:102
+#: templates/index/chart_farmed.html:148
+#: templates/views/index_script_block.js:107
+msgid "Coins"
+msgstr ""
+
+#: templates/index/chart_farmed.html:48 templates/index/index.html:97
+msgid "Farmed Blocks"
+msgstr ""
+
+#: templates/index/chart_farmed.html:53
+msgid "Plot File"
+msgstr ""
+
+#: templates/index/chart_farmed.html:54
+msgid "Farmed Block"
+msgstr ""
+
+#: templates/index/chart_farmed.html:55
+msgid "Farmed At"
+msgstr ""
+
+#: templates/index/chart_plot_count.html:101 templates/index/index.html:70
+msgid "Plot Count"
+msgstr ""
+
+#: templates/index/index.html:30
+msgid "Expected Time to Win"
+msgstr ""
+
+#: templates/index/index.html:73
+msgid "Total Plots"
+msgstr ""
+
+#: templates/index/index.html:81
+msgid "Total Plots Size"
+msgstr ""
+
+#: templates/index/index.html:101
+msgid "Farmed"
+msgstr ""
+
+#: templates/index/index.html:111
+msgid "Netspace"
+msgstr ""
+
+#: templates/index/index.html:144
+msgid "Challenges from Harvesters"
+msgstr ""
+
+#: templates/index/index.html:162
+msgid "Partial Proofs for Pools"
+msgstr ""
+
 #: templates/plotting/jobs.html:9
 msgid "Confirm Kill"
 msgstr ""
@@ -1354,10 +1425,6 @@ msgstr ""
 msgid "Plotting Speed - k%(k_size)s Plots"
 msgstr ""
 
-#: templates/plotting/jobs.html:285
-msgid "Date"
-msgstr ""
-
 #: templates/plotting/jobs.html:302
 msgid "Time (minutes)"
 msgstr ""
@@ -1413,7 +1480,7 @@ msgid "Archiving is disabled.  See Settings | Plotting page."
 msgstr ""
 
 #: templates/plotting/workers.html:256
-#: templates/views/index_script_block.js:152
+#: templates/views/index_script_block.js:232
 msgid "Time - Last 24 Hours"
 msgstr ""
 
@@ -1499,15 +1566,15 @@ msgstr ""
 msgid "PlotNFT Log on "
 msgstr ""
 
-#: templates/views/index_script_block.js:85
+#: templates/views/index_script_block.js:163
 msgid "Time - Recent"
 msgstr ""
 
-#: templates/views/index_script_block.js:102
+#: templates/views/index_script_block.js:180
 msgid "Time Taken (seconds)"
 msgstr ""
 
-#: templates/views/index_script_block.js:169
+#: templates/views/index_script_block.js:249
 msgid "Partials Submitted"
 msgstr ""
 

From ca6b31bd332215d743dc3ee538419b273f4b4151 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 7 Jun 2022 17:23:19 -0600
Subject: [PATCH 0772/1625] Updates for charts and i18n.

---
 CHANGELOG.md                                  |  2 +-
 api/models/chia.py                            |  2 +-
 .../de_DE/LC_MESSAGES/messages.po             |  2 +-
 .../fr_FR/LC_MESSAGES/messages.po             |  2 +-
 .../it_IT/LC_MESSAGES/messages.po             |  2 +-
 .../nl_NL/LC_MESSAGES/messages.po             |  2 +-
 .../pt_PT/LC_MESSAGES/messages.po             |  2 +-
 api/translations/zh/LC_MESSAGES/messages.po   |  2 +-
 scripts/forks/mmx_install.sh                  |  4 +-
 web/actions/stats.py                          |  4 +-
 web/templates/connections.html                | 29 ++++++-
 web/templates/index/chart_farmed.html         |  4 +-
 web/templates/index/index.html                |  4 +-
 web/templates/plotting/jobs.html              |  9 +-
 .../de_DE/LC_MESSAGES/messages.po             | 83 ++++++++++++-------
 .../fr_FR/LC_MESSAGES/messages.po             | 83 ++++++++++++-------
 .../it_IT/LC_MESSAGES/messages.po             | 83 ++++++++++++-------
 .../nl_NL/LC_MESSAGES/messages.po             | 83 ++++++++++++-------
 .../pt_PT/LC_MESSAGES/messages.po             | 83 ++++++++++++-------
 web/translations/zh/LC_MESSAGES/messages.po   | 80 +++++++++++-------
 20 files changed, 365 insertions(+), 200 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe7368ee..2f2907ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,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).
 
 ## [0.7.3] - 2022-06-?
- - Wallets - chart each blockchain's farmed coins and wallet balances over the past month.
+ - Charting of each blockchain's farmed coins and wallet balances over the past month.
  - [Chia](https://github.com/Chia-Network/chia-blockchain) - v1.3.6 pre-release for testing
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain) - v1.3.4, matches Chia 1.3.4, please run: `cactus db upgrade`
  - [Chives](https://github.com/HiveProject2021/chives-blockchain) - v1.3.1, please run: `chives db upgrade`
diff --git a/api/models/chia.py b/api/models/chia.py
index f4f6ea6c..97eede8b 100644
--- a/api/models/chia.py
+++ b/api/models/chia.py
@@ -97,7 +97,7 @@ def __init__(self, wallets, cold_wallet_addresses={}):
                     'total_balance': total_balance,
                     'updated_at': wallet.updated_at })
             else:
-                app.logger.info("Skipping blockchain {0}".format(wallet.blockchain))
+                app.logger.debug("api.models.Wallets.init(): Skipping blockchain {0}".format(wallet.blockchain))
 
     def exclude_cat_wallets(self, wallet_details):
         details = []
diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po
index 9a81e82a..380d86e2 100644
--- a/api/translations/de_DE/LC_MESSAGES/messages.po
+++ b/api/translations/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-06-06 20:47-0600\n"
+"POT-Creation-Date: 2022-06-07 10:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: ApfelBirneKreis\n"
 "Language: de\n"
diff --git a/api/translations/fr_FR/LC_MESSAGES/messages.po b/api/translations/fr_FR/LC_MESSAGES/messages.po
index a63d5ee7..8c89d452 100644
--- a/api/translations/fr_FR/LC_MESSAGES/messages.po
+++ b/api/translations/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-06-06 20:47-0600\n"
+"POT-Creation-Date: 2022-06-07 10:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: fr\n"
diff --git a/api/translations/it_IT/LC_MESSAGES/messages.po b/api/translations/it_IT/LC_MESSAGES/messages.po
index 7c5c6d4f..afd7fe4f 100644
--- a/api/translations/it_IT/LC_MESSAGES/messages.po
+++ b/api/translations/it_IT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-06-06 20:47-0600\n"
+"POT-Creation-Date: 2022-06-07 10:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Fabrizio Cacicia\n"
 "Language: it\n"
diff --git a/api/translations/nl_NL/LC_MESSAGES/messages.po b/api/translations/nl_NL/LC_MESSAGES/messages.po
index 7c50daac..ac175409 100644
--- a/api/translations/nl_NL/LC_MESSAGES/messages.po
+++ b/api/translations/nl_NL/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
 "Creation-Date: 2022-03-13 10:30-0600\n"
-"POT-Creation-Date: 2022-06-06 20:47-0600\n"
+"POT-Creation-Date: 2022-06-07 10:26-0600\n"
 "PO-Revision-Date: 2022-03-13 10:29-0600\n"
 "Last-Translator: Bernie Deprez\n"
 "Language: nl_NL\n"
diff --git a/api/translations/pt_PT/LC_MESSAGES/messages.po b/api/translations/pt_PT/LC_MESSAGES/messages.po
index cb303b8b..9c233eda 100644
--- a/api/translations/pt_PT/LC_MESSAGES/messages.po
+++ b/api/translations/pt_PT/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-06-06 20:47-0600\n"
+"POT-Creation-Date: 2022-06-07 10:26-0600\n"
 "PO-Revision-Date: 2022-02-13 13:45-0700\n"
 "Last-Translator: Antonio Casqueiro\n"
 "Language: pt\n"
diff --git a/api/translations/zh/LC_MESSAGES/messages.po b/api/translations/zh/LC_MESSAGES/messages.po
index 73e243c1..e183d932 100644
--- a/api/translations/zh/LC_MESSAGES/messages.po
+++ b/api/translations/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Machinaris VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
 "/issuesCreation-Date: 2022-02-16 15:00-0700\n"
-"POT-Creation-Date: 2022-06-06 20:47-0600\n"
+"POT-Creation-Date: 2022-06-07 10:26-0600\n"
 "PO-Revision-Date: 2022-02-15 14:29-0700\n"
 "Last-Translator: Guy Davis\n"
 "Language: zh\n"
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index c53561bf..83321d63 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-06-02
-HASH=f8ea5be1b2fb61160898d0164cad152da25f4c45
+# On 2022-06-07
+HASH=7b2a969adc382aff9d7b736dd3883e8c09fdcf74
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
diff --git a/web/actions/stats.py b/web/actions/stats.py
index 80fe9ddd..c5130621 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -407,13 +407,13 @@ def load_wallet_balances(blockchain):
     for i in range(len(result)):
         s = result[i]
         converted_date = converters.convert_date_for_luxon(s.created_at)
-        if (last_value != s.value) or (i % 24 == 0) or (i == len(result) - 1):
+        if (last_value != s.value) or ((i + 12) % 24 == 0) or (i == len(result) - 1):
             dates.append(converted_date)
             values.append(s.value)
             last_value = s.value
     #app.logger.info(dates)
     #app.logger.info(values)
-    return { 'title': blockchain.capitalize() + ' - ' + _('Wallet Balances'), 'dates': dates, 'vals': values}
+    return { 'title': blockchain.capitalize() + ' - ' + _('Total Balance'), 'dates': dates, 'vals': values}
 
 def load_netspace_size(blockchain):
     dates = []
diff --git a/web/templates/connections.html b/web/templates/connections.html
index 8b682b75..3e47934c 100644
--- a/web/templates/connections.html
+++ b/web/templates/connections.html
@@ -77,11 +77,11 @@ 
         {% endfor %}
     
 
-{% if maxmind_license %}
-
 

     

         
{{_('Connections Map')}}

+
+{% if maxmind_license %}
         

             

                 

 
 

 
-

-    {{_('Connection Details')}}
+{% else %}
+    

 
 
+

+    
+        
+    
+    
{{_('Map your network peers around the world')}}...

+    {% autoescape false %}
+    
{{_('To get started, you\'ll need a %(maxmind_link)s%(b_tag_open)sFREE%(b_tag_close)s Maxmind account%(a_tag_close)s to 
+        allow Machinaris to geolocate your network peer IP addresses. %(i_tag_open)sOptionally%(i_tag_close)s, you can also get
+        better looking map tiles with a %(mapbox_link)s%(b_tag_open)sFREE%(b_tag_close)s Mapbox account%(a_tag_close)s.',
+        maxmind_link='',
+        mapbox_link='',
+        i_tag_open='', i_tag_close='', b_tag_open='', b_tag_close='', a_tag_close='')}}
+        {{_('To enter your map account details, click the Settings (gear icon) button on the top-right of this page.')}}
+    

+    {% endautoescape %}
+    

+

 {% endif %}
 
+

+    {{_('Connection Details')}}
+

+
     {% if connections.rows|length > 0 %}
     
diff --git a/web/utils.py b/web/utils.py
index d92b4263..87571814 100644
--- a/web/utils.py
+++ b/web/utils.py
@@ -71,3 +71,8 @@ def get_hostname():
 
 def is_controller():
     return app.config['CONTROLLER_HOST'] == "localhost"
+
+def convert_chia_ip_address(chia_ip_address):
+    if chia_ip_address in ['127.0.0.1']:
+        return get_hostname()
+    return chia_ip_address  # TODO Map duplicated IPs from docker internals...
\ No newline at end of file

From 500e070e3c23d73eabf862d9439665ccb8594e20 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 16 Sep 2022 09:30:46 -0600
Subject: [PATCH 0974/1625] Setup page: prevent browser client-side caching of
 mnemonic on re-installs with autocomplete="off".  Thanks @Baatezu

---
 web/templates/setup.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/templates/setup.html b/web/templates/setup.html
index cdb5f6f0..68dcfdfc 100644
--- a/web/templates/setup.html
+++ b/web/templates/setup.html
@@ -82,9 +82,9 @@
                         {% else %}
 
                         
{{_('To get started with Machinaris as a Chia%(trademark)s fullnode, either import your existing 24-word mnemonic seed phrase', trademark='™')}}: 

-                        
+                        
                         

-                            
                             


From 29083482fb6b2f3627a2511d4189293b87c1af0d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 16 Sep 2022 19:53:11 -0600
Subject: [PATCH 0975/1625] Cactus and MMX updates.

---
 CHANGELOG.md                    | 3 ++-
 scripts/forks/cactus_install.sh | 4 ++--
 scripts/forks/mmx_install.sh    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c031f66..26304081 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file. The format
 - Scaling-Down: Optional mode where wallets are synced daily, not run 24/7.  Saves ~35% memory so smaller farmers can farm more blockchains concurrently on the same machine. See Wallets page, top-right Settings.
 - Scaling-Up: Improved plot tracking efficiency for multi-PB sized farms.
 - Warnings for duplicated, invalid, or key-less plots.  See Farming page.
-- Update: [Flax](https://github.com/Flax-Network/flax-blockchain) to v0.1.10
+- Update: [Flax](https://github.com/Flax-Network/flax-blockchain) to v0.1.10, [Cactus](https://github.com/Cactus-Network/cactus-blockchain) to v1.5.2
+- Security: Disable Setup page's mnemonic import field autocomplete from caching value in your local browser. Thanks @Baatezu!
 - Fixes: Better handling of farmed block logging for certain blockchains like Apple & BPX, Alerts from Chia 1.5.1 for added coins missing due to blockchain logging changes.  Improved Smartctl response processing.
 
 ## [0.8.3] - 2022-08-23
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index 7c0b3c20..31d4e313 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2022-08-20
-HASH=b758b13d3d88f8076e99671e641f9402cd7c05ea
+# On 2022-09-16
+HASH=b006b43ef4bf5b1be114a5648f56db966733e74d
 
 if [ -z ${CACTUS_BRANCH} ]; then
 	echo 'Skipping Cactus install as not requested.'
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 322c2001..e20cc079 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-09-07
-HASH=d0f91e87a8faada3d006a995dac2eba49b76f31d
+# On 2022-09-16
+HASH=d6160e8c701afeaed723c487f002f2e73c44b25d
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'

From df6bd95f5d987b0f368f48647c547cc5036f65f9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 17 Sep 2022 06:54:37 -0600
Subject: [PATCH 0976/1625] Update staicoin_install.sh

Staicoin 1.2.3 emergency release due them letting their SSL certificate expire.
---
 scripts/forks/staicoin_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/staicoin_install.sh b/scripts/forks/staicoin_install.sh
index fcaf51f0..fc3e35cc 100644
--- a/scripts/forks/staicoin_install.sh
+++ b/scripts/forks/staicoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 STAICOIN_BRANCH=$1
-# On 2022-04-23
-HASH=b8686c75dd5fe7883115d9613858c9c8cadfc4a7
+# On 2022-09-17
+HASH=4808632d8147b1fb8ec9ec7aad5a80f86a509b3d
 
 if [ -z ${STAICOIN_BRANCH} ]; then
 	echo 'Skipping Staicoin install as not requested.'

From bb55add0a4e42eae98cc66c35823c0d51d09e405 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 17 Sep 2022 07:12:42 -0600
Subject: [PATCH 0977/1625] Cactus lost backwards compatibility for `cactus
 keys add` CLI.

---
 scripts/forks/cactus_launch.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/forks/cactus_launch.sh b/scripts/forks/cactus_launch.sh
index fc56079f..b1e9045c 100644
--- a/scripts/forks/cactus_launch.sh
+++ b/scripts/forks/cactus_launch.sh
@@ -37,12 +37,14 @@ if [ -f /root/.cactus/mainnet/config/config.yaml ]; then
 fi
 
 # Loop over provided list of key paths
+label_num = 0
 for k in ${keys//:/ }; do
   if [[ "${k}" == "persistent" ]]; then
     echo "Not touching key directories."
   elif [ -s ${k} ]; then
-    echo "Adding key at path: ${k}"
-    cactus keys add -f ${k} > /dev/null
+    echo "Adding key #${label_num} at path: ${k}"
+    cactus keys add -l "key_${label_num}" -f ${k} > /dev/null
+    ((label_num=label_num+1))
   fi
 done
 

From 80bbaaef7e521fd9879a04fc05bb07dcd14ccc73 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 17 Sep 2022 11:19:02 -0600
Subject: [PATCH 0978/1625] Stop polling for market prices from Posat as its
 dead. Using ATB and Vayamos still.

---
 api/commands/rpc.py            | 8 ++++----
 api/commands/websvcs.py        | 6 +++---
 scripts/forks/cactus_launch.sh | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/commands/rpc.py b/api/commands/rpc.py
index aa0baadc..49ed93b6 100644
--- a/api/commands/rpc.py
+++ b/api/commands/rpc.py
@@ -342,7 +342,7 @@ async def _load_transactions(self, wallet_id, reverse):
             app.logger.info("Error getting transactions via RPC: {0}".format(str(ex)))
         return transactions
 
-    # Get warnings about problem plots
+    # Get warnings about problem plots, only first 100 warnings each to avoid overwhelming the user
     async def _load_harvester_warnings(self):
         harvesters = {}
         try:
@@ -370,7 +370,7 @@ async def _load_harvester_warnings(self):
 
                 invalid_plots = []
                 results = await farmer.get_harvester_plots_invalid(PlotPathRequestData(bytes.fromhex(node_id[2:]), 0, 1000))
-                invalid_plots.extend(results['plots'])
+                invalid_plots.extend(results['plots'][:100])
                 farmer.close()
                 await farmer.await_closed()
 
@@ -380,7 +380,7 @@ async def _load_harvester_warnings(self):
                 )
                 missing_keys = []
                 results = await farmer.get_harvester_plots_keys_missing(PlotPathRequestData(bytes.fromhex(node_id[2:]), 0, 1000))
-                missing_keys.extend(results['plots'])
+                missing_keys.extend(results['plots'][:100])
                 farmer.close()
                 await farmer.await_closed()
 
@@ -390,7 +390,7 @@ async def _load_harvester_warnings(self):
                 )
                 duplicate_plots = []
                 results = await farmer.get_harvester_plots_duplicates(PlotPathRequestData(bytes.fromhex(node_id[2:]), 0, 1000))
-                duplicate_plots.extend(results['plots'])
+                duplicate_plots.extend(results['plots'][:100])
                 farmer.close()
                 await farmer.await_closed()
 
diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 929b0bb6..a7f55903 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -325,8 +325,8 @@ def request_vayamos_prices(debug=False):
                 if not market['pair'].endswith('USDT'):
                     continue # Skip other market pairs than USDT
                 for blockchain in SUPPORTED_BLOCKCHAINS:
-                    posat_symbol = globals.get_blockchain_symbol(blockchain).upper()
-                    if market['base'] == posat_symbol:
+                    vayamos_symbol = globals.get_blockchain_symbol(blockchain).upper()
+                    if market['base'] == vayamos_symbol:
                         #app.logger.info("VAYAMOS: {0} @ {1}".format(blockchain, market['price']))
                         try:
                             prices[blockchain] = float(market['price'])
@@ -367,7 +367,7 @@ def get_prices():
         try:
             last_price_request_time = datetime.datetime.now()
             store_exchange_prices(prices, 'alltheblocks', request_atb_prices(), last_price_request_time)
-            store_exchange_prices(prices, 'posat', request_posat_prices(), last_price_request_time)
+            #store_exchange_prices(prices, 'posat', request_posat_prices(), last_price_request_time) # Dead as of Sept 2022
             store_exchange_prices(prices, 'vayamos', request_vayamos_prices(), last_price_request_time)
             save_prices_cache(prices)
         except Exception as ex:
diff --git a/scripts/forks/cactus_launch.sh b/scripts/forks/cactus_launch.sh
index b1e9045c..fe088134 100644
--- a/scripts/forks/cactus_launch.sh
+++ b/scripts/forks/cactus_launch.sh
@@ -37,7 +37,7 @@ if [ -f /root/.cactus/mainnet/config/config.yaml ]; then
 fi
 
 # Loop over provided list of key paths
-label_num = 0
+label_num=0
 for k in ${keys//:/ }; do
   if [[ "${k}" == "persistent" ]]; then
     echo "Not touching key directories."

From cb0657110a876609fd5b5181dbc4734e94995d90 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 17 Sep 2022 11:58:34 -0600
Subject: [PATCH 0979/1625] Sqlite3 bulk_save_objects for plot status.

---
 api/schedules/status_plots.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index 7b9c1591..785e8ff6 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -103,7 +103,7 @@ def save_duplicate_plots(duplicated_plots):
         app.logger.error('Failed to send duplicated plots warnings due to '+ str(ex))
 
 def update_chia_plots(plots_status, since):
-    payload = []
+    items = []
     time_start = time.time()
     memory_start = utils.current_memory_megabytes()
     try:
@@ -140,7 +140,7 @@ def update_chia_plots(plots_status, since):
                 add_duplicate_plots(duplicate_plots, file, plot['hostname'], dir, plots_by_id[short_plot_id]['hostname'], plots_by_id[short_plot_id]['path'])
             plots_by_id[short_plot_id] = { 'hostname': plot['hostname'], 'worker': displayname, 'path': dir, 'file': file }
             if not duplicated_on_same_host and (not since or created_at > since):
-                payload.append({
+                items.append(p.Plot(**{
                     "plot_id": short_plot_id,
                     "blockchain": 'chia',
                     "hostname": plot['hostname'] if plot['hostname'] in ['127.0.0.1'] else plot['hostname'],
@@ -152,15 +152,13 @@ def update_chia_plots(plots_status, since):
                     "plot_analyze": analyze_status(plots_status, short_plot_id),
                     "plot_check": check_status(plots_status, short_plot_id),
                     "size": plot['file_size']
-                })
-        if len(payload) > 0:
+                }))
+        if len(items) > 0:
             memory_prestore = utils.current_memory_megabytes()
-            app.logger.info("PLOT STATUS: About to store {0} Chia plots.".format(len(payload)))
+            app.logger.info("PLOT STATUS: About to store {0} Chia plots.".format(len(items)))
             try:
-                for new_item in payload: # Maximum of chunk_size plots inserted at a time.
-                    item = p.Plot(**new_item)
-                    db.session.add(item)
-                db.session.commit() # Commit every chunk size
+                db.session.bulk_save_objects(items)
+                db.session.commit() 
             except Exception as ex:
                 app.logger.error("PLOT STATUS: Failed to store batch of Chia plots being farmed [{0}:{1}] because {2}".format(i, i+chunk_size, str(ex)))
         if not since: # Save current duplicate plots
@@ -170,8 +168,8 @@ def update_chia_plots(plots_status, since):
         traceback.print_exc()
     memory_afterward = utils.current_memory_megabytes()
     del plots_farming
-    if payload:
-        del payload
+    if items:
+        del items
         gc.collect()
         app.logger.info("PLOT STATUS: In {3} seconds, memory went from {0} MB to {2} MB, {1} MB at prestore.".format(
             memory_start, memory_prestore, memory_afterward, (round(time.time()-time_start, 2))))

From ebff13b8f5c1a9cd579a08107e8b307bf1ca8704 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 17 Sep 2022 15:23:07 -0600
Subject: [PATCH 0980/1625] Garbage collect other dictionary.

---
 api/schedules/status_plots.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index 785e8ff6..ac050c95 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -166,11 +166,12 @@ def update_chia_plots(plots_status, since):
     except Exception as ex:
         app.logger.error("PLOT STATUS: Failed to load Chia plots being farmed because {0}".format(str(ex)))
         traceback.print_exc()
-    memory_afterward = utils.current_memory_megabytes()
     del plots_farming
+    del plots_by_id
     if items:
         del items
         gc.collect()
+        memory_afterward = utils.current_memory_megabytes()
         app.logger.info("PLOT STATUS: In {3} seconds, memory went from {0} MB to {2} MB, {1} MB at prestore.".format(
             memory_start, memory_prestore, memory_afterward, (round(time.time()-time_start, 2))))
     

From 972379f0747df1cdd4355ec9921e37bae03db6b4 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 17 Sep 2022 16:35:58 -0600
Subject: [PATCH 0981/1625] Further memory logging.

---
 api/schedules/status_plots.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index ac050c95..a1c86010 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -103,14 +103,15 @@ def save_duplicate_plots(duplicated_plots):
         app.logger.error('Failed to send duplicated plots warnings due to '+ str(ex))
 
 def update_chia_plots(plots_status, since):
-    items = []
     time_start = time.time()
     memory_start = utils.current_memory_megabytes()
+    memory_prestore = None
     try:
         if not since:  # If no filter, delete all for this blockchain before storing again
             db.session.query(p.Plot).filter(p.Plot.blockchain=='chia').delete()
             db.session.commit()
         blockchain_rpc = rpc.RPC()
+        items = []
         plots_farming = blockchain_rpc.get_all_plots()
         plots_by_id = {}
         duplicate_plots = {}
@@ -153,7 +154,7 @@ def update_chia_plots(plots_status, since):
                     "plot_check": check_status(plots_status, short_plot_id),
                     "size": plot['file_size']
                 }))
-        if len(items) > 0:
+        if items:
             memory_prestore = utils.current_memory_megabytes()
             app.logger.info("PLOT STATUS: About to store {0} Chia plots.".format(len(items)))
             try:
@@ -170,10 +171,14 @@ def update_chia_plots(plots_status, since):
     del plots_by_id
     if items:
         del items
-        gc.collect()
-        memory_afterward = utils.current_memory_megabytes()
+    gc.collect()
+    memory_afterward = utils.current_memory_megabytes()
+    if memory_prestore:  # Full re-sync
         app.logger.info("PLOT STATUS: In {3} seconds, memory went from {0} MB to {2} MB, {1} MB at prestore.".format(
             memory_start, memory_prestore, memory_afterward, (round(time.time()-time_start, 2))))
+    else: # Only new plots added, if any
+        app.logger.info("PLOT STATUS: In {2} seconds, memory went from {0} MB to {1} MB.".format(
+            memory_start, memory_afterward, (round(time.time()-time_start, 2))))
     
 # Sent from a separate fullnode container
 def update_chives_plots(since):

From 9567995b69aa85aa93435f373dedb3ff5cf6bcfc Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 18 Sep 2022 17:04:12 -0600
Subject: [PATCH 0982/1625] Test harness that loads 120k plot status records to
 check memory and performance.

---
 CHANGELOG.md                  |  2 +-
 api/commands/rpc.py           | 20 +++++++++++++++++++-
 api/gunicorn.conf.py          |  2 +-
 api/schedules/status_plots.py | 29 ++++++++++++++++-------------
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26304081..940ab295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.8.4] - 2022-09-?
 - Scaling-Down: Optional mode where wallets are synced daily, not run 24/7.  Saves ~35% memory so smaller farmers can farm more blockchains concurrently on the same machine. See Wallets page, top-right Settings.
-- Scaling-Up: Improved plot tracking efficiency for multi-PB sized farms.
+- Scaling-Up: Improved plot tracking efficiency for multi-PB sized farms. Thanks @grobalt!
 - Warnings for duplicated, invalid, or key-less plots.  See Farming page.
 - Update: [Flax](https://github.com/Flax-Network/flax-blockchain) to v0.1.10, [Cactus](https://github.com/Cactus-Network/cactus-blockchain) to v1.5.2
 - Security: Disable Setup page's mnemonic import field autocomplete from caching value in your local browser. Thanks @Baatezu!
diff --git a/api/commands/rpc.py b/api/commands/rpc.py
index 49ed93b6..c6acbe25 100644
--- a/api/commands/rpc.py
+++ b/api/commands/rpc.py
@@ -7,6 +7,7 @@
 import importlib
 import os
 import traceback
+import uuid
 
 from common.config import globals
 from api import app
@@ -200,6 +201,19 @@ def __init__(self):
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
 
+    # Used to load all plots on all harvesters
+    def get_all_plots_test_harness(self):
+        testing_plots = []
+        for i in range(240): # 240 x 500 is 120000 plots
+            for plot in asyncio.run(self._load_all_plots())[:500]:
+                #old_plot_name = plot['filename']
+                plot['plot_id'] = str(uuid.uuid4())[:16] # Generate a unique plot
+                idx = plot['filename'].rindex('-')
+                plot['filename'] = plot['filename'][:idx+1] + plot['plot_id'] + plot['filename'][idx+17:]
+                #app.logger.info("{0} -> {1}".format(old_plot_name, plot['filename']))
+                testing_plots.append(plot)
+        return testing_plots
+
     # Used to load all plots on all harvesters
     def get_all_plots(self):
         plots_via_rpc = asyncio.run(self._load_all_plots())
@@ -207,11 +221,15 @@ def get_all_plots(self):
 
     # Get all wallet info
     def get_wallets(self):
+        if not globals.wallet_running():
+            return []
         wallets = asyncio.run(self._load_wallets())
         return wallets
 
     # Get transactions for a particular wallet
     def get_transactions(self, wallet_id, reverse=False):
+        if not globals.wallet_running():
+            return []
         if globals.legacy_blockchain(globals.enabled_blockchains()[0]):
             transactions = asyncio.run(self._load_transactions_legacy_blockchains(wallet_id, reverse))
         else:
@@ -264,7 +282,7 @@ async def _load_all_plots(self):
                 # app.logger.info(harvester['connection']) Returns: {'host': '192.168.1.100', 'node_id': '602eb9...90378', 'port': 62599}
                 host = utils.convert_chia_ip_address(harvester["connection"]["host"])
                 plots = harvester["plots"]
-                app.logger.info("Listing plots found {0} plots on {1}.".format(len(plots), host))
+                #app.logger.info("Listing plots found {0} plots on {1}.".format(len(plots), host))
                 for plot in plots:
                     all_plots.append({
                         "hostname": host,
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 84d2f9a0..347210f8 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -87,7 +87,7 @@ def on_starting(server):
         scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0)  # Hourly
         
     # Testing only
-    #scheduler.add_job(func=status_plotnfts.update, name="status_plotnfts", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=status_plots.update, name="status_plots", trigger='interval', seconds=60) # Test immediately
     #scheduler.add_job(func=stats_blocks.collect, name="stats_blocks", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_effort.collect, name="stats_effort", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index a1c86010..0b0ebbc8 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -106,6 +106,7 @@ def update_chia_plots(plots_status, since):
     time_start = time.time()
     memory_start = utils.current_memory_megabytes()
     memory_prestore = None
+    plots_farming = None
     try:
         if not since:  # If no filter, delete all for this blockchain before storing again
             db.session.query(p.Plot).filter(p.Plot.blockchain=='chia').delete()
@@ -129,6 +130,7 @@ def update_chia_plots(plots_status, since):
                     displayname = plot['hostname']
                 displaynames[plot['hostname']] = displayname
             short_plot_id,dir,file,created_at = get_plot_attrs(plot['plot_id'], plot['filename'])
+            #app.logger.info("{0} -> {1}".format(short_plot_id, file))
             duplicated_on_same_host = False
             if not since and short_plot_id in plots_by_id:  # Only check for duplicates on full load
                 if plot['hostname'] == plots_by_id[short_plot_id]['hostname']:
@@ -161,24 +163,25 @@ def update_chia_plots(plots_status, since):
                 db.session.bulk_save_objects(items)
                 db.session.commit() 
             except Exception as ex:
-                app.logger.error("PLOT STATUS: Failed to store batch of Chia plots being farmed [{0}:{1}] because {2}".format(i, i+chunk_size, str(ex)))
+                app.logger.error("PLOT STATUS: Failed to store Chia plots being farmed because {0}".format(str(ex)))
         if not since: # Save current duplicate plots
             save_duplicate_plots(duplicate_plots)
     except Exception as ex:
         app.logger.error("PLOT STATUS: Failed to load Chia plots being farmed because {0}".format(str(ex)))
         traceback.print_exc()
-    del plots_farming
-    del plots_by_id
-    if items:
-        del items
-    gc.collect()
-    memory_afterward = utils.current_memory_megabytes()
-    if memory_prestore:  # Full re-sync
-        app.logger.info("PLOT STATUS: In {3} seconds, memory went from {0} MB to {2} MB, {1} MB at prestore.".format(
-            memory_start, memory_prestore, memory_afterward, (round(time.time()-time_start, 2))))
-    else: # Only new plots added, if any
-        app.logger.info("PLOT STATUS: In {2} seconds, memory went from {0} MB to {1} MB.".format(
-            memory_start, memory_afterward, (round(time.time()-time_start, 2))))
+    finally:
+        del plots_farming
+        del plots_by_id
+        if items:
+            del items
+        gc.collect()
+        memory_afterward = utils.current_memory_megabytes()
+        if memory_prestore:  # Full re-sync
+            app.logger.info("PLOT STATUS: In {3} seconds, memory went from {0} MB to {2} MB, {1} MB at prestore.".format(
+                memory_start, memory_prestore, memory_afterward, (round(time.time()-time_start, 2))))
+        else: # Only new plots added, if any
+            app.logger.info("PLOT STATUS: In {2} seconds, memory went from {0} MB to {1} MB.".format(
+                memory_start, memory_afterward, (round(time.time()-time_start, 2))))
     
 # Sent from a separate fullnode container
 def update_chives_plots(since):

From 157a401a5daf8b6fa3f8d70f50a52e99a7048a97 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 19 Sep 2022 13:39:55 -0600
Subject: [PATCH 0983/1625] Logging for balance duplication issue.

---
 api/commands/rpc.py             |  2 +-
 api/commands/websvcs.py         |  4 +++-
 api/schedules/stats_balances.py |  5 ++++-
 api/schedules/stats_effort.py   |  2 ++
 web/models/chia.py              |  1 +
 web/templates/blockchains.html  | 10 ++++++++--
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/api/commands/rpc.py b/api/commands/rpc.py
index c6acbe25..eebb06ac 100644
--- a/api/commands/rpc.py
+++ b/api/commands/rpc.py
@@ -201,7 +201,7 @@ def __init__(self):
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
 
-    # Used to load all plots on all harvesters
+    # Used to load all plots on all harvesters when testing performance of 100,000+ inserts
     def get_all_plots_test_harness(self):
         testing_plots = []
         for i in range(240): # 240 x 500 is 120000 plots
diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index a7f55903..193c3896 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -59,7 +59,7 @@ def load_cold_wallet_cache():
     return data
 
 def save_cold_wallet_cache(cold_wallet_cache):
-    app.logger.debug("Saving cold wallet cache: {0}".format(cold_wallet_cache))
+    app.logger.info("Saving cold wallet cache: {0}".format(cold_wallet_cache))
     try:
         with open(COLD_WALLET_CACHE_FILE, 'w') as f:
             json.dump(cold_wallet_cache, f)
@@ -180,6 +180,7 @@ def cold_wallet_balance(blockchain):
                 app.logger.error("Failed to request cold wallet balance for {0} due to {1}".format(cold_blockchain, str(ex)))
         save_cold_wallet_cache(cold_wallet_cache)
     # Now for that specific blockchain, check for a cold wallet balance in the cache
+    total_balance = 0.0
     if blockchain in addresses_per_blockchain:
         for address in addresses_per_blockchain[blockchain]:
             if address in cold_wallet_cache:
@@ -191,6 +192,7 @@ def cold_wallet_balance(blockchain):
                 except Exception as ex:
                     app.logger.info("During cold balance lookup, deleting old cold wallet cache file with legacy format. {0}".format(str(ex)))
                     os.remove(COLD_WALLET_CACHE_FILE)
+        app.logger.info("Returning {0} cold wallet balance of {1}".format(blockchain, total_balance))
         return total_balance
     return 0.0 # No cold wallet addresses to check, so no errors obviously
 
diff --git a/api/schedules/stats_balances.py b/api/schedules/stats_balances.py
index b32867be..6c0f10f5 100644
--- a/api/schedules/stats_balances.py
+++ b/api/schedules/stats_balances.py
@@ -60,7 +60,8 @@ def collect():
                     cold_wallet_balance_error = True  # Skip recording a balance data point for this blockchain
                     app.logger.error("No wallet balance recorded. Received an erroneous cold wallet balance for {0} wallet. Please correct the address and verify at https://alltheblocks.net".format(wallet['blockchain']))
                     continue # Don't save a data point if part of the sum is missing due to error
-            app.logger.debug("Fiat total is {0} {1}".format(round(fiat_total, 2), currency_symbol))
+            if wallet['blockchain'] == 'chia':
+                app.logger.info("From {0} wallet rows, fiat total (including cold wallet balance) is {1} {2}".format(len(wallets.rows), round(fiat_total, 2), currency_symbol))
             if not cold_wallet_balance_error: # Don't record a total across all wallets if one is temporarily erroring out
                 store_total_locally(round(fiat_total, 2), currency_symbol, current_datetime)
         except:
@@ -68,6 +69,8 @@ def collect():
             app.logger.info(traceback.format_exc())
 
 def store_balance_locally(blockchain, wallet_balance, current_datetime):
+    if blockchain == 'chia':
+        app.logger.info("Storing Chia total wallet balance (including cold wallet balance) of {0}".format(wallet_balance))
     try:
         db.session.add(stats.StatWalletBalances(
             hostname=utils.get_hostname(),
diff --git a/api/schedules/stats_effort.py b/api/schedules/stats_effort.py
index 62ddd594..6de3c607 100644
--- a/api/schedules/stats_effort.py
+++ b/api/schedules/stats_effort.py
@@ -61,6 +61,8 @@ def collect():
                 return
             farm_summary = chia_cli.load_farm_summary(blockchain)
             wallets = blockchain_rpc.get_wallets()
+            if len(wallets) < 1:  # If no wallet status returned, then no effort stat to record.
+                return
             transactions = blockchain_rpc.get_transactions(wallets[0]['id'], reverse=True) # Search primary wallet only
             most_recent_block_reward_time = None
             for transaction in transactions:  # Order is reversed; newest to oldest
diff --git a/web/models/chia.py b/web/models/chia.py
index 237bbec7..2539b532 100644
--- a/web/models/chia.py
+++ b/web/models/chia.py
@@ -625,6 +625,7 @@ def extract_status(self, blockchain, details, worker_status):
                     if 'No' == status: # MMX
                         return "Syncing" 
                     return status
+            return "Error"
         return "Offline"
 
     def extract_height(self, blockchain, details):
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index b1c1b363..e9119847 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -124,10 +124,16 @@ 
                 
                 
                     {% if blockchain.status == 'Offline' %}
-                         {{blockchain.status}}
+                         {{_('Offline')}}
                     {% elif blockchain.status.lower().startswith('synced') %}
                       
-                        {{blockchain.status}}
+                        {{_('Synced')}}
+                    {% elif blockchain.status.lower().startswith('not synced') or blockchain.status.lower().startswith('syncing')  %}
+                      
+                        {{_('Syncing')}}
+                    {% elif blockchain.status.lower().startswith('error') %}
+                      
+                        {{_('Error')}}
                     {% else %}
                       
                         {{blockchain.status}}

From 71905f867f576d1f895d3e19e59bc1d25fb898da Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 19 Sep 2022 18:15:05 -0600
Subject: [PATCH 0984/1625] Tweak color of "Not Synced" blockchains status.

---
 scripts/forks/mmx_install.sh   | 4 ++--
 web/templates/blockchains.html | 5 ++++-
 web/templates/summary.html     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index e20cc079..17fb4f25 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-09-16
-HASH=d6160e8c701afeaed723c487f002f2e73c44b25d
+# On 2022-09-19
+HASH=1d39de976d57aae0b3655d72642bcdf110d4610c
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index e9119847..10c6c067 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -128,7 +128,10 @@ 
                     {% elif blockchain.status.lower().startswith('synced') %}
                       
                         {{_('Synced')}}
-                    {% elif blockchain.status.lower().startswith('not synced') or blockchain.status.lower().startswith('syncing')  %}
+                    {% elif blockchain.status.lower().startswith('not synced') %}
+                      
+                        {{_('Not Synced')}}
+                    {% elif blockchain.status.lower().startswith('syncing')  %}
                       
                         {{_('Syncing')}}
                     {% elif blockchain.status.lower().startswith('error') %}
diff --git a/web/templates/summary.html b/web/templates/summary.html
index 406b0abd..482488e2 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -106,7 +106,7 @@ 
                     {% elif summary.status.lower().startswith('syncing') %}
                          {{_('Syncing')}}
                     {% elif summary.status.lower().startswith('not synced') %}
-                         {{_('Not Synced')}}
+                         {{_('Not Synced')}}
                     {% else %}
                        {{summary.status}}
                     {% endif %}  

From 68d390e489ab7b8448070db0fbbccb67d27a1918 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 19 Sep 2022 21:27:57 -0600
Subject: [PATCH 0985/1625] Testing updated fd-cli versions.

---
 .github/workflows/develop-shibgreen.yaml | 1 +
 docker/dockerfile                        | 1 +
 docker/dockerfile-jammy.base             | 1 +
 docker/entrypoint.sh                     | 2 +-
 scripts/fd-cli_setup.sh                  | 8 +++++---
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/develop-shibgreen.yaml b/.github/workflows/develop-shibgreen.yaml
index 75c260a3..0931ac11 100644
--- a/.github/workflows/develop-shibgreen.yaml
+++ b/.github/workflows/develop-shibgreen.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "SHIBGREEN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-shibgreen:develop
diff --git a/docker/dockerfile b/docker/dockerfile
index 210796f4..f5de3fe1 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -5,6 +5,7 @@ FROM ghcr.io/guydavis/machinaris-base-${UBUNTU_VER}:${MACHINARIS_STREAM}
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG CHIADOG_BRANCH=main
+ARG FDCLI_BRANCH=master
 ARG BLADEBIT_BRANCH=master
 
 ARG APPLE_BRANCH
diff --git a/docker/dockerfile-jammy.base b/docker/dockerfile-jammy.base
index 1941dadb..9f27ebed 100644
--- a/docker/dockerfile-jammy.base
+++ b/docker/dockerfile-jammy.base
@@ -12,6 +12,7 @@ RUN apt-get update \
 		bc \
 		ca-certificates \
 		cifs-utils \
+		cmake \
 		curl \
 		git \
 		iproute2 \
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b904db8d..42b8b840 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -81,7 +81,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   /usr/bin/bash /machinaris/scripts/farmr_setup.sh > /tmp/farmr_setup.log 2>&1
 
   # Conditionally install fd-cli on fullnodes, excluding Chia and Chives
-  /usr/bin/bash /machinaris/scripts/fd-cli_setup.sh > /tmp/fd-cli_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/fd-cli_setup.sh ${FDCLI_BRANCH} > /tmp/fd-cli_setup.log 2>&1
 
   # Conditionally build bladebit on plotters and fullnodes, sleep a bit first
   /usr/bin/bash /machinaris/scripts/bladebit_setup.sh ${BLADEBIT_BRANCH} > /tmp/bladebit_setup.log 2>&1
diff --git a/scripts/fd-cli_setup.sh b/scripts/fd-cli_setup.sh
index 58999f0a..b26c82a5 100644
--- a/scripts/fd-cli_setup.sh
+++ b/scripts/fd-cli_setup.sh
@@ -6,13 +6,15 @@
 #
 
 # On 2021-11-08
-HASH=e99cf3c9d39d0a6c71ee0f92f11034f0b5516df7
+HASH=c9f562728acde289d3406d5cdc5a1139fd4267c8
+
+FDCLI_BRANCH=$1
 
 if [[ ${mode} == 'fullnode' ]]; then
     if [[ "${blockchains}" != 'chia' ]] && [[ "${blockchains}" != 'chives' ]] && [[ "${blockchains}" != 'mmx' ]]; then
         cd /
-        git clone https://github.com/Flora-Network/fd-cli.git
-        cd fd-cli
+        git clone --branch ${FDCLI_BRANCH} https://github.com/guydavis/flora-dev-cli.git
+        cd flora-dev-cli
         git checkout $HASH
         pip install -e . --extra-index-url https://pypi.chia.net/simple/
     fi

From d1facf43f89fa0edca9b2ba24e8a388d6e42dd4a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 19 Sep 2022 21:43:44 -0600
Subject: [PATCH 0986/1625] Test with BTCGreen as well.

---
 .github/workflows/develop-btcgreen.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/develop-btcgreen.yaml b/.github/workflows/develop-btcgreen.yaml
index 41e4bcab..f7f39214 100644
--- a/.github/workflows/develop-btcgreen.yaml
+++ b/.github/workflows/develop-btcgreen.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "BTCGREEN_BRANCH=main"     
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-btcgreen:develop

From 62855106d19aeed377397b3711eeea6fe8f6b5c5 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 20 Sep 2022 09:34:09 -0600
Subject: [PATCH 0987/1625] More fdccli update testing.

---
 docker/dockerfile       | 1 +
 scripts/fd-cli_setup.sh | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index f5de3fe1..c24675b2 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -120,6 +120,7 @@ ENV FLASK_ENV=production
 ENV XDG_CONFIG_HOME=/root/.chia
 ENV AUTO_PLOT=false
 ENV CHIADOG_BRANCH=${CHIADOG_BRANCH}
+ENV FDCLI_BRANCH=${FDCLI_BRANCH}
 ENV BLADEBIT_BRANCH=${BLADEBIT_BRANCH}
 
 VOLUME [ "/id_rsa" ]
diff --git a/scripts/fd-cli_setup.sh b/scripts/fd-cli_setup.sh
index b26c82a5..e46de44c 100644
--- a/scripts/fd-cli_setup.sh
+++ b/scripts/fd-cli_setup.sh
@@ -5,9 +5,6 @@
 # Not needed on either the Chia or Chives images, only other forks.
 #
 
-# On 2021-11-08
-HASH=c9f562728acde289d3406d5cdc5a1139fd4267c8
-
 FDCLI_BRANCH=$1
 
 if [[ ${mode} == 'fullnode' ]]; then
@@ -15,7 +12,6 @@ if [[ ${mode} == 'fullnode' ]]; then
         cd /
         git clone --branch ${FDCLI_BRANCH} https://github.com/guydavis/flora-dev-cli.git
         cd flora-dev-cli
-        git checkout $HASH
         pip install -e . --extra-index-url https://pypi.chia.net/simple/
     fi
 fi
\ No newline at end of file

From 98f039628555dd5f0773d39aad65a4a39d241ff2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 20 Sep 2022 10:05:43 -0600
Subject: [PATCH 0988/1625] Test against on Focal with HDDCoin.

---
 .github/workflows/develop-hddcoin.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index 60a39f16..c67caac5 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "HDDCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop

From 8be9e7b9cfd4ebdb156ce537cba6e6d63d12df53 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 20 Sep 2022 15:43:19 -0600
Subject: [PATCH 0989/1625] Paths to database files for v2 as well.

---
 .github/workflows/develop-cactus.yaml  |  1 +
 .github/workflows/develop-hddcoin.yaml |  1 -
 api/commands/fd_cli.py                 | 26 ++++++++++++++++++++++----
 api/gunicorn.conf.py                   |  3 ++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/develop-cactus.yaml b/.github/workflows/develop-cactus.yaml
index 81165e8c..dd906b79 100644
--- a/.github/workflows/develop-cactus.yaml
+++ b/.github/workflows/develop-cactus.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "CACTUS_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:develop
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index c67caac5..60a39f16 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "HDDCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
diff --git a/api/commands/fd_cli.py b/api/commands/fd_cli.py
index 02f69016..59fa86b6 100644
--- a/api/commands/fd_cli.py
+++ b/api/commands/fd_cli.py
@@ -26,15 +26,33 @@ def reward_recovery(wallet_id, launcher_id, pool_contract_address):
     vars = {}
     network_path = globals.get_blockchain_network_path(blockchain)
     network_name = globals.get_blockchain_network_name(blockchain)
-    vars['FD_CLI_BC_DB_PATH'] = f'{network_path}/db/blockchain_v1_{network_name}.sqlite'
-    vars['FD_CLI_WT_DB_PATH'] = f'{network_path}/wallet/db/blockchain_wallet_v1_{network_name}_{wallet_id}.sqlite'
+    blockchain_db_path = f'{network_path}/db/blockchain_v2_{network_name}.sqlite'
+    if os.path.exists(blockchain_db_path):  # First check for a v2 blockchain and wallet
+        vars['FD_CLI_BC_DB_PATH'] = blockchain_db_path
+        wallet_db_path = f'{network_path}/wallet/db/blockchain_wallet_v2_r1_{network_name}_{wallet_id}.sqlite'
+        if os.path.exists(wallet_db_path):
+            vars['FD_CLI_WT_DB_PATH'] = wallet_db_path
+        else:
+            app.logger.error("Reward Recovery found no v2 wallet database: {0}".format(wallet_db_path))
+    else: # Then check for old v1 blockchain and wallet if no v2 found
+        blockchain_db_path = f'{network_path}/db/blockchain_v1_{network_name}.sqlite'
+        if os.path.exists(blockchain_db_path):  # Then check for a v1 blockchain and wallet
+            vars['FD_CLI_BC_DB_PATH'] = blockchain_db_path
+            wallet_db_path = f'{network_path}/wallet/db/blockchain_wallet_v1_{network_name}_{wallet_id}.sqlite'
+            if os.path.exists(wallet_db_path):
+                vars['FD_CLI_WT_DB_PATH'] = wallet_db_path
+            else:
+                app.logger.error("Reward Recovery found no v1 wallet database: {0}".format(wallet_db_path))
+        else:
+            app.logger.error("Reward Recovery found neither v1 or v2 blockchain database at: {0}/db".format(network_path))
     fd_env = os.environ.copy()
     fd_env.update(vars)
     cmd = f"/usr/local/bin/fd-cli nft-recover -l {launcher_id} -p {pool_contract_address} -nh 127.0.0.1 -np {rpc_port} -ct {network_path}/config/ssl/full_node/private_full_node.crt -ck {network_path}/config/ssl/full_node/private_full_node.key"
     app.logger.info(f"Executing NFT 7/8 win recovery for {blockchain}: {cmd}")
-    log_fo.write("\n\nExecuted at: {0}\n{1}".format(time.strftime("%Y-%m-%d-%H:%M:%S"), cmd))
+    log_fo.write("\n\nExecuted at: {0}\nFD_CLI_BC_DB_PATH={1} FD_CLI_WT_DB_PATH={2} {3}".format(
+        time.strftime("%Y-%m-%d-%H:%M:%S"), vars['FD_CLI_BC_DB_PATH'], vars['FD_CLI_WT_DB_PATH'], cmd))
     log_fo.flush()
-    proc = Popen(cmd,cwd="/fd-cli", env=fd_env, shell=True, universal_newlines=True, stdout=log_fo, stderr=log_fo)
+    proc = Popen(cmd,cwd="/flora-dev-cli", env=fd_env, shell=True, universal_newlines=True, stdout=log_fo, stderr=log_fo)
     try:
         outs, errs = proc.communicate(timeout=1800)
         if errs:
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 347210f8..d224d95d 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -96,7 +96,8 @@ def on_starting(server):
     #scheduler.add_job(func=status_warnings.collect, name="farms", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=periodically_sync_wallet.execute, name="periodically_sync_wallet", trigger='interval', seconds=60) # Test immediately
     #scheduler.add_job(func=status_warnings.collect, name="status_warnings", trigger='interval', seconds=60) # Test immediately
-    
+    #scheduler.add_job(func=nft_recover.execute, name="status_nft_recover", trigger='interval', seconds=60)
+        
 
     app.logger.debug("Starting background scheduler...")
     scheduler.start()

From ce5ce5fc990f3d7d209c6806c6f085c8032af2e6 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 20 Sep 2022 15:50:11 -0600
Subject: [PATCH 0990/1625] Chia 1.6.0 dropped.

---
 .github/workflows/develop-chia.yaml | 2 +-
 CHANGELOG.md                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index d9df9e67..c328fdd9 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.6.0"
+            "CHIA_BRANCH=latest"
             "BLADEBIT_BRANCH=2.0.0-beta1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 940ab295..a2128f13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 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).
 
-## [0.8.4] - 2022-09-?
+## [0.8.4] - 2022-09-21
 - Scaling-Down: Optional mode where wallets are synced daily, not run 24/7.  Saves ~35% memory so smaller farmers can farm more blockchains concurrently on the same machine. See Wallets page, top-right Settings.
 - Scaling-Up: Improved plot tracking efficiency for multi-PB sized farms. Thanks @grobalt!
 - Warnings for duplicated, invalid, or key-less plots.  See Farming page.
-- Update: [Flax](https://github.com/Flax-Network/flax-blockchain) to v0.1.10, [Cactus](https://github.com/Cactus-Network/cactus-blockchain) to v1.5.2
+- Update: [Flax](https://github.com/Flax-Network/flax-blockchain) to v0.1.10, [Cactus](https://github.com/Cactus-Network/cactus-blockchain) to v1.5.2, [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.0) to v1.6.0
 - Security: Disable Setup page's mnemonic import field autocomplete from caching value in your local browser. Thanks @Baatezu!
 - Fixes: Better handling of farmed block logging for certain blockchains like Apple & BPX, Alerts from Chia 1.5.1 for added coins missing due to blockchain logging changes.  Improved Smartctl response processing.
 

From 12d650f572d8372f446c0671d2d1d2a9feb6dcc3 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 20 Sep 2022 16:36:50 -0600
Subject: [PATCH 0991/1625] Trigger another build against latest base.

---
 api/gunicorn.conf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index d224d95d..07d03960 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -97,7 +97,6 @@ def on_starting(server):
     #scheduler.add_job(func=periodically_sync_wallet.execute, name="periodically_sync_wallet", trigger='interval', seconds=60) # Test immediately
     #scheduler.add_job(func=status_warnings.collect, name="status_warnings", trigger='interval', seconds=60) # Test immediately
     #scheduler.add_job(func=nft_recover.execute, name="status_nft_recover", trigger='interval', seconds=60)
-        
 
     app.logger.debug("Starting background scheduler...")
     scheduler.start()

From bca5a917188ec8f574afeace65822192cd00fe77 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 21 Sep 2022 10:08:52 -0600
Subject: [PATCH 0992/1625] Fixes for Cactus CLI renamings.

---
 api/commands/chia_cli.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index b3ae5902..ea553e46 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -117,7 +117,10 @@ def load_blockchain_show(blockchain):
 
 def load_connections_show(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
+    if blockchain == 'cactus':  # Cactus now supports only 'peer' command
+        proc = Popen("{0} peer -c full_node".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
+    else:
+        proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
     try:
         outs, errs = proc.communicate(timeout=30)
         if errs:
@@ -205,7 +208,10 @@ def pause_wallet(blockchain):
 def remove_connection(node_id, ip, blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     try:
-        proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
+        if blockchain == 'cactus':  # Cactus now supports only 'peer' command
+            proc = Popen("{0} peer --remove-connection {1} full_node".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
+        else:
+            proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
         try:
             outs, errs = proc.communicate(timeout=30)
             if errs:
@@ -286,7 +292,10 @@ def add_connections(connections, blockchain):
             elif socket.gethostbyname(hostname) != hostname:
                 app.logger.debug('{} is a valid hostname'.format(hostname))
             app.logger.info("Adding {0} connection to peer: {1}".format(blockchain, connection))
-            proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
+            if blockchain == 'cactus':  # Cactus now supports only 'peer' command
+                proc = Popen("{0} peer --add-connection {1} full_node".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
+            else:
+                proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
             try:
                 outs, errs = proc.communicate(timeout=60)
                 if errs:

From abbf22931af985ee2af3ace9dd26267a989bad8a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 23 Sep 2022 09:01:25 -0600
Subject: [PATCH 0993/1625] Latest Maize now at 1.6.0

---
 CHANGELOG.md                   | 3 +++
 VERSION                        | 2 +-
 scripts/forks/maize_install.sh | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2128f13..2af1b904 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 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).
 
+## [0.8.5] - 2022-10-?
+ - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0
+
 ## [0.8.4] - 2022-09-21
 - Scaling-Down: Optional mode where wallets are synced daily, not run 24/7.  Saves ~35% memory so smaller farmers can farm more blockchains concurrently on the same machine. See Wallets page, top-right Settings.
 - Scaling-Up: Improved plot tracking efficiency for multi-PB sized farms. Thanks @grobalt!
diff --git a/VERSION b/VERSION
index fcbb5375..bbde4bee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.4
\ No newline at end of file
+0.8.5
\ No newline at end of file
diff --git a/scripts/forks/maize_install.sh b/scripts/forks/maize_install.sh
index f61a3f4d..31ea8b10 100644
--- a/scripts/forks/maize_install.sh
+++ b/scripts/forks/maize_install.sh
@@ -4,8 +4,8 @@
 #
 
 MAIZE_BRANCH=$1
-# On 2022-08-18
-HASH=2fcb4deeb2944e0ff96158ec8986b23580d875d5
+# On 2022-09-22
+HASH=1530e15a5fba769f9387508e842121daca5d44e2
 
 if [ -z ${MAIZE_BRANCH} ]; then
 	echo 'Skipping Maize install as not requested.'

From 6cb9dbbdb1518d460160e65c0ed6f992d1ab5d30 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sat, 24 Sep 2022 12:59:17 -0600
Subject: [PATCH 0994/1625] More discarding of backwards compatibility by
 blockchains.

---
 api/commands/chia_cli.py      | 6 +++---
 scripts/forks/maize_launch.sh | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index ea553e46..ae7d6eb8 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -117,7 +117,7 @@ def load_blockchain_show(blockchain):
 
 def load_connections_show(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    if blockchain == 'cactus':  # Cactus now supports only 'peer' command
+    if blockchain in ['cactus', 'maize']:  # Cactus & Maize now supports only 'peer' command
         proc = Popen("{0} peer -c full_node".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
     else:
         proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
@@ -208,7 +208,7 @@ def pause_wallet(blockchain):
 def remove_connection(node_id, ip, blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     try:
-        if blockchain == 'cactus':  # Cactus now supports only 'peer' command
+        if blockchain in ['cactus', 'maize']:  # Cactus & Maize now supports only 'peer' command
             proc = Popen("{0} peer --remove-connection {1} full_node".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
         else:
             proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
@@ -292,7 +292,7 @@ def add_connections(connections, blockchain):
             elif socket.gethostbyname(hostname) != hostname:
                 app.logger.debug('{} is a valid hostname'.format(hostname))
             app.logger.info("Adding {0} connection to peer: {1}".format(blockchain, connection))
-            if blockchain == 'cactus':  # Cactus now supports only 'peer' command
+            if blockchain in ['cactus', 'maize']:  # Cactus & Maize now supports only 'peer' command
                 proc = Popen("{0} peer --add-connection {1} full_node".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
             else:
                 proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
diff --git a/scripts/forks/maize_launch.sh b/scripts/forks/maize_launch.sh
index 6a5ab77b..46c325ff 100644
--- a/scripts/forks/maize_launch.sh
+++ b/scripts/forks/maize_launch.sh
@@ -32,15 +32,18 @@ if [ -f /root/.maize/mainnet/config/config.yaml ]; then
 fi
 
 # Loop over provided list of key paths
+label_num=0
 for k in ${keys//:/ }; do
   if [[ "${k}" == "persistent" ]]; then
     echo "Not touching key directories."
   elif [ -s ${k} ]; then
-    echo "Adding key at path: ${k}"
-    maize keys add -f ${k} > /dev/null
+    echo "Adding key #${label_num} at path: ${k}"
+    maize keys add -l "key_${label_num}" -f ${k} > /dev/null
+    ((label_num=label_num+1))
   fi
 done
 
+
 # Loop over provided list of completed plot directories
 IFS=':' read -r -a array <<< "$plots_dir"
 joined=$(printf ", %s" "${array[@]}")

From 3f2b20e411ff476bc5b479f512379eb964dc2985 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 25 Sep 2022 14:24:18 -0600
Subject: [PATCH 0995/1625] Use dev branch of fd-cli tool.

---
 .github/workflows/develop-apple.yaml           | 1 +
 .github/workflows/develop-bpx.yaml             | 1 +
 .github/workflows/develop-chinilla.yaml        | 1 +
 .github/workflows/develop-cryptodoge.yaml      | 1 +
 .github/workflows/develop-ecostake.yaml        | 1 +
 .github/workflows/develop-flax.yaml            | 1 +
 .github/workflows/develop-flora.yaml           | 1 +
 .github/workflows/develop-gold.yaml            | 1 +
 .github/workflows/develop-hddcoin.yaml         | 1 +
 .github/workflows/develop-littlelambocoin.yaml | 1 +
 .github/workflows/develop-maize.yaml           | 1 +
 .github/workflows/develop-mint.yaml            | 1 +
 .github/workflows/develop-nchain.yaml          | 1 +
 .github/workflows/develop-petroleum.yaml       | 1 +
 .github/workflows/develop-profit.yaml          | 1 +
 .github/workflows/develop-silicoin.yaml        | 1 +
 .github/workflows/develop-staicoin.yaml        | 1 +
 .github/workflows/develop-stor.yaml            | 1 +
 .github/workflows/develop-tad.yaml             | 1 +
 .github/workflows/develop-wheat.yaml           | 1 +
 20 files changed, 20 insertions(+)

diff --git a/.github/workflows/develop-apple.yaml b/.github/workflows/develop-apple.yaml
index 0eb92bc8..661ea9a0 100644
--- a/.github/workflows/develop-apple.yaml
+++ b/.github/workflows/develop-apple.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "APPLE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-apple:develop
diff --git a/.github/workflows/develop-bpx.yaml b/.github/workflows/develop-bpx.yaml
index 0343c974..afc1e293 100644
--- a/.github/workflows/develop-bpx.yaml
+++ b/.github/workflows/develop-bpx.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "BPX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:develop
diff --git a/.github/workflows/develop-chinilla.yaml b/.github/workflows/develop-chinilla.yaml
index 00ef6260..1f1562a6 100644
--- a/.github/workflows/develop-chinilla.yaml
+++ b/.github/workflows/develop-chinilla.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "CHINILLA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:develop
diff --git a/.github/workflows/develop-cryptodoge.yaml b/.github/workflows/develop-cryptodoge.yaml
index cf008279..235a65de 100644
--- a/.github/workflows/develop-cryptodoge.yaml
+++ b/.github/workflows/develop-cryptodoge.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "CRYPTODOGE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cryptodoge:develop
diff --git a/.github/workflows/develop-ecostake.yaml b/.github/workflows/develop-ecostake.yaml
index d3c4b0a1..f2ecd3f7 100644
--- a/.github/workflows/develop-ecostake.yaml
+++ b/.github/workflows/develop-ecostake.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "ECOSTAKE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-ecostake:develop
diff --git a/.github/workflows/develop-flax.yaml b/.github/workflows/develop-flax.yaml
index 88e68186..22034ea6 100644
--- a/.github/workflows/develop-flax.yaml
+++ b/.github/workflows/develop-flax.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flax:develop
diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml
index 7a5ef22b..ff8bdeac 100644
--- a/.github/workflows/develop-flora.yaml
+++ b/.github/workflows/develop-flora.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "FLORA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:develop
diff --git a/.github/workflows/develop-gold.yaml b/.github/workflows/develop-gold.yaml
index 99bc8145..7f66ee56 100644
--- a/.github/workflows/develop-gold.yaml
+++ b/.github/workflows/develop-gold.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "GOLD_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gold:develop
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index 60a39f16..c67caac5 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "HDDCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
diff --git a/.github/workflows/develop-littlelambocoin.yaml b/.github/workflows/develop-littlelambocoin.yaml
index 896480bb..2bc9e76f 100644
--- a/.github/workflows/develop-littlelambocoin.yaml
+++ b/.github/workflows/develop-littlelambocoin.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "LITTLELAMBOCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-littlelambocoin:develop
diff --git a/.github/workflows/develop-maize.yaml b/.github/workflows/develop-maize.yaml
index e7199c6d..b928392b 100644
--- a/.github/workflows/develop-maize.yaml
+++ b/.github/workflows/develop-maize.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "MAIZE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-maize:develop
diff --git a/.github/workflows/develop-mint.yaml b/.github/workflows/develop-mint.yaml
index e87873c5..c8200838 100644
--- a/.github/workflows/develop-mint.yaml
+++ b/.github/workflows/develop-mint.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "MINT_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mint:develop
diff --git a/.github/workflows/develop-nchain.yaml b/.github/workflows/develop-nchain.yaml
index b8ddffdd..5299e4e9 100644
--- a/.github/workflows/develop-nchain.yaml
+++ b/.github/workflows/develop-nchain.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "NCHAIN_BRANCH=net9.dev"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-nchain:develop
diff --git a/.github/workflows/develop-petroleum.yaml b/.github/workflows/develop-petroleum.yaml
index aacea88c..a59ffd7c 100644
--- a/.github/workflows/develop-petroleum.yaml
+++ b/.github/workflows/develop-petroleum.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "PETROLEUM_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-petroleum:develop
diff --git a/.github/workflows/develop-profit.yaml b/.github/workflows/develop-profit.yaml
index 4b531df6..20f05eb8 100644
--- a/.github/workflows/develop-profit.yaml
+++ b/.github/workflows/develop-profit.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "PROFIT_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-profit:develop
diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
index 23af89e8..16e113f2 100644
--- a/.github/workflows/develop-silicoin.yaml
+++ b/.github/workflows/develop-silicoin.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "SILICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:develop
diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index b8a8c47f..f8a20ea9 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "STAICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-staicoin:develop
diff --git a/.github/workflows/develop-stor.yaml b/.github/workflows/develop-stor.yaml
index 3bb5074b..addd6b0c 100644
--- a/.github/workflows/develop-stor.yaml
+++ b/.github/workflows/develop-stor.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "STOR_BRANCH=master"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-stor:develop
diff --git a/.github/workflows/develop-tad.yaml b/.github/workflows/develop-tad.yaml
index b5d4f3e1..a90a6cfe 100644
--- a/.github/workflows/develop-tad.yaml
+++ b/.github/workflows/develop-tad.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "TAD_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-tad:develop
diff --git a/.github/workflows/develop-wheat.yaml b/.github/workflows/develop-wheat.yaml
index 4a8eb1d2..5860dd1a 100644
--- a/.github/workflows/develop-wheat.yaml
+++ b/.github/workflows/develop-wheat.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "WHEAT_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-wheat:develop

From 3da6551051f0b64d441c73748d0727a467802661 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 25 Sep 2022 16:35:42 -0600
Subject: [PATCH 0996/1625] Fix for setting Wallet Sync back to Always.

---
 api/commands/chia_cli.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index ae7d6eb8..aea868d1 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -333,11 +333,14 @@ def remove_connection(node_ids, blockchain):
 
 def save_wallet_settings(settings, blockchain):
     try:
+        app.logger.info("Setting wallet frequency: {0}".format(settings))
         if not settings: # User reverting to defaults, no custom settings
-            os.path(WALLET_SETTINGS_FILE).delete()
+            app.logger.info("Deleting settings at {0}".format(WALLET_SETTINGS_FILE))
+            os.remove(WALLET_SETTINGS_FILE)
         else:
+            app.logger.info("Updating settings at {0}".format(WALLET_SETTINGS_FILE))
             with open(WALLET_SETTINGS_FILE, 'w') as outfile:
                 json.dump(settings, outfile)
     except Exception as ex:
-        app.logger.info(traceback.format_exc())
+        app.logger.debug(traceback.format_exc())
         raise Exception('Failed to store {0} wallet settings to {1}.'.format(blockchain, WALLET_SETTINGS_FILE) + '\n' + str(ex))

From 45ff0d1dcc75b550d325570272669adcce99f17d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 25 Sep 2022 16:45:33 -0600
Subject: [PATCH 0997/1625] Fix for wallet settings.

---
 api/commands/chia_cli.py | 5 ++++-
 web/actions/chia.py      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index aea868d1..b1117f0f 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -336,7 +336,10 @@ def save_wallet_settings(settings, blockchain):
         app.logger.info("Setting wallet frequency: {0}".format(settings))
         if not settings: # User reverting to defaults, no custom settings
             app.logger.info("Deleting settings at {0}".format(WALLET_SETTINGS_FILE))
-            os.remove(WALLET_SETTINGS_FILE)
+            try:
+                os.remove(WALLET_SETTINGS_FILE)
+            except OSError:
+                pass
         else:
             app.logger.info("Updating settings at {0}".format(WALLET_SETTINGS_FILE))
             with open(WALLET_SETTINGS_FILE, 'w') as outfile:
diff --git a/web/actions/chia.py b/web/actions/chia.py
index e3da44ca..c219ec87 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -454,7 +454,7 @@ def load_current_wallet_sync_frequency():
 
 def save_current_wallet_sync_frequency(freq):
     settings = {} # An "always" (-1) frequency is an empty settings dict to fullnodes
-    if int(freq) > 0:
+    if int(freq) >= 0:  # 0 is Never, other is hours of frequency
         settings = {'wallet_sync_frequency': freq}
     fullnodes = wk.get_fullnodes_by_blockchain()
     for blockchain in fullnodes.keys():

From 6ae69cd6657efd231a990b53940947c50b2dc4f8 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 25 Sep 2022 17:02:55 -0600
Subject: [PATCH 0998/1625] Delete alerts which are older than 3 days to avoid
 too many rows.

---
 api/gunicorn.conf.py           |  2 +-
 api/schedules/status_alerts.py | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 07d03960..8463f3f6 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -93,7 +93,7 @@ def on_starting(server):
     #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=websvcs.get_chain_statuses, name="get_chain_statuses", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=status_farm.update, name="farms", trigger='interval', seconds=10) # Test immediately
-    #scheduler.add_job(func=status_warnings.collect, name="farms", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=status_alerts.update, name="alerts", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=periodically_sync_wallet.execute, name="periodically_sync_wallet", trigger='interval', seconds=60) # Test immediately
     #scheduler.add_job(func=status_warnings.collect, name="status_warnings", trigger='interval', seconds=60) # Test immediately
     #scheduler.add_job(func=nft_recover.execute, name="status_nft_recover", trigger='interval', seconds=60)
diff --git a/api/schedules/status_alerts.py b/api/schedules/status_alerts.py
index 6c1b0130..83a92acc 100644
--- a/api/schedules/status_alerts.py
+++ b/api/schedules/status_alerts.py
@@ -19,16 +19,29 @@
 from api.commands import chiadog_cli
 from api import app, utils
 
+DELETE_OLD_STATS_AFTER_DAYS = 3  # Keep at most 3 days of old alerts
+
 first_run = True
 
+def delete_old_alerts(db):
+    try:
+        cutoff = datetime.datetime.now() - datetime.timedelta(days=DELETE_OLD_STATS_AFTER_DAYS)
+        db.session.query(a.Alert).filter(a.Alert.created_at <= cutoff).delete()
+        db.session.commit()
+        app.logger.debug("Deleted old alerts before {0}".format(cutoff.strftime("%Y-%m-%d %H:%M")))
+    except:
+        app.logger.info("Failed to delete old alerts.")
+        app.logger.info(traceback.format_exc())
+
 def update():
     global first_run
-    if globals.load()['is_controller']:
-        #app.logger.info("Skipping alerts polling on fullnode are already placed in database directly via chiadog_notifier.sh script.")
-        return
     with app.app_context():
         try:
             from api import db
+            delete_old_alerts(db)
+            if globals.load()['is_controller']:
+                #app.logger.info("Skipping alerts polling on fullnode are already placed in database directly via chiadog_notifier.sh script.")
+                return
             hostname = utils.get_hostname()
             if first_run:  # On first launch, load last hour of notifications
                 since = (datetime.datetime.now() - datetime.timedelta(hours=1)).strftime("%Y-%m-%d %H:%M:%S")

From 84e13d33c15fe49288c872093a952c44809dd5ed Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 26 Sep 2022 08:01:03 -0600
Subject: [PATCH 0999/1625] Extra line break after fd-cli log output.

---
 CHANGELOG.md           | 1 +
 api/commands/fd_cli.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2af1b904..21863d77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,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).
 
 ## [0.8.5] - 2022-10-?
+ - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases and run on Ubuntu 22.04 base image.
  - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0
 
 ## [0.8.4] - 2022-09-21
diff --git a/api/commands/fd_cli.py b/api/commands/fd_cli.py
index 59fa86b6..438ff77d 100644
--- a/api/commands/fd_cli.py
+++ b/api/commands/fd_cli.py
@@ -49,7 +49,7 @@ def reward_recovery(wallet_id, launcher_id, pool_contract_address):
     fd_env.update(vars)
     cmd = f"/usr/local/bin/fd-cli nft-recover -l {launcher_id} -p {pool_contract_address} -nh 127.0.0.1 -np {rpc_port} -ct {network_path}/config/ssl/full_node/private_full_node.crt -ck {network_path}/config/ssl/full_node/private_full_node.key"
     app.logger.info(f"Executing NFT 7/8 win recovery for {blockchain}: {cmd}")
-    log_fo.write("\n\nExecuted at: {0}\nFD_CLI_BC_DB_PATH={1} FD_CLI_WT_DB_PATH={2} {3}".format(
+    log_fo.write("\n\nExecuted at: {0}\nFD_CLI_BC_DB_PATH={1} FD_CLI_WT_DB_PATH={2} {3}\n".format(
         time.strftime("%Y-%m-%d-%H:%M:%S"), vars['FD_CLI_BC_DB_PATH'], vars['FD_CLI_WT_DB_PATH'], cmd))
     log_fo.flush()
     proc = Popen(cmd,cwd="/flora-dev-cli", env=fd_env, shell=True, universal_newlines=True, stdout=log_fo, stderr=log_fo)

From e27a6d6f6b0bd62589f51de6ec69ea3444a48b7b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 26 Sep 2022 08:25:09 -0600
Subject: [PATCH 1000/1625] Collect status before pausing wallet.

---
 api/schedules/periodically_sync_wallet.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/schedules/periodically_sync_wallet.py b/api/schedules/periodically_sync_wallet.py
index 2f898fd1..734767d7 100644
--- a/api/schedules/periodically_sync_wallet.py
+++ b/api/schedules/periodically_sync_wallet.py
@@ -15,6 +15,7 @@
 from api import app
 from common.config import globals
 from api.commands import chia_cli
+from api.schedules import stats_effort, status_wallets, status_farm, status_pools
 
 # When this file present, we are leaving wallet paused normally, syncing every day or so
 WALLET_SETTINGS_FILE = '/root/.chia/machinaris/config/wallet_settings.json'
@@ -51,7 +52,12 @@ def execute():
             wallet = chia_cli.load_wallet_show(blockchain)
             if not wallet.is_synced():
                 app.logger.info("SYNC: Wallet running but still not synced. Leaving it running since {0}".format(last_wallet_start_at.strftime('%Y-%m-%d %H:%M:%S')))
-            else:
+            else:  # Collect stats needing a synced wallet, then pause wallet to save memory
+                app.logger.info("SYNC: Collecting farm, wallet, pool, and effort status before pausing wallet...")
+                stats_effort.collect()
+                status_wallets.update()
+                status_farm.update()
+                status_pools.update()
                 app.logger.info("SYNC: Wallet running and is now synced.  Pausing wallet now, after earlier sync start at {0}".format(last_wallet_start_at.strftime('%Y-%m-%d %H:%M:%S')))
                 chia_cli.pause_wallet(blockchain)  # Wallet running, currently synced, so stop it until next sync time
         else: # Wallet not running, so check to see if a sync is due

From fdfa31d65e1b3f33590e1455d9ec25bbfecb8ea6 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 26 Sep 2022 20:42:28 -0600
Subject: [PATCH 1001/1625] Trigger a build against latest Chiadog.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21863d77..df8708ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,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).
 
 ## [0.8.5] - 2022-10-?
- - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases and run on Ubuntu 22.04 base image.
+ - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
  - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0
 
 ## [0.8.4] - 2022-09-21

From e81562b5f2d978798ed526902143c0a9d4abd4f6 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 27 Sep 2022 08:59:19 -0600
Subject: [PATCH 1002/1625] Path to fd-cli binary has changed.

---
 api/commands/fd_cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/commands/fd_cli.py b/api/commands/fd_cli.py
index 438ff77d..7b26f040 100644
--- a/api/commands/fd_cli.py
+++ b/api/commands/fd_cli.py
@@ -47,7 +47,7 @@ def reward_recovery(wallet_id, launcher_id, pool_contract_address):
             app.logger.error("Reward Recovery found neither v1 or v2 blockchain database at: {0}/db".format(network_path))
     fd_env = os.environ.copy()
     fd_env.update(vars)
-    cmd = f"/usr/local/bin/fd-cli nft-recover -l {launcher_id} -p {pool_contract_address} -nh 127.0.0.1 -np {rpc_port} -ct {network_path}/config/ssl/full_node/private_full_node.crt -ck {network_path}/config/ssl/full_node/private_full_node.key"
+    cmd = f"fd-cli nft-recover -l {launcher_id} -p {pool_contract_address} -nh 127.0.0.1 -np {rpc_port} -ct {network_path}/config/ssl/full_node/private_full_node.crt -ck {network_path}/config/ssl/full_node/private_full_node.key"
     app.logger.info(f"Executing NFT 7/8 win recovery for {blockchain}: {cmd}")
     log_fo.write("\n\nExecuted at: {0}\nFD_CLI_BC_DB_PATH={1} FD_CLI_WT_DB_PATH={2} {3}\n".format(
         time.strftime("%Y-%m-%d-%H:%M:%S"), vars['FD_CLI_BC_DB_PATH'], vars['FD_CLI_WT_DB_PATH'], cmd))

From 3a263ae900c76c174fd2fac6b792a70e20e42d8d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 27 Sep 2022 10:04:52 -0600
Subject: [PATCH 1003/1625] Use legacy fd-cli on legacy blockchains.

---
 .github/workflows/develop-cryptodoge.yaml | 1 -
 .github/workflows/develop-ecostake.yaml   | 1 -
 .github/workflows/develop-flora.yaml      | 1 -
 .github/workflows/develop-gold.yaml       | 1 -
 .github/workflows/develop-hddcoin.yaml    | 1 -
 .github/workflows/develop-mint.yaml       | 1 -
 .github/workflows/develop-nchain.yaml     | 1 -
 .github/workflows/develop-petroleum.yaml  | 1 -
 .github/workflows/develop-silicoin.yaml   | 1 -
 .github/workflows/develop-staicoin.yaml   | 1 -
 .github/workflows/develop-stor.yaml       | 1 -
 11 files changed, 11 deletions(-)

diff --git a/.github/workflows/develop-cryptodoge.yaml b/.github/workflows/develop-cryptodoge.yaml
index 235a65de..cf008279 100644
--- a/.github/workflows/develop-cryptodoge.yaml
+++ b/.github/workflows/develop-cryptodoge.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "CRYPTODOGE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cryptodoge:develop
diff --git a/.github/workflows/develop-ecostake.yaml b/.github/workflows/develop-ecostake.yaml
index f2ecd3f7..d3c4b0a1 100644
--- a/.github/workflows/develop-ecostake.yaml
+++ b/.github/workflows/develop-ecostake.yaml
@@ -42,7 +42,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "ECOSTAKE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-ecostake:develop
diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml
index ff8bdeac..7a5ef22b 100644
--- a/.github/workflows/develop-flora.yaml
+++ b/.github/workflows/develop-flora.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "FLORA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:develop
diff --git a/.github/workflows/develop-gold.yaml b/.github/workflows/develop-gold.yaml
index 7f66ee56..99bc8145 100644
--- a/.github/workflows/develop-gold.yaml
+++ b/.github/workflows/develop-gold.yaml
@@ -42,7 +42,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "GOLD_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gold:develop
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index c67caac5..60a39f16 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "HDDCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
diff --git a/.github/workflows/develop-mint.yaml b/.github/workflows/develop-mint.yaml
index c8200838..e87873c5 100644
--- a/.github/workflows/develop-mint.yaml
+++ b/.github/workflows/develop-mint.yaml
@@ -42,7 +42,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "MINT_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mint:develop
diff --git a/.github/workflows/develop-nchain.yaml b/.github/workflows/develop-nchain.yaml
index 5299e4e9..b8ddffdd 100644
--- a/.github/workflows/develop-nchain.yaml
+++ b/.github/workflows/develop-nchain.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "NCHAIN_BRANCH=net9.dev"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-nchain:develop
diff --git a/.github/workflows/develop-petroleum.yaml b/.github/workflows/develop-petroleum.yaml
index a59ffd7c..aacea88c 100644
--- a/.github/workflows/develop-petroleum.yaml
+++ b/.github/workflows/develop-petroleum.yaml
@@ -42,7 +42,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "PETROLEUM_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-petroleum:develop
diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
index 16e113f2..23af89e8 100644
--- a/.github/workflows/develop-silicoin.yaml
+++ b/.github/workflows/develop-silicoin.yaml
@@ -42,7 +42,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "SILICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:develop
diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index f8a20ea9..b8a8c47f 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "STAICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-staicoin:develop
diff --git a/.github/workflows/develop-stor.yaml b/.github/workflows/develop-stor.yaml
index addd6b0c..3bb5074b 100644
--- a/.github/workflows/develop-stor.yaml
+++ b/.github/workflows/develop-stor.yaml
@@ -43,7 +43,6 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "FDCLI_BRANCH=dev"
             "STOR_BRANCH=master"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-stor:develop

From 0e8fb43f5159a63f77e25458149e4b2ed8d81843 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 27 Sep 2022 10:10:27 -0600
Subject: [PATCH 1004/1625] fd-cli path

---
 api/commands/fd_cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/commands/fd_cli.py b/api/commands/fd_cli.py
index 7b26f040..438ff77d 100644
--- a/api/commands/fd_cli.py
+++ b/api/commands/fd_cli.py
@@ -47,7 +47,7 @@ def reward_recovery(wallet_id, launcher_id, pool_contract_address):
             app.logger.error("Reward Recovery found neither v1 or v2 blockchain database at: {0}/db".format(network_path))
     fd_env = os.environ.copy()
     fd_env.update(vars)
-    cmd = f"fd-cli nft-recover -l {launcher_id} -p {pool_contract_address} -nh 127.0.0.1 -np {rpc_port} -ct {network_path}/config/ssl/full_node/private_full_node.crt -ck {network_path}/config/ssl/full_node/private_full_node.key"
+    cmd = f"/usr/local/bin/fd-cli nft-recover -l {launcher_id} -p {pool_contract_address} -nh 127.0.0.1 -np {rpc_port} -ct {network_path}/config/ssl/full_node/private_full_node.crt -ck {network_path}/config/ssl/full_node/private_full_node.key"
     app.logger.info(f"Executing NFT 7/8 win recovery for {blockchain}: {cmd}")
     log_fo.write("\n\nExecuted at: {0}\nFD_CLI_BC_DB_PATH={1} FD_CLI_WT_DB_PATH={2} {3}\n".format(
         time.strftime("%Y-%m-%d-%H:%M:%S"), vars['FD_CLI_BC_DB_PATH'], vars['FD_CLI_WT_DB_PATH'], cmd))

From ec7dbc9797b8e6fbf806b467d2b85a3dc72c2451 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 28 Sep 2022 07:42:04 -0600
Subject: [PATCH 1005/1625] Fix for Github security alert on regexps.

---
 api/commands/chia_cli.py        | 2 +-
 api/commands/log_parser.py      | 2 +-
 api/schedules/stats_balances.py | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index b1117f0f..4b6d4eba 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -254,7 +254,7 @@ def plot_check(blockchain, plot_path):
         raise Exception("The timeout is expired attempting to check plots.")
     app.logger.info("Completed plot check of: {0}".format(plot_path))
     class_escape = re.compile(r'.*: INFO\s+')
-    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+    ansi_escape = re.compile(r'\x1B(?:[@A-Z\\-_]|\[[0-9:;<=>?]*[ -/]*[@-~])')
     return  class_escape.sub('', ansi_escape.sub('', outs))
 
 def dispatch_action(job):
diff --git a/api/commands/log_parser.py b/api/commands/log_parser.py
index 9a0dc4fb..c7e0e83e 100644
--- a/api/commands/log_parser.py
+++ b/api/commands/log_parser.py
@@ -161,6 +161,6 @@ def get_log_lines(log_type, log_id=None, blockchain=None):
         app.logger.info("No log file found at {0}".format(log_file))
         return 'No log file found!'
     #app.logger.info("Log file found at {0}".format(log_file))
-    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+    ansi_escape = re.compile(r'\x1B(?:[@A-Z\\-_]|\[[0-9:;<=>?]*[ -/]*[@-~])')
     proc = Popen(['tail', '-n', str(MAX_LOG_LINES), log_file], stdout=PIPE)
     return ansi_escape.sub('', proc.stdout.read().decode("utf-8"))
diff --git a/api/schedules/stats_balances.py b/api/schedules/stats_balances.py
index 6c0f10f5..bea1d8d1 100644
--- a/api/schedules/stats_balances.py
+++ b/api/schedules/stats_balances.py
@@ -82,6 +82,7 @@ def store_balance_locally(blockchain, wallet_balance, current_datetime):
     db.session.commit()
 
 def store_total_locally(total_balance, currency_symbol, current_datetime):
+    app.logger.info("Storing total wallet balance (all blockchains) of {0}".format(total_balance))
     try:
         db.session.add(stats.StatTotalBalance(
             hostname=utils.get_hostname(),

From 535180c8a2aa32be2175ec4733f95017b6ca398d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 28 Sep 2022 10:47:06 -0600
Subject: [PATCH 1006/1625] Use newer version of fd-cli

---
 .github/workflows/develop-cryptodoge.yaml | 1 +
 .github/workflows/develop-ecostake.yaml   | 1 +
 .github/workflows/develop-flora.yaml      | 1 +
 .github/workflows/develop-gold.yaml       | 1 +
 .github/workflows/develop-hddcoin.yaml    | 1 +
 .github/workflows/develop-mint.yaml       | 1 +
 .github/workflows/develop-nchain.yaml     | 1 +
 .github/workflows/develop-petroleum.yaml  | 1 +
 .github/workflows/develop-silicoin.yaml   | 1 +
 .github/workflows/develop-staicoin.yaml   | 1 +
 .github/workflows/develop-stor.yaml       | 1 +
 scripts/fd-cli_setup.sh                   | 4 ++++
 12 files changed, 15 insertions(+)

diff --git a/.github/workflows/develop-cryptodoge.yaml b/.github/workflows/develop-cryptodoge.yaml
index cf008279..235a65de 100644
--- a/.github/workflows/develop-cryptodoge.yaml
+++ b/.github/workflows/develop-cryptodoge.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "CRYPTODOGE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cryptodoge:develop
diff --git a/.github/workflows/develop-ecostake.yaml b/.github/workflows/develop-ecostake.yaml
index d3c4b0a1..f2ecd3f7 100644
--- a/.github/workflows/develop-ecostake.yaml
+++ b/.github/workflows/develop-ecostake.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "ECOSTAKE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-ecostake:develop
diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml
index 7a5ef22b..ff8bdeac 100644
--- a/.github/workflows/develop-flora.yaml
+++ b/.github/workflows/develop-flora.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "FLORA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flora:develop
diff --git a/.github/workflows/develop-gold.yaml b/.github/workflows/develop-gold.yaml
index 99bc8145..7f66ee56 100644
--- a/.github/workflows/develop-gold.yaml
+++ b/.github/workflows/develop-gold.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "GOLD_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gold:develop
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index 60a39f16..c67caac5 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "HDDCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
diff --git a/.github/workflows/develop-mint.yaml b/.github/workflows/develop-mint.yaml
index e87873c5..c8200838 100644
--- a/.github/workflows/develop-mint.yaml
+++ b/.github/workflows/develop-mint.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "MINT_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mint:develop
diff --git a/.github/workflows/develop-nchain.yaml b/.github/workflows/develop-nchain.yaml
index b8ddffdd..5299e4e9 100644
--- a/.github/workflows/develop-nchain.yaml
+++ b/.github/workflows/develop-nchain.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "NCHAIN_BRANCH=net9.dev"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-nchain:develop
diff --git a/.github/workflows/develop-petroleum.yaml b/.github/workflows/develop-petroleum.yaml
index aacea88c..a59ffd7c 100644
--- a/.github/workflows/develop-petroleum.yaml
+++ b/.github/workflows/develop-petroleum.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "PETROLEUM_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-petroleum:develop
diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
index 23af89e8..16e113f2 100644
--- a/.github/workflows/develop-silicoin.yaml
+++ b/.github/workflows/develop-silicoin.yaml
@@ -42,6 +42,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "SILICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-silicoin:develop
diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index b8a8c47f..f8a20ea9 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "STAICOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-staicoin:develop
diff --git a/.github/workflows/develop-stor.yaml b/.github/workflows/develop-stor.yaml
index 3bb5074b..addd6b0c 100644
--- a/.github/workflows/develop-stor.yaml
+++ b/.github/workflows/develop-stor.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FDCLI_BRANCH=dev"
             "STOR_BRANCH=master"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-stor:develop
diff --git a/scripts/fd-cli_setup.sh b/scripts/fd-cli_setup.sh
index e46de44c..7249f88a 100644
--- a/scripts/fd-cli_setup.sh
+++ b/scripts/fd-cli_setup.sh
@@ -12,6 +12,10 @@ if [[ ${mode} == 'fullnode' ]]; then
         cd /
         git clone --branch ${FDCLI_BRANCH} https://github.com/guydavis/flora-dev-cli.git
         cd flora-dev-cli
+        codename=`lsb_release -c -s`
+        echo "Building fd-cli on Ubuntu ${codename}..."
+        cp requirements_${codename}.txt requirements.txt
+        cp setup_${codename}.py setup.py
         pip install -e . --extra-index-url https://pypi.chia.net/simple/
     fi
 fi
\ No newline at end of file

From 24a85902c062988a48a510815efae282c7b8f605 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 30 Sep 2022 15:58:53 -0600
Subject: [PATCH 1007/1625] Container memory current display.

---
 api/commands/blockchain_db.py  | 50 ++++++++++++++++++++++++++++++++++
 api/gunicorn.conf.py           | 20 ++++++++------
 api/schedules/status_worker.py |  5 +++-
 api/views/rewards/resources.py |  8 +++++-
 common/config/blockchains.json |  2 +-
 common/config/globals.py       |  8 ++++++
 common/models/workers.py       |  6 ++++
 web/actions/chia.py            |  2 +-
 web/templates/workers.html     |  2 ++
 9 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 api/commands/blockchain_db.py

diff --git a/api/commands/blockchain_db.py b/api/commands/blockchain_db.py
new file mode 100644
index 00000000..78bd6d23
--- /dev/null
+++ b/api/commands/blockchain_db.py
@@ -0,0 +1,50 @@
+#
+# DB access to blockchain databases, used when RPC API isn't enough
+#
+
+import os
+import sqlite3
+
+from chia.util.bech32m import decode_puzzle_hash
+
+from common.config import globals
+from api import app
+
+def _get_blockchain_db_path():
+    blockchain = globals.enabled_blockchains()[0]
+    network_path = globals.get_blockchain_network_path(blockchain)
+    network_name = globals.get_blockchain_network_name(blockchain)
+    blockchain_db_path = f'{network_path}/db/blockchain_v2_{network_name}.sqlite'
+    if os.path.exists(blockchain_db_path):  # First check for a v2 blockchain
+        app.logger.info("For {0}, found v2 blockchain database at: {1}".formtat(blockchain, blockchain_db_path))
+        return blockchain_db_path
+    else: # Then check for old v1 blockchain and wallet if no v2 found
+        blockchain_db_path = f'{network_path}/db/blockchain_v1_{network_name}.sqlite'
+        if os.path.exists(blockchain_db_path):  # Then check for a v1 blockchain
+            app.logger.info("For {0}, found v1 blockchain database at: {1}".formtat(blockchain, blockchain_db_path))
+            return blockchain_db_path
+    raise Exception("Found neither v1 or v2 blockchain database at: {0}/db".format(network_path))
+
+def get_unspent_coins(pool_contract_address):
+    puzzle_hash = decode_puzzle_hash(pool_contract_address)
+    db_path = _get_blockchain_db_path()
+    spent_column_name = 'spent' # v1
+    if '_v2_' in db_path:
+        spent_column_name = 'spent_index'
+    conn = sqlite3.connect(db_path)
+    cursor = conn.cursor()
+    cursor.execute(
+        f"SELECT * "
+        f"FROM coin_record "
+        f"WHERE {spent_column_name} == 0 "
+        f"AND timestamp <= (strftime('%s', 'now') - 604800) "
+        f"AND puzzle_hash LIKE '{puzzle_hash}' "
+        f"ORDER BY timestamp DESC")
+    rows = []
+    for row in cursor.fetchall():
+        amount = int.from_bytes(row[7], byteorder='big', signed=False)
+        if amount > 0:
+            rows.append(row)
+    if len(rows) == 0:
+        app.logger.info("No coins are eligible for recovery yet. Notice that 604800 seconds must pass since coin creation to recover it.")
+    return rows
\ No newline at end of file
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 8463f3f6..e4d440fa 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -19,6 +19,7 @@ def on_starting(server):
         log_rotate, restart_stuck_farmer, geolocate_peers, \
         stats_effort, status_warnings
     from common.config import globals
+    from common.models import pools
 
     from api.commands import websvcs
 
@@ -52,6 +53,8 @@ def on_starting(server):
         scheduler.add_job(func=status_challenges.update, name="status_challenges", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=status_alerts.update, name="status_alerts", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=log_rotate.execute, name="log_rotate", trigger='cron', minute=0)  # Hourly
+    
+    if globals.farming_enabled() and 'chia' in globals.enabled_blockchains():  # For now, only Chia fullnodes
         scheduler.add_job(func=status_warnings.collect, name="status_warnings", trigger='cron', minute="*/20") # Every 20 minutes
 
     # Status for plotters
@@ -67,14 +70,16 @@ def on_starting(server):
         scheduler.add_job(func=status_connections.update, name="status_connections", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=status_keys.update, name="status_keys", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=status_farm.update, name="status_farms", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
-        scheduler.add_job(func=status_plots.update, name="status_plots", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
-        scheduler.add_job(func=status_plotnfts.update, name="status_plotnfts", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
-        scheduler.add_job(func=status_pools.update, name="status_pools", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
+        scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=restart_stuck_farmer.execute, name="status_blockchain_sync", trigger='interval', minutes=5, jitter=0) 
         scheduler.add_job(func=periodically_sync_wallet.execute, name="status_wallet_sync", trigger='interval', minutes=15, jitter=0) 
-        scheduler.add_job(func=status_partials.update, name="status_partials", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
-        scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
-
+        if globals.enabled_blockchains()[0] in ['chia', 'chives', 'mmx']: # Only get plot listing from these three blockchains
+            scheduler.add_job(func=status_plots.update, name="status_plots", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
+        if globals.enabled_blockchains()[0] in pools.POOLABLE_BLOCKCHAINS: # Only get pool submissions from poolable blockchains
+            scheduler.add_job(func=status_pools.update, name="status_pools", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
+            scheduler.add_job(func=status_partials.update, name="status_partials", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
+            scheduler.add_job(func=status_plotnfts.update, name="status_plotnfts", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
+        
     # Status for single Machinaris controller only, should be blockchain=chia
     if utils.is_controller():
         scheduler.add_job(func=plots_check.execute, name="plot_checks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER, 
@@ -87,8 +92,7 @@ def on_starting(server):
         scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0)  # Hourly
         
     # Testing only
-    #scheduler.add_job(func=status_plots.update, name="status_plots", trigger='interval', seconds=60) # Test immediately
-    #scheduler.add_job(func=stats_blocks.collect, name="stats_blocks", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=status_worker.update, name="status_worker", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_effort.collect, name="stats_effort", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=websvcs.get_chain_statuses, name="get_chain_statuses", trigger='interval', seconds=10) # Test immediately
diff --git a/api/schedules/status_worker.py b/api/schedules/status_worker.py
index 7a9722fd..e690af7b 100644
--- a/api/schedules/status_worker.py
+++ b/api/schedules/status_worker.py
@@ -77,4 +77,7 @@ def gather_services_status():
     response['farming_status'] = farming_status
     if gc['machinaris_mode'] == 'fullnode':
         response['wallet_status'] = wallet_status
-    return json.dumps(response)
\ No newline at end of file
+    memory_usage = globals.get_container_memory_usage_bytes()
+    if memory_usage:
+        response['container_memory_usage_bytes'] = memory_usage
+    return json.dumps(response)
diff --git a/api/views/rewards/resources.py b/api/views/rewards/resources.py
index ddc9798e..130fc38f 100644
--- a/api/views/rewards/resources.py
+++ b/api/views/rewards/resources.py
@@ -10,7 +10,7 @@
 from api import app
 from api.extensions.api import Blueprint
 
-from api.commands import fd_cli
+from api.commands import fd_cli, blockchain_db
 from common.models import pools
 
 blp = Blueprint(
@@ -23,6 +23,12 @@
 @blp.route('/')
 class Rewards(MethodView):
 
+    def get(self):
+        coins = blockchain_db.get_unspent_coins('TESTING')
+        response = make_response(json.dumps(coins), 200)
+        response.mimetype = "text/json"
+        return response
+
     def post(self):
         try:
             body = json.loads(request.data)
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 95abeca5..f43cea94 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -352,7 +352,7 @@
         "blocks_per_day": 4608,
         "git_url": "https://github.com/SHIBgreen-Network/shibgreen-blockchain",
         "discord_url": "https://discord.gg/yZSKtPf8",
-        "website_url": "https://shibgreen.com/"
+        "website_url": "https://shib.green/"
     },
     "silicoin": {
         "name": "Silicoin",
diff --git a/common/config/globals.py b/common/config/globals.py
index d37bd60e..b75c26c3 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -512,3 +512,11 @@ def wallet_running():
     except:
         logging.error(traceback.format_exc())
     return False
+
+def get_container_memory_usage_bytes():
+    try:
+        with open("/sys/fs/cgroup/memory/memory.usage_in_bytes", "r") as f:
+            return int(f.readline())
+    except Exception as ex:
+        logging.error("Failed to read current container memory usage in bytes due to: {0}".format(str(ex)))
+    return None
diff --git a/common/models/workers.py b/common/models/workers.py
index b75a3b5a..fc218bf8 100644
--- a/common/models/workers.py
+++ b/common/models/workers.py
@@ -65,6 +65,12 @@ def monitoring_status(self):
             except:
                 return "unknown"
     
+    def container_memory_usage_gb(self):
+        try:
+            return "{:.2f} GB".format(int(j.loads(self.services)['container_memory_usage_bytes']) / 1024 / 1024 / 1024)
+        except Exception as ex:
+            return ''
+    
     def connection_status(self):
         fifteen_mins_ago = dt.datetime.now() - dt.timedelta(minutes=15)
         if self.ping_success_at and self.ping_success_at >= fifteen_mins_ago:
diff --git a/web/actions/chia.py b/web/actions/chia.py
index c219ec87..9128d637 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -416,7 +416,7 @@ def restart_farmer(hostname, blockchain):
     farmer = wk.get_worker(hostname, blockchain)
     try: # Send request, but timeout in only a second while API works in background
         utils.send_post(farmer, "/actions/", \
-            { 'service': 'farming', 'action': 'restart', 'blockchain': blockchain, }, debug=True, timeout=1) 
+            { 'service': 'farming', 'action': 'restart', 'blockchain': blockchain, }, debug=False, timeout=1) 
     except requests.exceptions.ReadTimeout: 
         pass
 
diff --git a/web/templates/workers.html b/web/templates/workers.html
index 00cca5e4..24d47e56 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -42,6 +42,7 @@
             {{_('Hostname')}}
             {{_('Blockchain')}}
             {{_('Mode')}}
+            {{_('Memory')}}
             {{_('Last Status Received')}}
             {{_('Last Ping')}}
             {{_('Last Successful Ping')}}
@@ -57,6 +58,7 @@
                 title="{{worker.hostname}}:{{worker.port}}">{{worker.displayname}}
             {{worker.blockchain}}
             {{worker.mode}}
+            {{worker.container_memory_usage_gb()}}
             {{worker.updated_at | datetimefilter}}
             

From 1e3cddb0dd0f50df147e69dd182031f79cf157f2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 30 Sep 2022 18:32:23 -0600
Subject: [PATCH 1008/1625] Chia import.

---
 api/commands/blockchain_db.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/commands/blockchain_db.py b/api/commands/blockchain_db.py
index 78bd6d23..b1084873 100644
--- a/api/commands/blockchain_db.py
+++ b/api/commands/blockchain_db.py
@@ -5,7 +5,10 @@
 import os
 import sqlite3
 
-from chia.util.bech32m import decode_puzzle_hash
+# TODO Handle other blockchains
+if "chia" == globals.enabled_blockchains()[0]:
+    # https://github.com/Chia-Network/chia-blockchain/blob/main/chia/util/bech32m.py
+    from chia.util.bech32m import decode_puzzle_hash
 
 from common.config import globals
 from api import app

From 3b9f7cef6108f10c51d0e2512be586e61f517de0 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 30 Sep 2022 18:56:10 -0600
Subject: [PATCH 1009/1625] Will have to send puzzle hash from Chia controller.

---
 api/commands/blockchain_db.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/api/commands/blockchain_db.py b/api/commands/blockchain_db.py
index b1084873..1f78d4a7 100644
--- a/api/commands/blockchain_db.py
+++ b/api/commands/blockchain_db.py
@@ -5,11 +5,6 @@
 import os
 import sqlite3
 
-# TODO Handle other blockchains
-if "chia" == globals.enabled_blockchains()[0]:
-    # https://github.com/Chia-Network/chia-blockchain/blob/main/chia/util/bech32m.py
-    from chia.util.bech32m import decode_puzzle_hash
-
 from common.config import globals
 from api import app
 
@@ -28,8 +23,7 @@ def _get_blockchain_db_path():
             return blockchain_db_path
     raise Exception("Found neither v1 or v2 blockchain database at: {0}/db".format(network_path))
 
-def get_unspent_coins(pool_contract_address):
-    puzzle_hash = decode_puzzle_hash(pool_contract_address)
+def get_unspent_coins(puzzle_hash):
     db_path = _get_blockchain_db_path()
     spent_column_name = 'spent' # v1
     if '_v2_' in db_path:

From 89f44e78bd0fd2ec6aae7ccad723438d99916676 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 2 Oct 2022 09:33:26 -0600
Subject: [PATCH 1010/1625] Chart memory usage of each container (GiB) and
 total host usage (%).

---
 api/default_settings.py                    |   2 +
 api/migrations/versions/00382c81d58e_.py   |  12 +
 api/migrations/versions/4251648e5e30_.py   |  12 +
 api/migrations/versions/53d13c2cdac7_.py   |  12 +
 api/migrations/versions/8acdc24f8d3d_.py   |  12 +
 api/migrations/versions/a73e47f22d10_.py   |  12 +
 api/migrations/versions/aa872a73d89d_.py   |  12 +
 api/migrations/versions/bad9ae7e11d9_.py   |  12 +
 api/migrations/versions/da71a39b8e21_.py   |  12 +
 api/migrations/versions/e5c6d9a6d9c3_.py   |  12 +
 api/migrations/versions/e8e78a7c23bf_.py   | 437 +++++++++++++++++++++
 api/schedules/stats_disk.py                |   3 +-
 api/schedules/status_worker.py             |   5 +
 api/views/workers/resources.py             |  32 ++
 common/config/globals.py                   |  18 +
 common/models/stats.py                     |  19 +
 common/models/workers.py                   |   4 +-
 web/actions/stats.py                       | 107 ++++-
 web/default_settings.py                    |   2 +
 web/routes.py                              |  15 +-
 web/templates/charts/container_memory.html | 126 ++++++
 web/templates/farming/workers.html         | 110 +++++-
 web/templates/plotting/workers.html        |  89 ++++-
 web/templates/wallet.html                  |   4 +-
 web/templates/worker.html                  |  97 ++++-
 web/templates/workers.html                 | 135 ++++++-
 26 files changed, 1288 insertions(+), 25 deletions(-)
 create mode 100644 api/migrations/versions/e8e78a7c23bf_.py
 create mode 100644 web/templates/charts/container_memory.html

diff --git a/api/default_settings.py b/api/default_settings.py
index 505e614c..3cea47a4 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -44,6 +44,8 @@ class DefaultConfig:
         'stat_farmed_blocks':       'sqlite:////root/.chia/machinaris/dbs/stat_farmed_blocks.db',
         'stat_wallet_balances':     'sqlite:////root/.chia/machinaris/dbs/stat_wallet_balances.db',
         'stat_total_balance':       'sqlite:////root/.chia/machinaris/dbs/stat_total_balance.db',
+        'stat_container_mem_gib':   'sqlite:////root/.chia/machinaris/dbs/stat_container_mem_gib.db',
+        'stat_host_mem_pct':        'sqlite:////root/.chia/machinaris/dbs/stat_host_mem_pct.db',
     }
     SQLALCHEMY_ECHO = True if 'FLASK_ENV' in os.environ and os.environ['FLASK_ENV'] == "development" else False
     ETAG_DISABLED = True # https://flask-smorest.readthedocs.io/en/latest/etag.html
diff --git a/api/migrations/versions/00382c81d58e_.py b/api/migrations/versions/00382c81d58e_.py
index 7302f939..34244c40 100644
--- a/api/migrations/versions/00382c81d58e_.py
+++ b/api/migrations/versions/00382c81d58e_.py
@@ -402,3 +402,15 @@ def upgrade_warnings():
 
 def downgrade_warnings():
     pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
+    pass
diff --git a/api/migrations/versions/4251648e5e30_.py b/api/migrations/versions/4251648e5e30_.py
index 42ac3e94..6e9c9f11 100644
--- a/api/migrations/versions/4251648e5e30_.py
+++ b/api/migrations/versions/4251648e5e30_.py
@@ -382,4 +382,16 @@ def upgrade_warnings():
     pass
 
 def downgrade_warnings():
+    pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
     pass
\ No newline at end of file
diff --git a/api/migrations/versions/53d13c2cdac7_.py b/api/migrations/versions/53d13c2cdac7_.py
index 8577585c..d4fd7395 100644
--- a/api/migrations/versions/53d13c2cdac7_.py
+++ b/api/migrations/versions/53d13c2cdac7_.py
@@ -378,3 +378,15 @@ def upgrade_warnings():
 
 def downgrade_warnings():
     pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
+    pass
diff --git a/api/migrations/versions/8acdc24f8d3d_.py b/api/migrations/versions/8acdc24f8d3d_.py
index 02053ad6..f5d3ab8b 100644
--- a/api/migrations/versions/8acdc24f8d3d_.py
+++ b/api/migrations/versions/8acdc24f8d3d_.py
@@ -384,3 +384,15 @@ def upgrade_warnings():
 
 def downgrade_warnings():
     pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
+    pass
diff --git a/api/migrations/versions/a73e47f22d10_.py b/api/migrations/versions/a73e47f22d10_.py
index 05cb8623..5d4d2b55 100644
--- a/api/migrations/versions/a73e47f22d10_.py
+++ b/api/migrations/versions/a73e47f22d10_.py
@@ -407,3 +407,15 @@ def downgrade_stat_total_balance():
     # ### commands auto generated by Alembic - please adjust! ###
     pass
     # ### end Alembic commands ###
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
+    pass
\ No newline at end of file
diff --git a/api/migrations/versions/aa872a73d89d_.py b/api/migrations/versions/aa872a73d89d_.py
index 598c6961..a5ef727c 100644
--- a/api/migrations/versions/aa872a73d89d_.py
+++ b/api/migrations/versions/aa872a73d89d_.py
@@ -397,4 +397,16 @@ def upgrade_warnings():
     pass
 
 def downgrade_warnings():
+    pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
     pass
\ No newline at end of file
diff --git a/api/migrations/versions/bad9ae7e11d9_.py b/api/migrations/versions/bad9ae7e11d9_.py
index cad85859..11ace85a 100644
--- a/api/migrations/versions/bad9ae7e11d9_.py
+++ b/api/migrations/versions/bad9ae7e11d9_.py
@@ -392,3 +392,15 @@ def upgrade_warnings():
 
 def downgrade_warnings():
     pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
+    pass
diff --git a/api/migrations/versions/da71a39b8e21_.py b/api/migrations/versions/da71a39b8e21_.py
index 45b2fe67..d5ba62d3 100644
--- a/api/migrations/versions/da71a39b8e21_.py
+++ b/api/migrations/versions/da71a39b8e21_.py
@@ -569,4 +569,16 @@ def upgrade_warnings():
     pass
 
 def downgrade_warnings():
+    pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
     pass
\ No newline at end of file
diff --git a/api/migrations/versions/e5c6d9a6d9c3_.py b/api/migrations/versions/e5c6d9a6d9c3_.py
index 50571bf8..ac1f3366 100644
--- a/api/migrations/versions/e5c6d9a6d9c3_.py
+++ b/api/migrations/versions/e5c6d9a6d9c3_.py
@@ -381,4 +381,16 @@ def upgrade_warnings():
     pass
 
 def downgrade_warnings():
+    pass
+
+def upgrade_stat_container_mem_gib():
+    pass
+
+def downgrade_stat_container_mem_gib():
+    pass
+
+def upgrade_stat_host_mem_pct():
+    pass
+
+def downgrade_stat_host_mem_pct():
     pass
\ No newline at end of file
diff --git a/api/migrations/versions/e8e78a7c23bf_.py b/api/migrations/versions/e8e78a7c23bf_.py
new file mode 100644
index 00000000..0767f9c7
--- /dev/null
+++ b/api/migrations/versions/e8e78a7c23bf_.py
@@ -0,0 +1,437 @@
+"""empty message
+
+Revision ID: e8e78a7c23bf
+Revises: a73e47f22d10
+Create Date: 2022-10-01 17:19:07.495438
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e8e78a7c23bf'
+down_revision = 'a73e47f22d10'
+branch_labels = None
+depends_on = None
+
+
+def upgrade(engine_name):
+    globals()["upgrade_%s" % engine_name]()
+
+
+def downgrade(engine_name):
+    globals()["downgrade_%s" % engine_name]()
+
+
+
+
+
+def upgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_alerts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_alerts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_blockchains():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_blockchains():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_challenges():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_challenges():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_connections():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_connections():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_drives():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_drives():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_farms():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_farms():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_keys():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_keys():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_partials():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_partials():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plotnfts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plotnfts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plottings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plottings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plots():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plots():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_pools():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_pools():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_wallets():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_wallets():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_warnings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_warnings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_workers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_workers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plot_count():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plot_count():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_total_coins():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_total_coins():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_netspace_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_netspace_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_time_to_win():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_time_to_win():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_effort():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_effort():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_farmed_blocks():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_farmed_blocks():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_wallet_balances():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_wallet_balances():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_total_balance():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_total_balance():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_container_mem_gib():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('stat_container_mem_gib',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('hostname', sa.String(), nullable=True),
+    sa.Column('blockchain', sa.String(length=64), nullable=False),
+    sa.Column('value', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_container_mem_gib():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('stat_container_mem_gib')
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_host_mem_pct():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('stat_host_mem_pct',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('hostname', sa.String(), nullable=True),
+    sa.Column('value', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_host_mem_pct():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('stat_host_mem_pct')
+    # ### end Alembic commands ###
+
diff --git a/api/schedules/stats_disk.py b/api/schedules/stats_disk.py
index aa895562..5978fe93 100644
--- a/api/schedules/stats_disk.py
+++ b/api/schedules/stats_disk.py
@@ -16,7 +16,8 @@
 DELETE_OLD_STATS_AFTER_DAYS = 1
 
 TABLES = [ stats.StatPlotsTotalUsed, stats.StatPlotsDiskUsed, stats.StatPlotsDiskFree,
-           stats.StatPlottingTotalUsed, stats.StatPlottingDiskUsed, stats.StatPlottingDiskFree, ]
+           stats.StatPlottingTotalUsed, stats.StatPlottingDiskUsed, stats.StatPlottingDiskFree,
+           stats.StatContainerMemoryUsageGib, stats.StatHostMemoryUsagePercent, ] # Also delete memory stats
 
 def delete_old_stats():
     try:
diff --git a/api/schedules/status_worker.py b/api/schedules/status_worker.py
index e690af7b..4f3da524 100644
--- a/api/schedules/status_worker.py
+++ b/api/schedules/status_worker.py
@@ -80,4 +80,9 @@ def gather_services_status():
     memory_usage = globals.get_container_memory_usage_bytes()
     if memory_usage:
         response['container_memory_usage_bytes'] = memory_usage
+    if blockchain == 'chia': # Only Chia container records host memory usage
+        host_memory_usage_percent = globals.get_host_memory_usage_percent()
+        if host_memory_usage_percent:
+            response['host_memory_usage_percent'] = host_memory_usage_percent
+    app.logger.info(response)
     return json.dumps(response)
diff --git a/api/views/workers/resources.py b/api/views/workers/resources.py
index ea9c299d..4cd9d26c 100644
--- a/api/views/workers/resources.py
+++ b/api/views/workers/resources.py
@@ -1,4 +1,5 @@
 import datetime as dt
+import json
 import pytz
 import os
 
@@ -9,6 +10,7 @@
 from api.extensions.api import Blueprint, SQLCursorPage
 from common.extensions.database import db
 from common.models import Worker
+from common.models.stats import StatContainerMemoryUsageGib, StatHostMemoryUsagePercent 
 
 from .schemas import WorkerSchema, WorkerQueryArgsSchema
 
@@ -47,6 +49,17 @@ def post(self, new_item, hostname, port):
             WorkerSchema().update(item, new_item)
         else: # insert
             item = Worker(**new_item)
+        try:
+            created_at = dt.datetime.now().strftime("%Y%m%d%H%M")
+            hostname = new_item['hostname']
+            blockchain = new_item['blockchain']
+            services = json.loads(item.services)
+            if 'container_memory_usage_bytes' in services:
+                self.save_container_memory_usage(hostname, blockchain, services['container_memory_usage_bytes'], created_at)
+            if 'host_memory_usage_percent' in services:
+                self.save_host_memory_usage(hostname, blockchain, services['host_memory_usage_percent'], created_at)
+        except Exception as ex:
+            app.logger.error("Failed to record memory statistic from worker status due to: {0}".format(str(ex)))
         db.session.add(item)
         db.session.commit()
         return item
@@ -59,3 +72,22 @@ def delete(self, hostname, port):
             blp.check_etag(item, WorkerSchema)
             db.session.delete(item)
             db.session.commit()
+
+    def save_container_memory_usage(self, hostname, blockchain, mem_bytes, created_at):
+        item = StatContainerMemoryUsageGib(**{
+            'hostname':  hostname,
+            'blockchain': blockchain,
+            'value': mem_bytes,
+            'created_at': created_at
+        })
+        db.session.add(item)
+        db.session.commit()
+
+    def save_host_memory_usage(self, hostname, blokchain, pct_used, created_at):
+        item = StatHostMemoryUsagePercent(**{
+            'hostname':  hostname,
+            'value': pct_used,
+            'created_at': created_at
+        })
+        db.session.add(item)
+        db.session.commit()
diff --git a/common/config/globals.py b/common/config/globals.py
index b75c26c3..9d9abc4b 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -520,3 +520,21 @@ def get_container_memory_usage_bytes():
     except Exception as ex:
         logging.error("Failed to read current container memory usage in bytes due to: {0}".format(str(ex)))
     return None
+
+def get_host_memory_usage_percent():
+    try:
+        total_mem = None
+        avail_mem = None
+        with open("/proc/meminfo", "r") as f:
+            for line in f.readlines():
+                if line.startswith('MemTotal:'):
+                    #logging.error("{0} -> {1}".format(line, line.split(':')[1].strip().split(' ')[0]))
+                    total_mem = int(line.split(':')[1].strip().split(' ')[0])
+                elif line.startswith('MemAvailable:'):
+                    #logging.error("{0} -> {1}".format(line, line.split(':')[1].strip().split(' ')[0]))
+                    avail_mem = int(line.split(':')[1].strip().split(' ')[0])
+        if total_mem and avail_mem:
+            return 100 - int(avail_mem / total_mem * 100)  # Used memory percentage
+    except Exception as ex:
+        logging.error("Failed to calculate total host memory usage percentage due to: {0}".format(str(ex)))
+    return None
diff --git a/common/models/stats.py b/common/models/stats.py
index 74c51589..54c364c1 100644
--- a/common/models/stats.py
+++ b/common/models/stats.py
@@ -158,3 +158,22 @@ class StatTotalBalance(db.Model):
     value = db.Column(db.REAL)
     currency = db.Column(db.String())
     created_at = db.Column(db.String())
+
+class StatContainerMemoryUsageGib(db.Model):
+    __bind_key__ = 'stat_container_mem_gib'
+    __tablename__ = "stat_container_mem_gib"
+
+    id = db.Column(db.Integer, primary_key=True)
+    hostname = db.Column(db.String())
+    blockchain = db.Column(db.String(length=64), nullable=False)
+    value = db.Column(db.Integer)
+    created_at = db.Column(db.String())
+
+class StatHostMemoryUsagePercent(db.Model):
+    __bind_key__ = 'stat_host_mem_pct'
+    __tablename__ = "stat_host_mem_pct"
+
+    id = db.Column(db.Integer, primary_key=True)
+    hostname = db.Column(db.String())
+    value = db.Column(db.Integer)
+    created_at = db.Column(db.String())
diff --git a/common/models/workers.py b/common/models/workers.py
index fc218bf8..fe5c3d8e 100644
--- a/common/models/workers.py
+++ b/common/models/workers.py
@@ -65,9 +65,9 @@ def monitoring_status(self):
             except:
                 return "unknown"
     
-    def container_memory_usage_gb(self):
+    def container_memory_usage_gib(self):
         try:
-            return "{:.2f} GB".format(int(j.loads(self.services)['container_memory_usage_bytes']) / 1024 / 1024 / 1024)
+            return "{:.2f} GiB".format(int(j.loads(self.services)['container_memory_usage_bytes']) / 1024 / 1024 / 1024)
         except Exception as ex:
             return ''
     
diff --git a/web/actions/stats.py b/web/actions/stats.py
index 28fd48b0..e516b0d1 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -26,7 +26,8 @@
 from common.models.partials import Partial
 from common.models.stats import StatPlotCount, StatPlotsSize, StatTotalCoins, StatNetspaceSize, StatTimeToWin, \
         StatPlotsTotalUsed, StatPlotsDiskUsed, StatPlotsDiskFree, StatPlottingTotalUsed, StatEffort, \
-        StatPlottingDiskUsed, StatPlottingDiskFree, StatFarmedBlocks, StatWalletBalances, StatTotalBalance
+        StatPlottingDiskUsed, StatPlottingDiskFree, StatFarmedBlocks, StatWalletBalances, StatTotalBalance, \
+        StatContainerMemoryUsageGib, StatHostMemoryUsagePercent
 from web import app, db, utils
 from web.actions import chia, worker
 
@@ -474,6 +475,46 @@ def load_total_balances(current_currency_symbol):
     return { 'title': _('Wallets Total') + ' (' + current_currency_symbol + ')', 'y_axis_title': _('Fiat Currency'),
          'dates': dates, 'vals': values, 'last_value': " - {0} {1}".format(last_value, current_currency_symbol) }
 
+def load_host_memory_usage():
+    dates = []
+    workers = {}
+    displaynames_for_hosts = {}
+    result = db.session.query(StatHostMemoryUsagePercent).order_by(StatHostMemoryUsagePercent.created_at.asc()).all()
+    for p in result:
+        converted_date = converters.convert_date_for_luxon(p.created_at)
+        if not converted_date in dates:
+            dates.append(converted_date)
+        if p.hostname in displaynames_for_hosts:
+            displayname = displaynames_for_hosts[p.hostname]
+        else:
+            try:
+                w = worker.get_worker(p.hostname)
+                displayname = w.displayname
+            except:
+                app.logger.debug("Failed to find worker for hostname: {0}".format(p.hostname))
+                displayname = p.hostname
+        if not displayname in workers:
+            workers[displayname] = {}
+        values = workers[displayname]
+        values[converted_date] = p.value # Integer as percent of all host memory used
+    values_per_worker = {}
+    if len(dates) > 0:
+        for wk in workers.keys():
+            worker_values = []
+            for date in dates:
+                if wk in workers:
+                    if date in workers[wk]:  
+                        worker_values.append(str(workers[wk][date]))
+                    else: # Due to exeception reported by one user
+                        worker_values.append('null')
+                else:
+                    worker_values.append('null')
+            values_per_worker[wk] = worker_values
+    #app.logger.info(dates)
+    #app.logger.info(values_per_worker)
+    return {'y_axis_title': _('Host Memory Usage') + ' (%)',
+         'dates': dates, "workers": workers.keys(), "values_per_worker": values_per_worker }
+
 def load_netspace_size(blockchain):
     dates = []
     values = []
@@ -503,7 +544,7 @@ def load_farmed_blocks(blockchain):
             w = worker.get_worker(row.hostname)
             displayname = w.displayname
         except:
-            app.logger.debug("Failed to find worker for hostname: {0}".format(ResourceWarning.hostname))
+            app.logger.debug("Failed to find worker for hostname: {0}".format(w.hostname))
             displayname = row.hostname
         blocks.append({
             'hostname': displayname,
@@ -621,6 +662,31 @@ def load_time_to_win(blockchain):
     return { 'title': blockchain.capitalize() + ' - ' + _('ETW'), 'dates': dates, 'vals': converted_values, 
         'y_axis_title': _('Estimated Time to Win') + ' (' + _('days') + ')'}
 
+def load_container_memory(hostname, blockchain):
+    dates = []
+    values = []
+    result = db.session.query(StatContainerMemoryUsageGib).order_by(StatContainerMemoryUsageGib.created_at.asc()).filter(
+            StatContainerMemoryUsageGib.hostname == hostname, StatContainerMemoryUsageGib.blockchain == blockchain).all()
+    for i in range(len(result)):
+        s = result[i]
+        converted_date = converters.convert_date_for_luxon(s.created_at)
+        # First, last, and every 5th (at ~2x5 min intervals)
+        if (i == 0) or (i % 5 == 0) or (i == len(result) - 1):
+            dates.append(converted_date)
+            values.append(s.value)
+    app.logger.debug("{0} before {1}".format(blockchain, values))
+    if len(values) > 0:
+        converted_values = list(map(lambda x: round(x/1024/1024/1024,2), values))  # Bytes to GiB
+    else:
+        converted_values = []
+    app.logger.debug("{0} after {1}".format(blockchain, converted_values))
+    try:
+        displayname = worker.get_worker(hostname).displayname
+    except:
+        displayname = hostname
+    return { 'title': blockchain.capitalize() + ' - ' + _('Container Memory Usage') +  ' - ' + displayname, 'dates': dates, 'vals': converted_values, 
+        'y_axis_title': _('GiB') }
+
 def count_plots_by_type(hostname):
     plots_by_type = {}
     result = db.session.query(Plot.type, func.count(Plot.hostname)).filter(Plot.hostname==hostname).group_by(Plot.type).all()
@@ -656,3 +722,40 @@ def set_disk_usage_per_farmer(farmers, disk_usage):
         else:
             app.logger.info("No disk usage stats found for {0}".format(farmer.hostname))
             farmer.drive_usage = "" # Empty string to report
+
+def load_recent_mem_usage(worker_type, only_hostname=None):
+    summary_by_worker = {}
+    for host in worker.load_workers():
+        hostname = host.hostname
+        if only_hostname and hostname != only_hostname:
+            continue
+        dates = []
+        data_by_blockchain = {}
+        mem_result = db.session.query(StatContainerMemoryUsageGib).filter( 
+            StatContainerMemoryUsageGib.hostname == host.hostname). \
+            order_by(StatContainerMemoryUsageGib.created_at, StatContainerMemoryUsageGib.blockchain).all()
+        for row in mem_result:
+            if worker_type == 'plotting' and host.mode != 'plotter' and (host.mode == 'fullnode' and not row.blockchain in ['chia', 'chives', 'mmx']):
+                continue  # Not a plotting container
+            elif worker_type == 'farming' and host.mode == 'plotter':
+                continue # Not a farmer or harvester
+            converted_date = converters.convert_date_for_luxon(row.created_at)
+            if not converted_date in dates:
+                dates.append(converted_date)
+            if not row.blockchain in data_by_blockchain:
+                data_by_blockchain[row.blockchain] = {}
+            data_by_blockchain[row.blockchain][converted_date] = round((row.value / 1024 / 1024 /1024), 2)
+        if len(dates) > 0:
+            summary_by_worker[hostname] = { "dates": dates, "blockchains": data_by_blockchain.keys(),  }
+            for blockchain in data_by_blockchain.keys():
+                blockchain_values = []
+                for date in dates:
+                    if blockchain in data_by_blockchain:
+                        if date in data_by_blockchain[blockchain]:
+                            blockchain_values.append(str(data_by_blockchain[blockchain][date]))
+                        else: 
+                            blockchain_values.append('null')
+                    else:
+                        blockchain_values.append('null')
+                summary_by_worker[hostname][blockchain] = blockchain_values
+    return summary_by_worker
diff --git a/web/default_settings.py b/web/default_settings.py
index c29da506..752c281f 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -36,6 +36,8 @@ class DefaultConfig:
         'stat_farmed_blocks':       'sqlite:////root/.chia/machinaris/dbs/stat_farmed_blocks.db',
         'stat_wallet_balances':     'sqlite:////root/.chia/machinaris/dbs/stat_wallet_balances.db',
         'stat_total_balance':       'sqlite:////root/.chia/machinaris/dbs/stat_total_balance.db',
+        'stat_container_mem_gib':   'sqlite:////root/.chia/machinaris/dbs/stat_container_mem_gib.db',
+        'stat_host_mem_pct':        'sqlite:////root/.chia/machinaris/dbs/stat_host_mem_pct.db',
     }
     SQLALCHEMY_ECHO = True if 'FLASK_ENV' in os.environ and os.environ['FLASK_ENV'] == "development" else False
     CONTROLLER_SCHEME = 'http'
diff --git a/web/routes.py b/web/routes.py
index 996a295f..67cb1f11 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -110,6 +110,9 @@ def chart():
     elif chart_type == 'timetowin':
         chart_data = stats.load_time_to_win(blockchain)
         return render_template('charts/timetowin.html', reload_seconds=120, global_config=gc, chart_data=chart_data, lang=get_lang(request)) 
+    elif chart_type == 'container_memory':
+        chart_data = stats.load_container_memory(request.args.get('hostname'), blockchain)
+        return render_template('charts/container_memory.html', reload_seconds=120, global_config=gc, chart_data=chart_data, lang=get_lang(request)) 
 
 @app.route('/summary', methods=['GET', 'POST'])
 def summary():
@@ -195,7 +198,8 @@ def plotting_workers():
         return redirect(url_for('plotting_workers')) # Force a redirect to allow time to update status
     plotters = plotman.load_plotters()
     disk_usage = stats.load_recent_disk_usage('plotting')
-    return render_template('plotting/workers.html', plotters=plotters, disk_usage=disk_usage, global_config=gc)
+    mem_usage = stats.load_recent_mem_usage('plotting')
+    return render_template('plotting/workers.html', plotters=plotters, disk_usage=disk_usage, mem_usage=mem_usage, global_config=gc)
 
 @app.route('/farming/plots')
 def farming_plots():
@@ -227,8 +231,9 @@ def farming_workers():
     daily_summaries = stats.load_daily_farming_summaries(farmers)
     disk_usage = stats.load_current_disk_usage('plots')
     stats.set_disk_usage_per_farmer(farmers, disk_usage)
+    mem_usage = stats.load_recent_mem_usage('farming')
     return render_template('farming/workers.html', farmers=farmers, 
-        daily_summaries=daily_summaries, disk_usage=disk_usage, 
+        daily_summaries=daily_summaries, disk_usage=disk_usage, mem_usage=mem_usage, 
         MAX_COLUMNS_ON_CHART=stats.MAX_ALLOWED_PATHS_ON_BAR_CHART,
         global_config=gc)
 
@@ -310,8 +315,9 @@ def workers():
         if request.form.get('action') == "prune":
             worker.prune_workers_status(request.form.getlist('worker'))
     wkrs = worker.load_worker_summary()
+    chart_data = stats.load_host_memory_usage()
     return render_template('workers.html', reload_seconds=120, 
-        workers=wkrs, global_config=gc, lang=get_lang(request))
+        workers=wkrs, global_config=gc, chart_data=chart_data, lang=get_lang(request))
 
 @app.route('/worker', methods=['GET'])
 def worker_route():
@@ -322,9 +328,10 @@ def worker_route():
     plotting = plotman.load_plotting_summary(hostname=hostname)
     plots_disk_usage = stats.load_current_disk_usage('plots',hostname=hostname)
     plotting_disk_usage = stats.load_current_disk_usage('plotting',hostname=hostname)
+    mem_usage = stats.load_recent_mem_usage('all', only_hostname=hostname)
     warnings = worker.generate_warnings(wkr)
     return render_template('worker.html', worker=wkr, 
-        plotting=plotting, plots_disk_usage=plots_disk_usage, 
+        plotting=plotting, mem_usage=mem_usage, plots_disk_usage=plots_disk_usage, 
         plotting_disk_usage=plotting_disk_usage, warnings=warnings, global_config=gc,
         MAX_COLUMNS_ON_CHART=stats.MAX_ALLOWED_PATHS_ON_BAR_CHART,
         lang=get_lang(request))
diff --git a/web/templates/charts/container_memory.html b/web/templates/charts/container_memory.html
new file mode 100644
index 00000000..c3b25b2b
--- /dev/null
+++ b/web/templates/charts/container_memory.html
@@ -0,0 +1,126 @@
+
+
+
+
+    
+    
+    
+    
+    
+    
+    {{ chart_data.title }}
+    {% if reload_seconds %}
+    
+    {% endif %}
+    
+    
+    
+    
+
+
+
+    

+        
+    

+
+    
Loaded at: {{ global_config.now }}

+    
+    
+    
+    
+    
+    
+    
+    
+
+
diff --git a/web/templates/farming/workers.html b/web/templates/farming/workers.html
index 31a56fa4..beb7561e 100644
--- a/web/templates/farming/workers.html
+++ b/web/templates/farming/workers.html
@@ -128,6 +128,18 @@ 
{{ blockchain|capitalize }} - {{_('Daily Summary')}}

         

+        

+            

+                {% if mem_usage[farmer.hostname] %}
+                
+                {% else %}
+                {% autoescape false %}
+                
{{_('No memory usage stats recorded recently for %(hostname)s with Chia blockchain. Please ensure the Chia worker is reporting into the controller on the Workers page.', hostname=farmer.hostname)}}
+                

+                {% endautoescape %}
+                {% endif %}
+            

+        

         

             

                 {% if disk_usage[farmer.hostname] %}
@@ -153,11 +165,23 @@ 
{{ blockchain|capitalize }} - {{_('Daily Summary')}}

-        Chart.register(ChartDataLabels);
-    
+        const COLORS = [
+            '#3aac59',
+            '#4dc9f6',
+            '#f67019',
+            '#f53794',
+            '#537bc4',
+            '#acc236',
+            '#166a8f',
+            '#00a950',
+            '#58595b',
+            '#8549ba'
+        ];
+        function color(index) {
+            return COLORS[index % COLORS.length];
+        }
     {% for farmer in farmers %}
     {% if disk_usage[farmer.hostname] %}
-    
     {% endif %}
     {% endfor %}
+    
     {% endblock %}
\ No newline at end of file
diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html
index 4d7718b7..88eb2f12 100644
--- a/web/templates/plotting/workers.html
+++ b/web/templates/plotting/workers.html
@@ -178,6 +178,18 @@ 
{{ plotter.displayname }}

                 

             

         

+        

+            

+                {% if mem_usage[plotter.hostname] %}
+                
+                {% else %}
+                

+                    No Docker container memory usage recorded recently for {{plotter.hostname}}. 
+                    Also ensure the worker is reporting into the controller on the Workers page.
+                

+                {% endif %}
+            

+        

         

             

                 {% if disk_usage[plotter.hostname] %}
@@ -216,10 +228,8 @@ 
{{ plotter.displayname }}

         function color(index) {
             return COLORS[index % COLORS.length];
         }
-    
     {% for plotter in plotters %}
     {% if disk_usage[plotter.hostname] %}
-    
-    {% endif %}
-    {% endfor %}
     {% endblock %}
\ No newline at end of file
diff --git a/web/templates/wallet.html b/web/templates/wallet.html
index c2e404e7..4c4a61c3 100644
--- a/web/templates/wallet.html
+++ b/web/templates/wallet.html
@@ -364,7 +364,7 @@ 
{{_('You can also try running "chia wallet show" on your fullnode\'s in-cont
           return COLORS[index % COLORS.length];
         }
 
-        {% if chart_data.dates|length > 0 %}
+    {% if chart_data.dates|length > 0 %}
         var ctx = document.getElementById('total_balance_chart');
         var myChart = new Chart(ctx, {
             type: 'line',
@@ -434,6 +434,6 @@ 
{{_('You can also try running "chia wallet show" on your fullnode\'s in-cont
               }
             }
           });
-  {% endif %}
+    {% endif %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/web/templates/worker.html b/web/templates/worker.html
index 0e1bcfd3..3da543ad 100644
--- a/web/templates/worker.html
+++ b/web/templates/worker.html
@@ -11,7 +11,7 @@
 

 
 

-  {{_('Worker')}} - {{ worker.displayname }}
+  {{_('Worker')}} - {{ worker.displayname }} - {{ worker.blockchain }} - {{ worker.mode}} 
 

 
 

@@ -126,6 +126,13 @@
     

   

 
+  {% if mem_usage[worker.hostname] %}
+  

+    
Memory Usage

+    
+  

+  {% endif %}
+
   {% if plots_disk_usage[worker.hostname] %}
   

     
Plots

@@ -167,6 +174,21 @@
 
   {% block scripts %}
   
   {% endblock %}
\ No newline at end of file

From 3eb1b8c58fa72d95a3122aee89719ac28c393647 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 2 Oct 2022 10:31:14 -0600
Subject: [PATCH 1011/1625] Support cgroups v2

---
 CHANGELOG.md                  | 1 +
 common/config/globals.py      | 9 +++++++--
 web/static/landings/de_DE.txt | 2 +-
 web/static/landings/en.txt    | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df8708ff..a9f2da50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,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).
 
 ## [0.8.5] - 2022-10-?
+ - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. Add 'SYS_RAWIO' to your `docker-compose.yml`
  - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
  - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0
 
diff --git a/common/config/globals.py b/common/config/globals.py
index 9d9abc4b..80227d9c 100644
--- a/common/config/globals.py
+++ b/common/config/globals.py
@@ -514,11 +514,16 @@ def wallet_running():
     return False
 
 def get_container_memory_usage_bytes():
-    try:
+    try: # Check cgroups v1
         with open("/sys/fs/cgroup/memory/memory.usage_in_bytes", "r") as f:
             return int(f.readline())
     except Exception as ex:
-        logging.error("Failed to read current container memory usage in bytes due to: {0}".format(str(ex)))
+        pass
+    try: # Check cgroups v2
+        with open("/sys/fs/cgroup/memory.current", "r") as f:
+            return int(f.readline())
+    except Exception as ex:
+        pass
     return None
 
 def get_host_memory_usage_percent():
diff --git a/web/static/landings/de_DE.txt b/web/static/landings/de_DE.txt
index 41eca535..769ceb3e 100644
--- a/web/static/landings/de_DE.txt
+++ b/web/static/landings/de_DE.txt
@@ -51,4 +51,4 @@ Wenn sich der Staubsturm legt... (zu früh?)
 Bitte CD2 einlegen und irgendeine taste drücken...
 Error in Error reporting, cannot Error @$Error. Starting Log4j in 3... 2... 1...
 Du hättest auch Grafikkarten kaufen können
-1337.png
+1337.png
\ No newline at end of file
diff --git a/web/static/landings/en.txt b/web/static/landings/en.txt
index e7eb2a03..826738a9 100644
--- a/web/static/landings/en.txt
+++ b/web/static/landings/en.txt
@@ -64,5 +64,5 @@ Power surge! Is your UPS working?
 Light out! Are your hard drives with bad sectors now?
 Light out! Does the system still boot?
 Light out! Lets replot again!
-I wish daddy had given me an UPS last Christmas, now my hard drives are all dead!
-1337.png
\ No newline at end of file
+1337.png
+You said 'Buy Crypto'! No... I said 'Bye Crypto'
\ No newline at end of file

From 78d5bd6d108b907b30e1304dff647ea7c3e05efc Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 3 Oct 2022 10:30:46 -0600
Subject: [PATCH 1012/1625] Move to WatchedFileHandler and use logroate
 instead.

---
 api/log.conf                   |  4 ++--
 api/schedules/log_rotate.py    |  1 +
 api/schedules/status_worker.py |  2 +-
 scripts/machinaris_install.sh  | 11 +++++++++++
 web/log.conf                   |  4 ++--
 web/templates/workers.html     |  3 +++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/api/log.conf b/api/log.conf
index d913744a..e9e585de 100644
--- a/api/log.conf
+++ b/api/log.conf
@@ -26,9 +26,9 @@ propagate=1
 qualname=gunicorn.access
 
 [handler_server_file]
-class=logging.handlers.TimedRotatingFileHandler
+class=logging.handlers.WatchedFileHandler
 formatter=generic
-args=('/root/.chia/machinaris/logs/apisrv.log', 'midnight', 1, 10, 'utf-8')
+args=('/root/.chia/machinaris/logs/apisrv.log', 'a', 'utf-8')
 
 [handler_null]
 class=NullHandler
diff --git a/api/schedules/log_rotate.py b/api/schedules/log_rotate.py
index b5b43a30..85587f3a 100644
--- a/api/schedules/log_rotate.py
+++ b/api/schedules/log_rotate.py
@@ -11,6 +11,7 @@
 MAX_LOG_SIZE_MB = 20
 LOG_ROTATE_CONFIG_DIR = '/etc/logrotate.d/'
 LOG_ROTATE_CONFIGS = [
+    'machinaris',
     'farmr',
     'mmx-node',
 ]
diff --git a/api/schedules/status_worker.py b/api/schedules/status_worker.py
index 4f3da524..d22b44de 100644
--- a/api/schedules/status_worker.py
+++ b/api/schedules/status_worker.py
@@ -84,5 +84,5 @@ def gather_services_status():
         host_memory_usage_percent = globals.get_host_memory_usage_percent()
         if host_memory_usage_percent:
             response['host_memory_usage_percent'] = host_memory_usage_percent
-    app.logger.info(response)
+    #app.logger.info(response)
     return json.dumps(response)
diff --git a/scripts/machinaris_install.sh b/scripts/machinaris_install.sh
index 151d9796..bce38545 100644
--- a/scripts/machinaris_install.sh
+++ b/scripts/machinaris_install.sh
@@ -12,3 +12,14 @@ venv/bin/pip3 install -r /machinaris/docker/requirements.txt
 cp -f /machinaris/docker/entrypoint.sh /chia-blockchain/ 
 
 chmod 755 /machinaris/scripts/* /chia-blockchain/entrypoint.sh
+
+tee /etc/logrotate.d/machinaris >/dev/null <{{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.
                           }
                       },
                       beginAtZero: true,
+                      max: 100,
+                      steps: 10,
+                      stepValue: 5,
                       title: {
                           display: true,
                           text: "{{ chart_data.y_axis_title }}",

From 4d70fba48b9206bbd34169792974a87f553891a6 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 3 Oct 2022 11:15:00 -0600
Subject: [PATCH 1013/1625] Improved Workers table filtering.

---
 api/commands/fd_cli.py     |  2 +-
 scripts/fd-cli_setup.sh    |  9 +++++++++
 web/actions/stats.py       | 14 ++++++++++----
 web/routes.py              |  2 +-
 web/templates/workers.html | 32 ++++++++++++++++++++++++++++----
 5 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/api/commands/fd_cli.py b/api/commands/fd_cli.py
index 438ff77d..38e023a1 100644
--- a/api/commands/fd_cli.py
+++ b/api/commands/fd_cli.py
@@ -20,7 +20,7 @@ def reward_recovery(wallet_id, launcher_id, pool_contract_address):
     if not rpc_port:
         app.logger.info("Skipping NFT reward recovery on unsupported blockchain: {0}".format(blockchain))
         return
-    logfile = "/root/.chia/machinaris/logs/fd-cli.log"
+    logfile = "/root/.chia/machinaris/logs/rewards.log"
     log_fd = os.open(logfile, os.O_RDWR | os.O_CREAT)
     log_fo = os.fdopen(log_fd, "a+")
     vars = {}
diff --git a/scripts/fd-cli_setup.sh b/scripts/fd-cli_setup.sh
index 7249f88a..97684db9 100644
--- a/scripts/fd-cli_setup.sh
+++ b/scripts/fd-cli_setup.sh
@@ -17,5 +17,14 @@ if [[ ${mode} == 'fullnode' ]]; then
         cp requirements_${codename}.txt requirements.txt
         cp setup_${codename}.py setup.py
         pip install -e . --extra-index-url https://pypi.chia.net/simple/
+
+        # v0.8.5 - upgrade to new log file name
+        if [[ -f /root/.chia/machinaris/logs/fd-cli.log ]]; then 
+            if [[ -f /root/.chia/machinaris/logs/rewards.log ]]; then
+                rm -f /root/.chia/machinaris/logs/fd-cli.log
+            else  # Save old log
+                mv /root/.chia/machinaris/logs/fd-cli.log /root/.chia/machinaris/logs/rewards.log
+            fi
+        fi
     fi
 fi
\ No newline at end of file
diff --git a/web/actions/stats.py b/web/actions/stats.py
index e516b0d1..edf52027 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -723,7 +723,7 @@ def set_disk_usage_per_farmer(farmers, disk_usage):
             app.logger.info("No disk usage stats found for {0}".format(farmer.hostname))
             farmer.drive_usage = "" # Empty string to report
 
-def load_recent_mem_usage(worker_type, only_hostname=None):
+def load_recent_mem_usage(worker_type, only_hostname=None, only_blockchain=None):
     summary_by_worker = {}
     for host in worker.load_workers():
         hostname = host.hostname
@@ -731,9 +731,14 @@ def load_recent_mem_usage(worker_type, only_hostname=None):
             continue
         dates = []
         data_by_blockchain = {}
-        mem_result = db.session.query(StatContainerMemoryUsageGib).filter( 
-            StatContainerMemoryUsageGib.hostname == host.hostname). \
-            order_by(StatContainerMemoryUsageGib.created_at, StatContainerMemoryUsageGib.blockchain).all()
+        if only_blockchain:
+            mem_result = db.session.query(StatContainerMemoryUsageGib).filter( 
+                StatContainerMemoryUsageGib.hostname == host.hostname, StatContainerMemoryUsageGib.blockchain == only_blockchain). \
+                order_by(StatContainerMemoryUsageGib.created_at, StatContainerMemoryUsageGib.blockchain).all()
+        else: # all blockchains on that hostname
+            mem_result = db.session.query(StatContainerMemoryUsageGib).filter( 
+                StatContainerMemoryUsageGib.hostname == host.hostname). \
+                order_by(StatContainerMemoryUsageGib.created_at, StatContainerMemoryUsageGib.blockchain).all()
         for row in mem_result:
             if worker_type == 'plotting' and host.mode != 'plotter' and (host.mode == 'fullnode' and not row.blockchain in ['chia', 'chives', 'mmx']):
                 continue  # Not a plotting container
@@ -757,5 +762,6 @@ def load_recent_mem_usage(worker_type, only_hostname=None):
                             blockchain_values.append('null')
                     else:
                         blockchain_values.append('null')
+                # TODO Decimate the memory usage datapoints as too many being returned...
                 summary_by_worker[hostname][blockchain] = blockchain_values
     return summary_by_worker
diff --git a/web/routes.py b/web/routes.py
index 67cb1f11..c5cc4dd5 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -328,7 +328,7 @@ def worker_route():
     plotting = plotman.load_plotting_summary(hostname=hostname)
     plots_disk_usage = stats.load_current_disk_usage('plots',hostname=hostname)
     plotting_disk_usage = stats.load_current_disk_usage('plotting',hostname=hostname)
-    mem_usage = stats.load_recent_mem_usage('all', only_hostname=hostname)
+    mem_usage = stats.load_recent_mem_usage('all', only_hostname=hostname, only_blockchain=blockchain)
     warnings = worker.generate_warnings(wkr)
     return render_template('worker.html', worker=wkr, 
         plotting=plotting, mem_usage=mem_usage, plots_disk_usage=plots_disk_usage, 
diff --git a/web/templates/workers.html b/web/templates/workers.html
index 944e3d6c..7287ae50 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -63,10 +63,9 @@
         
           {% for worker in workers.workers %}
           
-            
+            {{ worker.hostname }}|{{ worker.blockchain }}|{{ worker.port }}
             {{worker.displayname}}
-            {{worker.blockchain}}
+            {{worker.blockchain}}
             {{worker.mode}}
             {{worker.container_memory_usage_gib()}}
             {{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.
           "pageLength": 25,
           "lengthMenu": [ [25, 50, 100, 200, -1], [25, 50, 100, 200, "All"] ],
           "order": [[1, "asc"]],
-          "columnDefs": [{ "orderable": false, targets: [0,8] }],
+          "columnDefs": [
+            { 
+                targets: [0], "orderable": false, 
+                "render": function ( data, type, row, meta ) {
+                    console.log(row);
+                    arr = data.split('|');
+                    hostname = arr[0];
+                    blockchain = arr[1];
+                    port = arr[2];
+                    return '';
+                }
+            },
+            { 
+                targets: [2], "orderable": true, 
+                "render": function ( data, type, row, meta ) {
+                    console.log(row);
+                    var url = "{{ url_for('worker_route') }}";
+                    arr = row[0].split('|');
+                    hostname = arr[0];
+                    blockchain = arr[1];
+                    port = arr[2];
+                    return '' + data +'';
+                }
+            },
+            { "orderable": false, targets: [8] },
+          ],
           {% if lang != 'en' %}
           "language": {
               "url": "{{ url_for('static', filename='3rd_party/i18n/datatables.'+lang+'.json') }}"

From 466e2b3d11cca6ef9faacf523eda8c9c21931065 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 3 Oct 2022 15:40:01 -0600
Subject: [PATCH 1014/1625] Fork forktools.

---
 scripts/forktools_setup.sh |  6 +++---
 web/templates/workers.html | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/scripts/forktools_setup.sh b/scripts/forktools_setup.sh
index 4ccdcdad..d48f998f 100644
--- a/scripts/forktools_setup.sh
+++ b/scripts/forktools_setup.sh
@@ -3,12 +3,12 @@
 # Installs forktools - https://github.com/Qwinn1/forktools
 #
 
-# On 2021-12-01
-HASH=5df93f705f650cbd1379eee21efaeef8f6dc262a
+FORKTOOLS_BRANCH=testing
+
 if [[ "${forktools_skip_build}" != 'true' ]]; then
 	if [[ (${mode} == 'fullnode' || ${mode} =~ "harvester") && ${blockchains} != 'mmx' ]]; then
 		cd /
-		git clone https://github.com/Qwinn1/forktools
+		git clone --branch ${FORKTOOLS_BRANCH} git@github.com:guydavis/forktools.git
 		cd forktools
 		bash installft.sh
 		git checkout $HASH > /dev/null
diff --git a/web/templates/workers.html b/web/templates/workers.html
index 7287ae50..bbda0bf4 100644
--- a/web/templates/workers.html
+++ b/web/templates/workers.html
@@ -87,8 +87,7 @@
               {% endif %}
             
             {{worker.ping_success_at | datetimefilter}}
-            {{worker.versions.machinaris}}
+            {{worker.versions.machinaris}}|{{worker.versions.components}}
             
               
               {% if worker.mode == "fullnode" and worker.blockchain == "chia" %}
@@ -163,7 +162,6 @@ 
{{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.
             { 
                 targets: [0], "orderable": false, 
                 "render": function ( data, type, row, meta ) {
-                    console.log(row);
                     arr = data.split('|');
                     hostname = arr[0];
                     blockchain = arr[1];
@@ -174,7 +172,6 @@ 
{{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.
             { 
                 targets: [2], "orderable": true, 
                 "render": function ( data, type, row, meta ) {
-                    console.log(row);
                     var url = "{{ url_for('worker_route') }}";
                     arr = row[0].split('|');
                     hostname = arr[0];
@@ -183,7 +180,16 @@ 
{{_('For more, see the Machinaris %(wiki_link_open)swiki%(wiki_link_close)s.
                     return '' + data +'';
                 }
             },
-            { "orderable": false, targets: [8] },
+            { 
+                targets: [8], "orderable": true, 
+                "render": function ( data, type, row, meta ) {
+                    arr = data.split('|');
+                    machinaris_version = arr[0];
+                    component_versions = arr[1];
+                    return ''+machinaris_version+'';
+                }
+            },
+            { "orderable": false, targets: [9] },
           ],
           {% if lang != 'en' %}
           "language": {

From 18de79b7480ccc5b8fc53e1c684313483a436742 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 3 Oct 2022 16:43:22 -0600
Subject: [PATCH 1015/1625] Forktools git url.

---
 scripts/forktools_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/forktools_setup.sh b/scripts/forktools_setup.sh
index d48f998f..84fd0864 100644
--- a/scripts/forktools_setup.sh
+++ b/scripts/forktools_setup.sh
@@ -8,7 +8,7 @@ FORKTOOLS_BRANCH=testing
 if [[ "${forktools_skip_build}" != 'true' ]]; then
 	if [[ (${mode} == 'fullnode' || ${mode} =~ "harvester") && ${blockchains} != 'mmx' ]]; then
 		cd /
-		git clone --branch ${FORKTOOLS_BRANCH} git@github.com:guydavis/forktools.git
+		git clone --branch ${FORKTOOLS_BRANCH} https://github.com/guydavis/forktools.git
 		cd forktools
 		bash installft.sh
 		git checkout $HASH > /dev/null

From c07b3bee255916bf51bf1abcf602556f772f6622 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 14:31:18 -0600
Subject: [PATCH 1016/1625] MMX updated to testnet7

---
 .github/workflows/develop-apple.yaml           |  1 +
 .github/workflows/develop-bpx.yaml             |  1 +
 .github/workflows/develop-btcgreen.yaml        |  1 +
 .github/workflows/develop-cactus.yaml          |  1 +
 .github/workflows/develop-chia.yaml            |  1 +
 .github/workflows/develop-chinilla.yaml        |  1 +
 .github/workflows/develop-flax.yaml            |  1 +
 .github/workflows/develop-littlelambocoin.yaml |  1 +
 .github/workflows/develop-maize.yaml           |  1 +
 .github/workflows/develop-shibgreen.yaml       |  1 +
 .github/workflows/develop-wheat.yaml           |  1 +
 CHANGELOG.md                                   |  2 +-
 api/gunicorn.conf.py                           |  4 ++--
 common/config/blockchains.json                 |  4 ++--
 docker/dockerfile                              |  2 ++
 docker/entrypoint.sh                           |  2 +-
 scripts/forks/mmx_install.sh                   |  9 +++++----
 scripts/forks/mmx_launch.sh                    | 18 +++++++++---------
 scripts/forktools_setup.sh                     |  2 +-
 19 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/develop-apple.yaml b/.github/workflows/develop-apple.yaml
index 661ea9a0..f5b357a1 100644
--- a/.github/workflows/develop-apple.yaml
+++ b/.github/workflows/develop-apple.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "APPLE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-apple:develop
diff --git a/.github/workflows/develop-bpx.yaml b/.github/workflows/develop-bpx.yaml
index afc1e293..da350549 100644
--- a/.github/workflows/develop-bpx.yaml
+++ b/.github/workflows/develop-bpx.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "BPX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-bpx:develop
diff --git a/.github/workflows/develop-btcgreen.yaml b/.github/workflows/develop-btcgreen.yaml
index f7f39214..8dfb4cdd 100644
--- a/.github/workflows/develop-btcgreen.yaml
+++ b/.github/workflows/develop-btcgreen.yaml
@@ -44,6 +44,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "BTCGREEN_BRANCH=main"     
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-btcgreen:develop
diff --git a/.github/workflows/develop-cactus.yaml b/.github/workflows/develop-cactus.yaml
index dd906b79..1c044bf5 100644
--- a/.github/workflows/develop-cactus.yaml
+++ b/.github/workflows/develop-cactus.yaml
@@ -44,6 +44,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "CACTUS_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-cactus:develop
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index c328fdd9..38aa71cf 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -43,6 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "CHIA_BRANCH=latest"
             "BLADEBIT_BRANCH=2.0.0-beta1"
           tags: |
diff --git a/.github/workflows/develop-chinilla.yaml b/.github/workflows/develop-chinilla.yaml
index 1f1562a6..5741704e 100644
--- a/.github/workflows/develop-chinilla.yaml
+++ b/.github/workflows/develop-chinilla.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "CHINILLA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:develop
diff --git a/.github/workflows/develop-flax.yaml b/.github/workflows/develop-flax.yaml
index 22034ea6..d5ffab4a 100644
--- a/.github/workflows/develop-flax.yaml
+++ b/.github/workflows/develop-flax.yaml
@@ -44,6 +44,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "FLAX_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-flax:develop
diff --git a/.github/workflows/develop-littlelambocoin.yaml b/.github/workflows/develop-littlelambocoin.yaml
index 2bc9e76f..ae766a14 100644
--- a/.github/workflows/develop-littlelambocoin.yaml
+++ b/.github/workflows/develop-littlelambocoin.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "LITTLELAMBOCOIN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-littlelambocoin:develop
diff --git a/.github/workflows/develop-maize.yaml b/.github/workflows/develop-maize.yaml
index b928392b..774d4a7f 100644
--- a/.github/workflows/develop-maize.yaml
+++ b/.github/workflows/develop-maize.yaml
@@ -44,6 +44,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "MAIZE_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-maize:develop
diff --git a/.github/workflows/develop-shibgreen.yaml b/.github/workflows/develop-shibgreen.yaml
index 0931ac11..b6df5bc0 100644
--- a/.github/workflows/develop-shibgreen.yaml
+++ b/.github/workflows/develop-shibgreen.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "SHIBGREEN_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-shibgreen:develop
diff --git a/.github/workflows/develop-wheat.yaml b/.github/workflows/develop-wheat.yaml
index 5860dd1a..7ee87acc 100644
--- a/.github/workflows/develop-wheat.yaml
+++ b/.github/workflows/develop-wheat.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "WHEAT_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-wheat:develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9f2da50..b06d3209 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format
 ## [0.8.5] - 2022-10-?
  - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. Add 'SYS_RAWIO' to your `docker-compose.yml`
  - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
- - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0
+ - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0, [MMX](https://github.com/madMAx43v3r/mmx-node) to `testnet7`.
 
 ## [0.8.4] - 2022-09-21
 - Scaling-Down: Optional mode where wallets are synced daily, not run 24/7.  Saves ~35% memory so smaller farmers can farm more blockchains concurrently on the same machine. See Wallets page, top-right Settings.
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index e4d440fa..13bd4ef2 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -19,7 +19,7 @@ def on_starting(server):
         log_rotate, restart_stuck_farmer, geolocate_peers, \
         stats_effort, status_warnings
     from common.config import globals
-    from common.models import pools
+    from common.models import pools, plottings
 
     from api.commands import websvcs
 
@@ -73,7 +73,7 @@ def on_starting(server):
         scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=restart_stuck_farmer.execute, name="status_blockchain_sync", trigger='interval', minutes=5, jitter=0) 
         scheduler.add_job(func=periodically_sync_wallet.execute, name="status_wallet_sync", trigger='interval', minutes=15, jitter=0) 
-        if globals.enabled_blockchains()[0] in ['chia', 'chives', 'mmx']: # Only get plot listing from these three blockchains
+        if globals.enabled_blockchains()[0] in plottings.PLOTTABLE_BLOCKCHAINS: # Only get plot listing from these three blockchains
             scheduler.add_job(func=status_plots.update, name="status_plots", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         if globals.enabled_blockchains()[0] in pools.POOLABLE_BLOCKCHAINS: # Only get pool submissions from poolable blockchains
             scheduler.add_job(func=status_pools.update, name="status_pools", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index f43cea94..6b7d888a 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -275,8 +275,8 @@
         "name": "MMX",
         "symbol": "MMX" ,
         "binary":  "/mmx-node/build/mmx",
-        "network_path": "/root/.mmx/testnet6",
-        "network_name": "testnet6",
+        "network_path": "/root/.mmx/testnet7",
+        "network_name": "testnet7",
         "network_port": 12334,
         "farmer_port": 11330,
         "worker_port": 8940,
diff --git a/docker/dockerfile b/docker/dockerfile
index c24675b2..89ea4eff 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -6,6 +6,7 @@ FROM ghcr.io/guydavis/machinaris-base-${UBUNTU_VER}:${MACHINARIS_STREAM}
 ARG DEBIAN_FRONTEND=noninteractive
 ARG CHIADOG_BRANCH=main
 ARG FDCLI_BRANCH=master
+ARG FORKTOOLS_BRANCH=testing
 ARG BLADEBIT_BRANCH=master
 
 ARG APPLE_BRANCH
@@ -121,6 +122,7 @@ ENV XDG_CONFIG_HOME=/root/.chia
 ENV AUTO_PLOT=false
 ENV CHIADOG_BRANCH=${CHIADOG_BRANCH}
 ENV FDCLI_BRANCH=${FDCLI_BRANCH}
+ENV FORKTOOLS_BRANCH=${FORKTOOLS_BRANCH}
 ENV BLADEBIT_BRANCH=${BLADEBIT_BRANCH}
 
 VOLUME [ "/id_rsa" ]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 42b8b840..a41f0f4c 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -93,7 +93,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   /usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
 
   # Conditionally install forktools on fullnodes
-  /usr/bin/bash /machinaris/scripts/forktools_setup.sh > /tmp/forktools_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/forktools_setup.sh ${FORKTOOLS_BRANCH} > /tmp/forktools_setup.log 2>&1
 
 fi
 
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 17fb4f25..18dd7bb1 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -4,16 +4,17 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-09-19
-HASH=1d39de976d57aae0b3655d72642bcdf110d4610c
+# On 2022-10-04
+HASH=341442465b1470d8c4b57d1253eaa2e02d4b0b6c
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'
 else
 	rm -rf /root/.cache
 	apt-get update
-	# Install dependencies
-	apt-get install -y git cmake build-essential libsecp256k1-dev librocksdb-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
+	# Install dependencies for MMX and GPU support
+	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
+	apt-get install -y initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
 	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
 	curl -O http://repo.radeon.com/amdgpu-install/21.40/ubuntu/focal/amdgpu-install-21.40.40500-1_all.deb
 	apt install -y ./amdgpu-install-21.40.40500-1_all.deb
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index f9cfa7de..e34dbe9f 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -28,9 +28,9 @@ if [ ! -d /root/.chia/mmx/config ]; then
 EOF
 	# For a fresh install of Machinaris-MMX, disable timelord by default to save CPU usage
 	echo false > /root/.chia/mmx/config/local/timelord
-elif [ ! -d /root/.chia/mmx/config/testnet6 ]; then # Handle an upgrade from older testnet
+elif [ ! -d /root/.chia/mmx/config/testnet7 ]; then # Handle an upgrade from older testnet
 	echo 'Copying over new testnet configs to /root/.chia/mmx/config/'
-	cp -r ./config/testnet6 /root/.chia/mmx/config/
+	cp -r ./config/testnet7 /root/.chia/mmx/config/
 fi
 rm -rf ./config
 ln -s /root/.chia/mmx/config /mmx-node/config
@@ -54,19 +54,19 @@ else
 	echo "No OPENCL_GPU provided.  MMX blockchain will use use CPU instead."
 fi
 
-# Symlink the NETWORK file, use 'testnet6' for now
+# Symlink the NETWORK file, use 'testnet7' for now
 #if [ ! -f /root/.chia/mmx/NETWORK ]; then
-echo 'testnet6' > /root/.chia/mmx/NETWORK
+echo 'testnet7' > /root/.chia/mmx/NETWORK
 #fi
 rm -f ./NETWORK
 ln -s /root/.chia/mmx/NETWORK /mmx-node/NETWORK
 
-# Symlink the testnet6 folder
-if [ ! -d /root/.chia/mmx/testnet6 ]; then
-	mkdir /root/.chia/mmx/testnet6
+# Symlink the testnet7 folder
+if [ ! -d /root/.chia/mmx/testnet7 ]; then
+	mkdir /root/.chia/mmx/testnet7
 fi
-rm -rf ./testnet6
-ln -s /root/.chia/mmx/testnet6 /mmx-node/testnet6
+rm -rf ./testnet7
+ln -s /root/.chia/mmx/testnet7 /mmx-node/testnet7
 
 # Create a key if none found from previous runs
 if [[ ${mode} == 'fullnode' ]]; then
diff --git a/scripts/forktools_setup.sh b/scripts/forktools_setup.sh
index 84fd0864..63c82da3 100644
--- a/scripts/forktools_setup.sh
+++ b/scripts/forktools_setup.sh
@@ -3,7 +3,7 @@
 # Installs forktools - https://github.com/Qwinn1/forktools
 #
 
-FORKTOOLS_BRANCH=testing
+FORKTOOLS_BRANCH=$1
 
 if [[ "${forktools_skip_build}" != 'true' ]]; then
 	if [[ (${mode} == 'fullnode' || ${mode} =~ "harvester") && ${blockchains} != 'mmx' ]]; then

From 21be29ea9fdb4baad17834e45a88559edd694785 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 15:03:01 -0600
Subject: [PATCH 1017/1625] Try with 16 character plot_id.

---
 api/schedules/status_plots.py | 49 +++++++++++++++++------------------
 api/views/plots/resources.py  |  6 ++---
 web/actions/warnings.py       |  2 +-
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index 0b0ebbc8..7b62e1c3 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -31,10 +31,10 @@ def get_plot_attrs(plot_id, filename):
     dir,file = os.path.split(filename)
     match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
-        short_plot_id = match.group(7)[:8]
+        short_plot_id = match.group(7)[:16]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
     else:
-        short_plot_id = plot_id[2:10]
+        short_plot_id = plot_id[2:18]
         created_at = "" 
     return [short_plot_id, dir,file,created_at]
 
@@ -114,7 +114,7 @@ def update_chia_plots(plots_status, since):
         blockchain_rpc = rpc.RPC()
         items = []
         plots_farming = blockchain_rpc.get_all_plots()
-        plots_by_id = {}
+        plots_by_filename = {}
         duplicate_plots = {}
         displaynames = {}
         app.logger.info("PLOT STATUS: Chia farmer RPC reports {0} total plots in this farm.".format(len(plots_farming)))
@@ -130,18 +130,17 @@ def update_chia_plots(plots_status, since):
                     displayname = plot['hostname']
                 displaynames[plot['hostname']] = displayname
             short_plot_id,dir,file,created_at = get_plot_attrs(plot['plot_id'], plot['filename'])
-            #app.logger.info("{0} -> {1}".format(short_plot_id, file))
             duplicated_on_same_host = False
-            if not since and short_plot_id in plots_by_id:  # Only check for duplicates on full load
-                if plot['hostname'] == plots_by_id[short_plot_id]['hostname']:
+            if not since and file in plots_by_filename:  # Only check for duplicates on full load
+                if plot['hostname'] == plots_by_filename[file]['hostname']:
                     app.logger.error("PLOT STATUS: Duplicate Chia plot found on same worker {0} at both {1}/{2} and {3}/{4}".format(
-                        displayname, plots_by_id[short_plot_id]['path'], plots_by_id[short_plot_id]['file'], dir, file))
+                        displayname, plots_by_filename[file]['path'], plots_by_filename[file]['file'], dir, file))
                     duplicated_on_same_host = True
                 else:
                     app.logger.error("PLOT STATUS: Duplicate Chia plot found on different workers at {0}@{1}/{2} and {3}@{4}/{5}".format(
-                        plots_by_id[short_plot_id]['worker'], plots_by_id[short_plot_id]['path'], plots_by_id[short_plot_id]['file'], displayname, dir, file))
-                add_duplicate_plots(duplicate_plots, file, plot['hostname'], dir, plots_by_id[short_plot_id]['hostname'], plots_by_id[short_plot_id]['path'])
-            plots_by_id[short_plot_id] = { 'hostname': plot['hostname'], 'worker': displayname, 'path': dir, 'file': file }
+                        plots_by_filename[file]['worker'], plots_by_filename[file]['path'], plots_by_filename[file]['file'], displayname, dir, file))
+                add_duplicate_plots(duplicate_plots, file, plot['hostname'], dir, plots_by_filename[file]['hostname'], plots_by_filename[file]['path'])
+            plots_by_filename[file] = { 'hostname': plot['hostname'], 'worker': displayname, 'path': dir, 'file': file }
             if not duplicated_on_same_host and (not since or created_at > since):
                 items.append(p.Plot(**{
                     "plot_id": short_plot_id,
@@ -152,8 +151,8 @@ def update_chia_plots(plots_status, since):
                     "file": file,
                     "type": plot['type'],
                     "created_at": created_at,
-                    "plot_analyze": analyze_status(plots_status, short_plot_id),
-                    "plot_check": check_status(plots_status, short_plot_id),
+                    "plot_analyze": analyze_status(plots_status, short_plot_id[:8]),
+                    "plot_check": check_status(plots_status, short_plot_id[:8]),
                     "size": plot['file_size']
                 }))
         if items:
@@ -171,7 +170,7 @@ def update_chia_plots(plots_status, since):
         traceback.print_exc()
     finally:
         del plots_farming
-        del plots_by_id
+        del plots_by_filename
         if items:
             del items
         gc.collect()
@@ -191,19 +190,19 @@ def update_chives_plots(since):
         hostname = utils.get_hostname()
         plots_farming = blockchain_rpc.get_all_plots()
         payload = []
-        plots_by_id = {}
+        plots_by_filename = {}
         for plot in plots_farming:
             short_plot_id,dir,file,created_at = get_plot_attrs(plot['plot_id'], plot['filename'])
             duplicated_on_same_host = False
-            if not since and short_plot_id in plots_by_id:  # Only check for duplicates on full load
-                if plot['hostname'] == plots_by_id[short_plot_id]['hostname']:
+            if not since and file in plots_by_filename:  # Only check for duplicates on full load
+                if plot['hostname'] == plots_by_filename[file]['hostname']:
                     app.logger.error("DUPLICATE CHIVES PLOT FOUND ON SAME WORKER {0} AT BOTH {1}/{2} AND {3}/{4}".format(
-                        plot['hostname'], plots_by_id[short_plot_id]['path'], plots_by_id[short_plot_id]['file'], dir, file))
+                        plot['hostname'], plots_by_filename[file]['path'], plots_by_filename[file]['file'], dir, file))
                     duplicated_on_same_host = True
                 else:
                     app.logger.error("DUPLICATE CHIVES PLOT FOUND ON DIFFERENT WORKERS AT {0}@{1}/{2} AND {3}@{4}/{5}".format(
-                        plots_by_id[short_plot_id]['worker'], plots_by_id[short_plot_id]['path'], plots_by_id[short_plot_id]['file'], plot['hostname'], dir, file))
-            plots_by_id[short_plot_id] = { 'hostname': plot['hostname'], 'worker': plot['hostname'], 'path': dir, 'file': file }
+                        plots_by_filename[file]['worker'], plots_by_filename[file]['path'], plots_by_filename[file]['file'], plot['hostname'], dir, file))
+            plots_by_filename[file] = { 'hostname': plot['hostname'], 'worker': plot['hostname'], 'path': dir, 'file': file }
             if not duplicated_on_same_host and not since or created_at > since:
                 payload.append({
                     "plot_id": short_plot_id,
@@ -232,19 +231,19 @@ def update_mmx_plots(since):
         hostname = utils.get_hostname()
         plots_farming = mmx_cli.list_plots()
         payload = []
-        plots_by_id = {}
+        plots_by_filename = {}
         for plot in plots_farming.rows:
             short_plot_id,dir,file,created_at = get_plot_attrs(plot['plot_id'], plot['filename'])
             duplicated_on_same_host = False
-            if not since and short_plot_id in plots_by_id:  # Only check for duplicates on full load
-                if plot['hostname'] == plots_by_id[short_plot_id]['hostname']:
+            if not since and file in plots_by_filename:  # Only check for duplicates on full load
+                if plot['hostname'] == plots_by_filename[file]['hostname']:
                     app.logger.error("DUPLICATE MMX PLOT FOUND ON SAME WORKER {0} AT BOTH {1}/{2} AND {3}/{4}".format(
-                        plot['hostname'], plots_by_id[short_plot_id]['path'], plots_by_id[short_plot_id]['file'], dir, file))
+                        plot['hostname'], plots_by_filename[file]['path'], plots_by_filename[file]['file'], dir, file))
                     duplicated_on_same_host = True
                 else:
                     app.logger.error("DUPLICATE MMX PLOT FOUND ON DIFFERENT WORKERS AT {0}@{1}/{2} AND {3}@{4}/{5}".format(
-                        plots_by_id[short_plot_id]['worker'], plots_by_id[short_plot_id]['path'], plots_by_id[short_plot_id]['file'], plot['hostname'], dir, file))
-            plots_by_id[short_plot_id] = { 'hostname': plot['hostname'], 'worker': plot['hostname'], 'path': dir, 'file': file }
+                        plots_by_filename[file]['worker'], plots_by_filename[file]['path'], plots_by_filename[file]['file'], plot['hostname'], dir, file))
+            plots_by_filename[file] = { 'hostname': plot['hostname'], 'worker': plot['hostname'], 'path': dir, 'file': file }
             if not duplicated_on_same_host and not since or created_at > since:
                 payload.append({
                     "plot_id": short_plot_id,
diff --git a/api/views/plots/resources.py b/api/views/plots/resources.py
index e0803867..7b4d52fa 100644
--- a/api/views/plots/resources.py
+++ b/api/views/plots/resources.py
@@ -118,10 +118,10 @@ def put(self, new_items, hostname, blockchain):
             # Skip any previously sent by existing plot_id
             if not db.session.query(Plot).filter(Plot.hostname==new_item['hostname'], 
                 Plot.plot_id==new_item['plot_id']).first():
-                short_plot_id = new_item['plot_id'][:8]
+                short_plot_id = new_item['plot_id']
                 item = Plot(**new_item)
-                item.plot_analyze = analyze_status(plots_status, short_plot_id)
-                item.plot_check = check_status(plots_status, short_plot_id)
+                item.plot_analyze = analyze_status(plots_status, short_plot_id[:8])
+                item.plot_check = check_status(plots_status, short_plot_id[:8])
                 items.append(item)
                 db.session.add(item)
         db.session.commit()
diff --git a/web/actions/warnings.py b/web/actions/warnings.py
index 2c07a674..8a03c65c 100644
--- a/web/actions/warnings.py
+++ b/web/actions/warnings.py
@@ -86,7 +86,7 @@ def get_plot_attrs(filename):
     dir,file = os.path.split(filename)
     match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
-        short_plot_id = match.group(7)[:8]
+        short_plot_id = match.group(7)[:16]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
     else:
         raise Exception("Malformed plot path/filename: {0}".format(filename))

From 7ccfd45719ce39b2b39b692467b05ffdc4ee0f3e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 15:09:28 -0600
Subject: [PATCH 1018/1625] Additional plot_id handling for backwards
 compatibility.

---
 api/schedules/plots_check.py | 16 ++++++++--------
 web/routes.py                |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/api/schedules/plots_check.py b/api/schedules/plots_check.py
index 3ffe044e..4c74039b 100644
--- a/api/schedules/plots_check.py
+++ b/api/schedules/plots_check.py
@@ -47,7 +47,7 @@ def write_status_json(status):
 
 def set_analyze_status(workers, status, plot):
     #app.logger.info("Checking for analyze of {0}".format(plot.plot_id))
-    analyze_log = ANALYZE_LOGS + '/' + plot.plot_id + '.log'
+    analyze_log = ANALYZE_LOGS + '/' + plot.plot_id[:8] + '.log'
     analysis_seconds = None
     if not os.path.exists(analyze_log):
         [hostname, displayname, result] = request_analyze(plot.file, workers)
@@ -75,11 +75,11 @@ def set_analyze_status(workers, status, plot):
                 except Exception as ex:
                     app.log.error("Failed to parse plotman analyze line because: {0}".format(str(ex)))
                     app.log.error(line)
-    if plot.plot_id in status:
-        plot_state = status[plot.plot_id]
+    if plot.plot_id[:8] in status:
+        plot_state = status[plot.plot_id[:8]]
     else:
         plot_state = {}
-        status[plot.plot_id] = plot_state
+        status[plot.plot_id[:8]] = plot_state
     if analysis_seconds:
         #app.logger.info("For {0} found {1} seconds.".format(plot.plot_id, analysis_seconds))
         plot_state['analyze'] = { 'host': hostname, 'seconds': analysis_seconds }
@@ -113,7 +113,7 @@ def request_analyze(plot_file, workers):
 
 def set_check_status(workers, status, plot):
     #app.logger.info("Checking for plot check of {0}".format(plot.plot_id))
-    check_log = CHECK_LOGS + '/' + plot.plot_id + '.log'
+    check_log = CHECK_LOGS + '/' + plot.plot_id[:8] + '.log'
     check_status = None
     requested_status = False
     if not os.path.exists(check_log):
@@ -140,11 +140,11 @@ def set_check_status(workers, status, plot):
                     app.log.error(line)
             elif "Found 1 valid plots" in line:
                 check_status = 'GOOD'
-    if plot.plot_id in status:
-        plot_state = status[plot.plot_id]
+    if plot.plot_id[:8] in status:
+        plot_state = status[plot.plot_id[:8]]
     else:
         plot_state = {}
-        status[plot.plot_id] = plot_state
+        status[plot.plot_id[:8]] = plot_state
     if check_status:
         #app.logger.info("For {0} found {1} status.".format(plot.plot_id, check_status))
         plot_state['check'] = { 'host': hostname, 'status': check_status }
diff --git a/web/routes.py b/web/routes.py
index c5cc4dd5..510297e8 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -205,10 +205,10 @@ def plotting_workers():
 def farming_plots():
     if request.args.get('analyze'):  # Xhr with a plot_id
         plot_id = request.args.get('analyze')
-        return plotman.analyze(plot_id)
+        return plotman.analyze(plot_id[:8])
     elif request.args.get('check'):  # Xhr with a plot_id
         plot_id = request.args.get('check')
-        return chia.check(plot_id)
+        return chia.check(plot_id[:8])
     gc = globals.load()
     farmers = chia.load_farmers()
     plots = chia.load_plots_farming()

From 4b722f920a606daaa50e1b4d5962563ff3d00efd Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 15:59:20 -0600
Subject: [PATCH 1019/1625] Latest version of Bootstrap

---
 scripts/pull_3rd_party_libs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index b344c381..dba2ac23 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -4,8 +4,8 @@
 #
 
 # Bootstrap Icons
-BSI_VERSION=1.8.2
-BOOTSTRAP_VERSION=5.2.1
+BSI_VERSION=1.9.1
+BOOTSTRAP_VERSION=5.2.2
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
 # List of other css/js links

From cd65ea7b283d8861da07d40483381e8813335590 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 17:00:33 -0600
Subject: [PATCH 1020/1625] Simplify Forktools install, by fixing in upstream
 repo.

---
 scripts/forktools_setup.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/forktools_setup.sh b/scripts/forktools_setup.sh
index 63c82da3..530ee2a9 100644
--- a/scripts/forktools_setup.sh
+++ b/scripts/forktools_setup.sh
@@ -11,7 +11,6 @@ if [[ "${forktools_skip_build}" != 'true' ]]; then
 		git clone --branch ${FORKTOOLS_BRANCH} https://github.com/guydavis/forktools.git
 		cd forktools
 		bash installft.sh
-		git checkout $HASH > /dev/null
 
 		mkdir -p /root/.chia/forktools/ftconfigs
 		cp -n ftconfigs/* /root/.chia/forktools/ftconfigs > /dev/null
@@ -27,13 +26,6 @@ if [[ "${forktools_skip_build}" != 'true' ]]; then
 
 		# Now multiproc patch fullnodes to limit memory usage, but delay to offset resource crunch on launch
 		if [[ ${mode} == 'fullnode' ]]; then
-			if [ ! -f /root/.chia/forktools/ftconfigs/.configured ]; then
-				sed -i "s/SETMAXLOGROTATION='99'/SETMAXLOGROTATION='7'/g" /root/.chia/forktools/ftconfigs/config.forkfixconfig*
-				sed -i "s/SETPLOTLOADFREQUENCY='18000'/SETPLOTLOADFREQUENCY='1800'/g" /root/.chia/forktools/ftconfigs/config.forkfixconfig*
-				sed -i "s/SETFNTARGETPEERCOUNT='80'/SETFNTARGETPEERCOUNT='20'/g"  /root/.chia/forktools/ftconfigs/config.forkfixconfig*
-				sed -i "s/\"/'/g" /root/.chia/forktools/ftconfigs/config.forkfixconfig
-				touch /root/.chia/forktools/ftconfigs/.configured
-			fi
 			echo 'Y' | ./forkfixconfig all
   			sleep $[ ( $RANDOM % 300 )  + 1 ]s
 			./forkpatch all -multiproc || true

From 4ff6d590603909eb7ce10e0b598bd9cd2aa302b1 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 17:32:20 -0600
Subject: [PATCH 1021/1625] Update changelog for `reserved_cores` setting.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b06d3209..679a3c2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.8.5] - 2022-10-?
  - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. Add 'SYS_RAWIO' to your `docker-compose.yml`
+ - Enhanced Forktools to limit a blockchain's process count, which greatly limits full_node memory usage.
  - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
  - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0, [MMX](https://github.com/madMAx43v3r/mmx-node) to `testnet7`.
 

From b323e163a2e50b220dca0f8f7cf2970999422f7c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 18:53:24 -0600
Subject: [PATCH 1022/1625] Updated changelog entry.

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 679a3c2e..8e0d3a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,8 @@
 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).
 
 ## [0.8.5] - 2022-10-?
- - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. Add 'SYS_RAWIO' to your `docker-compose.yml`
- - Enhanced Forktools to limit a blockchain's process count, which greatly limits full_node memory usage.
+ - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps.
+ - Enhanced Forktools to decrease a blockchain's full_node process count, which greatly limits memory usage.
  - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
  - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0, [MMX](https://github.com/madMAx43v3r/mmx-node) to `testnet7`.
 

From 426fbd03ff1f11642e1a28d2650750d7104fd984 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 20:03:41 -0600
Subject: [PATCH 1023/1625] Tad as well for reserved_cores.

---
 .github/workflows/develop-tad.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/develop-tad.yaml b/.github/workflows/develop-tad.yaml
index a90a6cfe..92ce292a 100644
--- a/.github/workflows/develop-tad.yaml
+++ b/.github/workflows/develop-tad.yaml
@@ -43,6 +43,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
+            "FORKTOOLS_BRANCH=reserved_cores"
             "TAD_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-tad:develop

From 0fcaccb3b5c262e1e454420b29c0d70b92344a65 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 21:41:19 -0600
Subject: [PATCH 1024/1625] Latest LLC.

---
 CHANGELOG.md                             | 2 +-
 scripts/forks/littlelambocoin_install.sh | 4 ++--
 web/templates/blockchains.html           | 2 +-
 web/templates/drives.html                | 4 ++--
 web/templates/summary.html               | 4 ++--
 web/templates/wallet.html                | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e0d3a71..dd53f47e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. The format
  - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps.
  - Enhanced Forktools to decrease a blockchain's full_node process count, which greatly limits memory usage.
  - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
- - Update: [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0, [MMX](https://github.com/madMAx43v3r/mmx-node) to `testnet7`.
+ - Update: [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.0) to v1.6.0, [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0, [MMX](https://github.com/madMAx43v3r/mmx-node) to `testnet7`.
 
 ## [0.8.4] - 2022-09-21
 - Scaling-Down: Optional mode where wallets are synced daily, not run 24/7.  Saves ~35% memory so smaller farmers can farm more blockchains concurrently on the same machine. See Wallets page, top-right Settings.
diff --git a/scripts/forks/littlelambocoin_install.sh b/scripts/forks/littlelambocoin_install.sh
index 0bc683e9..7188d2f3 100644
--- a/scripts/forks/littlelambocoin_install.sh
+++ b/scripts/forks/littlelambocoin_install.sh
@@ -4,8 +4,8 @@
 #
 
 LITTLELAMBOCOIN_BRANCH=$1
-# On 2022-08-20
-HASH=8454a7093626a388364ff7425e1b9400ffbbb15a
+# On 2022-10-04
+HASH=5126d3af5901aa2d59fbe4e6e2716a2b0bfc88fb
 
 if [ -z ${LITTLELAMBOCOIN_BRANCH} ]; then
 	echo 'Skipping LittleLamboCoin install as not requested.'
diff --git a/web/templates/blockchains.html b/web/templates/blockchains.html
index 10c6c067..fcc0f584 100644
--- a/web/templates/blockchains.html
+++ b/web/templates/blockchains.html
@@ -129,7 +129,7 @@ 
                       
                         {{_('Synced')}}
                     {% elif blockchain.status.lower().startswith('not synced') %}
-                      
+                      
                         {{_('Not Synced')}}
                     {% elif blockchain.status.lower().startswith('syncing')  %}
                       
diff --git a/web/templates/drives.html b/web/templates/drives.html
index 736c4403..58f76671 100644
--- a/web/templates/drives.html
+++ b/web/templates/drives.html
@@ -73,11 +73,11 @@ 
Temperatures

           
            < 
            °C
-           
+           
            < 
            °C
            < 
-           
+           
         
       

       

diff --git a/web/templates/summary.html b/web/templates/summary.html
index 482488e2..697db394 100644
--- a/web/templates/summary.html
+++ b/web/templates/summary.html
@@ -104,9 +104,9 @@ 
                     {% elif summary.status.lower().startswith('synced') %}
                          {{_('Synced')}}
                     {% elif summary.status.lower().startswith('syncing') %}
-                         {{_('Syncing')}}
+                         {{_('Syncing')}}
                     {% elif summary.status.lower().startswith('not synced') %}
-                         {{_('Not Synced')}}
+                         {{_('Not Synced')}}
                     {% else %}
                        {{summary.status}}
                     {% endif %}  
diff --git a/web/templates/wallet.html b/web/templates/wallet.html
index 4c4a61c3..7b140fb3 100644
--- a/web/templates/wallet.html
+++ b/web/templates/wallet.html
@@ -172,10 +172,10 @@ 
                         
                       {{_('Synced')}}
                     {% elif wallet.status.lower().startswith('syncing') %}
-                        
+                        
                       {{_('Syncing')}}
                     {% elif wallet.status.lower().startswith('not synced') %}
-                         
+                         
                       {{_('Not Synced')}}
                     {% else %}
                        

From f3d1d718faff205399c1398f76a433c93dcac5ce Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 4 Oct 2022 21:55:45 -0600
Subject: [PATCH 1025/1625] LLC now uses 'peer' CLI too.

---
 api/commands/chia_cli.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 4b6d4eba..390b60f5 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -117,7 +117,7 @@ def load_blockchain_show(blockchain):
 
 def load_connections_show(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
-    if blockchain in ['cactus', 'maize']:  # Cactus & Maize now supports only 'peer' command
+    if blockchain in ['cactus', 'littlelambocoin', 'maize']:  # These now support only the 'peer' command
         proc = Popen("{0} peer -c full_node".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
     else:
         proc = Popen("{0} show --connections".format(chia_binary), stdout=PIPE, stderr=PIPE, shell=True)
@@ -208,7 +208,7 @@ def pause_wallet(blockchain):
 def remove_connection(node_id, ip, blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     try:
-        if blockchain in ['cactus', 'maize']:  # Cactus & Maize now supports only 'peer' command
+        if blockchain in ['cactus', 'littlelambocoin', 'maize']:  # These now support only the 'peer' command
             proc = Popen("{0} peer --remove-connection {1} full_node".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
         else:
             proc = Popen("{0} show --remove-connection {1}".format(chia_binary, node_id), stdout=PIPE, stderr=PIPE, shell=True)
@@ -292,7 +292,7 @@ def add_connections(connections, blockchain):
             elif socket.gethostbyname(hostname) != hostname:
                 app.logger.debug('{} is a valid hostname'.format(hostname))
             app.logger.info("Adding {0} connection to peer: {1}".format(blockchain, connection))
-            if blockchain in ['cactus', 'maize']:  # Cactus & Maize now supports only 'peer' command
+            if blockchain in ['cactus', 'littlelambocoin', 'maize']:  # These now support only the 'peer' command
                 proc = Popen("{0} peer --add-connection {1} full_node".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)
             else:
                 proc = Popen("{0} show --add-connection {1}".format(chia_binary, connection), stdout=PIPE, stderr=PIPE, shell=True)

From 24ea2650ea5240b37fce2eac3ef4cca5e4d110b2 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 6 Oct 2022 22:03:25 -0600
Subject: [PATCH 1026/1625] Show plotman directory config on Settings |
 Plotting page.

---
 .github/workflows/develop-chia.yaml  |  1 +
 CHANGELOG.md                         |  2 +-
 api/commands/plotman_cli.py          | 29 +++++++++++++
 api/views/configs/resources.py       |  6 ++-
 docker/dockerfile                    |  2 +
 docker/entrypoint.sh                 |  2 +-
 scripts/dev/swap-plotman.sh          |  2 +-
 scripts/plotman_setup.sh             |  2 +-
 scripts/start_machinaris.sh          |  2 +-
 web/actions/plotman.py               |  4 ++
 web/routes.py                        |  5 +++
 web/templates/plotting/workers.html  |  2 +-
 web/templates/settings/plotting.html | 61 +++++++++++++++++++++++++---
 13 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 38aa71cf..5798e7d9 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -42,6 +42,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
+            "PLOTMAN_BRANCH=dirs_json"
             "CHIADOG_BRANCH=dev"
             "FORKTOOLS_BRANCH=reserved_cores"
             "CHIA_BRANCH=latest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd53f47e..788ac87e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format
 
 ## [0.8.5] - 2022-10-?
  - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps.
- - Enhanced Forktools to decrease a blockchain's full_node process count, which greatly limits memory usage.
+ - Enhanced Forktools to optionally decrease a blockchain's full_node process count, which greatly limits memory usage.
  - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts.
  - Update: [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.0) to v1.6.0, [Maize](https://github.com/Maize-Network/maize-blockchain/releases/tag/1.6.0) to v1.6.0, [MMX](https://github.com/madMAx43v3r/mmx-node) to `testnet7`.
 
diff --git a/api/commands/plotman_cli.py b/api/commands/plotman_cli.py
index 70108494..8270cdcf 100644
--- a/api/commands/plotman_cli.py
+++ b/api/commands/plotman_cli.py
@@ -4,6 +4,7 @@
 
 import datetime
 import itertools
+import json
 import os
 import pathlib
 import psutil
@@ -284,3 +285,31 @@ def get_prometheus_metrics():
         raise Exception("The timeout expired during plotman call.")
     cli_stdout = outs.decode('utf-8')
     return cli_stdout
+
+def load_dirs(blockchain):
+    if not check_script():
+        raise Exception("No plotman script found yet at {0}. Container probably just launched. Please allow 15 minutes for startup." \
+                .format(PLOTMAN_SCRIPT))
+    check_config()
+    proc = Popen("{0} {1} {2}".format(PLOTMAN_SCRIPT, 'dirs', '--json'), stdout=PIPE, stderr=PIPE, shell=True)
+    try:
+        outs, errs = proc.communicate(timeout=90)
+    except TimeoutExpired:
+        proc.kill()
+        proc.communicate()
+        raise Exception("The timeout expired during plotman dirs.")
+    result = {}
+    try:
+        response = json.loads(outs.decode('utf-8'))
+        if not 'temporary' in response:
+            response['temporary'] = []
+        if not 'destination' in response:
+            response['destination'] = []
+        if not 'archiving' in response:
+            response['archiving'] = []
+    except:
+        response = outs.decode('utf-8')
+    result = {'response': response, }
+    if errs.decode('utf-8'):
+        result['errors'] = errs.decode('utf-8')
+    return json.dumps(result)
\ No newline at end of file
diff --git a/api/views/configs/resources.py b/api/views/configs/resources.py
index c92e73be..53d8ce51 100644
--- a/api/views/configs/resources.py
+++ b/api/views/configs/resources.py
@@ -30,6 +30,7 @@ def get(self):
 class ConfigByType(MethodView):
 
     def get(self, type, blockchain):
+        mimetype = "application/x-yaml"
         if type == "farming":
             if blockchain == 'mmx':
                 config = mmx_cli.load_config(blockchain)
@@ -39,12 +40,15 @@ def get(self, type, blockchain):
             config = chiadog_cli.load_config(blockchain)
         elif type == "plotting":
             config = plotman_cli.load_config(blockchain)
+        elif type == "plotting_dirs":
+            config = plotman_cli.load_dirs(blockchain)
+            mimetype = "application/json"
         elif type == "tools":
             config = forktools_cli.load_config(blockchain)
         else:
             abort(400, "Unknown config type provided: {0}".format(type))
         response = make_response(config, 200)
-        response.mimetype = "application/x-yaml"
+        response.mimetype = mimetype
         return response
 
     def clean_config(self, req_data):
diff --git a/docker/dockerfile b/docker/dockerfile
index 89ea4eff..f981b8f8 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -4,6 +4,7 @@ ARG MACHINARIS_STREAM=main
 FROM ghcr.io/guydavis/machinaris-base-${UBUNTU_VER}:${MACHINARIS_STREAM}
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG PLOTMAN_BRANCH=development
 ARG CHIADOG_BRANCH=main
 ARG FDCLI_BRANCH=master
 ARG FORKTOOLS_BRANCH=testing
@@ -120,6 +121,7 @@ ENV LANGUAGE en_US.UTF-8
 ENV FLASK_ENV=production
 ENV XDG_CONFIG_HOME=/root/.chia
 ENV AUTO_PLOT=false
+ENV PLOTMAN_BRANCH=${PLOTMAN_BRANCH}
 ENV CHIADOG_BRANCH=${CHIADOG_BRANCH}
 ENV FDCLI_BRANCH=${FDCLI_BRANCH}
 ENV FORKTOOLS_BRANCH=${FORKTOOLS_BRANCH}
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index a41f0f4c..55cdf66e 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -69,7 +69,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   trap "chia stop all -d; exit 0" SIGINT SIGTERM
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
-  /usr/bin/bash /machinaris/scripts/plotman_setup.sh > /tmp/plotman_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/plotman_setup.sh ${PLOTMAN_BRANCH} > /tmp/plotman_setup.log 2>&1
 
   # Conditionally install chiadog on harvesters and fullnodes
   /usr/bin/bash /machinaris/scripts/chiadog_setup.sh ${CHIADOG_BRANCH} > /tmp/chiadog_setup.log 2>&1
diff --git a/scripts/dev/swap-plotman.sh b/scripts/dev/swap-plotman.sh
index 05d17c25..52255a0b 100644
--- a/scripts/dev/swap-plotman.sh
+++ b/scripts/dev/swap-plotman.sh
@@ -7,5 +7,5 @@ echo 'Swapping to development Plotman...'
 cd /chia-blockchain/venv/lib/python3.10/site-packages
 if [ -d ./plotman ]; then
     mv ./plotman ./plotman.orig
-    ln -s /code/plotman/src/plotman
 fi
+ln -s /code/plotman/src/plotman
diff --git a/scripts/plotman_setup.sh b/scripts/plotman_setup.sh
index 83b6219f..c1cc568e 100644
--- a/scripts/plotman_setup.sh
+++ b/scripts/plotman_setup.sh
@@ -3,7 +3,7 @@
 # Installs Plotman for plotting management; customized for non-interactive use by Machinaris
 #
 
-PLOTMAN_BRANCH=development
+PLOTMAN_BRANCH=$1
 
 if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx') ]]; then
     if [[ ! -f /chia-blockchain/venv/bin/plotman ]]; then
diff --git a/scripts/start_machinaris.sh b/scripts/start_machinaris.sh
index 05e56547..068c4c4b 100644
--- a/scripts/start_machinaris.sh
+++ b/scripts/start_machinaris.sh
@@ -26,7 +26,7 @@ else # If Chia
 fi
 # Import ssh key if exists
 if [ -f "/id_rsa" ]; then
-    echo "/id_rsa exists, trying to import private ssh key"
+    echo "Importing SSH key at /id_rsa volume mount."
     mkdir -p ~/.ssh/
     cp -f /id_rsa ~/.ssh/id_rsa
     cat > ~/.ssh/config <<'_EOF'
diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index ba62be58..7094ee8f 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -209,6 +209,10 @@ def load_config(plotter, blockchain):
         #app.logger.info("Return false for replaced.")
         return [ False, '\n'.join(lines) ]
 
+def load_dirs(plotter, blockchain):
+    result = utils.send_get(plotter, "/configs/plotting_dirs/" + blockchain, debug=False).content.decode('utf-8')
+    return result
+
 def inspect_config(hostname, config):
     if 'plotting' in config:
         if 'pool_contract_address' in config['plotting']:
diff --git a/web/routes.py b/web/routes.py
index 510297e8..543e7c32 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -516,6 +516,11 @@ def views_settings_config(path):
             response.headers.set('ConfigReplacementsOccurred', replaced)
         except requests.exceptions.ConnectionError as ex:
             response = make_response(_("For Plotting config, found no responding fullnode found for %(blockchain)s. Please check your workers.", blockchain=escape(request.args.get('blockchain'))))
+    elif config_type == "plotting_dirs":
+        try:
+            response = make_response(plotman.load_dirs(w, request.args.get('blockchain')), 200)
+        except requests.exceptions.ConnectionError as ex:
+            response = make_response(_("No responding fullnode found for %(blockchain)s. Please check your workers.", blockchain=escape(request.args.get('blockchain'))))
     elif config_type == "tools":
         try:
             response = make_response(forktools.load_config(w, request.args.get('blockchain')), 200)
diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html
index 88eb2f12..594bb4f6 100644
--- a/web/templates/plotting/workers.html
+++ b/web/templates/plotting/workers.html
@@ -352,7 +352,7 @@ 
{{ plotter.displayname }}

                         beginAtZero: true,
                         title: {
                             display: true,
-                            text: "{{_('Container Disk Usage (GiB)')}}",
+                            text: "{{_('Container Memory Usage (GiB)')}}",
                             color: "#c7c7c7",  
                             font: {
                                 size: 18 
diff --git a/web/templates/settings/plotting.html b/web/templates/settings/plotting.html
index df30617d..ffc77f47 100644
--- a/web/templates/settings/plotting.html
+++ b/web/templates/settings/plotting.html
@@ -30,7 +30,8 @@
         {% endwith %}
     

 
-    
+    
+    
     

         

             

@@ -49,6 +50,13 @@
                     
                 

             

+            
             

                 
@@ -65,7 +73,7 @@
     {% block scripts %}
     
+    {% endblock %}
\ No newline at end of file
diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html
index 0c88fa40..2c54eeca 100644
--- a/web/templates/plotting/workers.html
+++ b/web/templates/plotting/workers.html
@@ -94,62 +94,13 @@ 
             
  • 
                 {{_('Jobs')}}
             
    • 
+            
  • 
+                {{_('Transfers')}}
+            
    • 
             
  • 
                 {{_('Workers')}}
             
    • 
         
-        
-            
-            
-            
    
-                {{_('Archiving')}}: 
-                {% for plotter in plotters %}
-                
    
-                    
-                    
-                
    
-                {% endfor %}
-            
    
-        
     
    
 
 
@@ -169,38 +120,6 @@ 
         {% endwith %}
     
    
 
-    
    
-        
    
-            
    
-                
-                    
-                        
-                            {% for column in transfers.columns %}
-                            
-                            {% endfor %}
-                            
-                        
-                    
-                    
-                        {% for row in transfers.rows %}
-                        
-                            {% for column in transfers.columns %}
-                                
-                            {% endfor %}
-                            
-                        
-                        {% endfor %}
-                    
-                
    {{ column }}
    {{ row[column] }}
-                                
-                                
-                                    
-                                
-                            
    
-            
    
-        
    
-    
    
-
     
    
         {% for plotter in plotters %}
         
    

From 25f0e4732afef1e2a91e86efeff0d8261ed7f12c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 20:22:24 -0700
Subject: [PATCH 1093/1625] Fix for 'Import Mnemonic' due to Chia 1.6.1
 breaking their CLI again.

---
 web/actions/chia.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/actions/chia.py b/web/actions/chia.py
index 46f81dad..99a8adc3 100644
--- a/web/actions/chia.py
+++ b/web/actions/chia.py
@@ -260,7 +260,7 @@ def import_key(key_path, mnemonic, blockchain):
     with open(key_path, 'w') as keyfile:
         keyfile.write('{0}\n'.format(mnemonic))
     time.sleep(3)
-    proc = Popen("{0} keys add -f {1}".format(chia_binary, key_path), stdout=PIPE, stderr=PIPE, shell=True)
+    proc = Popen("{0} keys add --label key_0 -f {1}".format(chia_binary, key_path), stdout=PIPE, stderr=PIPE, shell=True)
     try:
         outs, errs = proc.communicate(timeout=90)
         if errs:

From 432256784bf68084d7d3753deaed42f39f317558 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 20:48:54 -0700
Subject: [PATCH 1094/1625] Fix for Settings | Farming config load on fresh
 install.

---
 scripts/forks/flax_launch.sh        | 6 ++++--
 web/templates/settings/farming.html | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/forks/flax_launch.sh b/scripts/forks/flax_launch.sh
index 2c56117d..ac0186a2 100644
--- a/scripts/forks/flax_launch.sh
+++ b/scripts/forks/flax_launch.sh
@@ -34,12 +34,14 @@ if [ -f /root/.flax/mainnet/config/config.yaml ]; then
 fi
 
 # Loop over provided list of key paths
+label_num=0
 for k in ${keys//:/ }; do
   if [[ "${k}" == "persistent" ]]; then
     echo "Not touching key directories."
   elif [ -s ${k} ]; then
-    echo "Adding key at path: ${k}"
-    flax keys add -f ${k} > /dev/null
+    echo "Adding key #${label_num} at path: ${k}"
+    flax keys add -l "key_${label_num}" -f ${k} > /dev/null
+    ((label_num=label_num+1))
   fi
 done
 
diff --git a/web/templates/settings/farming.html b/web/templates/settings/farming.html
index ca648989..effa2f76 100644
--- a/web/templates/settings/farming.html
+++ b/web/templates/settings/farming.html
@@ -108,10 +108,10 @@
         endfor %}
             var unknown_target_addresses = [];
             for (target_address of target_addresses) {
-                if (hot_addresses.get(blockchain).includes(target_address)) {
+                if (hot_addresses.has(blockchain) && hot_addresses.get(blockchain).includes(target_address)) {
                     continue;
                 }
-                if (cold_addresses.get(blockchain).includes(target_address)) {
+                if (cold_addresses.has(blockchain) && cold_addresses.get(blockchain).includes(target_address)) {
                     continue;
                 }
                 unknown_target_addresses.push(target_address);

From af714d8b7c4b55eb0c3404a0861732a0fd8478dd Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 21:17:04 -0700
Subject: [PATCH 1095/1625] Fix for Settings | Farming page.

---
 CHANGELOG.md                        | 4 ++--
 web/templates/settings/farming.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a439d2fd..a7fe6a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,14 @@ All notable changes to this project will be documented in this file. The format
  - List recent plot archiving (local and remote) on Plotting | Workers page.
  - [Moon](https://github.com/MOONCOINTEAM/moon-blockchain) at 1.6.0
 ### Changed
- - Fixed broken 'Generate Key' action for Chia 1.6.1 on Setup page. Thanks @SilverFolfy
+ - Fixed broken 'Generate/Import Key' actions for Chia 1.6.1 on Setup page. Thanks @SilverFolfy
 ### Updated
  - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v2.0.1) to v2.0.1
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.1) to v1.6.1
  - [Chiadog](https://github.com/guydavis/chiadog/releases/tag/v0.7.5) to v0.7.5
  - [Flax](https://github.com/Flax-Network/flax-blockchain/releases/tag/0.1.11) to v0.1.11
 ### Known Issues
- - 
+ - Incorrect reward recovery calculations for some blockchains.  Please use AllTheBlocks site if this affects you.
 
 ## [0.8.5] - 2022-11-03
 ### Added
diff --git a/web/templates/settings/farming.html b/web/templates/settings/farming.html
index effa2f76..a8c73985 100644
--- a/web/templates/settings/farming.html
+++ b/web/templates/settings/farming.html
@@ -108,10 +108,10 @@
         endfor %}
             var unknown_target_addresses = [];
             for (target_address of target_addresses) {
-                if (hot_addresses.has(blockchain) && hot_addresses.get(blockchain).includes(target_address)) {
+                if (!hot_addresses.has(blockchain) || hot_addresses.get(blockchain).includes(target_address)) {
                     continue;
                 }
-                if (cold_addresses.has(blockchain) && cold_addresses.get(blockchain).includes(target_address)) {
+                if (!cold_addresses.has(blockchain) || cold_addresses.get(blockchain).includes(target_address)) {
                     continue;
                 }
                 unknown_target_addresses.push(target_address);

From ab78cfcd246f0da20e05a32a36dc65afa19dc70e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 21:19:56 -0700
Subject: [PATCH 1096/1625] Fix for transfers redirect on start.

---
 web/routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/routes.py b/web/routes.py
index cffb65fc..0ef2243a 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -195,7 +195,7 @@ def plotting_transfers():
             plotter = worker.get_worker(hostname, blockchain)
             if request.form.get('service') == 'archiving':
                 plotman.stop_archiving(plotter)
-        return redirect(url_for('plotting_workers')) # Force a redirect to allow time to update status
+        return redirect(url_for('plotting_transfers')) # Force a redirect to allow time to update status
     plotters = plotman.load_plotters()
     transfers = plotman.load_archiving_summary()
     disk_usage = stats.load_current_disk_usage('plots')

From c8280afbaea92e143b042495207442908b8dc659 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 21:24:27 -0700
Subject: [PATCH 1097/1625] Update archiving status after a start/stop.

---
 api/views/actions/resources.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/views/actions/resources.py b/api/views/actions/resources.py
index 0bc15b8a..4e4d2c48 100644
--- a/api/views/actions/resources.py
+++ b/api/views/actions/resources.py
@@ -11,7 +11,7 @@
 
 from api.commands import chiadog_cli, chia_cli, plotman_cli, pools_cli
 from api.schedules import status_worker, status_plotting, status_farm, \
-    status_alerts, status_connections, status_pools, status_plotnfts
+    status_alerts, status_connections, status_pools, status_plotnfts, status_archiving
 
 blp = Blueprint(
     'Action',
@@ -47,8 +47,10 @@ def post(self):
             # Now trigger updates after a delay
             time.sleep(17)
             status_worker.update()
-            if service in ["plotting", "archiving"]:
+            if service == "plotting":
                 status_plotting.update()
+            elif service == "archiving":
+                status_archiving.update()
             elif service == "farming":
                 status_farm.update()
             elif service == "networking":

From 356fe5e180720bc39d99dcca9b9e081d21beaf17 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 21:25:52 -0700
Subject: [PATCH 1098/1625] Reload archiving jobs every 2 minutes.

---
 web/routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/routes.py b/web/routes.py
index 0ef2243a..00d76542 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -202,7 +202,7 @@ def plotting_transfers():
     farmers = chia.load_farmers()
     stats.set_disk_usage_per_farmer(farmers, disk_usage)
     return render_template('plotting/transfers.html', plotters=plotters, farmers=farmers, transfers=transfers, 
-        disk_usage=disk_usage, global_config=gc, lang=get_lang(request))
+        disk_usage=disk_usage, global_config=gc, lang=get_lang(request), reload_seconds=120)
 
 @app.route('/plotting/workers')
 def plotting_workers():

From 0beeaa076afd57df920990a2d63cd7983c37d8c4 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 13 Nov 2022 21:30:45 -0700
Subject: [PATCH 1099/1625] More cleanups to split Transfers and Workers pages.

---
 web/templates/plotting/workers.html | 117 ----------------------------
 1 file changed, 117 deletions(-)

diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html
index 2c54eeca..59df70ca 100644
--- a/web/templates/plotting/workers.html
+++ b/web/templates/plotting/workers.html
@@ -2,79 +2,6 @@
 
 {% block content %}
 
-
-
-
-
-
-
-
-
 
    
     
    
       
@@ -350,50 +277,6 @@ 
    {{ plotter.displayname }}
    
                 },
                 {% endif %}
             });
-            $("#btnConfirmStart").click(function () {
-                $("#btnCancelStart").prop("disabled", true);
-                $(this).prop("disabled", true);
-                $(this).html(
-                    ` Starting...`
-                );
-                $('#plotman-form').append('');
-                $('#plotman-form').append('');
-                $("#plotman-form").submit();
-            });
-            $("#btnConfirmStop").click(function () {
-                $("#btnCancelStop").prop("disabled", true);
-                $(this).prop("disabled", true);
-                $(this).html(
-                    ` Stopping...`
-                );
-                $('#plotman-form').append('');
-                $('#plotman-form').append('');
-                $("#plotman-form").submit();
-            });
-            var startModal = document.getElementById('startModal')
-            startModal.addEventListener('show.bs.modal', function (event) {
-                var button = event.relatedTarget
-                var hostname = button.getAttribute('data-bs-hostname')
-                var blockchain = button.getAttribute('data-bs-blockchain')
-                document.getElementById('hostname').value = hostname
-                document.getElementById('blockchain').value = blockchain
-            });
-            var stopModal = document.getElementById('stopModal')
-            stopModal.addEventListener('show.bs.modal', function (event) {
-                var button = event.relatedTarget
-                var hostname = button.getAttribute('data-bs-hostname')
-                var blockchain = button.getAttribute('data-bs-blockchain')
-                document.getElementById('hostname').value = hostname
-                document.getElementById('blockchain').value = blockchain
-            });
-            var disabledModal = document.getElementById('disabledModal')
-            disabledModal.addEventListener('show.bs.modal', function (event) {
-                var button = event.relatedTarget
-                var hostname = button.getAttribute('data-bs-hostname')
-                var blockchain = button.getAttribute('data-bs-blockchain')
-                document.getElementById('hostname').value = hostname
-                document.getElementById('blockchain').value = blockchain
-            });
         });
     
     {% endblock %}
\ No newline at end of file

From 8e2a97b447f6182ea65225b4dc6c3b80fed3caca Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 14 Nov 2022 10:11:32 -0700
Subject: [PATCH 1100/1625] Merged Plotman improvements.

---
 .github/workflows/develop-chia.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 3840c9f2..3b0fa156 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -45,7 +45,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.6.1"
             "BLADEBIT_BRANCH=master"
-            "PLOTMAN_BRANCH=diskplot"
+            "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

From 6974f2905d32f7da831d7417944ba2d8a17055fa Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 14 Nov 2022 15:04:59 -0700
Subject: [PATCH 1101/1625] Guard against malformed status.json content.

---
 README.md                     | 12 +++++++++---
 api/schedules/plots_check.py  |  9 ++++++---
 api/schedules/status_plots.py |  9 ++++++---
 api/views/plots/resources.py  |  9 ++++++---
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 8cfc0d83..aeb7bf53 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ For details, see your particular platform: [Windows](https://github.com/guydavis
 
 ## Plotting View
 
-Plotting with the [MadMax](https://github.com/madMAx43v3r/chia-plotter), [Bladebit](https://github.com/harold-b/bladebit), and [Chia™](https://github.com/Chia-Network/chia-blockchain) plotters is managed by [Plotman](https://github.com/ericaltendorf/plotman) through the Machinaris WebUI.
+Plotting with the [MadMax](https://github.com/madMAx43v3r/chia-plotter), [Bladebit](https://github.com/harold-b/bladebit), and [Chia™](https://github.com/Chia-Network/chia-blockchain) plotters is managed by [Plotman](https://github.com/ericaltendorf/plotman) through the Machinaris WebUI across many machines:
 
 ![Plotting](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/machinaris_plotting.png)
 
@@ -16,6 +16,10 @@ Track your plotter machines performance as you fine-tune your plotting, graphed
 
 ![Speed](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/plotting_speed_chart.png)
 
+Archive your new plots to their final destination on local drives or on remote harvesters (via rsync):
+
+![Transfers](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/archiving_transfers.png)
+
 ## Farming View
 
 Machinaris bundles the [latest Chia™ version](https://github.com/Chia-Network/chia-blockchain/wiki/INSTALL#ubuntudebian) inside the Docker image.
@@ -26,11 +30,13 @@ Machinaris also optionally farms your plots to other blockchains including [BPX]
 
 ## Alerts
 
-[Chiadog](https://github.com/martomi/chiadog) provides monitoring of the log files, ensuring you get notified when important events occur across your farm:
+[Chiadog](https://github.com/guydavis/machinaris/wiki/ChiaDog) provides monitoring of the log files, ensuring you get notified when important events occur across your farm:
 
 ![Alerts](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/ChiaDog-1-Example.png)
 
-Notifications can be sent to e-mail, telegram, discord, slack, etc.
+[Drive health](https://github.com/guydavis/machinaris/wiki/Drives) is monitored as with `smartctl` on Linux. Notifications can be sent to e-mail, telegram, discord, slack, etc.
+
+![Drives](https://raw.githubusercontent.com/guydavis/machinaris-unraid/master/docs/img/drives_grid.png)
 
 ## Setup
 
diff --git a/api/schedules/plots_check.py b/api/schedules/plots_check.py
index baaee11e..e5f015db 100644
--- a/api/schedules/plots_check.py
+++ b/api/schedules/plots_check.py
@@ -36,9 +36,12 @@ def have_recent_plot_check_log(plot_check_log):
 
 def open_status_json():
     status = {}
-    if os.path.exists(STATUS_FILE): 
-        with open(STATUS_FILE, 'r+') as fp:
-            status = json.load(fp)
+    try:
+        if os.path.exists(STATUS_FILE): 
+            with open(STATUS_FILE, 'r') as fp:
+                status = json.load(fp)
+    except Exception as ex:
+        app.logger.error("Failed to read JSON from {0} because {1}".format(STATUS_FILE, str(ex)))
     return status
 
 def write_status_json(status):
diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index c25930f7..f7370d51 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -40,9 +40,12 @@ def get_plot_attrs(plot_id, filename):
 
 def open_status_json():
     status = {}
-    if os.path.exists(STATUS_FILE): 
-        with open(STATUS_FILE, 'r+') as fp:
-            status = json.load(fp)
+    try:
+        if os.path.exists(STATUS_FILE): 
+            with open(STATUS_FILE, 'r') as fp:
+                status = json.load(fp)
+    except Exception as ex:
+        app.logger.error("Failed to read JSON from {0} because {1}".format(STATUS_FILE, str(ex)))
     return status
 
 def update():
diff --git a/api/views/plots/resources.py b/api/views/plots/resources.py
index b5f6e82a..e7c7252a 100644
--- a/api/views/plots/resources.py
+++ b/api/views/plots/resources.py
@@ -26,9 +26,12 @@
 
 def open_status_json():
     status = {}
-    if os.path.exists(STATUS_FILE): 
-        with open(STATUS_FILE, 'r+') as fp:
-            status = json.load(fp)
+    try:
+        if os.path.exists(STATUS_FILE): 
+            with open(STATUS_FILE, 'r') as fp:
+                status = json.load(fp)
+    except Exception as ex:
+        app.logger.error("Failed to read JSON from {0} because {1}".format(STATUS_FILE, str(ex)))
     return status
 
 def analyze_status(plots_status, short_plot_id):

From 4362ce8de946c400e78b2862ff9f9a71d45951bd Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 14 Nov 2022 21:39:36 -0700
Subject: [PATCH 1102/1625] Send Test Alert for Alerts page.

---
 CHANGELOG.md                       |  2 ++
 api/commands/chiadog_cli.py        | 28 +++++++++++++++++
 web/actions/chiadog.py             |  9 ++++++
 web/routes.py                      |  6 +++-
 web/templates/settings/alerts.html | 49 ++++++++++++++++++++++++++++++
 5 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7fe6a71..89e58132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,11 @@ All notable changes to this project will be documented in this file. The format
 ## [Unreleased]
 ### Added
  - List recent plot archiving (local and remote) on Plotting | Workers page.
+ - Settings | Alerts page: new 'Send Test Alert' button to validate Chiadog configs.
  - [Moon](https://github.com/MOONCOINTEAM/moon-blockchain) at 1.6.0
 ### Changed
  - Fixed broken 'Generate/Import Key' actions for Chia 1.6.1 on Setup page. Thanks @SilverFolfy
+ - Missing plots on Farming page when a status.json file was corrupted. Thanks @Yurly
 ### Updated
  - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v2.0.1) to v2.0.1
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.1) to v1.6.1
diff --git a/api/commands/chiadog_cli.py b/api/commands/chiadog_cli.py
index 52ca14f2..2128aaf8 100644
--- a/api/commands/chiadog_cli.py
+++ b/api/commands/chiadog_cli.py
@@ -3,8 +3,11 @@
 #
 
 import datetime
+import http
+import json
 import os
 import psutil
+import requests
 import signal
 import shutil
 import sqlite3
@@ -58,6 +61,8 @@ def dispatch_action(job):
         stop_chiadog()
         time.sleep(5)
         start_chiadog()
+    elif action == "test":
+        test_chiadog()
     else:
         raise Exception("Unsupported action {0} for monitoring.".format(action))
 
@@ -90,3 +95,26 @@ def stop_chiadog():
         except:
             app.logger.info('Failed to stop monitoring!')
             app.logger.info(traceback.format_exc())
+
+# If enhanced Chiadog is running within container, then its listening on http://localhost:8925
+# Example: curl -X POST http://localhost:8925 -H 'Content-Type: application/json' -d '{"type":"user", "service":"farmer", "priority":"high", "message":"Hello World"}'
+def test_chiadog(debug=False):
+    try:
+        headers = {'Content-type': 'application/json', 'Accept': 'application/json'}
+        if debug:
+            http.client.HTTPConnection.debuglevel = 1
+        mode = 'full_node'
+        if 'mode' in os.environ and 'harvester' in os.environ['mode']:
+            mode = 'harvester'
+        response = requests.post("http://localhost:8925", headers = headers, data = json.dumps(
+            {
+                "type": "user", 
+                "service": mode, 
+                "priority": "high", 
+                "message": "Test alert from Machinaris!"
+            }
+        ))
+    except Exception as ex:
+        app.logger.info("Failed to notify Chiadog with test alert.")
+    finally:
+        http.client.HTTPConnection.debuglevel = 0
\ No newline at end of file
diff --git a/web/actions/chiadog.py b/web/actions/chiadog.py
index 357455f2..4b538f69 100644
--- a/web/actions/chiadog.py
+++ b/web/actions/chiadog.py
@@ -76,3 +76,12 @@ def stop_chiadog(farmer):
         flash(_('Failed to stop Chiadog monitoring! Please see log files.'), 'danger')
     else:
         flash(_('Chiadog monitoring stopped successfully.  No notifications will be sent!'), 'success')
+
+def send_test_alert(farmer):
+    try:
+        utils.send_post(farmer, "/actions/", payload={"service": "monitoring","action": "test"}, debug=False)
+    except Exception as ex:
+        flash(_('Failed to contact farmer to send test alert.  Please ensure the worker is running and check it\'s logs.'), 'danger')
+        flash(str(ex), 'warning')
+    else:
+        flash(_("Test alert has been sent.  Please check notification target(s) for test success."), 'success')
\ No newline at end of file
diff --git a/web/routes.py b/web/routes.py
index 00d76542..228a19a6 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -459,7 +459,11 @@ def settings_alerts():
     if request.method == 'POST':
         selected_worker_hostname = request.form.get('worker')
         selected_blockchain = request.form.get('blockchain')
-        chiadog.save_config(worker.get_worker(selected_worker_hostname, selected_blockchain), selected_blockchain, request.form.get("config"))
+        selected_worker = worker.get_worker(selected_worker_hostname, selected_blockchain)
+        if request.form.get('action') == 'test':
+            chiadog.send_test_alert(selected_worker)
+        else: # Save config
+            chiadog.save_config(selected_worker, selected_blockchain, request.form.get("config"))
     farmers = chiadog.load_farmers()
     selected_worker = find_selected_worker(farmers, selected_worker_hostname, selected_blockchain)
     if not selected_blockchain:
diff --git a/web/templates/settings/alerts.html b/web/templates/settings/alerts.html
index bdafe990..ad63c324 100644
--- a/web/templates/settings/alerts.html
+++ b/web/templates/settings/alerts.html
@@ -2,6 +2,34 @@
 
 {% block content %}
 
+    
+
 
    
     
    
         
@@ -11,6 +39,8 @@
 
    
 
 
    
+    
     {{_('Alerts')}} - config.yaml 
 
    
 
@@ -86,6 +116,17 @@
             });
             //Call the function when the page loads
             load_config("{{selected_worker}}", "{{selected_blockchain}}");
+
+            var testModal = document.getElementById('testModal')
+            testModal.addEventListener('show.bs.modal', function (event) {
+                var button = event.relatedTarget
+                var blockchainField = document.getElementById('blockchain_field')
+                blockchainField.value = $("#blockchain").val()
+                $('#blockchain_label').text($("#blockchain option:selected").text())
+                var workerField = document.getElementById('hostname_field')
+                workerField.value = $("#worker").val()
+                $('#hostname_label').text($("#worker option:selected").text())
+            })
         });
 
         function update_blockchain_options(hostname) {
@@ -120,5 +161,13 @@
             blockchain = $("#blockchain").val()
             window.location.href = '/settings/config/' + worker + '_' + blockchain + 'dog_config.yaml?type=alerts&worker=' + worker + "&blockchain=" + blockchain
         });
+        $("#btnConfirmTest").click(function () {
+            $("#btnCancelTest").prop("disabled", true);
+            $(this).prop("disabled", true);
+            $(this).html(
+                ` Sending...`
+            );
+            $("#test-form").submit();
+        });
     
     {% endblock %}
\ No newline at end of file

From a261e3f76d1a8ca49110cb941c9699bec8664cc8 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 15 Nov 2022 08:56:48 -0700
Subject: [PATCH 1103/1625] Redirect after test to Alerts listing page.

---
 web/actions/chiadog.py | 2 +-
 web/routes.py          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/actions/chiadog.py b/web/actions/chiadog.py
index 4b538f69..c0f70e4b 100644
--- a/web/actions/chiadog.py
+++ b/web/actions/chiadog.py
@@ -84,4 +84,4 @@ def send_test_alert(farmer):
         flash(_('Failed to contact farmer to send test alert.  Please ensure the worker is running and check it\'s logs.'), 'danger')
         flash(str(ex), 'warning')
     else:
-        flash(_("Test alert has been sent.  Please check notification target(s) for test success."), 'success')
\ No newline at end of file
+        flash(_("Test alert has been sent. Please check your configured notification target(s) for receipt of the test alert."), 'success')
\ No newline at end of file
diff --git a/web/routes.py b/web/routes.py
index 228a19a6..dd68253c 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -462,6 +462,7 @@ def settings_alerts():
         selected_worker = worker.get_worker(selected_worker_hostname, selected_blockchain)
         if request.form.get('action') == 'test':
             chiadog.send_test_alert(selected_worker)
+            return redirect(url_for('alerts')) # Redirct to page showing the test alert
         else: # Save config
             chiadog.save_config(selected_worker, selected_blockchain, request.form.get("config"))
     farmers = chiadog.load_farmers()

From 3a4ab6a9bcb67ff19965a218570c00522c5e7b53 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 17 Nov 2022 21:42:11 -0700
Subject: [PATCH 1104/1625] Start on a settings UI for replotting.

---
 api/schedules/plots_check.py          |   2 +-
 web/actions/plotman.py                |  10 ++
 web/routes.py                         |   6 +-
 web/templates/farming/plots.html      | 153 +++++++++++++++++++++++++-
 web/templates/plotting/jobs.html      |   2 +-
 web/templates/plotting/transfers.html |   2 +-
 web/templates/wallet.html             |   2 +-
 7 files changed, 169 insertions(+), 8 deletions(-)

diff --git a/api/schedules/plots_check.py b/api/schedules/plots_check.py
index e5f015db..7c0d074d 100644
--- a/api/schedules/plots_check.py
+++ b/api/schedules/plots_check.py
@@ -185,7 +185,7 @@ def request_check(plot, workers):
     return [None, None, None]
 
 def execute():
-    if 'plots_check_analyze_skip' in os.environ:
+    if 'plots_check_analyze_skip' in os.environ and os.environ['plots_check_analyze_skip'].lower() == 'true':
         app.logger.info("Skipping plots check and analyze as environment variable 'plots_check_analyze_skip' is present.")
         return
     with app.app_context():
diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index a867f1e1..1d0486ca 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -272,3 +272,13 @@ def load_plotting_keys(blockchain):
     if not pool_contract_address:
         pool_contract_address = None if os.environ['pool_contract_address'] == 'null' else os.environ['pool_contract_address']
     return [farmer_pk, pool_pk, pool_contract_address]
+
+def load_replotting_settings():
+    # TODO Load from file with real settings, here are some test defaults
+    settings = {}
+    for blockchain in PLOTTABLE_BLOCKCHAINS:
+        if blockchain == 'chia':
+            settings[blockchain] = { "enabled": True, "delete_solo": True, "delete_before": "2021-07-01", "delete_ksizes": [ 29, 30], "free_ksize": 32 }
+        else:
+            settings[blockchain] = { "enabled": False, "delete_solo": False, }
+    return settings
\ No newline at end of file
diff --git a/web/routes.py b/web/routes.py
index dd68253c..38df41d1 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -224,8 +224,10 @@ def farming_plots():
     gc = globals.load()
     farmers = chia.load_farmers()
     plots = chia.load_plots_farming()
-    return render_template('farming/plots.html', farmers=farmers, plots=plots, global_config=gc, 
-        lang=get_lang(request))
+    ksizes = [29, 30, 31, 32, 33, 34]
+    settings = { 'replotting': plotman.load_replotting_settings() }
+    return render_template('farming/plots.html', farmers=farmers, plots=plots, 
+        settings=settings, ksizes=ksizes, global_config=gc, lang=get_lang(request))
 
 @app.route('/farming/data')
 def farming_data():
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index b9e2cdfe..9c211220 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -37,7 +37,17 @@ 
         
           
     
    
-  
    
+
    
+
+
    
+    
    
+        
+         
+        
+            
+        
+    
    
+
    
 
 
 
+
+
+
+
 
    
             
    

From 372384bafc23e147e249205362404b86cb38ee3c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 17 Jan 2023 20:03:13 -0700
Subject: [PATCH 1176/1625] Pipscoin fix install and launch scripts.

---
 scripts/forks/pipscoin_install.sh | 6 +++---
 scripts/forks/pipscoin_launch.sh  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/forks/pipscoin_install.sh b/scripts/forks/pipscoin_install.sh
index 7972039f..7821dcf5 100644
--- a/scripts/forks/pipscoin_install.sh
+++ b/scripts/forks/pipscoin_install.sh
@@ -4,13 +4,13 @@
 #
 
 PIPSCOIN_BRANCH=$1
-# On 2023-01-02
-HASH=29854541a4a6b2b9bc4d423302642e10ddf8fc77
+# On 2023-01-17
+HASH=3017cde5f8c463f5e494c5c1e258dd2bf8281fee
 
 if [ -z ${PIPSCOIN_BRANCH} ]; then
 	echo 'Skipping Pipscoin install as not requested.'
 else
-	git clpipscoin --branch ${PIPSCOIN_BRANCH} --recurse-submodules https://github.com/Pipscoin-Network/pipscoin-blockchain.git /pipscoin-blockchain 
+	git clone --branch ${PIPSCOIN_BRANCH} --recurse-submodules https://github.com/Pipscoin-Network/pipscoin-blockchain.git /pipscoin-blockchain 
 	cd /pipscoin-blockchain 
 	git submodule update --init mozilla-ca
 	git checkout $HASH
diff --git a/scripts/forks/pipscoin_launch.sh b/scripts/forks/pipscoin_launch.sh
index 83dae859..64917b44 100644
--- a/scripts/forks/pipscoin_launch.sh
+++ b/scripts/forks/pipscoin_launch.sh
@@ -40,7 +40,7 @@ for k in ${keys//:/ }; do
     pipscoin keys add -l "key_${label_num}" -f ${k} > /dev/null
     ((label_num=label_num+1))
   fi
-dpipscoin
+done
 
 # Loop over provided list of completed plot directories
 IFS=':' read -r -a array <<< "$plots_dir"
@@ -48,7 +48,7 @@ joined=$(printf ", %s" "${array[@]}")
 echo "Adding plot directories at: ${joined:1}"
 for p in ${plots_dir//:/ }; do
   pipscoin plots add -d ${p}
-dpipscoin
+done
 
 chmod 755 -R /root/.pipscoin/mainnet/config/ssl/ &> /dev/null
 pipscoin init --fix-ssl-permissions > /dev/null 
@@ -63,8 +63,8 @@ if [[ ${mode} == 'fullnode' ]]; then
         pipscoin keys add -f ${k}
         sleep 10
       fi
-    dpipscoin
-  dpipscoin
+    done
+  done
   if [ -f /root/.chia/machinaris/config/wallet_settings.json ]; then
     pipscoin start farmer-no-wallet
   else

From 53c65b99fe83e61041d920e7bc0db943c098516a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 17 Jan 2023 21:40:59 -0700
Subject: [PATCH 1177/1625] Fix for ballcoin module name.

---
 api/commands/rpc.py            | 12 ++++++------
 common/config/blockchains.json |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/commands/rpc.py b/api/commands/rpc.py
index 562421e8..39c1975d 100644
--- a/api/commands/rpc.py
+++ b/api/commands/rpc.py
@@ -23,12 +23,12 @@
     from apple.util.ints import uint16
     from apple.util.config import load_config as load_fork_config
 elif blockchain == "ballcoin":
-    from ballcoin.rpc.full_node_rpc_client import FullNodeRpcClient
-    from ballcoin.rpc.farmer_rpc_client import FarmerRpcClient
-    from ballcoin.rpc.wallet_rpc_client import WalletRpcClient
-    from ballcoin.util.default_root import DEFAULT_ROOT_PATH
-    from ballcoin.util.ints import uint16
-    from ballcoin.util.config import load_config as load_fork_config
+    from ball.rpc.full_node_rpc_client import FullNodeRpcClient
+    from ball.rpc.farmer_rpc_client import FarmerRpcClient
+    from ball.rpc.wallet_rpc_client import WalletRpcClient
+    from ball.util.default_root import DEFAULT_ROOT_PATH
+    from ball.util.ints import uint16
+    from ball.util.config import load_config as load_fork_config
 elif blockchain == "bpx":
     from chia.rpc.full_node_rpc_client import FullNodeRpcClient
     from chia.rpc.farmer_rpc_client import FarmerRpcClient
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 97f719dc..9cc4479e 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -26,7 +26,7 @@
         "farmer_port": 38891,
         "fullnode_rpc_port": 38885,
         "worker_port": 8957,
-        "reward": 2.0,
+        "reward": 200,
         "mojos_per_coin": 1000000000000,
         "blocks_per_day": 4608,
         "git_url": "https://github.com/ball-network/ballcoin-blockchain",
@@ -415,7 +415,7 @@
         "farmer_port": 16339,
         "fullnode_rpc_port": 18868,
         "worker_port": 8958,
-        "reward": 1.0,
+        "reward": 5.0,
         "mojos_per_coin": 1000000000000,
         "blocks_per_day": 4608,
         "git_url": "https://github.com/Pipscoin-Network/pipscoin-blockchain",

From f3e8a60e27b7d23fed8d299a928667928765c1a0 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Thu, 19 Jan 2023 09:58:29 -0700
Subject: [PATCH 1178/1625] Try building latest Staicoin on Ubuntu 22.04

---
 .github/workflows/develop-staicoin.yaml | 4 ++--
 .github/workflows/main-staicoin.yaml    | 4 ++--
 .github/workflows/test-staicoin.yaml    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index f8a20ea9..d009c6c0 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            "UBUNTU_VER=focal"
+            "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "FDCLI_BRANCH=dev"
diff --git a/.github/workflows/main-staicoin.yaml b/.github/workflows/main-staicoin.yaml
index 7df7e485..f0ba0c07 100644
--- a/.github/workflows/main-staicoin.yaml
+++ b/.github/workflows/main-staicoin.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -41,7 +41,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "UBUNTU_VER=focal"
+            "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "STAICOIN_BRANCH=main"
           tags: |
diff --git a/.github/workflows/test-staicoin.yaml b/.github/workflows/test-staicoin.yaml
index 7111e555..79752209 100644
--- a/.github/workflows/test-staicoin.yaml
+++ b/.github/workflows/test-staicoin.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
-            "UBUNTU_VER=focal"
+            "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
             "STAICOIN_BRANCH=main"

From 36842e2acd8e09ebd7706fc06bde80a612f2e667 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 20 Jan 2023 09:06:51 -0700
Subject: [PATCH 1179/1625] Fix for Bladebit ramplot plotting issues.

---
 CHANGELOG.md | 1 +
 CREDITS.md   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c83f523a..a5abecbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. The format
  - [Pipscoin](https://github.com/Pipscoin-Network/pipscoin-blockchain") blockchain at version 1.7.0.
 ## Changed
  - Fix missing Connections listing for Flax and MMX blockchains
+ - Fix for Bladebit ramplot relaunching.  Thanks @JoeZotacExperience!
 ## Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.3) to v1.5.3, including staking.
diff --git a/CREDITS.md b/CREDITS.md
index 5fc6b7be..6ea4898d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -102,6 +102,7 @@ A big thanks to all that contributed with dev and test including:
 * Gnomuz
 * borifrmr (aka Inabon)
 * DeathandDestruction
+* Joe Zotac Experience
 
 ## 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.*
\ No newline at end of file

From 604e289dff32c0fa2c1877e7ea3d6c87649e9e13 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 20 Jan 2023 11:18:29 -0700
Subject: [PATCH 1180/1625] More efficient log parse from @qoole.  Thanks! #838

---
 api/commands/chia_cli.py   | 4 ++--
 api/commands/log_parser.py | 7 ++++---
 api/gunicorn.conf.py       | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 7b59c062..25febee0 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -157,7 +157,7 @@ def load_keys_show(blockchain):
 def restart_farmer(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     if os.path.exists(WALLET_SETTINGS_FILE):
-        cmd = "{0} stop farmer && {0} start farmer-no-wallet".format(chia_binary)
+        cmd = "{0} stop -d farmer && {0} start farmer-no-wallet".format(chia_binary)
     else:
         cmd = "{0} start farmer && {0} start farmer -r".format(chia_binary)
     app.logger.info("Executing farmer restart: {0}".format(cmd))
@@ -194,7 +194,7 @@ def start_wallet(blockchain):
 def pause_wallet(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     if globals.legacy_blockchain(blockchain):  # Old chains will stop fullnode(!) if ask to stop just the wallet...
-        cmd = "{0} stop farmer && {0} start farmer-no-wallet".format(chia_binary)
+        cmd = "{0} stop -d farmer && {0} start farmer-no-wallet".format(chia_binary)
     else:  # Updated blockchains can simply stop the wallet
         cmd = "{0} stop wallet".format(chia_binary)
     app.logger.info("Executing wallet pause: {0}".format(cmd))
diff --git a/api/commands/log_parser.py b/api/commands/log_parser.py
index 625fd15e..ffef5a80 100644
--- a/api/commands/log_parser.py
+++ b/api/commands/log_parser.py
@@ -97,8 +97,9 @@ def recent_farmed_blocks(blockchain):
         #app.logger.info("MMX executing: grep 'Created block' {0}".format(log_file))
         proc = Popen("grep 'Created block' {0}".format(log_file), stdout=PIPE, stderr=PIPE, shell=True)
     else:
-        # Chia 1.4+ sprays lots of useless "Cumulative cost" log lines right in middle of important lines, so ignore them
-        proc = Popen("grep -v 'Cumulative cost' {0} {1} | grep -v 'CompressorArg' | grep -B 15 'Farmed unfinished_block'".format(rotated_log_file, log_file),
+        # Chia 1.4+ sprays lots of useless "Cumulative cost" and "CompressorArg" log lines right in middle of important lines, so ignore them
+        # Hopefully, there are not more than about 80 of such useless log lines else the selection of 100 before lines might exclude some blocks
+        proc = Popen("grep -B 100 'Farmed unfinished_block' {0} {1} | grep -ve 'Cumulative cost' -ve 'CompressorArg'".format(rotated_log_file, log_file),
                  stdout=PIPE, stderr=PIPE, shell=True)
     try:
         outs, errs = proc.communicate(timeout=90)
@@ -112,7 +113,7 @@ def recent_farmed_blocks(blockchain):
     cli_stdout = outs.decode('utf-8')
     #app.logger.info("Blocks grep: {0}".format(cli_stdout))
     blocks = log.Blocks(blockchain, cli_stdout.splitlines())
-    #app.logger.info(blocks.rows)
+    app.logger.info(blocks.rows)
     return blocks
 
 def get_farming_log_file(blockchain):
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 810c8f7e..617d127f 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -72,7 +72,7 @@ def on_starting(server):
         scheduler.add_job(func=status_connections.update, name="status_connections", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=status_keys.update, name="status_keys", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=status_farm.update, name="status_farm", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
-        scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
+        scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', minutes=10, jitter=0)
         scheduler.add_job(func=restart_stuck_farmer.execute, name="status_blockchain_sync", trigger='interval', minutes=5, jitter=0) 
         scheduler.add_job(func=periodically_sync_wallet.execute, name="status_wallet_sync", trigger='interval', minutes=15, jitter=0) 
         scheduler.add_job(func=nft_recover.execute, name="status_nft_recover", trigger='interval', hours=1) # Once an hour
@@ -96,7 +96,7 @@ def on_starting(server):
         
     # Testing only
     #scheduler.add_job(func=plots_check.execute, name="plots_check", trigger='interval', seconds=60) # Test immediately
-    #scheduler.add_job(func=stats_effort.collect, name="stats_effort", trigger='interval', seconds=10) # Test immediately
+    #scheduler.add_job(func=stats_blocks.collect, name="stats_effort", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=websvcs.get_chain_statuses, name="get_chain_statuses", trigger='interval', seconds=10) # Test immediately
     #scheduler.add_job(func=status_farm.update, name="farms", trigger='interval', seconds=10) # Test immediately

From c603041c5e9c3c0978530919ac4651067bb7cae3 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 20 Jan 2023 12:46:05 -0700
Subject: [PATCH 1181/1625] Handle multiple key prompt from Cactus.

---
 CHANGELOG.md              | 4 ++--
 CREDITS.md                | 1 +
 api/commands/chia_cli.py  | 8 ++++----
 api/commands/pools_cli.py | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5abecbe..c15f825f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,9 @@ All notable changes to this project will be documented in this file. The format
 ### Added
  - [MMX Cuda Plotter](https://github.com/madMAx43v3r/mmx-binaries/tree/master/mmx-cuda-plotter) - currently only at commandline: `cuda_plot_kXX`. 
  - [Ballcoin](https://github.com/ball-network/ballcoin-blockchain) blockchain at version 1.6.0, another slow Silicoin fork.
- - [Pipscoin](https://github.com/Pipscoin-Network/pipscoin-blockchain") blockchain at version 1.7.0.
+ - [Pipscoin](https://github.com/Pipscoin-Network/pipscoin-blockchain) blockchain at version 1.7.0.
 ## Changed
- - Fix missing Connections listing for Flax and MMX blockchains
+ - Fix missing Connections listing for Flax and MMX blockchains.  Thanks @ekersey!
  - Fix for Bladebit ramplot relaunching.  Thanks @JoeZotacExperience!
 ## Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
diff --git a/CREDITS.md b/CREDITS.md
index 6ea4898d..f879ca3a 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -102,6 +102,7 @@ A big thanks to all that contributed with dev and test including:
 * Gnomuz
 * borifrmr (aka Inabon)
 * DeathandDestruction
+* @ekersey
 * Joe Zotac Experience
 
 ## Trademark Notice
diff --git a/api/commands/chia_cli.py b/api/commands/chia_cli.py
index 25febee0..fa1ca977 100644
--- a/api/commands/chia_cli.py
+++ b/api/commands/chia_cli.py
@@ -92,17 +92,17 @@ def load_wallet_show(blockchain):
     app.logger.debug("Default SELECTED_WALLET_NUM is {0}".format(wallet_id_num))
     while True:
         i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", 
-            "Choose a wallet key .*\r\n", "No online backup file found.*\r\n", "Connection error.*\r\n"], timeout=90)
+            "Choose a wallet key .*\r\n", "Active Wallet Key.*\r\n", "No online backup file found.*\r\n", "Connection error.*\r\n"], timeout=90)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
-        elif i == 1 or i == 2 or i == 3:
+        elif i == 1 or i == 2 or i == 3 or i == 4:
             app.logger.info("Wallet show got num prompt so selecting wallet #{0}".format(wallet_id_num))
             child.sendline("{0}".format(wallet_id_num))
-        elif i == 4:
-            child.sendline("S")
         elif i == 5:
+            child.sendline("S")
+        elif i == 6:
             raise Exception("Skipping wallet status gathering as it returned 'Connection Error', so possibly still starting up. If this error persists more than 30 minutes after startup, try restarting the Machinaris Docker container.")
         else:
             raise Exception("ERROR:\n" + child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8"))
diff --git a/api/commands/pools_cli.py b/api/commands/pools_cli.py
index df828d9a..eacdc2b3 100644
--- a/api/commands/pools_cli.py
+++ b/api/commands/pools_cli.py
@@ -100,16 +100,16 @@ def load_plotnft_show(blockchain):
     pool_wallet_id = 1
     while True:
         i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", 
-            "Choose a wallet key .*\r\n", "No online backup file found.*\r\n"], timeout=30)
+            "Choose a wallet key .*\r\n", "Active Wallet Key.*\r\n", "No online backup file found.*\r\n"], timeout=30)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
-        elif i == 1 or i == 2 or i == 3:
+        elif i == 1 or i == 2 or i == 3 or i == 4:
             app.logger.debug("wallet show got index prompt so selecting #{0}".format(pool_wallet_id))
             child.sendline("{0}".format(pool_wallet_id))
             pool_wallet_id += 1
-        elif i == 4:
+        elif i == 5:
             child.sendline("S")
         else:
             app.logger.debug("pexpect returned {0}".format(i))

From f38c8c710c773f0f1c02d0a16cb18c47541105b1 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 08:06:00 -0700
Subject: [PATCH 1182/1625] Fix for flask-migrate env.py being out-of-date. 
 Cache control header.  Thanks @qoole!

---
 CREDITS.md              |  2 ++
 api/migrations/env.py   | 34 ++++++++++++++++++++++------------
 web/default_settings.py |  3 +++
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index f879ca3a..c96c3e1b 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -104,6 +104,8 @@ A big thanks to all that contributed with dev and test including:
 * DeathandDestruction
 * @ekersey
 * Joe Zotac Experience
+* @qoole
+* @miguell
 
 ## 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.*
\ No newline at end of file
diff --git a/api/migrations/env.py b/api/migrations/env.py
index 04b1ff74..7f48c373 100644
--- a/api/migrations/env.py
+++ b/api/migrations/env.py
@@ -19,14 +19,23 @@
 fileConfig(config.config_file_name)
 logger = logging.getLogger('alembic.env')
 
+
+def get_engine(bind_key=None):
+    try:
+        # this works with Flask-SQLAlchemy<3 and Alchemical
+        return current_app.extensions['migrate'].db.get_engine(bind=bind_key)
+    except TypeError:
+        # this works with Flask-SQLAlchemy>=3
+        return current_app.extensions['migrate'].db.engines.get(bind_key)
+
+
 # add your model's MetaData object here
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
 config.set_main_option(
-    'sqlalchemy.url',
-    str(current_app.extensions['migrate'].db.get_engine().url).replace(
-        '%', '%%'))
+    'sqlalchemy.url', str(get_engine().url).replace('%', '%%'))
+bind_names = []
 if current_app.config.get('SQLALCHEMY_BINDS') is not None:
     bind_names = list(current_app.config['SQLALCHEMY_BINDS'].keys())
 else:
@@ -37,10 +46,8 @@
 for bind in bind_names:
     context.config.set_section_option(
         bind, "sqlalchemy.url",
-        str(current_app.extensions['migrate'].db.get_engine(
-            bind=bind).url).replace('%', '%%'))
-target_metadata = current_app.extensions['migrate'].db.metadata
-
+        str(get_engine(bind_key=bind).url).replace('%', '%%'))
+target_db = current_app.extensions['migrate'].db
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
@@ -52,8 +59,12 @@ def get_metadata(bind):
     """Return the metadata for a bind."""
     if bind == '':
         bind = None
+    if hasattr(target_db, 'metadatas'):
+        return target_db.metadatas[bind]
+
+    # legacy, less flexible implementation
     m = MetaData()
-    for t in target_metadata.tables.values():
+    for t in target_db.metadata.tables.values():
         if t.info.get('bind_key') == bind:
             t.tometadata(m)
     return m
@@ -124,12 +135,11 @@ def process_revision_directives(context, revision, directives):
     # for the direct-to-DB use case, start a transaction on all
     # engines, then run all migrations, then commit all transactions.
     engines = {
-        '': {'engine': current_app.extensions['migrate'].db.get_engine()}
+        '': {'engine': get_engine()}
     }
     for name in bind_names:
         engines[name] = rec = {}
-        rec['engine'] = current_app.extensions['migrate'].db.get_engine(
-            bind=name)
+        rec['engine'] = get_engine(bind_key=name)
 
     for name, rec in engines.items():
         engine = rec['engine']
@@ -171,4 +181,4 @@ def process_revision_directives(context, revision, directives):
 if context.is_offline_mode():
     run_migrations_offline()
 else:
-    run_migrations_online()
+    run_migrations_online()
\ No newline at end of file
diff --git a/web/default_settings.py b/web/default_settings.py
index 641698fa..ee36bd77 100644
--- a/web/default_settings.py
+++ b/web/default_settings.py
@@ -50,3 +50,6 @@ class DefaultConfig:
     # Note, babel looks in /machinaris/web/translations with this path.
     BABEL_TRANSLATION_DIRECTORIES = "translations"
     LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'nl_NL', 'pt_PT', 'zh']
+
+    # Enable client-side caching of static files; Thanks @qoole!
+    SEND_FILE_MAX_AGE_DEFAULT = 86400

From 12f8b9984e39902169d9b3e3add8dcc7b6f5c247 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 08:22:44 -0700
Subject: [PATCH 1183/1625] Latest Javascript libs.

---
 api/default_settings.py        |  8 ++++++++
 scripts/pull_3rd_party_libs.sh | 13 ++++++++-----
 web/__init__.py                |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/api/default_settings.py b/api/default_settings.py
index 4066cb46..097715d8 100644
--- a/api/default_settings.py
+++ b/api/default_settings.py
@@ -1,4 +1,5 @@
 import os
+import traceback
 
 class DefaultConfig:
     API_TITLE = "Machinaris API"
@@ -62,3 +63,10 @@ class DefaultConfig:
 
     BABEL_TRANSLATION_DIRECTORIES = "api/translations"
     LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'nl_NL', 'pt_PT', 'zh']
+
+    # For latest APScheduler library, pass the TZ through
+    try:
+        SCHEDULER_TIMEZONE = os.environ['TZ']
+    except:
+        print("Found no TZ environment variable containing timezone.  Generate a working Machinaris launch at https://www.machinaris.app")
+        traceback.print_exc()
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index 88b6e9e7..c26f4f8c 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -3,20 +3,23 @@
 # Due to complaints about JS CDNs, this pulls all JS libs into web/static/3rd_party folder
 #
 
-# Bootstrap Icons
-BSI_VERSION=1.10.2
+# Bootstrap and Icons
+BSI_VERSION=1.10.3
 BOOTSTRAP_VERSION=5.2.3
 BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
+# Mapping library
+LEAFLET_VERSION=1.9.3
+
 # List of other css/js links
 LIST="
 https://cdn.datatables.net/1.13.1/css/dataTables.bootstrap5.css
 https://cdn.datatables.net/1.13.1/js/dataTables.bootstrap5.js
 https://cdn.datatables.net/1.13.1/js/jquery.dataTables.js
-https://cdn.jsdelivr.net/npm/chart.js@4.0.1/dist/chart.umd.min.js
+https://cdn.jsdelivr.net/npm/chart.js@4.2.0/dist/chart.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.0/dist/chartjs-adapter-luxon.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.2.0/dist/chartjs-plugin-datalabels.min.js
-https://cdn.jsdelivr.net/npm/jquery@3.6.1/dist/jquery.min.js
+https://cdn.jsdelivr.net/npm/jquery@3.6.3/dist/jquery.min.js
 https://moment.github.io/luxon/global/luxon.min.js"
 
 mkdir -p $BASEPATH
@@ -36,7 +39,7 @@ unzip -q -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/
 rm -f ${BASEPATH}/bs.zip
 
 # Leaflet and plugins
-wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v1.9.3/leaflet.zip" && \
+wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v{$LEAFLET_VERSION}/leaflet.zip" && \
 unzip -q -o ${BASEPATH}/leaflet.zip -d $BASEPATH/ && \
 rm -f ${BASEPATH}/leaflet.zip
 wget -O ${BASEPATH}/leaflet-layervisibility.js -nv "https://unpkg.com/leaflet-layervisibility/dist/leaflet-layervisibility.js"
diff --git a/web/__init__.py b/web/__init__.py
index a8f45655..e5518432 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -29,9 +29,9 @@ def get_locale():
             alternative = "{0}_{1}".format(first_accept, first_accept.upper())
             if alternative in app.config['LANGUAGES']:
                 return alternative
-        app.logger.info("INIT: Accept-Language: {0}  ---->  matched locale: {1}".format(accept, match))
+        app.logger.debug("INIT: Accept-Language: {0}  ---->  matched locale: {1}".format(accept, match))
     except:
-        app.logger.info("INIT: Request had no Accept-Language, returning default locale of en.")
+        app.logger.debug("INIT: Request had no Accept-Language, returning default locale of en.")
     return request.accept_languages.best_match(app.config['LANGUAGES'])
 
 babel = Babel(app, locale_selector=get_locale,)

From f04338fa2ee1e1380d410323bd42d80e6a072239 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 08:37:11 -0700
Subject: [PATCH 1184/1625] Use ATB API for peer node list request.  Thanks
 @qoole!  #840

---
 api/commands/websvcs.py | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 3b19d055..713c9dac 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -343,25 +343,17 @@ def request_infinex_prices(debug=False):
 def request_peers(blockchain, debug=False):
     peers = []
     alltheblocks_blockchain = globals.get_alltheblocks_name(blockchain)
-    url = "https://alltheblocks.net/{0}/peers".format(alltheblocks_blockchain)
+    url = "https://api.alltheblocks.net/{0}/peer/recent?amount=10".format(alltheblocks_blockchain)
     app.logger.info("Requesting node peers for {0} from {1}".format(blockchain, url))
-    if debug:
-        http.client.HTTPConnection.debuglevel = 1
-    data = requests.get(url, timeout=30).text
-    http.client.HTTPConnection.debuglevel = 0
-    soup = bs4.BeautifulSoup(data, 'html.parser')
-    div = soup.find('div', class_="p-2 text-monospace")
-    for row in div.find_all('div'):
-        if len(row.contents) == 1:
-            add_cmd = row.contents[0].string.strip()
-            if 'show -a' in add_cmd:
-                peer = add_cmd[(add_cmd.index('show -a ') + len('show -a ')):].strip()
-                peers.append(peer)
-            elif 'peer -a' in add_cmd:
-                peer = add_cmd[(add_cmd.index('peer -a ') + len('peer -a ')):].strip()
-                peers.append(peer.splitlines()[0])
-            else:
-                app.logger.error("Unparseable peer connection: {0}".format(row.contents[0].string))
+    try:
+        if debug:
+            http.client.HTTPConnection.debuglevel = 1
+        data = json.loads(requests.get(url, timeout=30).content)
+        http.client.HTTPConnection.debuglevel = 0
+        for peer in data:
+            peers.append("{0}:{1}".format(peer['host'], peer['port']))
+    except Exception as ex:
+        app.logger.error("Failed to request network peers from {0} due to {1}".format(url, str(ex)))
     return peers
 
 last_price_request_time = None

From 77abbde697c73105c8b9ac7f4133216934fa291e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 13:32:35 -0700
Subject: [PATCH 1185/1625] Initial GPU support in the Chia container.

---
 CHANGELOG.md                  |  2 ++
 CREDITS.md                    | 21 +++------------------
 api/commands/websvcs.py       | 23 -----------------------
 scripts/forks/chia_install.sh |  9 +++++++++
 scripts/forks/chia_launch.sh  | 13 +++++++++++++
 web/routes.py                 |  8 ++++----
 6 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c15f825f..5e1ab601 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,14 @@ All notable changes to this project will be documented in this file. The format
 
 ## [Unreleased]
 ### Added
+ - [Bladebit](https://github.com/Chia-Network/bladebit) - support for plotting via GPU (NOT YET, PENDING!)
  - [MMX Cuda Plotter](https://github.com/madMAx43v3r/mmx-binaries/tree/master/mmx-cuda-plotter) - currently only at commandline: `cuda_plot_kXX`. 
  - [Ballcoin](https://github.com/ball-network/ballcoin-blockchain) blockchain at version 1.6.0, another slow Silicoin fork.
  - [Pipscoin](https://github.com/Pipscoin-Network/pipscoin-blockchain) blockchain at version 1.7.0.
 ## Changed
  - Fix missing Connections listing for Flax and MMX blockchains.  Thanks @ekersey!
  - Fix for Bladebit ramplot relaunching.  Thanks @JoeZotacExperience!
+ - Multiple functionality & performance cleanups from excellent code review by @qoole.
 ## Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.3) to v1.5.3, including staking.
diff --git a/CREDITS.md b/CREDITS.md
index c96c3e1b..6400e083 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -5,12 +5,13 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 
 ## Core Components
 * [Chia™](https://www.chia.net/): the distributed cryptocurrency project.
+* [Forks](https://github.com/guydavis/machinaris/wiki/Forks): All the other blockchain clones.
 * [Plotman](https://github.com/ericaltendorf/plotman): a parallel plotting manager.
 * [Chiadog](https://github.com/martomi/chiadog): a log monitor with alerting.
 * [Madmax](https://github.com/madMAx43v3r/chia-plotter): a pipelined, multi-threaded plotter.
 * [Bladebit](https://github.com/harold-b/bladebit): an in-memory plotter.
-* [Farmr](https://github.com/gilnobrega/farmr): provides advanced monitoring at [farmr.net](https://farmr.net).
 * [Forktools](https://github.com/Qwinn1/forktools): shell utilities for managing Chia forks.
+* [FD-CLI](https://github.com/Flora-Network/flora-dev-cli) - script to regularly recover 7/8 rewards 
 
 ## Web Application
 * [Flask](https://flask.palletsprojects.com/en/2.0.x/): Web UI application server.
@@ -28,25 +29,9 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [Maxmind](https://maxmind.com/): Geolocation API for mapping IP addresses of peer connections.
 * [Mapbox](https://mapbox.com): Nice looking map tiles for use with Leaflet on the Connections page map.
 
-## Blockchains
-* [BTCgreen](https://github.com/BTCgreen-Network/btcgreen-blockchain)
-* [Cactus](https://github.com/Cactus-Network/cactus-blockchain)
-* [Chives](https://github.com/HiveProject2021/chives-blockchain)
-* [Cryptodoge](https://github.com/CryptoDoge-Network/cryptodoge)
-* [Flax](https://github.com/Flax-Network/flax-blockchain)
-* [Flora](https://github.com/Flora-Network/flora-blockchain)
-* [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain)
-* [Maize](https://github.com/Maize-Network/maize-blockchain)
-* [MMX](https://github.com/madMAx43v3r/mmx-node)
-* [NChain](https://gitee.com/ext9/ext9-blockchain)
-* [SHIBgreen](https://github.com/BTCgreen-Network/shibgreen-blockchain)
-* [Staicoin](https://github.com/STATION-I/staicoin-blockchain)
-* [Stor](https://github.com/Stor-Network/stor-blockchain)
-
 ## Other Resources
-* [FD-CLI](https://github.com/Flora-Network/flora-dev-cli) - script to regularly recover 7/8 rewards 
-* [Chia DB Downloads](https://www.chia-database.com/) - for Chia blockchain database
 * [All the Blocks](https://alltheblocks.net/) - blockchain, wallet, and pricing info
+* [Infinex](infinex.cc) - blockchain coin exchange, also for pricing info
 * [Coin Gecko](https://coingecko.com/) - fiat currency exchange info
 
 ## Testers and Developers
diff --git a/api/commands/websvcs.py b/api/commands/websvcs.py
index 713c9dac..5d8898d2 100644
--- a/api/commands/websvcs.py
+++ b/api/commands/websvcs.py
@@ -289,28 +289,6 @@ def request_atb_prices(debug=False):
         app.logger.error("Failed to request recent blockchain pricing from {0} due to {1}".format(url, str(ex)))
     return prices
 
-def request_posat_prices(debug=False):
-    prices = {}
-    url = "https://mrkt.posat.io/api/prices/v2"
-    try:
-        app.logger.info("Requesting recent pricing for blockchains from {0}".format(url))
-        if debug:
-            http.client.HTTPConnection.debuglevel = 1
-        data = json.loads(requests.get(url, timeout=30).content)
-        http.client.HTTPConnection.debuglevel = 0
-        for blockchain in data.keys():
-            machinaris_blockchain = blockchain.replace('stai', 'staicoin').lower()
-            if not machinaris_blockchain in SUPPORTED_BLOCKCHAINS:
-                continue
-            #app.logger.info("POSAT: {0} @ {1}".format(blockchain, data[blockchain]['price']['usd']))
-            try:
-                prices[machinaris_blockchain] = float(data[blockchain]['price']['usd'])
-            except Exception as ex:
-                traceback.print_exc()
-    except Exception as ex:
-        app.logger.error("Failed to request recent blockchain pricing from {0} due to {1}".format(url, str(ex)))
-    return prices
-
 def request_infinex_prices(debug=False):
     prices = {}
     url = "https://api.infinex.cc/spot/markets"
@@ -364,7 +342,6 @@ def get_prices():
         try:
             last_price_request_time = datetime.datetime.now()
             store_exchange_prices(prices, 'alltheblocks', request_atb_prices(), last_price_request_time)
-            #store_exchange_prices(prices, 'posat', request_posat_prices(), last_price_request_time) # Dead as of Sept 2022
             store_exchange_prices(prices, 'infinex', request_infinex_prices(), last_price_request_time)
             save_prices_cache(prices)
         except Exception as ex:
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 46b3eb27..c4fd1b29 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -8,6 +8,15 @@ CHIA_BRANCH=$1
 if [ -z ${CHIA_BRANCH} ]; then
     echo 'Skipping Chia install as not requested.'
 else
+    rm -rf /root/.cache
+	apt-get update
+	# Install dependencies for MMX and GPU support
+	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev libminiupnpc-dev libjemalloc-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
+	apt-get install -y initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
+	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
+	curl -O http://repo.radeon.com/amdgpu-install/22.20.5/ubuntu/jammy/amdgpu-install_22.20.50205-1_all.deb
+	apt-get install -y ./amdgpu-install_22.20.50205-1_all.deb
+	
     git clone --branch ${CHIA_BRANCH} --recurse-submodules=mozilla-ca https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain
     cd /chia-blockchain
 
diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 0fbf4516..2bb59ca3 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -85,6 +85,19 @@ done
 chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
 chia init --fix-ssl-permissions > /dev/null 
 
+# Initial support for GPUs used when plotting/farming
+if [[ ${OPENCL_GPU} == 'nvidia' ]]; then    
+    mkdir -p /etc/OpenCL/vendors
+    echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
+elif [[ ${OPENCL_GPU} == 'amd' ]]; then
+	pushd /tmp
+	apt-get update 2>&1 > /tmp/amdgpu_setup.log
+	amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula 2>&1 >> /tmp/amdgpu_setup.log
+	popd
+elif [[ ${OPENCL_GPU} == 'intel' ]]; then
+	apt-get update 2>&1 > /tmp/intelgpu_setup.log
+	apt-get install -y intel-opencl-icd 2>&1 >> /tmp/intelgpu_setup.log
+fi
 
 # Start services based on mode selected. Default is 'fullnode'
 if [[ ${mode} == 'fullnode' ]]; then
diff --git a/web/routes.py b/web/routes.py
index 6c711803..4b4a0127 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -28,15 +28,15 @@ def get_lang(request):
             first_accept = accept.split(',')[0]  # Like 'nl'
             alternative = "{0}_{1}".format(first_accept, first_accept.upper())
             if alternative in app.config['LANGUAGES']:
-                app.logger.info("LOCALE: Accept-Language: {0}  ---->  using locale: {1}".format(accept, alternative))
+                app.logger.debug("LOCALE: Accept-Language: {0}  ---->  using locale: {1}".format(accept, alternative))
                 return alternative
         if match:
-            app.logger.info("LOCALE: Accept-Language: {0}  ---->  matched locale: {1}".format(accept, match))
+            app.logger.debug("LOCALE: Accept-Language: {0}  ---->  matched locale: {1}".format(accept, match))
             return match
-        app.logger.info("LOCALE: Accept-Language: {0} returned no match so defaulting to 'en'.".format(accept))
+        app.logger.debug("LOCALE: Accept-Language: {0} returned no match so defaulting to 'en'.".format(accept))
         return "en"
     except:
-        app.logger.info("LOCALE: Request had no Accept-Language header, returning default locale of 'en'")
+        app.logger.debug("LOCALE: Request had no Accept-Language header, returning default locale of 'en'")
         return "en" 
 
 def find_selected_worker(hosts, hostname, blockchain= None):

From 43d22d316e1b5fd3b8d268848a94f0de413c8785 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 14:07:00 -0700
Subject: [PATCH 1186/1625] Another try for GPU support.

---
 scripts/forks/chia_install.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index c4fd1b29..1f548d23 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -10,9 +10,8 @@ if [ -z ${CHIA_BRANCH} ]; then
 else
     rm -rf /root/.cache
 	apt-get update
-	# Install dependencies for MMX and GPU support
-	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev libminiupnpc-dev libjemalloc-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
-	apt-get install -y initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
+	# Install dependencies for GPU support
+	apt-get install -y git cmake build-essential ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils
 	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
 	curl -O http://repo.radeon.com/amdgpu-install/22.20.5/ubuntu/jammy/amdgpu-install_22.20.50205-1_all.deb
 	apt-get install -y ./amdgpu-install_22.20.50205-1_all.deb

From f7fa9e6e1e1b739ba93572799a80806fd209573c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 14:14:28 -0700
Subject: [PATCH 1187/1625] Use tmp initially.

---
 scripts/forks/chia_install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 1f548d23..c158b7e5 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -8,6 +8,7 @@ CHIA_BRANCH=$1
 if [ -z ${CHIA_BRANCH} ]; then
     echo 'Skipping Chia install as not requested.'
 else
+    cd /tmp
     rm -rf /root/.cache
 	apt-get update
 	# Install dependencies for GPU support

From 78f64628ba394996e84f3627d4faafc6f8a77920 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 15:44:58 -0700
Subject: [PATCH 1188/1625] Fixes for GPU usage in Chia container?

---
 api/gunicorn.conf.py          | 3 ++-
 scripts/forks/chia_install.sh | 4 ++--
 scripts/forks/chia_launch.sh  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 617d127f..43ff4755 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -6,6 +6,7 @@ def on_starting(server):
     import atexit
     import os
     import time
+    import tzlocal
 
     from datetime import datetime, timedelta
     from apscheduler.schedulers.background import BackgroundScheduler
@@ -23,7 +24,7 @@ def on_starting(server):
 
     from api.commands import websvcs
 
-    scheduler = BackgroundScheduler()
+    scheduler = BackgroundScheduler(timezone=str(tzlocal.get_localzone()))
 
     schedule_every_x_minutes = "?"
     try:
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index c158b7e5..236eb6f6 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -10,9 +10,9 @@ if [ -z ${CHIA_BRANCH} ]; then
 else
     cd /tmp
     rm -rf /root/.cache
-	apt-get update
+	apt-get update && apt-get install -y dialog apt-utils
 	# Install dependencies for GPU support
-	apt-get install -y git cmake build-essential ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils
+	apt-get install -y git cmake build-essential ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers
 	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
 	curl -O http://repo.radeon.com/amdgpu-install/22.20.5/ubuntu/jammy/amdgpu-install_22.20.50205-1_all.deb
 	apt-get install -y ./amdgpu-install_22.20.50205-1_all.deb
diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 2bb59ca3..0ce893d2 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -90,10 +90,10 @@ if [[ ${OPENCL_GPU} == 'nvidia' ]]; then
     mkdir -p /etc/OpenCL/vendors
     echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
 elif [[ ${OPENCL_GPU} == 'amd' ]]; then
-	pushd /tmp
+	pushd /tmp > /dev/null
 	apt-get update 2>&1 > /tmp/amdgpu_setup.log
 	amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula 2>&1 >> /tmp/amdgpu_setup.log
-	popd
+	popd > /dev/null
 elif [[ ${OPENCL_GPU} == 'intel' ]]; then
 	apt-get update 2>&1 > /tmp/intelgpu_setup.log
 	apt-get install -y intel-opencl-icd 2>&1 >> /tmp/intelgpu_setup.log

From e1ab3e758c1f4a75ce73e68f2c08af080928474d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 16:29:18 -0700
Subject: [PATCH 1189/1625] Quiet debconf headless complaint.

---
 scripts/forks/chia_launch.sh |  9 +++++++--
 scripts/forks/mmx_launch.sh  | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh
index 0ce893d2..ccfc1758 100644
--- a/scripts/forks/chia_launch.sh
+++ b/scripts/forks/chia_launch.sh
@@ -85,18 +85,23 @@ done
 chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null
 chia init --fix-ssl-permissions > /dev/null 
 
-# Initial support for GPUs used when plotting/farming
-if [[ ${OPENCL_GPU} == 'nvidia' ]]; then    
+# Support for GPUs used when plotting/farming
+if [[ ${OPENCL_GPU} == 'nvidia' ]]; then   
     mkdir -p /etc/OpenCL/vendors
     echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
+    echo "Enabling Nvidia GPU support inside this container."
 elif [[ ${OPENCL_GPU} == 'amd' ]]; then
 	pushd /tmp > /dev/null
+  echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 	apt-get update 2>&1 > /tmp/amdgpu_setup.log
 	amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula 2>&1 >> /tmp/amdgpu_setup.log
 	popd > /dev/null
+  echo "Enabling AMD GPU support inside this container."
 elif [[ ${OPENCL_GPU} == 'intel' ]]; then
+  echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 	apt-get update 2>&1 > /tmp/intelgpu_setup.log
 	apt-get install -y intel-opencl-icd 2>&1 >> /tmp/intelgpu_setup.log
+  echo "Enabling Intel GPU support inside this container."
 fi
 
 # Start services based on mode selected. Default is 'fullnode'
diff --git a/scripts/forks/mmx_launch.sh b/scripts/forks/mmx_launch.sh
index c18d6dc1..8687ec80 100644
--- a/scripts/forks/mmx_launch.sh
+++ b/scripts/forks/mmx_launch.sh
@@ -31,17 +31,22 @@ fi
 escaped_plot_dirs=$(printf '%s\n' "$plot_dirs" | sed -e 's/[\/&]/\\&/g')
 sed -i "s/\"plot_dirs\":.*$/\"plot_dirs\": [ $escaped_plot_dirs ]/g" /root/.chia/mmx/config/local/Harvester.json
 
-if [[ ${OPENCL_GPU} == 'nvidia' ]]; then    
+# Support for GPUs used when plotting/farming
+if [[ ${OPENCL_GPU} == 'nvidia' ]]; then   
     mkdir -p /etc/OpenCL/vendors
     echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
+    echo "Enabling Nvidia GPU support inside this container."
 elif [[ ${OPENCL_GPU} == 'amd' ]]; then
-	pushd /tmp
+	pushd /tmp > /dev/null
+  echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 	apt-get update 2>&1 > /tmp/amdgpu_setup.log
 	amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula 2>&1 >> /tmp/amdgpu_setup.log
-	popd
+	popd > /dev/null
+  echo "Enabling AMD GPU support inside this container."
 elif [[ ${OPENCL_GPU} == 'intel' ]]; then
 	apt-get update 2>&1 > /tmp/intelgpu_setup.log
 	apt-get install -y intel-opencl-icd 2>&1 >> /tmp/intelgpu_setup.log
+  echo "Enabling Intel GPU support inside this container."
 else
 	echo "No OPENCL_GPU provided.  MMX blockchain will use use CPU instead."
 fi

From 3ac446d9f5c73ff56edab3b3c7732211a0512e9e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Sun, 22 Jan 2023 17:48:31 -0700
Subject: [PATCH 1190/1625] Needs libnuma1

---
 scripts/forks/chia_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
index 236eb6f6..0e908573 100644
--- a/scripts/forks/chia_install.sh
+++ b/scripts/forks/chia_install.sh
@@ -12,7 +12,7 @@ else
     rm -rf /root/.cache
 	apt-get update && apt-get install -y dialog apt-utils
 	# Install dependencies for GPU support
-	apt-get install -y git cmake build-essential ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers
+	apt-get install -y git cmake build-essential ocl-icd-opencl-dev clinfo screen initramfs-tools ocl-icd-libopencl1 opencl-headers libnuma1
 	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
 	curl -O http://repo.radeon.com/amdgpu-install/22.20.5/ubuntu/jammy/amdgpu-install_22.20.50205-1_all.deb
 	apt-get install -y ./amdgpu-install_22.20.50205-1_all.deb

From e7b836b7713316fd9c4147961d1c5bc28b660bd7 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 23 Jan 2023 10:53:57 -0700
Subject: [PATCH 1191/1625] Fix for Leaft lib pull during image build.

---
 scripts/pull_3rd_party_libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index c26f4f8c..c49c120a 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -39,7 +39,7 @@ unzip -q -o -j ${BASEPATH}/bs.zip -d $BASEPATH/ bootstrap-${BOOTSTRAP_VERSION}*/
 rm -f ${BASEPATH}/bs.zip
 
 # Leaflet and plugins
-wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v{$LEAFLET_VERSION}/leaflet.zip" && \
+wget -O ${BASEPATH}/leaflet.zip -nv "https://leafletjs-cdn.s3.amazonaws.com/content/leaflet/v${LEAFLET_VERSION}/leaflet.zip" && \
 unzip -q -o ${BASEPATH}/leaflet.zip -d $BASEPATH/ && \
 rm -f ${BASEPATH}/leaflet.zip
 wget -O ${BASEPATH}/leaflet-layervisibility.js -nv "https://unpkg.com/leaflet-layervisibility/dist/leaflet-layervisibility.js"

From b7890d50b52a58ef18400eb99b561465e3063346 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 23 Jan 2023 15:05:15 -0700
Subject: [PATCH 1192/1625] Job jitter all the things.

---
 api/gunicorn.conf.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index 43ff4755..e0b4ad11 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -30,20 +30,19 @@ def on_starting(server):
     try:
         schedule_every_x_minutes = app.config['STATUS_EVERY_X_MINUTES']
         JOB_FREQUENCY = 60 * int(schedule_every_x_minutes)
-        JOB_JITTER = JOB_FREQUENCY / 2
     except:
         app.logger.info("Failed to configure job schedule frequency in minutes as setting was: '{0}'".format(schedule_every_x_minutes))
-        JOB_FREQUENCY = 60 # once a minute
-        JOB_JITTER = 30 # 30 seconds
+        JOB_FREQUENCY = 120 # once every two minutes
     app.logger.info("Scheduler frequency will be once every {0} seconds.".format(JOB_FREQUENCY))
+    JOB_JITTER = JOB_FREQUENCY / 2
 
     # Every single container should report as a worker
     scheduler.add_job(func=status_worker.update, name="status_workers", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
 
     # Collect disk stats from all modes where blockchain is chia, avoiding duplicate disks from multiple forks on same host
     if 'chia' in globals.enabled_blockchains():
-        scheduler.add_job(func=stats_disk.collect, name="stats_disk", trigger='cron', minute="*/10") # Every 10 minutes
-        scheduler.add_job(func=status_drives.update, name="status_drives", trigger='cron', minute="*/15") # Every 15 minutes
+        scheduler.add_job(func=stats_disk.collect, name="stats_disk", trigger='cron', minute="*/10", jitter=JOB_JITTER) # Every 10 minutes
+        scheduler.add_job(func=status_drives.update, name="status_drives", trigger='cron', minute="*/15", jitter=JOB_JITTER) # Every 15 minutes
         
     # MMX needs to report plots from harvesters directly as they are not listed via the fullnode like Chia does
     if not utils.is_fullnode() and globals.harvesting_enabled() and 'mmx' in globals.enabled_blockchains():
@@ -57,7 +56,7 @@ def on_starting(server):
         scheduler.add_job(func=log_rotate.execute, name="log_rotate", trigger='cron', minute=0)  # Hourly
     
     if globals.farming_enabled() and 'chia' in globals.enabled_blockchains():  # For now, only Chia fullnodes
-        scheduler.add_job(func=status_warnings.collect, name="status_warnings", trigger='cron', minute="*/20") # Every 20 minutes
+        scheduler.add_job(func=status_warnings.collect, name="status_warnings", trigger='cron', minute="*/20", jitter=JOB_JITTER) # Every 20 minutes
 
     # Status for plotters
     if globals.plotting_enabled():
@@ -73,10 +72,10 @@ def on_starting(server):
         scheduler.add_job(func=status_connections.update, name="status_connections", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=status_keys.update, name="status_keys", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         scheduler.add_job(func=status_farm.update, name="status_farm", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
-        scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', minutes=10, jitter=0)
-        scheduler.add_job(func=restart_stuck_farmer.execute, name="status_blockchain_sync", trigger='interval', minutes=5, jitter=0) 
-        scheduler.add_job(func=periodically_sync_wallet.execute, name="status_wallet_sync", trigger='interval', minutes=15, jitter=0) 
-        scheduler.add_job(func=nft_recover.execute, name="status_nft_recover", trigger='interval', hours=1) # Once an hour
+        scheduler.add_job(func=stats_blocks.collect, name="status_blocks", trigger='interval', minutes=10, jitter=JOB_JITTER)
+        scheduler.add_job(func=restart_stuck_farmer.execute, name="status_blockchain_sync", trigger='interval', minutes=5, jitter=JOB_JITTER) 
+        scheduler.add_job(func=periodically_sync_wallet.execute, name="status_wallet_sync", trigger='interval', minutes=15, jitter=JOB_JITTER) 
+        scheduler.add_job(func=nft_recover.execute, name="status_nft_recover", trigger='interval', hours=1, jitter=JOB_JITTER) # Once an hour
         if globals.enabled_blockchains()[0] in plottings.PLOTTABLE_BLOCKCHAINS: # Only get plot listing from these three blockchains
             scheduler.add_job(func=status_plots.update, name="status_plots", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER)
         if globals.enabled_blockchains()[0] in pools.POOLABLE_BLOCKCHAINS: # Only get pool submissions from poolable blockchains
@@ -92,7 +91,7 @@ def on_starting(server):
         scheduler.add_job(func=websvcs.get_prices, name="status_exchange_prices", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=websvcs.get_chain_statuses, name="status_blockchain_networks", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         scheduler.add_job(func=geolocate_peers.execute, name="stats_geolocate_peers", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
-        scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0)  # Hourly
+        scheduler.add_job(func=stats_balances.collect, name="stats_balances", trigger='cron', minute=0, jitter=JOB_JITTER)  # Hourly
         scheduler.add_job(func=plots_replot.execute, name="replot_check", trigger='interval', seconds=JOB_FREQUENCY, jitter=JOB_JITTER) 
         
     # Testing only

From 76380f8737d47752b68da098b2d6e0bc61fa9bc0 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 24 Jan 2023 20:07:22 -0700
Subject: [PATCH 1193/1625] Cactus 1.6.2

---
 CHANGELOG.md                    | 2 +-
 scripts/forks/cactus_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e1ab601..97fcd285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file. The format
  - Multiple functionality & performance cleanups from excellent code review by @qoole.
 ## Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
+ - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.2) to v1.6.2
  - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.3) to v1.5.3, including staking.
  - [SHIBGreen](https://github.com/BTCgreen-Network/shibgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Staicoin](https://github.com/STATION-I/stai-blockchain/releases/tag/1.3.0) to v1.3.0. Note, they require a fresh `config.yaml`.
@@ -36,7 +37,6 @@ All notable changes to this project will be documented in this file. The format
  - Improved "Settings | Pools" page with fee amount and `delete_unconfirmed_transactions` action.
 ### Updated
  - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v2.0.1) to v2.0.1
- - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.7.0) to v1.7.0
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.2) to v1.6.2
  - [Chinilla](https://github.com/Chinilla/chinilla-blockchain/releases/tag/1.4.0) to v1.4.0
  - [Chiadog](https://github.com/guydavis/chiadog/releases/tag/v0.7.5) to v0.7.5
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index 0216d34a..fb5e1787 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2022-12-08
-HASH=5789962eba648c5532f1f54fc12057862b7be009
+# On 2023-01-24
+HASH=1999f8921050bd034b7af46f665e5d268cfb397d
 
 if [ -z ${CACTUS_BRANCH} ]; then
 	echo 'Skipping Cactus install as not requested.'

From 8e57a3ca1a5ebdc34538c0e5b3fa5b2415ad20f7 Mon Sep 17 00:00:00 2001
From: fufar 
Date: Wed, 25 Jan 2023 19:31:35 +0600
Subject: [PATCH 1194/1625] first try

---
 .github/workflows/develop-chives-foxy.yaml |  50 +++++++++++
 .github/workflows/main-chives-foxy.yaml    |  51 +++++++++++
 .github/workflows/test-chives-foxy.yaml    |  49 ++++++++++
 common/config/blockchains.json             |  19 +++-
 config/chiadog/chives-foxy.sample.yaml     |  91 +++++++++++++++++++
 docker/dockerfile                          |   6 +-
 scripts/forks/chives_foxy_install.sh       |  24 +++++
 scripts/forks/chives_foxy_launch.sh        | 100 +++++++++++++++++++++
 web/templates/worker_launch.html           |  38 +++++---
 9 files changed, 414 insertions(+), 14 deletions(-)
 create mode 100644 .github/workflows/develop-chives-foxy.yaml
 create mode 100644 .github/workflows/main-chives-foxy.yaml
 create mode 100644 .github/workflows/test-chives-foxy.yaml
 create mode 100644 config/chiadog/chives-foxy.sample.yaml
 create mode 100644 scripts/forks/chives_foxy_install.sh
 create mode 100644 scripts/forks/chives_foxy_launch.sh

diff --git a/.github/workflows/develop-chives-foxy.yaml b/.github/workflows/develop-chives-foxy.yaml
new file mode 100644
index 00000000..a3f98feb
--- /dev/null
+++ b/.github/workflows/develop-chives-foxy.yaml
@@ -0,0 +1,50 @@
+name: develop-chives-foxy
+
+on:
+  push:
+    branches:
+      - 'develop'
+
+jobs:
+  docker:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "UBUNTU_VER=focal"
+            "MACHINARIS_STREAM=develop"
+            "CHIADOG_BRANCH=dev"
+            "CHIVES_FOXY_BRANCH=1.5.1"
+            "PLOTMAN_BRANCH=development"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:develop
diff --git a/.github/workflows/main-chives-foxy.yaml b/.github/workflows/main-chives-foxy.yaml
new file mode 100644
index 00000000..7aeaa9d4
--- /dev/null
+++ b/.github/workflows/main-chives-foxy.yaml
@@ -0,0 +1,51 @@
+name: release-chives-foxy
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release Version'
+
+jobs:
+  docker:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            "UBUNTU_VER=focal"
+            "MACHINARIS_STREAM=latest"
+            "CHIVES_FOXY_BRANCH=1.5.1"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:v${{ github.event.inputs.version }}
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:latest
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chives-foxy.yaml b/.github/workflows/test-chives-foxy.yaml
new file mode 100644
index 00000000..e6c22852
--- /dev/null
+++ b/.github/workflows/test-chives-foxy.yaml
@@ -0,0 +1,49 @@
+name: test-chives-foxy
+
+on:
+  push:
+    branches:
+      - 'integration'
+
+jobs:
+  docker:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            "UBUNTU_VER=focal"
+            "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
+            "CHIVES_FOXY_BRANCH=1.5.1"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:test
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:test
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 4201aceb..f11a1c67 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -118,6 +118,23 @@
         "discord_url": "https://discord.gg/9aAbYNqjtA",
         "website_url": "https://www.chivescoin.org/"
     },
+    "chives-foxy": {
+        "name": "Chives Foxy",
+        "symbol": "XCC" ,
+        "binary":  "/chives-foxy-blockchain/venv/bin/chives",
+        "network_path": "/root/.chives-foxy/mainnet",
+        "network_name": "mainnet",
+        "network_port": 9699,
+        "farmer_port": 9647,
+        "fullnode_rpc_port": 9755,
+        "worker_port": 8931,
+        "reward": 180.0,
+        "mojos_per_coin": 100000000,
+        "blocks_per_day": 4608,
+        "git_url": "https://github.com/foxypool/chives-blockchain",
+        "discord_url": "https://discord.gg/foxy-582180216747720723",
+        "website_url": "https://chives-og.foxypool.io/"
+    },
     "coffee": {
         "name": "Coffee",
         "symbol": "XCF" ,
@@ -507,4 +524,4 @@
         "discord_url": null,
         "website_url": "http://wheat.top/"
     }
-}
\ No newline at end of file
+}
diff --git a/config/chiadog/chives-foxy.sample.yaml b/config/chiadog/chives-foxy.sample.yaml
new file mode 100644
index 00000000..307e2f36
--- /dev/null
+++ b/config/chiadog/chives-foxy.sample.yaml
@@ -0,0 +1,91 @@
+# This is useful to differentiate multiple
+# instances monitoring multiple harvesters
+notification_title_prefix: '$HOSTNAME-chives-foxy'
+log_level: INFO
+coin_name: 'chives'
+coin_symbol: 'xcc'
+
+# Only one consumer can be enabled at a time, you can
+# delete the section for the consumer which you aren't using
+# DON'T CHANGE file_path IT'S ALREADY SET IN-CONTAINER FOR MACHINARIS!
+chia_logs:
+  file_log_consumer:
+    enable: true
+    prefix: 'chives'
+    file_path: '~/.chives-foxy/mainnet/log/debug.log'
+
+# Enable this and chiadog will ping a remote server every 5 minutes
+# That way you can know that the monitoring is running as expected
+#keep_alive_monitor:
+#  enable_remote_ping: false
+#  ping_url: ''
+
+# Enable this and you'll receive a daily summary notification
+# on your farm performance at the specified time of the day.
+daily_stats:
+  enable: true
+  time_of_day: 21
+
+# We support a lot of notifiers, please check the README for more
+# information. You can delete the sections which you aren't using.
+# You can also enable more than one notifier and send different
+# notifications to each of them. E.g. enable daily_stats only to E-mail.
+# If you enable wallet_events you'll get notifications anytime your
+# wallet receives some XCH (e.g. farming reward).
+notifier:
+  pushover:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      api_token: 'dummy_token'
+      user_key: 'dummy_key'
+  telegram:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      bot_token: 'dummy_bot_token'
+      chat_id: 'dummy_chat_id'
+  smtp:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      sender: 'chives@example.com'
+      sender_name: 'Machinaris'
+      recipient: 'you@example.com'
+      username_smtp: 'username'
+      password_smtp: 'password'
+      host: 'smtp.example.com'
+      port: 587
+  script:
+    # DON'T CHANGE THIS SCRIPT NOTIFIER, IT'S USED BY MACHINARIS!
+    enable: true
+    daily_stats: true
+    wallet_events: true
+    script_path: '/root/.chia/chiadog/notifier.sh'
+  discord:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+      webhook_url: 'https://discord.com/api/webhooks/...'
+  slack:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    credentials:
+     webhook_url: 'https://hooks.slack.com/services/...'
+  mqtt:
+    enable: false
+    daily_stats: true
+    wallet_events: true
+    topic: flax/chivesdog/alert
+    qos: 1
+    retain: false
+    credentials:
+      host: '192.168.0.10'
+      port: 8883
+      username: ''
+      password: ''
diff --git a/docker/dockerfile b/docker/dockerfile
index 20857515..4185df33 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -17,6 +17,7 @@ ARG CACTUS_BRANCH
 ARG CHIA_BRANCH
 ARG CHINILLA_BRANCH
 ARG CHIVES_BRANCH
+ARG CHIVES_FOXY_BRANCH
 ARG COFFEE_BRANCH
 ARG CRYPTODOGE_BRANCH
 ARG ECOSTAKE_BRANCH
@@ -55,6 +56,7 @@ RUN \
 	&& /usr/bin/bash /machinaris/scripts/forks/cactus_install.sh ${CACTUS_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/chia_install.sh ${CHIA_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/chives_install.sh ${CHIVES_BRANCH} \
+	&& /usr/bin/bash /machinaris/scripts/forks/chives_foxy_install.sh ${CHIVES_FOXY_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/chinilla_install.sh ${CHINILLA_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/coffee_install.sh ${COFFEE_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/cryptodoge_install.sh ${CRYPTODOGE_BRANCH} \
@@ -89,11 +91,11 @@ RUN \
 		/var/tmp/*
 
 # Provide a colon-separated list of in-container paths to your mnemonic keys
-ENV keys="/root/.chia/mnemonic.txt"  
+ENV keys="/root/.chia/mnemonic.txt"
 # Provide a colon-separated list of in-container paths to your completed plots
 ENV plots_dir="/plots"
 # One of fullnode, farmer, harvester, plotter, farmer+plotter, harvester+plotter. Default is fullnode
-ENV mode="fullnode" 
+ENV mode="fullnode"
 # The single blockchain to run: chia, flax, nchain, hddcoin, chives, etc
 ENV blockchains="chia"
 # If provided then these optional 3 public keys will be set in your plotman.yaml
diff --git a/scripts/forks/chives_foxy_install.sh b/scripts/forks/chives_foxy_install.sh
new file mode 100644
index 00000000..c53433fc
--- /dev/null
+++ b/scripts/forks/chives_foxy_install.sh
@@ -0,0 +1,24 @@
+#!/bin/env bash
+#
+# Installs Chives as per https://github.com/foxypool/chives-blockchain
+#
+
+CHIVES_FOXY_BRANCH=$1
+
+if [ -z ${CHIVES_FOXY_BRANCH} ]; then
+	echo 'Skipping Chives install as not requested.'
+else
+	git clone --branch ${CHIVES_FOXY_BRANCH} --recurse-submodules https://github.com/foxypool/chives-blockchain.git /chives-foxy-blockchain
+	cd /chives-foxy-blockchain
+	chmod +x install.sh
+	# 2022-07-20: Python needs 'packaging==21.3'
+	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+	/usr/bin/sh ./install.sh
+
+	if [ ! -d /chia-blockchain/venv ]; then
+		cd /
+		rmdir /chia-blockchain
+		ln -s /chives-foxy-blockchain /chia-blockchain
+		ln -s /chives-foxy-blockchain/venv/bin/chives /chia-blockchain/venv/bin/chia
+	fi
+fi
diff --git a/scripts/forks/chives_foxy_launch.sh b/scripts/forks/chives_foxy_launch.sh
new file mode 100644
index 00000000..e0fd0672
--- /dev/null
+++ b/scripts/forks/chives_foxy_launch.sh
@@ -0,0 +1,100 @@
+#!/bin/env bash
+#
+# Initialize Chives Foxy service, depending on mode of system requested
+#
+
+cd /chives-foxy-blockchain
+
+. ./activate
+
+# Only the /root/.chia folder is volume-mounted so store chives within
+mkdir -p /root/.chia/chives-foxy
+rm -f /root/.chives-foxy
+ln -s /root/.chia/chives-foxy /root/.chives-foxy
+
+if [[ "${blockchain_db_download}" == 'true' ]] \
+  && [[ "${mode}" == 'fullnode' ]] \
+  && [[ ! -f /root/.chives-foxy/mainnet/db/blockchain_v1_mainnet.sqlite ]] \
+  && [[ ! -f /root/.chives-foxy/mainnet/db/blockchain_v2_mainnet.sqlite ]]; then
+  echo "Sorry, Chives does not offer a recent blockchain DB for download.  Standard sync will happen over a few days."
+  echo "It is recommended to add some peer node connections on the Connections page of Machinaris."
+fi
+
+mkdir -p /root/.chives-foxy/mainnet/log
+chives init >> /root/.chives-foxy/mainnet/log/init.log 2>&1
+
+echo 'Configuring Chives...'
+if [ -f /root/.chives-foxy/mainnet/config/config.yaml ]; then
+  sed -i 's/log_stdout: true/log_stdout: false/g' /root/.chives-foxy/mainnet/config/config.yaml
+  sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.chives-foxy/mainnet/config/config.yaml
+  sed -i 's/localhost/127.0.0.1/g' /root/.chives-foxy/mainnet/config/config.yaml
+fi
+# Loop over provided list of key paths
+for k in ${keys//:/ }; do
+  if [[ "${k}" == "persistent" ]]; then
+    echo "Not touching key directories."
+  elif [ -s ${k} ]; then
+    echo "Adding key at path: ${k}"
+    chives keys add -f ${k} > /dev/null
+  fi
+done
+
+# Loop over provided list of completed plot directories
+IFS=':' read -r -a array <<< "$plots_dir"
+joined=$(printf ", %s" "${array[@]}")
+echo "Adding plot directories at: ${joined:1}"
+for p in ${plots_dir//:/ }; do
+    chives plots add -d ${p}
+done
+
+# Start services based on mode selected. Default is 'fullnode'
+if [[ ${mode} == 'fullnode' ]]; then
+  for k in ${keys//:/ }; do
+    while [[ "${k}" != "persistent" ]] && [[ ! -s ${k} ]]; do
+      echo 'Waiting for key to be created/imported into mnemonic.txt. See: http://localhost:8926'
+      sleep 10  # Wait 10 seconds before checking for mnemonic.txt presence
+      if [ -s ${k} ]; then
+        chives keys add -f ${k}
+        sleep 10
+      fi
+    done
+  done
+  if [ -f /root/.chia/machinaris/config/wallet_settings.json ]; then
+    chives start farmer-no-wallet
+  else
+    chives start farmer
+  fi
+elif [[ ${mode} =~ ^farmer.* ]]; then
+  if [ ! -f ~/.chives-foxy/mainnet/config/ssl/wallet/public_wallet.key ]; then
+    echo "No wallet key found, so not starting farming services.  Please add your Chia mnemonic.txt to the ~/.machinaris/ folder and restart."
+  else
+    chives start farmer-only
+  fi
+elif [[ ${mode} =~ ^harvester.* ]]; then
+  if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
+    echo "A farmer peer address and port are required."
+    exit
+  else
+    if [ ! -f /root/.chives-foxy/farmer_ca/chives_ca.crt ]; then
+      mkdir -p /root/.chives-foxy/farmer_ca
+      response=$(curl --write-out '%{http_code}' --silent http://${farmer_address}:8931/certificates/?type=chives --output /tmp/certs.zip)
+      if [ $response == '200' ]; then
+        unzip /tmp/certs.zip -d /root/.chives/farmer_ca
+      else
+        echo "Certificates response of ${response} from http://${farmer_address}:8931/certificates/?type=chives.  Is the fork's fullnode container running?"
+      fi
+      rm -f /tmp/certs.zip
+    fi
+    if [[ -f /root/.chives-foxy/farmer_ca/chives_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
+      chives init -c /root/.chives-foxy/farmer_ca 2>&1 > /root/.chives-foxy/mainnet/log/init.log
+    else
+      echo "Did not find your farmer's certificates within /root/.chives-foxy/farmer_ca."
+      echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
+    fi
+    chives configure --set-farmer-peer ${farmer_address}:${farmer_port}
+    chives configure --enable-upnp false
+    chives start harvester -r
+  fi
+elif [[ ${mode} == 'plotter' ]]; then
+    echo "Starting in Plotter-only mode.  Run Plotman from either CLI or WebUI."
+fi
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 4be358e4..79a55a77 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -53,7 +53,7 @@
                     
                     
    
                         
-                        
                     
    
                     
    
@@ -176,6 +176,9 @@
             if (blockchain == 'chives') {
                 return 8931;
             }
+            if (blockchain == 'chives-foxy') {
+                return 8931;
+            }
             if (blockchain == 'coffee') {
                 return 8954;
             }
@@ -270,6 +273,9 @@
             if (blockchain == 'chives') {
                 return 9647;
             }
+            if (blockchain == 'chives-foxy') {
+                return 9647;
+            }
             if (blockchain == 'coffee') {
                 return 33847;
             }
@@ -354,10 +360,10 @@
             for(var i = 0; i < blockchains.length; ++i) {
                 if (blockchains[i].checked) {
                     var blockchain = blockchains[i].value
-                    if (!document.getElementById('mode-harvester').checked && 
+                    if (!document.getElementById('mode-harvester').checked &&
                             document.getElementById('mode-plotter').checked &&
-                            blockchain != "chia" && blockchain != "chives") {
-                        continue;  // Don't add plotter-only containers for forks beyond Chia & Chives
+                            blockchain != "chia" && blockchain != "chives" && blockchain != "chives-foxy") {
+                        continue;  // Don't add plotter-only containers for forks beyond Chia & Chives & Chives-foxy
                     }
                     if (blockchain == "chia") {
                         cmd += "    machinaris:" + line_end;
@@ -393,7 +399,7 @@
                             if (is_first_loop_pass) { // Record error on first pass
                                 if (volume_host_path.endsWith(':')) {
                                     errors.push("{{_('Invalid host path ending with colon. Try adding a slash to the end like this')}} " + volume_host_path + '/');
-                                } 
+                                }
                                 if (!volume_host_path) {
                                     errors.push("{{_('Empty host path provided for volume at ')}}" + volume_container_path + "'. {{_('Please provide a host path.')}}");
                                 } else if (!volume_container_path) {
@@ -403,6 +409,9 @@
                             if ((blockchain == "chives") && ($('#volume_type' + index).val() == 'plots')) {
                                 volume_host_path += '/chives'
                             }
+                            if ((blockchain == "chives-foxy") && ($('#volume_type' + index).val() == 'plots')) {
+                                volume_host_path += '/chives-foxy'
+                            }
                             if ((blockchain == "mmx") && ($('#volume_type' + index).val() == 'plots')) {
                                 volume_host_path += '/mmx'
                             }
@@ -421,7 +430,7 @@
                         var farmer_port = lookup_farmer_port(blockchain);
                         cmd += '            - farmer_port=' + farmer_port + line_end;
                     }
-                    if ((blockchain == "chia" || blockchain == "chives") && (document.getElementById('mode-plotter').checked)) {
+                    if ((blockchain == "chia" || blockchain == "chives" || blockchain == "foxy-chives") && (document.getElementById('mode-plotter').checked)) {
                         if (mode) {
                             mode += ',plotter';
                         }
@@ -479,11 +488,11 @@
             }
             return cmd;
         }
-        function valid_ip_addr(ipaddress) {  
-            if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress)) {  
-                return (true)  
-            }  
-            return (false)  
+        function valid_ip_addr(ipaddress) {
+            if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress)) {
+                return (true)
+            }
+            return (false)
         }
         $(document).ready(function () {
             $('#plotting_keys_row').hide();
@@ -665,6 +674,13 @@ 
    {{_('Machinaris Worker - Launch Config')}}
    
                                 Chives
                             
                         
    
+                        
    
+                            
+                            
+                        
    
                         
    
                             

From 15fd963b62c63d7776938c24926101a377935d79 Mon Sep 17 00:00:00 2001
From: fufar 
Date: Wed, 25 Jan 2023 19:35:16 +0600
Subject: [PATCH 1195/1625] Update CREDITS.md

---
 CREDITS.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index 5fc6b7be..cd9c5a2e 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -32,6 +32,7 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [BTCgreen](https://github.com/BTCgreen-Network/btcgreen-blockchain)
 * [Cactus](https://github.com/Cactus-Network/cactus-blockchain)
 * [Chives](https://github.com/HiveProject2021/chives-blockchain)
+* [Chives-foxy](https://github.com/foxypool/chives-blockchain)
 * [Cryptodoge](https://github.com/CryptoDoge-Network/cryptodoge)
 * [Flax](https://github.com/Flax-Network/flax-blockchain)
 * [Flora](https://github.com/Flora-Network/flora-blockchain)
@@ -44,7 +45,7 @@ A huge thank-you to the great teams/devs behind these projects, being used by Ma
 * [Stor](https://github.com/Stor-Network/stor-blockchain)
 
 ## Other Resources
-* [FD-CLI](https://github.com/Flora-Network/flora-dev-cli) - script to regularly recover 7/8 rewards 
+* [FD-CLI](https://github.com/Flora-Network/flora-dev-cli) - script to regularly recover 7/8 rewards
 * [Chia DB Downloads](https://www.chia-database.com/) - for Chia blockchain database
 * [All the Blocks](https://alltheblocks.net/) - blockchain, wallet, and pricing info
 * [Coin Gecko](https://coingecko.com/) - fiat currency exchange info
@@ -104,4 +105,4 @@ A big thanks to all that contributed with dev and test including:
 * DeathandDestruction
 
 ## 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.*
\ No newline at end of file
+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.*

From 87eef9096eb358b8472031cbb9065ad25ef1ac17 Mon Sep 17 00:00:00 2001
From: fufar 
Date: Wed, 25 Jan 2023 22:06:00 +0600
Subject: [PATCH 1196/1625] Update main-chives-foxy.yaml

---
 .github/workflows/main-chives-foxy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main-chives-foxy.yaml b/.github/workflows/main-chives-foxy.yaml
index 7aeaa9d4..933a9088 100644
--- a/.github/workflows/main-chives-foxy.yaml
+++ b/.github/workflows/main-chives-foxy.yaml
@@ -43,7 +43,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=latest"
-            "CHIVES_FOXY_BRANCH=1.5.1"
+            "CHIVES_FOXY_BRANCH=1.5.3"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:v${{ github.event.inputs.version }}

From 41dc42853b1987d572da28e6318249722c38d8e4 Mon Sep 17 00:00:00 2001
From: fufar 
Date: Wed, 25 Jan 2023 22:06:21 +0600
Subject: [PATCH 1197/1625] Update develop-chives-foxy.yaml

---
 .github/workflows/develop-chives-foxy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop-chives-foxy.yaml b/.github/workflows/develop-chives-foxy.yaml
index a3f98feb..d7f8c38c 100644
--- a/.github/workflows/develop-chives-foxy.yaml
+++ b/.github/workflows/develop-chives-foxy.yaml
@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIVES_FOXY_BRANCH=1.5.1"
+            "CHIVES_FOXY_BRANCH=1.5.3"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:develop

From 4faecb7da4b0a40964f5b11c3730725690e80089 Mon Sep 17 00:00:00 2001
From: fufar 
Date: Wed, 25 Jan 2023 22:06:34 +0600
Subject: [PATCH 1198/1625] Update test-chives-foxy.yaml

---
 .github/workflows/test-chives-foxy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-chives-foxy.yaml b/.github/workflows/test-chives-foxy.yaml
index e6c22852..7cfb8b32 100644
--- a/.github/workflows/test-chives-foxy.yaml
+++ b/.github/workflows/test-chives-foxy.yaml
@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIVES_FOXY_BRANCH=1.5.1"
+            "CHIVES_FOXY_BRANCH=1.5.3"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:test

From c2381f610212982e4e2f55837e8ecf20c860dea3 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 25 Jan 2023 09:54:51 -0700
Subject: [PATCH 1199/1625] Convert tabs to spaces for indentation.

---
 scripts/forks/apple_install.sh           | 34 +++++-----
 scripts/forks/ballcoin_install.sh        | 30 ++++-----
 scripts/forks/bpx_install.sh             | 36 +++++-----
 scripts/forks/cactus_install.sh          | 32 ++++-----
 scripts/forks/chinilla_install.sh        | 34 +++++-----
 scripts/forks/chives_install.sh          | 26 ++++----
 scripts/forks/coffee_install.sh          | 36 +++++-----
 scripts/forks/cryptodoge_install.sh      | 30 ++++-----
 scripts/forks/ecostake_install.sh        | 36 +++++-----
 scripts/forks/flax_install.sh            | 34 +++++-----
 scripts/forks/flora_install.sh           | 36 +++++-----
 scripts/forks/gold_install.sh            | 36 +++++-----
 scripts/forks/greenbtc_install.sh        | 36 +++++-----
 scripts/forks/hddcoin_install.sh         | 34 +++++-----
 scripts/forks/littlelambocoin_install.sh | 34 +++++-----
 scripts/forks/maize_install.sh           | 38 +++++------
 scripts/forks/mint_install.sh            | 36 +++++-----
 scripts/forks/mmx_install.sh             | 42 ++++++------
 scripts/forks/mmx_launch.sh              | 84 ++++++++++++------------
 scripts/forks/moon_install.sh            | 38 +++++------
 scripts/forks/nchain_install.sh          | 32 ++++-----
 scripts/forks/one_install.sh             | 32 ++++-----
 scripts/forks/petroleum_install.sh       | 36 +++++-----
 scripts/forks/pipscoin_install.sh        | 32 ++++-----
 scripts/forks/profit_install.sh          | 36 +++++-----
 scripts/forks/shibgreen_install.sh       | 32 ++++-----
 scripts/forks/silicoin_install.sh        | 36 +++++-----
 scripts/forks/staicoin_install.sh        | 30 ++++-----
 scripts/forks/stor_install.sh            | 34 +++++-----
 scripts/forks/tad_install.sh             | 32 ++++-----
 scripts/forks/wheat_install.sh           | 36 +++++-----
 31 files changed, 555 insertions(+), 555 deletions(-)

diff --git a/scripts/forks/apple_install.sh b/scripts/forks/apple_install.sh
index 48eb6449..1625bca8 100644
--- a/scripts/forks/apple_install.sh
+++ b/scripts/forks/apple_install.sh
@@ -8,24 +8,24 @@ APPLE_BRANCH=$1
 HASH=c4884b2774d1cf4a9ff8816ecd7b4e6676335c2c
 
 if [ -z ${APPLE_BRANCH} ]; then
-	echo 'Skipping Apple install as not requested.'
+    echo 'Skipping Apple install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${APPLE_BRANCH} --single-branch https://github.com/Apple-Network/apple-blockchain.git /apple-blockchain
-	cd /apple-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    rm -rf /root/.cache
+    git clone --branch ${APPLE_BRANCH} --single-branch https://github.com/Apple-Network/apple-blockchain.git /apple-blockchain
+    cd /apple-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' apple/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /apple-blockchain /chia-blockchain
-		ln -s /apple-blockchain/venv/bin/apple /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /apple-blockchain /chia-blockchain
+        ln -s /apple-blockchain/venv/bin/apple /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/ballcoin_install.sh b/scripts/forks/ballcoin_install.sh
index 2a30295e..211ff406 100644
--- a/scripts/forks/ballcoin_install.sh
+++ b/scripts/forks/ballcoin_install.sh
@@ -8,21 +8,21 @@ BALLCOIN_BRANCH=$1
 HASH=1c60346a5f75e9a489a5904db521336fd9d2d769
 
 if [ -z ${BALLCOIN_BRANCH} ]; then
-	echo 'Skipping Ballcoin install as not requested.'
+    echo 'Skipping Ballcoin install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${BALLCOIN_BRANCH} --single-branch https://github.com/ball-network/ballcoin-blockchain.git /ballcoin-blockchain
-	cd /ballcoin-blockchain
-	git submodule update --init mozilla-ca
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${BALLCOIN_BRANCH} --single-branch https://github.com/ball-network/ballcoin-blockchain.git /ballcoin-blockchain
+    cd /ballcoin-blockchain
+    git submodule update --init mozilla-ca
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /ballcoin-blockchain /chia-blockchain
-		ln -s /ballcoin-blockchain/venv/bin/ballcoin /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /ballcoin-blockchain /chia-blockchain
+        ln -s /ballcoin-blockchain/venv/bin/ballcoin /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/bpx_install.sh b/scripts/forks/bpx_install.sh
index 460017ec..d62b194c 100644
--- a/scripts/forks/bpx_install.sh
+++ b/scripts/forks/bpx_install.sh
@@ -8,24 +8,24 @@ BPX_BRANCH=$1
 HASH=9c96494c576e112e093d5c7fbab0db531b12bbf8
 
 if [ -z ${BPX_BRANCH} ]; then
-	echo 'Skipping BPX install as not requested.'
+    echo 'Skipping BPX install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${BPX_BRANCH} --single-branch https://github.com/bpx-network/bpx-blockchain.git /bpx-blockchain
-	cd /bpx-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${BPX_BRANCH} --single-branch https://github.com/bpx-network/bpx-blockchain.git /bpx-blockchain
+    cd /bpx-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /bpx-blockchain /chia-blockchain
-		ln -s /bpx-blockchain/venv/bin/bpx /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /bpx-blockchain /chia-blockchain
+        ln -s /bpx-blockchain/venv/bin/bpx /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index fb5e1787..21b748f4 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -8,23 +8,23 @@ CACTUS_BRANCH=$1
 HASH=1999f8921050bd034b7af46f665e5d268cfb397d
 
 if [ -z ${CACTUS_BRANCH} ]; then
-	echo 'Skipping Cactus install as not requested.'
+    echo 'Skipping Cactus install as not requested.'
 else
-	git clone --branch ${CACTUS_BRANCH} --recurse-submodules https://github.com/Cactus-Network/cactus-blockchain.git /cactus-blockchain 
-	cd /cactus-blockchain 
-	git submodule update --init mozilla-ca
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    git clone --branch ${CACTUS_BRANCH} --recurse-submodules https://github.com/Cactus-Network/cactus-blockchain.git /cactus-blockchain 
+    cd /cactus-blockchain 
+    git submodule update --init mozilla-ca
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' cactus/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /cactus-blockchain /chia-blockchain
-		ln -s /cactus-blockchain/venv/bin/cactus /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /cactus-blockchain /chia-blockchain
+        ln -s /cactus-blockchain/venv/bin/cactus /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/chinilla_install.sh b/scripts/forks/chinilla_install.sh
index 3c830d99..4297eed5 100644
--- a/scripts/forks/chinilla_install.sh
+++ b/scripts/forks/chinilla_install.sh
@@ -8,24 +8,24 @@ CHINILLA_BRANCH=$1
 HASH=de8119eb8e1cc13418e7df30eb7d73aae900c40a
 
 if [ -z ${CHINILLA_BRANCH} ]; then
-	echo 'Skipping Chinilla install as not requested.'
+    echo 'Skipping Chinilla install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${CHINILLA_BRANCH} --single-branch https://github.com/Chinilla/chinilla-blockchain.git /chinilla-blockchain
-	cd /chinilla-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    rm -rf /root/.cache
+    git clone --branch ${CHINILLA_BRANCH} --single-branch https://github.com/Chinilla/chinilla-blockchain.git /chinilla-blockchain
+    cd /chinilla-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' chinilla/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /chinilla-blockchain /chia-blockchain
-		ln -s /chinilla-blockchain/venv/bin/chinilla /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /chinilla-blockchain /chia-blockchain
+        ln -s /chinilla-blockchain/venv/bin/chinilla /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/chives_install.sh b/scripts/forks/chives_install.sh
index 78b1288b..31982360 100644
--- a/scripts/forks/chives_install.sh
+++ b/scripts/forks/chives_install.sh
@@ -6,19 +6,19 @@
 CHIVES_BRANCH=$1
 
 if [ -z ${CHIVES_BRANCH} ]; then
-	echo 'Skipping Chives install as not requested.'
+    echo 'Skipping Chives install as not requested.'
 else
-	git clone --branch ${CHIVES_BRANCH} --recurse-submodules https://github.com/HiveProject2021/chives-blockchain.git /chives-blockchain 
-	cd /chives-blockchain
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    git clone --branch ${CHIVES_BRANCH} --recurse-submodules https://github.com/HiveProject2021/chives-blockchain.git /chives-blockchain 
+    cd /chives-blockchain
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /chives-blockchain /chia-blockchain
-		ln -s /chives-blockchain/venv/bin/chives /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /chives-blockchain /chia-blockchain
+        ln -s /chives-blockchain/venv/bin/chives /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/coffee_install.sh b/scripts/forks/coffee_install.sh
index 86892bea..15481a55 100644
--- a/scripts/forks/coffee_install.sh
+++ b/scripts/forks/coffee_install.sh
@@ -8,24 +8,24 @@ COFFEE_BRANCH=$1
 HASH=0b2678d3d64722e787e6ee35a690ed6503a5d08c
 
 if [ -z ${COFFEE_BRANCH} ]; then
-	echo 'Skipping Coffee install as not requested.'
+    echo 'Skipping Coffee install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${COFFEE_BRANCH} --single-branch https://github.com/Coffee-Network/coffee-blockchain.git /coffee-blockchain
-	cd /coffee-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${COFFEE_BRANCH} --single-branch https://github.com/Coffee-Network/coffee-blockchain.git /coffee-blockchain
+    cd /coffee-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /coffee-blockchain /chia-blockchain
-		ln -s /coffee-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /coffee-blockchain /chia-blockchain
+        ln -s /coffee-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/cryptodoge_install.sh b/scripts/forks/cryptodoge_install.sh
index c2ea961b..623a8329 100644
--- a/scripts/forks/cryptodoge_install.sh
+++ b/scripts/forks/cryptodoge_install.sh
@@ -8,21 +8,21 @@ CRYPTODOGE_BRANCH=$1
 HASH=02ce973fe88d62c0c0ee106d988e172ee3f5aecf
 
 if [ -z ${CRYPTODOGE_BRANCH} ]; then
-	echo 'Skipping Cryptodoge install as not requested.'
+    echo 'Skipping Cryptodoge install as not requested.'
 else
-	git clone --branch ${CRYPTODOGE_BRANCH} --recurse-submodules https://github.com/CryptoDoge-Network/cryptodoge.git /cryptodoge-blockchain 
-	cd /cryptodoge-blockchain
-	git submodule update --init mozilla-ca
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    git clone --branch ${CRYPTODOGE_BRANCH} --recurse-submodules https://github.com/CryptoDoge-Network/cryptodoge.git /cryptodoge-blockchain 
+    cd /cryptodoge-blockchain
+    git submodule update --init mozilla-ca
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /cryptodoge-blockchain /chia-blockchain
-		ln -s /cryptodoge-blockchain/venv/bin/cryptodoge /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /cryptodoge-blockchain /chia-blockchain
+        ln -s /cryptodoge-blockchain/venv/bin/cryptodoge /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/ecostake_install.sh b/scripts/forks/ecostake_install.sh
index fafb9c45..4a090fa5 100644
--- a/scripts/forks/ecostake_install.sh
+++ b/scripts/forks/ecostake_install.sh
@@ -8,24 +8,24 @@ ECOSTAKE_BRANCH=$1
 HASH=8ea8bb9743c7caccb2f8c670853d93ee12d00c86
 
 if [ -z ${ECOSTAKE_BRANCH} ]; then
-	echo 'Skipping Ecostake install as not requested.'
+    echo 'Skipping Ecostake install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${ECOSTAKE_BRANCH} --single-branch https://github.com/ecostake-network/ecostake-blockchain /ecostake-blockchain
-	cd /ecostake-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${ECOSTAKE_BRANCH} --single-branch https://github.com/ecostake-network/ecostake-blockchain /ecostake-blockchain
+    cd /ecostake-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /ecostake-blockchain /chia-blockchain
-		ln -s /ecostake-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /ecostake-blockchain /chia-blockchain
+        ln -s /ecostake-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/flax_install.sh b/scripts/forks/flax_install.sh
index b0900e94..1aff10de 100644
--- a/scripts/forks/flax_install.sh
+++ b/scripts/forks/flax_install.sh
@@ -8,24 +8,24 @@ FLAX_BRANCH=$1
 HASH=bb8715f3155bb8011a04cc8c05b3fa8133e4c64b
 
 if [ -z ${FLAX_BRANCH} ]; then
-	echo 'Skipping Flax install as not requested.'
+    echo 'Skipping Flax install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${FLAX_BRANCH} --single-branch https://github.com/Flax-Network/flax-blockchain.git /flax-blockchain
-	cd /flax-blockchain
-	git checkout $HASH
-	git submodule update --init mozilla-ca
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    rm -rf /root/.cache
+    git clone --branch ${FLAX_BRANCH} --single-branch https://github.com/Flax-Network/flax-blockchain.git /flax-blockchain
+    cd /flax-blockchain
+    git checkout $HASH
+    git submodule update --init mozilla-ca
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' flax/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /flax-blockchain /chia-blockchain
-		ln -s /flax-blockchain/venv/bin/flax /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /flax-blockchain /chia-blockchain
+        ln -s /flax-blockchain/venv/bin/flax /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/flora_install.sh b/scripts/forks/flora_install.sh
index 560eba93..53a0bd09 100644
--- a/scripts/forks/flora_install.sh
+++ b/scripts/forks/flora_install.sh
@@ -8,24 +8,24 @@ FLORA_BRANCH=$1
 HASH=f4da13dd7160de772ea5daa333984bed3882e84c
 
 if [ -z ${FLORA_BRANCH} ]; then
-	echo 'Skipping Flora install as not requested.'
+    echo 'Skipping Flora install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${FLORA_BRANCH} --single-branch https://github.com/Flora-Network/flora-blockchain.git /flora-blockchain
-	cd /flora-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${FLORA_BRANCH} --single-branch https://github.com/Flora-Network/flora-blockchain.git /flora-blockchain
+    cd /flora-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /flora-blockchain /chia-blockchain
-		ln -s /flora-blockchain/venv/bin/flora /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /flora-blockchain /chia-blockchain
+        ln -s /flora-blockchain/venv/bin/flora /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/gold_install.sh b/scripts/forks/gold_install.sh
index 381c91b7..def21e07 100644
--- a/scripts/forks/gold_install.sh
+++ b/scripts/forks/gold_install.sh
@@ -8,24 +8,24 @@ GOLD_BRANCH=$1
 HASH=8f3bd229813a820e4b9d2e4cd69a28c00c27b7d2
 
 if [ -z ${GOLD_BRANCH} ]; then
-	echo 'Skipping Gold install as not requested.'
+    echo 'Skipping Gold install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${GOLD_BRANCH} --single-branch https://github.com/goldcoin-gl/gold-blockchain.git /gold-blockchain
-	cd /gold-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${GOLD_BRANCH} --single-branch https://github.com/goldcoin-gl/gold-blockchain.git /gold-blockchain
+    cd /gold-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /gold-blockchain /chia-blockchain
-		ln -s /gold-blockchain/venv/bin/gold /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /gold-blockchain /chia-blockchain
+        ln -s /gold-blockchain/venv/bin/gold /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/greenbtc_install.sh b/scripts/forks/greenbtc_install.sh
index ec56f299..347bf168 100644
--- a/scripts/forks/greenbtc_install.sh
+++ b/scripts/forks/greenbtc_install.sh
@@ -8,24 +8,24 @@ GREENBTC_BRANCH=$1
 HASH=e14bc12696af1cbcdf89a3e7bea0cdb1dd0e89ad
 
 if [ -z ${GREENBTC_BRANCH} ]; then
-	echo 'Skipping GreenBTC install as not requested.'
+    echo 'Skipping GreenBTC install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${GREENBTC_BRANCH} --single-branch https://github.com/greenbtc/greenbtc-blockchain.git /greenbtc-blockchain
-	cd /greenbtc-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${GREENBTC_BRANCH} --single-branch https://github.com/greenbtc/greenbtc-blockchain.git /greenbtc-blockchain
+    cd /greenbtc-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /greenbtc-blockchain /chia-blockchain
-		ln -s /greenbtc-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /greenbtc-blockchain /chia-blockchain
+        ln -s /greenbtc-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/hddcoin_install.sh b/scripts/forks/hddcoin_install.sh
index 8c8ac76a..68a1d03e 100644
--- a/scripts/forks/hddcoin_install.sh
+++ b/scripts/forks/hddcoin_install.sh
@@ -8,23 +8,23 @@ HDDCOIN_BRANCH=$1
 HASH=42403754da1d819632b0442964eabc2962e30484
 
 if [ -z ${HDDCOIN_BRANCH} ]; then
-	echo 'Skipping HDDCoin install as not requested.'
+    echo 'Skipping HDDCoin install as not requested.'
 else
-	git clone --branch ${HDDCOIN_BRANCH} --recurse-submodules https://github.com/HDDcoin-Network/hddcoin-blockchain.git /hddcoin-blockchain
-	cd /hddcoin-blockchain
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    git clone --branch ${HDDCOIN_BRANCH} --recurse-submodules https://github.com/HDDcoin-Network/hddcoin-blockchain.git /hddcoin-blockchain
+    cd /hddcoin-blockchain
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /hddcoin-blockchain /chia-blockchain
-		ln -s /hddcoin-blockchain/venv/bin/hddcoin /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /hddcoin-blockchain /chia-blockchain
+        ln -s /hddcoin-blockchain/venv/bin/hddcoin /chia-blockchain/venv/bin/chia
+    fi
 fi
\ No newline at end of file
diff --git a/scripts/forks/littlelambocoin_install.sh b/scripts/forks/littlelambocoin_install.sh
index b55be8d6..b73bbc82 100644
--- a/scripts/forks/littlelambocoin_install.sh
+++ b/scripts/forks/littlelambocoin_install.sh
@@ -8,24 +8,24 @@ LITTLELAMBOCOIN_BRANCH=$1
 HASH=a656e0d3478773a38ac4959a611b5d064bb22cb5
 
 if [ -z ${LITTLELAMBOCOIN_BRANCH} ]; then
-	echo 'Skipping LittleLamboCoin install as not requested.'
+    echo 'Skipping LittleLamboCoin install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${LITTLELAMBOCOIN_BRANCH} --single-branch https://github.com/BTCgreen-Network/littlelambocoin-blockchain /littlelambocoin-blockchain
-	cd /littlelambocoin-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    rm -rf /root/.cache
+    git clone --branch ${LITTLELAMBOCOIN_BRANCH} --single-branch https://github.com/BTCgreen-Network/littlelambocoin-blockchain /littlelambocoin-blockchain
+    cd /littlelambocoin-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' littlelambocoin/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /littlelambocoin-blockchain /chia-blockchain
-		ln -s /littlelambocoin-blockchain/venv/bin/littlelambocoin /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /littlelambocoin-blockchain /chia-blockchain
+        ln -s /littlelambocoin-blockchain/venv/bin/littlelambocoin /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/maize_install.sh b/scripts/forks/maize_install.sh
index 31ea8b10..4af7a2ed 100644
--- a/scripts/forks/maize_install.sh
+++ b/scripts/forks/maize_install.sh
@@ -8,26 +8,26 @@ MAIZE_BRANCH=$1
 HASH=1530e15a5fba769f9387508e842121daca5d44e2
 
 if [ -z ${MAIZE_BRANCH} ]; then
-	echo 'Skipping Maize install as not requested.'
+    echo 'Skipping Maize install as not requested.'
 else
-	cd /
-	rm -rf /root/.cache
-	git clone --branch ${MAIZE_BRANCH} --single-branch https://github.com/Maize-Network/maize-blockchain.git /maize-blockchain
-	cd /maize-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	pwd
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    cd /
+    rm -rf /root/.cache
+    git clone --branch ${MAIZE_BRANCH} --single-branch https://github.com/Maize-Network/maize-blockchain.git /maize-blockchain
+    cd /maize-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    pwd
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' maize/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /maize-blockchain /chia-blockchain
-		ln -s /maize-blockchain/venv/bin/maize /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /maize-blockchain /chia-blockchain
+        ln -s /maize-blockchain/venv/bin/maize /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/mint_install.sh b/scripts/forks/mint_install.sh
index 07e9456c..c9a261aa 100644
--- a/scripts/forks/mint_install.sh
+++ b/scripts/forks/mint_install.sh
@@ -8,24 +8,24 @@ MINT_BRANCH=$1
 HASH=65ec05a015a07664ed25f83efa736065a17f7d7a
 
 if [ -z ${MINT_BRANCH} ]; then
-	echo 'Skipping Mint install as not requested.'
+    echo 'Skipping Mint install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${MINT_BRANCH} --single-branch https://github.com/MintNetwork/mint-blockchain.git /mint-blockchain
-	cd /mint-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${MINT_BRANCH} --single-branch https://github.com/MintNetwork/mint-blockchain.git /mint-blockchain
+    cd /mint-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /mint-blockchain /chia-blockchain
-		ln -s /mint-blockchain/venv/bin/mint /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /mint-blockchain /chia-blockchain
+        ln -s /mint-blockchain/venv/bin/mint /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 0b51f654..10b99677 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -7,28 +7,28 @@
 MMX_BRANCH=$1
 
 if [ -z ${MMX_BRANCH} ]; then
-	echo 'Skipping MMX install as not requested.'
+    echo 'Skipping MMX install as not requested.'
 else
-	rm -rf /root/.cache
-	apt-get update
-	# Install dependencies for MMX and GPU support
-	apt-get install -y git cmake build-essential libsecp256k1-dev libsodium-dev libminiupnpc-dev libjemalloc-dev zlib1g-dev ocl-icd-opencl-dev clinfo screen
-	apt-get install -y initramfs-tools ocl-icd-libopencl1 opencl-headers apt-utils libnuma1
-	# For AMDGPU, install the amdgpu-install stub, optionally invoked later if OPENCL_GPU=amd at launch time
-	curl -O http://repo.radeon.com/amdgpu-install/22.20.5/ubuntu/jammy/amdgpu-install_22.20.50205-1_all.deb
-	apt-get install -y ./amdgpu-install_22.20.50205-1_all.deb
-	# Clone and install MMX from the author's own binaries, not linked to his code branches unfortunately
-	pushd /tmp
-	git clone --depth 1 --filter=blob:none --sparse https://github.com/madMAx43v3r/mmx-binaries.git
-	pushd mmx-binaries/
-	git sparse-checkout set mmx-node/linux/x86_64/
-	pushd mmx-node/linux
-	mv x86_64 /mmx-node
-	popd
-	rm -f mmx-binaries
-	popd
-	tee /etc/ld.so.conf.d/30-mmx.conf >/dev/null </dev/null </dev/null </dev/null < /root/.chia/mmx/config/local/timelord
+    # For a fresh install of Machinaris-MMX, disable timelord by default to save CPU usage
+    echo false > /root/.chia/mmx/config/local/timelord
 fi
 escaped_plot_dirs=$(printf '%s\n' "$plot_dirs" | sed -e 's/[\/&]/\\&/g')
 sed -i "s/\"plot_dirs\":.*$/\"plot_dirs\": [ $escaped_plot_dirs ]/g" /root/.chia/mmx/config/local/Harvester.json
@@ -37,62 +37,62 @@ if [[ ${OPENCL_GPU} == 'nvidia' ]]; then
     echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
     echo "Enabling Nvidia GPU support inside this container."
 elif [[ ${OPENCL_GPU} == 'amd' ]]; then
-	pushd /tmp > /dev/null
+    pushd /tmp > /dev/null
   echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-	apt-get update 2>&1 > /tmp/amdgpu_setup.log
-	amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula 2>&1 >> /tmp/amdgpu_setup.log
-	popd > /dev/null
+    apt-get update 2>&1 > /tmp/amdgpu_setup.log
+    amdgpu-install -y --usecase=opencl --opencl=rocr --no-dkms --no-32 --accept-eula 2>&1 >> /tmp/amdgpu_setup.log
+    popd > /dev/null
   echo "Enabling AMD GPU support inside this container."
 elif [[ ${OPENCL_GPU} == 'intel' ]]; then
-	apt-get update 2>&1 > /tmp/intelgpu_setup.log
-	apt-get install -y intel-opencl-icd 2>&1 >> /tmp/intelgpu_setup.log
+    apt-get update 2>&1 > /tmp/intelgpu_setup.log
+    apt-get install -y intel-opencl-icd 2>&1 >> /tmp/intelgpu_setup.log
   echo "Enabling Intel GPU support inside this container."
 else
-	echo "No OPENCL_GPU provided.  MMX blockchain will use use CPU instead."
+    echo "No OPENCL_GPU provided.  MMX blockchain will use use CPU instead."
 fi
 
 echo 'testnet9' > /root/.chia/mmx/NETWORK
 
 # Symlink the testnet9 folder
 if [ ! -d /root/.chia/mmx/testnet9 ]; then
-	mkdir /root/.chia/mmx/testnet9
+    mkdir /root/.chia/mmx/testnet9
 fi
 
 # Create a key if none found from previous runs
 if [[ ${mode} == 'fullnode' ]]; then
-	if [ ! -f /root/.chia/mmx/wallet.dat ]; then
-		echo "Creating key at path: /root/.chia/mmx/wallet.dat"
-		mmx wallet create
-	else
-		echo "Adding key at path: /root/.chia/mmx/wallet.dat"
-	fi
-	# Setup log rotation
-	tee /etc/logrotate.d/mmx-node >/dev/null </dev/null </root/.chia/mmx/logs/mmx_node.log 2>&1 &
+    # Now start the MMX node
+    ./run_node.sh >/root/.chia/mmx/logs/mmx_node.log 2>&1 &
 elif [[ ${mode} =~ ^farmer.* ]]; then
-	# Setup log rotation
-	tee /etc/logrotate.d/mmx-farmer >/dev/null </dev/null </root/.chia/mmx/logs/mmx_farmer.log 2>&1 &
+    ./run_farmer.sh -n ${node_address}:11330 >/root/.chia/mmx/logs/mmx_farmer.log 2>&1 &
 elif [[ ${mode} =~ ^harvester.* ]]; then
-	# Setup log rotation
-	tee /etc/logrotate.d/mmx-harvester >/dev/null </dev/null </root/.chia/mmx/logs/mmx_harvester.log 2>&1 &
+    ./run_harvester.sh -n ${farmer_address}:11330 >/root/.chia/mmx/logs/mmx_harvester.log 2>&1 &
 elif [[ ${mode} == 'plotter' ]]; then
     echo "Starting in Plotter-only mode.  Run Plotman from either CLI or WebUI."
 fi
diff --git a/scripts/forks/moon_install.sh b/scripts/forks/moon_install.sh
index 8dcc99e3..4e7c1ed5 100644
--- a/scripts/forks/moon_install.sh
+++ b/scripts/forks/moon_install.sh
@@ -7,26 +7,26 @@ MOON_BRANCH=$1
 HASH=dbb7e66d4cb1af20caa3d8f3dc883a345d7643e3
 
 if [ -z ${MOON_BRANCH} ]; then
-	echo 'Skipping Moon install as not requested.'
+    echo 'Skipping Moon install as not requested.'
 else
-	cd /
-	rm -rf /root/.cache
-	git clone --branch ${MOON_BRANCH} --single-branch https://github.com/MOONCOINTEAM/moon-blockchain.git /moon-blockchain
-	cd /moon-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	pwd
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    cd /
+    rm -rf /root/.cache
+    git clone --branch ${MOON_BRANCH} --single-branch https://github.com/MOONCOINTEAM/moon-blockchain.git /moon-blockchain
+    cd /moon-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    pwd
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' moon/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /moon-blockchain /chia-blockchain
-		ln -s /moon-blockchain/venv/bin/moon /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /moon-blockchain /chia-blockchain
+        ln -s /moon-blockchain/venv/bin/moon /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/nchain_install.sh b/scripts/forks/nchain_install.sh
index 7a7c6f65..de42a5ee 100644
--- a/scripts/forks/nchain_install.sh
+++ b/scripts/forks/nchain_install.sh
@@ -10,22 +10,22 @@ NCHAIN_BRANCH=$1
 HASH=3c51a0bc6ee3930b40296a75dccf0ad8daab3a68
 
 if [ -z ${NCHAIN_BRANCH} ]; then
-	echo 'Skipping NChain install as not requested.'
+    echo 'Skipping NChain install as not requested.'
 else
-	git clone --branch ${NCHAIN_BRANCH} --recurse-submodules https://gitee.com/ext9/ext9-blockchain.git /ext9-blockchain 
-	cd /ext9-blockchain
-	git submodule update --init mozilla-ca
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    git clone --branch ${NCHAIN_BRANCH} --recurse-submodules https://gitee.com/ext9/ext9-blockchain.git /ext9-blockchain 
+    cd /ext9-blockchain
+    git submodule update --init mozilla-ca
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /ext9-blockchain /chia-blockchain
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /ext9-blockchain /chia-blockchain
+    fi
 fi
\ No newline at end of file
diff --git a/scripts/forks/one_install.sh b/scripts/forks/one_install.sh
index a479b93b..295ba332 100644
--- a/scripts/forks/one_install.sh
+++ b/scripts/forks/one_install.sh
@@ -8,23 +8,23 @@ ONE_BRANCH=$1
 HASH=29854541a4a6b2b9bc4d423302642e10ddf8fc77
 
 if [ -z ${ONE_BRANCH} ]; then
-	echo 'Skipping One install as not requested.'
+    echo 'Skipping One install as not requested.'
 else
-	git clone --branch ${ONE_BRANCH} --recurse-submodules https://github.com/xone-network/one-blockchain.git /one-blockchain 
-	cd /one-blockchain 
-	git submodule update --init mozilla-ca
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    git clone --branch ${ONE_BRANCH} --recurse-submodules https://github.com/xone-network/one-blockchain.git /one-blockchain 
+    cd /one-blockchain 
+    git submodule update --init mozilla-ca
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' one/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /one-blockchain /chia-blockchain
-		ln -s /one-blockchain/venv/bin/one /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /one-blockchain /chia-blockchain
+        ln -s /one-blockchain/venv/bin/one /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/petroleum_install.sh b/scripts/forks/petroleum_install.sh
index b8e166bb..4a24cb55 100644
--- a/scripts/forks/petroleum_install.sh
+++ b/scripts/forks/petroleum_install.sh
@@ -8,24 +8,24 @@ PETROLEUM_BRANCH=$1
 HASH=8fae07695353b4e7fb7d861ab747b04aebab176c
 
 if [ -z ${PETROLEUM_BRANCH} ]; then
-	echo 'Skipping Petroleum install as not requested.'
+    echo 'Skipping Petroleum install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${PETROLEUM_BRANCH} --single-branch https://github.com/petroleum-network/petroleum-blockchain /petroleum-blockchain
-	cd /petroleum-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${PETROLEUM_BRANCH} --single-branch https://github.com/petroleum-network/petroleum-blockchain /petroleum-blockchain
+    cd /petroleum-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /petroleum-blockchain /chia-blockchain
-		ln -s /petroleum-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /petroleum-blockchain /chia-blockchain
+        ln -s /petroleum-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/pipscoin_install.sh b/scripts/forks/pipscoin_install.sh
index 7821dcf5..87bd034f 100644
--- a/scripts/forks/pipscoin_install.sh
+++ b/scripts/forks/pipscoin_install.sh
@@ -8,23 +8,23 @@ PIPSCOIN_BRANCH=$1
 HASH=3017cde5f8c463f5e494c5c1e258dd2bf8281fee
 
 if [ -z ${PIPSCOIN_BRANCH} ]; then
-	echo 'Skipping Pipscoin install as not requested.'
+    echo 'Skipping Pipscoin install as not requested.'
 else
-	git clone --branch ${PIPSCOIN_BRANCH} --recurse-submodules https://github.com/Pipscoin-Network/pipscoin-blockchain.git /pipscoin-blockchain 
-	cd /pipscoin-blockchain 
-	git submodule update --init mozilla-ca
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	# Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
+    git clone --branch ${PIPSCOIN_BRANCH} --recurse-submodules https://github.com/Pipscoin-Network/pipscoin-blockchain.git /pipscoin-blockchain 
+    cd /pipscoin-blockchain 
+    git submodule update --init mozilla-ca
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -e 's/^        self.log.debug($/        self.log.info(/g' pipscoin/wallet/wallet_state_manager.py
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /pipscoin-blockchain /chia-blockchain
-		ln -s /pipscoin-blockchain/venv/bin/pipscoin /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /pipscoin-blockchain /chia-blockchain
+        ln -s /pipscoin-blockchain/venv/bin/pipscoin /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/profit_install.sh b/scripts/forks/profit_install.sh
index 8b7d4af2..0f417c12 100644
--- a/scripts/forks/profit_install.sh
+++ b/scripts/forks/profit_install.sh
@@ -8,24 +8,24 @@ PROFIT_BRANCH=$1
 HASH=966811500810a0dcbf13a8e02f507b9449bb418c
 
 if [ -z ${PROFIT_BRANCH} ]; then
-	echo 'Skipping Profit install as not requested.'
+    echo 'Skipping Profit install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${PROFIT_BRANCH} --single-branch https://github.com/ProfitCrypto/profit-blockchain /profit-blockchain
-	cd /profit-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${PROFIT_BRANCH} --single-branch https://github.com/ProfitCrypto/profit-blockchain /profit-blockchain
+    cd /profit-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /profit-blockchain /chia-blockchain
-		ln -s /profit-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /profit-blockchain /chia-blockchain
+        ln -s /profit-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/shibgreen_install.sh b/scripts/forks/shibgreen_install.sh
index e7ff30a6..6b8c2807 100644
--- a/scripts/forks/shibgreen_install.sh
+++ b/scripts/forks/shibgreen_install.sh
@@ -8,27 +8,27 @@ SHIBGREEN_BRANCH=$1
 HASH=21ad1e45aa722bb3382d824d872ebbad26487cf3
 
 if [ -z ${SHIBGREEN_BRANCH} ]; then
-	echo 'Skipping SHIBGreen install as not requested.'
+    echo 'Skipping SHIBGreen install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${SHIBGREEN_BRANCH} --single-branch https://github.com/BTCgreen-Network/shibgreen-blockchain /shibgreen-blockchain
-	cd /shibgreen-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
+    rm -rf /root/.cache
+    git clone --branch ${SHIBGREEN_BRANCH} --single-branch https://github.com/BTCgreen-Network/shibgreen-blockchain /shibgreen-blockchain
+    cd /shibgreen-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
 
     # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -i -e 's/^        self.log.debug($/        self.log.info(/g' shibgreen/wallet/wallet_state_manager.py
 
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
 
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /shibgreen-blockchain /chia-blockchain
-		ln -s /shibgreen-blockchain/venv/bin/shibgreen /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /shibgreen-blockchain /chia-blockchain
+        ln -s /shibgreen-blockchain/venv/bin/shibgreen /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/silicoin_install.sh b/scripts/forks/silicoin_install.sh
index 38ff0d8e..94eed494 100644
--- a/scripts/forks/silicoin_install.sh
+++ b/scripts/forks/silicoin_install.sh
@@ -8,24 +8,24 @@ SILICOIN_BRANCH=$1
 HASH=ebe7880e24b22d8f3bf8d0c8b31ad5397b3e7af3
 
 if [ -z ${SILICOIN_BRANCH} ]; then
-	echo 'Skipping Silicoin install as not requested.'
+    echo 'Skipping Silicoin install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${SILICOIN_BRANCH} --single-branch https://github.com/silicoin-network/silicoin-blockchain /silicoin-blockchain
-	cd /silicoin-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${SILICOIN_BRANCH} --single-branch https://github.com/silicoin-network/silicoin-blockchain /silicoin-blockchain
+    cd /silicoin-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /silicoin-blockchain /chia-blockchain
-		ln -s /silicoin-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /silicoin-blockchain /chia-blockchain
+        ln -s /silicoin-blockchain/venv/bin/sit /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/staicoin_install.sh b/scripts/forks/staicoin_install.sh
index 7ae7f81a..2100bc9c 100644
--- a/scripts/forks/staicoin_install.sh
+++ b/scripts/forks/staicoin_install.sh
@@ -8,21 +8,21 @@ STAICOIN_BRANCH=$1
 HASH=60b6a001795af56ed1b2fc6e464cdc10884193a1
 
 if [ -z ${STAICOIN_BRANCH} ]; then
-	echo 'Skipping Staicoin install as not requested.'
+    echo 'Skipping Staicoin install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${STAICOIN_BRANCH} --single-branch https://github.com/STATION-I/staicoin-blockchain.git /staicoin-blockchain
-	cd /staicoin-blockchain
-	git submodule update --init mozilla-ca
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${STAICOIN_BRANCH} --single-branch https://github.com/STATION-I/staicoin-blockchain.git /staicoin-blockchain
+    cd /staicoin-blockchain
+    git submodule update --init mozilla-ca
+    chmod +x install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /staicoin-blockchain /chia-blockchain
-		ln -s /staicoin-blockchain/venv/bin/staicoin /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /staicoin-blockchain /chia-blockchain
+        ln -s /staicoin-blockchain/venv/bin/staicoin /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/stor_install.sh b/scripts/forks/stor_install.sh
index 6759ffbe..a40efd6d 100644
--- a/scripts/forks/stor_install.sh
+++ b/scripts/forks/stor_install.sh
@@ -8,23 +8,23 @@ STOR_BRANCH=$1
 HASH=3c3cd1a3b99592e88160107ca5b81afc0937b992
 
 if [ -z ${STOR_BRANCH} ]; then
-	echo 'Skipping Stor install as not requested.'
+    echo 'Skipping Stor install as not requested.'
 else
-	git clone --branch ${STOR_BRANCH} --recurse-submodules https://github.com/Stor-Network/stor-blockchain.git /stor-blockchain 
-	cd /stor-blockchain
-	git submodule update --init mozilla-ca
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    git clone --branch ${STOR_BRANCH} --recurse-submodules https://github.com/Stor-Network/stor-blockchain.git /stor-blockchain 
+    cd /stor-blockchain
+    git submodule update --init mozilla-ca
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /stor-blockchain /chia-blockchain
-		ln -s /stor-blockchain/venv/bin/stor /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /stor-blockchain /chia-blockchain
+        ln -s /stor-blockchain/venv/bin/stor /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/tad_install.sh b/scripts/forks/tad_install.sh
index a3f10cbe..9c798a79 100644
--- a/scripts/forks/tad_install.sh
+++ b/scripts/forks/tad_install.sh
@@ -8,27 +8,27 @@ TAD_BRANCH=$1
 HASH=177cf628f94a023549cbb955b49a1cf857c73851
 
 if [ -z ${TAD_BRANCH} ]; then
-	echo 'Skipping Tad install as not requested.'
+    echo 'Skipping Tad install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${TAD_BRANCH} --single-branch https://github.com/BTCgreen-Network/tad-blockchain.git /tad-blockchain
-	cd /tad-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
+    rm -rf /root/.cache
+    git clone --branch ${TAD_BRANCH} --single-branch https://github.com/BTCgreen-Network/tad-blockchain.git /tad-blockchain
+    cd /tad-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
 
     # Log "Added Coins" at info, not debug level.  See: https://github.com/Chia-Network/chia-blockchain/issues/11955
     sed -i -e 's/^        self.log.debug($/        self.log.info(/g' tad/wallet/wallet_state_manager.py
 
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
 
-	/usr/bin/sh ./install.sh
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /tad-blockchain /chia-blockchain
-		ln -s /tad-blockchain/venv/bin/tad /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /tad-blockchain /chia-blockchain
+        ln -s /tad-blockchain/venv/bin/tad /chia-blockchain/venv/bin/chia
+    fi
 fi
diff --git a/scripts/forks/wheat_install.sh b/scripts/forks/wheat_install.sh
index 9bf5fc46..376681ec 100644
--- a/scripts/forks/wheat_install.sh
+++ b/scripts/forks/wheat_install.sh
@@ -8,24 +8,24 @@ WHEAT_BRANCH=$1
 HASH=07f451a4d124f714246391585c00c79332840759
 
 if [ -z ${WHEAT_BRANCH} ]; then
-	echo 'Skipping Wheat install as not requested.'
+    echo 'Skipping Wheat install as not requested.'
 else
-	rm -rf /root/.cache
-	git clone --branch ${WHEAT_BRANCH} --single-branch https://github.com/wheatnetwork/wheat-blockchain.git /wheat-blockchain
-	cd /wheat-blockchain 
-	git submodule update --init mozilla-ca 
-	git checkout $HASH
-	chmod +x install.sh
-	# 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
-	sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
+    rm -rf /root/.cache
+    git clone --branch ${WHEAT_BRANCH} --single-branch https://github.com/wheatnetwork/wheat-blockchain.git /wheat-blockchain
+    cd /wheat-blockchain 
+    git submodule update --init mozilla-ca 
+    git checkout $HASH
+    chmod +x install.sh
+    # 2022-01-30: pip broke due to https://github.com/pypa/pip/issues/10825
+    sed -i 's/upgrade\ pip$/upgrade\ "pip<22.0"/' install.sh
+    # 2022-07-20: Python needs 'packaging==21.3'
+    sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
+    /usr/bin/sh ./install.sh
 
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /wheat-blockchain /chia-blockchain
-		ln -s /wheat-blockchain/venv/bin/wheat /chia-blockchain/venv/bin/chia
-	fi
+    if [ ! -d /chia-blockchain/venv ]; then
+        cd /
+        rmdir /chia-blockchain
+        ln -s /wheat-blockchain /chia-blockchain
+        ln -s /wheat-blockchain/venv/bin/wheat /chia-blockchain/venv/bin/chia
+    fi
 fi

From a87a396465f7d43ebdc483adbaf143fdc22c3f1c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 25 Jan 2023 14:25:07 -0700
Subject: [PATCH 1200/1625] Initial support for the FoxyPool fork of Chives.

---
 .github/workflows/develop-chives-foxy.yaml |  50 -----------
 .github/workflows/develop-chives.yaml      |  48 +++++++++-
 .github/workflows/main-chives-foxy.yaml    |  51 -----------
 .github/workflows/main-chives.yaml         |  47 +++++++++-
 .github/workflows/test-chives-foxy.yaml    |  49 ----------
 .github/workflows/test-chives.yaml         |  46 +++++++++-
 common/config/blockchains.json             |  17 ----
 config/chiadog/chives-foxy.sample.yaml     |  91 -------------------
 docker/dockerfile                          |   5 +-
 scripts/forks/chives_foxy_launch.sh        | 100 ---------------------
 scripts/forks/chives_install.sh            |   6 +-
 web/templates/worker_launch.html           |  24 ++---
 12 files changed, 151 insertions(+), 383 deletions(-)
 delete mode 100644 .github/workflows/develop-chives-foxy.yaml
 delete mode 100644 .github/workflows/main-chives-foxy.yaml
 delete mode 100644 .github/workflows/test-chives-foxy.yaml
 delete mode 100644 config/chiadog/chives-foxy.sample.yaml
 delete mode 100644 scripts/forks/chives_foxy_launch.sh

diff --git a/.github/workflows/develop-chives-foxy.yaml b/.github/workflows/develop-chives-foxy.yaml
deleted file mode 100644
index d7f8c38c..00000000
--- a/.github/workflows/develop-chives-foxy.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: develop-chives-foxy
-
-on:
-  push:
-    branches:
-      - 'develop'
-
-jobs:
-  docker:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64
-          push: true
-          build-args: |
-            "UBUNTU_VER=focal"
-            "MACHINARIS_STREAM=develop"
-            "CHIADOG_BRANCH=dev"
-            "CHIVES_FOXY_BRANCH=1.5.3"
-            "PLOTMAN_BRANCH=development"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:develop
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:develop
diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
index 7342d5ee..8a3e6fa2 100644
--- a/.github/workflows/develop-chives.yaml
+++ b/.github/workflows/develop-chives.yaml
@@ -6,7 +6,8 @@ on:
       - 'develop'
 
 jobs:
-  docker:
+
+  chives:
     runs-on: ubuntu-20.04
     steps:
       -
@@ -43,8 +44,53 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
+            "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop
+
+  chivesfoxy:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            "UBUNTU_VER=focal"
+            "MACHINARIS_STREAM=develop"
+            "CHIADOG_BRANCH=dev"
+            "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
+            "CHIVES_BRANCH=main"
+            "PLOTMAN_BRANCH=development"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:develop
diff --git a/.github/workflows/main-chives-foxy.yaml b/.github/workflows/main-chives-foxy.yaml
deleted file mode 100644
index 933a9088..00000000
--- a/.github/workflows/main-chives-foxy.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: release-chives-foxy
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release Version'
-
-jobs:
-  docker:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          build-args: |
-            "UBUNTU_VER=focal"
-            "MACHINARIS_STREAM=latest"
-            "CHIVES_FOXY_BRANCH=1.5.3"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:latest
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:v${{ github.event.inputs.version }}
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:latest
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 95ff811f..55f9f588 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -7,7 +7,7 @@ on:
         description: 'Release Version' 
 
 jobs:
-  docker:
+  chives:
     runs-on: ubuntu-20.04
     steps:
       -
@@ -43,9 +43,54 @@ jobs:
           build-args: |
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=latest"
+            "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
+
+  chivesfoxy:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            "UBUNTU_VER=focal"
+            "MACHINARIS_STREAM=latest"
+            "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
+            "CHIVES_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:v${{ github.event.inputs.version }}
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:latest
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chives-foxy.yaml b/.github/workflows/test-chives-foxy.yaml
deleted file mode 100644
index 7cfb8b32..00000000
--- a/.github/workflows/test-chives-foxy.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: test-chives-foxy
-
-on:
-  push:
-    branches:
-      - 'integration'
-
-jobs:
-  docker:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          file: docker/dockerfile
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          build-args: |
-            "UBUNTU_VER=focal"
-            "MACHINARIS_STREAM=test"
-            "CHIADOG_BRANCH=dev"
-            "CHIVES_FOXY_BRANCH=1.5.3"
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:test
-            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives-foxy:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index e34b5a6b..ab2009f4 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -6,7 +6,7 @@ on:
       - 'integration'
 
 jobs:
-  docker:
+  chives:
     runs-on: ubuntu-20.04
     steps:
       -
@@ -43,7 +43,51 @@ jobs:
             "UBUNTU_VER=focal"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
+            "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test
+
+  chivesfoxy:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          file: docker/dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            "UBUNTU_VER=focal"
+            "MACHINARIS_STREAM=test"
+            "CHIADOG_BRANCH=dev"
+            "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
+            "CHIVES_BRANCH=main"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 4b76b09b..26e40f01 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -135,23 +135,6 @@
         "discord_url": "https://discord.gg/9aAbYNqjtA",
         "website_url": "https://www.chivescoin.org/"
     },
-    "chives-foxy": {
-        "name": "Chives Foxy",
-        "symbol": "XCC" ,
-        "binary":  "/chives-foxy-blockchain/venv/bin/chives",
-        "network_path": "/root/.chives-foxy/mainnet",
-        "network_name": "mainnet",
-        "network_port": 9699,
-        "farmer_port": 9647,
-        "fullnode_rpc_port": 9755,
-        "worker_port": 8931,
-        "reward": 180.0,
-        "mojos_per_coin": 100000000,
-        "blocks_per_day": 4608,
-        "git_url": "https://github.com/foxypool/chives-blockchain",
-        "discord_url": "https://discord.gg/foxy-582180216747720723",
-        "website_url": "https://chives-og.foxypool.io/"
-    },
     "coffee": {
         "name": "Coffee",
         "symbol": "XCF" ,
diff --git a/config/chiadog/chives-foxy.sample.yaml b/config/chiadog/chives-foxy.sample.yaml
deleted file mode 100644
index 307e2f36..00000000
--- a/config/chiadog/chives-foxy.sample.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-# This is useful to differentiate multiple
-# instances monitoring multiple harvesters
-notification_title_prefix: '$HOSTNAME-chives-foxy'
-log_level: INFO
-coin_name: 'chives'
-coin_symbol: 'xcc'
-
-# Only one consumer can be enabled at a time, you can
-# delete the section for the consumer which you aren't using
-# DON'T CHANGE file_path IT'S ALREADY SET IN-CONTAINER FOR MACHINARIS!
-chia_logs:
-  file_log_consumer:
-    enable: true
-    prefix: 'chives'
-    file_path: '~/.chives-foxy/mainnet/log/debug.log'
-
-# Enable this and chiadog will ping a remote server every 5 minutes
-# That way you can know that the monitoring is running as expected
-#keep_alive_monitor:
-#  enable_remote_ping: false
-#  ping_url: ''
-
-# Enable this and you'll receive a daily summary notification
-# on your farm performance at the specified time of the day.
-daily_stats:
-  enable: true
-  time_of_day: 21
-
-# We support a lot of notifiers, please check the README for more
-# information. You can delete the sections which you aren't using.
-# You can also enable more than one notifier and send different
-# notifications to each of them. E.g. enable daily_stats only to E-mail.
-# If you enable wallet_events you'll get notifications anytime your
-# wallet receives some XCH (e.g. farming reward).
-notifier:
-  pushover:
-    enable: false
-    daily_stats: true
-    wallet_events: true
-    credentials:
-      api_token: 'dummy_token'
-      user_key: 'dummy_key'
-  telegram:
-    enable: false
-    daily_stats: true
-    wallet_events: true
-    credentials:
-      bot_token: 'dummy_bot_token'
-      chat_id: 'dummy_chat_id'
-  smtp:
-    enable: false
-    daily_stats: true
-    wallet_events: true
-    credentials:
-      sender: 'chives@example.com'
-      sender_name: 'Machinaris'
-      recipient: 'you@example.com'
-      username_smtp: 'username'
-      password_smtp: 'password'
-      host: 'smtp.example.com'
-      port: 587
-  script:
-    # DON'T CHANGE THIS SCRIPT NOTIFIER, IT'S USED BY MACHINARIS!
-    enable: true
-    daily_stats: true
-    wallet_events: true
-    script_path: '/root/.chia/chiadog/notifier.sh'
-  discord:
-    enable: false
-    daily_stats: true
-    wallet_events: true
-    credentials:
-      webhook_url: 'https://discord.com/api/webhooks/...'
-  slack:
-    enable: false
-    daily_stats: true
-    wallet_events: true
-    credentials:
-     webhook_url: 'https://hooks.slack.com/services/...'
-  mqtt:
-    enable: false
-    daily_stats: true
-    wallet_events: true
-    topic: flax/chivesdog/alert
-    qos: 1
-    retain: false
-    credentials:
-      host: '192.168.0.10'
-      port: 8883
-      username: ''
-      password: ''
diff --git a/docker/dockerfile b/docker/dockerfile
index f726e80c..3e1f049e 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -17,8 +17,8 @@ ARG BTCGREEN_BRANCH
 ARG CACTUS_BRANCH
 ARG CHIA_BRANCH
 ARG CHINILLA_BRANCH
+ARG CHIVES_REPO
 ARG CHIVES_BRANCH
-ARG CHIVES_FOXY_BRANCH
 ARG COFFEE_BRANCH
 ARG CRYPTODOGE_BRANCH
 ARG ECOSTAKE_BRANCH
@@ -58,8 +58,7 @@ RUN \
 	&& /usr/bin/bash /machinaris/scripts/forks/btcgreen_install.sh ${BTCGREEN_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/cactus_install.sh ${CACTUS_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/chia_install.sh ${CHIA_BRANCH} \
-	&& /usr/bin/bash /machinaris/scripts/forks/chives_install.sh ${CHIVES_BRANCH} \
-	&& /usr/bin/bash /machinaris/scripts/forks/chives_foxy_install.sh ${CHIVES_FOXY_BRANCH} \
+	&& /usr/bin/bash /machinaris/scripts/forks/chives_install.sh ${CHIVES_REPO} ${CHIVES_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/chinilla_install.sh ${CHINILLA_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/coffee_install.sh ${COFFEE_BRANCH} \
 	&& /usr/bin/bash /machinaris/scripts/forks/cryptodoge_install.sh ${CRYPTODOGE_BRANCH} \
diff --git a/scripts/forks/chives_foxy_launch.sh b/scripts/forks/chives_foxy_launch.sh
deleted file mode 100644
index e0fd0672..00000000
--- a/scripts/forks/chives_foxy_launch.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/env bash
-#
-# Initialize Chives Foxy service, depending on mode of system requested
-#
-
-cd /chives-foxy-blockchain
-
-. ./activate
-
-# Only the /root/.chia folder is volume-mounted so store chives within
-mkdir -p /root/.chia/chives-foxy
-rm -f /root/.chives-foxy
-ln -s /root/.chia/chives-foxy /root/.chives-foxy
-
-if [[ "${blockchain_db_download}" == 'true' ]] \
-  && [[ "${mode}" == 'fullnode' ]] \
-  && [[ ! -f /root/.chives-foxy/mainnet/db/blockchain_v1_mainnet.sqlite ]] \
-  && [[ ! -f /root/.chives-foxy/mainnet/db/blockchain_v2_mainnet.sqlite ]]; then
-  echo "Sorry, Chives does not offer a recent blockchain DB for download.  Standard sync will happen over a few days."
-  echo "It is recommended to add some peer node connections on the Connections page of Machinaris."
-fi
-
-mkdir -p /root/.chives-foxy/mainnet/log
-chives init >> /root/.chives-foxy/mainnet/log/init.log 2>&1
-
-echo 'Configuring Chives...'
-if [ -f /root/.chives-foxy/mainnet/config/config.yaml ]; then
-  sed -i 's/log_stdout: true/log_stdout: false/g' /root/.chives-foxy/mainnet/config/config.yaml
-  sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.chives-foxy/mainnet/config/config.yaml
-  sed -i 's/localhost/127.0.0.1/g' /root/.chives-foxy/mainnet/config/config.yaml
-fi
-# Loop over provided list of key paths
-for k in ${keys//:/ }; do
-  if [[ "${k}" == "persistent" ]]; then
-    echo "Not touching key directories."
-  elif [ -s ${k} ]; then
-    echo "Adding key at path: ${k}"
-    chives keys add -f ${k} > /dev/null
-  fi
-done
-
-# Loop over provided list of completed plot directories
-IFS=':' read -r -a array <<< "$plots_dir"
-joined=$(printf ", %s" "${array[@]}")
-echo "Adding plot directories at: ${joined:1}"
-for p in ${plots_dir//:/ }; do
-    chives plots add -d ${p}
-done
-
-# Start services based on mode selected. Default is 'fullnode'
-if [[ ${mode} == 'fullnode' ]]; then
-  for k in ${keys//:/ }; do
-    while [[ "${k}" != "persistent" ]] && [[ ! -s ${k} ]]; do
-      echo 'Waiting for key to be created/imported into mnemonic.txt. See: http://localhost:8926'
-      sleep 10  # Wait 10 seconds before checking for mnemonic.txt presence
-      if [ -s ${k} ]; then
-        chives keys add -f ${k}
-        sleep 10
-      fi
-    done
-  done
-  if [ -f /root/.chia/machinaris/config/wallet_settings.json ]; then
-    chives start farmer-no-wallet
-  else
-    chives start farmer
-  fi
-elif [[ ${mode} =~ ^farmer.* ]]; then
-  if [ ! -f ~/.chives-foxy/mainnet/config/ssl/wallet/public_wallet.key ]; then
-    echo "No wallet key found, so not starting farming services.  Please add your Chia mnemonic.txt to the ~/.machinaris/ folder and restart."
-  else
-    chives start farmer-only
-  fi
-elif [[ ${mode} =~ ^harvester.* ]]; then
-  if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
-    echo "A farmer peer address and port are required."
-    exit
-  else
-    if [ ! -f /root/.chives-foxy/farmer_ca/chives_ca.crt ]; then
-      mkdir -p /root/.chives-foxy/farmer_ca
-      response=$(curl --write-out '%{http_code}' --silent http://${farmer_address}:8931/certificates/?type=chives --output /tmp/certs.zip)
-      if [ $response == '200' ]; then
-        unzip /tmp/certs.zip -d /root/.chives/farmer_ca
-      else
-        echo "Certificates response of ${response} from http://${farmer_address}:8931/certificates/?type=chives.  Is the fork's fullnode container running?"
-      fi
-      rm -f /tmp/certs.zip
-    fi
-    if [[ -f /root/.chives-foxy/farmer_ca/chives_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
-      chives init -c /root/.chives-foxy/farmer_ca 2>&1 > /root/.chives-foxy/mainnet/log/init.log
-    else
-      echo "Did not find your farmer's certificates within /root/.chives-foxy/farmer_ca."
-      echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
-    fi
-    chives configure --set-farmer-peer ${farmer_address}:${farmer_port}
-    chives configure --enable-upnp false
-    chives start harvester -r
-  fi
-elif [[ ${mode} == 'plotter' ]]; then
-    echo "Starting in Plotter-only mode.  Run Plotman from either CLI or WebUI."
-fi
diff --git a/scripts/forks/chives_install.sh b/scripts/forks/chives_install.sh
index 31982360..76d36c9e 100644
--- a/scripts/forks/chives_install.sh
+++ b/scripts/forks/chives_install.sh
@@ -1,14 +1,16 @@
 #!/bin/env bash
 #
 # Installs Chives as per https://github.com/HiveProject2021/chives-blockchain
+# Alternatively, also supports the Foxy port: https://github.com/foxypool/chives-blockchain
 #
 
-CHIVES_BRANCH=$1
+CHIVES_REPO=$1
+CHIVES_BRANCH=$2
 
 if [ -z ${CHIVES_BRANCH} ]; then
     echo 'Skipping Chives install as not requested.'
 else
-    git clone --branch ${CHIVES_BRANCH} --recurse-submodules https://github.com/HiveProject2021/chives-blockchain.git /chives-blockchain 
+    git clone --branch ${CHIVES_BRANCH} --recurse-submodules ${CHIVES_REPO} /chives-blockchain 
     cd /chives-blockchain
     chmod +x install.sh
     # 2022-07-20: Python needs 'packaging==21.3'
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 3368616c..9cc239bf 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -179,9 +179,6 @@
             if (blockchain == 'chives') {
                 return 8931;
             }
-            if (blockchain == 'chives-foxy') {
-                return 8931;
-            }
             if (blockchain == 'coffee') {
                 return 8954;
             }
@@ -282,7 +279,7 @@
             if (blockchain == 'chives') {
                 return 9647;
             }
-            if (blockchain == 'chives-foxy') {
+            if (blockchain == 'chives') {
                 return 9647;
             }
             if (blockchain == 'coffee') {
@@ -374,8 +371,8 @@
                     var blockchain = blockchains[i].value
                     if (!document.getElementById('mode-harvester').checked &&
                             document.getElementById('mode-plotter').checked &&
-                            blockchain != "chia" && blockchain != "chives" && blockchain != "chives-foxy") {
-                        continue;  // Don't add plotter-only containers for forks beyond Chia & Chives & Chives-foxy
+                            blockchain != "chia" && blockchain != "chives") {
+                        continue;  // Don't add plotter-only containers for forks beyond Chia & Chives
                     }
                     if (blockchain == "chia") {
                         cmd += "    machinaris:" + line_end;
@@ -386,6 +383,9 @@
                         cmd += "        image: ghcr.io/guydavis/machinaris-" + blockchain + ":latest" + line_end;
                         cmd += "        container_name: machinaris-" + blockchain + line_end;
                     }
+                    if (blockchain == "chives") {
+                        errors.push("{{_('NOTE: If you want to run the FoxyPool port of Chives, change the image from machinaris-chives to machinaris-chivesfoxy in generated config below.')}}")
+                    }
                     if (document.getElementById("worker_hostname").value) {
                         cmd += '        hostname: ' + document.getElementById("worker_hostname").value + line_end;
                     }
@@ -421,9 +421,6 @@
                             if ((blockchain == "chives") && ($('#volume_type' + index).val() == 'plots')) {
                                 volume_host_path += '/chives'
                             }
-                            if ((blockchain == "chives-foxy") && ($('#volume_type' + index).val() == 'plots')) {
-                                volume_host_path += '/chives-foxy'
-                            }
                             if ((blockchain == "mmx") && ($('#volume_type' + index).val() == 'plots')) {
                                 volume_host_path += '/mmx'
                             }
@@ -442,7 +439,7 @@
                         var farmer_port = lookup_farmer_port(blockchain);
                         cmd += '            - farmer_port=' + farmer_port + line_end;
                     }
-                    if ((blockchain == "chia" || blockchain == "chives" || blockchain == "foxy-chives") && (document.getElementById('mode-plotter').checked)) {
+                    if ((blockchain == "chia" || blockchain == "chives" || blockchain == "mmx") && (document.getElementById('mode-plotter').checked)) {
                         if (mode) {
                             mode += ',plotter';
                         }
@@ -693,13 +690,6 @@ 
    {{_('Machinaris Worker - Launch Config')}}
    
                                 Chives
                             
                         
    
-                        
    
-                            
-                            
-                        
    
                         
    
                             

From cad95ed92769fb53600b0b7b37c3b698ffeaf673 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Wed, 25 Jan 2023 14:43:55 -0700
Subject: [PATCH 1201/1625] Fix for Cactus hard-coded path issue.

---
 scripts/forks/cactus_install.sh      |  2 +-
 scripts/forks/chives_foxy_install.sh | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 scripts/forks/chives_foxy_install.sh

diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
index 21b748f4..70095e31 100644
--- a/scripts/forks/cactus_install.sh
+++ b/scripts/forks/cactus_install.sh
@@ -5,7 +5,7 @@
 
 CACTUS_BRANCH=$1
 # On 2023-01-24
-HASH=1999f8921050bd034b7af46f665e5d268cfb397d
+HASH=96dcdf36a214fea2236e88bd5fb251c81da46897
 
 if [ -z ${CACTUS_BRANCH} ]; then
     echo 'Skipping Cactus install as not requested.'
diff --git a/scripts/forks/chives_foxy_install.sh b/scripts/forks/chives_foxy_install.sh
deleted file mode 100644
index c53433fc..00000000
--- a/scripts/forks/chives_foxy_install.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/env bash
-#
-# Installs Chives as per https://github.com/foxypool/chives-blockchain
-#
-
-CHIVES_FOXY_BRANCH=$1
-
-if [ -z ${CHIVES_FOXY_BRANCH} ]; then
-	echo 'Skipping Chives install as not requested.'
-else
-	git clone --branch ${CHIVES_FOXY_BRANCH} --recurse-submodules https://github.com/foxypool/chives-blockchain.git /chives-foxy-blockchain
-	cd /chives-foxy-blockchain
-	chmod +x install.sh
-	# 2022-07-20: Python needs 'packaging==21.3'
-	sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
-	/usr/bin/sh ./install.sh
-
-	if [ ! -d /chia-blockchain/venv ]; then
-		cd /
-		rmdir /chia-blockchain
-		ln -s /chives-foxy-blockchain /chia-blockchain
-		ln -s /chives-foxy-blockchain/venv/bin/chives /chia-blockchain/venv/bin/chia
-	fi
-fi

From f21f91cf45a48e408b273ba57ca73ad9587ed8ae Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 27 Jan 2023 10:17:52 -0700
Subject: [PATCH 1202/1625] Test upcoming Chia 1.7.0 release branch.  Also
 'provenance: false' fix for Github image change.

---
 .github/workflows/develop-apple.yaml           | 1 +
 .github/workflows/develop-ballcoin.yaml        | 1 +
 .github/workflows/develop-base.yaml            | 2 ++
 .github/workflows/develop-bpx.yaml             | 1 +
 .github/workflows/develop-btcgreen.yaml        | 1 +
 .github/workflows/develop-cactus.yaml          | 1 +
 .github/workflows/develop-chia.yaml            | 3 ++-
 .github/workflows/develop-chinilla.yaml        | 1 +
 .github/workflows/develop-chives.yaml          | 1 +
 .github/workflows/develop-coffee.yaml          | 1 +
 .github/workflows/develop-cryptodoge.yaml      | 1 +
 .github/workflows/develop-ecostake.yaml        | 1 +
 .github/workflows/develop-flax.yaml            | 1 +
 .github/workflows/develop-flora.yaml           | 1 +
 .github/workflows/develop-gold.yaml            | 1 +
 .github/workflows/develop-greenbtc.yaml        | 1 +
 .github/workflows/develop-hddcoin.yaml         | 1 +
 .github/workflows/develop-littlelambocoin.yaml | 1 +
 .github/workflows/develop-maize.yaml           | 1 +
 .github/workflows/develop-mint.yaml            | 1 +
 .github/workflows/develop-mmx.yaml             | 1 +
 .github/workflows/develop-moon.yaml            | 1 +
 .github/workflows/develop-nchain.yaml          | 1 +
 .github/workflows/develop-one.yaml             | 1 +
 .github/workflows/develop-petroleum.yaml       | 1 +
 .github/workflows/develop-pipscoin.yaml        | 1 +
 .github/workflows/develop-profit.yaml          | 1 +
 .github/workflows/develop-shibgreen.yaml       | 1 +
 .github/workflows/develop-silicoin.yaml        | 1 +
 .github/workflows/develop-staicoin.yaml        | 1 +
 .github/workflows/develop-stor.yaml            | 1 +
 .github/workflows/develop-tad.yaml             | 1 +
 .github/workflows/develop-wheat.yaml           | 1 +
 .github/workflows/main-chia.yaml               | 2 +-
 .github/workflows/test-chia.yaml               | 2 +-
 35 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/develop-apple.yaml b/.github/workflows/develop-apple.yaml
index 661ea9a0..2d5e356b 100644
--- a/.github/workflows/develop-apple.yaml
+++ b/.github/workflows/develop-apple.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-ballcoin.yaml b/.github/workflows/develop-ballcoin.yaml
index d91473a9..2cfb8ba7 100644
--- a/.github/workflows/develop-ballcoin.yaml
+++ b/.github/workflows/develop-ballcoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
index 0b5b6515..70d6100a 100644
--- a/.github/workflows/develop-base.yaml
+++ b/.github/workflows/develop-base.yaml
@@ -35,6 +35,7 @@ jobs:
           file: docker/dockerfile-jammy.base
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop
@@ -72,6 +73,7 @@ jobs:
           file: docker/dockerfile-focal.base
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop
diff --git a/.github/workflows/develop-bpx.yaml b/.github/workflows/develop-bpx.yaml
index afc1e293..24694d91 100644
--- a/.github/workflows/develop-bpx.yaml
+++ b/.github/workflows/develop-bpx.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-btcgreen.yaml b/.github/workflows/develop-btcgreen.yaml
index f7f39214..20b82dc6 100644
--- a/.github/workflows/develop-btcgreen.yaml
+++ b/.github/workflows/develop-btcgreen.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-cactus.yaml b/.github/workflows/develop-cactus.yaml
index dd906b79..0f316a95 100644
--- a/.github/workflows/develop-cactus.yaml
+++ b/.github/workflows/develop-cactus.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 3d41f123..6d8165c8 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -38,12 +38,13 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=main"
+            "CHIA_BRANCH=release/1.7.0"
             "BLADEBIT_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
diff --git a/.github/workflows/develop-chinilla.yaml b/.github/workflows/develop-chinilla.yaml
index 1538b8b9..af579e4f 100644
--- a/.github/workflows/develop-chinilla.yaml
+++ b/.github/workflows/develop-chinilla.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
index 8a3e6fa2..fafadea0 100644
--- a/.github/workflows/develop-chives.yaml
+++ b/.github/workflows/develop-chives.yaml
@@ -83,6 +83,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-coffee.yaml b/.github/workflows/develop-coffee.yaml
index 2877fe8c..aaaba8b6 100644
--- a/.github/workflows/develop-coffee.yaml
+++ b/.github/workflows/develop-coffee.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-cryptodoge.yaml b/.github/workflows/develop-cryptodoge.yaml
index 235a65de..dfe85105 100644
--- a/.github/workflows/develop-cryptodoge.yaml
+++ b/.github/workflows/develop-cryptodoge.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-ecostake.yaml b/.github/workflows/develop-ecostake.yaml
index f2ecd3f7..3f7e0fab 100644
--- a/.github/workflows/develop-ecostake.yaml
+++ b/.github/workflows/develop-ecostake.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-flax.yaml b/.github/workflows/develop-flax.yaml
index 22034ea6..25b144ff 100644
--- a/.github/workflows/develop-flax.yaml
+++ b/.github/workflows/develop-flax.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml
index ff8bdeac..8eadcf40 100644
--- a/.github/workflows/develop-flora.yaml
+++ b/.github/workflows/develop-flora.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-gold.yaml b/.github/workflows/develop-gold.yaml
index 7f66ee56..112ed784 100644
--- a/.github/workflows/develop-gold.yaml
+++ b/.github/workflows/develop-gold.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-greenbtc.yaml b/.github/workflows/develop-greenbtc.yaml
index fb006dee..000f4a14 100644
--- a/.github/workflows/develop-greenbtc.yaml
+++ b/.github/workflows/develop-greenbtc.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index c67caac5..c49c3419 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-littlelambocoin.yaml b/.github/workflows/develop-littlelambocoin.yaml
index 2bc9e76f..a3e5e711 100644
--- a/.github/workflows/develop-littlelambocoin.yaml
+++ b/.github/workflows/develop-littlelambocoin.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-maize.yaml b/.github/workflows/develop-maize.yaml
index b928392b..e3b491ac 100644
--- a/.github/workflows/develop-maize.yaml
+++ b/.github/workflows/develop-maize.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-mint.yaml b/.github/workflows/develop-mint.yaml
index c8200838..845a33af 100644
--- a/.github/workflows/develop-mint.yaml
+++ b/.github/workflows/develop-mint.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 4e522c36..0761bdfb 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-moon.yaml b/.github/workflows/develop-moon.yaml
index 6cb9bc7f..3e2cb782 100644
--- a/.github/workflows/develop-moon.yaml
+++ b/.github/workflows/develop-moon.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-nchain.yaml b/.github/workflows/develop-nchain.yaml
index 5299e4e9..a8db9e1f 100644
--- a/.github/workflows/develop-nchain.yaml
+++ b/.github/workflows/develop-nchain.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-one.yaml b/.github/workflows/develop-one.yaml
index 8743c00f..be74f30a 100644
--- a/.github/workflows/develop-one.yaml
+++ b/.github/workflows/develop-one.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-petroleum.yaml b/.github/workflows/develop-petroleum.yaml
index a59ffd7c..8f186267 100644
--- a/.github/workflows/develop-petroleum.yaml
+++ b/.github/workflows/develop-petroleum.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-pipscoin.yaml b/.github/workflows/develop-pipscoin.yaml
index 25262a20..b5b5257a 100644
--- a/.github/workflows/develop-pipscoin.yaml
+++ b/.github/workflows/develop-pipscoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-profit.yaml b/.github/workflows/develop-profit.yaml
index 20f05eb8..7ab80ac2 100644
--- a/.github/workflows/develop-profit.yaml
+++ b/.github/workflows/develop-profit.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-shibgreen.yaml b/.github/workflows/develop-shibgreen.yaml
index 0931ac11..f9195e8c 100644
--- a/.github/workflows/develop-shibgreen.yaml
+++ b/.github/workflows/develop-shibgreen.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
index 16e113f2..26d82246 100644
--- a/.github/workflows/develop-silicoin.yaml
+++ b/.github/workflows/develop-silicoin.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index d009c6c0..1e98777e 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-stor.yaml b/.github/workflows/develop-stor.yaml
index addd6b0c..9e0d5083 100644
--- a/.github/workflows/develop-stor.yaml
+++ b/.github/workflows/develop-stor.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/develop-tad.yaml b/.github/workflows/develop-tad.yaml
index a90a6cfe..df4c28f8 100644
--- a/.github/workflows/develop-tad.yaml
+++ b/.github/workflows/develop-tad.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/develop-wheat.yaml b/.github/workflows/develop-wheat.yaml
index 5860dd1a..6e9276f9 100644
--- a/.github/workflows/develop-wheat.yaml
+++ b/.github/workflows/develop-wheat.yaml
@@ -37,6 +37,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 7ed8bf78..86e9cbbc 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -43,7 +43,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=release/1.6.2"
+            "CHIA_BRANCH=release/1.7.0"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 8faf25c9..e7648eed 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=release/1.6.2"
+            "CHIA_BRANCH=release/1.7.0"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test

From fb14d13ac3301497961cabf169e97d70b3cdcd3d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 27 Jan 2023 12:26:06 -0700
Subject: [PATCH 1203/1625] Testing new Madmax plotters.

---
 .github/workflows/develop-mmx.yaml |  2 +-
 scripts/madmax_setup.sh            | 39 ++++--------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 0761bdfb..6900ad49 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -45,7 +45,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
             "CHIA_BRANCH=latest"
-            "PLOTMAN_BRANCH=development"
+            "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index 2a9a248a..8a152a16 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -1,41 +1,12 @@
 #!/bin/env bash
 #
-# Installs chia-plotter (pipelined multi-threaded)
-# See https://github.com/madMAx43v3r/chia-plotter
+# Installs chia-plotter (pipelined multi-threaded) from binaries
+#
+# https://github.com/madMAx43v3r/chia-plotter
+# https://github.com/madMAx43v3r/mmx-binaries
 #
 
-# As of 2022-08-20
-HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648
-MADMAX_BRANCH=master
-
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
-    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
-        arch_name="$(uname -m)"
-        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
-            apt update && apt install -y libsodium-dev cmake g++ git build-essential
-            cd /
-            git clone --branch ${MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
-            cd chia-plotter && echo "Building madmax on ${arch_name}..."
-            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
-                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
-            fi
-            git submodule update --init
-            git checkout $HASH
-            ./make_devel.sh
-            mkdir -p /usr/lib/chia-plotter
-            cp -r ./build/* /usr/lib/chia-plotter
-            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
-            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
-            cd /
-            rm -rf chia-plotter
-        else
-            echo "Building madmax plotter skipped -> unsupported architecture: ${arch_name}"
-        fi
-    fi
-fi
-
-# The MMX blockchain uses plotters from: https://github.com/madMAx43v3r/mmx-binaries
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && ${blockchains} == 'mmx' ]]; then
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx')) ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then

From 4edb349cedb54b90104f7e4a577899136d60d585 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 27 Jan 2023 13:45:34 -0700
Subject: [PATCH 1204/1625] Remove extra bracket.

---
 scripts/madmax_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index 8a152a16..96cba6a1 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -6,7 +6,7 @@
 # https://github.com/madMAx43v3r/mmx-binaries
 #
 
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx')) ]]; then
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives' || ${blockchains} == 'mmx') ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then

From 14e9613d06c5a5aba2360ca75f65518e2f64e099 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Fri, 27 Jan 2023 14:13:21 -0700
Subject: [PATCH 1205/1625] Test compression for Chia too.

---
 .github/workflows/develop-chia.yaml | 2 +-
 api/gunicorn.conf.py                | 4 ++--
 config/plotman.sample-chives.yaml   | 2 ++
 config/plotman.sample-mmx.yaml      | 2 ++
 config/plotman.sample.yaml          | 4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 6d8165c8..7a0bfcb2 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -46,7 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "BLADEBIT_BRANCH=master"
-            "PLOTMAN_BRANCH=development"
+            "PLOTMAN_BRANCH=compress"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py
index e0b4ad11..4afbc963 100644
--- a/api/gunicorn.conf.py
+++ b/api/gunicorn.conf.py
@@ -41,8 +41,8 @@ def on_starting(server):
 
     # Collect disk stats from all modes where blockchain is chia, avoiding duplicate disks from multiple forks on same host
     if 'chia' in globals.enabled_blockchains():
-        scheduler.add_job(func=stats_disk.collect, name="stats_disk", trigger='cron', minute="*/10", jitter=JOB_JITTER) # Every 10 minutes
-        scheduler.add_job(func=status_drives.update, name="status_drives", trigger='cron', minute="*/15", jitter=JOB_JITTER) # Every 15 minutes
+        scheduler.add_job(func=stats_disk.collect, name="stats_disk", trigger='cron', minute="*/10", jitter=5*60) # Every 10 minutes
+        scheduler.add_job(func=status_drives.update, name="status_drives", trigger='cron', minute="*/15", jitter=7.5*60) # Every 15 minutes
         
     # MMX needs to report plots from harvesters directly as they are not listed via the fullnode like Chia does
     if not utils.is_fullnode() and globals.harvesting_enabled() and 'mmx' in globals.enabled_blockchains():
diff --git a/config/plotman.sample-chives.yaml b/config/plotman.sample-chives.yaml
index d8193b92..151a4fef 100644
--- a/config/plotman.sample-chives.yaml
+++ b/config/plotman.sample-chives.yaml
@@ -114,3 +114,5 @@ plotting:
                 n_buckets3: 256       # Default is 256
                 n_rmulti2: 1          # Default is 1
                 network_port: 9699    # Default is 8444, but use 9699 for Chives
+                compression: 1        # Compression level (default = 1, min = 1, max = 9)
+                gpu_plot: false       # If true, requires a GPU device in-container to plot
diff --git a/config/plotman.sample-mmx.yaml b/config/plotman.sample-mmx.yaml
index 34de5393..9431a551 100644
--- a/config/plotman.sample-mmx.yaml
+++ b/config/plotman.sample-mmx.yaml
@@ -110,3 +110,5 @@ plotting:
                 n_buckets3: 256       # Default is 256
                 n_rmulti2: 1          # Default is 1
                 network_port: 11337    # Use 11337
+                compression: 1        # Compression level (default = 1, min = 1, max = 9)
+                gpu_plot: false       # If true, requires a GPU device in-container to plot
diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml
index c1e173ee..85287396 100644
--- a/config/plotman.sample.yaml
+++ b/config/plotman.sample.yaml
@@ -119,7 +119,9 @@ plotting:
                 n_buckets3: 256       # Default is 256
                 n_rmulti2: 1          # Default is 1
                 network_port: 8444    # Default is 8444, but use 9699 for Chives
-        
+                compression: 1        # Compression level (default = 1, min = 1, max = 9)
+                gpu_plot: false       # If true, requires a GPU device in-container to plot
+       
         chia:
                 # The stock plotter; see https://github.com/guydavis/machinaris/wiki/Chia#plotting
                 k: 32                # k-size of plot, leave at 32 most of the time

From 9d01c1f8b3f4922fada4046deafc5dcc4ee7fc45 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 30 Jan 2023 09:47:12 -0700
Subject: [PATCH 1206/1625] Fix for alerts timestamp formatting.  Shibgreen
 patch.

---
 CHANGELOG.md                       |  2 +-
 scripts/chiadog_notifier.sh        |  3 +--
 scripts/forks/shibgreen_install.sh |  4 ++--
 scripts/madmax_setup.sh            | 34 +++++++++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97fcd285..44e438ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file. The format
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.2) to v1.6.2
  - [Chives](https://github.com/HiveProject2021/chives-blockchain/releases/tag/1.5.3) to v1.5.3, including staking.
- - [SHIBGreen](https://github.com/BTCgreen-Network/shibgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
+ - [SHIBGreen](https://github.com/BTCgreen-Network/shibgreen-blockchain/releases/tag/1.7.0.1) to v1.7.0.1
  - [Staicoin](https://github.com/STATION-I/stai-blockchain/releases/tag/1.3.0) to v1.3.0. Note, they require a fresh `config.yaml`.
 ## Notes
  - Support for new Chia forks DOES NOT imply my endorsement for them.  Only run those you are comfortable with.
diff --git a/scripts/chiadog_notifier.sh b/scripts/chiadog_notifier.sh
index d47d8b28..be59b4db 100644
--- a/scripts/chiadog_notifier.sh
+++ b/scripts/chiadog_notifier.sh
@@ -10,8 +10,7 @@ hostname="$(hostname -s)"
 now="$(date +'%Y-%m-%d %H:%M:%S.%3N')"
 unique_id="${hostname}_${blockchains}_${now}"
 echo "${now} ${hostname} ${event_service_name} ${event_priority_name}: ${event_message}"
-
-now_secs_only=$(echo "${now}" | sed 's/...$//')
+now_secs_only=${now::-4}
 cd /root/.chia/machinaris/dbs
 sqlite3 -cmd '.timeout 5000' alerts.db < unsupported architecture: ${arch_name}"
+        fi
+    fi
+fi
+
+# MMX blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx') ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then

From d77a3b173cb5624e23afb3240df94b2d6bcf710c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 30 Jan 2023 10:09:00 -0700
Subject: [PATCH 1207/1625] Fix for provence issue with GHCR.

---
 .github/workflows/main-apple.yaml           | 1 +
 .github/workflows/main-ballcoin.yaml        | 1 +
 .github/workflows/main-base.yaml            | 2 ++
 .github/workflows/main-bpx.yaml             | 1 +
 .github/workflows/main-btcgreen.yaml        | 1 +
 .github/workflows/main-cactus.yaml          | 2 ++
 .github/workflows/main-chia.yaml            | 1 +
 .github/workflows/main-chinilla.yaml        | 1 +
 .github/workflows/main-chives.yaml          | 1 +
 .github/workflows/main-coffee.yaml          | 1 +
 .github/workflows/main-cryptodoge.yaml      | 1 +
 .github/workflows/main-ecostake.yaml        | 1 +
 .github/workflows/main-flax.yaml            | 1 +
 .github/workflows/main-flora.yaml           | 1 +
 .github/workflows/main-gold.yaml            | 1 +
 .github/workflows/main-greenbtc.yaml        | 1 +
 .github/workflows/main-hddcoin.yaml         | 1 +
 .github/workflows/main-littlelambocoin.yaml | 1 +
 .github/workflows/main-maize.yaml           | 1 +
 .github/workflows/main-mint.yaml            | 1 +
 .github/workflows/main-mmx.yaml             | 1 +
 .github/workflows/main-moon.yaml            | 1 +
 .github/workflows/main-nchain.yaml          | 1 +
 .github/workflows/main-one.yaml             | 1 +
 .github/workflows/main-petroleum.yaml       | 1 +
 .github/workflows/main-pipscoin.yaml        | 1 +
 .github/workflows/main-profit.yaml          | 1 +
 .github/workflows/main-shibgreen.yaml       | 1 +
 .github/workflows/main-silicoin.yaml        | 1 +
 .github/workflows/main-staicoin.yaml        | 1 +
 .github/workflows/main-stor.yaml            | 1 +
 .github/workflows/main-tad.yaml             | 1 +
 .github/workflows/main-wheat.yaml           | 1 +
 .github/workflows/test-apple.yaml           | 1 +
 .github/workflows/test-ballcoin.yaml        | 1 +
 .github/workflows/test-base.yaml            | 1 +
 .github/workflows/test-bpx.yaml             | 1 +
 .github/workflows/test-btcgreen.yaml        | 1 +
 .github/workflows/test-cactus.yaml          | 1 +
 .github/workflows/test-chia.yaml            | 1 +
 .github/workflows/test-chinilla.yaml        | 1 +
 .github/workflows/test-chives.yaml          | 1 +
 .github/workflows/test-coffee.yaml          | 1 +
 .github/workflows/test-cryptodoge.yaml      | 1 +
 .github/workflows/test-ecostake.yaml        | 1 +
 .github/workflows/test-flax.yaml            | 1 +
 .github/workflows/test-flora.yaml           | 1 +
 .github/workflows/test-gold.yaml            | 1 +
 .github/workflows/test-greenbtc.yaml        | 1 +
 .github/workflows/test-hddcoin.yaml         | 1 +
 .github/workflows/test-littlelambocoin.yaml | 1 +
 .github/workflows/test-maize.yaml           | 1 +
 .github/workflows/test-mint.yaml            | 1 +
 .github/workflows/test-mmx.yaml             | 1 +
 .github/workflows/test-moon.yaml            | 1 +
 .github/workflows/test-nchain.yaml          | 1 +
 .github/workflows/test-one.yaml             | 1 +
 .github/workflows/test-petroleum.yaml       | 1 +
 .github/workflows/test-pipscoin.yaml        | 1 +
 .github/workflows/test-profit.yaml          | 1 +
 .github/workflows/test-shibgreen.yaml       | 1 +
 .github/workflows/test-silicoin.yaml        | 1 +
 .github/workflows/test-staicoin.yaml        | 1 +
 .github/workflows/test-stor.yaml            | 1 +
 .github/workflows/test-tad.yaml             | 1 +
 .github/workflows/test-wheat.yaml           | 1 +
 web/actions/chiadog.py                      | 9 +++++++--
 67 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main-apple.yaml b/.github/workflows/main-apple.yaml
index 0b480deb..b67464f9 100644
--- a/.github/workflows/main-apple.yaml
+++ b/.github/workflows/main-apple.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-ballcoin.yaml b/.github/workflows/main-ballcoin.yaml
index 2672c7f7..a0ff905c 100644
--- a/.github/workflows/main-ballcoin.yaml
+++ b/.github/workflows/main-ballcoin.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
index 080f1acd..8d639154 100644
--- a/.github/workflows/main-base.yaml
+++ b/.github/workflows/main-base.yaml
@@ -35,6 +35,7 @@ jobs:
           file: docker/dockerfile-jammy.base
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:latest
@@ -72,6 +73,7 @@ jobs:
           file: docker/dockerfile-focal.base
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:latest
diff --git a/.github/workflows/main-bpx.yaml b/.github/workflows/main-bpx.yaml
index 38747738..6cfb08a2 100644
--- a/.github/workflows/main-bpx.yaml
+++ b/.github/workflows/main-bpx.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-btcgreen.yaml b/.github/workflows/main-btcgreen.yaml
index d41a9a42..bfe73779 100644
--- a/.github/workflows/main-btcgreen.yaml
+++ b/.github/workflows/main-btcgreen.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-cactus.yaml b/.github/workflows/main-cactus.yaml
index 5f09607f..0b1ff6e4 100644
--- a/.github/workflows/main-cactus.yaml
+++ b/.github/workflows/main-cactus.yaml
@@ -39,6 +39,8 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 86e9cbbc..e0ff030e 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-chinilla.yaml b/.github/workflows/main-chinilla.yaml
index c31c042b..71ac2dd5 100644
--- a/.github/workflows/main-chinilla.yaml
+++ b/.github/workflows/main-chinilla.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 55f9f588..cadce930 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -83,6 +83,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-coffee.yaml b/.github/workflows/main-coffee.yaml
index f711fd29..a71a1271 100644
--- a/.github/workflows/main-coffee.yaml
+++ b/.github/workflows/main-coffee.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-cryptodoge.yaml b/.github/workflows/main-cryptodoge.yaml
index 79536f10..8ad2e813 100644
--- a/.github/workflows/main-cryptodoge.yaml
+++ b/.github/workflows/main-cryptodoge.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-ecostake.yaml b/.github/workflows/main-ecostake.yaml
index 57fe8614..4b63f6cb 100644
--- a/.github/workflows/main-ecostake.yaml
+++ b/.github/workflows/main-ecostake.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-flax.yaml b/.github/workflows/main-flax.yaml
index 0096d7f4..d9ad33d0 100644
--- a/.github/workflows/main-flax.yaml
+++ b/.github/workflows/main-flax.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-flora.yaml b/.github/workflows/main-flora.yaml
index 75ccb667..0346d6c4 100644
--- a/.github/workflows/main-flora.yaml
+++ b/.github/workflows/main-flora.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-gold.yaml b/.github/workflows/main-gold.yaml
index 3a5c2693..4de0bd6f 100644
--- a/.github/workflows/main-gold.yaml
+++ b/.github/workflows/main-gold.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-greenbtc.yaml b/.github/workflows/main-greenbtc.yaml
index 4a55cfd3..b557ce6d 100644
--- a/.github/workflows/main-greenbtc.yaml
+++ b/.github/workflows/main-greenbtc.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-hddcoin.yaml b/.github/workflows/main-hddcoin.yaml
index 045e0ee4..66470501 100644
--- a/.github/workflows/main-hddcoin.yaml
+++ b/.github/workflows/main-hddcoin.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-littlelambocoin.yaml b/.github/workflows/main-littlelambocoin.yaml
index 764e578e..6491eb34 100644
--- a/.github/workflows/main-littlelambocoin.yaml
+++ b/.github/workflows/main-littlelambocoin.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-maize.yaml b/.github/workflows/main-maize.yaml
index ef31e742..44b10352 100644
--- a/.github/workflows/main-maize.yaml
+++ b/.github/workflows/main-maize.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-mint.yaml b/.github/workflows/main-mint.yaml
index 92211dd8..88b0136b 100644
--- a/.github/workflows/main-mint.yaml
+++ b/.github/workflows/main-mint.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 51358134..11af09a1 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-moon.yaml b/.github/workflows/main-moon.yaml
index 270cffda..3333d66c 100644
--- a/.github/workflows/main-moon.yaml
+++ b/.github/workflows/main-moon.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-nchain.yaml b/.github/workflows/main-nchain.yaml
index 5412e05f..b5214154 100644
--- a/.github/workflows/main-nchain.yaml
+++ b/.github/workflows/main-nchain.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-one.yaml b/.github/workflows/main-one.yaml
index e7c6d019..4c66b26d 100644
--- a/.github/workflows/main-one.yaml
+++ b/.github/workflows/main-one.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-petroleum.yaml b/.github/workflows/main-petroleum.yaml
index f4d1d274..ca93709f 100644
--- a/.github/workflows/main-petroleum.yaml
+++ b/.github/workflows/main-petroleum.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-pipscoin.yaml b/.github/workflows/main-pipscoin.yaml
index 999d9a96..cfb9483f 100644
--- a/.github/workflows/main-pipscoin.yaml
+++ b/.github/workflows/main-pipscoin.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-profit.yaml b/.github/workflows/main-profit.yaml
index 72109e69..70098f54 100644
--- a/.github/workflows/main-profit.yaml
+++ b/.github/workflows/main-profit.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-shibgreen.yaml b/.github/workflows/main-shibgreen.yaml
index c629c8ee..f42b97c4 100644
--- a/.github/workflows/main-shibgreen.yaml
+++ b/.github/workflows/main-shibgreen.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-silicoin.yaml b/.github/workflows/main-silicoin.yaml
index ec39655e..eea38269 100644
--- a/.github/workflows/main-silicoin.yaml
+++ b/.github/workflows/main-silicoin.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-staicoin.yaml b/.github/workflows/main-staicoin.yaml
index f0ba0c07..a570112d 100644
--- a/.github/workflows/main-staicoin.yaml
+++ b/.github/workflows/main-staicoin.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-stor.yaml b/.github/workflows/main-stor.yaml
index ef142e9d..59b0bc04 100644
--- a/.github/workflows/main-stor.yaml
+++ b/.github/workflows/main-stor.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/main-tad.yaml b/.github/workflows/main-tad.yaml
index 127bf225..5a158c92 100644
--- a/.github/workflows/main-tad.yaml
+++ b/.github/workflows/main-tad.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/main-wheat.yaml b/.github/workflows/main-wheat.yaml
index 5778c95a..f1447772 100644
--- a/.github/workflows/main-wheat.yaml
+++ b/.github/workflows/main-wheat.yaml
@@ -39,6 +39,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-apple.yaml b/.github/workflows/test-apple.yaml
index 5cbd0e04..a85fd395 100644
--- a/.github/workflows/test-apple.yaml
+++ b/.github/workflows/test-apple.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-ballcoin.yaml b/.github/workflows/test-ballcoin.yaml
index 908b7df8..68a67aaf 100644
--- a/.github/workflows/test-ballcoin.yaml
+++ b/.github/workflows/test-ballcoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
index b8209c4e..7434fa39 100644
--- a/.github/workflows/test-base.yaml
+++ b/.github/workflows/test-base.yaml
@@ -35,6 +35,7 @@ jobs:
           file: docker/dockerfile-jammy.base
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:test
diff --git a/.github/workflows/test-bpx.yaml b/.github/workflows/test-bpx.yaml
index decc3443..29cee94b 100644
--- a/.github/workflows/test-bpx.yaml
+++ b/.github/workflows/test-bpx.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-btcgreen.yaml b/.github/workflows/test-btcgreen.yaml
index 88353d0f..83284392 100644
--- a/.github/workflows/test-btcgreen.yaml
+++ b/.github/workflows/test-btcgreen.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-cactus.yaml b/.github/workflows/test-cactus.yaml
index 0796aa79..8644cecc 100644
--- a/.github/workflows/test-cactus.yaml
+++ b/.github/workflows/test-cactus.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index e7648eed..fa66f01a 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-chinilla.yaml b/.github/workflows/test-chinilla.yaml
index 3b5a890b..a0793869 100644
--- a/.github/workflows/test-chinilla.yaml
+++ b/.github/workflows/test-chinilla.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index ab2009f4..0aeee3e2 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -81,6 +81,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-coffee.yaml b/.github/workflows/test-coffee.yaml
index 1319a5fd..5603cf27 100644
--- a/.github/workflows/test-coffee.yaml
+++ b/.github/workflows/test-coffee.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-cryptodoge.yaml b/.github/workflows/test-cryptodoge.yaml
index 1dc575b5..8692df85 100644
--- a/.github/workflows/test-cryptodoge.yaml
+++ b/.github/workflows/test-cryptodoge.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-ecostake.yaml b/.github/workflows/test-ecostake.yaml
index a82512d9..f7c46569 100644
--- a/.github/workflows/test-ecostake.yaml
+++ b/.github/workflows/test-ecostake.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-flax.yaml b/.github/workflows/test-flax.yaml
index d8aa4a45..b46daa7d 100644
--- a/.github/workflows/test-flax.yaml
+++ b/.github/workflows/test-flax.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-flora.yaml b/.github/workflows/test-flora.yaml
index 93828955..0273e058 100644
--- a/.github/workflows/test-flora.yaml
+++ b/.github/workflows/test-flora.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-gold.yaml b/.github/workflows/test-gold.yaml
index a6e0f4fc..45f462fe 100644
--- a/.github/workflows/test-gold.yaml
+++ b/.github/workflows/test-gold.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-greenbtc.yaml b/.github/workflows/test-greenbtc.yaml
index 6e9cbbba..399cc3c8 100644
--- a/.github/workflows/test-greenbtc.yaml
+++ b/.github/workflows/test-greenbtc.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-hddcoin.yaml b/.github/workflows/test-hddcoin.yaml
index 2c42f949..857e5ac2 100644
--- a/.github/workflows/test-hddcoin.yaml
+++ b/.github/workflows/test-hddcoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-littlelambocoin.yaml b/.github/workflows/test-littlelambocoin.yaml
index c3d86a59..cab6398f 100644
--- a/.github/workflows/test-littlelambocoin.yaml
+++ b/.github/workflows/test-littlelambocoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-maize.yaml b/.github/workflows/test-maize.yaml
index b0ab09b6..ad4f7298 100644
--- a/.github/workflows/test-maize.yaml
+++ b/.github/workflows/test-maize.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-mint.yaml b/.github/workflows/test-mint.yaml
index f106b596..cbc92b71 100644
--- a/.github/workflows/test-mint.yaml
+++ b/.github/workflows/test-mint.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index abf5d0ee..add9a2f1 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-moon.yaml b/.github/workflows/test-moon.yaml
index f150d796..71e5c242 100644
--- a/.github/workflows/test-moon.yaml
+++ b/.github/workflows/test-moon.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-nchain.yaml b/.github/workflows/test-nchain.yaml
index cd034876..3d1acd2a 100644
--- a/.github/workflows/test-nchain.yaml
+++ b/.github/workflows/test-nchain.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-one.yaml b/.github/workflows/test-one.yaml
index ca148779..4350257b 100644
--- a/.github/workflows/test-one.yaml
+++ b/.github/workflows/test-one.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-petroleum.yaml b/.github/workflows/test-petroleum.yaml
index 7f9a954e..fc435e92 100644
--- a/.github/workflows/test-petroleum.yaml
+++ b/.github/workflows/test-petroleum.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-pipscoin.yaml b/.github/workflows/test-pipscoin.yaml
index 7b9896d9..85c3df32 100644
--- a/.github/workflows/test-pipscoin.yaml
+++ b/.github/workflows/test-pipscoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-profit.yaml b/.github/workflows/test-profit.yaml
index 7dd758ab..d4e93c99 100644
--- a/.github/workflows/test-profit.yaml
+++ b/.github/workflows/test-profit.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-shibgreen.yaml b/.github/workflows/test-shibgreen.yaml
index c725981b..4516c316 100644
--- a/.github/workflows/test-shibgreen.yaml
+++ b/.github/workflows/test-shibgreen.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-silicoin.yaml b/.github/workflows/test-silicoin.yaml
index cc9c0ae3..2a094e17 100644
--- a/.github/workflows/test-silicoin.yaml
+++ b/.github/workflows/test-silicoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-staicoin.yaml b/.github/workflows/test-staicoin.yaml
index 79752209..7c647521 100644
--- a/.github/workflows/test-staicoin.yaml
+++ b/.github/workflows/test-staicoin.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-stor.yaml b/.github/workflows/test-stor.yaml
index cb88a255..18c99ba5 100644
--- a/.github/workflows/test-stor.yaml
+++ b/.github/workflows/test-stor.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=focal"
diff --git a/.github/workflows/test-tad.yaml b/.github/workflows/test-tad.yaml
index 9a425c9c..844c6456 100644
--- a/.github/workflows/test-tad.yaml
+++ b/.github/workflows/test-tad.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/.github/workflows/test-wheat.yaml b/.github/workflows/test-wheat.yaml
index 8afe34c7..d79ec794 100644
--- a/.github/workflows/test-wheat.yaml
+++ b/.github/workflows/test-wheat.yaml
@@ -38,6 +38,7 @@ jobs:
           file: docker/dockerfile
           context: .
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           build-args: |
             "UBUNTU_VER=jammy"
diff --git a/web/actions/chiadog.py b/web/actions/chiadog.py
index c0f70e4b..9213f3a7 100644
--- a/web/actions/chiadog.py
+++ b/web/actions/chiadog.py
@@ -44,8 +44,13 @@ def save_config(farmer, blockchain, config):
         flash(_("Nice! Chiadog's config.yaml validated and saved successfully."), 'success')
 
 def get_notifications():
-    alerts = db.session.query(a.Alert).order_by(a.Alert.created_at.desc()).all()
-    return Alerts(alerts)
+    try: # Due to defect in date formatting around January 2023, if get a Value
+        alerts = db.session.query(a.Alert).order_by(a.Alert.created_at.desc()).all()
+        return Alerts(alerts)
+    except ValueError:
+        app.logger.error("Found likely malformeed alert timestamp.  Now clearing bad alerts.")
+        remove_all_alerts()
+        return Alerts([])
 
 def remove_alerts(unique_ids):
     app.logger.info("Removing {0} alerts: {1}".format(len(unique_ids), unique_ids))

From b9f2537beaa955b8073eb9fcc10c5854f5f2fb4d Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 30 Jan 2023 14:26:12 -0700
Subject: [PATCH 1208/1625] Fix for MMX binary path.

---
 common/config/blockchains.json    | 2 +-
 config/plotman.sample-chives.yaml | 2 --
 config/plotman.sample.yaml        | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 26e40f01..16c707fa 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -325,7 +325,7 @@
     "mmx": {
         "name": "MMX",
         "symbol": "MMX" ,
-        "binary":  "/mmx-node/build/mmx",
+        "binary":  "/mmx-node/bin/mmx",
         "network_path": "/root/.mmx/testnet9",
         "network_name": "testnet9",
         "network_port": 12339,
diff --git a/config/plotman.sample-chives.yaml b/config/plotman.sample-chives.yaml
index 151a4fef..d8193b92 100644
--- a/config/plotman.sample-chives.yaml
+++ b/config/plotman.sample-chives.yaml
@@ -114,5 +114,3 @@ plotting:
                 n_buckets3: 256       # Default is 256
                 n_rmulti2: 1          # Default is 1
                 network_port: 9699    # Default is 8444, but use 9699 for Chives
-                compression: 1        # Compression level (default = 1, min = 1, max = 9)
-                gpu_plot: false       # If true, requires a GPU device in-container to plot
diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml
index 85287396..41a0f97f 100644
--- a/config/plotman.sample.yaml
+++ b/config/plotman.sample.yaml
@@ -119,8 +119,6 @@ plotting:
                 n_buckets3: 256       # Default is 256
                 n_rmulti2: 1          # Default is 1
                 network_port: 8444    # Default is 8444, but use 9699 for Chives
-                compression: 1        # Compression level (default = 1, min = 1, max = 9)
-                gpu_plot: false       # If true, requires a GPU device in-container to plot
        
         chia:
                 # The stock plotter; see https://github.com/guydavis/machinaris/wiki/Chia#plotting

From d040aefef92385a92e0701ba0ec49dc5d323e334 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 30 Jan 2023 15:40:44 -0700
Subject: [PATCH 1209/1625] Display compression level of plotting.

---
 api/commands/plotman_cli.py              |   4 +-
 api/migrations/versions/6cda05ff2952_.py | 440 +++++++++++++++++++++++
 api/models/mmx.py                        |   2 +-
 api/models/plotman.py                    |   2 +-
 api/schedules/stats_effort.py            |   2 +-
 api/schedules/status_plots.py            |   2 +-
 api/schedules/status_plotting.py         |   1 +
 common/models/plottings.py               |   1 +
 web/__init__.py                          |   2 +-
 web/actions/warnings.py                  |   2 +-
 web/models/plotman.py                    |   2 +
 11 files changed, 452 insertions(+), 8 deletions(-)
 create mode 100644 api/migrations/versions/6cda05ff2952_.py

diff --git a/api/commands/plotman_cli.py b/api/commands/plotman_cli.py
index 0814ad76..18ed02a6 100644
--- a/api/commands/plotman_cli.py
+++ b/api/commands/plotman_cli.py
@@ -175,7 +175,7 @@ def clean_tmp_dirs_before_run():
 
 def check_tmp_file_is_day_old(path):
     try:
-        match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+)", path.name)
+        match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+)", path.name)
         if match:
             plot_date = datetime.datetime.strptime("{0}-{1}-{2} {3}:{4}".format(
                 match.group(2), match.group(3), match.group(4), match.group(5), match.group(6)), 
@@ -276,7 +276,7 @@ def find_plotting_job_log(plot_id):
     return None
 
 def analyze(plot_file):
-    groups = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot_file)
+    groups = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot_file)
     if not groups:
         return "Invalid plot file name provided: {0}".format(plot_file)
     plot_log_file = find_plotting_job_log(groups[7])
diff --git a/api/migrations/versions/6cda05ff2952_.py b/api/migrations/versions/6cda05ff2952_.py
new file mode 100644
index 00000000..d42a7b5f
--- /dev/null
+++ b/api/migrations/versions/6cda05ff2952_.py
@@ -0,0 +1,440 @@
+"""empty message
+
+Revision ID: 6cda05ff2952
+Revises: 2f7f4aa4758b
+Create Date: 2023-01-30 15:28:21.362394
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '6cda05ff2952'
+down_revision = '2f7f4aa4758b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade(engine_name):
+    globals()["upgrade_%s" % engine_name]()
+
+
+def downgrade(engine_name):
+    globals()["downgrade_%s" % engine_name]()
+
+
+
+
+
+def upgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_alerts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_alerts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_blockchains():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_blockchains():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_challenges():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_challenges():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_connections():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_connections():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_drives():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_drives():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_farms():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_farms():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_keys():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_keys():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_partials():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_partials():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plotnfts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plotnfts():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_plottings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('plottings', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('lvl', sa.Integer(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade_plottings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('plottings', schema=None) as batch_op:
+        batch_op.drop_column('lvl')
+
+    # ### end Alembic commands ###
+
+
+def upgrade_plots():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_plots():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_pools():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_pools():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_transfers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_transfers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_wallets():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_wallets():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_warnings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_warnings():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_workers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_workers():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plot_count():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plot_count():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_total_coins():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_total_coins():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_netspace_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_netspace_size():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_time_to_win():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_time_to_win():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_effort():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_effort():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plots_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plots_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_total_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_disk_used():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_plotting_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_plotting_disk_free():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_farmed_blocks():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_farmed_blocks():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_wallet_balances():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_wallet_balances():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_total_balance():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_total_balance():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_container_mem_gib():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_container_mem_gib():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def upgrade_stat_host_mem_pct():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade_stat_host_mem_pct():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
diff --git a/api/models/mmx.py b/api/models/mmx.py
index 653b7b4a..5410c5d0 100644
--- a/api/models/mmx.py
+++ b/api/models/mmx.py
@@ -82,7 +82,7 @@ def __init__(self, entries):
                 app.logger.info("Skipping non-plot file named: {0}".format(path))
                 continue
             dir,file=os.path.split(path)
-            groups = re.match("plot-mmx-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
+            groups = re.match("plot-mmx-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
             if not groups:
                 app.logger.info("Invalid plot file name provided: {0}".format(file))
                 continue
diff --git a/api/models/plotman.py b/api/models/plotman.py
index 43955a36..eea7b113 100644
--- a/api/models/plotman.py
+++ b/api/models/plotman.py
@@ -84,7 +84,7 @@ def parse_transfer_log(self, log_file, running_transfers):
                 elif line.startswith("Completed"):
                     self.end_date = line[line.index(' at ')+4:].strip()
                 elif line.startswith("+ rsync"):
-                    m = re.search("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", line)
+                    m = re.search("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", line)
                     if m:
                         self.plot_id = m.group(7)[:16].strip()
                         self.k = int(m.group(1).strip())
diff --git a/api/schedules/stats_effort.py b/api/schedules/stats_effort.py
index 6de3c607..69a538aa 100644
--- a/api/schedules/stats_effort.py
+++ b/api/schedules/stats_effort.py
@@ -41,7 +41,7 @@ def get_oldest_plot_file_time():
         for plot_dir in globals.get_disks("plots"):
             plots = [f for f in os.listdir(plot_dir) if os.path.isfile(os.path.join(plot_dir,f))]
             for plot in plots:
-                match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot)
+                match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot)
                 if match:
                     created_at_str = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
                     created_at_secs = time.mktime(datetime.datetime.strptime(created_at_str, "%Y-%m-%d %H:%M").timetuple())
diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index f7370d51..bf0fd3fb 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -29,7 +29,7 @@
 
 def get_plot_attrs(plot_id, filename):
     dir,file = os.path.split(filename)
-    match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
+    match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
         short_plot_id = match.group(7)[:16]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
diff --git a/api/schedules/status_plotting.py b/api/schedules/status_plotting.py
index c4c6b7a4..d279b2b7 100644
--- a/api/schedules/status_plotting.py
+++ b/api/schedules/status_plotting.py
@@ -29,6 +29,7 @@ def update():
                     "blockchain": blockchain,
                     "plotter": plot['plotter'],
                     "k": plot['k'],
+                    "lvl": plot['lvl'],
                     "tmp": plot['tmp'],
                     "dst": plot['dst'],
                     "wall": plot['wall'],
diff --git a/common/models/plottings.py b/common/models/plottings.py
index 85976376..de2294fc 100644
--- a/common/models/plottings.py
+++ b/common/models/plottings.py
@@ -16,6 +16,7 @@ class Plotting(db.Model):
     plotter = sa.Column(sa.String(length=64), nullable=False)
     blockchain = sa.Column(sa.String(length=64), nullable=False)
     k = sa.Column(sa.Integer, nullable=False)
+    lvl = sa.Column(sa.Integer, nullable=True)
     tmp = sa.Column(sa.String(length=255), nullable=False)
     dst = sa.Column(sa.String(length=255), nullable=False)
     wall = sa.Column(sa.String(length=8), nullable=False)
diff --git a/web/__init__.py b/web/__init__.py
index e5518432..4f74d2f2 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -85,7 +85,7 @@ def timesecondstrimmer(value):
 
 def plotnameshortener(value):
     #app.logger.info("Shorten: {0}".format(value))
-    match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", value)
+    match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", value)
     if match:
         return "plot-k{0}-{1}-{2}-{3}-{4}-{5}-{6}...".format( match.group(1), 
             match.group(2), match.group(3), match.group(4), match.group(5), match.group(6),
diff --git a/web/actions/warnings.py b/web/actions/warnings.py
index 84940924..c0a73b74 100644
--- a/web/actions/warnings.py
+++ b/web/actions/warnings.py
@@ -84,7 +84,7 @@ def check_warnings(args):
 
 def get_plot_attrs(filename):
     dir,file = os.path.split(filename)
-    match = re.match("plot(?:-mmx)?-k(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
+    match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
         short_plot_id = match.group(7)[:16]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
diff --git a/web/models/plotman.py b/web/models/plotman.py
index ac2705f2..eb37e86b 100644
--- a/web/models/plotman.py
+++ b/web/models/plotman.py
@@ -15,6 +15,7 @@ def __init__(self, plottings):
                         'plotter',
                         'plot_id',
                         'k',
+                        'lvl',
                         'tmp',
                         'dst',
                         'wall',
@@ -42,6 +43,7 @@ def __init__(self, plottings):
                 'plotter': plotting.plotter,
                 'plot_id': plotting.plot_id,
                 'k': plotting.k,
+                'lvl': plotting.lvl,
                 'tmp': self.strip_trailing_slash(plotting.tmp),
                 'dst': self.strip_trailing_slash(plotting.dst),
                 'wall': plotting.wall,

From ad53cd088ffbc669e7ff898f205e3bc1b917dca9 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 30 Jan 2023 16:29:09 -0700
Subject: [PATCH 1210/1625] Fix for compression display.

---
 api/models/plotman.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/models/plotman.py b/api/models/plotman.py
index eea7b113..29278d5e 100644
--- a/api/models/plotman.py
+++ b/api/models/plotman.py
@@ -16,7 +16,7 @@ def __init__(self, cli_stdout, plotman_pid):
             elif "plot id" in line.strip(): # The header row
                 self.columns = line.replace('plot id', 'plot_id').strip().split()
                 # Plotman has two columns both named 'tmp' so change the 2nd one to 'size'
-                self.columns[7] = 'size'
+                self.columns[8] = 'size'
             else: # Check for a plotting job row
                 values = line.split()
                 if len(values) > 1 and values[1] in ['chia', 'madmax', 'bladebit']:

From 29769af8f4b5af3887068c97ee39efad4a191322 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 30 Jan 2023 18:01:55 -0700
Subject: [PATCH 1211/1625] MMX compression.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44e438ac..4ad76a3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. The format
  - Fix missing Connections listing for Flax and MMX blockchains.  Thanks @ekersey!
  - Fix for Bladebit ramplot relaunching.  Thanks @JoeZotacExperience!
  - Multiple functionality & performance cleanups from excellent code review by @qoole.
+ - Display compression level for active plotting jobs, currently MMX only.
 ## Updated 
  - [BTCGreen](https://github.com/BTCgreen-Network/btcgreen-blockchain/releases/tag/1.7.0b) to v1.7.0b
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.6.2) to v1.6.2

From 21d27f16b99b7b48bba4a13ca787c789ce9178c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Jan 2023 07:01:48 +0000
Subject: [PATCH 1212/1625] Bump docker/build-push-action from 3 to 4

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 .github/workflows/develop-apple.yaml           | 2 +-
 .github/workflows/develop-base.yaml            | 4 ++--
 .github/workflows/develop-bpx.yaml             | 2 +-
 .github/workflows/develop-btcgreen.yaml        | 2 +-
 .github/workflows/develop-cactus.yaml          | 2 +-
 .github/workflows/develop-chia.yaml            | 2 +-
 .github/workflows/develop-chinilla.yaml        | 2 +-
 .github/workflows/develop-chives.yaml          | 2 +-
 .github/workflows/develop-coffee.yaml          | 2 +-
 .github/workflows/develop-cryptodoge.yaml      | 2 +-
 .github/workflows/develop-ecostake.yaml        | 2 +-
 .github/workflows/develop-flax.yaml            | 2 +-
 .github/workflows/develop-flora.yaml           | 2 +-
 .github/workflows/develop-gold.yaml            | 2 +-
 .github/workflows/develop-greenbtc.yaml        | 2 +-
 .github/workflows/develop-hddcoin.yaml         | 2 +-
 .github/workflows/develop-littlelambocoin.yaml | 2 +-
 .github/workflows/develop-maize.yaml           | 2 +-
 .github/workflows/develop-mint.yaml            | 2 +-
 .github/workflows/develop-mmx.yaml             | 2 +-
 .github/workflows/develop-moon.yaml            | 2 +-
 .github/workflows/develop-nchain.yaml          | 2 +-
 .github/workflows/develop-one.yaml             | 2 +-
 .github/workflows/develop-petroleum.yaml       | 2 +-
 .github/workflows/develop-profit.yaml          | 2 +-
 .github/workflows/develop-shibgreen.yaml       | 2 +-
 .github/workflows/develop-silicoin.yaml        | 2 +-
 .github/workflows/develop-staicoin.yaml        | 2 +-
 .github/workflows/develop-stor.yaml            | 2 +-
 .github/workflows/develop-tad.yaml             | 2 +-
 .github/workflows/develop-wheat.yaml           | 2 +-
 .github/workflows/main-apple.yaml              | 2 +-
 .github/workflows/main-base.yaml               | 4 ++--
 .github/workflows/main-bpx.yaml                | 2 +-
 .github/workflows/main-btcgreen.yaml           | 2 +-
 .github/workflows/main-cactus.yaml             | 2 +-
 .github/workflows/main-chia.yaml               | 2 +-
 .github/workflows/main-chinilla.yaml           | 2 +-
 .github/workflows/main-chives.yaml             | 2 +-
 .github/workflows/main-coffee.yaml             | 2 +-
 .github/workflows/main-cryptodoge.yaml         | 2 +-
 .github/workflows/main-ecostake.yaml           | 2 +-
 .github/workflows/main-flax.yaml               | 2 +-
 .github/workflows/main-flora.yaml              | 2 +-
 .github/workflows/main-gold.yaml               | 2 +-
 .github/workflows/main-greenbtc.yaml           | 2 +-
 .github/workflows/main-hddcoin.yaml            | 2 +-
 .github/workflows/main-littlelambocoin.yaml    | 2 +-
 .github/workflows/main-maize.yaml              | 2 +-
 .github/workflows/main-mint.yaml               | 2 +-
 .github/workflows/main-mmx.yaml                | 2 +-
 .github/workflows/main-moon.yaml               | 2 +-
 .github/workflows/main-nchain.yaml             | 2 +-
 .github/workflows/main-one.yaml                | 2 +-
 .github/workflows/main-petroleum.yaml          | 2 +-
 .github/workflows/main-profit.yaml             | 2 +-
 .github/workflows/main-shibgreen.yaml          | 2 +-
 .github/workflows/main-silicoin.yaml           | 2 +-
 .github/workflows/main-staicoin.yaml           | 2 +-
 .github/workflows/main-stor.yaml               | 2 +-
 .github/workflows/main-tad.yaml                | 2 +-
 .github/workflows/main-wheat.yaml              | 2 +-
 .github/workflows/test-apple.yaml              | 2 +-
 .github/workflows/test-base.yaml               | 4 ++--
 .github/workflows/test-bpx.yaml                | 2 +-
 .github/workflows/test-btcgreen.yaml           | 2 +-
 .github/workflows/test-cactus.yaml             | 2 +-
 .github/workflows/test-chia.yaml               | 2 +-
 .github/workflows/test-chinilla.yaml           | 2 +-
 .github/workflows/test-chives.yaml             | 2 +-
 .github/workflows/test-coffee.yaml             | 2 +-
 .github/workflows/test-cryptodoge.yaml         | 2 +-
 .github/workflows/test-ecostake.yaml           | 2 +-
 .github/workflows/test-flax.yaml               | 2 +-
 .github/workflows/test-flora.yaml              | 2 +-
 .github/workflows/test-gold.yaml               | 2 +-
 .github/workflows/test-greenbtc.yaml           | 2 +-
 .github/workflows/test-hddcoin.yaml            | 2 +-
 .github/workflows/test-littlelambocoin.yaml    | 2 +-
 .github/workflows/test-maize.yaml              | 2 +-
 .github/workflows/test-mint.yaml               | 2 +-
 .github/workflows/test-mmx.yaml                | 2 +-
 .github/workflows/test-moon.yaml               | 2 +-
 .github/workflows/test-nchain.yaml             | 2 +-
 .github/workflows/test-one.yaml                | 2 +-
 .github/workflows/test-petroleum.yaml          | 2 +-
 .github/workflows/test-profit.yaml             | 2 +-
 .github/workflows/test-shibgreen.yaml          | 2 +-
 .github/workflows/test-silicoin.yaml           | 2 +-
 .github/workflows/test-staicoin.yaml           | 2 +-
 .github/workflows/test-stor.yaml               | 2 +-
 .github/workflows/test-tad.yaml                | 2 +-
 .github/workflows/test-wheat.yaml              | 2 +-
 93 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/develop-apple.yaml b/.github/workflows/develop-apple.yaml
index 661ea9a0..5e13aba5 100644
--- a/.github/workflows/develop-apple.yaml
+++ b/.github/workflows/develop-apple.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
index 0b5b6515..0c1ada83 100644
--- a/.github/workflows/develop-base.yaml
+++ b/.github/workflows/develop-base.yaml
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile-jammy.base
           context: .
@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile-focal.base
           context: .
diff --git a/.github/workflows/develop-bpx.yaml b/.github/workflows/develop-bpx.yaml
index afc1e293..6d2f37ef 100644
--- a/.github/workflows/develop-bpx.yaml
+++ b/.github/workflows/develop-bpx.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-btcgreen.yaml b/.github/workflows/develop-btcgreen.yaml
index f7f39214..c1def0bf 100644
--- a/.github/workflows/develop-btcgreen.yaml
+++ b/.github/workflows/develop-btcgreen.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-cactus.yaml b/.github/workflows/develop-cactus.yaml
index dd906b79..a04293fc 100644
--- a/.github/workflows/develop-cactus.yaml
+++ b/.github/workflows/develop-cactus.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index c9ba01d5..c493529d 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-chinilla.yaml b/.github/workflows/develop-chinilla.yaml
index 1538b8b9..35c45f1f 100644
--- a/.github/workflows/develop-chinilla.yaml
+++ b/.github/workflows/develop-chinilla.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
index 6989dd7b..4e9b52a0 100644
--- a/.github/workflows/develop-chives.yaml
+++ b/.github/workflows/develop-chives.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-coffee.yaml b/.github/workflows/develop-coffee.yaml
index 2877fe8c..5147bee5 100644
--- a/.github/workflows/develop-coffee.yaml
+++ b/.github/workflows/develop-coffee.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-cryptodoge.yaml b/.github/workflows/develop-cryptodoge.yaml
index 235a65de..20a4677e 100644
--- a/.github/workflows/develop-cryptodoge.yaml
+++ b/.github/workflows/develop-cryptodoge.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-ecostake.yaml b/.github/workflows/develop-ecostake.yaml
index f2ecd3f7..833bdb55 100644
--- a/.github/workflows/develop-ecostake.yaml
+++ b/.github/workflows/develop-ecostake.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-flax.yaml b/.github/workflows/develop-flax.yaml
index 22034ea6..c46db8e0 100644
--- a/.github/workflows/develop-flax.yaml
+++ b/.github/workflows/develop-flax.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-flora.yaml b/.github/workflows/develop-flora.yaml
index ff8bdeac..545e620e 100644
--- a/.github/workflows/develop-flora.yaml
+++ b/.github/workflows/develop-flora.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-gold.yaml b/.github/workflows/develop-gold.yaml
index 7f66ee56..dcbbf0db 100644
--- a/.github/workflows/develop-gold.yaml
+++ b/.github/workflows/develop-gold.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-greenbtc.yaml b/.github/workflows/develop-greenbtc.yaml
index fb006dee..47e22c1d 100644
--- a/.github/workflows/develop-greenbtc.yaml
+++ b/.github/workflows/develop-greenbtc.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-hddcoin.yaml b/.github/workflows/develop-hddcoin.yaml
index c67caac5..983ccd39 100644
--- a/.github/workflows/develop-hddcoin.yaml
+++ b/.github/workflows/develop-hddcoin.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-littlelambocoin.yaml b/.github/workflows/develop-littlelambocoin.yaml
index 2bc9e76f..8d34e49f 100644
--- a/.github/workflows/develop-littlelambocoin.yaml
+++ b/.github/workflows/develop-littlelambocoin.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-maize.yaml b/.github/workflows/develop-maize.yaml
index b928392b..e9ea6972 100644
--- a/.github/workflows/develop-maize.yaml
+++ b/.github/workflows/develop-maize.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-mint.yaml b/.github/workflows/develop-mint.yaml
index c8200838..6ecc7720 100644
--- a/.github/workflows/develop-mint.yaml
+++ b/.github/workflows/develop-mint.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 489bae37..4dab50f3 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-moon.yaml b/.github/workflows/develop-moon.yaml
index 6cb9bc7f..e6b9cfbf 100644
--- a/.github/workflows/develop-moon.yaml
+++ b/.github/workflows/develop-moon.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-nchain.yaml b/.github/workflows/develop-nchain.yaml
index 5299e4e9..7e18df4f 100644
--- a/.github/workflows/develop-nchain.yaml
+++ b/.github/workflows/develop-nchain.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-one.yaml b/.github/workflows/develop-one.yaml
index 8743c00f..42d67774 100644
--- a/.github/workflows/develop-one.yaml
+++ b/.github/workflows/develop-one.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-petroleum.yaml b/.github/workflows/develop-petroleum.yaml
index a59ffd7c..58aef56a 100644
--- a/.github/workflows/develop-petroleum.yaml
+++ b/.github/workflows/develop-petroleum.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-profit.yaml b/.github/workflows/develop-profit.yaml
index 20f05eb8..343d07d3 100644
--- a/.github/workflows/develop-profit.yaml
+++ b/.github/workflows/develop-profit.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-shibgreen.yaml b/.github/workflows/develop-shibgreen.yaml
index 0931ac11..61306330 100644
--- a/.github/workflows/develop-shibgreen.yaml
+++ b/.github/workflows/develop-shibgreen.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-silicoin.yaml b/.github/workflows/develop-silicoin.yaml
index 16e113f2..1621d999 100644
--- a/.github/workflows/develop-silicoin.yaml
+++ b/.github/workflows/develop-silicoin.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-staicoin.yaml b/.github/workflows/develop-staicoin.yaml
index f8a20ea9..fd6fc2d5 100644
--- a/.github/workflows/develop-staicoin.yaml
+++ b/.github/workflows/develop-staicoin.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-stor.yaml b/.github/workflows/develop-stor.yaml
index addd6b0c..b4454f3e 100644
--- a/.github/workflows/develop-stor.yaml
+++ b/.github/workflows/develop-stor.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-tad.yaml b/.github/workflows/develop-tad.yaml
index a90a6cfe..29dca77b 100644
--- a/.github/workflows/develop-tad.yaml
+++ b/.github/workflows/develop-tad.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/develop-wheat.yaml b/.github/workflows/develop-wheat.yaml
index 5860dd1a..1b2b64e6 100644
--- a/.github/workflows/develop-wheat.yaml
+++ b/.github/workflows/develop-wheat.yaml
@@ -32,7 +32,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-apple.yaml b/.github/workflows/main-apple.yaml
index 0b480deb..ace536bd 100644
--- a/.github/workflows/main-apple.yaml
+++ b/.github/workflows/main-apple.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
index 080f1acd..856d9fc8 100644
--- a/.github/workflows/main-base.yaml
+++ b/.github/workflows/main-base.yaml
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile-jammy.base
           context: .
@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile-focal.base
           context: .
diff --git a/.github/workflows/main-bpx.yaml b/.github/workflows/main-bpx.yaml
index 38747738..6a68fbf7 100644
--- a/.github/workflows/main-bpx.yaml
+++ b/.github/workflows/main-bpx.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-btcgreen.yaml b/.github/workflows/main-btcgreen.yaml
index d41a9a42..19bb9a85 100644
--- a/.github/workflows/main-btcgreen.yaml
+++ b/.github/workflows/main-btcgreen.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-cactus.yaml b/.github/workflows/main-cactus.yaml
index 5f09607f..c7cae57a 100644
--- a/.github/workflows/main-cactus.yaml
+++ b/.github/workflows/main-cactus.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 7ed8bf78..78ab24ae 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-chinilla.yaml b/.github/workflows/main-chinilla.yaml
index c31c042b..ae5311c7 100644
--- a/.github/workflows/main-chinilla.yaml
+++ b/.github/workflows/main-chinilla.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 81bd249f..9ad75274 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-coffee.yaml b/.github/workflows/main-coffee.yaml
index f711fd29..e5ea2992 100644
--- a/.github/workflows/main-coffee.yaml
+++ b/.github/workflows/main-coffee.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-cryptodoge.yaml b/.github/workflows/main-cryptodoge.yaml
index 79536f10..c029bd4f 100644
--- a/.github/workflows/main-cryptodoge.yaml
+++ b/.github/workflows/main-cryptodoge.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-ecostake.yaml b/.github/workflows/main-ecostake.yaml
index 57fe8614..29699bbc 100644
--- a/.github/workflows/main-ecostake.yaml
+++ b/.github/workflows/main-ecostake.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-flax.yaml b/.github/workflows/main-flax.yaml
index 0096d7f4..2bcdf76c 100644
--- a/.github/workflows/main-flax.yaml
+++ b/.github/workflows/main-flax.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-flora.yaml b/.github/workflows/main-flora.yaml
index 75ccb667..fb7900a9 100644
--- a/.github/workflows/main-flora.yaml
+++ b/.github/workflows/main-flora.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-gold.yaml b/.github/workflows/main-gold.yaml
index 3a5c2693..ddf7158e 100644
--- a/.github/workflows/main-gold.yaml
+++ b/.github/workflows/main-gold.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-greenbtc.yaml b/.github/workflows/main-greenbtc.yaml
index 4a55cfd3..79fdd055 100644
--- a/.github/workflows/main-greenbtc.yaml
+++ b/.github/workflows/main-greenbtc.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-hddcoin.yaml b/.github/workflows/main-hddcoin.yaml
index 045e0ee4..6ae15fdf 100644
--- a/.github/workflows/main-hddcoin.yaml
+++ b/.github/workflows/main-hddcoin.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-littlelambocoin.yaml b/.github/workflows/main-littlelambocoin.yaml
index 764e578e..07b14f9e 100644
--- a/.github/workflows/main-littlelambocoin.yaml
+++ b/.github/workflows/main-littlelambocoin.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-maize.yaml b/.github/workflows/main-maize.yaml
index ef31e742..7327983a 100644
--- a/.github/workflows/main-maize.yaml
+++ b/.github/workflows/main-maize.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-mint.yaml b/.github/workflows/main-mint.yaml
index 92211dd8..739e8142 100644
--- a/.github/workflows/main-mint.yaml
+++ b/.github/workflows/main-mint.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 51358134..65b78061 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-moon.yaml b/.github/workflows/main-moon.yaml
index 270cffda..08aa5d06 100644
--- a/.github/workflows/main-moon.yaml
+++ b/.github/workflows/main-moon.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-nchain.yaml b/.github/workflows/main-nchain.yaml
index 5412e05f..e35c4ebf 100644
--- a/.github/workflows/main-nchain.yaml
+++ b/.github/workflows/main-nchain.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-one.yaml b/.github/workflows/main-one.yaml
index e7c6d019..1ccc6f57 100644
--- a/.github/workflows/main-one.yaml
+++ b/.github/workflows/main-one.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-petroleum.yaml b/.github/workflows/main-petroleum.yaml
index f4d1d274..ba486ff8 100644
--- a/.github/workflows/main-petroleum.yaml
+++ b/.github/workflows/main-petroleum.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-profit.yaml b/.github/workflows/main-profit.yaml
index 72109e69..262609b5 100644
--- a/.github/workflows/main-profit.yaml
+++ b/.github/workflows/main-profit.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-shibgreen.yaml b/.github/workflows/main-shibgreen.yaml
index c629c8ee..915ad023 100644
--- a/.github/workflows/main-shibgreen.yaml
+++ b/.github/workflows/main-shibgreen.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-silicoin.yaml b/.github/workflows/main-silicoin.yaml
index ec39655e..41785231 100644
--- a/.github/workflows/main-silicoin.yaml
+++ b/.github/workflows/main-silicoin.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-staicoin.yaml b/.github/workflows/main-staicoin.yaml
index 7df7e485..6b057e25 100644
--- a/.github/workflows/main-staicoin.yaml
+++ b/.github/workflows/main-staicoin.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-stor.yaml b/.github/workflows/main-stor.yaml
index ef142e9d..036edb29 100644
--- a/.github/workflows/main-stor.yaml
+++ b/.github/workflows/main-stor.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-tad.yaml b/.github/workflows/main-tad.yaml
index 127bf225..4852a97e 100644
--- a/.github/workflows/main-tad.yaml
+++ b/.github/workflows/main-tad.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/main-wheat.yaml b/.github/workflows/main-wheat.yaml
index 5778c95a..579ab336 100644
--- a/.github/workflows/main-wheat.yaml
+++ b/.github/workflows/main-wheat.yaml
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-apple.yaml b/.github/workflows/test-apple.yaml
index 5cbd0e04..bb390cc0 100644
--- a/.github/workflows/test-apple.yaml
+++ b/.github/workflows/test-apple.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
index b8209c4e..91bd072d 100644
--- a/.github/workflows/test-base.yaml
+++ b/.github/workflows/test-base.yaml
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile-jammy.base
           context: .
@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile-focal.base
           context: .
diff --git a/.github/workflows/test-bpx.yaml b/.github/workflows/test-bpx.yaml
index decc3443..31a9e0a7 100644
--- a/.github/workflows/test-bpx.yaml
+++ b/.github/workflows/test-bpx.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-btcgreen.yaml b/.github/workflows/test-btcgreen.yaml
index 88353d0f..fb4e916d 100644
--- a/.github/workflows/test-btcgreen.yaml
+++ b/.github/workflows/test-btcgreen.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-cactus.yaml b/.github/workflows/test-cactus.yaml
index 0796aa79..0343993f 100644
--- a/.github/workflows/test-cactus.yaml
+++ b/.github/workflows/test-cactus.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 8faf25c9..9ce4a225 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-chinilla.yaml b/.github/workflows/test-chinilla.yaml
index 3b5a890b..b9e67242 100644
--- a/.github/workflows/test-chinilla.yaml
+++ b/.github/workflows/test-chinilla.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index cad8f20f..cfef2eb4 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-coffee.yaml b/.github/workflows/test-coffee.yaml
index 1319a5fd..42849fca 100644
--- a/.github/workflows/test-coffee.yaml
+++ b/.github/workflows/test-coffee.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-cryptodoge.yaml b/.github/workflows/test-cryptodoge.yaml
index 1dc575b5..2085ebc9 100644
--- a/.github/workflows/test-cryptodoge.yaml
+++ b/.github/workflows/test-cryptodoge.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-ecostake.yaml b/.github/workflows/test-ecostake.yaml
index a82512d9..10cabe6e 100644
--- a/.github/workflows/test-ecostake.yaml
+++ b/.github/workflows/test-ecostake.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-flax.yaml b/.github/workflows/test-flax.yaml
index d8aa4a45..83fb241b 100644
--- a/.github/workflows/test-flax.yaml
+++ b/.github/workflows/test-flax.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-flora.yaml b/.github/workflows/test-flora.yaml
index 93828955..035aedf0 100644
--- a/.github/workflows/test-flora.yaml
+++ b/.github/workflows/test-flora.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-gold.yaml b/.github/workflows/test-gold.yaml
index a6e0f4fc..b5184a7e 100644
--- a/.github/workflows/test-gold.yaml
+++ b/.github/workflows/test-gold.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-greenbtc.yaml b/.github/workflows/test-greenbtc.yaml
index 6e9cbbba..2a128e3d 100644
--- a/.github/workflows/test-greenbtc.yaml
+++ b/.github/workflows/test-greenbtc.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-hddcoin.yaml b/.github/workflows/test-hddcoin.yaml
index 2c42f949..dc178731 100644
--- a/.github/workflows/test-hddcoin.yaml
+++ b/.github/workflows/test-hddcoin.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-littlelambocoin.yaml b/.github/workflows/test-littlelambocoin.yaml
index c3d86a59..4f33fcf0 100644
--- a/.github/workflows/test-littlelambocoin.yaml
+++ b/.github/workflows/test-littlelambocoin.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-maize.yaml b/.github/workflows/test-maize.yaml
index b0ab09b6..213376db 100644
--- a/.github/workflows/test-maize.yaml
+++ b/.github/workflows/test-maize.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-mint.yaml b/.github/workflows/test-mint.yaml
index f106b596..35ea7dfc 100644
--- a/.github/workflows/test-mint.yaml
+++ b/.github/workflows/test-mint.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index abf5d0ee..228e22ec 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-moon.yaml b/.github/workflows/test-moon.yaml
index f150d796..ab766575 100644
--- a/.github/workflows/test-moon.yaml
+++ b/.github/workflows/test-moon.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-nchain.yaml b/.github/workflows/test-nchain.yaml
index cd034876..e3c48754 100644
--- a/.github/workflows/test-nchain.yaml
+++ b/.github/workflows/test-nchain.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-one.yaml b/.github/workflows/test-one.yaml
index ca148779..1fee64a6 100644
--- a/.github/workflows/test-one.yaml
+++ b/.github/workflows/test-one.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-petroleum.yaml b/.github/workflows/test-petroleum.yaml
index 7f9a954e..8c729376 100644
--- a/.github/workflows/test-petroleum.yaml
+++ b/.github/workflows/test-petroleum.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-profit.yaml b/.github/workflows/test-profit.yaml
index 7dd758ab..0b7eb039 100644
--- a/.github/workflows/test-profit.yaml
+++ b/.github/workflows/test-profit.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-shibgreen.yaml b/.github/workflows/test-shibgreen.yaml
index c725981b..dec1c4da 100644
--- a/.github/workflows/test-shibgreen.yaml
+++ b/.github/workflows/test-shibgreen.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-silicoin.yaml b/.github/workflows/test-silicoin.yaml
index cc9c0ae3..06817b73 100644
--- a/.github/workflows/test-silicoin.yaml
+++ b/.github/workflows/test-silicoin.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-staicoin.yaml b/.github/workflows/test-staicoin.yaml
index 7111e555..294cf1f7 100644
--- a/.github/workflows/test-staicoin.yaml
+++ b/.github/workflows/test-staicoin.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-stor.yaml b/.github/workflows/test-stor.yaml
index cb88a255..5e197614 100644
--- a/.github/workflows/test-stor.yaml
+++ b/.github/workflows/test-stor.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-tad.yaml b/.github/workflows/test-tad.yaml
index 9a425c9c..5fb3febb 100644
--- a/.github/workflows/test-tad.yaml
+++ b/.github/workflows/test-tad.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .
diff --git a/.github/workflows/test-wheat.yaml b/.github/workflows/test-wheat.yaml
index 8afe34c7..f4c280ad 100644
--- a/.github/workflows/test-wheat.yaml
+++ b/.github/workflows/test-wheat.yaml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           file: docker/dockerfile
           context: .

From 39a163ebbc98c7b30e8f1cf9c2685a87659ed242 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 09:32:52 -0700
Subject: [PATCH 1213/1625] Fix for plot filename exceptions.

---
 api/commands/plotman_cli.py   | 4 ++--
 api/models/plotman.py         | 2 +-
 api/schedules/stats_effort.py | 2 +-
 api/schedules/status_plots.py | 2 +-
 web/__init__.py               | 8 +-------
 web/actions/warnings.py       | 2 +-
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/api/commands/plotman_cli.py b/api/commands/plotman_cli.py
index 18ed02a6..8f2ea804 100644
--- a/api/commands/plotman_cli.py
+++ b/api/commands/plotman_cli.py
@@ -175,7 +175,7 @@ def clean_tmp_dirs_before_run():
 
 def check_tmp_file_is_day_old(path):
     try:
-        match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+)", path.name)
+        match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+)", path.name)
         if match:
             plot_date = datetime.datetime.strptime("{0}-{1}-{2} {3}:{4}".format(
                 match.group(2), match.group(3), match.group(4), match.group(5), match.group(6)), 
@@ -276,7 +276,7 @@ def find_plotting_job_log(plot_id):
     return None
 
 def analyze(plot_file):
-    groups = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot_file)
+    groups = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot_file)
     if not groups:
         return "Invalid plot file name provided: {0}".format(plot_file)
     plot_log_file = find_plotting_job_log(groups[7])
diff --git a/api/models/plotman.py b/api/models/plotman.py
index 29278d5e..1aec5ca6 100644
--- a/api/models/plotman.py
+++ b/api/models/plotman.py
@@ -84,7 +84,7 @@ def parse_transfer_log(self, log_file, running_transfers):
                 elif line.startswith("Completed"):
                     self.end_date = line[line.index(' at ')+4:].strip()
                 elif line.startswith("+ rsync"):
-                    m = re.search("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", line)
+                    m = re.search("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", line)
                     if m:
                         self.plot_id = m.group(7)[:16].strip()
                         self.k = int(m.group(1).strip())
diff --git a/api/schedules/stats_effort.py b/api/schedules/stats_effort.py
index 69a538aa..0c2cc64c 100644
--- a/api/schedules/stats_effort.py
+++ b/api/schedules/stats_effort.py
@@ -41,7 +41,7 @@ def get_oldest_plot_file_time():
         for plot_dir in globals.get_disks("plots"):
             plots = [f for f in os.listdir(plot_dir) if os.path.isfile(os.path.join(plot_dir,f))]
             for plot in plots:
-                match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot)
+                match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot)
                 if match:
                     created_at_str = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
                     created_at_secs = time.mktime(datetime.datetime.strptime(created_at_str, "%Y-%m-%d %H:%M").timetuple())
diff --git a/api/schedules/status_plots.py b/api/schedules/status_plots.py
index bf0fd3fb..3d06d99d 100644
--- a/api/schedules/status_plots.py
+++ b/api/schedules/status_plots.py
@@ -29,7 +29,7 @@
 
 def get_plot_attrs(plot_id, filename):
     dir,file = os.path.split(filename)
-    match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
+    match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
         short_plot_id = match.group(7)[:16]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
diff --git a/web/__init__.py b/web/__init__.py
index 4f74d2f2..754cefa2 100644
--- a/web/__init__.py
+++ b/web/__init__.py
@@ -84,13 +84,7 @@ def timesecondstrimmer(value):
 app.jinja_env.filters['timesecondstrimmer'] = timesecondstrimmer
 
 def plotnameshortener(value):
-    #app.logger.info("Shorten: {0}".format(value))
-    match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", value)
-    if match:
-        return "plot-k{0}-{1}-{2}-{3}-{4}-{5}-{6}...".format( match.group(1), 
-            match.group(2), match.group(3), match.group(4), match.group(5), match.group(6),
-            match.group(7)[:16])
-    return value
+    return value[:30]
 
 app.jinja_env.filters['plotnameshortener'] = plotnameshortener
 
diff --git a/web/actions/warnings.py b/web/actions/warnings.py
index c0a73b74..bf178598 100644
--- a/web/actions/warnings.py
+++ b/web/actions/warnings.py
@@ -84,7 +84,7 @@ def check_warnings(args):
 
 def get_plot_attrs(filename):
     dir,file = os.path.split(filename)
-    match = re.match("plot(?:-mmx)?-k(\d+)(-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
+    match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
     if match:
         short_plot_id = match.group(7)[:16]
         created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))

From e739149cc76af07f24c80c07f168696913154cde Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 13:20:49 -0700
Subject: [PATCH 1214/1625] Fix for Settings | Plotting page loading dirs when
 switching blockchain.

---
 web/templates/settings/plotting.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/settings/plotting.html b/web/templates/settings/plotting.html
index 70944994..310ac895 100644
--- a/web/templates/settings/plotting.html
+++ b/web/templates/settings/plotting.html
@@ -146,7 +146,7 @@
             });
             $(document).on("change", "#blockchain", function (e) {
                 load_config($("#worker").val(), $("#blockchain").val())
-                load_dir($("#worker").val(), $("#blockchain").val())
+                load_dirs($("#worker").val(), $("#blockchain").val())
             });
             //Call the function when the page loads
             load_config("{{selected_worker}}", "{{selected_blockchain}}");

From 9fc76fe1d7b29c820146939b475d995a65e33f98 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 14:11:08 -0700
Subject: [PATCH 1215/1625] Fix for missing disk usage charts.

---
 web/actions/stats.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/actions/stats.py b/web/actions/stats.py
index d8807717..7c81c6a8 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -41,6 +41,9 @@
 # Don't overload the bar chart with tons of plots paths, randomly sample only this amount
 MAX_ALLOWED_PATHS_ON_BAR_CHART = 20
 
+# Ignore disk stats that are older than this many minutes ago
+STALE_MINUTES_DISK_STATS = 30
+
 def load_daily_diff(farm_summary):
     for blockchain in farm_summary.farms:
         summary = {}
@@ -236,8 +239,11 @@ def load_current_disk_usage(disk_type, hostname=None):
         free = []
         used_result = free_result = None
         if disk_type == 'plots':
-            created_at_max = db.session.query(StatPlotsDiskUsed).order_by(StatPlotsDiskUsed.created_at.desc()).first()
-            if created_at_max:
+            created_at_max = db.session.query(StatPlotsDiskUsed).filter(or_(StatPlotsDiskUsed.hostname == host.hostname, 
+                StatPlotsDiskUsed.hostname == host.displayname)).order_by(StatPlotsDiskUsed.created_at.desc()).first()
+            if datetime.datetime.strptime(created_at_max.created_at, '%Y%m%d%H%M%S') <= (datetime.datetime.now() - datetime.timedelta(minutes=STALE_MINUTES_DISK_STATS)):
+                app.logger.info("Last disk stats from {0} at {1}, ignoring as stale and out-of-date.  Check on worker status!".format(host.displayname, created_at_max.created_at))
+            elif created_at_max:
                 used_result = db.session.query(StatPlotsDiskUsed).filter( 
                     or_(StatPlotsDiskUsed.hostname == host.hostname, StatPlotsDiskUsed.hostname == host.displayname),
                         StatPlotsDiskUsed.created_at == created_at_max.created_at).order_by(StatPlotsDiskUsed.path).all()

From 12955f51968349e1b9fcbdba0a78db58d840c561 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 14:31:23 -0700
Subject: [PATCH 1216/1625] Branches for dev & test.

---
 .github/workflows/develop-chia.yaml |  2 +-
 .github/workflows/develop-mmx.yaml  |  2 +-
 .github/workflows/main-mmx.yaml     |  2 +-
 .github/workflows/test-chia.yaml    |  1 +
 .github/workflows/test-chives.yaml  |  1 +
 .github/workflows/test-mmx.yaml     |  3 ++-
 docker/dockerfile                   |  2 +-
 docker/entrypoint.sh                |  2 +-
 scripts/forks/mmx_install.sh        |  2 +-
 scripts/madmax_setup.sh             | 24 +++++++++++++-----------
 10 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 7a0bfcb2..6d8165c8 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -46,7 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "BLADEBIT_BRANCH=master"
-            "PLOTMAN_BRANCH=compress"
+            "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 6900ad49..0761bdfb 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -45,7 +45,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
             "CHIA_BRANCH=latest"
-            "PLOTMAN_BRANCH=compress"
+            "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 11af09a1..21b71304 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -44,7 +44,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "MMX_BRANCH=v0.9.3"
+            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index fa66f01a..9bd7e345 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -45,6 +45,7 @@ jobs:
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
+            "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index 0aeee3e2..c6cbb64b 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -89,6 +89,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
+            "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index add9a2f1..60ac9e2f 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -43,8 +43,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
-            "MMX_BRANCH=v0.9.3"
+            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
+            "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/docker/dockerfile b/docker/dockerfile
index 3e1f049e..39c79728 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -30,7 +30,7 @@ ARG HDDCOIN_BRANCH
 ARG LITTLELAMBOCOIN_BRANCH
 ARG MAIZE_BRANCH
 ARG MINT_BRANCH
-ARG MMX_BRANCH
+ARG MMX_BRANCH=master
 ARG MOON_BRANCH
 ARG NCHAIN_BRANCH
 ARG ONE_BRANCH
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 23abd60b..3bab73dd 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -106,7 +106,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   /usr/bin/bash /machinaris/scripts/bladebit_setup.sh ${BLADEBIT_BRANCH} > /tmp/bladebit_setup.log 2>&1
 
   # Conditionally madmax on plotters and fullnodes, sleep a bit first
-  /usr/bin/bash /machinaris/scripts/madmax_setup.sh > /tmp/madmax_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/madmax_setup.sh ${MMX_BRANCH} > /tmp/madmax_setup.log 2>&1
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
   /usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh
index 10b99677..0d88b213 100644
--- a/scripts/forks/mmx_install.sh
+++ b/scripts/forks/mmx_install.sh
@@ -19,7 +19,7 @@ else
     apt-get install -y ./amdgpu-install_22.20.50205-1_all.deb
     # Clone and install MMX from the author's own binaries, not linked to his code branches unfortunately
     pushd /tmp
-    git clone --depth 1 --filter=blob:none --sparse https://github.com/madMAx43v3r/mmx-binaries.git
+    git clone --branch ${MMX_BRANCH} --single-branch --depth 1 --filter=blob:none --sparse https://github.com/madMAx43v3r/mmx-binaries.git
     pushd mmx-binaries/
     git sparse-checkout set mmx-node/linux/x86_64/
     pushd mmx-node/linux
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index 35aec9d2..90bb1c94 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -2,14 +2,16 @@
 #
 # Installs chia-plotter (pipelined multi-threaded) from binaries
 #
-# https://github.com/madMAx43v3r/chia-plotter
-# https://github.com/madMAx43v3r/mmx-binaries
+# 
 #
 
-# As of 2022-08-20
+# As of 2022-08-20, https://github.com/madMAx43v3r/chia-plotter
 HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648
 MADMAX_BRANCH=master
 
+# MMX Plotter binaries, https://github.com/madMAx43v3r/mmx-binaries
+MMX_BRANCH=$1
+
 # Currently Chia and Chives get the "old" Madmax plotter (no compresssion), built from source
 if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
@@ -43,15 +45,15 @@ if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then
             pushd /usr/bin
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cpu-plotter/linux/x86_64/chia_plot
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cpu-plotter/linux/x86_64/chia_plot_k34
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cpu-plotter/linux/x86_64/chia_plot
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cpu-plotter/linux/x86_64/chia_plot_k34
             chmod 755 chia_plot*
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cuda-plotter/linux/x86_64/cuda_plot_k26
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cuda-plotter/linux/x86_64/cuda_plot_k29
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cuda-plotter/linux/x86_64/cuda_plot_k30
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cuda-plotter/linux/x86_64/cuda_plot_k31
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cuda-plotter/linux/x86_64/cuda_plot_k32
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/master/mmx-cuda-plotter/linux/x86_64/cuda_plot_k33
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k26
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k29
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k30
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k31
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k32
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k33
             chmod 755 cuda_plot*
             popd
         else

From 87992323a2f4816b73a229131724198264001db0 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 14:37:53 -0700
Subject: [PATCH 1217/1625] MADMAX_BRANCH

---
 docker/dockerfile       |  4 +++-
 docker/entrypoint.sh    |  2 +-
 scripts/madmax_setup.sh | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/docker/dockerfile b/docker/dockerfile
index 39c79728..2613cfc0 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -9,6 +9,7 @@ ARG CHIADOG_BRANCH=main
 ARG FDCLI_BRANCH=master
 ARG FORKTOOLS_BRANCH=main
 ARG BLADEBIT_BRANCH=master
+ARG MADMAX_BRANCH=master
 
 ARG APPLE_BRANCH
 ARG BALLCOIN_BRANCH
@@ -30,7 +31,7 @@ ARG HDDCOIN_BRANCH
 ARG LITTLELAMBOCOIN_BRANCH
 ARG MAIZE_BRANCH
 ARG MINT_BRANCH
-ARG MMX_BRANCH=master
+ARG MMX_BRANCH
 ARG MOON_BRANCH
 ARG NCHAIN_BRANCH
 ARG ONE_BRANCH
@@ -139,6 +140,7 @@ ENV CHIADOG_BRANCH=${CHIADOG_BRANCH}
 ENV FDCLI_BRANCH=${FDCLI_BRANCH}
 ENV FORKTOOLS_BRANCH=${FORKTOOLS_BRANCH}
 ENV BLADEBIT_BRANCH=${BLADEBIT_BRANCH}
+ENV MADMAX_BRANCH=${MADMAX_BRANCH}
 ENV MMX_HOME=/root/.mmx/
 
 VOLUME [ "/id_rsa" ]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 3bab73dd..43ff4ef8 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -106,7 +106,7 @@ if /usr/bin/bash /machinaris/scripts/forks/${blockchains}_launch.sh; then
   /usr/bin/bash /machinaris/scripts/bladebit_setup.sh ${BLADEBIT_BRANCH} > /tmp/bladebit_setup.log 2>&1
 
   # Conditionally madmax on plotters and fullnodes, sleep a bit first
-  /usr/bin/bash /machinaris/scripts/madmax_setup.sh ${MMX_BRANCH} > /tmp/madmax_setup.log 2>&1
+  /usr/bin/bash /machinaris/scripts/madmax_setup.sh ${MADMAX_BRANCH} > /tmp/madmax_setup.log 2>&1
 
   # Conditionally install plotman on plotters and fullnodes, after the plotters setup
   /usr/bin/bash /machinaris/scripts/plotman_autoplot.sh > /tmp/plotman_autoplot.log 2>&1
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index 90bb1c94..2351e7d5 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -7,10 +7,10 @@
 
 # As of 2022-08-20, https://github.com/madMAx43v3r/chia-plotter
 HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648
-MADMAX_BRANCH=master
+ORIG_MADMAX_BRANCH=master
 
 # MMX Plotter binaries, https://github.com/madMAx43v3r/mmx-binaries
-MMX_BRANCH=$1
+MADMAX_BRANCH=$1
 
 # Currently Chia and Chives get the "old" Madmax plotter (no compresssion), built from source
 if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
@@ -19,7 +19,7 @@ if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chi
         if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
             apt update && apt install -y libsodium-dev cmake g++ git build-essential
             cd /
-            git clone --branch ${MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
+            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
             cd chia-plotter && echo "Building madmax on ${arch_name}..."
             if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
                 sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
@@ -45,15 +45,15 @@ if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then
             pushd /usr/bin
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cpu-plotter/linux/x86_64/chia_plot
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cpu-plotter/linux/x86_64/chia_plot_k34
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cpu-plotter/linux/x86_64/chia_plot
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cpu-plotter/linux/x86_64/chia_plot_k34
             chmod 755 chia_plot*
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k26
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k29
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k30
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k31
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k32
-            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MMX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k33
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k26
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k29
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k30
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k31
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k32
+            curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k33
             chmod 755 cuda_plot*
             popd
         else

From 158797a710e5020bd6f736d52fcaa56e79f8d98e Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 20:33:40 -0700
Subject: [PATCH 1218/1625] More MMX handling.

---
 api/schedules/nft_recover.py | 2 ++
 api/schedules/plots_check.py | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/schedules/nft_recover.py b/api/schedules/nft_recover.py
index 36b5fdaf..3ccfebf0 100644
--- a/api/schedules/nft_recover.py
+++ b/api/schedules/nft_recover.py
@@ -19,5 +19,7 @@ def execute():
     with app.app_context():
         from api import db
         gc = globals.load()
+        if globals.enabled_blockchains()[0] == 'mmx':
+            return  # No such thing for MMX
         app.logger.info("****************** Starting hourly NFT 7/8 qualified reward coins check... *********************")
         rewards.update_qualified_coins_cache()
diff --git a/api/schedules/plots_check.py b/api/schedules/plots_check.py
index 8a3a2700..3a137bd8 100644
--- a/api/schedules/plots_check.py
+++ b/api/schedules/plots_check.py
@@ -190,13 +190,13 @@ def request_check(plot, workers):
 def refresh_status_file_from_logs():
     status = open_status_json()
     for key in list(status.keys()):
-        if (status[key]['check'] is None) and (status[key]['analyze'] is None):
+        if (not 'check' in status[key] or status[key]['check'] is None) and (not 'analyze' in status[key] or status[key]['analyze'] is None):
             app.logger.info("Deleting {0} both".format(key))
             del status[key]
-        elif status[key]['check'] is None:
+        elif 'check' in status[key] and status[key]['check'] is None:
             app.logger.info("Deleting {0} check".format(key))
             del status[key]['check']
-        elif status[key]['analyze'] is None:
+        elif 'analyze' in status[key] and status[key]['analyze'] is None:
             app.logger.info("Deleting {0} analyze".format(key))
             del status[key]['analyze']
     write_status_json(status)

From c0c6c275af82c00cf83c1a1a850bcc4172fdb812 Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 31 Jan 2023 20:50:25 -0700
Subject: [PATCH 1219/1625] Latest disk stats fix.

---
 web/actions/stats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/actions/stats.py b/web/actions/stats.py
index 7c81c6a8..51bd9e1b 100644
--- a/web/actions/stats.py
+++ b/web/actions/stats.py
@@ -241,7 +241,7 @@ def load_current_disk_usage(disk_type, hostname=None):
         if disk_type == 'plots':
             created_at_max = db.session.query(StatPlotsDiskUsed).filter(or_(StatPlotsDiskUsed.hostname == host.hostname, 
                 StatPlotsDiskUsed.hostname == host.displayname)).order_by(StatPlotsDiskUsed.created_at.desc()).first()
-            if datetime.datetime.strptime(created_at_max.created_at, '%Y%m%d%H%M%S') <= (datetime.datetime.now() - datetime.timedelta(minutes=STALE_MINUTES_DISK_STATS)):
+            if datetime.datetime.strptime(created_at_max.created_at, '%Y%m%d%H%M') <= (datetime.datetime.now() - datetime.timedelta(minutes=STALE_MINUTES_DISK_STATS)):
                 app.logger.info("Last disk stats from {0} at {1}, ignoring as stale and out-of-date.  Check on worker status!".format(host.displayname, created_at_max.created_at))
             elif created_at_max:
                 used_result = db.session.query(StatPlotsDiskUsed).filter( 

From 04fb93d1b923e8cf05b458b85d73ed80f880f85b Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 6 Feb 2023 09:32:52 -0700
Subject: [PATCH 1220/1625] Try Madmax plotters @ v0.9.9.

---
 .github/workflows/develop-chia.yaml   |  1 +
 .github/workflows/develop-chives.yaml |  1 +
 .github/workflows/develop-mmx.yaml    |  1 +
 .github/workflows/main-chia.yaml      |  1 +
 .github/workflows/main-chives.yaml    |  1 +
 .github/workflows/main-mmx.yaml       |  3 +-
 .github/workflows/test-chia.yaml      |  1 +
 .github/workflows/test-chives.yaml    |  1 +
 .github/workflows/test-mmx.yaml       |  3 +-
 scripts/madmax_setup.sh               | 56 +++++++++++++--------------
 scripts/pull_3rd_party_libs.sh        |  2 +-
 11 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 931f4507..09bad885 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -46,6 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "BLADEBIT_BRANCH=master"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
index db5faacf..2d1cd339 100644
--- a/.github/workflows/develop-chives.yaml
+++ b/.github/workflows/develop-chives.yaml
@@ -46,6 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop
diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
index 52b92106..c4f20240 100644
--- a/.github/workflows/develop-mmx.yaml
+++ b/.github/workflows/develop-mmx.yaml
@@ -45,6 +45,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
             "CHIA_BRANCH=latest"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 05ce1130..fd9e9ae7 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -45,6 +45,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=release/1.7.0"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
index 93e6f4b3..cd8530aa 100644
--- a/.github/workflows/main-chives.yaml
+++ b/.github/workflows/main-chives.yaml
@@ -45,6 +45,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index 846403b8..ba7bf0cc 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -44,8 +44,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
+            "MMX_BRANCH=v0.9.9"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index 50228880..d14dc731 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -46,6 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "PLOTMAN_BRANCH=development"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
index 96dbf169..954b6e42 100644
--- a/.github/workflows/test-chives.yaml
+++ b/.github/workflows/test-chives.yaml
@@ -90,6 +90,7 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index cf59fab3..a496d384 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -43,9 +43,10 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
-            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
+            "MMX_BRANCH=v0.9.9"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index 2351e7d5..e1f8156b 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -2,8 +2,6 @@
 #
 # Installs chia-plotter (pipelined multi-threaded) from binaries
 #
-# 
-#
 
 # As of 2022-08-20, https://github.com/madMAx43v3r/chia-plotter
 HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648
@@ -13,34 +11,34 @@ ORIG_MADMAX_BRANCH=master
 MADMAX_BRANCH=$1
 
 # Currently Chia and Chives get the "old" Madmax plotter (no compresssion), built from source
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
-    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
-        arch_name="$(uname -m)"
-        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
-            apt update && apt install -y libsodium-dev cmake g++ git build-essential
-            cd /
-            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
-            cd chia-plotter && echo "Building madmax on ${arch_name}..."
-            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
-                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
-            fi
-            git submodule update --init
-            git checkout $HASH
-            ./make_devel.sh
-            mkdir -p /usr/lib/chia-plotter
-            cp -r ./build/* /usr/lib/chia-plotter
-            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
-            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
-            cd /
-            rm -rf chia-plotter
-        else
-            echo "Building madmax skipped -> unsupported architecture: ${arch_name}"
-        fi
-    fi
-fi
+#if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
+#    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
+#        arch_name="$(uname -m)"
+#        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
+#            apt update && apt install -y libsodium-dev cmake g++ git build-essential
+#            cd /
+#            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
+#            cd chia-plotter && echo "Building madmax on ${arch_name}..."
+#            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
+#                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
+#            fi
+#            git submodule update --init
+#            git checkout $HASH
+#            ./make_devel.sh
+#            mkdir -p /usr/lib/chia-plotter
+#            cp -r ./build/* /usr/lib/chia-plotter
+#            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
+#            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
+#            cd /
+#            rm -rf chia-plotter
+#       else
+#            echo "Building madmax skipped -> unsupported architecture: ${arch_name}"
+#        fi
+#    fi
+#fi
 
-# MMX blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx') ]]; then
+# MMX, Chia, and Chives blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then
diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
index c49c120a..d9cc873c 100755
--- a/scripts/pull_3rd_party_libs.sh
+++ b/scripts/pull_3rd_party_libs.sh
@@ -17,7 +17,7 @@ https://cdn.datatables.net/1.13.1/css/dataTables.bootstrap5.css
 https://cdn.datatables.net/1.13.1/js/dataTables.bootstrap5.js
 https://cdn.datatables.net/1.13.1/js/jquery.dataTables.js
 https://cdn.jsdelivr.net/npm/chart.js@4.2.0/dist/chart.umd.min.js
-https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.0/dist/chartjs-adapter-luxon.umd.min.js
+https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.3.1/dist/chartjs-adapter-luxon.umd.min.js
 https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.2.0/dist/chartjs-plugin-datalabels.min.js
 https://cdn.jsdelivr.net/npm/jquery@3.6.3/dist/jquery.min.js
 https://moment.github.io/luxon/global/luxon.min.js"

From 84474eaba6c73fd4c3e7fc4349744236fdb2783a Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Mon, 6 Feb 2023 10:30:12 -0700
Subject: [PATCH 1221/1625] Still plotters only work for MMX blockchain.

---
 scripts/madmax_setup.sh | 57 ++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
index e1f8156b..fc79b6dd 100644
--- a/scripts/madmax_setup.sh
+++ b/scripts/madmax_setup.sh
@@ -11,34 +11,34 @@ ORIG_MADMAX_BRANCH=master
 MADMAX_BRANCH=$1
 
 # Currently Chia and Chives get the "old" Madmax plotter (no compresssion), built from source
-#if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
-#    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
-#        arch_name="$(uname -m)"
-#        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
-#            apt update && apt install -y libsodium-dev cmake g++ git build-essential
-#            cd /
-#            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
-#            cd chia-plotter && echo "Building madmax on ${arch_name}..."
-#            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
-#                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
-#            fi
-#            git submodule update --init
-#            git checkout $HASH
-#            ./make_devel.sh
-#            mkdir -p /usr/lib/chia-plotter
-#            cp -r ./build/* /usr/lib/chia-plotter
-#            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
-#            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
-#            cd /
-#            rm -rf chia-plotter
-#       else
-#            echo "Building madmax skipped -> unsupported architecture: ${arch_name}"
-#        fi
-#    fi
-#fi
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
+    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
+        arch_name="$(uname -m)"
+        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
+            apt update && apt install -y libsodium-dev cmake g++ git build-essential
+            cd /
+            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
+            cd chia-plotter && echo "Building madmax on ${arch_name}..."
+            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
+                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
+            fi
+            git submodule update --init
+            git checkout $HASH
+            ./make_devel.sh
+            mkdir -p /usr/lib/chia-plotter
+            cp -r ./build/* /usr/lib/chia-plotter
+            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
+            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
+            cd /
+            rm -rf chia-plotter
+       else
+            echo "Building madmax skipped -> unsupported architecture: ${arch_name}"
+        fi
+    fi
+fi
 
-# MMX, Chia, and Chives blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
+# MMX blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx') ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then
@@ -54,6 +54,9 @@ if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx
             curl -sLJO https://github.com/madMAx43v3r/mmx-binaries/raw/${MADMAX_BRANCH}/mmx-cuda-plotter/linux/x86_64/cuda_plot_k33
             chmod 755 cuda_plot*
             popd
+            echo "Completed download of Madmax binaries for plotting:"
+            echo "chia_plot @ "`chia_plot --version`
+            echo "cuda_plot @ "`cuda_plot_k32 --version`
         else
             echo "Downloading MMX chia_plot and cuda_plot skipped -> unsupported architecture: ${arch_name}"
         fi

From 56c1e616914a4c84dca2bebc3a64b902910ce60c Mon Sep 17 00:00:00 2001
From: Guy Davis 
Date: Tue, 7 Feb 2023 21:16:09 -0700
Subject: [PATCH 1222/1625] Plotting scheduling - UI only so far.

---
 web/actions/plotman.py           |  15 +++-
 web/routes.py                    |   6 +-
 web/templates/farming/plots.html |   8 ---
 web/templates/plotting/jobs.html | 113 ++++++++++++++++++++++++++++++-
 4 files changed, 129 insertions(+), 13 deletions(-)

diff --git a/web/actions/plotman.py b/web/actions/plotman.py
index 7975e0d2..6ecce017 100644
--- a/web/actions/plotman.py
+++ b/web/actions/plotman.py
@@ -26,6 +26,7 @@
 
 PLOTMAN_SCRIPT = '/chia-blockchain/venv/bin/plotman'
 REPLOTTING_CONFIG = '/root/.chia/machinaris/config/replotting.json'
+PLOTTING_SCHEDULES = '/root/.chia/machinaris/config/plotting_schedules.json'
 
 # Don't query plotman unless at least this long since last time.
 RELOAD_MINIMUM_SECS = 30
@@ -309,4 +310,16 @@ def save_replotting_settings(form):
         app.logger.error(msg)
         flash(msg, 'danger')
         return
-    return settings
\ No newline at end of file
+    return settings
+
+def save_schedules(schedule):
+    flash(_('Plotting schedule has been saved and applied.  Current plotting manager status of running or stopped is not immediately affected.'))
+
+def load_schedules():
+    schedules = []
+    if os.path.exists(PLOTTING_SCHEDULES):
+        with open(PLOTTING_SCHEDULES, 'r') as fp:
+            settings = json.loads(fp.read())
+    if len(schedules) == 0:
+        schedules.append({'start': '', 'stop': ''})
+    return schedules
diff --git a/web/routes.py b/web/routes.py
index 4b4a0127..9f802807 100644
--- a/web/routes.py
+++ b/web/routes.py
@@ -170,14 +170,18 @@ def plotting_jobs():
             action = request.form.get('action')
             plot_ids = request.form.getlist('plot_id')
             plotman.action_plots(action, plot_ids)
+        elif request.form.get('action') == 'schedule':
+            schedules = request.form.getlist('schedules')
+            plotman.save_schedules(schedules)
         else:
             app.logger.info(_("Unknown plotting form") + ": {0}".format(request.form))
         return redirect(url_for('plotting_jobs')) # Force a redirect to allow time to update status
     plotters = plotman.load_plotters()
     plotting = plotman.load_plotting_summary()
+    schedules = plotman.load_schedules()
     job_stats = stats.load_plotting_stats()
     return render_template('plotting/jobs.html', reload_seconds=120,  plotting=plotting, 
-        plotters=plotters, job_stats=job_stats, global_config=gc, lang=get_lang(request))
+        plotters=plotters, job_stats=job_stats, schedules=schedules, global_config=gc, lang=get_lang(request))
 
 @app.route('/plotting/transfers', methods=['GET', 'POST'])
 def plotting_transfers():
diff --git a/web/templates/farming/plots.html b/web/templates/farming/plots.html
index dac9e563..dbbdebfa 100644
--- a/web/templates/farming/plots.html
+++ b/web/templates/farming/plots.html
@@ -31,14 +31,6 @@ 
     
    
 
 
-
    
-    
    
-      
-        
-      
-    
    
-
    
-
 
    
     
    
         
diff --git a/web/templates/plotting/jobs.html b/web/templates/plotting/jobs.html
index 99277a2e..29a8c3b3 100644
--- a/web/templates/plotting/jobs.html
+++ b/web/templates/plotting/jobs.html
@@ -85,13 +85,110 @@ 
         
    
     
    
 
+
+
+
+
+
 
    
     
    
-      
+        
+         
+        
         
       
     
    
-  
    
+
+