Merge branch 'beta' into merge-beta

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:3.9-buster
 
 RUN apt-get update && apt-get install -y wget git libxslt-dev iptables kmod swig3.0
 RUN ln -s /usr/bin/swig3.0 /usr/bin/swig

VERSION

@@ -1 +1 @@
-2.5.0
+2.5.1

admin.py

@@ -29,7 +29,7 @@
 from core.updates import soft_updates
 from core.filebeat import update_filebeat_service
 
-from tools.configs import BACKUP_RUN, INIT_LOCK_PATH
+from tools.configs import BACKUP_RUN, INIT_LOCK_PATH, PULL_CONFIG_FOR_SCHAIN
 from tools.configs.web3 import (
     ENDPOINT, ABI_FILEPATH, STATE_FILEPATH)
 from tools.configs.ima import MAINNET_IMA_ABI_FILEPATH
@@ -38,7 +38,13 @@
 from tools.sgx_utils import generate_sgx_key
 from tools.wallet_utils import init_wallet
 
-from web.models.schain import create_tables, set_schains_first_run, set_schains_monitor_id
+from web.models.schain import (
+    create_tables,
+    set_schains_backup_run,
+    set_schains_first_run,
+    set_schains_monitor_id,
+    set_schains_sync_config_run
+)
 from web.migrations import migrate
 
 
@@ -91,6 +97,10 @@ def init():
         migrate()
         set_schains_first_run()
         set_schains_monitor_id()
+        if BACKUP_RUN:
+            set_schains_backup_run()
+        if PULL_CONFIG_FOR_SCHAIN:
+            set_schains_sync_config_run(PULL_CONFIG_FOR_SCHAIN)
         cleanup_notification_state()
 
 

core/node.py

@@ -44,7 +44,6 @@
 from core.filebeat import update_filebeat_service
 
 from tools.configs import CHECK_REPORT_PATH, META_FILEPATH, WATCHDOG_PORT
-from tools.configs.web3 import NODE_REGISTER_CONFIRMATION_BLOCKS
 from tools.helper import read_json
 from tools.str_formatters import arguments_list_string
 from tools.wallet_utils import check_required_balance
@@ -151,8 +150,7 @@ def create_node_on_contracts(self, ip, public_ip, port, name, domain_name,
                 gas_limit=gas_limit,
                 gas_price=gas_price,
                 skip_dry_run=skip_dry_run,
-                wait_for=True,
-                confirmation_blocks=NODE_REGISTER_CONFIRMATION_BLOCKS
+                wait_for=True
             )
         except TransactionFailedError:
             logger.exception('Node creation failed')