olas-operate-middleware 0.2.4__tar.gz → 0.11.4__tar.gz

{olas_operate_middleware-0.2.4 → olas_operate_middleware-0.11.4}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: olas-operate-middleware
-Version: 0.2.4
+Version: 0.11.4
 Summary: 
+License-File: LICENSE
 Author: David Vilela
 Author-email: dvilelaf@gmail.com
 Requires-Python: >=3.9,<3.12
@@ -10,37 +11,40 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: aiohttp (==3.9.5)
+Requires-Dist: argon2-cffi (==23.1.0)
 Requires-Dist: clea (==0.1.0rc4)
 Requires-Dist: cytoolz (==0.12.3)
-Requires-Dist: deepdiff (>=8.0.1,<9.0.0)
+Requires-Dist: deepdiff (>=8.6.1,<9.0.0)
 Requires-Dist: docker (==6.1.2)
-Requires-Dist: eth-abi (==5.1.0)
+Requires-Dist: eth-abi (==4.0.0)
 Requires-Dist: eth-account (==0.8.0)
 Requires-Dist: eth-hash (==0.7.0)
 Requires-Dist: eth-keyfile (==0.6.1)
 Requires-Dist: eth-keys (==0.4.0)
 Requires-Dist: eth-rlp (==0.3.0)
 Requires-Dist: eth-typing (==3.5.2)
-Requires-Dist: eth-utils (==2.3.1)
-Requires-Dist: fastapi (==0.110.0)
+Requires-Dist: eth-utils (==2.2.0)
+Requires-Dist: fastapi (==0.110.3)
 Requires-Dist: frozenlist (==1.4.1)
 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.64.0)
-Requires-Dist: open-aea-ledger-cosmos (==1.64.0)
-Requires-Dist: open-aea-ledger-ethereum (==1.64.0)
-Requires-Dist: open-aea-ledger-ethereum-flashbots (==1.64.0)
-Requires-Dist: open-autonomy (==0.19.4)
+Requires-Dist: open-aea-cli-ipfs (==1.65.0)
+Requires-Dist: open-aea-ledger-cosmos (==1.65.0)
+Requires-Dist: open-aea-ledger-ethereum (==1.65.0)
+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.36.3)
+Requires-Dist: starlette (==0.37.2)
 Requires-Dist: twikit (==2.2.0)
 Requires-Dist: uvicorn (==0.27.0)
-Requires-Dist: web3 (==6.1.0)
+Requires-Dist: web3 (==6.20.4)
 Description-Content-Type: text/markdown
 
 <h1 align="center">

olas_operate_middleware-0.2.4/operate/ledger/solana.py → olas_operate_middleware-0.11.4/operate/__init__.py

@@ -17,22 +17,21 @@
 #
 # ------------------------------------------------------------------------------
 
-"""Solana ledger helpers."""
+"""Operate app."""
 
-import typing as t
+import logging
+from importlib.metadata import PackageNotFoundError, version
 
-from operate.ledger.base import LedgerHelper
-from operate.operate_types import LedgerType
 
+try:
+    # Prefer the distribution name if installed; fall back to the module name
+    __version__ = version("olas-operate-middleware")
+except PackageNotFoundError:
+    try:
+        __version__ = version("operate")
+    except PackageNotFoundError:
+        logger = logging.getLogger("operate")
+        logger.warning("Could not determine version, using 0.0.0+local")
+        __version__ = "0.0.0+local"
 
-class Solana(LedgerHelper):
-    """Solana ledger helper."""
-
-    def create_key(self) -> t.Dict:
-        """Create key."""
-        return {
-            "address": "",
-            "private_key": "",
-            "encrypted": False,
-            "ledger": LedgerType.SOLANA,
-        }
+logging.getLogger("aea").setLevel(logging.ERROR)

{olas_operate_middleware-0.2.4 → olas_operate_middleware-0.11.4}/operate/account/user.py

@@ -23,21 +23,22 @@ import hashlib
 from dataclasses import dataclass
 from pathlib import Path
 
+import argon2
+
 from operate.resource import LocalResource
 
 
-def sha256(string: str) -> str:
-    """Get SHA256 hexdigest of a string."""
-    sh256 = hashlib.sha256()
-    sh256.update(string.encode())
-    return sh256.hexdigest()
+def argon2id(password: str) -> str:
+    """Get Argon2id digest of a password."""
+    ph = argon2.PasswordHasher()  # Defaults to Argon2id
+    return ph.hash(password)
 
 
 @dataclass
 class UserAccount(LocalResource):
     """User account."""
 
