olas-operate-middleware 0.13.5__tar.gz → 0.13.6__tar.gz

{olas_operate_middleware-0.13.5 → olas_operate_middleware-0.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: olas-operate-middleware
-Version: 0.13.5
+Version: 0.13.6
 Summary: 
 License-File: LICENSE
 Author: David Vilela
@@ -21,7 +21,7 @@ Requires-Dist: open-aea-cli-ipfs (>=2.0.6,<3.0.0)
 Requires-Dist: open-aea-ledger-cosmos (>=2.0.6,<3.0.0)
 Requires-Dist: open-aea-ledger-ethereum (>=2.0.6,<3.0.0)
 Requires-Dist: open-aea-ledger-ethereum-flashbots (>=2.0.6,<3.0.0)
-Requires-Dist: open-autonomy (>=0.21.4,<0.22.0)
+Requires-Dist: open-autonomy (>=0.21.5,<0.22.0)
 Requires-Dist: psutil (>=5.9.8,<6.0.0)
 Requires-Dist: pyinstaller (>=6.8.0,<7.0.0)
 Requires-Dist: requests-mock (>=1.12.1,<2.0.0)

{olas_operate_middleware-0.13.5 → olas_operate_middleware-0.13.6}/operate/services/manage.py

@@ -22,7 +22,6 @@
 import json
 import logging
 import os
-import time
 import traceback
 import typing as t
 from collections import Counter, defaultdict
@@ -967,9 +966,6 @@ class ServiceManager:
             chain_data.token = event_data["args"]["serviceId"]
             service.store()
 
-        if is_first_mint:  # Hotfix to prevent RPC out-of-sync issues
-            time.sleep(RPC_SYNC_TIMEOUT)
-
         # Activate service
         if (
             self._get_on_chain_state(service=service, chain=chain)
@@ -1035,9 +1031,6 @@ class ServiceManager:
                 )
             ).settle()
 
-        if is_first_mint:  # Hotfix to prevent RPC out-of-sync issues
-            time.sleep(RPC_SYNC_TIMEOUT)
-
         # Register agent instances
         if (
             self._get_on_chain_state(service=service, chain=chain)
@@ -1105,9 +1098,6 @@ class ServiceManager:
                 )
             ).settle()
 
-        if is_first_mint:  # Hotfix to prevent RPC out-of-sync issues
-            time.sleep(RPC_SYNC_TIMEOUT)
-
         # Deploy service
         is_initial_funding = False
         if (

{olas_operate_middleware-0.13.5 → olas_operate_middleware-0.13.6}/operate/utils/gnosis.py

@@ -22,7 +22,6 @@
 import binascii
 import itertools
 import secrets
-import time
 import typing as t
 from enum import Enum
 
@@ -164,7 +163,6 @@ def _get_nonce() -> int:
 def create_safe(
     ledger_api: LedgerApi,
     crypto: Crypto,
-    backup_owner: t.Optional[str] = None,
     salt_nonce: t.Optional[int] = None,
 ) -> t.Tuple[str, int, str]:
     """Create gnosis safe."""
@@ -202,29 +200,6 @@ def create_safe(
         event_name="ProxyCreation",
     )
     safe_address = event["args"]["proxy"]
-
-    if backup_owner is not None:
-        retry_delays = [0, 60, 120, 180, 240]
-        for attempt in range(1, len(retry_delays) + 1):
-            try:
-                add_owner(
-                    ledger_api=ledger_api,
-                    crypto=crypto,
-                    safe=safe_address,
-                    owner=backup_owner,
-                )
-                break  # success
-            except Exception as e:  # pylint: disable=broad-except
-                if attempt == len(retry_delays):
-                    raise RuntimeError(
-                        f"Failed to add backup owner {backup_owner} after {len(retry_delays)} attempts: {e}"
-                    ) from e
-                next_delay = retry_delays[attempt]
-                logger.error(
-                    f"Retry add owner {attempt}/{len(retry_delays)} in {next_delay} seconds due to error: {e}"
-                )
-                time.sleep(next_delay)
-
     return safe_address, salt_nonce, tx_settler.tx_hash
 
 

{olas_operate_middleware-0.13.5 → olas_operate_middleware-0.13.6}/operate/utils/single_instance.py

@@ -36,9 +36,9 @@ class AppSingleInstance:
 
     host = "127.0.0.1"
     after_kill_sleep_time = 1
-    proc_kill_wait_timeout = 10
-    proc_terminate_wait_timeout = 10
-    http_request_timeout = 3
+    proc_kill_wait_timeout = 3
+    proc_terminate_wait_timeout = 3
+    http_request_timeout = 1
 
     def __init__(self, port_number: int, shutdown_endpoint: str = "/shutdown") -> None:
         """Initialize the AppSingleInstance manager."""

{olas_operate_middleware-0.13.5 → olas_operate_middleware-0.13.6}/operate/wallet/master.py

@@ -675,20 +675,29 @@ class EthereumMasterWallet(MasterWallet):
         rpc: t.Optional[str] = None,
     ) -> t.Optional[str]:
         """Create safe."""
-        if chain in self.safes:
-            raise ValueError(f"Wallet already has a Safe on chain {chain}.")
-
-        safe, self.safe_nonce, tx_hash = create_gnosis_safe(
-            ledger_api=self.ledger_api(chain=chain, rpc=rpc),
-            crypto=self.crypto,
-            backup_owner=backup_owner,
-            salt_nonce=self.safe_nonce,
-        )
-        self.safe_chains.append(chain)
+        tx_hash = None
+        ledger_api = self.ledger_api(chain=chain, rpc=rpc)
         if self.safes is None:
             self.safes = {}
-        self.safes[chain] = safe
-        self.store()
+
+        if chain not in self.safe_chains and chain not in self.safes:
+            safe, self.safe_nonce, tx_hash = create_gnosis_safe(
+                ledger_api=ledger_api,
+                crypto=self.crypto,
+                salt_nonce=self.safe_nonce,
+            )
+            self.safe_chains.append(chain)
+            self.safes[chain] = safe
+            self.store()
+
+        if backup_owner is not None:
+            add_owner(
+                ledger_api=ledger_api,
+                crypto=self.crypto,
+                safe=self.safes[chain],
+                owner=backup_owner,
+            )
+
         return tx_hash
 
     def update_backup_owner(

{olas_operate_middleware-0.13.5 → olas_operate_middleware-0.13.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "olas-operate-middleware"
-version = "0.13.5"
+version = "0.13.6"
 description = ""
 authors = ["David Vilela <dvilelaf@gmail.com>", "Viraj Patel <vptl185@gmail.com>"]
 readme = "README.md"
@@ -19,7 +19,7 @@ operate = "operate.cli:main"
 
 [tool.poetry.dependencies]
 python = "<3.12,>=3.10"
-open-autonomy = "^0.21.4"
+open-autonomy = "^0.21.5"
 open-aea-ledger-cosmos = "^2.0.6"
 open-aea-ledger-ethereum = "^2.0.6"
 open-aea-ledger-ethereum-flashbots = "^2.0.6"