olas-operate-middleware 0.14.0__py3-none-any.whl → 0.14.1__py3-none-any.whl

{olas_operate_middleware-0.14.0.dist-info → olas_operate_middleware-0.14.1.dist-info}/METADATA

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

{olas_operate_middleware-0.14.0.dist-info → olas_operate_middleware-0.14.1.dist-info}/RECORD

@@ -70,7 +70,7 @@ operate/quickstart/claim_staking_rewards.py,sha256=K7X1Yq0mxe3qWmFLb1Xu9-Jghhml9
 operate/quickstart/reset_configs.py,sha256=DVPM4mh6Djunwq16hf8lD9-nGkkm7wVtwr2JUXr1if8,3380
 operate/quickstart/reset_password.py,sha256=jEBk2ROR1q8PkTIHlqum7E8PRQtXHwrauiy0_bik3RQ,2394
 operate/quickstart/reset_staking.py,sha256=SB5LZq9EctG4SYn2M6oPZ7R7ARHSFLRGzAqfKkpRcy0,5111
-operate/quickstart/run_service.py,sha256=myncdvwHD9DDgjj6fBVC2Ju4SplfBUZnPyXu0Z2gNYg,30279
+operate/quickstart/run_service.py,sha256=tt4PYeZJ2MtYeG59vohOdMbOiCYGGUmGnjeZwYl0shQ,30383
 operate/quickstart/stop_service.py,sha256=a3-1vVyZma2UtFUPKMvVrOso1Iwpz5Rzpus9VAI4qOc,2169
 operate/quickstart/terminate_on_chain_service.py,sha256=5ENU8_mkj06i80lKUX-v1QbLU0YzKeOZDUL1e_jzySE,2914
 operate/quickstart/utils.py,sha256=i1juhJCPkzB7ZKgSk5tNiRmYxGcx8MG-dTjVyC5sKys,9287
@@ -83,7 +83,7 @@ operate/services/funding_manager.py,sha256=q-mO6kQWthCLI5uW8qbrMQw_6i--zd1rJ3SG4
 operate/services/health_checker.py,sha256=dARikrgzU1jEuK4NUqlZ7N0DQq4Ah1ZiRKHmrlh8v-A,11472
 operate/services/manage.py,sha256=9dTjXhBq6tgcFWfhU61JQL67L2h3_b_7p8OICimWWB4,113292
 operate/services/protocol.py,sha256=4wAMHoELkqJJlETsMJa-XT8xVA0jfueiaKMn7X4SUKo,71898
-operate/services/service.py,sha256=g5P7DmOv-DtITTLJ3m2MdH8L5gMx0Nt50O06Jd3enW0,45407
+operate/services/service.py,sha256=YOU0rlPe5PjDnFRlAcThYLvr5MrPOftBDKZHMRNzZ78,46647
 operate/services/utils/__init__.py,sha256=TvioaZ1mfTRUSCtrQoLNAp4WMVXyqEJqFJM4PxSQCRU,24
 operate/services/utils/mech.py,sha256=98gNw8pMNvv_O34V1blr7JUwenqxFeeyFuXLuSYv10w,3864
 operate/services/utils/tendermint.py,sha256=M4zjF97SOJomhmj97bWKIphnia30lbDie65fs_vy_q8,25686
@@ -95,8 +95,8 @@ operate/utils/ssl.py,sha256=O5DrDoZD4T4qQuHP8GLwWUVxQ-1qXeefGp6uDJiF2lM,4308
 operate/wallet/__init__.py,sha256=NGiozD3XhvkBi7_FaOWQ8x1thZPK4uGpokJaeDY_o2w,813
 operate/wallet/master.py,sha256=019VvWsMfzAV3fUienhcYVLB12BcSVvub3weAeMOlSA,33808
 operate/wallet/wallet_recovery_manager.py,sha256=kZIKBCIVb-ufntUoCE0IqAJ-Q2YUIl7955UYY6sp8Os,19856
-olas_operate_middleware-0.14.0.dist-info/METADATA,sha256=zv5wkUhi9SFBx0kX1eardkHgBIxoRO3EeT7EX41JtW8,1492
-olas_operate_middleware-0.14.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-olas_operate_middleware-0.14.0.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
-olas_operate_middleware-0.14.0.dist-info/licenses/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-olas_operate_middleware-0.14.0.dist-info/RECORD,,
+olas_operate_middleware-0.14.1.dist-info/METADATA,sha256=f-5TTJaF2_pDz2a0j7nRdvqdokleT2m2-gJ94jf2YI4,1492
+olas_operate_middleware-0.14.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+olas_operate_middleware-0.14.1.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
+olas_operate_middleware-0.14.1.dist-info/licenses/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+olas_operate_middleware-0.14.1.dist-info/RECORD,,

