olas-operate-middleware 0.14.4__tar.gz → 0.14.6__tar.gz

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/PKG-INFO

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

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/bridge/providers/provider.py

@@ -61,7 +61,9 @@ MESSAGE_EXECUTION_FAILED_SETTLEMENT = (
 )
 MESSAGE_REQUIREMENTS_QUOTE_FAILED = "Cannot compute requirements for failed quote."
 
-ERC20_APPROVE_SELECTOR = "0x095ea7b3"  # First 4 bytes of Web3.keccak(text='approve(address,uint256)').to_0x_hex()[:10]
+# ERC-20 function selectors (first 4 bytes of the Keccak-256 hash of the function signature)
+ERC20_APPROVE_SELECTOR = "0x095ea7b3"
+ERC20_TRANSFER_SELECTOR = "0xa9059cbb"
 
 
 @dataclass
@@ -287,14 +289,29 @@ class Provider(ABC):
                 f"[PROVIDER] {from_ledger_api.api.eth.get_block('latest').baseFeePerGas=}"
             )
 
-            if tx.get("to", "").lower() == from_token.lower() and tx.get(
-                "data", ""
-            ).startswith(ERC20_APPROVE_SELECTOR):
+            # TODO Move the requirements logic to be implemented by each provider.
+            #
+            # The following code parses the required ERC20 token amount. The typical case is that the bridge
+            # transactions fall into one of these cases:
+            #     a. ERC20.approve + Bridge.deposit (bridge-specific tx), or
+            #     b. ERC20.transfer
+            #
+            # Thus, the logic below assumes that there is only either an ERC20.approve OR ERC20.transfer (but not both).
+            # However, since the set of transactions is bridge-dependent, this might not always be the case, and
+            # is suggested that the requirements() logic be implemented per-provider.
+            if tx.get("to", "").lower() == from_token.lower():
+                data = tx.get("data", "").lower()
                 try:
-                    amount = BigInt(tx["data"][-64:], 16)
-                    total_token += amount
+                    if data.startswith(ERC20_APPROVE_SELECTOR):
+                        amount_hex = data[-64:]
+                        amount = BigInt(amount_hex, 16)
+                        total_token += amount
+                    elif data.startswith(ERC20_TRANSFER_SELECTOR):
+                        amount_hex = data[10 + 64 : 10 + 64 + 64]
+                        amount = BigInt(amount_hex, 16)
+                        total_token += amount
                 except Exception as e:
-                    raise RuntimeError("Malformed ERC20 approve transaction.") from e
+                    raise RuntimeError("Malformed ERC20 transaction.") from e
 
         self.logger.info(
             f"[PROVIDER] Total gas fees for request {provider_request.id}: {total_gas_fees} native units."

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/cli.py

@@ -824,7 +824,7 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
 
         if transfer_excess_assets:
             asset_addresses = {ZERO_ADDRESS} | {
-                token[chain] for token in ERC20_TOKENS.values()
+                token[chain] for token in ERC20_TOKENS.values() if chain in token
             }
             balances = get_assets_balances(
                 ledger_api=ledger_api,

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/constants.py

@@ -81,9 +81,10 @@ MECH_AGENT_FACTORY_JSON_URL = "https://raw.githubusercontent.com/valory-xyz/auto
 MECH_MARKETPLACE_JSON_URL = "https://raw.githubusercontent.com/valory-xyz/mech-quickstart/refs/heads/main/contracts/MechMarketplace.json"
 NO_STAKING_PROGRAM_ID = "no_staking"
 
-
 DEPLOYMENT_START_TRIES_NUM = 3
 IPFS_CHECK_URL = "https://gateway.autonolas.tech/ipfs/bafybeigcllaxn4ycjjvika3zd6eicksuriez2wtg67gx7pamhcazl3tv54/echo/README.md"
 MSG_NEW_PASSWORD_MISSING = "'new_password' is required."  # nosec
 MSG_INVALID_PASSWORD = "Password is not valid."  # nosec
 MSG_INVALID_MNEMONIC = "Seed phrase is not valid."  # nosec
+
+POLY_SAFE_SERVICE_NAMES = frozenset(("polymarket_trader",))

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/ledger/profiles.py

@@ -189,6 +189,12 @@ USDC: t.Dict[Chain, str] = {
     Chain.POLYGON: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
 }
 
+USDC_E: t.Dict[Chain, str] = {
+    Chain.GNOSIS: "0x2a22f9c3b484c3629090FeED35F17Ff8F88f76F0",
+    Chain.OPTIMISM: "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
+    Chain.POLYGON: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+}
+
 WRAPPED_NATIVE_ASSET = {
     Chain.ARBITRUM_ONE: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
     Chain.BASE: "0x4200000000000000000000000000000000000006",
@@ -203,6 +209,7 @@ WRAPPED_NATIVE_ASSET = {
 ERC20_TOKENS = {
     "OLAS": OLAS,
     "USDC": USDC,
+    "USDC.e": USDC_E,
     "WRAPPED_NATIVE": WRAPPED_NATIVE_ASSET,
 }
 
@@ -252,7 +259,7 @@ DEFAULT_EOA_TOPUPS = {
     Chain.GNOSIS: {ZERO_ADDRESS: BigInt(750_000_000_000_000_000)},
     Chain.MODE: {ZERO_ADDRESS: BigInt(250_000_000_000_000)},
     Chain.OPTIMISM: {ZERO_ADDRESS: BigInt(2_500_000_000_000_000)},
-    Chain.POLYGON: {ZERO_ADDRESS: BigInt(750_000_000_000_000_000)},
+    Chain.POLYGON: {ZERO_ADDRESS: BigInt(4_000_000_000_000_000_000)},
 }
 
 DEFAULT_EOA_TOPUPS_WITHOUT_SAFE = {
@@ -268,7 +275,7 @@ DEFAULT_RECOVERY_TOPUPS = {
     Chain.GNOSIS: {ZERO_ADDRESS: BigInt(187_500_000_000_000_000)},
     Chain.MODE: {ZERO_ADDRESS: BigInt(62_500_000_000_000)},
     Chain.OPTIMISM: {ZERO_ADDRESS: BigInt(625_000_000_000_000)},
-    Chain.POLYGON: {ZERO_ADDRESS: BigInt(187_500_000_000_000_000)},
+    Chain.POLYGON: {ZERO_ADDRESS: BigInt(1_000_000_000_000_000_000)},
 }
 
 DEFAULT_EOA_THRESHOLD = 0.5

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/services/manage.py

@@ -30,6 +30,7 @@ from http import HTTPStatus
 from pathlib import Path
 
 import requests
+from aea.configurations.data_types import PublicId
 from aea.helpers.base import IPFSHash
 from aea_ledger_ethereum import LedgerApi
 from autonomy.chain.base import registry_contracts
@@ -45,6 +46,7 @@ from operate.constants import (
     IPFS_ADDRESS,
     MIN_AGENT_BOND,
     MIN_SECURITY_DEPOSIT,
+    POLY_SAFE_SERVICE_NAMES,
     ZERO_ADDRESS,
 )
 from operate.data import DATA_DIR
@@ -1114,6 +1116,7 @@ class ServiceManager:
                 is_recovery_module_enabled = True
             else:
                 reuse_multisig = True
+                is_initial_funding = False
                 is_recovery_module_enabled = (
                     registry_contracts.gnosis_safe.is_module_enabled(
                         ledger_api=sftxb.ledger_api,
@@ -1125,11 +1128,19 @@ class ServiceManager:
             self.logger.info(f"{reuse_multisig=}")
             self.logger.info(f"{is_recovery_module_enabled=}")
 
+            service_public_id = PublicId.from_str(service.service_public_id())
+            use_poly_safe = service_public_id.name in POLY_SAFE_SERVICE_NAMES
+
+            self.logger.info(f"{use_poly_safe=}")
             messages = sftxb.get_deploy_data_from_safe(
                 service_id=chain_data.token,
                 reuse_multisig=reuse_multisig,
                 master_safe=safe,
                 use_recovery_module=is_recovery_module_enabled,
+                use_poly_safe=use_poly_safe,
+                agent_eoa_crypto=self.keys_manager.get_crypto_instance(
+                    service.agent_addresses[0]
+                ),
             )
             tx = sftxb.new_tx()
             for message in messages:

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/services/protocol.py

@@ -41,6 +41,7 @@ from autonomy.chain.constants import (
     GNOSIS_SAFE_PROXY_FACTORY_CONTRACT,
     GNOSIS_SAFE_SAME_ADDRESS_MULTISIG_CONTRACT,
     MULTISEND_CONTRACT,
+    POLY_SAFE_CREATOR_WITH_RECOVERY_MODULE_CONTRACT,
     RECOVERY_MODULE_CONTRACT,
     SAFE_MULTISIG_WITH_RECOVERY_MODULE_CONTRACT,
 )
@@ -49,6 +50,7 @@ from autonomy.chain.service import (
     get_agent_instances,
     get_deployment_payload,
     get_deployment_with_recovery_payload,
+    get_poly_safe_deployment_payload,
     get_service_info,
     get_token_deposit_amount,
 )
@@ -1408,12 +1410,14 @@ class EthSafeTxBuilder(_ChainUtil):
             "value": cost_of_bond,
         }
 
-    def get_deploy_data_from_safe(
+    def get_deploy_data_from_safe(  # pylint: disable=too-many-arguments
         self,
         service_id: int,
         master_safe: str,
         reuse_multisig: bool = False,
         use_recovery_module: bool = True,
+        use_poly_safe: bool = False,
+        agent_eoa_crypto: t.Optional[Crypto] = None,
     ) -> t.List[t.Dict[str, t.Any]]:
         """Get the deploy data instructions for a safe"""
         approve_hash_message = None
@@ -1452,12 +1456,28 @@ class EthSafeTxBuilder(_ChainUtil):
                     RECOVERY_MODULE_CONTRACT.name
                 ).contracts[self.chain_type]
         else:  # Deploy a new multisig
-            if not use_recovery_module:
+            if not use_recovery_module and not use_poly_safe:
                 deployment_payload = get_deployment_payload()
                 gnosis_safe_multisig = ContractConfigs.get(
                     GNOSIS_SAFE_PROXY_FACTORY_CONTRACT.name
                 ).contracts[self.chain_type]
-            else:
+            elif use_recovery_module and use_poly_safe:
+                if not agent_eoa_crypto:
+                    raise ValueError("Crypto object must be provided for Poly Safe.")
+
+                deployment_payload = get_poly_safe_deployment_payload(
+                    ledger_api=self.ledger_api,
+                    chain_type=self.chain_type,
+                    crypto=agent_eoa_crypto,
+                )
+                gnosis_safe_multisig = ContractConfigs.get(
+                    POLY_SAFE_CREATOR_WITH_RECOVERY_MODULE_CONTRACT.name
+                ).contracts[self.chain_type]
+            elif not use_recovery_module and use_poly_safe:
+                raise ValueError(
+                    "Poly Safe deployment without recovery module is not supported."
+                )
+            else:  # Normal case: use_recovery_module and not use_poly_safe
                 deployment_payload = get_deployment_with_recovery_payload()
                 gnosis_safe_multisig = ContractConfigs.get(
                     SAFE_MULTISIG_WITH_RECOVERY_MODULE_CONTRACT.name

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/services/service.py

@@ -1047,22 +1047,23 @@ class Service(LocalResource):
             AchievementsNotifications, AchievementsNotifications.load(self.path)
         )
 
-        agent_achievements_json_path = (
+        agent_performance_json_path = (
             Path(
                 self.env_variables.get(
                     AGENT_PERSISTENT_STORAGE_ENV_VAR, {"value": "."}
                 ).get("value", ".")
             )
-            / "achievements.json"
+            / "agent_performance.json"
         )
 
         agent_achievements: t.Dict[str, t.Any] = {}
-        if agent_achievements_json_path.exists():
+        if agent_performance_json_path.exists():
             try:
-                with open(agent_achievements_json_path, "r", encoding="utf-8") as f:
-                    agent_achievements = json.load(f)
+                with open(agent_performance_json_path, "r", encoding="utf-8") as f:
+                    data = json.load(f)
+                    agent_achievements = data.get("achievements", {}).get("items", {})
             except (json.JSONDecodeError, OSError) as e:
-                print(f"Error reading file 'achievements.json': {e}")
+                logger.warning(f"Cannot read file 'agent_performance.json': {e}")
 
             save_changes = False
             for achievement_id in agent_achievements:

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/operate/wallet/master.py

@@ -547,7 +547,9 @@ class EthereumMasterWallet(MasterWallet):
         rpc: t.Optional[str] = None,
     ) -> None:
         """Drain all erc20/native assets to the given account."""
-        assets = [token[chain] for token in ERC20_TOKENS.values()] + [ZERO_ADDRESS]
+        assets = [token[chain] for token in ERC20_TOKENS.values() if chain in token] + [
+            ZERO_ADDRESS
+        ]
         for asset in assets:
             balance = self.get_balance(chain=chain, asset=asset, from_safe=from_safe)
             if balance <= 0:
@@ -783,7 +785,9 @@ class EthereumMasterWallet(MasterWallet):
 
             balances[chain_str] = {self.address: {}, safe: {}}
 
-            assets = [token[chain] for token in ERC20_TOKENS.values()] + [ZERO_ADDRESS]
+            assets = [
+                token[chain] for token in ERC20_TOKENS.values() if chain in token
+            ] + [ZERO_ADDRESS]
             for asset in assets:
                 balances[chain_str][self.address][asset] = str(
                     self.get_balance(chain=chain, asset=asset, from_safe=False)

{olas_operate_middleware-0.14.4 → olas_operate_middleware-0.14.6}/pyproject.toml

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