olas-operate-middleware 0.13.2__py3-none-any.whl → 0.13.4__py3-none-any.whl

operate/services/protocol.py

@@ -58,6 +58,7 @@ from autonomy.cli.helpers.chain import ServiceHelper as ServiceManager
 from eth_utils import to_bytes
 from hexbytes import HexBytes
 from web3.contract import Contract
+from web3.types import TxReceipt
 
 from operate.constants import (
     NO_STAKING_PROGRAM_ID,
@@ -121,9 +122,7 @@ class GnosisSafeTransaction:
         self._txs.append(tx)
         return self
 
-    def build(  # pylint: disable=unused-argument
-        self, *args: t.Any, **kwargs: t.Any
-    ) -> t.Dict:
+    def build(self) -> t.Dict:
         """Build the transaction."""
         multisend_data = bytes.fromhex(
             registry_contracts.multisend.get_tx_data(
@@ -175,22 +174,21 @@ class GnosisSafeTransaction:
         update_tx_with_gas_estimate(tx, self.ledger_api)
         return t.cast(t.Dict, tx)
 
-    def settle(self) -> t.Dict:
+    def settle(self) -> TxReceipt:
         """Settle the transaction."""
-        tx_settler = TxSettler(
-            ledger_api=self.ledger_api,
-            crypto=self.crypto,
-            chain_type=self.chain_type,
-            timeout=ON_CHAIN_INTERACT_TIMEOUT,
-            retries=ON_CHAIN_INTERACT_RETRIES,
-            sleep=ON_CHAIN_INTERACT_SLEEP,
-        )
-        setattr(tx_settler, "build", self.build)  # noqa: B010
-        return tx_settler.transact(
-            method=lambda: {},
-            contract="",
-            kwargs={},
-            dry_run=False,
+        return (
+            TxSettler(
+                ledger_api=self.ledger_api,
+                crypto=self.crypto,
+                chain_type=self.chain_type,
+                tx_builder=self.build,
+                timeout=ON_CHAIN_INTERACT_TIMEOUT,
+                retries=ON_CHAIN_INTERACT_RETRIES,
+                sleep=ON_CHAIN_INTERACT_SLEEP,
+            )
+            .transact()
+            .settle()
+            .tx_receipt
         )
 
 
@@ -401,7 +399,7 @@ class StakingManager:
         staking_contract: str,
         key: Path,
         password: str,
-    ) -> None:
+    ) -> str:
         """Stake the service"""
         och = OnChainHelper(
             key=key, chain_type=ChainType(self.chain.value), password=password
@@ -411,62 +409,52 @@ class StakingManager:
             service_id=service_id, staking_contract=staking_contract
         )
 
-        tx_settler = TxSettler(
-            ledger_api=och.ledger_api,
-            crypto=och.crypto,
-            chain_type=och.chain_type,
-            timeout=ON_CHAIN_INTERACT_TIMEOUT,
-            retries=ON_CHAIN_INTERACT_RETRIES,
-            sleep=ON_CHAIN_INTERACT_SLEEP,
-        )
-
         # we make use of the ERC20 contract to build the approval transaction
         # since it has the same interface as ERC721 we might want to create
         # a ERC721 contract package
         # this is very bad way to do it but it works because the ERC721 contract expects two arguments
         # for approve call (spender, token_id), and the ERC20 contract wrapper used here from open-autonomy
         # passes the amount as the second argument.
-        def _build_approval_tx(  # pylint: disable=unused-argument
-            *args: t.Any, **kargs: t.Any
-        ) -> t.Dict:
-            return registry_contracts.erc20.get_approve_tx(
+        TxSettler(
+            ledger_api=och.ledger_api,
+            crypto=och.crypto,
+            chain_type=och.chain_type,
+            timeout=ON_CHAIN_INTERACT_TIMEOUT,
+            retries=ON_CHAIN_INTERACT_RETRIES,
+            sleep=ON_CHAIN_INTERACT_SLEEP,
+            tx_builder=lambda: registry_contracts.erc20.get_approve_tx(
                 ledger_api=och.ledger_api,
                 contract_address=service_registry,
                 spender=staking_contract,
                 sender=och.crypto.address,
                 amount=service_id,  # TODO: This is a workaround and it should be fixed
-            )
+            ),
+        ).transact().settle()
 
-        setattr(tx_settler, "build", _build_approval_tx)  # noqa: B010
-        tx_settler.transact(
-            method=lambda: {},
-            contract="",
-            kwargs={},
-            dry_run=False,
-        )
-
-        def _build_staking_tx(  # pylint: disable=unused-argument
-            *args: t.Any, **kargs: t.Any
-        ) -> t.Dict:
-            return och.ledger_api.build_transaction(
-                contract_instance=self.staking_ctr.get_instance(
-                    ledger_api=och.ledger_api,
-                    contract_address=staking_contract,
+        return (
+            TxSettler(
+                ledger_api=och.ledger_api,
+                crypto=och.crypto,
+                chain_type=och.chain_type,
+                timeout=ON_CHAIN_INTERACT_TIMEOUT,
+                retries=ON_CHAIN_INTERACT_RETRIES,
+                sleep=ON_CHAIN_INTERACT_SLEEP,
+                tx_builder=lambda: och.ledger_api.build_transaction(
+                    contract_instance=self.staking_ctr.get_instance(
+                        ledger_api=och.ledger_api,
+                        contract_address=staking_contract,
+                    ),
+                    method_name="stake",
+                    method_args={"serviceId": service_id},
+                    tx_args={
+                        "sender_address": och.crypto.address,
+                    },
+                    raise_on_try=True,
                 ),
-                method_name="stake",
-                method_args={"serviceId": service_id},
-                tx_args={
-                    "sender_address": och.crypto.address,
-                },
-                raise_on_try=True,
             )
-
-        setattr(tx_settler, "build", _build_staking_tx)  # noqa: B010
-        tx_settler.transact(
-            method=lambda: {},
-            contract="",
-            kwargs={},
-            dry_run=False,
+            .transact()
+            .settle()
+            .tx_hash
         )
 
     def check_if_unstaking_possible(
@@ -506,43 +494,36 @@ class StakingManager:
         staking_contract: str,
         key: Path,
         password: str,
-    ) -> None:
+    ) -> str:
         """Unstake the service"""
         och = OnChainHelper(
             key=key, chain_type=ChainType(self.chain.value), password=password
         )
 
-        tx_settler = TxSettler(
-            ledger_api=och.ledger_api,
-            crypto=och.crypto,
-            chain_type=och.chain_type,
-            timeout=ON_CHAIN_INTERACT_TIMEOUT,
-            retries=ON_CHAIN_INTERACT_RETRIES,
-            sleep=ON_CHAIN_INTERACT_SLEEP,
-        )
-
-        def _build_unstaking_tx(  # pylint: disable=unused-argument
-            *args: t.Any, **kargs: t.Any
-        ) -> t.Dict:
-            return och.ledger_api.build_transaction(
-                contract_instance=self.staking_ctr.get_instance(
-                    ledger_api=och.ledger_api,
-                    contract_address=staking_contract,
+        return (
+            TxSettler(
+                ledger_api=och.ledger_api,
+                crypto=och.crypto,
+                chain_type=och.chain_type,
+                timeout=ON_CHAIN_INTERACT_TIMEOUT,
+                retries=ON_CHAIN_INTERACT_RETRIES,
+                sleep=ON_CHAIN_INTERACT_SLEEP,
+                tx_builder=lambda: och.ledger_api.build_transaction(
+                    contract_instance=self.staking_ctr.get_instance(
+                        ledger_api=och.ledger_api,
+                        contract_address=staking_contract,
+                    ),
+                    method_name="unstake",
+                    method_args={"serviceId": service_id},
+                    tx_args={
+                        "sender_address": och.crypto.address,
+                    },
+                    raise_on_try=True,
                 ),
-                method_name="unstake",
-                method_args={"serviceId": service_id},
-                tx_args={
-                    "sender_address": och.crypto.address,
-                },
-                raise_on_try=True,
             )
-
-        setattr(tx_settler, "build", _build_unstaking_tx)  # noqa: B010
-        tx_settler.transact(
-            method=lambda: {},
-            contract="",
-            kwargs={},
-            dry_run=False,
+            .transact()
+            .settle()
+            .tx_hash
         )
 
     def get_stake_approval_tx_data(
@@ -559,8 +540,8 @@ class StakingManager:
         return registry_contracts.erc20.get_instance(
             ledger_api=self.ledger_api,
             contract_address=service_registry,
-        ).encodeABI(
-            fn_name="approve",
+        ).encode_abi(
+            abi_element_identifier="approve",
             args=[
                 staking_contract,
                 service_id,
@@ -576,8 +557,8 @@ class StakingManager:
         return self.staking_ctr.get_instance(
             ledger_api=self.ledger_api,
             contract_address=staking_contract,
-        ).encodeABI(
-            fn_name="stake",
+        ).encode_abi(
+            abi_element_identifier="stake",
             args=[service_id],
         )
 
@@ -590,8 +571,8 @@ class StakingManager:
         return self.staking_ctr.get_instance(
             ledger_api=self.ledger_api,
             contract_address=staking_contract,
-        ).encodeABI(
-            fn_name="unstake",
+        ).encode_abi(
+            abi_element_identifier="unstake",
             args=[service_id],
         )
 
@@ -600,8 +581,8 @@ class StakingManager:
         return self.staking_ctr.get_instance(
             ledger_api=self.ledger_api,
             contract_address=staking_contract,
-        ).encodeABI(
-            fn_name="claim",
+        ).encode_abi(
+            abi_element_identifier="claim",
             args=[service_id],
         )
 
@@ -612,8 +593,8 @@ class StakingManager:
         return self.staking_ctr.get_instance(
             ledger_api=self.ledger_api,
             contract_address=staking_contract,
-        ).encodeABI(
-            fn_name="forcedUnstake",
+        ).encode_abi(
+            abi_element_identifier="forcedUnstake",
             args=[service_id],
         )
 
@@ -781,15 +762,9 @@ class _ChainUtil:
         )
 
     @cached_property
-    def service_manager_address(self) -> str:  # TODO: backport to OA
+    def service_manager_address(self) -> str:
         """Get service manager contract address."""
-        service_registry = registry_contracts.service_registry.get_instance(
-            ledger_api=self.ledger_api,
-            contract_address=CONTRACTS[OperateChain(self.chain_type.value)][
-                "service_registry"
-            ],
-        )
-        return service_registry.functions.manager().call()
+        return ContractConfigs.service_manager.contracts[self.chain_type]
 
     @property
     def service_manager_instance(self) -> Contract:
@@ -1320,8 +1295,8 @@ class EthSafeTxBuilder(_ChainUtil):
         instance = self.service_manager_instance
         if update_token is None:
             safe = self.safe
-            txd = instance.encodeABI(
-                fn_name="create",
+            txd = instance.encode_abi(
+                abi_element_identifier="create",
                 args=[
                     safe,
                     token or ETHEREUM_ERC20,
@@ -1332,8 +1307,8 @@ class EthSafeTxBuilder(_ChainUtil):
                 ],
             )
         else:
-            txd = instance.encodeABI(
-                fn_name="update",
+            txd = instance.encode_abi(
+                abi_element_identifier="update",
                 args=[
                     token or ETHEREUM_ERC20,
                     manager.metadata_hash,
@@ -1362,8 +1337,8 @@ class EthSafeTxBuilder(_ChainUtil):
             ledger_api=self.ledger_api,
             contract_address=erc20_contract,
         )
-        txd = instance.encodeABI(
-            fn_name="approve",
+        txd = instance.encode_abi(
+            abi_element_identifier="approve",
             args=[spender, amount],
         )
         return {
@@ -1375,12 +1350,8 @@ class EthSafeTxBuilder(_ChainUtil):
 
     def get_activate_data(self, service_id: int, cost_of_bond: int) -> t.Dict:
         """Get activate tx data."""
-        instance = registry_contracts.service_manager.get_instance(
-            ledger_api=self.ledger_api,
-            contract_address=self.service_manager_address,
-        )
-        txd = instance.encodeABI(
-            fn_name="activateRegistration",
+        txd = self.service_manager_instance.encode_abi(
+            abi_element_identifier="activateRegistration",
             args=[service_id],
         )
         return {
@@ -1399,12 +1370,8 @@ class EthSafeTxBuilder(_ChainUtil):
         cost_of_bond: int,
     ) -> t.Dict:
         """Get register instances tx data."""
-        instance = registry_contracts.service_manager.get_instance(
-            ledger_api=self.ledger_api,
-            contract_address=self.service_manager_address,
-        )
-        txd = instance.encodeABI(
-            fn_name="registerAgents",
+        txd = self.service_manager_instance.encode_abi(
+            abi_element_identifier="registerAgents",
             args=[
                 service_id,
                 instances,
@@ -1427,10 +1394,6 @@ class EthSafeTxBuilder(_ChainUtil):
         use_recovery_module: bool = True,
     ) -> t.List[t.Dict[str, t.Any]]:
         """Get the deploy data instructions for a safe"""
-        registry_instance = registry_contracts.service_manager.get_instance(
-            ledger_api=self.ledger_api,
-            contract_address=self.service_manager_address,
-        )
         approve_hash_message = None
         if reuse_multisig:
             if not use_recovery_module:
@@ -1478,8 +1441,8 @@ class EthSafeTxBuilder(_ChainUtil):
                     SAFE_MULTISIG_WITH_RECOVERY_MODULE_CONTRACT.name
                 ).contracts[self.chain_type]
 
-        deploy_data = registry_instance.encodeABI(
-            fn_name="deploy",
+        deploy_data = self.service_manager_instance.encode_abi(
+            abi_element_identifier="deploy",
             args=[
                 service_id,
                 gnosis_safe_multisig,
@@ -1544,8 +1507,8 @@ class EthSafeTxBuilder(_ChainUtil):
         ).get("tx_hash")
 
         # Build approveHash message
-        approve_hash_data = safe_b_instance.encodeABI(
-            fn_name="approveHash",
+        approve_hash_data = safe_b_instance.encode_abi(
+            abi_element_identifier="approveHash",
             args=[safe_tx_hash],
         )
         approve_hash_message = {
@@ -1556,8 +1519,8 @@ class EthSafeTxBuilder(_ChainUtil):
         }
 
         # Build execTransaction message
-        exec_data = safe_b_instance.encodeABI(
-            fn_name="execTransaction",
+        exec_data = safe_b_instance.encode_abi(
+            abi_element_identifier="execTransaction",
             args=[
                 multisend_address,
                 multisend_tx["value"],
@@ -1607,8 +1570,8 @@ class EthSafeTxBuilder(_ChainUtil):
         txs.append(
             {
                 "to": token,
-                "data": erc20_instance.encodeABI(
-                    fn_name="transfer",
+                "data": erc20_instance.encode_abi(
+                    abi_element_identifier="transfer",
                     args=[to, amount],
                 ),
                 "operation": MultiSendOperation.CALL,
@@ -1636,8 +1599,8 @@ class EthSafeTxBuilder(_ChainUtil):
         ).get("tx_hash")
 
         # Build approveHash message
-        approve_hash_data = safe_b_instance.encodeABI(
-            fn_name="approveHash",
+        approve_hash_data = safe_b_instance.encode_abi(
+            abi_element_identifier="approveHash",
             args=[safe_tx_hash],
         )
         approve_hash_message = {
@@ -1648,8 +1611,8 @@ class EthSafeTxBuilder(_ChainUtil):
         }
 
         # Build execTransaction message
-        exec_data = safe_b_instance.encodeABI(
-            fn_name="execTransaction",
+        exec_data = safe_b_instance.encode_abi(
+            abi_element_identifier="execTransaction",
             args=[
                 multisend_address,
                 multisend_tx["value"],
@@ -1674,12 +1637,8 @@ class EthSafeTxBuilder(_ChainUtil):
 
     def get_terminate_data(self, service_id: int) -> t.Dict:
         """Get terminate tx data."""
-        instance = registry_contracts.service_manager.get_instance(
-            ledger_api=self.ledger_api,
-            contract_address=self.service_manager_address,
-        )
-        txd = instance.encodeABI(
-            fn_name="terminate",
+        txd = self.service_manager_instance.encode_abi(
+            abi_element_identifier="terminate",
             args=[service_id],
         )
         return {
@@ -1691,12 +1650,8 @@ class EthSafeTxBuilder(_ChainUtil):
 
     def get_unbond_data(self, service_id: int) -> t.Dict:
         """Get unbond tx data."""
-        instance = registry_contracts.service_manager.get_instance(
-            ledger_api=self.ledger_api,
-            contract_address=self.service_manager_address,
-        )
-        txd = instance.encodeABI(
-            fn_name="unbond",
+        txd = self.service_manager_instance.encode_abi(
+            abi_element_identifier="unbond",
             args=[service_id],
         )
         return {
@@ -1844,8 +1799,8 @@ class EthSafeTxBuilder(_ChainUtil):
         #     ledger_api=self.ledger_api,  # noqa: E800
         #     contract_address=self.contracts["recovery_module"],  # noqa: E800
         # )  # noqa: E800
-        txd = instance.encodeABI(
-            fn_name="recoverAccess",
+        txd = instance.encode_abi(
+            abi_element_identifier="recoverAccess",
             args=[service_id],
         )
         return {
@@ -1866,8 +1821,8 @@ class EthSafeTxBuilder(_ChainUtil):
             ledger_api=self.ledger_api,
             contract_address=safe_address,
         )
-        txd = instance.encodeABI(
-            fn_name="enableModule",
+        txd = instance.encode_abi(
+            abi_element_identifier="enableModule",
             args=[module_address],
         )
         return {
@@ -1948,8 +1903,8 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
                 "to": multisig_address,
                 "data": HexBytes(
                     bytes.fromhex(
-                        multisig_instance.encodeABI(
-                            fn_name="addOwnerWithThreshold",
+                        multisig_instance.encode_abi(
+                            abi_element_identifier="addOwnerWithThreshold",
                             args=[_owner, 1],
                         )[2:]
                     )
@@ -1964,8 +1919,8 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
             "to": multisig_address,
             "data": HexBytes(
                 bytes.fromhex(
-                    multisig_instance.encodeABI(
-                        fn_name="removeOwner",
+                    multisig_instance.encode_abi(
+                        abi_element_identifier="removeOwner",
                         args=[new_owners[0], master_safe, 1],
                     )[2:]
                 )
@@ -1980,8 +1935,8 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
             "to": multisig_address,
             "data": HexBytes(
                 bytes.fromhex(
-                    multisig_instance.encodeABI(
-                        fn_name="changeThreshold",
+                    multisig_instance.encode_abi(
+                        abi_element_identifier="changeThreshold",
                         args=[threshold],
                     )[2:]
                 )
@@ -2006,8 +1961,8 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
         data=multisend_tx["data"],
         operation=1,
     ).get("tx_hash")
-    approve_hash_data = multisig_instance.encodeABI(
-        fn_name="approveHash",
+    approve_hash_data = multisig_instance.encode_abi(
+        abi_element_identifier="approveHash",
         args=[
             safe_tx_hash,
         ],
@@ -2019,8 +1974,8 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
         "value": 0,
     }
 
-    safe_exec_data = multisig_instance.encodeABI(
-        fn_name="execTransaction",
+    safe_exec_data = multisig_instance.encode_abi(
+        abi_element_identifier="execTransaction",
         args=[
             multisend_address,  # to address
             multisend_tx["value"],  # value

operate/services/utils/mech.py

@@ -24,7 +24,7 @@ from typing import Tuple
 import requests
 from aea_ledger_ethereum import Web3
 
-from operate.constants import MECH_MARKETPLACE_JSON_URL
+from operate.constants import DEFAULT_TIMEOUT, MECH_MARKETPLACE_JSON_URL
 from operate.operate_types import Chain
 from operate.quickstart.utils import print_section
 from operate.services.protocol import EthSafeTxBuilder
@@ -57,7 +57,7 @@ def deploy_mech(sftxb: EthSafeTxBuilder, service: Service) -> Tuple[str, str]:
     # Get the mech type from service config
     mech_type = service.env_variables.get("MECH_TYPE", {}).get("value", "Native")
 
-    abi = requests.get(MECH_MARKETPLACE_JSON_URL).json()["abi"]
+    abi = requests.get(MECH_MARKETPLACE_JSON_URL, timeout=DEFAULT_TIMEOUT).json()["abi"]
     chain = Chain.from_string(service.home_chain)
     mech_marketplace_address = service.env_variables["MECH_MARKETPLACE_ADDRESS"][
         "value"
@@ -82,7 +82,7 @@ def deploy_mech(sftxb: EthSafeTxBuilder, service: Service) -> Tuple[str, str]:
     contract = sftxb.ledger_api.api.eth.contract(
         address=Web3.to_checksum_address(mech_marketplace_address), abi=abi
     )
-    data = contract.encodeABI(
+    data = contract.encode_abi(
         "create",
         args=[
             service.chain_configs[service.home_chain].chain_data.token,

operate/services/utils/tendermint.py

@@ -42,6 +42,8 @@ import requests
 from flask import Flask, Response, jsonify, request
 from werkzeug.exceptions import InternalServerError, NotFound
 
+from operate.constants import DEFAULT_TIMEOUT
+
 
 ENCODING = "utf-8"
 DEFAULT_LOG_FILE = "com.log"
@@ -474,7 +476,7 @@ class PeriodDumper:
             os.chmod(path, stat.S_IWRITE)
             func(path)
         except (FileNotFoundError, OSError):
-            return
+            pass
 
     def dump_period(self) -> None:
         """Dump tendermint run data for replay"""
@@ -532,7 +534,7 @@ def create_app(  # pylint: disable=too-many-statements
             )
             priv_key_data = json.loads(priv_key_file.read_text(encoding=ENCODING))
             del priv_key_data["priv_key"]
-            status = requests.get(TM_STATUS_ENDPOINT).json()
+            status = requests.get(TM_STATUS_ENDPOINT, timeout=DEFAULT_TIMEOUT).json()
             priv_key_data["peer_id"] = status["result"]["node_info"]["id"]
             return {
                 "params": priv_key_data,
@@ -600,7 +602,7 @@ def create_app(  # pylint: disable=too-many-statements
             endpoint = f"{tendermint_params.rpc_laddr.replace('tcp', 'http').replace(non_routable, loopback)}/block"
             height = request.args.get("height")
             params = {"height": height} if height is not None else None
-            res = requests.get(endpoint, params)
+            res = requests.get(endpoint, params, timeout=DEFAULT_TIMEOUT)
             app_hash_ = res.json()["result"]["block"]["header"]["app_hash"]
             return jsonify({"app_hash": app_hash_}), res.status_code
         except Exception as e:  # pylint: disable=W0703