-    password_sha: str
+    password_hash: str
     path: Path
 
     @classmethod
@@ -49,7 +50,7 @@ class UserAccount(LocalResource):
     def new(cls, password: str, path: Path) -> "UserAccount":
         """Create a new user."""
         user = UserAccount(
-            password_sha=sha256(string=password),
+            password_hash=argon2id(password=password),
             path=path,
         )
         user.store()
@@ -57,16 +58,36 @@ class UserAccount(LocalResource):
 
     def is_valid(self, password: str) -> bool:
         """Check if a password string is valid."""
-        return sha256(string=password) == self.password_sha
+        try:
+            ph = argon2.PasswordHasher()
+            valid = ph.verify(self.password_hash, password)
+
+            if valid and ph.check_needs_rehash(self.password_hash):
+                self.password_hash = argon2id(password)
+                self.store()
+
+            return valid
+        except argon2.exceptions.VerificationError:
+            return False
+        except argon2.exceptions.InvalidHashError:
+            # Verify legacy password hash and update it to Argon2id if valid
+            sha256 = hashlib.sha256()
+            sha256.update(password.encode())
+            if sha256.hexdigest() == self.password_hash:
+                self.password_hash = argon2id(password=password)
+                self.store()
+                return True
+
+            return False
 
     def update(self, old_password: str, new_password: str) -> None:
         """Update current password."""
         if not self.is_valid(password=old_password):
             raise ValueError("Old password is not valid")
-        self.password_sha = sha256(string=new_password)
+        self.password_hash = argon2id(password=new_password)
         self.store()
 
     def force_update(self, new_password: str) -> None:
         """Force update current password."""
-        self.password_sha = sha256(string=new_password)
+        self.password_hash = argon2id(password=new_password)
         self.store()

olas_operate_middleware-0.11.4/operate/bridge/bridge_manager.py

