Merge pull request #114 from skalenetwork/enhancement/SKALE-3753--call-block-check

Enhancement/skale 3753  call block check

Author: alexgex

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
       DB_ROOT_PASSWORD: ${{ secrets.DB_ROOT_PASSWORD }}
       DB_PORT: ${{ secrets.DB_PORT }}
 
-      MANAGER_TAG: "1.6.2-stable.0"
+      MANAGER_TAG: "1.7.1-develop.4"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.7

configs/__init__.py

@@ -10,10 +10,16 @@
 
 CONTRACTS_INFO_FOLDER_NAME = 'contracts_info'
 MANAGER_CONTRACTS_INFO_NAME = 'manager.json'
-CONTRACTS_INFO_FOLDER = os.path.join(SKALE_VOLUME_PATH, CONTRACTS_INFO_FOLDER_NAME)
+CONTRACTS_INFO_FOLDER = os.path.join(SKALE_VOLUME_PATH,
+                                     CONTRACTS_INFO_FOLDER_NAME)
 NODE_CONFIG_FILENAME = 'node_config.json'
 NODE_CONFIG_FILEPATH = os.path.join(NODE_DATA_PATH, NODE_CONFIG_FILENAME)
 
+STATE_FILENAME = os.getenv('STATE_FILENAME')
+STATE_BASE_PATH = os.path.join(NODE_DATA_PATH, 'eth-state')
+STATE_FILEPATH = None if not STATE_FILENAME \
+                    else os.path.join(STATE_BASE_PATH, STATE_FILENAME)
+
 MIN_ETH_AMOUNT_IN_SKL = 0.01
 MIN_ETH_AMOUNT = int(MIN_ETH_AMOUNT_IN_SKL * (10 ** 18))
 RETRY_INTERVAL = 60  # in seconds

requirements.txt

@@ -1,6 +1,6 @@
-skale.py==4.1.dev20
+skale.py==4.1b10
 schedule==0.6.0
 tenacity==6.2.0
 apscheduler==3.6.3
 peewee==3.14.0
-PyMySQL==0.10.1
+PyMySQL==0.10.1

tests/prepare_validator.py

@@ -75,8 +75,11 @@ def create_validator(skale):
 
 
 def create_node(skale, node_id):
-    res_tx = skale.manager.create_node(IP_BASE + str(node_id), TEST_PORT,
-                                       'node_' + str(node_id), wait_for=True)
+    name = f'node_{node_id}'
+    ip = f'{IP_BASE}{node_id}'
+    domain_name = f'skalebounty{node_id}.com'
+    res_tx = skale.manager.create_node(
+        ip, TEST_PORT, name, domain_name, wait_for=True)
 
     if res_tx.receipt['status'] == 1:
         print(f'Node with ID={node_id} was successfully created')

tools/helper.py

@@ -28,7 +28,7 @@
 from skale import Skale
 from skale.wallets import RPCWallet
 
-from configs import CONFIG_CHECK_PERIOD, NOTIFIER_URL
+from configs import CONFIG_CHECK_PERIOD, NOTIFIER_URL, STATE_FILEPATH
 from configs.web3 import ABI_FILEPATH, ENDPOINT
 from tools.exceptions import NodeNotFoundException
 
@@ -42,7 +42,7 @@
 
 def init_skale():
     wallet = RPCWallet(os.environ['TM_URL'])
-    return Skale(ENDPOINT, ABI_FILEPATH, wallet)
+    return Skale(ENDPOINT, ABI_FILEPATH, wallet, state_path=STATE_FILEPATH)
 
 
 def get_agent_name(name):