From 41347338a635498cd5dfca89173190bd964be538 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 23 Mar 2023 16:09:50 -0600 Subject: [PATCH 01/30] Fix for broken translations. --- api/translations/de_DE/LC_MESSAGES/messages.po | 2 +- api/translations/fr_FR/LC_MESSAGES/messages.po | 2 +- api/translations/it_IT/LC_MESSAGES/messages.po | 2 +- api/translations/nl_NL/LC_MESSAGES/messages.po | 2 +- api/translations/pt_PT/LC_MESSAGES/messages.po | 2 +- api/translations/zh/LC_MESSAGES/messages.po | 2 +- web/translations/de_DE/LC_MESSAGES/messages.po | 2 +- web/translations/fr_FR/LC_MESSAGES/messages.po | 7 +------ web/translations/it_IT/LC_MESSAGES/messages.po | 7 +------ web/translations/nl_NL/LC_MESSAGES/messages.po | 6 +----- web/translations/pt_PT/LC_MESSAGES/messages.po | 7 +------ web/translations/zh/LC_MESSAGES/messages.po | 2 +- 12 files changed, 12 insertions(+), 31 deletions(-) diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po index 4db838fe..22926458 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-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 c7bd56bd..92a37c4f 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-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 2ef9a792..cc506c17 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-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 34476cc0..c8d57e4b 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-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 2a3a8a76..f7bbc5e6 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-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 29f06069..516a21f4 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Guy Davis\n" "Language: zh\n" diff --git a/web/translations/de_DE/LC_MESSAGES/messages.po b/web/translations/de_DE/LC_MESSAGES/messages.po index 9b144af7..7bce36ce 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: ApfelBirneKreisLanguage: de\n" "Language: de_DE\n" diff --git a/web/translations/fr_FR/LC_MESSAGES/messages.po b/web/translations/fr_FR/LC_MESSAGES/messages.po index 5d3cda4b..ac3f19b8 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: FULL NAME\n" "Language: fr\n" @@ -2318,11 +2318,6 @@ msgid "" "blockchain. Please ensure the Chia worker is reporting into the " "controller on the Workers page." msgstr "" -"Aucune statistique de disque n'a été enregistrée récemment pour " -"%(hostname)s avec Chia blockchain. Veuillez vous assurer que tous les " -"chemins contenant des %(wiki_link_open)s a configuré %(wiki_link_close)s." -" Assurez-vous également que le worker Chia fait rapport au contrôleur sur" -" la page Workers." #: templates/farming/workers.html:154 #, python-format diff --git a/web/translations/it_IT/LC_MESSAGES/messages.po b/web/translations/it_IT/LC_MESSAGES/messages.po index 67ff477c..b46130d7 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-02-15 10:14-0700\n" "Last-Translator: Fabrizio Cacicia\n" "Language: it\n" @@ -2314,11 +2314,6 @@ msgid "" "blockchain. Please ensure the Chia worker is reporting into the " "controller on the Workers page." msgstr "" -"Non ci sono statistiche disco registrate recentemente per %(hostname)s " -"relativa alla blockchain Chia. Assicurati che tutti i percorsi contenenti" -" plots siano stati %(wiki_link_open)s configurati %(wiki_link_close)s. " -"Assicurati inoltre che il worker di Chia stia rispondendo nel controller " -"dalla pagina Workers." #: templates/farming/workers.html:154 #, python-format diff --git a/web/translations/nl_NL/LC_MESSAGES/messages.po b/web/translations/nl_NL/LC_MESSAGES/messages.po index 1d646a31..dbc94684 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-03-13 10:29-0600\n" "Last-Translator: Bernie Deprez\n" "Language: nl_NL\n" @@ -2307,10 +2307,6 @@ msgid "" "blockchain. Please 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/farming/workers.html:154 #, python-format diff --git a/web/translations/pt_PT/LC_MESSAGES/messages.po b/web/translations/pt_PT/LC_MESSAGES/messages.po index ea146a35..cb7a4891 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: Antonio Casqueiro\n" "Language: pt\n" @@ -2433,11 +2433,6 @@ msgid "" "blockchain. Please 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 \"Workers\"." #: templates/farming/workers.html:154 #, python-format diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po index 7b05d0c3..fc0e1db2 100755 --- 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: 2023-03-21 10:35-0600\n" +"POT-Creation-Date: 2023-03-23 16:07-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Guy Davis\n" "Language: zh\n" From f89daa137d2aa705fcc5a838b66a0626ea2d19a1 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 24 Mar 2023 10:08:06 -0600 Subject: [PATCH 02/30] Next development version: 0.8.9 --- CHANGELOG.md | 10 ++++++++++ VERSION | 2 +- scripts/forks/chia_install.sh | 14 ++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73d9f814..175a5349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased +### Added + - +## Changed + - +## Updated + - +## Notes + - Support for new blockchains and tools DOES NOT imply my endorsement for them. *Only run those you are comfortable with.* + ## [0.8.8] - 2023-03-23 ### Added - Support for running a blockchain timelord with environment variable `mode` set to `fullnode,timelord`. diff --git a/VERSION b/VERSION index 5c5cbb3b..021abec7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.8 \ No newline at end of file +0.8.9 \ No newline at end of file diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 964f3d46..d25ccee2 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -10,17 +10,23 @@ if [ -z ${CHIA_BRANCH} ]; then else cd /tmp rm -rf /root/.cache - apt-get update && apt-get install -y dialog apt-utils + apt-get update && apt-get install -y dialog apt-utils /usr/bin/bash /machinaris/scripts/gpu_drivers_install.sh - + git clone --branch ${CHIA_BRANCH} --recurse-submodules=mozilla-ca https://github.com/Chia-Network/chia-blockchain.git /chia-blockchain cd /chia-blockchain # 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' chia/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 + # Now correct the version that Chia binaries report. Use the actual version checked out from Github. + branch_version=$(echo $CHIA_BRANCH | grep -Po '(?<=release/)\d.\d.\d') + if [ $? -eq 0 ]; then # Will match if branch is "release/X.Y.Z", not if branch is "main" (development stream) + echo "Building Chia release version ${branch_version}" + sed -i "/name=\"chia-blockchain\",/a \ \ \ \ version=\"${branch_version}\"," setup.py + else + echo "Building Chia development version from branch ${CHIA_BRANCH}" + fi /bin/sh ./install.sh From 6e7e9e27289e142472d1ef6545356c66470ab44f Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 24 Mar 2023 10:47:28 -0600 Subject: [PATCH 03/30] Simplify things. --- scripts/forks/chia_install.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index d25ccee2..5ca74e5d 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -19,14 +19,6 @@ else # 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' chia/wallet/wallet_state_manager.py - # Now correct the version that Chia binaries report. Use the actual version checked out from Github. - branch_version=$(echo $CHIA_BRANCH | grep -Po '(?<=release/)\d.\d.\d') - if [ $? -eq 0 ]; then # Will match if branch is "release/X.Y.Z", not if branch is "main" (development stream) - echo "Building Chia release version ${branch_version}" - sed -i "/name=\"chia-blockchain\",/a \ \ \ \ version=\"${branch_version}\"," setup.py - else - echo "Building Chia development version from branch ${CHIA_BRANCH}" - fi /bin/sh ./install.sh From e00b12164dcc73b351e32420b3f6c0e0aa147d91 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Fri, 24 Mar 2023 11:11:29 -0600 Subject: [PATCH 04/30] Fix for Settings pages - Download button. --- CHANGELOG.md | 2 +- scripts/forks/chia_install.sh | 1 - web/templates/settings/alerts.html | 2 +- web/templates/settings/farming.html | 2 +- web/templates/settings/plotting.html | 2 +- web/templates/settings/tools.html | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 175a5349..01446608 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 ### Added - ## Changed - - + - Fix for Download button on Settings pages that were providing the wrong config file. Thanks @TuftyBruno. ## Updated - ## Notes diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 5ca74e5d..bee759ee 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -19,7 +19,6 @@ else # 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' chia/wallet/wallet_state_manager.py - /bin/sh ./install.sh fi diff --git a/web/templates/settings/alerts.html b/web/templates/settings/alerts.html index 303b8e85..ae3b0e50 100644 --- a/web/templates/settings/alerts.html +++ b/web/templates/settings/alerts.html @@ -176,7 +176,7 @@ $("#btnDownload").click(function () { 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 + '_alerts_config.yaml?type=alerts&worker=' + worker + "&blockchain=" + blockchain }); $("#btnConfirmTest").click(function () { $("#btnCancelTest").prop("disabled", true); diff --git a/web/templates/settings/farming.html b/web/templates/settings/farming.html index 6c970c08..82518c88 100644 --- a/web/templates/settings/farming.html +++ b/web/templates/settings/farming.html @@ -181,7 +181,7 @@ $("#btnDownload").click(function () { 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 + '_farming_config.yaml?type=farming&worker=' + worker + "&blockchain=" + blockchain }); {% endblock %} \ No newline at end of file diff --git a/web/templates/settings/plotting.html b/web/templates/settings/plotting.html index e379dfc1..aa01bec5 100644 --- a/web/templates/settings/plotting.html +++ b/web/templates/settings/plotting.html @@ -281,7 +281,7 @@ $("#btnDownload").click(function () { 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 + '_plotting_config.yaml?type=plotting&worker=' + worker + "&blockchain=" + blockchain }); $("#btnSaveSchedule").click(function () { $("#btnCancelSchedule").prop("disabled", true); diff --git a/web/templates/settings/tools.html b/web/templates/settings/tools.html index a39d0f39..934dd748 100644 --- a/web/templates/settings/tools.html +++ b/web/templates/settings/tools.html @@ -135,7 +135,7 @@ $("#btnDownload").click(function () { 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 + '_tools_config.yaml?type=tools&worker=' + worker + "&blockchain=" + blockchain }); {% endblock %} \ No newline at end of file From bea809d15caf7f80587e14e3d62533f7115582e0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 26 Mar 2023 14:36:13 -0600 Subject: [PATCH 05/30] Latest Cactus and Chia for development. --- .github/workflows/develop-chia.yaml | 2 +- CHANGELOG.md | 2 +- scripts/forks/cactus_install.sh | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index f80e66f6..936a45c2 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=release/1.7.1" + "CHIA_BRANCH=main" "BLADEBIT_BRANCH=cuda-compression" "MADMAX_BRANCH=master" "PLOTMAN_BRANCH=compress" diff --git a/CHANGELOG.md b/CHANGELOG.md index 01446608..891d9523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. The format ## Changed - Fix for Download button on Settings pages that were providing the wrong config file. Thanks @TuftyBruno. ## Updated - - + - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.7.1) to v1.7.1 ## Notes - Support for new blockchains and tools DOES NOT imply my endorsement for them. *Only run those you are comfortable with.* diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh index 70095e31..c69a1b15 100644 --- a/scripts/forks/cactus_install.sh +++ b/scripts/forks/cactus_install.sh @@ -4,8 +4,8 @@ # CACTUS_BRANCH=$1 -# On 2023-01-24 -HASH=96dcdf36a214fea2236e88bd5fb251c81da46897 +# On 2023-03-26 +HASH=31d37fea4e000152962d1a13d75ee156e7779837 if [ -z ${CACTUS_BRANCH} ]; then echo 'Skipping Cactus install as not requested.' @@ -15,10 +15,9 @@ else 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 if [ ! -d /chia-blockchain/venv ]; then From ad2b0f6261fb886b9e5bea4a6629dc9b9b073975 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 27 Mar 2023 09:45:19 -0600 Subject: [PATCH 06/30] Fix for download path before gunzip. --- scripts/forks/chia_launch.sh | 10 +--------- scripts/forks/gigahorse_launch.sh | 11 ++--------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index 93f00c0d..32fe7b71 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -38,22 +38,14 @@ if [[ "${blockchain_db_download}" == 'true' ]] \ mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia # Latest Blockchain DB, first try direct download, then fallback to slower torrent torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent") - #echo "Please be patient! Downloading blockchain database directly from: " - #echo " ${torrent::-8}" - #curl -kLJ -O ${torrent::-8} > /tmp/chiadb_download.log 2>&1 - #size_at_least=55000000000 # 55 GB - #size_actual=$(wc -c > /tmp/chiadb_download.log 2>&1 cd /chia-blockchain && . ./activate # Re-activate - #fi echo "Now decompressing the blockchain database..." - gunzip *.gz + cd /root/.chia/mainnet/db/chia && gunzip *.gz cd /root/.chia/mainnet/db mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.*.sqlite blockchain_v2_mainnet.sqlite rm -rf /root/.chia/mainnet/db/chia diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh index 79fd8d28..79092574 100644 --- a/scripts/forks/gigahorse_launch.sh +++ b/scripts/forks/gigahorse_launch.sh @@ -33,23 +33,16 @@ if [[ "${blockchain_db_download}" == 'true' ]] \ echo "Please be patient as this takes hours now, but saves days of syncing time later." mkdir -p /root/.chia/mainnet/db/chia && cd /root/.chia/mainnet/db/chia # Latest Blockchain DB, first try direct download, then fallback to slower torrent + # Latest Blockchain DB, first try direct download, then fallback to slower torrent torrent=$(curl -s https://www.chia.net/downloads/ | grep -Po "https:.*/blockchain_v2_mainnet.\d{4}-\d{2}-\d{2}.sqlite.gz.torrent") - #echo "Please be patient! Downloading blockchain database directly from: " - #echo " ${torrent::-8}" - #curl -kLJ -O ${torrent::-8} > /tmp/chiadb_download.log 2>&1 - #size_at_least=55000000000 # 55 GB - #size_actual=$(wc -c > /tmp/chiadb_download.log 2>&1 cd /chia-blockchain && . ./activate # Re-activate - #fi echo "Now decompressing the blockchain database..." - gunzip *.gz + cd /root/.chia/mainnet/db/chia && gunzip *.gz cd /root/.chia/mainnet/db mv /root/.chia/mainnet/db/chia/blockchain_v2_mainnet.*.sqlite blockchain_v2_mainnet.sqlite rm -rf /root/.chia/mainnet/db/chia From 43044e0d33fa15c67f07b814f98c60883660810c Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 27 Mar 2023 10:45:32 -0600 Subject: [PATCH 07/30] Switch Plotman back to development branch. --- .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 936a45c2..4f837bc5 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -47,7 +47,7 @@ jobs: "CHIA_BRANCH=main" "BLADEBIT_BRANCH=cuda-compression" "MADMAX_BRANCH=master" - "PLOTMAN_BRANCH=compress" + "PLOTMAN_BRANCH=development" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop From 83811dec9f97b3c08c12eacd819ad11c59414f75 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sat, 8 Apr 2023 21:04:22 -0600 Subject: [PATCH 08/30] Fix for k-size replotting not finding candidate plots. --- api/schedules/plots_replot.py | 2 +- web/models/chia.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/schedules/plots_replot.py b/api/schedules/plots_replot.py index fbcb598e..df93ccbd 100644 --- a/api/schedules/plots_replot.py +++ b/api/schedules/plots_replot.py @@ -59,7 +59,7 @@ def gather_plots_by_ksize(db, harvester, delete_by_ksizes): app.logger.error("Invalid target ksize for deletion provided: {0}".format(ksize)) return [] return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname, - or_(*[p.Plot.file.like("-k{0}-".format(ksize)) for ksize in delete_by_ksizes])).order_by(p.Plot.created_at.asc()).limit(20).all() + or_(*[p.Plot.file.like("%-k{0}-%".format(ksize)) for ksize in delete_by_ksizes])).order_by(p.Plot.created_at.asc()).limit(20).all() def limit_deletes_to_accomodate_ksize(db, candidate_plots, free_ksize): size_bytes_to_delete = 0 diff --git a/web/models/chia.py b/web/models/chia.py index e25e6e31..c67fbdd6 100644 --- a/web/models/chia.py +++ b/web/models/chia.py @@ -635,6 +635,8 @@ def extract_status(self, blockchain, details, worker_status): return "Synced" if 'No' == status: # MMX return "Syncing" + if 'Peer(s) Stalled' in status: # Staicoin + return "Peer(s) Stalled" return status return "Error" return "Offline" From 3c17e875e7b68906da4782c32951e1269d68a166 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 9 Apr 2023 14:28:27 -0600 Subject: [PATCH 09/30] Dev testing of concurrent plotman archiving. --- .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 4f837bc5..936a45c2 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -47,7 +47,7 @@ jobs: "CHIA_BRANCH=main" "BLADEBIT_BRANCH=cuda-compression" "MADMAX_BRANCH=master" - "PLOTMAN_BRANCH=development" + "PLOTMAN_BRANCH=compress" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop From 458c6fec1e468a1d8ef68e8d3911362ddcd1b898 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 11 Apr 2023 08:28:35 -0600 Subject: [PATCH 10/30] Support for concurrent plot transfers. --- .github/workflows/develop-chia.yaml | 4 ++-- CHANGELOG.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 936a45c2..c6af7284 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -47,7 +47,7 @@ jobs: "CHIA_BRANCH=main" "BLADEBIT_BRANCH=cuda-compression" "MADMAX_BRANCH=master" - "PLOTMAN_BRANCH=compress" + "PLOTMAN_BRANCH=development" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop @@ -92,7 +92,7 @@ jobs: "CHIADOG_BRANCH=dev" "GIGAHORSE_BRANCH=v1.6.2.giga7" "CHIA_BRANCH=release/1.6.2" - "PLOTMAN_BRANCH=compress" + "PLOTMAN_BRANCH=development" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop diff --git a/CHANGELOG.md b/CHANGELOG.md index 891d9523..c010d1e0 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 ## Unreleased ### Added - - + - Concurrent plot transfers to both remote and local archive paths. Previously was one plot transferred at a time. ## Changed - Fix for Download button on Settings pages that were providing the wrong config file. Thanks @TuftyBruno. ## Updated From 3b778597d53b82d7fb7119b86b788c1ae8cce633 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 19 Apr 2023 09:54:11 -0600 Subject: [PATCH 11/30] Misc fixes from reports on Github and Discord. Thanks all! --- common/config/blockchains.json | 2 +- web/templates/setup.html | 2 +- web/templates/summary.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/config/blockchains.json b/common/config/blockchains.json index 87acfb82..1c558ebe 100644 --- a/common/config/blockchains.json +++ b/common/config/blockchains.json @@ -43,7 +43,7 @@ "farmer_port": 27914, "fullnode_rpc_port": 27925, "worker_port": 8945, - "reward": 200.0, + "reward": 20.0, "mojos_per_coin": 1000000000000, "blocks_per_day": 4608, "git_url": "https://github.com/bpx-network/bpx-blockchain", diff --git a/web/templates/setup.html b/web/templates/setup.html index 3f145041..76d84eff 100644 --- a/web/templates/setup.html +++ b/web/templates/setup.html @@ -124,7 +124,7 @@

{{_('OR')}}