Merge pull request #789 from guydavis/integration

v0.8.5

.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

.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

.github/workflows/develop-chia.yaml

@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=latest"
+            "CHIA_BRANCH=release/1.6.1"
             "BLADEBIT_BRANCH=2.0.0-beta1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

.github/workflows/develop-chinilla.yaml

@@ -42,7 +42,8 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHINILLA_BRANCH=main"
+            "FDCLI_BRANCH=dev"
+            "CHINILLA_BRANCH=release/1.6.0"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:develop

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.github/workflows/main-chia.yaml

@@ -43,7 +43,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=latest"
+            "CHIA_BRANCH=release/1.6.1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}

.github/workflows/main-chinilla.yaml

@@ -43,7 +43,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "CHINILLA_BRANCH=latest"
+            "CHINILLA_BRANCH=release/1.6.0"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:v${{ github.event.inputs.version }}

.github/workflows/test-chia.yaml

@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=latest"
+            "CHIA_BRANCH=release/1.6.1"
             "BLADEBIT_BRANCH=2.0.0-beta1"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test

.github/workflows/test-chinilla.yaml

@@ -43,7 +43,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHINILLA_BRANCH=latest"
+            "CHINILLA_BRANCH=release/1.6.0"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chinilla:test

CHANGELOG.md

@@ -2,6 +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).
 
+## [0.8.5] - 2022-10-?
+ - 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.)
+ - 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
 - 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!

CREDITS.md

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

VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

api/commands/chia_cli.py

@@ -33,6 +33,9 @@
 # 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'
 
+# Blockchains which dropped compatibility with `show -c` commands around v1.6
+BLOCKCHAINS_USING_PEER_CMD = ['cactus', 'chia', 'littlelambocoin', 'maize']
+
 def load_farm_summary(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     if globals.farming_enabled():
@@ -117,7 +120,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 BLOCKCHAINS_USING_PEER_CMD:  # 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 +211,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 BLOCKCHAINS_USING_PEER_CMD:  # 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)
@@ -254,7 +257,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):
@@ -292,7 +295,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 BLOCKCHAINS_USING_PEER_CMD:  # 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)
@@ -333,11 +336,17 @@ 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))
+            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:
                 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))