olas-operate-middleware 0.10.10__py3-none-any.whl → 0.10.12__py3-none-any.whl

{olas_operate_middleware-0.10.10.dist-info → olas_operate_middleware-0.10.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: olas-operate-middleware
-Version: 0.10.10
+Version: 0.10.12
 Summary: 
 Author: David Vilela
 Author-email: dvilelaf@gmail.com
@@ -15,14 +15,14 @@ Requires-Dist: clea (==0.1.0rc4)
 Requires-Dist: cytoolz (==0.12.3)
 Requires-Dist: deepdiff (>=8.0.1,<9.0.0)
 Requires-Dist: docker (==6.1.2)
-Requires-Dist: eth-abi (==5.1.0)
+Requires-Dist: eth-abi (==4.0.0)
 Requires-Dist: eth-account (==0.8.0)
 Requires-Dist: eth-hash (==0.7.0)
 Requires-Dist: eth-keyfile (==0.6.1)
 Requires-Dist: eth-keys (==0.4.0)
 Requires-Dist: eth-rlp (==0.3.0)
 Requires-Dist: eth-typing (==3.5.2)
-Requires-Dist: eth-utils (==2.3.1)
+Requires-Dist: eth-utils (==2.2.0)
 Requires-Dist: fastapi (==0.110.3)
 Requires-Dist: frozenlist (==1.4.1)
 Requires-Dist: halo (==0.0.31)

{olas_operate_middleware-0.10.10.dist-info → olas_operate_middleware-0.10.12.dist-info}/RECORD

@@ -7,7 +7,7 @@ operate/bridge/providers/native_bridge_provider.py,sha256=gG8bSyxUoAVEF6_J9tn1qK
 operate/bridge/providers/provider.py,sha256=i54RL7m4wMSADM_D_V_quQump_ipPTmByUc-c-AOLPQ,19687
 operate/bridge/providers/relay_provider.py,sha256=L7D-PKepsuBadarJmrNneZk0bsrh88u05uD6_2MSss4,17341
 operate/cli.py,sha256=REHgtFvaSs7jm7B0K1tPkEKco7Bmd06KQvYAQstFPyw,55783
-operate/constants.py,sha256=ilmLiv0H_xKZyfqmfEdqMci-TlLQyNPp9rrxxqtkqFI,2992
+operate/constants.py,sha256=p_kYu4YyMnoZKHVrhhSjJlCCjWxRdSIzWfvQQeO8Ud4,3030
 operate/data/README.md,sha256=jGPyZTvg2LCGdllvmYxmFMkkkiXb6YWatbqIkcX3kv4,879
 operate/data/__init__.py,sha256=ttC51Yqk9c4ehpIgs1Qbe7aJvzkrbbdZ1ClaCxJYByE,864
 operate/data/contracts/__init__.py,sha256=_th54_WvL0ibGy-b6St0Ne9DX-fyjsh-tNOKDn-cWrg,809
@@ -58,7 +58,7 @@ operate/data/contracts/uniswap_v2_erc20/contract.yaml,sha256=XUdz-XtKtmZgLfItbO8
 operate/data/contracts/uniswap_v2_erc20/tests/__init__.py,sha256=3Arw8dsCsJz6hVOl0t9UjFASHXbV9yp3hw6x4HqgXpU,847
 operate/data/contracts/uniswap_v2_erc20/tests/test_contract.py,sha256=FzZbw9OTcr_yvjOXpk9YcO-K40eyDARyybcfSHDg2Ps,13392
 operate/keys.py,sha256=mPZ2KZujPjHZ1RNVD2vkLzK_3q6J32o9q0WCB6Raxs4,5237
-operate/ledger/__init__.py,sha256=s8GEcV-VtKdBQb9DqW7uf-tj_NpFNn13aNHCh0eqfaQ,3037
+operate/ledger/__init__.py,sha256=hGTrWaPBRCodIFYUKVzfx_t_kpDa7SYyFjat8OhNRqA,3026
 operate/ledger/profiles.py,sha256=LaYPyz-1Cy-KRRuXk60W0ZXQJ2cwoWmDxYrL_psIdKo,11993
 operate/migration.py,sha256=mh921s8FG48XMfDu63ojrdhU7j_RZsdl5E2BvxsbkWE,16937
 operate/operate_http/__init__.py,sha256=dxCIVSUos23M4R-PFZZG6k5QrOlEiK0SxhCYSFNxh7U,4711
@@ -78,10 +78,10 @@ operate/resource.py,sha256=E59oIVqf6B6nN4LTmf_o2iCgLFAogTLPjm_cK6kMVxg,6305
 operate/services/__init__.py,sha256=isrThS-Ccu5Sc15JZgkN4uTAVaSg-NwUUSDeTyJEqLk,855
 operate/services/agent_runner.py,sha256=6tJePUJmlRxlIugT2fDaCJHSrQlDnl1t9pbg3-7EmCQ,7560
 operate/services/deployment_runner.py,sha256=Su73o7cdH6fkQfj468K77J04a_TWiokJwbMyVQ25xko,27067
-operate/services/health_checker.py,sha256=2KSEDxG3YmGolUDU--648ny0UJpTAAKvxkcr_VZQv-I,9654
-operate/services/manage.py,sha256=KFRaBLLkZNNtGSZ0ayC4z07HsJhyIVg4b6X5G-hxceE,118105
+operate/services/health_checker.py,sha256=MuGZ0pQ7zyJVbNU9FJR5gR8zTE7z7kCH1h5Ampv9IC0,9837
+operate/services/manage.py,sha256=5yUZPOFZYHVBV8KSZfGQf9JGsoTFZgfaCUsYbQdPlSw,118137
 operate/services/protocol.py,sha256=FoJmHz5nukI01-VYtReMsIl3JT5RgZZSLX-mf9EXQ90,62903
-operate/services/service.py,sha256=ZbkTryuK3kBkdvhxd9QDyXRxRFsGGG9WZqbLGOUPloc,39301
+operate/services/service.py,sha256=1gjBu3yzwFKX54xEeyRZ_NzRjuYk_gpfWzS8JWTQ2xs,39319
 operate/services/utils/__init__.py,sha256=TvioaZ1mfTRUSCtrQoLNAp4WMVXyqEJqFJM4PxSQCRU,24
 operate/services/utils/mech.py,sha256=W2x4dqodivNKXjWU-Brp40QhoUHsIMyNAO7-caMoR0Q,3821
 operate/services/utils/tendermint.py,sha256=3h9nDb2Z89T0RwUr_AaVjqtymQmsu3u6DAVCfL_k1U0,25591
@@ -91,8 +91,8 @@ operate/utils/ssl.py,sha256=O5DrDoZD4T4qQuHP8GLwWUVxQ-1qXeefGp6uDJiF2lM,4308
 operate/wallet/__init__.py,sha256=NGiozD3XhvkBi7_FaOWQ8x1thZPK4uGpokJaeDY_o2w,813
 operate/wallet/master.py,sha256=jLFLcRgO6ADok2DigpK59PFJ4mnc_0H9a4RRioYzlvw,30811
 operate/wallet/wallet_recovery_manager.py,sha256=sXEZyvFMePxQKf9NJg4HT90mPg4-7ZcTbvggMnKKzhA,7795
-olas_operate_middleware-0.10.10.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-olas_operate_middleware-0.10.10.dist-info/METADATA,sha256=ws4V3q2GY0du3aYLhO2xg6iMwIDcjiWT7wTykSUXHGA,2036
-olas_operate_middleware-0.10.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-olas_operate_middleware-0.10.10.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
-olas_operate_middleware-0.10.10.dist-info/RECORD,,
+olas_operate_middleware-0.10.12.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+olas_operate_middleware-0.10.12.dist-info/METADATA,sha256=hckT7Sd5e7xDjE38VbjWsuB068kkU1o5qDF7NzZSn6s,2036
+olas_operate_middleware-0.10.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+olas_operate_middleware-0.10.12.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
+olas_operate_middleware-0.10.12.dist-info/RECORD,,

operate/constants.py

@@ -32,6 +32,7 @@ DEPLOYMENT_DIR = "deployment"
 DEPLOYMENT_JSON = "deployment.json"
 CONFIG_JSON = "config.json"
 USER_JSON = "user.json"
+HEALTHCHECK_JSON = "healthcheck.json"
 
 AGENT_PERSISTENT_STORAGE_DIR = "persistent_data"
 AGENT_PERSISTENT_STORAGE_ENV_VAR = "STORE_PATH"

operate/ledger/__init__.py

@@ -40,8 +40,8 @@ ARBITRUM_ONE_RPC = os.environ.get("ARBITRUM_ONE_RPC", "https://arb1.arbitrum.io/
 BASE_RPC = os.environ.get("BASE_RPC", "https://mainnet.base.org")
 CELO_RPC = os.environ.get("CELO_RPC", "https://forno.celo.org")
 ETHEREUM_RPC = os.environ.get("ETHEREUM_RPC", "https://ethereum.publicnode.com")
-GNOSIS_RPC = os.environ.get("GNOSIS_RPC", "https://rpc-gate.autonolas.tech/gnosis-rpc/")
-MODE_RPC = os.environ.get("MODE_RPC", "https://mainnet.mode.network/")
+GNOSIS_RPC = os.environ.get("GNOSIS_RPC", "https://gnosis-rpc.publicnode.com")
+MODE_RPC = os.environ.get("MODE_RPC", "https://mainnet.mode.network")
 OPTIMISM_RPC = os.environ.get("OPTIMISM_RPC", "https://mainnet.optimism.io")
 POLYGON_RPC = os.environ.get("POLYGON_RPC", "https://polygon-rpc.com")
 SOLANA_RPC = os.environ.get("SOLANA_RPC", "https://api.mainnet-beta.solana.com")

operate/services/health_checker.py

@@ -29,7 +29,7 @@ from traceback import print_exc
 
 import aiohttp  # type: ignore
 
-from operate.constants import HEALTH_CHECK_URL
+from operate.constants import HEALTHCHECK_JSON, HEALTH_CHECK_URL
 from operate.services.manage import ServiceManager  # type: ignore
 
 
@@ -107,12 +107,14 @@ class HealthChecker:
                     response_json = await resp.json()
 
                     if service_path:
-                        healthcheck_json_path = service_path / "healthcheck.json"
+                        healthcheck_json_path = service_path / HEALTHCHECK_JSON
                         healthcheck_json_path.write_text(
                             json.dumps(response_json, indent=2), encoding="utf-8"
                         )
 
-                    return response_json.get("is_transitioning_fast", False)
+                    return response_json.get(
+                        "is_healthy", response_json.get("is_transitioning_fast", False)
+                    )  # TODO: remove is_transitioning_fast after all the services start reporting is_healthy
                 except Exception as e:  # pylint: disable=broad-except
                     self.logger.error(
                         f"[HEALTH_CHECKER] error {e}. set not healthy!", exc_info=True

operate/services/manage.py

@@ -1895,21 +1895,23 @@ class ServiceManager:
         service = self.load(service_config_id=service_config_id)
         chain_config = service.chain_configs[chain]
         ledger_config = chain_config.ledger_config
-        staking_program_id = chain_config.chain_data.user_params.staking_program_id
         wallet = self.wallet_manager.load(ledger_config.chain.ledger_type)
         ledger_api = wallet.ledger_api(chain=ledger_config.chain, rpc=ledger_config.rpc)
         self.logger.info(
             f"OLAS Balance on service Safe {chain_config.chain_data.multisig}: "
             f"{get_asset_balance(ledger_api, OLAS[Chain(chain)], chain_config.chain_data.multisig)}"
         )
+        current_staking_program = self._get_current_staking_program(
+            service=service, chain=chain
+        )
         staking_contract = get_staking_contract(
             chain=ledger_config.chain,
-            staking_program_id=staking_program_id,
+            staking_program_id=current_staking_program,
         )
         if staking_contract is None:
             raise RuntimeError(
-                "No staking contract found for the current staking_program_id: "
-                f"{staking_program_id}. Not claiming the rewards."
+                "No staking contract found for the "
+                f"{current_staking_program=}. Not claiming the rewards."
             )
 
         sftxb = self.get_eth_safe_tx_builder(ledger_config=ledger_config)
@@ -1925,15 +1927,18 @@ class ServiceManager:
             .add(
                 sftxb.get_claiming_data(
                     service_id=chain_config.chain_data.token,
-                    staking_contract=get_staking_contract(
-                        chain=ledger_config.chain,
-                        staking_program_id=staking_program_id,
-                    ),
+                    staking_contract=staking_contract,
                 )
             )
             .settle()
         )
 
+        if receipt.status != 1:
+            self.logger.error(
+                f"Failed to claim staking rewards. Tx hash: {receipt.tx_hash}"
+            )
+            return 0
+
         # transfer claimed amount from agents safe to master safe
         # TODO: remove after staking contract directly starts sending the rewards to master safe
         amount_claimed = int(receipt["logs"][0]["data"].hex(), 16)
@@ -2323,8 +2328,8 @@ class ServiceManager:
                         await loop.run_in_executor(
                             executor,
                             self.claim_on_chain_from_safe,
-                            service_config_id=service_config_id,
-                            chain=service.home_chain,
+                            service_config_id,
+                            service.home_chain,
                         )
                     except Exception:  # pylint: disable=broad-except
                         logging.info(

operate/services/service.py

@@ -68,6 +68,7 @@ from operate.constants import (
     CONFIG_JSON,
     DEPLOYMENT_DIR,
     DEPLOYMENT_JSON,
+    HEALTHCHECK_JSON,
 )
 from operate.keys import KeysManager
 from operate.operate_http.exceptions import NotAllowed
@@ -911,7 +912,7 @@ class Service(LocalResource):
 
     def get_latest_healthcheck(self) -> t.Dict:
         """Return the latest stored healthcheck.json"""
-        healthcheck_json_path = self.path / "healthcheck.json"
+        healthcheck_json_path = self.path / HEALTHCHECK_JSON
 
         if not healthcheck_json_path.exists():
             return {}
@@ -924,7 +925,7 @@ class Service(LocalResource):
 
     def remove_latest_healthcheck(self) -> None:
         """Remove the latest healthcheck.json, if it exists"""
-        healthcheck_json_path = self.path / "healthcheck.json"
+        healthcheck_json_path = self.path / HEALTHCHECK_JSON
 
         if healthcheck_json_path.exists():
             try: