olas-operate-middleware 0.10.20__py3-none-any.whl → 0.11.0__py3-none-any.whl

{olas_operate_middleware-0.10.20.dist-info → olas_operate_middleware-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: olas-operate-middleware
-Version: 0.10.20
+Version: 0.11.0
 Summary: 
 License-File: LICENSE
 Author: David Vilela
@@ -30,6 +30,7 @@ Requires-Dist: halo (==0.0.31)
 Requires-Dist: hexbytes (==0.3.1)
 Requires-Dist: ipfshttpclient (==0.8.0a2)
 Requires-Dist: jsonschema (==4.3.3)
+Requires-Dist: multiaddr (==0.0.9)
 Requires-Dist: multidict (==6.0.5)
 Requires-Dist: open-aea-cli-ipfs (==1.65.0)
 Requires-Dist: open-aea-ledger-cosmos (==1.65.0)
@@ -38,6 +39,7 @@ Requires-Dist: open-aea-ledger-ethereum-flashbots (==1.65.0)
 Requires-Dist: open-autonomy (>=0.20.2,<0.21.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)
 Requires-Dist: requests-toolbelt (==1.0.0)
 Requires-Dist: starlette (==0.37.2)
 Requires-Dist: twikit (==2.2.0)

{olas_operate_middleware-0.10.20.dist-info → olas_operate_middleware-0.11.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 operate/__init__.py,sha256=PY5BUTF5cmNI-7UwAj2jJlPl6KJ44LoY5e16p7IrE3g,1335
 operate/account/__init__.py,sha256=suJ_vBMO7hLCvLYe3MVDtLXTNDd6P03og7bvUN7fZsE,804
 operate/account/user.py,sha256=y7DqqDpqgHjbVmnfL_cN0Me_JWl3Dh6GSVt2-9FdRVw,3044
-operate/bridge/bridge_manager.py,sha256=sUfhB1pZvBrF-kBfDOfFVoNeesCe7wd4_YahUF3FZDU,17119
+operate/bridge/bridge_manager.py,sha256=gQuZ0uf70o_YqG5EmZN3A0-inQGAvnIZlUDgtmorgUI,17045
 operate/bridge/providers/lifi_provider.py,sha256=UzAeEnX9FGpnCYYml5lcICeEZeHHqNRCHkGZ-npgteo,14208
-operate/bridge/providers/native_bridge_provider.py,sha256=eSf30IFPkYd373L9ymZHFvKL2Nl8WesGtVIUAQ6RFZo,24702
-operate/bridge/providers/provider.py,sha256=kdwD5ZarEg-SiY5Tar8zij4RsiIeJlsGiejm3OPfXQg,17713
+operate/bridge/providers/native_bridge_provider.py,sha256=eo_X_mtsRRGFCI9CncZ1DpjLjYlgNqLDCeJ9jvvZ09c,24711
+operate/bridge/providers/provider.py,sha256=KXp5CITCQ-fSOv2iFMOt8Wer1QGhBvJG0HN5Tnh5Qns,17287
 operate/bridge/providers/relay_provider.py,sha256=4D2U8jrugh2DJZeSoxLCTVSZe8xMEwdCimqFDtfwWwc,17422
-operate/cli.py,sha256=2_D_3yRqBd5F0z01YohjvFcGg2VRHoAFfQKaeq68k3Q,55445
-operate/constants.py,sha256=ZNiYe52hzWrKhCeZl43WoYN-5tTy_YuN-UnuH-We5U8,3030
+operate/cli.py,sha256=FQdLAbUkXl1Aqgd70rGSLJlsdSfYTm7KDJDAWgVIV1w,67547
+operate/constants.py,sha256=FxQL9MmGHD-nNr7UBPb6ItltWtrCLB2fnT6fb4XNlKg,3849
 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,41 +58,44 @@ 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=B01Fl-yY_D3nR0X1Qei0ipRcGsKM0NUlMlo4-8SwKT4,5047
-operate/ledger/profiles.py,sha256=d6c-oNIULuL9N_2y45kqyMPRuH1ETK4B8iMFWYAZekE,12191
+operate/ledger/__init__.py,sha256=P5rPmLtlZ9qk7jLvzLqg5TxL4mj-bJedRfT3Ie-CRzE,6688
+operate/ledger/profiles.py,sha256=GOh_VIet8Woa30Ps1RQkBT6YO8dzdBq6mLCw3kfQwKY,14073
 operate/migration.py,sha256=TJhztfHUVhZ2buKHx10vXeVo1rRAORdbqGE8fLHL15I,17305
 operate/operate_http/__init__.py,sha256=dxCIVSUos23M4R-PFZZG6k5QrOlEiK0SxhCYSFNxh7U,4711
 operate/operate_http/exceptions.py,sha256=4UFzrn-GyDD71RhkaOyFPBynL6TrrtP3eywaaU3o4fc,1339
-operate/operate_types.py,sha256=oVOzd6K_CTbmAe1pbSFr4LCajNJ_n0y6J5Wwdf_6ev8,8102
+operate/operate_types.py,sha256=hGzYW47MPxOQuvDQAD_TqyIHxNReTeDYQI_uKrfJ1Jc,15570
 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_password.py,sha256=78riP7zyFM2JMa1H8Dh6pg-PtLJLQS7PFzx9SECPACQ,2571
 operate/quickstart/reset_staking.py,sha256=SB5LZq9EctG4SYn2M6oPZ7R7ARHSFLRGzAqfKkpRcy0,5111
-operate/quickstart/run_service.py,sha256=L7pS8OMZJGqd1sVysi0u_J60VqcsWtXZJektDJLzhBk,27270
+operate/quickstart/run_service.py,sha256=loGVKQuHevWcX2nCkgO1oatSH88cWgH4BiZnmpOdAn8,27266
 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/resource.py,sha256=E59oIVqf6B6nN4LTmf_o2iCgLFAogTLPjm_cK6kMVxg,6305
 operate/services/__init__.py,sha256=isrThS-Ccu5Sc15JZgkN4uTAVaSg-NwUUSDeTyJEqLk,855
-operate/services/agent_runner.py,sha256=vdQXDkATS9Nmf16I1W93s9hC551iWlJnBJuDsU9OxvY,7565
-operate/services/deployment_runner.py,sha256=Su73o7cdH6fkQfj468K77J04a_TWiokJwbMyVQ25xko,27067
+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/health_checker.py,sha256=r_lMlRZu-UNfqaM-Zo5_cWjsigdqYTAty4h-ISpM7RE,9859
-operate/services/manage.py,sha256=MCxSrEPHtLTKacNBaQ5KsD6OEdMroz_Vb0vCyTmyYU0,119268
-operate/services/protocol.py,sha256=FoJmHz5nukI01-VYtReMsIl3JT5RgZZSLX-mf9EXQ90,62903
-operate/services/service.py,sha256=9UVscczt6GnDGGZtKix5-cg28fknD9MJdoi_-fyFLRw,39514
+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/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
+operate/settings.py,sha256=0J2E69-Oplo-Ijy-7rzYHc2Q9Xvct-EUMiEdmKKaYOQ,2353
 operate/utils/__init__.py,sha256=rGxT0uLZYixofOrTY_MSnTlpfC4FDAxuNDyA4N-GDkM,3576
-operate/utils/gnosis.py,sha256=CS07ZqvrO7uelkFe09VMyPBcLzKONUI1ZqFvi41BDhc,17924
+operate/utils/gnosis.py,sha256=iyaFw3ZMlNnd1lDulhXfcYxQunPL4Zfhnk1fy20ga7g,19843
+operate/utils/single_instance.py,sha256=pmtumg0fFDWWcGzXFXQdLXSW54Zq9qBKgJTEPF6pVW8,9092
 operate/utils/ssl.py,sha256=O5DrDoZD4T4qQuHP8GLwWUVxQ-1qXeefGp6uDJiF2lM,4308
 operate/wallet/__init__.py,sha256=NGiozD3XhvkBi7_FaOWQ8x1thZPK4uGpokJaeDY_o2w,813
-operate/wallet/master.py,sha256=_s0asw8ztb3T2OVl1soqZzE0YWNXvU3RFhnckYUhjiA,30993
-operate/wallet/wallet_recovery_manager.py,sha256=sXEZyvFMePxQKf9NJg4HT90mPg4-7ZcTbvggMnKKzhA,7795
-olas_operate_middleware-0.10.20.dist-info/METADATA,sha256=T572rkDhnFmt7Ms9EEEYGM9DMNZbBpRyMplbylPPlh8,2058
-olas_operate_middleware-0.10.20.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-olas_operate_middleware-0.10.20.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
-olas_operate_middleware-0.10.20.dist-info/licenses/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-olas_operate_middleware-0.10.20.dist-info/RECORD,,
+operate/wallet/master.py,sha256=gcax6M8_KT2IkL0kGZP4lF4f2updoP5r6ix5e72ZrL4,33674
+operate/wallet/wallet_recovery_manager.py,sha256=ZOLq0B9irux_og8pLBzaxlRA1r6RqJfZA4j4RX0kzoU,7775
+olas_operate_middleware-0.11.0.dist-info/METADATA,sha256=aTW-ySUHCFjiOW4lcIWlaoMZTcc29Nac7AJ-4pOwAHE,2139
+olas_operate_middleware-0.11.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+olas_operate_middleware-0.11.0.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
+olas_operate_middleware-0.11.0.dist-info/licenses/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+olas_operate_middleware-0.11.0.dist-info/RECORD,,

operate/bridge/bridge_manager.py

@@ -42,10 +42,9 @@ from operate.bridge.providers.provider import Provider, ProviderRequest
 from operate.bridge.providers.relay_provider import RelayProvider
 from operate.constants import ZERO_ADDRESS
 from operate.ledger.profiles import USDC
-from operate.operate_types import Chain
+from operate.operate_types import Chain, ChainAmounts
 from operate.resource import LocalResource
 from operate.services.manage import get_assets_balances
-from operate.utils import merge_sum_dicts, subtract_dicts
 from operate.wallet.master import MasterWalletManager
 
 
@@ -187,13 +186,13 @@ class BridgeManager:
         path: Path,
         wallet_manager: MasterWalletManager,
         logger: logging.Logger,
-        quote_validity_period: int = DEFAULT_BUNDLE_VALIDITY_PERIOD,
+        bundle_validity_period: int = DEFAULT_BUNDLE_VALIDITY_PERIOD,
     ) -> None:
         """Initialize bridge manager."""
         self.path = path
         self.wallet_manager = wallet_manager
         self.logger = logger
-        self.quote_validity_period = quote_validity_period
+        self.bundle_validity_period = bundle_validity_period
         self.path.mkdir(exist_ok=True)
         (self.path / EXECUTED_BUNDLES_PATH).mkdir(exist_ok=True)
         self.data: BridgeManagerData = cast(
@@ -251,7 +250,7 @@ class BridgeManager:
             self.logger.info("[BRIDGE MANAGER] Force bundle update.")
             self.quote_bundle(bundle)
             self._store_data()
-        elif now > bundle.timestamp + self.quote_validity_period:
+        elif now > bundle.timestamp + self.bundle_validity_period:
             self.logger.info("[BRIDGE MANAGER] Bundle expired.")
             self.quote_bundle(bundle)
             self._store_data()
@@ -335,7 +334,7 @@ class BridgeManager:
 
         bundle = self._get_updated_bundle(requests_params, force_update)
 
-        balances = {}
+        balances = ChainAmounts()
         for chain in bundle.get_from_chains():
             ledger_api = self.wallet_manager.load(chain.ledger_type).ledger_api(chain)
             balances[chain.value] = get_assets_balances(
@@ -346,9 +345,8 @@ class BridgeManager:
 
         bridge_total_requirements = self.bridge_total_requirements(bundle)
 
-        bridge_refill_requirements = cast(
-            t.Dict[str, t.Dict[str, t.Dict[str, int]]],
-            subtract_dicts(bridge_total_requirements, balances),
+        bridge_refill_requirements = ChainAmounts.shortfalls(
+            bridge_total_requirements, balances
         )
 
         is_refill_required = any(
@@ -364,7 +362,7 @@ class BridgeManager:
                 "balances": balances,
                 "bridge_refill_requirements": bridge_refill_requirements,
                 "bridge_total_requirements": bridge_total_requirements,
-                "expiration_timestamp": bundle.timestamp + self.quote_validity_period,
+                "expiration_timestamp": bundle.timestamp + self.bundle_validity_period,
                 "is_refill_required": is_refill_required,
             }
         )
@@ -441,14 +439,14 @@ class BridgeManager:
             "bridge_request_status": provider_request_status,
         }
 
-    def bridge_total_requirements(self, bundle: ProviderRequestBundle) -> t.Dict:
+    def bridge_total_requirements(self, bundle: ProviderRequestBundle) -> ChainAmounts:
         """Sum bridge requirements."""
         requirements = []
         for provider_request in bundle.provider_requests:
             provider = self._providers[provider_request.provider_id]
             requirements.append(provider.requirements(provider_request))
 
-        return merge_sum_dicts(*requirements)
+        return ChainAmounts.add(*requirements)
 
     def quote_bundle(self, bundle: ProviderRequestBundle) -> None:
         """Update the bundle with the quotes."""

operate/bridge/providers/native_bridge_provider.py

@@ -97,7 +97,7 @@ class BridgeContractAdaptor(ABC):
         if from_token == ZERO_ADDRESS and to_token == ZERO_ADDRESS:
             return True
 
-        for token_map in ERC20_TOKENS:
+        for token_map in ERC20_TOKENS.values():
             if (
                 Chain(from_chain) in token_map
                 and Chain(to_chain) in token_map

operate/bridge/providers/provider.py

@@ -32,7 +32,6 @@ from dataclasses import dataclass
 from aea.crypto.base import LedgerApi
 from autonomy.chain.tx import TxSettler
 from web3 import Web3
-from web3.middleware import geth_poa_middleware
 
 from operate.constants import (
     ON_CHAIN_INTERACT_RETRIES,
@@ -40,8 +39,8 @@ from operate.constants import (
     ON_CHAIN_INTERACT_TIMEOUT,
     ZERO_ADDRESS,
 )
-from operate.ledger import update_tx_with_gas_pricing
-from operate.operate_types import Chain
+from operate.ledger import get_default_ledger_api, update_tx_with_gas_pricing
+from operate.operate_types import Chain, ChainAmounts
 from operate.resource import LocalResource
 from operate.wallet.master import MasterWalletManager
 
@@ -218,28 +217,12 @@ class Provider(ABC):
     def _from_ledger_api(self, provider_request: ProviderRequest) -> LedgerApi:
         """Get the from ledger api."""
         from_chain = provider_request.params["from"]["chain"]
-        chain = Chain(from_chain)
-        wallet = self.wallet_manager.load(chain.ledger_type)
-        ledger_api = wallet.ledger_api(chain)
-
-        # TODO: Backport to open aea/autonomy
-        if chain == Chain.OPTIMISM:
-            ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
-
-        return ledger_api
+        return get_default_ledger_api(Chain(from_chain))
 
     def _to_ledger_api(self, provider_request: ProviderRequest) -> LedgerApi:
         """Get the from ledger api."""
-        from_chain = provider_request.params["to"]["chain"]
-        chain = Chain(from_chain)
-        wallet = self.wallet_manager.load(chain.ledger_type)
-        ledger_api = wallet.ledger_api(chain)
-
-        # TODO: Backport to open aea/autonomy
-        if chain == Chain.OPTIMISM:
-            ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
-
-        return ledger_api
+        to_chain = provider_request.params["to"]["chain"]
+        return get_default_ledger_api(Chain(to_chain))
 
     @abstractmethod
     def quote(self, provider_request: ProviderRequest) -> None:
@@ -253,7 +236,7 @@ class Provider(ABC):
         """Get the sorted list of transactions to execute the quote."""
         raise NotImplementedError()
 
-    def requirements(self, provider_request: ProviderRequest) -> t.Dict:
+    def requirements(self, provider_request: ProviderRequest) -> ChainAmounts:
         """Gets the requirements to execute the quote, with updated gas estimation."""
         self.logger.info(f"[PROVIDER] Requirements for request {provider_request.id}.")
 
@@ -267,14 +250,16 @@ class Provider(ABC):
         txs = self._get_txs(provider_request)
 
         if not txs:
-            return {
-                from_chain: {
-                    from_address: {
-                        ZERO_ADDRESS: 0,
-                        from_token: 0,
+            return ChainAmounts(
+                {
+                    from_chain: {
+                        from_address: {
+                            ZERO_ADDRESS: 0,
+                            from_token: 0,
+                        }
                     }
                 }
-            }
+            )
 
         total_native = 0
         total_gas_fees = 0
@@ -312,13 +297,15 @@ class Provider(ABC):
             f"[PROVIDER] Total gas fees for request {provider_request.id}: {total_gas_fees} native units."
         )
 
-        result = {
-            from_chain: {
-                from_address: {
-                    ZERO_ADDRESS: total_native,
+        result = ChainAmounts(
+            {
+                from_chain: {
+                    from_address: {
+                        ZERO_ADDRESS: total_native,
+                    }
                 }
             }
-        }
+        )
 
         if from_token != ZERO_ADDRESS:
             result[from_chain][from_address][from_token] = total_token