@@ -0,0 +1,460 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2024 Valory AG
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+# ------------------------------------------------------------------------------
+"""Bridge manager."""
+
+
+import json
+import logging
+import time
+import typing as t
+import uuid
+from dataclasses import dataclass
+from pathlib import Path
+from typing import cast
+
+from deepdiff import DeepDiff
+from web3 import Web3
+
+from operate.bridge.providers.lifi_provider import LiFiProvider
+from operate.bridge.providers.native_bridge_provider import (
+    NativeBridgeProvider,
+    OmnibridgeContractAdaptor,
+    OptimismContractAdaptor,
+)
+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, ChainAmounts
+from operate.resource import LocalResource
+from operate.services.manage import get_assets_balances
+from operate.wallet.master import MasterWalletManager
+
+
+DEFAULT_BUNDLE_VALIDITY_PERIOD = 3 * 60
+EXECUTED_BUNDLES_PATH = "executed"
+BRIDGE_REQUEST_BUNDLE_PREFIX = "rb-"
+
+LIFI_PROVIDER_ID = "lifi-provider"
+RELAY_PROVIDER_ID = "relay-provider"
+
+NATIVE_BRIDGE_PROVIDER_CONFIGS: t.Dict[str, t.Any] = {
+    "native-ethereum-to-base": {
+        "from_chain": "ethereum",
+        "from_bridge": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35",
+        "to_chain": "base",
+        "to_bridge": "0x4200000000000000000000000000000000000010",
+        "bridge_eta": 300,
+        "bridge_contract_adaptor_class": OptimismContractAdaptor,
+    },
+    "native-ethereum-to-mode": {
+        "from_chain": "ethereum",
+        "from_bridge": "0x735aDBbE72226BD52e818E7181953f42E3b0FF21",
+        "to_chain": "mode",
+        "to_bridge": "0x4200000000000000000000000000000000000010",
+        "bridge_eta": 300,
+        "bridge_contract_adaptor_class": OptimismContractAdaptor,
+    },
+    "native-ethereum-to-optimism": {
+        "from_chain": "ethereum",
+        "from_bridge": "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1",
+        "to_chain": "optimism",
+        "to_bridge": "0x4200000000000000000000000000000000000010",
+        "bridge_eta": 300,
+        "bridge_contract_adaptor_class": OptimismContractAdaptor,
+    },
+    "native-ethereum-to-gnosis": {
+        "from_chain": "ethereum",
+        "from_bridge": "0x88ad09518695c6c3712AC10a214bE5109a655671",
+        "to_chain": "gnosis",
+        "to_bridge": "0xf6A78083ca3e2a662D6dd1703c939c8aCE2e268d",
+        "bridge_eta": 1800,
+        "bridge_contract_adaptor_class": OmnibridgeContractAdaptor,
+    },
+}
+
+
+ROUTES = {
+    (
+        Chain.ETHEREUM,  # from_chain
+        USDC[Chain.ETHEREUM],  # from_token
+        Chain.OPTIMISM,  # to_chain
+        USDC[Chain.OPTIMISM],  # to_token
+    ): LIFI_PROVIDER_ID,
+    (
+        Chain.ETHEREUM,  # from_chain
+        USDC[Chain.ETHEREUM],  # from_token
+        Chain.BASE,  # to_chain
+        USDC[Chain.BASE],  # to_token
+    ): LIFI_PROVIDER_ID,
+    (Chain.ETHEREUM, ZERO_ADDRESS, Chain.GNOSIS, ZERO_ADDRESS): RELAY_PROVIDER_ID,
+}
+
+
+@dataclass
+class ProviderRequestBundle(LocalResource):
+    """ProviderRequestBundle"""
+
+    requests_params: t.List[t.Dict]
+    provider_requests: t.List[ProviderRequest]
+    timestamp: int
+    id: str
+
+    def get_from_chains(self) -> set[Chain]:
+        """Get 'from' chains."""
+        return {
+            Chain(request.params["from"]["chain"]) for request in self.provider_requests
+        }
+
+    def get_from_addresses(self, chain: Chain) -> set[str]:
+        """Get 'from' addresses."""
+        chain_str = chain.value
+        return {
+            request.params["from"]["address"]
+            for request in self.provider_requests
+            if request.params["from"]["chain"] == chain_str
+        }
+
+    def get_from_tokens(self, chain: Chain) -> set[str]:
+        """Get 'from' tokens."""
+        chain_str = chain.value
+        return {
+            request.params["from"]["token"]
+            for request in self.provider_requests
+            if request.params["from"]["chain"] == chain_str
+        }
+
+
+@dataclass
+class BridgeManagerData(LocalResource):
+    """BridgeManagerData"""
+
+    path: Path
+    version: int = 1
+    last_requested_bundle: t.Optional[ProviderRequestBundle] = None
+    last_executed_bundle_id: t.Optional[str] = None
+
+    _file = "bridge.json"
+
+    # TODO Migrate to LocalResource?
+    # It can be inconvenient that all local resources create an empty resource
+    # if the file is corrupted. For example, if a service configuration is
+    # corrupted, we might want to halt execution, because otherwise, the application
+    # could continue as if the user is creating a service from scratch.
+    # For the bridge manager data, it's harmless, because its memory
+    # is limited to the process of getting and executing a quote.
+    @classmethod  # Overrides from LocalResource
+    def load(cls, path: Path) -> "LocalResource":
+        """Load local resource."""
+
+        file = path / cls._file
+        if not file.exists():
+            BridgeManagerData(path=path).store()
+
+        try:
+            super().load(path=file)
+        except (json.JSONDecodeError, KeyError):
+            new_file = path / f"invalid_{int(time.time())}_{cls._file}"
+            file.rename(new_file)
+            BridgeManagerData(path=path).store()
+
+        return super().load(path)
+
+
+class BridgeManager:
+    """BridgeManager"""
+
+    def __init__(
+        self,
+        path: Path,
+        wallet_manager: MasterWalletManager,
+        logger: logging.Logger,
+        bundle_validity_period: int = DEFAULT_BUNDLE_VALIDITY_PERIOD,
+    ) -> None:
+        """Initialize bridge manager."""
+        self.path = path
+        self.wallet_manager = wallet_manager
+        self.logger = logger
+        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(
+            BridgeManagerData, BridgeManagerData.load(path)
+        )
+        self._native_bridge_providers = {
+            provider_id: NativeBridgeProvider(
+                config["bridge_contract_adaptor_class"](
+                    from_chain=config["from_chain"],
+                    to_chain=config["to_chain"],
+                    from_bridge=config["from_bridge"],
+                    to_bridge=config["to_bridge"],
+                    bridge_eta=config["bridge_eta"],
+                ),
+                provider_id,
+                wallet_manager,
+                logger,
+            )
+            for provider_id, config in NATIVE_BRIDGE_PROVIDER_CONFIGS.items()
+        }
+
+        self._providers: t.Dict[str, Provider] = {}
+        self._providers.update(self._native_bridge_providers)
+        self._providers[LIFI_PROVIDER_ID] = LiFiProvider(
+            provider_id=LIFI_PROVIDER_ID,
+            wallet_manager=wallet_manager,
+            logger=logger,
+        )
+        self._providers[RELAY_PROVIDER_ID] = RelayProvider(
+            provider_id=RELAY_PROVIDER_ID,
+            wallet_manager=wallet_manager,
+            logger=logger,
+        )
+
+    def _store_data(self) -> None:
+        self.logger.info("[BRIDGE MANAGER] Storing data to file.")
+        self.data.store()
+
+    def _get_updated_bundle(
+        self, requests_params: t.List[t.Dict], force_update: bool
+    ) -> ProviderRequestBundle:
+        """Ensures to return a valid (non expired) bundle for the given inputs."""
+
+        now = int(time.time())
+        bundle = self.data.last_requested_bundle
+        create_new_bundle = False
+
+        if not bundle:
+            self.logger.info("[BRIDGE MANAGER] No last bundle.")
+            create_new_bundle = True
+        elif DeepDiff(requests_params, bundle.requests_params):
+            self.logger.info("[BRIDGE MANAGER] Different requests params.")
+            create_new_bundle = True
+        elif force_update:
+            self.logger.info("[BRIDGE MANAGER] Force bundle update.")
+            self.quote_bundle(bundle)
+            self._store_data()
+        elif now > bundle.timestamp + self.bundle_validity_period:
+            self.logger.info("[BRIDGE MANAGER] Bundle expired.")
+            self.quote_bundle(bundle)
+            self._store_data()
+
+        if not bundle or create_new_bundle:
+            self.logger.info("[BRIDGE MANAGER] Creating new bridge request bundle.")
+
+            provider_requests = []
+            for params in requests_params:
+                for provider in self._native_bridge_providers.values():
+                    if provider.can_handle_request(params):
+                        provider_requests.append(provider.create_request(params=params))
+                        break
+                else:
+                    provider_id = ROUTES.get(
+                        (
+                            Chain(params["from"]["chain"]),
+                            params["from"]["token"],
+                            Chain(params["to"]["chain"]),
+                            params["to"]["token"],
+                        ),
+                        RELAY_PROVIDER_ID,
+                    )
+
+                    provider_requests.append(
+                        self._providers[provider_id].create_request(params=params)
+                    )
+
+            bundle = ProviderRequestBundle(
+                id=f"{BRIDGE_REQUEST_BUNDLE_PREFIX}{uuid.uuid4()}",
+                requests_params=requests_params,
+                provider_requests=provider_requests,
+                timestamp=now,
+            )
+
+            self.data.last_requested_bundle = bundle
+            self.quote_bundle(bundle)
+            self._store_data()
+
+        return bundle
+
+    def _sanitize(self, requests_params: t.List) -> None:
+        """Sanitize quote requests."""
+        w3 = Web3()
+        for params in requests_params:
+            params["from"]["address"] = w3.to_checksum_address(
+                params["from"]["address"]
+            )
+            params["from"]["token"] = w3.to_checksum_address(params["from"]["token"])
+            params["to"]["address"] = w3.to_checksum_address(params["to"]["address"])
+            params["to"]["token"] = w3.to_checksum_address(params["to"]["token"])
+            params["to"]["amount"] = int(params["to"]["amount"])
+
+    def _raise_if_invalid(self, requests_params: t.List) -> None:
+        """Preprocess quote requests."""
+
+        for params in requests_params:
+            from_chain = params["from"]["chain"]
+            from_address = params["from"]["address"]
+
+            wallet = self.wallet_manager.load(Chain(from_chain).ledger_type)
+            wallet_address = wallet.address
+            safe_address = wallet.safes.get(Chain(from_chain))
+
+            if from_address is None or not (
+                from_address == wallet_address or from_address == safe_address
+            ):
+                raise ValueError(
+                    f"Invalid input: 'from' address {from_address} does not match Master EOA nor Master Safe on chain {Chain(from_chain).name}."
+                )
+
+    def bridge_refill_requirements(
+        self, requests_params: t.List[t.Dict], force_update: bool = False
+    ) -> t.Dict:
+        """Get bridge refill requirements."""
+        self._sanitize(requests_params)
+        self._raise_if_invalid(requests_params)
+        self.logger.info(
+            f"[BRIDGE MANAGER] Quote requests count: {len(requests_params)}."
+        )
+
+        bundle = self._get_updated_bundle(requests_params, force_update)
+
+        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(
+                ledger_api=ledger_api,
+                asset_addresses={ZERO_ADDRESS} | bundle.get_from_tokens(chain),
+                addresses=bundle.get_from_addresses(chain),
+            )
+
+        bridge_total_requirements = self.bridge_total_requirements(bundle)
+
+        bridge_refill_requirements = ChainAmounts.shortfalls(
+            bridge_total_requirements, balances
+        )
+
+        is_refill_required = any(
+            amount > 0
+            for from_addresses in bridge_refill_requirements.values()
+            for from_tokens in from_addresses.values()
+            for amount in from_tokens.values()
+        )
+
+        status_json = self.get_status_json(bundle.id)
+        status_json.update(
+            {
+                "balances": balances,
+                "bridge_refill_requirements": bridge_refill_requirements,
+                "bridge_total_requirements": bridge_total_requirements,
+                "expiration_timestamp": bundle.timestamp + self.bundle_validity_period,
+                "is_refill_required": is_refill_required,
+            }
+        )
+        return status_json
+
+    def execute_bundle(self, bundle_id: str) -> t.Dict:
+        """Execute the bundle"""
+
+        bundle = self.data.last_requested_bundle
+
+        if not bundle:
+            raise RuntimeError("[BRIDGE MANAGER] No bundle.")
+
+        if bundle.id != bundle_id:
+            raise RuntimeError(
+                f"Quote bundle id {bundle_id} does not match last requested bundle id {bundle.id}."
+            )
+
+        requirements = self.bridge_refill_requirements(bundle.requests_params)
+        self.data.last_requested_bundle = None
+        self.data.last_executed_bundle_id = bundle_id
+        bundle_path = self.path / EXECUTED_BUNDLES_PATH / f"{bundle.id}.json"
+        bundle.path = bundle_path
+        self._store_data()
+        bundle.store()
+
+        if requirements["is_refill_required"]:
+            self.logger.warning(
+                f"[BRIDGE MANAGER] Refill requirements not satisfied for bundle id {bundle_id}."
+            )
+
+        self.logger.info("[BRIDGE MANAGER] Executing quotes.")
+
+        for request in bundle.provider_requests:
+            provider = self._providers[request.provider_id]
+            provider.execute(request)
+            self._store_data()
+
+        self._store_data()
+        bundle.store()
+        self.logger.info(f"[BRIDGE MANAGER] Bundle id {bundle_id} executed.")
+        return self.get_status_json(bundle_id)
+
+    def get_status_json(self, bundle_id: str) -> t.Dict:
+        """Get execution status of bundle."""
+        bundle = self.data.last_requested_bundle
+
+        if bundle is not None and bundle.id == bundle_id:
+            pass
+        else:
+            bundle_path = self.path / EXECUTED_BUNDLES_PATH / f"{bundle_id}.json"
+            if bundle_path.exists():
+                bundle = cast(
+                    ProviderRequestBundle, ProviderRequestBundle.load(bundle_path)
+                )
+                bundle.path = bundle_path  # TODO backport to resource.py ?
+            else:
+                raise FileNotFoundError(f"Bundle with ID {bundle_id} does not exist.")
+
+        initial_status = [request.status for request in bundle.provider_requests]
+
+        provider_request_status = []
+        for request in bundle.provider_requests:
+            provider = self._providers[request.provider_id]
+            provider_request_status.append(provider.status_json(request))
+
+        updated_status = [request.status for request in bundle.provider_requests]
+
+        if initial_status != updated_status and bundle.path is not None:
+            bundle.store()
+
+        return {
+            "id": bundle.id,
+            "bridge_request_status": provider_request_status,
+        }
+
+    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 ChainAmounts.add(*requirements)
+
+    def quote_bundle(self, bundle: ProviderRequestBundle) -> None:
+        """Update the bundle with the quotes."""
+        for provider_request in bundle.provider_requests:
+            provider = self._providers[provider_request.provider_id]
+            provider.quote(provider_request)
+        bundle.timestamp = int(time.time())
+
+    def last_executed_bundle_id(self) -> t.Optional[str]:
+        """Get the last executed bundle id."""
+        return self.data.last_executed_bundle_id