operate/quickstart/run_service.py

@@ -46,6 +46,7 @@ from operate.ledger import DEFAULT_RPCS
 from operate.ledger.profiles import STAKING, get_staking_contract
 from operate.operate_types import (
     Chain,
+    ChainAmounts,
     LedgerType,
     ServiceEnvProvisionType,
     ServiceTemplate,
@@ -649,7 +650,9 @@ def _ask_funds_from_requirements(
     )
 
     if not requirements["is_refill_required"] and requirements["allow_start_agent"]:
-        for chain_name, balances in requirements["balances"].items():
+        for chain_name, balances in ChainAmounts.from_json(
+            requirements["balances"]
+        ).items():
             ledger_api = wallet.ledger_api(
                 chain=Chain(chain_name),
                 rpc=service.chain_configs[chain_name].ledger_config.rpc,
@@ -662,17 +665,19 @@ def _ask_funds_from_requirements(
 
         return True
 
-    for chain_name, chain_requirements in requirements["refill_requirements"].items():
+    for chain_name, chain_requirements in ChainAmounts.from_json(
+        requirements["refill_requirements"]
+    ).items():
         chain = Chain(chain_name)
         ledger_api = wallet.ledger_api(
             chain=chain,
             rpc=service.chain_configs[chain_name].ledger_config.rpc,
         )
-        for wallet_address, requirements in chain_requirements.items():
+        for wallet_address, _requirements in chain_requirements.items():
             if wallet_address in ("master_safe", "service_safe"):
                 continue  # we can't ask funds in placeholder addresses
 
-            for asset_address, requirement in requirements.items():
+            for asset_address, requirement in _requirements.items():
                 ask_funds_in_address(
                     ledger_api=ledger_api,
                     chain=chain_name,

operate/services/service.py

@@ -77,6 +77,7 @@ from operate.constants import (
 )
 from operate.keys import KeysManager
 from operate.ledger import get_default_ledger_api, get_default_rpc
+from operate.ledger.profiles import WRAPPED_NATIVE_ASSET
 from operate.operate_http.exceptions import NotAllowed
 from operate.operate_types import (
     AgentRelease,
@@ -1200,10 +1201,13 @@ class Service(LocalResource):
 
         return amounts
 
-    def get_balances(self) -> ChainAmounts:
-        """Get balances of the agent addresses and service safe."""
+    def get_balances(self, unify_wrapped_native_tokens: bool = True) -> ChainAmounts:
+        """Get balances of the agent addresses and service safe.
+
+        :param unify_wrapped_native_tokens: Whether to consider wrapped native tokens as native tokens.
+        """
         initial_funding_amounts = self.get_initial_funding_amounts()
-        return ChainAmounts(
+        absolute_balances = ChainAmounts(
             {
                 chain_str: {
                     address: {
@@ -1222,6 +1226,27 @@ class Service(LocalResource):
                 for chain_str, addresses in initial_funding_amounts.items()
             }
         )
+        if unify_wrapped_native_tokens:
+            for chain_str, addresses in absolute_balances.items():
+                chain = Chain.from_string(chain_str)
+                wrapped_asset = WRAPPED_NATIVE_ASSET[chain]
+                for address, assets in addresses.items():
+                    if ZERO_ADDRESS in assets or wrapped_asset in assets:
+                        if ZERO_ADDRESS not in assets:
+                            assets[ZERO_ADDRESS] = 0
+
+                    if wrapped_asset in assets:
+                        assets[ZERO_ADDRESS] += assets[wrapped_asset]
+                        del assets[wrapped_asset]
+                    else:
+                        assets[ZERO_ADDRESS] += get_asset_balance(
+                            ledger_api=get_default_ledger_api(chain),
+                            asset_address=wrapped_asset,
+                            address=address,
+                            raise_on_invalid_address=False,
+                        )
+
+        return absolute_balances
 
     def get_funding_requests(self) -> ChainAmounts:
         """Get funding amounts requested by the agent."""