Merge pull request #351 from valory-xyz/develop

Release v0.19.4.post1
valory-xyz · Sep 4, 2024 · f3a6ecb · f3a6ecb
2 parents 9ecc1a8 + 4809bf1
commit f3a6ecb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/scripts/choose_staking.py b/scripts/choose_staking.py
@@ -53,7 +53,7 @@
     "CUSTOM_SERVICE_REGISTRY_TOKEN_UTILITY_ADDRESS": "0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8",
     "MECH_CONTRACT_ADDRESS": "0x77af31De935740567Cf4fF1986D04B2c964A786a",
     "CUSTOM_OLAS_ADDRESS": ZERO_ADDRESS,
-    "CUSTOM_STAKING_ADDRESS": ZERO_ADDRESS,
+    "CUSTOM_STAKING_ADDRESS": "0x43fB32f25dce34EB76c78C7A42C8F40F84BCD237",  # Non-staking agents need to specify an arbitrary staking contract so that they can call getStakingState()
     "MECH_ACTIVITY_CHECKER_CONTRACT": ZERO_ADDRESS,
     "MIN_STAKING_BOND_OLAS": "0",
     "MIN_STAKING_DEPOSIT_OLAS": "0",

diff --git a/scripts/staking.py b/scripts/staking.py
@@ -70,6 +70,11 @@ def _check_unstaking_availability(
     staking_program: str,
 ) -> bool:
 
+    if is_service_evicted(
+        ledger_api, service_id, staking_contract_address
+    ):
+        return True
+
     now = time.time()
     ts_start = get_service_info(
         ledger_api, service_id, staking_contract_address