Merge pull request #144 from skalenetwork/fix-validator-id-by-address

Fix validator id by address
skalenetwork · Apr 16, 2020 · a937df2 · a937df2
2 parents 7748953 + 0617262
commit a937df2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 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_BRANCH: "beta"
+      MANAGER_TAG: "1.1.1-stable.0"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/scripts/deploy_manager.sh b/scripts/deploy_manager.sh
@@ -3,7 +3,7 @@
 set -e
 
 : "${ETH_PRIVATE_KEY?Need to set ETH_PRIVATE_KEY}"
-: "${MANAGER_BRANCH?Need to set MANAGER_BRANCH}"
+: "${MANAGER_TAG?Need to set MANAGER_TAG}"
 
 export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export DOCKER_NETWORK_ENDPOINT=http://ganache:8545
@@ -15,13 +15,13 @@ docker run -d --network testnet -p 8545:8545 -p 8546:8546 \
     --name ganache trufflesuite/ganache-cli:beta \
     --account="0x${ETH_PRIVATE_KEY},100000000000000000000000000" -l 80000000 -b 1
 
-docker pull skalenetwork/skale-manager:$MANAGER_BRANCH-latest
+docker pull skalenetwork/skale-manager:$MANAGER_TAG
 docker run \
     -v $DIR/contracts_data:/usr/src/manager/data \
     --network testnet \
     -e ENDPOINT=$DOCKER_NETWORK_ENDPOINT \
     -e PRIVATE_KEY=$ETH_PRIVATE_KEY \
-    skalenetwork/skale-manager:$MANAGER_BRANCH-latest \
+    skalenetwork/skale-manager:$MANAGER_TAG \
     npx truffle migrate --network unique
 
 cp $DIR/contracts_data/unique.json $DIR/../test_abi.json
diff --git a/skale/contracts/delegation/validator_service.py b/skale/contracts/delegation/validator_service.py
@@ -109,8 +109,16 @@ def is_main_address(self, validator_address: str) -> bool:
         :returns: True if provided address is the main validator address, otherwise False
         :rtype: bool
         """
-        validator_id = self.validator_id_by_address(validator_address)
-        validator = self.get(validator_id)
+        if not self.validator_address_exists(validator_address):
+            return False
+
+        try:
+            # TODO: handle address that is not main in a proper way
+            validator_id = self.validator_id_by_address(validator_address)
+            validator = self.get(validator_id)
+        except Exception:
+            return False
+
         return validator_address == validator['validator_address']
 
     def validator_address_exists(self, validator_address: str) -> bool:
@@ -127,7 +135,7 @@ def validator_id_by_address(self, validator_address: str) -> int:
         :returns: Validator ID
         :rtype: int
         """
-        return self.contract.functions.getValidatorIdByNodeAddress(validator_address).call()
+        return self.contract.functions.getValidatorId(validator_address).call()
 
     def get_trusted_validator_ids(self) -> list:
         """Returns list of trusted validators id.