Merge pull request #311 from valory-xyz/fix/staking_data_type

Fix staking data type

Author: dagacha

run_service.sh

@@ -1057,6 +1057,17 @@ if [ "${USE_STAKING}" = true ]; then
   perform_staking_ops
 fi
 
+
+# ensure Safe owner is agent
+# (This may occur if update flow was interrupted)
+service_safe_address=$(<"../$service_safe_address_path")
+current_safe_owners=$(poetry run python "../scripts/get_safe_owners.py" "$service_safe_address" "../$agent_pkey_path" "$rpc" $password_argument | awk '{gsub(/"/, "\047", $0); print $0}')
+if [[ "$current_safe_owners" == "['$operator_address']" ]]; then
+    echo "[Operator] Swapping Safe owner..."
+    poetry run python "../scripts/swap_safe_owner.py" "$service_safe_address" "../$operator_pkey_path" "$agent_address" "$rpc" $password_argument
+fi
+
+
 echo ""
 echo "Finished checking Autonolas Protocol service $service_id state."
 

scripts/staking.py

@@ -353,7 +353,7 @@ def main() -> None:
                 sys.exit(0)
 
             print(
-                f"Service {args.service_id} is already staked on {staking_program}."
+                f"Service {args.service_id} is already staked on {staking_program}. "
                 f"Checking if the staking contract has any rewards..."
             )
             available_rewards = get_available_rewards(

scripts/utils.py

@@ -179,6 +179,10 @@ def is_service_staked(
     service_staking_state = staking_contract.get_service_staking_state(
         ledger_api, staking_contract_address, service_id
     ).pop("data")
+
+    if isinstance(service_staking_state, int):
+        service_staking_state = StakingState(service_staking_state)
+
     is_staked = service_staking_state == StakingState.STAKED or service_staking_state == StakingState.EVICTED
     return is_staked
 
@@ -191,6 +195,9 @@ def is_service_evicted(
         ledger_api, staking_contract_address, service_id
     ).pop("data")
 
+    if isinstance(service_staking_state, int):
+        service_staking_state = StakingState(service_staking_state)
+
     is_evicted = service_staking_state == StakingState.EVICTED
     return is_evicted