Merge pull request #703 from guydavis/develop

Fixes for Datatables.js i18n error in version 1.12.0.  Now using 1.12.1.

CHANGELOG.md

@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. The format
  - [Cactus](https://github.com/Cactus-Network/cactus-blockchain) - v1.3.4, matches Chia 1.3.4, please run: `cactus db upgrade`
  - [Chives](https://github.com/HiveProject2021/chives-blockchain) - v1.3.1, please run: `chives db upgrade`
  - [Cryptodoge](https://github.com/CryptoDoge-Network/cryptodoge) - v1.3.4, matches Chia 1.3.4, please run: `cryptodoge db upgrade`
- - [Flax](https://github.com/Flax-Network/flax-blockchain) - v0.1.8, matches Chia 1.3.3, please run: `flax db upgrade` if you haven't yet
+ - [Flax](https://github.com/Flax-Network/flax-blockchain) - v0.1.9, matches Chia 1.4.0, please run: `flax db upgrade` if you haven't yet
  - [MMX](https://github.com/madMAx43v3r/mmx-node) - updated version for their `testnet6` network.
 
 ## [0.7.2] - 2022-05-17

api/commands/chia_cli.py

@@ -75,21 +75,21 @@ def load_wallet_show(blockchain):
     chia_binary = globals.get_blockchain_binary(blockchain)
     wallet_show = ""
     child = pexpect.spawn("{0} wallet show".format(chia_binary))
-    wallet_index = 1
+    wallet_id_num = app.config['SELECTED_WALLET_NUM']  # Default wallet ID num to respond if prompted is 1
+    app.logger.debug("Default SELECTED_WALLET_NUM is {0}".format(wallet_id_num))
     while True:
         i = child.expect(["Wallet height:.*\r\n", "Wallet keys:.*\r\n", "Choose wallet key:.*\r\n", "Choose a wallet key:.*\r\n", "No online backup file found.*\r\n"], timeout=120)
         if i == 0:
             app.logger.debug("wallet show returned 'Wallet height...' so collecting details.")
             wallet_show += child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
             break
         elif i == 1 or i == 2 or i == 3:
-            app.logger.debug("wallet show got index prompt so selecting #{0}".format(wallet_index))
-            child.sendline("{0}".format(wallet_index))
-            wallet_index += 1
+            app.logger.info("Wallet show got num prompt so selecting wallet #{0}".format(wallet_id_num))
+            child.sendline("{0}".format(wallet_id_num))
         elif i == 4:
             child.sendline("S")
         else:
-            app.logger.debug("pexpect returned {0}".format(i))
+            app.logger.info("pexpect returned {0}".format(i))
             wallet_show += "ERROR:\n" + child.after.decode("utf-8") + child.before.decode("utf-8") + child.read().decode("utf-8")
     return chia.Wallet(wallet_show)
 

api/default_settings.py

@@ -54,6 +54,7 @@ class DefaultConfig:
 
     STATUS_EVERY_X_MINUTES = 2  # Run status collection once every two minutes by default
     ALLOW_HARVESTER_CERT_LAN_DOWNLOAD = True
+    SELECTED_WALLET_NUM = 1 # Default is read first wallet if multiple are prompted by `chia wallet show`
 
     BABEL_TRANSLATION_DIRECTORIES = "api/translations"
     LANGUAGES = ['en', 'de_DE', 'fr_FR', 'it_IT', 'nl_NL', 'pt_PT', 'zh']

scripts/forks/flax_install.sh

@@ -4,8 +4,8 @@
 #
 
 FLAX_BRANCH=$1
-# On 2022-05-18
-HASH=5a314ca5f7f12adb16db8a9a13366f0df14ad17d
+# On 2022-06-30
+HASH=03f22c54738e94e9cfd0309a02a3e5d314528990
 
 if [ -z ${FLAX_BRANCH} ]; then
 	echo 'Skipping Flax install as not requested.'

scripts/forks/mmx_install.sh

@@ -4,8 +4,8 @@
 #
 
 MMX_BRANCH=$1
-# On 2022-06-29
-HASH=389c487bd5e7f10dae8be3a8a0778f858501d592
+# On 2022-06-30
+HASH=43f852d7a2e3c5fbfa8ceafe3cd577049f973ea9
 
 if [ -z ${MMX_BRANCH} ]; then
 	echo 'Skipping MMX install as not requested.'

scripts/pull_3rd_party_libs.sh

@@ -10,9 +10,9 @@ BASEPATH=${JS_LIBS_BASEPATH:-/machinaris/web/static/3rd_party}
 
 # List of other css/js links
 LIST="
-https://cdn.datatables.net/1.12.0/css/dataTables.bootstrap5.css
-https://cdn.datatables.net/1.12.0/js/dataTables.bootstrap5.js
-https://cdn.datatables.net/1.12.0/js/jquery.dataTables.js
+https://cdn.datatables.net/1.12.1/css/dataTables.bootstrap5.css
+https://cdn.datatables.net/1.12.1/js/dataTables.bootstrap5.js
+https://cdn.datatables.net/1.12.1/js/jquery.dataTables.js
 https://cdn.jsdelivr.net/npm/chart.js@3.8.0/dist/chart.min.js
 https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@1.1.0/dist/chartjs-adapter-luxon.min.js
 https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@2.0.0/dist/chartjs-plugin-datalabels.min.js

web/actions/plotman.py

@@ -51,7 +51,7 @@ def load_plotting_summary_by_blockchains(blockchains):
         for blockchain in blockchains: # All forks sharing Chia plots show as "Active" too
             if not blockchain in PLOTTABLE_BLOCKCHAINS:
                 summary[blockchain] = summary['chia']
-    app.logger.info(summary)
+    #app.logger.info(summary)
     return summary
 
 def load_plotters():

web/actions/stats.py

@@ -509,7 +509,7 @@ def load_farmed_blocks(blockchain):
             'farmed_block': row.farmed_block,
             'plot_files': row.plot_files, 
         })
-    app.logger.info(blocks)
+    #app.logger.info(blocks)
     return blocks
 
 def load_plot_count(blockchain):

web/models/chia.py

@@ -452,7 +452,7 @@ def sum_mmx_wallet_balance(self, hostname, blockchain, include_cold_balance=True
                 try:
                     #app.logger.info(wallet.details)
                     for balance in rx.findall(wallet.details):
-                        app.logger.info("Found balance of {0} for {1} - {2}".format(balance, wallet.hostname, wallet.blockchain))
+                        #app.logger.info("Found balance of {0} for {1} - {2}".format(balance, wallet.hostname, wallet.blockchain))
                         sum += locale.atof(balance)
                 except Exception as ex:
                     app.logger.info("Failed to find current wallet balance number for {0} - {1}: {2}".format(