Merge pull request #795 from guydavis/develop

Chia 1.6.1
guydavis · Nov 4, 2022 · eacd893 · eacd893
2 parents 9e9b6dc + 3c4f9d5
commit eacd893
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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-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.
@@ -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
@@ -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.*
diff --git 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

diff --git 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.'

diff --git 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.'