olas-operate-middleware 0.11.1__py3-none-any.whl → 0.11.3__py3-none-any.whl

{olas_operate_middleware-0.11.1.dist-info → olas_operate_middleware-0.11.3.dist-info}/METADATA

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

{olas_operate_middleware-0.11.1.dist-info → olas_operate_middleware-0.11.3.dist-info}/RECORD

@@ -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=IyXbKQkcH33021VaOfQC_ub0lHD6uCJaGtwGvjOMRs8,5650
-operate/ledger/__init__.py,sha256=P5rPmLtlZ9qk7jLvzLqg5TxL4mj-bJedRfT3Ie-CRzE,6688
+operate/ledger/__init__.py,sha256=G0iWcA0Rc-Um8NwpwPJWsQNUQb2tWKyDjzirxPhGc98,6517
 operate/ledger/profiles.py,sha256=7dxUFzjlT-VNpu9z45qeqPGyz5fDz0bM3LUK9VLcgJk,14272
 operate/migration.py,sha256=TJhztfHUVhZ2buKHx10vXeVo1rRAORdbqGE8fLHL15I,17305
 operate/operate_http/__init__.py,sha256=dxCIVSUos23M4R-PFZZG6k5QrOlEiK0SxhCYSFNxh7U,4711
@@ -67,22 +67,22 @@ operate/operate_types.py,sha256=hGzYW47MPxOQuvDQAD_TqyIHxNReTeDYQI_uKrfJ1Jc,1557
 operate/pearl.py,sha256=yrTpSXLu_ML3qT-uNxq3kScOyo31JyxBujiSMfMUbcg,1690
 operate/quickstart/analyse_logs.py,sha256=K11AWWevkddUIUzTe75J3fYVS6aLfi6kT_dAI9OjrX8,4195
 operate/quickstart/claim_staking_rewards.py,sha256=K7X1Yq0mxe3qWmFLb1Xu9-Jghhml95lS_LpM_BXii0o,3533
-operate/quickstart/reset_configs.py,sha256=ipPpbYyB9gQ4KOKS-xBrRi8fT5LvwctSkQi-8XiUMig,3341
+operate/quickstart/reset_configs.py,sha256=DVPM4mh6Djunwq16hf8lD9-nGkkm7wVtwr2JUXr1if8,3380
 operate/quickstart/reset_password.py,sha256=78riP7zyFM2JMa1H8Dh6pg-PtLJLQS7PFzx9SECPACQ,2571
 operate/quickstart/reset_staking.py,sha256=SB5LZq9EctG4SYn2M6oPZ7R7ARHSFLRGzAqfKkpRcy0,5111
-operate/quickstart/run_service.py,sha256=JavQh4_QNtiOq4NgGMwIUZc6yFNJCyFYs3eB4oDweIQ,27393
+operate/quickstart/run_service.py,sha256=yej4VRYcOaBJfT-LLqOe6VQ7i38PrRoAarr-U74CkvA,27653
 operate/quickstart/stop_service.py,sha256=CNcCucI4sqfZG0wTxxh-k14xGcbOh50UGyXqTZVQJP0,2048
 operate/quickstart/terminate_on_chain_service.py,sha256=5ENU8_mkj06i80lKUX-v1QbLU0YzKeOZDUL1e_jzySE,2914
-operate/quickstart/utils.py,sha256=rmd9e7whQIsYpRKqWBEQxMA_SHrivBg6DppFY5ECtQQ,9135
+operate/quickstart/utils.py,sha256=jvi7IgPtJEWf7-ciZFyEh_jgNthhv3Pus4VZa_Ha_ms,9221
 operate/resource.py,sha256=E59oIVqf6B6nN4LTmf_o2iCgLFAogTLPjm_cK6kMVxg,6305
 operate/services/__init__.py,sha256=isrThS-Ccu5Sc15JZgkN4uTAVaSg-NwUUSDeTyJEqLk,855
 operate/services/agent_runner.py,sha256=IIN77vD_2lq_hCkai-3dJQ3Ae64GUOQncvv0wxb3qUE,7629
 operate/services/deployment_runner.py,sha256=iT3gVZvz94kvd7vwtqJgPv74OJliz5XrgjJ_SNFiuEk,27191
