olas-operate-middleware 0.11.1__tar.gz → 0.11.2__tar.gz

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: olas-operate-middleware
-Version: 0.11.1
+Version: 0.11.2
 Summary: 
 License-File: LICENSE
 Author: David Vilela

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/operate/quickstart/reset_configs.py

@@ -89,7 +89,7 @@ def reset_configs(operate: "OperateApp", config_path: str) -> None:
             env_var=f"{chain_name.upper()}_LEDGER_RPC",
             old_value=config.rpc[chain_name],
             hidden=True,
-            validator=check_rpc,
+            validator=lambda x: check_rpc(chain_name, x),  # noqa: B023
         )
 
     if config.user_provided_args is None:

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/operate/quickstart/run_service.py

@@ -198,7 +198,7 @@ def configure_local_config(
         config.rpc = {}
 
     for chain in template["configurations"]:
-        while not check_rpc(config.rpc.get(chain)):
+        while not check_rpc(chain, config.rpc.get(chain)):
             config.rpc[chain] = ask_or_get_from_env(
                 f"Enter a {CHAIN_TO_METADATA[chain]['name']} RPC that supports eth_newFilter [hidden input]: ",
                 True,
@@ -495,7 +495,10 @@ def get_service(manager: ServiceManager, template: ServiceTemplate) -> Service:
                     service_template=template,
                 )
 
-            service.env_variables = template["env_variables"]
+            for env_var_name, env_var_data in template["env_variables"].items():
+                if env_var_name not in service.env_variables:
+                    service.env_variables[env_var_name] = env_var_data
+
             service.update_user_params_from_template(service_template=template)
             service.store()
             break
@@ -556,7 +559,7 @@ def _ask_funds_from_requirements(
     """Ask for funds from requirements."""
     spinner = Halo(text="Calculating funds requirements...", spinner="dots")
     spinner.start()
-    requirements = manager.refill_requirements(
+    requirements = manager.funding_requirements(
         service_config_id=service.service_config_id
     )
     spinner.stop()
@@ -635,6 +638,7 @@ def ensure_enough_funds(operate: "OperateApp", service: Service) -> None:
     _maybe_create_master_eoa(operate)
     wallet = operate.wallet_manager.load(ledger_type=LedgerType.ETHEREUM)
     manager = operate.service_manager()
+    manager.funding_manager.is_for_quickstart = True
 
     backup_owner = None
     while not _ask_funds_from_requirements(manager, wallet, service):
@@ -692,7 +696,8 @@ def run_service(
     )
 
     print_section("Funding the service")
-    manager.funding_manager.fund_service_initial(service=service)
+    service = get_service(manager, template)
+    manager.funding_manager.topup_service_initial(service=service)
 
     print_section("Deploying the service")
     manager.deploy_service_locally(

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/operate/quickstart/utils.py

@@ -208,12 +208,12 @@ def ask_or_get_from_env(
     return ""
 
 
-def check_rpc(rpc_url: Optional[str] = None) -> bool:
+def check_rpc(chain: str, rpc_url: Optional[str] = None) -> bool:
     """Check RPC."""
     if rpc_url is None:
         return False
 
-    spinner = Halo(text="Checking RPC...", spinner="dots")
+    spinner = Halo(text=f"[{chain}] Checking RPC...", spinner="dots")
     spinner.start()
 
     rpc_data = {
@@ -230,7 +230,7 @@ def check_rpc(rpc_url: Optional[str] = None) -> bool:
         response.raise_for_status()
         rpc_response = response.json()
     except (requests.exceptions.RequestException, ValueError, TypeError) as e:
-        spinner.fail(f"Error: Failed to send RPC request: {e}")
+        spinner.fail(f"Error: Failed to send {chain} RPC request: {e}")
         return False
 
     rpc_error_message = (
@@ -246,24 +246,24 @@ def check_rpc(rpc_url: Optional[str] = None) -> bool:
         print("  Received response:")
         print("  ", rpc_response)
         print("")
-        spinner.fail("Terminating script.")
+        spinner.fail(f"[{chain}] Terminating script.")
     elif rpc_error_message == "out of requests":
         print("Error: The provided rpc is out of requests.")
-        spinner.fail("Terminating script.")
+        spinner.fail(f"[{chain}] Terminating script.")
     elif (
         rpc_error_message == "the method eth_newfilter does not exist/is not available"
     ):
         print("Error: The provided RPC does not support 'eth_newFilter'.")
-        spinner.fail("Terminating script.")
+        spinner.fail(f"[{chain}] Terminating script.")
     elif "invalid" in rpc_error_message or "params" in rpc_error_message:
-        spinner.succeed("RPC checks passed.")
+        spinner.succeed(f"[{chain}] RPC checks passed.")
         return True
     else:
         print("Error: Unknown rpc error.")
         print("  Received response:")
         print("  ", rpc_response)
         print("")
-        spinner.fail("Terminating script.")
+        spinner.fail(f"[{chain}] Terminating script.")
 
     return False
 

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/operate/services/funding_manager.py

@@ -90,6 +90,7 @@ class FundingManager:
         self._lock = threading.Lock()
         self._funding_in_progress: t.Dict[str, bool] = {}
         self._funding_requests_cooldown_until: t.Dict[str, float] = {}
+        self.is_for_quickstart = False
 
     def drain_agents_eoas(
         self, service: Service, withdrawal_address: str, chain: Chain
@@ -650,7 +651,11 @@ class FundingManager:
         # We assume that if the service safe is created in any chain,
         # we have requested the funding already.
         service_initial_topup = service.get_initial_funding_amounts()
-        if not all(
+        if self.is_for_quickstart:
+            service_initial_shortfalls = self.compute_service_initial_shortfalls(
+                service
+            )
+        elif not all(
             SERVICE_SAFE_PLACEHOLDER in addresses
             for addresses in service_initial_topup.values()
         ):
@@ -795,6 +800,21 @@ class FundingManager:
         """Fund service initially"""
         self.fund_chain_amounts(service.get_initial_funding_amounts())
 
+    def compute_service_initial_shortfalls(self, service: Service) -> ChainAmounts:
+        """Compute service initial shortfalls"""
+        initial_funding_amounts = service.get_initial_funding_amounts()
+        service_balances = service.get_balances()
+        return self._compute_shortfalls(
+            balances=service_balances,
+            thresholds=initial_funding_amounts,
+            topups=initial_funding_amounts,
+        )
+
+    def topup_service_initial(self, service: Service) -> None:
+        """Fund service enough to reach initial funding amounts"""
+        service_initial_shortfalls = self.compute_service_initial_shortfalls(service)
+        self.fund_chain_amounts(service_initial_shortfalls)
+
     def fund_chain_amounts(self, amounts: ChainAmounts) -> None:
         """Fund chain amounts"""
         required = self._aggregate_as_master_safe_amounts(amounts)

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/operate/services/service.py

@@ -76,7 +76,7 @@ from operate.constants import (
     ZERO_ADDRESS,
 )
 from operate.keys import KeysManager
-from operate.ledger import get_default_rpc
+from operate.ledger import get_default_ledger_api, get_default_rpc
 from operate.operate_http.exceptions import NotAllowed
 from operate.operate_types import (
     Chain,
@@ -97,6 +97,7 @@ from operate.operate_types import (
 from operate.resource import LocalResource
 from operate.services.deployment_runner import run_host_deployment, stop_host_deployment
 from operate.services.utils import tendermint
+from operate.utils.gnosis import get_asset_balance
 from operate.utils.ssl import create_ssl_certificate
 
 
@@ -1148,6 +1149,29 @@ class Service(LocalResource):
 
         return amounts
 
+    def get_balances(self) -> ChainAmounts:
+        """Get balances of the agent addresses and service safe."""
+        initial_funding_amounts = self.get_initial_funding_amounts()
+        return ChainAmounts(
+            {
+                chain_str: {
+                    address: {
+                        asset: get_asset_balance(
+                            ledger_api=get_default_ledger_api(
+                                Chain.from_string(chain_str)
+                            ),
+                            asset_address=asset,
+                            address=address,
+                            raise_on_invalid_address=False,
+                        )
+                        for asset in tokens
+                    }
+                    for address, tokens in addresses.items()
+                }
+                for chain_str, addresses in initial_funding_amounts.items()
+            }
+        )
+
     def get_funding_requests(self) -> ChainAmounts:
         """Get funding amounts requested by the agent."""
         agent_response = {}

{olas_operate_middleware-0.11.1 → olas_operate_middleware-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "olas-operate-middleware"
-version = "0.11.1"
+version = "0.11.2"
 description = ""
 authors = ["David Vilela <dvilelaf@gmail.com>", "Viraj Patel <vptl185@gmail.com>"]
 readme = "README.md"