chore: update

valory-xyz · Aug 13, 2024 · f78a343 · f78a343
1 parent c4884ab
commit f78a343
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 277 deletions.
diff --git a/operate/data/contracts/staking_token/__init__.py b/operate/data/contracts/staking_token/__init__.py
diff --git a/operate/data/contracts/staking_token/contract.py b/operate/data/contracts/staking_token/contract.py
diff --git a/operate/data/contracts/staking_token/contract.yaml b/operate/data/contracts/staking_token/contract.yaml
diff --git a/operate/services/manage.py b/operate/services/manage.py
@@ -684,17 +684,29 @@ def terminate_service_on_chain_from_safe(self, hash: str, chain_id: int) -> None
         ic(info)
 
 
+        # Determine if the service is staked in a known staking program
+        current_staking_program = None
         for staking_program in STAKING[ledger_config.chain]:
             state = sftxb.staking_status(
                 service_id=chain_data.token,
                 staking_contract=STAKING[ledger_config.chain][staking_program],
             )
+            if state in (StakingState.STAKED, StakingState.EVICTED):
+                current_staking_program = staking_program
 
-            print(state)
+        is_staked = current_staking_program is not None
 
+        # if is_staked:
+        #     can_unstake = and not self._can_unstake_service_from_safe(hash=hash)
 
+        print(current_staking_program)
+        print(is_staked)
         import sys
         sys.exit(1)
+
+
+
+
         if (
             chain_data.user_params.use_staking
             and not self._can_unstake_service_from_safe(hash=hash)

diff --git a/operate/services/protocol.py b/operate/services/protocol.py
@@ -63,9 +63,6 @@
 from operate.data.contracts.service_staking_token.contract import (
     ServiceStakingTokenContract,
 )
-from operate.data.contracts.staking_token.contract import (
-    StakingTokenContract,
-)
 from operate.types import ContractAddresses
 from operate.utils.gnosis import (
     MultiSendOperation,
@@ -203,48 +200,23 @@ def __init__(
                 directory=str(DATA_DIR / "contracts" / "service_staking_token")
             ),
         )
-        self.staking_token_ctr = t.cast(
-            StakingTokenContract,
-            StakingTokenContract.from_dir(
-                directory=str(DATA_DIR / "contracts" / "staking_token")
-            ),
-        )
+        # self.staking_token_ctr = t.cast(
+        #     StakingTokenContract,
+        #     StakingTokenContract.from_dir(
+        #         directory=str(DATA_DIR / "contracts" / "staking_token")
+        #     ),
+        # )
 
     def status(self, service_id: int, staking_contract: str) -> StakingState:
         """Is the service staked?"""
-        staking_state = None
-
-        print(staking_contract)
-        try:
-            print("a")
-            staking_state = StakingState(
-                self.staking_ctr.get_instance(
-                    ledger_api=self.ledger_api,
-                    contract_address=staking_contract,
-                )
-                .functions.getStakingState(service_id)
-                .call()
+        return StakingState(
+            self.staking_ctr.get_instance(
+                ledger_api=self.ledger_api,
+                contract_address=staking_contract,
             )
-            print("b")
-            return staking_state
-        except Exception:
-            print("c")
-
-            try:
-                staking_state = StakingState(
-                    self.staking_token_ctr.get_instance(
-                        ledger_api=self.ledger_api,
-                        contract_address=staking_contract,
-                    )
-                    .functions.getStakingState(service_id)
-                    .call()
-                )
-                return staking_state
-            except Exception:
-                print("EXCEPTION")
-            print("d")
-
-        return staking_state
+            .functions.getStakingState(service_id)
+            .call()
+        )
 
     def slots_available(self, staking_contract: str) -> bool:
         """Check if there are available slots on the staking contract"""