-operate/services/funding_manager.py,sha256=BbrqTpAprDNgjTS2tEfWXlmLfveU6ASwGw_7qJtadZw,37493
+operate/services/funding_manager.py,sha256=Oei9uOSIvPvmbYotOndqjK5xxeiUG2qV-ejcA5MJmIE,38404
 operate/services/health_checker.py,sha256=r_lMlRZu-UNfqaM-Zo5_cWjsigdqYTAty4h-ISpM7RE,9859
 operate/services/manage.py,sha256=PyjrcH46bMtSalbpl25roGZlwg7ZEuGkw8gEbahUzj8,112710
 operate/services/protocol.py,sha256=KJK4jpwWbVqXaCNZNo84Sqxo32SFaxUQ_O8Jwq7im4g,71871
-operate/services/service.py,sha256=S0xFMKUCk6Ib13HIU2xSjwtjo95fzfk-PftEP2oT1Ww,42733
+operate/services/service.py,sha256=u_l9nWcfWAqm4lQsHuyXQnOHdZiFvuxaQd1no5IbDV8,43723
 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
@@ -94,8 +94,8 @@ operate/utils/ssl.py,sha256=O5DrDoZD4T4qQuHP8GLwWUVxQ-1qXeefGp6uDJiF2lM,4308
 operate/wallet/__init__.py,sha256=NGiozD3XhvkBi7_FaOWQ8x1thZPK4uGpokJaeDY_o2w,813
 operate/wallet/master.py,sha256=gcax6M8_KT2IkL0kGZP4lF4f2updoP5r6ix5e72ZrL4,33674
 operate/wallet/wallet_recovery_manager.py,sha256=ZOLq0B9irux_og8pLBzaxlRA1r6RqJfZA4j4RX0kzoU,7775
-olas_operate_middleware-0.11.1.dist-info/METADATA,sha256=5STuffU1Ru1v5kLX5VQPdQsCvZAXub-7wXsnk8mh4tE,2139
-olas_operate_middleware-0.11.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-olas_operate_middleware-0.11.1.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
-olas_operate_middleware-0.11.1.dist-info/licenses/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-olas_operate_middleware-0.11.1.dist-info/RECORD,,
+olas_operate_middleware-0.11.3.dist-info/METADATA,sha256=pr-OBOx0J1xjI3ONXU8Ey_YlM7KLuLtZD21N_68-Wjc,2139
+olas_operate_middleware-0.11.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+olas_operate_middleware-0.11.3.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
+olas_operate_middleware-0.11.3.dist-info/licenses/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+olas_operate_middleware-0.11.3.dist-info/RECORD,,

operate/ledger/__init__.py

@@ -119,31 +119,27 @@ def make_chain_ledger_api(
     rpc: t.Optional[str] = None,
 ) -> LedgerApi:
     """Get default RPC chain type."""
+    if chain == Chain.SOLANA:  # TODO: Complete when Solana is supported
+        raise NotImplementedError("Solana not yet supported.")
 
-    if chain not in DEFAULT_LEDGER_APIS:
-        if chain == Chain.SOLANA:  # TODO: Complete when Solana is supported
-            raise NotImplementedError("Solana not yet supported.")
-
-        gas_price_strategies = deepcopy(DEFAULT_GAS_PRICE_STRATEGIES)
-        if chain in (Chain.BASE, Chain.MODE, Chain.OPTIMISM):
-            gas_price_strategies[EIP1559]["fallback_estimate"]["maxFeePerGas"] = to_wei(
-                5, GWEI
-            )
-
-        ledger_api = make_ledger_api(
-            chain.ledger_type.name.lower(),
-            address=rpc or get_default_rpc(chain=chain),
-            chain_id=chain.id,
-            gas_price_strategies=gas_price_strategies,
-            poa_chain=chain == Chain.POLYGON,
+    gas_price_strategies = deepcopy(DEFAULT_GAS_PRICE_STRATEGIES)
+    if chain in (Chain.BASE, Chain.MODE, Chain.OPTIMISM):
+        gas_price_strategies[EIP1559]["fallback_estimate"]["maxFeePerGas"] = to_wei(
+            5, GWEI
         )
 
-        if chain == Chain.OPTIMISM:
-            ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
+    ledger_api = make_ledger_api(
+        chain.ledger_type.name.lower(),
+        address=rpc or get_default_rpc(chain=chain),
+        chain_id=chain.id,
+        gas_price_strategies=gas_price_strategies,
+        poa_chain=chain == Chain.POLYGON,
+    )
 
-        DEFAULT_LEDGER_APIS[chain] = ledger_api
+    if chain == Chain.OPTIMISM:
+        ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
 
-    return DEFAULT_LEDGER_APIS[chain]
+    return ledger_api
 
 
 def get_default_ledger_api(chain: Chain) -> LedgerApi:

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:

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(

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
 

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)

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 = {}