Merge pull request #445 from skalenetwork/hotfix/update-skale-manager

Update to SM 1.8.2-develop.32
skalenetwork · Oct 22, 2021 · a023325 · a023325
2 parents ab9edf5 + e76d1c2
commit a023325
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
       ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
       ENDPOINT: ${{ secrets.ENDPOINT }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      MANAGER_TAG: "1.8.1-develop.6"
+      MANAGER_TAG: "1.8.2-develop.32"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -44,7 +44,7 @@ jobs:
         python-version: [3.7]
     env:
       ETH_PRIVATE_KEY: ${{ secrets.ETH_PRIVATE_KEY }}
-      MANAGER_TAG: "1.8.1-develop.6"
+      MANAGER_TAG: "1.8.2-develop.32"
       ALLOCATOR_TAG: "2.2.0-develop.4"
     steps:
     - uses: actions/checkout@v2

diff --git a/skale/contracts/manager/constants_holder.py b/skale/contracts/manager/constants_holder.py
@@ -81,11 +81,11 @@ def get_rotation_delay(self) -> int:
         return self.contract.functions.rotationDelay().call()
 
     def get_dkg_timeout(self) -> int:
-        return self.contract.functions.complaintTimelimit().call()
+        return self.contract.functions.complaintTimeLimit().call()
 
     @transaction_method
     def set_complaint_timelimit(self, complaint_timelimit: int):
-        return self.contract.functions.setComplaintTimelimit(complaint_timelimit)
+        return self.contract.functions.setComplaintTimeLimit(complaint_timelimit)
 
     @transaction_method
     def grant_role(self, role: bytes, address: str) -> TxRes:

diff --git a/skale/contracts/manager/dkg.py b/skale/contracts/manager/dkg.py
@@ -59,7 +59,7 @@ def pre_response(
             group_index,
             fromNodeIndex=from_node_index,
             verificationVector=verification_vector,
-            verificationVectorMult=verification_vector_mult,
+            verificationVectorMultiplication=verification_vector_mult,
             secretKeyContribution=secret_key_contribution,
         )
 

diff --git a/skale/contracts/manager/manager.py b/skale/contracts/manager/manager.py
@@ -98,8 +98,8 @@ def default_admin_role(self) -> bytes:
     def admin_role(self) -> bytes:
         return self.contract.functions.ADMIN_ROLE().call()
 
-    def schain_deleter_role(self) -> bytes:
-        return self.contract.functions.SCHAIN_DELETER_ROLE().call()
+    def schain_removal_role(self) -> bytes:
+        return self.contract.functions.SCHAIN_REMOVAL_ROLE().call()
 
     def has_role(self, role: bytes, address: str) -> bool:
         return self.contract.functions.hasRole(role, address).call()
diff --git a/skale/contracts/manager/schains_internal.py b/skale/contracts/manager/schains_internal.py
@@ -52,7 +52,7 @@ def get_node_ids_for_schain(self, name):
         return self.contract.functions.getNodesInGroup(id_).call()
 
     def get_schain_ids_for_node(self, node_id):
-        return self.contract.functions.getSchainHashsForNode(node_id).call()
+        return self.contract.functions.getSchainHashesForNode(node_id).call()
 
     def is_schain_exist(self, name):
         id_ = self.schains.name_to_id(name)

diff --git a/skale/utils/contracts_provision/main.py b/skale/utils/contracts_provision/main.py
@@ -51,9 +51,9 @@ def add_all_permissions(skale, address):
     if not skale.schains.has_role(schain_creator_role, address):
         skale.schains.grant_role(schain_creator_role, address)
 
-    schain_deleter_role = skale.manager.schain_deleter_role()
-    if not skale.manager.has_role(schain_deleter_role, address):
-        skale.manager.grant_role(schain_deleter_role, address)
+    schain_removal_role = skale.manager.schain_removal_role()
+    if not skale.manager.has_role(schain_removal_role, address):
+        skale.manager.grant_role(schain_removal_role, address)
 
     bounty_reduction_manager_role = skale.bounty_v2.bounty_reduction_manager_role()
     if not skale.bounty_v2.has_role(bounty_reduction_manager_role, address):