From f4f5cbee0af4d47765102eb6d3ad2b863b81e659 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 25 Oct 2022 20:36:10 -0600 Subject: [PATCH 01/16] Misc fixes from testing. --- api/gunicorn.conf.py | 2 +- api/schedules/plots_check.py | 14 +++++++------- common/config/globals.py | 2 ++ scripts/forks/chia_launch.sh | 2 +- web/templates/plotting/jobs.html | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py index a4c7d3ad..09ea0569 100644 --- a/api/gunicorn.conf.py +++ b/api/gunicorn.conf.py @@ -92,7 +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_plotnfts.update, name="status_plotnfts", trigger='interval', seconds=10) # Test immediately + #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_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/plots_check.py b/api/schedules/plots_check.py index 4c74039b..baaee11e 100644 --- a/api/schedules/plots_check.py +++ b/api/schedules/plots_check.py @@ -112,7 +112,7 @@ def request_analyze(plot_file, workers): return [None, None, None] def set_check_status(workers, status, plot): - #app.logger.info("Checking for plot check of {0}".format(plot.plot_id)) + app.logger.debug("Checking for plot check of {0}".format(plot.plot_id)) check_log = CHECK_LOGS + '/' + plot.plot_id[:8] + '.log' check_status = None requested_status = False @@ -155,20 +155,20 @@ def set_check_status(workers, status, plot): def request_check(plot, workers): # Don't know which harvester might have the plot result so try them in-turn for harvester in workers: - #app.logger.info("{0}:{1} - {2} - {3}".format(harvester.hostname, harvester.port, harvester.blockchain, harvester.mode)) + app.logger.debug("{0}:{1} - {2} - {3}".format(harvester.hostname, harvester.port, harvester.blockchain, harvester.mode)) if harvester.mode == 'fullnode' or 'harvester' in harvester.mode: if harvester.latest_ping_result != "Responding": - #app.logger.info("Skipping check call to {0} as last ping was: {1}".format( \ - # harvester.hostname, harvester.latest_ping_result)) + app.logger.debug("Skipping check call to {0} as last ping was: {1}".format( \ + harvester.hostname, harvester.latest_ping_result)) continue if harvester.hostname != plot.hostname or harvester.blockchain != plot.blockchain: - #app.logger.info("Skipping check call to {0} ({1}) for plot on {2} ({3})".format( \ - # harvester.hostname, harvester.blockchain, plot.hostname, plot.blockchain)) + app.logger.debug("Skipping check call to {0} ({1}) for plot on {2} ({3})".format( \ + harvester.hostname, harvester.blockchain, plot.hostname, plot.blockchain)) continue try: app.logger.debug("Trying {0}:{1} for plot check....".format(harvester.hostname, harvester.port)) payload = {"service":"farming", "action":"check", "plot_file": plot.dir + '/' + plot.file } - response = utils.send_worker_post(harvester, "/analysis/", payload, debug=False) + response = utils.send_worker_post(harvester, "/analysis/", payload, debug=True) if response.status_code == 200: return [harvester.hostname, harvester.displayname, response.content.decode('utf-8')] elif response.status_code == 404: diff --git a/common/config/globals.py b/common/config/globals.py index 80227d9c..3fb39e41 100644 --- a/common/config/globals.py +++ b/common/config/globals.py @@ -243,6 +243,8 @@ def load_blockchain_version(blockchain): # Chia version with .dev is actually one # to high, never fixed by Chia team... # See: https://github.com/Chia-Network/chia-blockchain/issues/5655 sem_ver = last_blockchain_version.split('.') + if 'rc' in sem_ver[2]: # Strip out 'rcX' if found. + sem_ver[2] = sem_ver[2][:sem_ver[2].index('rc')] last_blockchain_version = sem_ver[0] + '.' + \ sem_ver[1] + '.' + str(int(sem_ver[2])-1) elif '.dev' in last_blockchain_version: diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index 567cbfe4..0fbf4516 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -52,7 +52,7 @@ chia init >> /root/.chia/mainnet/log/init.log 2>&1 echo 'Configuring Chia...' if [ ! -f /root/.chia/mainnet/config/config.yaml ]; then - sleep 10 + sleep 60 # Give Chia long enough to initialize and create a config file... fi if [ -f /root/.chia/mainnet/config/config.yaml ]; then sed -i 's/log_stdout: true/log_stdout: false/g' /root/.chia/mainnet/config/config.yaml diff --git a/web/templates/plotting/jobs.html b/web/templates/plotting/jobs.html index 749c447a..ce2d36fb 100644 --- a/web/templates/plotting/jobs.html +++ b/web/templates/plotting/jobs.html @@ -366,7 +366,7 @@
{{_('Plotting Speed - k%(k_size)s Plots', k_si } html = "
Destination Directories (optional)
" $("#dst_dirs").html(html); From a37b0f4a7e003573b9118ccd0647d8cd9c27637a Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 26 Oct 2022 20:34:42 -0600 Subject: [PATCH 02/16] Minor fixes from testing. --- CHANGELOG.md | 4 ++-- 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 +- common/config/blockchains.json | 2 +- config/plotman.sample.yaml | 9 +++------ web/actions/stats.py | 2 +- web/templates/plotting/workers.html | 4 ++-- web/translations/de_DE/LC_MESSAGES/messages.po | 8 ++++---- web/translations/fr_FR/LC_MESSAGES/messages.po | 10 +++++----- web/translations/it_IT/LC_MESSAGES/messages.po | 8 ++++---- web/translations/nl_NL/LC_MESSAGES/messages.po | 8 ++++---- web/translations/pt_PT/LC_MESSAGES/messages.po | 8 ++++---- web/translations/zh/LC_MESSAGES/messages.po | 8 ++++---- 17 files changed, 40 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cad97562..2be028a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,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.8.5] - 2022-10-? +## [0.8.5] - 2022-10-27 - Wallets page - Claim Rewards button offers portable plot reward recovery after one week has elapsed. (EARLY BETA!) - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. - Enhanced Forktools to optionally decrease a blockchain's full_node process count, which greatly limits memory usage. - Improve Plotting page to display configured tmp, dst, and archiving directories before starting to plot. Support `site_path_filter` for archive folders under `site_root`. - - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts. Fix for bladebit diskplot mode (NOTE: ramplot mode under development again by original author.) + - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts. Fix for bladebit diskplot mode (NOTE: ramplot mode coming soon). - Update: [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.1) to v1.6.1, [Chinilla](https://github.com/Chinilla/chinilla-blockchain/releases/tag/1.3.0 to v1.3.0, [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.1) to v1.6.1, [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 `testnet8`. ## [0.8.4] - 2022-09-21 diff --git a/api/translations/de_DE/LC_MESSAGES/messages.po b/api/translations/de_DE/LC_MESSAGES/messages.po index a47bcec6..c9caab08 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-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 60939550..758fa1b8 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-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 16076b6f..6ea8b68b 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-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 45975577..eb1f450f 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-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 cee0d274..8915499c 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-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 7177c0fa..925c2fd0 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Guy Davis\n" "Language: zh\n" diff --git a/common/config/blockchains.json b/common/config/blockchains.json index af6396fa..0de2c9f7 100644 --- a/common/config/blockchains.json +++ b/common/config/blockchains.json @@ -281,7 +281,7 @@ "farmer_port": 11330, "worker_port": 8940, "mojos_per_coin": 1000000, - "blocks_per_day": 10800, + "blocks_per_day": 8640, "git_url": "https://github.com/madMAx43v3r/mmx-node", "discord_url": "https://discord.gg/pQwkebKnPB", "website_url": "https://github.com/madMAx43v3r/mmx-node" diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml index f1815782..65aa2074 100644 --- a/config/plotman.sample.yaml +++ b/config/plotman.sample.yaml @@ -44,13 +44,10 @@ directories: # See: https://github.com/guydavis/machinaris/wiki/Plotman#archiving #archiving: - #target: rsyncd + #target: local_rsync #env: - #site_root: /mnt/disks - #user: root - #host: aragorn - #rsync_port: 12000 - #site: disks + #site_root: / + #site_path_filter: plots # Plotting scheduling parameters scheduling: diff --git a/web/actions/stats.py b/web/actions/stats.py index bd42254e..61cf989b 100644 --- a/web/actions/stats.py +++ b/web/actions/stats.py @@ -326,7 +326,7 @@ def load_plotting_stats(): app.logger.error("Inavlid plot_analyze time found in ip_addr|seconds: {0}".format(p.plot_analyze)) values[converted_date] = 'null' if len(dates) > 0: - summary_by_size[k] = { "dates": dates, "workers": workers.keys(), } + summary_by_size[k] = { "dates": dates, "workers": sorted(workers.keys()), } for wkr in workers.keys(): worker_values = [] for date in dates: diff --git a/web/templates/plotting/workers.html b/web/templates/plotting/workers.html index 594bb4f6..e06763b2 100644 --- a/web/templates/plotting/workers.html +++ b/web/templates/plotting/workers.html @@ -10,7 +10,7 @@
- {{_('This action will start Plotman archiving from the configured dst folder. Completed plots will be disributed locally or transferred remotely. Continue?')}} + {{_('This action will start Plotman archiving from the destination folder. Completed plots will be distributed locally or transferred remotely. Continue?')}}
@@ -28,7 +28,7 @@
- {{_('This action will stop Plotman archiving from the configured dst folder, preventing further completed plot transfers. Continue?')}} + {{_('This action will stop Plotman archiving from the destination folder, preventing further completed plot transfers. Continue?')}}
diff --git a/web/translations/de_DE/LC_MESSAGES/messages.po b/web/translations/de_DE/LC_MESSAGES/messages.po index b7455111..71d27876 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: ApfelBirneKreisLanguage: de\n" "Language: de_DE\n" @@ -2285,8 +2285,8 @@ msgstr "Archivieren Starten" #: 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. " +"This action will start Plotman archiving from the destination folder. " +"Completed plots will be distributed locally or transferred remotely. " "Continue?" msgstr "" @@ -2296,7 +2296,7 @@ msgstr "Archivieren stoppen" #: templates/plotting/workers.html:31 msgid "" -"This action will stop Plotman archiving from the configured dst folder, " +"This action will stop Plotman archiving from the destination folder, " "preventing further completed plot transfers. Continue?" msgstr "" diff --git a/web/translations/fr_FR/LC_MESSAGES/messages.po b/web/translations/fr_FR/LC_MESSAGES/messages.po index ab7d6e2b..46835b7b 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: FULL NAME\n" "Language: fr\n" @@ -2300,12 +2300,12 @@ msgstr "Démarrer l'archivage" #: 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. " +"This action will start Plotman archiving from the destination folder. " +"Completed plots will be distributed locally or transferred remotely. " "Continue?" msgstr "" "Cette action lancera l'archivage de Plotman à partir du dossier dst " -"configuré.Les parcelles terminées seront distribuées localement ou " +"configuré. Les parcelles terminées seront distribuées localement ou " "transférées à distance.Continuez?" #: templates/plotting/workers.html:27 templates/plotting/workers.html:138 @@ -2314,7 +2314,7 @@ msgstr "Arrêter l'archivage" #: templates/plotting/workers.html:31 msgid "" -"This action will stop Plotman archiving from the configured dst folder, " +"This action will stop Plotman archiving from the destination folder, " "preventing further completed plot transfers. Continue?" msgstr "" "Cette action arrêtera l'archivage de Plotman à partir du dossier dst " diff --git a/web/translations/it_IT/LC_MESSAGES/messages.po b/web/translations/it_IT/LC_MESSAGES/messages.po index 24cbd154..e49f0a72 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-02-15 10:14-0700\n" "Last-Translator: Fabrizio Cacicia\n" "Language: it\n" @@ -2297,8 +2297,8 @@ msgstr "Inizia Archiviazione" #: 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. " +"This action will start Plotman archiving from the destination folder. " +"Completed plots will be distributed locally or transferred remotely. " "Continue?" msgstr "" "Questa azione avvierà l'archiviazione tramite Plotman verso la cartella " @@ -2311,7 +2311,7 @@ msgstr "Ferma Archiviazione" #: templates/plotting/workers.html:31 msgid "" -"This action will stop Plotman archiving from the configured dst folder, " +"This action will stop Plotman archiving from the destination folder, " "preventing further completed plot transfers. Continue?" msgstr "" "Questa azione fermerà l'archiviazione tramite Plotman verso la cartella " diff --git a/web/translations/nl_NL/LC_MESSAGES/messages.po b/web/translations/nl_NL/LC_MESSAGES/messages.po index fb00ecbf..05b08e73 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-03-13 10:29-0600\n" "Last-Translator: Bernie Deprez\n" "Language: nl_NL\n" @@ -2286,8 +2286,8 @@ msgstr "Start Archivering" #: 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. " +"This action will start Plotman archiving from the destination folder. " +"Completed plots will be distributed locally or transferred remotely. " "Continue?" msgstr "" "Deze actie start Plotman archivering vanuit de geconfigureerde dst map. " @@ -2300,7 +2300,7 @@ msgstr "Stop Archivering" #: templates/plotting/workers.html:31 msgid "" -"This action will stop Plotman archiving from the configured dst folder, " +"This action will stop Plotman archiving from the destination folder, " "preventing further completed plot transfers. Continue?" msgstr "" "Deze actie stopt Plotman archivering vanuit de geconfigureerde dst map en" diff --git a/web/translations/pt_PT/LC_MESSAGES/messages.po b/web/translations/pt_PT/LC_MESSAGES/messages.po index 075d3d7a..17ce9cb6 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-02-13 13:45-0700\n" "Last-Translator: Antonio Casqueiro\n" "Language: pt\n" @@ -2416,8 +2416,8 @@ msgstr "Iniciar arquivar" #: 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. " +"This action will start Plotman archiving from the destination folder. " +"Completed plots will be distributed locally or transferred remotely. " "Continue?" msgstr "" "Esta acção irá iniciar o arquiver do Plotman a partir da pasta dst " @@ -2430,7 +2430,7 @@ msgstr "Parar arquivar" #: templates/plotting/workers.html:31 msgid "" -"This action will stop Plotman archiving from the configured dst folder, " +"This action will stop Plotman archiving from the destination folder, " "preventing further completed plot transfers. Continue?" msgstr "" "Esta acção irá parar o archiving do Plotman a partir da pasta dst " diff --git a/web/translations/zh/LC_MESSAGES/messages.po b/web/translations/zh/LC_MESSAGES/messages.po index 41868bac..c9b589c8 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: 2022-10-22 06:07-0600\n" +"POT-Creation-Date: 2022-10-26 09:06-0600\n" "PO-Revision-Date: 2022-02-15 14:29-0700\n" "Last-Translator: Guy Davis\n" "Language: zh\n" @@ -2206,8 +2206,8 @@ 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. " +"This action will start Plotman archiving from the destination folder. " +"Completed plots will be distributed locally or transferred remotely. " "Continue?" msgstr "" @@ -2217,7 +2217,7 @@ msgstr "" #: templates/plotting/workers.html:31 msgid "" -"This action will stop Plotman archiving from the configured dst folder, " +"This action will stop Plotman archiving from the destination folder, " "preventing further completed plot transfers. Continue?" msgstr "" From 35801c93fa551f63a7537009f8f0ee6ef69cabaa Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 27 Oct 2022 09:52:52 -0600 Subject: [PATCH 03/16] Chia reward recovery only of POOLING_WALLET type. --- .github/workflows/develop-chia.yaml | 2 +- CHANGELOG.md | 20 +++++++++++++++++--- api/commands/rewards.py | 3 ++- common/models/wallets.py | 11 +++++++++++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 9a3c30a4..e4b2a753 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -44,7 +44,7 @@ jobs: "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" "CHIA_BRANCH=release/1.6.1" - "BLADEBIT_BRANCH=2.0.0-beta1" + "BLADEBIT_BRANCH=develop" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be028a4..10fbc01e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,27 @@ 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-27 +## [Unreleased] + +## [0.8.5] - 2022-10-? +### Added - Wallets page - Claim Rewards button offers portable plot reward recovery after one week has elapsed. (EARLY BETA!) - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. - Enhanced Forktools to optionally decrease a blockchain's full_node process count, which greatly limits memory usage. - Improve Plotting page to display configured tmp, dst, and archiving directories before starting to plot. Support `site_path_filter` for archive folders under `site_root`. - - Fixes: Enhance 'NFT Reward Recovery' tool to support v2 databases. Fix for invalid Chiadog harvester alerts. Fix for bladebit diskplot mode (NOTE: ramplot mode coming soon). - - Update: [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.1) to v1.6.1, [Chinilla](https://github.com/Chinilla/chinilla-blockchain/releases/tag/1.3.0 to v1.3.0, [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.1) to v1.6.1, [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 `testnet8`. +### Changed + - Enhance 'NFT Reward Recovery' tool to support v2 databases. + - Fixes for invalid Chiadog harvester alerts. + - Fixes for bladebit diskplot mode (NOTE: ramplot mode coming soon). +### Updated + - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.1) to v1.6.1 + - [Chinilla](https://github.com/Chinilla/chinilla-blockchain/releases/tag/1.3.0 to v1.3.0 + - [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.1) to v1.6.1 + - [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 `testnet8`. +### Known Issues + - Incorrect reward recovery calculations for some blockchains. Please use AllTheBlocks site if this affects you. + - Chia CLI broke `chia plots check`, affecting new plots on Farming page. Still investigating... ## [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/commands/rewards.py b/api/commands/rewards.py index ccea0000..b1a78b7f 100644 --- a/api/commands/rewards.py +++ b/api/commands/rewards.py @@ -29,7 +29,8 @@ def reward_recovery(wallet_id, launcher_id, pool_contract_address): if blockchain in BLOCKCHAINS_WITH_PLOTNFT_CLAIM_CMD: for wallet in db.session.query(w.Wallet).filter(w.Wallet.blockchain==blockchain).order_by(w.Wallet.blockchain).all(): for wallet_num in wallet.wallet_nums(): - execute_plotnft_claim_recovery(wallet_num) + if wallet.get_wallet_type(wallet_num) == 'POOLING_WALLET': + execute_plotnft_claim_recovery(wallet_num) else: # Try old FD-CLI recovery instead execute_fd_cli_recovery(wallet_id, launcher_id, pool_contract_address) diff --git a/common/models/wallets.py b/common/models/wallets.py index c0304096..aae17cba 100644 --- a/common/models/wallets.py +++ b/common/models/wallets.py @@ -29,6 +29,17 @@ def wallet_nums(self): wallet_nums.append(line.split(':')[1].strip()) return wallet_nums + def get_wallet_type(self, wallet_num): + wallet_type = None + for line in self.details.split('\n'): + if "-Type:" in line: + wallet_type = line.split(':')[1].strip() + elif "Wallet ID:" in line: + current_wallet_num = line.split(':')[1].strip() + if wallet_num == current_wallet_num: + return wallet_type + return None + def is_synced(self): for line in self.details.split('\n'): if line.strip().startswith("Sync status: Synced"): From 232df69912c5d71042d7988dcb25c5c8bfa047d6 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 27 Oct 2022 13:40:23 -0600 Subject: [PATCH 04/16] Use bladebit@develop for ramplot mode. --- .github/workflows/test-chia.yaml | 1 - config/plotman.sample.yaml | 24 ++++++++++++------------ docker/dockerfile | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index 8c030cb2..106f3e48 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -44,7 +44,6 @@ jobs: "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" "CHIA_BRANCH=release/1.6.1" - "BLADEBIT_BRANCH=2.0.0-beta1" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml index 65aa2074..9560573b 100644 --- a/config/plotman.sample.yaml +++ b/config/plotman.sample.yaml @@ -103,16 +103,8 @@ plotting: # If you enable 'madmax', plot in *sequence* with very low tmpdir_max_jobs and global_max_jobs type: madmax - chia: - # The stock plotter: https://github.com/Chia-Network/chia-blockchain - k: 32 # k-size of plot, leave at 32 most of the time - e: False # Disable bitfield back sorting (default is True) - n_threads: 2 # Threads per job - n_buckets: 128 # Number of buckets to split data into - job_buffer: 3389 # Per job memory - madmax: - # madMAx plotter: https://github.com/madMAx43v3r/chia-plotter + # madMAx plotter; see https://github.com/guydavis/machinaris/wiki/MadMax k: 32 # Default is 32 for Chia, but can do 33 or 34. Use 29,30,31 for Chives n_threads: 4 # Default is 4, SLOWLY crank up if you have many cores n_buckets: 256 # Default is 256 @@ -121,8 +113,16 @@ plotting: network_port: 8444 # Default is 8444, but use 9699 for Chives bladebit: - # BladeBit plotter: https://github.com/Chia-Network/bladebit/ + # BladeBit plotter; see https://github.com/guydavis/machinaris/wiki/Bladebit threads: 2 # Threads per job - no_numa: false # Whether to disable NUMA memory support or not - diskplot: True # Whether to plot to tmp1 (and tmp2) disks or only RAM (false) + no_numa: true # Whether to disable NUMA memory support or not + diskplot: true # Whether to plot to tmp1 (and tmp2) disks or only RAM (false) diskplot_cache: 4GB # If diskplot, amount of RAM to allocate to caching disk writes + + 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 + e: False # Disable bitfield back sorting (default is True) + n_threads: 2 # Threads per job + n_buckets: 128 # Number of buckets to split data into + job_buffer: 3389 # Per job memory diff --git a/docker/dockerfile b/docker/dockerfile index 8740ddf7..13631314 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -8,7 +8,7 @@ ARG PLOTMAN_BRANCH=development ARG CHIADOG_BRANCH=main ARG FDCLI_BRANCH=master ARG FORKTOOLS_BRANCH=testing -ARG BLADEBIT_BRANCH=2.0.0-beta1 +ARG BLADEBIT_BRANCH=develop ARG APPLE_BRANCH ARG BPX_BRANCH From 25381449e02799f7f948a54e9e087360931c4163 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 27 Oct 2022 16:37:48 -0600 Subject: [PATCH 05/16] Update changelog. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10fbc01e..b13a9b10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,11 @@ 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 optionally decrease a blockchain's full_node process count, which greatly limits memory usage. - Improve Plotting page to display configured tmp, dst, and archiving directories before starting to plot. Support `site_path_filter` for archive folders under `site_root`. + - Bladebit support for new `ramplot` mode (needs 416 GB RAM) ### Changed - Enhance 'NFT Reward Recovery' tool to support v2 databases. - Fixes for invalid Chiadog harvester alerts. - - Fixes for bladebit diskplot mode (NOTE: ramplot mode coming soon). + - Fixes for bladebit `diskplot` mode (less than 416 GB RAM, needs 400+GB of tmp disk) ### Updated - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.1) to v1.6.1 - [Chinilla](https://github.com/Chinilla/chinilla-blockchain/releases/tag/1.3.0 to v1.3.0 From 1fb69ecc59722c3634d2d8a675d8c184a7aca734 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 30 Oct 2022 17:31:12 -0600 Subject: [PATCH 06/16] Fix for space. --- 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 edfec92c..fcad0d5d 100644 --- a/web/templates/settings/plotting.html +++ b/web/templates/settings/plotting.html @@ -114,7 +114,7 @@ $("#tmp_dirs").html(html); html = "
Destination Directories (optional)
    " for (dir of data['response']['destination']) { - html += "
  • " + dir['dst'] + " (" + dir['plots'] + 'plots, ' + dir['gb_free'] + " GB free)
    • "; + html += "
  • " + dir['dst'] + " (" + dir['plots'] + ' plots, ' + dir['gb_free'] + " GB free)
    • "; } html += "
" $("#dst_dirs").html(html); From c965c3467d8f121b0d62a0ffab95f77bb84419ec Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 30 Oct 2022 19:03:14 -0600 Subject: [PATCH 07/16] Chives 1.5.1 --- .github/workflows/develop-chives.yaml | 2 +- .github/workflows/main-chives.yaml | 2 +- .github/workflows/test-chives.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml index 3041565d..d97b1c4e 100644 --- a/.github/workflows/develop-chives.yaml +++ b/.github/workflows/develop-chives.yaml @@ -43,7 +43,7 @@ jobs: "UBUNTU_VER=focal" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "CHIVES_BRANCH=1.3.5" + "CHIVES_BRANCH=1.5.1" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml index cee4fd63..81bd249f 100644 --- a/.github/workflows/main-chives.yaml +++ b/.github/workflows/main-chives.yaml @@ -43,7 +43,7 @@ jobs: build-args: | "UBUNTU_VER=focal" "MACHINARIS_STREAM=latest" - "CHIVES_BRANCH=1.3.5" + "CHIVES_BRANCH=1.5.1" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }} diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml index cd05c717..cad8f20f 100644 --- a/.github/workflows/test-chives.yaml +++ b/.github/workflows/test-chives.yaml @@ -43,7 +43,7 @@ jobs: "UBUNTU_VER=focal" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "CHIVES_BRANCH=1.3.5" + "CHIVES_BRANCH=1.5.1" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:test From c7ded687fa691dbd1cb58b4a6ad380fd86aca474 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 31 Oct 2022 14:37:52 -0600 Subject: [PATCH 08/16] Fix for Wallet cold address entry. --- scripts/forks/mmx_install.sh | 4 ++-- web/routes.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh index 896b284e..bf255a3b 100644 --- a/scripts/forks/mmx_install.sh +++ b/scripts/forks/mmx_install.sh @@ -4,8 +4,8 @@ # MMX_BRANCH=$1 -# On 2022-10-24 -HASH=744dfe66729099f12dc697e8576feb0910d6ecd9 +# On 2022-10-31 +HASH=c44bf27308e0fa6e296626aec3c64a8da070edf8 if [ -z ${MMX_BRANCH} ]; then echo 'Skipping MMX install as not requested.' diff --git a/web/routes.py b/web/routes.py index 5d4ece5a..891f6fe5 100644 --- a/web/routes.py +++ b/web/routes.py @@ -278,6 +278,10 @@ def wallet(): app.logger.info("Saving local currency setting of: {0}".format(request.form.get('local_currency'))) chia.save_current_wallet_sync_frequency(request.form.get('sync_wallet_frequency')) flash(_("Saved local currency and wallet sync settings."), 'success') + elif request.form.get('cold_wallet_address'): + app.logger.info("Saving {0} cold wallet address of: {1}".format(request.form.get('blockchain'), request.form.get('cold_wallet_address'))) + selected_blockchain = request.form.get('blockchain') + chia.save_cold_wallet_addresses(request.form.get('blockchain'), request.form.get('cold_wallet_address')) elif request.form.get('blockchain'): action = request.form.get('action') if action == "start": @@ -289,9 +293,7 @@ def wallet(): elif request.form.get('action') == 'recover': p.request_unclaimed_plotnft_reward_recovery() else: - app.logger.info("Saving {0} cold wallet address of: {1}".format(request.form.get('blockchain'), request.form.get('cold_wallet_address'))) - selected_blockchain = request.form.get('blockchain') - chia.save_cold_wallet_addresses(request.form.get('blockchain'), request.form.get('cold_wallet_address')) + app.logger.error("Unknown wallet page form submitted. No action taken.") if request.args.get('rewards'): return json.dumps(p.get_unclaimed_plotnft_rewards()), 200 wallets = chia.load_wallets() From e67246d2937983b32064d48285a907fe5ce852a0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 31 Oct 2022 16:53:39 -0600 Subject: [PATCH 09/16] Fixes for MMX harvesting and plotting. --- api/gunicorn.conf.py | 5 +++-- common/config/globals.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/gunicorn.conf.py b/api/gunicorn.conf.py index 09ea0569..13c1fc1b 100644 --- a/api/gunicorn.conf.py +++ b/api/gunicorn.conf.py @@ -50,8 +50,9 @@ def on_starting(server): # Status for both farmers and harvesters (includes fullnodes) if globals.farming_enabled() or globals.harvesting_enabled(): - 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) + if not 'mmx' in globals.enabled_blockchains(): + 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 diff --git a/common/config/globals.py b/common/config/globals.py index 3fb39e41..4c56b265 100644 --- a/common/config/globals.py +++ b/common/config/globals.py @@ -221,6 +221,8 @@ def strip_data_layer_msg(lines): last_blockchain_version = None last_blockchain_version_load_time = None def load_blockchain_version(blockchain): + if blockchain == 'mmx': + return "recent" # Author didn't bother to version his binaries chia_binary = get_blockchain_binary(blockchain) global last_blockchain_version global last_blockchain_version_load_time From 1a6744cc33327bf7d5563ec24017fea32af9a6f1 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 31 Oct 2022 19:46:02 -0600 Subject: [PATCH 10/16] Fix for MMX harvester. --- common/config/globals.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/config/globals.py b/common/config/globals.py index 4c56b265..ffe483e4 100644 --- a/common/config/globals.py +++ b/common/config/globals.py @@ -90,10 +90,10 @@ def load(): fullnode_db_version = load_fullnode_db_version() if fullnode_db_version: cfg['fullnode_db_version'] = fullnode_db_version - if cfg['enabled_blockchains'][0] == 'mmx': - cfg['mmx_reward'] = gather_mmx_reward() if cfg['machinaris_mode'] == 'fullnode': cfg['wallet_status'] = "running" if wallet_running() else "paused" + if cfg['enabled_blockchains'][0] == 'mmx': + cfg['mmx_reward'] = gather_mmx_reward() return cfg def load_blockchain_info(blockchain, key): @@ -440,7 +440,6 @@ def load_fullnode_db_version(): except: logging.info(traceback.format_exc()) fullnode_db_version_load_time = datetime.datetime.now() - logging.info("Found neither!") return fullnode_db_version def get_disks(disk_type): From cf0f089fa38525f8858c72f6535360ccc87e0023 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Mon, 31 Oct 2022 20:44:18 -0600 Subject: [PATCH 11/16] Another MMX setup guard. --- api/models/mmx.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/models/mmx.py b/api/models/mmx.py index 52975fc3..43a7bc39 100644 --- a/api/models/mmx.py +++ b/api/models/mmx.py @@ -60,9 +60,11 @@ def calc_mmx_etw(self, netspace_size, plots_size): #app.logger.info("MMX PLOTS_SIZE: {0}".format(plots_size_gib)) netspace_size_gib = converters.str_to_gibs(netspace_size) #app.logger.info("MMX NETSPACE_SIZE: {0}".format(netspace_size_gib)) - etw_mins = round(netspace_size_gib / plots_size_gib / MMX_BLOCKS_PER_MIN) - #app.logger.info("MMX ETW_MINS: {0}".format(etw_mins)) - return converters.format_minutes(etw_mins) + if plots_size_gib > 0: + etw_mins = round(netspace_size_gib / plots_size_gib / MMX_BLOCKS_PER_MIN) + #app.logger.info("MMX ETW_MINS: {0}".format(etw_mins)) + return converters.format_minutes(etw_mins) + return "" # Zero plots, so basically never class HarvesterSummary: From 4f08106db487f999c6c32b0757280a652fe1cac0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 2 Nov 2022 14:11:14 -0600 Subject: [PATCH 12/16] Still waiting for Chia 1.6.1... --- CHANGELOG.md | 2 +- scripts/forks/mmx_install.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b13a9b10..c5c5d366 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] -## [0.8.5] - 2022-10-? +## [0.8.5] - 2022-11-? ### Added - Wallets page - Claim Rewards button offers portable plot reward recovery after one week has elapsed. (EARLY BETA!) - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. diff --git a/scripts/forks/mmx_install.sh b/scripts/forks/mmx_install.sh index bf255a3b..e279b138 100644 --- a/scripts/forks/mmx_install.sh +++ b/scripts/forks/mmx_install.sh @@ -4,8 +4,8 @@ # MMX_BRANCH=$1 -# On 2022-10-31 -HASH=c44bf27308e0fa6e296626aec3c64a8da070edf8 +# On 2022-11-02 +HASH=2bbee38a5912051ade7677cc7404587a98f6285e if [ -z ${MMX_BRANCH} ]; then echo 'Skipping MMX install as not requested.' From fa1c1d3be3c360fa25c75c0d4af47df82797a35c Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 2 Nov 2022 15:08:47 -0600 Subject: [PATCH 13/16] Bladebit lists plot ID way down in the log. --- api/commands/plotman_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/commands/plotman_cli.py b/api/commands/plotman_cli.py index a591b8cb..76530dd0 100644 --- a/api/commands/plotman_cli.py +++ b/api/commands/plotman_cli.py @@ -240,7 +240,7 @@ def find_plotting_job_log(plot_id): try: if filename.endswith(".log") and not filename.startswith('plotman.') and not filename.startswith('archiver.'): with open(os.path.join(str(dir_path), filename)) as logfile: - for line in itertools.islice(logfile, 0, 35): + for line in itertools.islice(logfile, 0, 50): if plot_id in line: return os.path.join(str(dir_path), filename) continue From c325f4f13bc538b433d454e5858a24cc622ebce2 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 3 Nov 2022 10:26:41 -0600 Subject: [PATCH 14/16] Tad to v1.6.0 --- CHANGELOG.md | 1 + CREDITS.md | 3 ++- scripts/forks/tad_install.sh | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c5d366..50eaf6f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file. The format - [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.1) to v1.6.1 - [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 `testnet8`. + - [Tad](https://github.com/BTCgreen-Network/tad-blockchain/releases/tag/1.6.0) to v1.6.0 ### Known Issues - Incorrect reward recovery calculations for some blockchains. Please use AllTheBlocks site if this affects you. - Chia CLI broke `chia plots check`, affecting new plots on Farming page. Still investigating... diff --git a/CREDITS.md b/CREDITS.md index 8eb9e475..5fc6b7be 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -100,7 +100,8 @@ A big thanks to all that contributed with dev and test including: * @fabriziocacicia (Fabrizio Cacicia) * @bdeprez (Bernie Deprez) * Gnomuz -* borifrmr +* borifrmr (aka Inabon) +* 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 diff --git a/scripts/forks/tad_install.sh b/scripts/forks/tad_install.sh index 51edb23c..511d4d8c 100644 --- a/scripts/forks/tad_install.sh +++ b/scripts/forks/tad_install.sh @@ -4,8 +4,8 @@ # TAD_BRANCH=$1 -# On 2022-08-10 -HASH=80ccd218e21f71450420c88c4158bf3a43571caa +# On 2022-11-03 +HASH=01925bb7c59b808a9ed6a8f985386817edbba554 if [ -z ${TAD_BRANCH} ]; then echo 'Skipping Tad install as not requested.' From 3c4f9d5805b5c77301cb3b2305183d61c6071560 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 3 Nov 2022 19:07:31 -0600 Subject: [PATCH 15/16] Chia 1.6.1 finally released. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50eaf6f7..dc9a0cae 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] -## [0.8.5] - 2022-11-? +## [0.8.5] - 2022-11-03 ### Added - Wallets page - Claim Rewards button offers portable plot reward recovery after one week has elapsed. (EARLY BETA!) - Chart memory usage per container (GiB) as well as total host memory usage (%) for OS and all apps. From f48f3ed15e7a84328ff3cf3467ac733efcc3b03b Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 3 Nov 2022 19:11:58 -0600 Subject: [PATCH 16/16] Bladebit @ master branch now. --- CHANGELOG.md | 1 + docker/dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc9a0cae..6a1cc634 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. The format - Fixes for invalid Chiadog harvester alerts. - Fixes for bladebit `diskplot` mode (less than 416 GB RAM, needs 400+GB of tmp disk) ### Updated + - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v2.0.0) to v2.0.0 - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.6.1) to v1.6.1 - [Chinilla](https://github.com/Chinilla/chinilla-blockchain/releases/tag/1.3.0 to v1.3.0 - [Littlelambocoin](https://github.com/BTCgreen-Network/littlelambocoin-blockchain/releases/tag/1.6.1) to v1.6.1 diff --git a/docker/dockerfile b/docker/dockerfile index 13631314..a951bc33 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -8,7 +8,7 @@ ARG PLOTMAN_BRANCH=development ARG CHIADOG_BRANCH=main ARG FDCLI_BRANCH=master ARG FORKTOOLS_BRANCH=testing -ARG BLADEBIT_BRANCH=develop +ARG BLADEBIT_BRANCH=master ARG APPLE_BRANCH ARG BPX_BRANCH