diff --git a/run_service.sh b/run_service.sh index ad9c1ae5..82c44ca0 100755 --- a/run_service.sh +++ b/run_service.sh @@ -1150,7 +1150,7 @@ export STOP_TRADING_IF_STAKING_KPI_MET=true export RESET_PAUSE_DURATION=45 export MECH_WRAPPED_NATIVE_TOKEN_ADDRESS=$WXDAI_ADDRESS export MECH_CHAIN_ID=ethereum -export TOOLS_ACCURACY_HASH=QmceqDQixda5tU6BBNTYFqBTqfhVeqeBC4NhsC136WYEvP +export TOOLS_ACCURACY_HASH=QmRnFBtMHTKhASuTiP5B8jCmVGrhEMnsgvADfYdSSvLPnu if [ -n "$SUBGRAPH_API_KEY" ]; then export CONDITIONAL_TOKENS_SUBGRAPH_URL="https://gateway-arbitrum.network.thegraph.com/api/$SUBGRAPH_API_KEY/subgraphs/id/7s9rGBffUTL8kDZuxvvpuc46v44iuDarbrADBFw5uVp2" diff --git a/scripts/staking.py b/scripts/staking.py index 24213290..49cf90ef 100644 --- a/scripts/staking.py +++ b/scripts/staking.py @@ -69,11 +69,11 @@ def _check_unstaking_availability( staking_contract_address: str, staking_program: str, ) -> bool: - - if is_service_evicted( - ledger_api, service_id, staking_contract_address - ): - return True + """Service can only be unstaked if one of these conditions occur: + - No rewards available + - Staked for longer than > minimum_staking_durtion. + A service can NOT be unstaked if evicted but has been staked for < minimum_staking_duration + """ now = time.time() ts_start = get_service_info(