skalenetwork · olehnikolaiev · Dec 26, 2023 · Oct 2, 2023 · Oct 10, 2023 · Dec 19, 2023
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 env:
   ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
   SCHAIN_TYPE: ${{ secrets.SCHAIN_TYPE }}
-  MANAGER_TAG: "1.9.3-beta.0"
+  MANAGER_TAG: "1.10.0-v1.10.0.0"
   IMA_TAG: "1.3.4-beta.5"
   SGX_WALLET_TAG: "1.83.0-beta.5"
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "helper-scripts"]
 	path = helper-scripts
 	url = https://github.com/skalenetwork/helper-scripts.git
-    branch = develop
+    branch = fix-for-latest-sm 
 [submodule "hardhat-node"]
 	path = hardhat-node
-	url = https://github.com/skalenetwork/hardhat-node.git
+    url = https://github.com/skalenetwork/hardhat-node.git
diff --git a/core/schains/dkg/client.py b/core/schains/dkg/client.py
@@ -160,6 +160,7 @@ def __init__(
         group_index_str = str(int(skale.web3.to_hex(self.group_index)[2:], 16))
         self.poly_name = generate_poly_name(group_index_str, self.node_id_dkg, rotation_id)
         self.bls_name = generate_bls_key_name(group_index_str, self.node_id_dkg, rotation_id)
+        self.rotation_id = rotation_id
         self.incoming_verification_vector = ['0' for _ in range(n)]
         self.incoming_secret_key_contribution = ['0' for _ in range(n)]
         self.public_keys = public_keys
@@ -240,6 +241,7 @@ def broadcast(self):
             self.node_id_contract,
             verification_vector,
             secret_key_contribution,
+            self.rotation_id
         )
         self.last_completed_step = DKGStep.BROADCAST
         logger.info('Everything is sent from %d node', self.node_id_dkg)

diff --git a/core/schains/dkg/main.py b/core/schains/dkg/main.py
@@ -56,6 +56,13 @@
 
     channel_started_time = skale.dkg.get_channel_started_time(dkg_client.group_index)
 
+    rotaion_mainnet = dkg_client.skale.node_rotation.get_rotation_obj(schain_name).rotation_counter
+    if rotation_id != rotaion_mainnet:
+        logger.info(f'sChain {schain_name}: Rotaion id on SKALE MANAGER {rotaion_mainnet} is '
+                    f'different from the one passed by SKALE ADMIN {rotation_id}.'
+                    f' Need to restart')
+        raise DkgError(f'sChain {schain_name}: restarting DKG')
+
     broadcast_and_check_data(dkg_client)
 
     if not dkg_client.is_everyone_broadcasted():

diff --git a/helper-scripts b/helper-scripts
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ Jinja2==3.1.2
 docker==6.1.3
 python-iptables==1.0.1
 
-skale.py==6.1dev1
+skale.py==6.1dev4
 
 ima-predeployed==2.0.0b0
 etherbase-predeployed==1.1.0b3
+0 −0		deploy_manager.sh
+0 −0		deploy_test_manager.sh
+13 −2		helper.sh