mech-client 0.2.8__tar.gz → 0.2.10__tar.gz

{mech_client-0.2.8 → mech_client-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.2.8
+Version: 0.2.10
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch
@@ -12,10 +12,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: asn1crypto (>=1.4.0,<1.5.0)
 Requires-Dist: gql (>=3.4.1)
-Requires-Dist: open-aea-cli-ipfs (>=1.42.0)
-Requires-Dist: open-aea-ledger-cosmos (>=1.42.0)
-Requires-Dist: open-aea-ledger-ethereum (>=1.42.0)
-Requires-Dist: open-aea[cli] (>=1.42.0)
+Requires-Dist: open-aea-cli-ipfs (==1.50.0)
+Requires-Dist: open-aea-ledger-cosmos (==1.50.0)
+Requires-Dist: open-aea-ledger-ethereum (==1.50.0)
+Requires-Dist: open-aea[cli] (==1.50.0)
 Requires-Dist: websocket-client (>=0.32.0,<1)
 Description-Content-Type: text/markdown
 
@@ -54,7 +54,7 @@ Commands:
   push-to-ipfs    Upload a file to IPFS.
  ```
 
-## Usage:
+## CLI Usage:
 
 First, create a private key in file `ethereum_private_key.txt` with this command:
 
@@ -63,6 +63,12 @@ aea generate-key ethereum
 ```
 Ensure the private key carries funds on Gnosis Chain.
 
+A keyfile is just a file with your ethereum private key as a hex-string, example:
+```
+0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd
+```
+In case you add your own, make sure you don't have any extra characters in the file, like newlines or spaces.
+
 Second, run the following command to instruct the mech with `<prompt>` and `<agent_id>`:
 
 ```bash
@@ -115,6 +121,32 @@ Data arrived: https://gateway.autonolas.tech/ipfs/f0170122069b55e077430a00f3cbc3
 Data from agent: {'requestId': 81653153529124597849081567361606842861262371002932574194580478443414142139857, 'result': "\n\nA summer breeze, so sweet,\nA gentle reminder of summer's heat.\nThe sky so blue, no cloud in sight,\nA perfect day, a wondrous sight."}
 ```
 
+## Programmatic Usage:
+
+```python
+from mech_client.interact import interact, ConfirmationType
+
+prompt_text = 'Will gnosis pay reach 100k cards in 2024?'
+agent_id = 3
+tool_name = "prediction-online"
+
+result = interact(
+    prompt=prompt_text,
+    agent_id=agent_id,
+    tool=tool_name,
+    confirmation_type=ConfirmationType.ON_CHAIN,
+    private_key_path='PATH_HERE'
+)
+print(result)
+```
+
+# Developer installation
+To setup the development environment, run the following commands:
+
+```bash
+poetry install && poetry shell
+```
+
 ## Release guide:
 
 - Bump versions in `pyproject.toml` and `mech_client/__init__.py`
@@ -122,4 +154,5 @@ Data from agent: {'requestId': 8165315352912459784908156736160684286126237100293
 - `rm -rf dist`
 - `autonomy packages sync --update-packages`
 - `make eject-packages`
-- then `poetry publish --build --username=<username> --password=<password>`.
+- then create release PR and tag release
+

{mech_client-0.2.8 → mech_client-0.2.10}/README.md

@@ -33,7 +33,7 @@ Commands:
   push-to-ipfs    Upload a file to IPFS.
  ```
 
-## Usage:
+## CLI Usage:
 
 First, create a private key in file `ethereum_private_key.txt` with this command:
 
@@ -42,6 +42,12 @@ aea generate-key ethereum
 ```
 Ensure the private key carries funds on Gnosis Chain.
 
+A keyfile is just a file with your ethereum private key as a hex-string, example:
+```
+0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd
+```
+In case you add your own, make sure you don't have any extra characters in the file, like newlines or spaces.
+
 Second, run the following command to instruct the mech with `<prompt>` and `<agent_id>`:
 
 ```bash
@@ -94,6 +100,32 @@ Data arrived: https://gateway.autonolas.tech/ipfs/f0170122069b55e077430a00f3cbc3
 Data from agent: {'requestId': 81653153529124597849081567361606842861262371002932574194580478443414142139857, 'result': "\n\nA summer breeze, so sweet,\nA gentle reminder of summer's heat.\nThe sky so blue, no cloud in sight,\nA perfect day, a wondrous sight."}
 ```
 
+## Programmatic Usage:
+
+```python
+from mech_client.interact import interact, ConfirmationType
+
+prompt_text = 'Will gnosis pay reach 100k cards in 2024?'
+agent_id = 3
+tool_name = "prediction-online"
+
+result = interact(
+    prompt=prompt_text,
+    agent_id=agent_id,
+    tool=tool_name,
+    confirmation_type=ConfirmationType.ON_CHAIN,
+    private_key_path='PATH_HERE'
+)
+print(result)
+```
+
+# Developer installation
+To setup the development environment, run the following commands:
+
+```bash
+poetry install && poetry shell
+```
+
 ## Release guide:
 
 - Bump versions in `pyproject.toml` and `mech_client/__init__.py`
@@ -101,4 +133,4 @@ Data from agent: {'requestId': 8165315352912459784908156736160684286126237100293
 - `rm -rf dist`
 - `autonomy packages sync --update-packages`
 - `make eject-packages`
-- then `poetry publish --build --username=<username> --password=<password>`.
+- then create release PR and tag release

mech_client-0.2.10/mech_client/__init__.py

@@ -0,0 +1,3 @@
+"""Mech client."""
+
+__version__ = "0.2.10"

{mech_client-0.2.8 → mech_client-0.2.10}/mech_client/cli.py

@@ -57,12 +57,30 @@ def cli() -> None:
     ),
     help="Data verification method (on-chain/off-chain)",
 )
-def interact(
+@click.option(
+    "--retries",
+    type=int,
+    help="Number of retries for sending a transaction",
+)
+@click.option(
+    "--timeout",
+    type=float,
+    help="Timeout to wait for the transaction",
+)
+@click.option(
+    "--sleep",
+    type=float,
+    help="Amount of sleep before retrying the transaction",
+)
+def interact(  # pylint: disable=too-many-arguments
     prompt: str,
     agent_id: int,
     tool: Optional[str],
     key: Optional[str],
     confirm: Optional[str] = None,
+    retries: Optional[int] = None,
+    timeout: Optional[float] = None,
+    sleep: Optional[float] = None,
 ) -> None:
     """Interact with a mech specifying a prompt and tool."""
     try:
@@ -76,6 +94,9 @@ def interact(
                 if confirm is not None
                 else ConfirmationType.WAIT_FOR_BOTH
             ),
+            retries=retries,
+            timeout=timeout,
+            sleep=sleep,
         )
     except (ValueError, FileNotFoundError) as e:
         raise click.ClickException(str(e)) from e

{mech_client-0.2.8 → mech_client-0.2.10}/mech_client/interact.py

@@ -26,17 +26,19 @@ python client.py <prompt> <tool>
 """
 
 import asyncio
-import json
 import os
+import time
 import warnings
+from datetime import datetime
 from enum import Enum
 from pathlib import Path
-from typing import Any, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import requests
 import websocket
 from aea.crypto.base import Crypto
 from aea_ledger_ethereum import EthereumApi, EthereumCrypto
+from web3 import Web3
 from web3.contract import Contract as Web3Contract
 
 from mech_client.acn import (
@@ -63,6 +65,7 @@ LEDGER_CONFIG = {
     "chain_id": 100,
     "poa_chain": False,
     "default_gas_price_strategy": "eip1559",
+    "is_gas_estimation_enabled": False,
 }
 PRIVATE_KEY_FILE_PATH = "ethereum_private_key.txt"
 
@@ -70,7 +73,19 @@ WSS_ENDPOINT = os.getenv(
     "WEBSOCKET_ENDPOINT",
     "wss://rpc.eu-central-2.gateway.fm/ws/v4/gnosis/non-archival/mainnet",
 )
-GNOSISSCAN_API_URL = "https://api.gnosisscan.io/api?module=contract&action=getabi&address={contract_address}"
+MANUAL_GAS_LIMIT = int(
+    os.getenv(
+        "MANUAL_GAS_LIMIT",
+        "100_000",
+    )
+)
+BLOCKSCOUT_API_URL = (
+    "https://gnosis.blockscout.com/api/v2/smart-contracts/{contract_address}"
+)
+
+MAX_RETRIES = 3
+WAIT_SLEEP = 3.0
+TIMEOUT = 60.0
 
 # Ignore a specific warning message
 warnings.filterwarnings("ignore", "The log with transaction hash.*")
@@ -84,20 +99,54 @@ class ConfirmationType(Enum):
     WAIT_FOR_BOTH = "wait-for-both"
 
 
-def get_contract(contract_address: str, ledger_api: EthereumApi) -> Web3Contract:
+def calculate_topic_id(event: Dict) -> str:
+    """Caclulate topic ID"""
+    text = event["name"]
+    text += "("
+    for inp in event["inputs"]:
+        text += inp["type"]
+        text += ","
+    text = text[:-1]
+    text += ")"
+    return Web3.keccak(text=text).hex()
+
+
+def get_event_signatures(abi: List) -> Tuple[str, str]:
+    """Calculate `Request` and `Deliver` event topics"""
+    request, deliver = "", ""
+    for obj in abi:
+        if obj["type"] != "event":
+            continue
+        if obj["name"] == "Deliver":
+            deliver = calculate_topic_id(event=obj)
+        if obj["name"] == "Request":
+            request = calculate_topic_id(event=obj)
+    return request, deliver
+
+
+def get_abi(contract_address: str) -> List:
+    """Get contract abi"""
+    abi_request_url = BLOCKSCOUT_API_URL.format(contract_address=contract_address)
+    response = requests.get(abi_request_url).json()
+    return response["abi"]
+
+
+def get_contract(
+    contract_address: str, abi: List, ledger_api: EthereumApi
+) -> Web3Contract:
     """
     Returns a contract instance.
 
     :param contract_address: The address of the contract.
     :type contract_address: str
+    :param abi: ABI Object
+    :type abi: List
     :param ledger_api: The Ethereum API used for interacting with the ledger.
     :type ledger_api: EthereumApi
     :return: The contract instance.
     :rtype: Web3Contract
     """
-    abi_request_url = GNOSISSCAN_API_URL.format(contract_address=contract_address)
-    response = requests.get(abi_request_url).json()
-    abi = json.loads(response["result"])
+
     return ledger_api.get_contract_instance(
         {"abi": abi, "bytecode": "0x"}, contract_address
     )
@@ -172,20 +221,25 @@ def verify_or_retrieve_tool(
 def fetch_tools(agent_id: int, ledger_api: EthereumApi) -> List[str]:
     """Fetch tools for specified agent ID."""
     mech_registry = get_contract(
-        contract_address=AGENT_REGISTRY_CONTRACT, ledger_api=ledger_api
+        contract_address=AGENT_REGISTRY_CONTRACT,
+        abi=get_abi(AGENT_REGISTRY_CONTRACT),
+        ledger_api=ledger_api,
     )
     token_uri = mech_registry.functions.tokenURI(agent_id).call()
     response = requests.get(token_uri).json()
     return response["tools"]
 
 
-def send_request(  # pylint: disable=too-many-arguments
+def send_request(  # pylint: disable=too-many-arguments,too-many-locals
     crypto: EthereumCrypto,
     ledger_api: EthereumApi,
     mech_contract: Web3Contract,
     prompt: str,
     tool: str,
     price: int = 10_000_000_000_000_000,
+    retries: Optional[int] = None,
+    timeout: Optional[float] = None,
+    sleep: Optional[float] = None,
 ) -> None:
     """
     Sends a request to the mech.
@@ -202,28 +256,58 @@ def send_request(  # pylint: disable=too-many-arguments
     :type tool: str
     :param price: The price for the request (default: 10_000_000_000_000_000).
     :type price: int
+    :param retries: Number of retries for sending a transaction
+    :type retries: int
+    :param timeout: Timeout to wait for the transaction
+    :type timeout: float
+    :param sleep: Amount of sleep before retrying the transaction
+    :type sleep: float
     """
     v1_file_hash_hex_truncated, v1_file_hash_hex = push_metadata_to_ipfs(prompt, tool)
     print(f"Prompt uploaded: https://gateway.autonolas.tech/ipfs/{v1_file_hash_hex}")
     method_name = "request"
     methord_args = {"data": v1_file_hash_hex_truncated}
-    tx_args = {"sender_address": crypto.address, "value": price}
-    raw_transaction = ledger_api.build_transaction(
-        contract_instance=mech_contract,
-        method_name=method_name,
-        method_args=methord_args,
-        tx_args=tx_args,
-    )
-    raw_transaction["gas"] = 50_000
-    signed_transaction = crypto.sign_transaction(raw_transaction)
-    transaction_digest = ledger_api.send_signed_transaction(signed_transaction)
-    print(f"Transaction sent: https://gnosisscan.io/tx/{transaction_digest}")
-
-
-def wait_for_data_url(
+    tx_args = {
+        "sender_address": crypto.address,
+        "value": price,
+        "gas": MANUAL_GAS_LIMIT,
+    }
+
+    tries = 0
+    retries = retries or MAX_RETRIES
+    timeout = timeout or TIMEOUT
+    sleep = sleep or WAIT_SLEEP
+    deadline = datetime.now().timestamp() + timeout
+
+    while tries < retries and datetime.now().timestamp() < deadline:
+        tries += 1
+        try:
+            raw_transaction = ledger_api.build_transaction(
+                contract_instance=mech_contract,
+                method_name=method_name,
+                method_args=methord_args,
+                tx_args=tx_args,
+                raise_on_try=True,
+            )
+            signed_transaction = crypto.sign_transaction(raw_transaction)
+            transaction_digest = ledger_api.send_signed_transaction(
+                signed_transaction,
+                raise_on_try=True,
+            )
+            print(f"Transaction sent: https://gnosisscan.io/tx/{transaction_digest}")
+            return
+        except Exception as e:  # pylint: disable=broad-except
+            print(
+                f"Error occured while sending the transaction: {e}; Retrying in {sleep}"
+            )
+            time.sleep(sleep)
+
+
+def wait_for_data_url(  # pylint: disable=too-many-arguments
     request_id: str,
     wss: websocket.WebSocket,
     mech_contract: Web3Contract,
+    deliver_signature: str,
     ledger_api: EthereumApi,
     crypto: Crypto,
 ) -> Any:
@@ -236,6 +320,8 @@ def wait_for_data_url(
     :type wss: websocket.WebSocket
     :param mech_contract: The mech contract instance.
     :type mech_contract: Web3Contract
+    :param deliver_signature: Topic signature for Deliver event
+    :type deliver_signature: str
     :param ledger_api: The Ethereum API used for interacting with the ledger.
     :type ledger_api: EthereumApi
     :param crypto: The cryptographic object.
@@ -250,6 +336,7 @@ def wait_for_data_url(
             request_id=request_id,
             wss=wss,
             mech_contract=mech_contract,
+            deliver_signature=deliver_signature,
             ledger_api=ledger_api,
             loop=loop,
         )
@@ -269,12 +356,15 @@ def wait_for_data_url(
     return result
 
 
-def interact(
+def interact(  # pylint: disable=too-many-arguments,too-many-locals
     prompt: str,
     agent_id: int,
     tool: Optional[str] = None,
     private_key_path: Optional[str] = None,
     confirmation_type: ConfirmationType = ConfirmationType.WAIT_FOR_BOTH,
+    retries: Optional[int] = None,
+    timeout: Optional[float] = None,
+    sleep: Optional[float] = None,
 ) -> Any:
     """
     Interact with agent mech contract.
@@ -290,9 +380,15 @@ def interact(
     :param confirmation_type: The confirmation type for the interaction (default: ConfirmationType.WAIT_FOR_BOTH).
     :type confirmation_type: ConfirmationType
     :return: The data received from on-chain/off-chain.
+    :param retries: Number of retries for sending a transaction
+    :type retries: int
+    :param timeout: Timeout to wait for the transaction
+    :type timeout: float
+    :param sleep: Amount of sleep before retrying the transaction
+    :type sleep: float
     :rtype: Any
     """
-    contract_address = query_agent_address(agent_id=agent_id)
+    contract_address = query_agent_address(agent_id=agent_id, timeout=timeout)
     if contract_address is None:
         raise ValueError(f"Agent with ID {agent_id} does not exist!")
 
@@ -307,19 +403,33 @@ def interact(
     ledger_api = EthereumApi(**LEDGER_CONFIG)
 
     tool = verify_or_retrieve_tool(agent_id=agent_id, ledger_api=ledger_api, tool=tool)
+    abi = get_abi(contract_address=contract_address)
     mech_contract = get_contract(
-        contract_address=contract_address, ledger_api=ledger_api
+        contract_address=contract_address, abi=abi, ledger_api=ledger_api
+    )
+    request_event_signature, deliver_event_signature = get_event_signatures(abi=abi)
+    register_event_handlers(
+        wss=wss,
+        contract_address=contract_address,
+        crypto=crypto,
+        request_signature=request_event_signature,
+        deliver_signature=deliver_event_signature,
     )
-    register_event_handlers(wss=wss, contract_address=contract_address, crypto=crypto)
     send_request(
         crypto=crypto,
         ledger_api=ledger_api,
         mech_contract=mech_contract,
         prompt=prompt,
         tool=tool,
+        retries=retries,
+        timeout=timeout,
+        sleep=sleep,
     )
     request_id = watch_for_request_id(
-        wss=wss, mech_contract=mech_contract, ledger_api=ledger_api
+        wss=wss,
+        mech_contract=mech_contract,
+        ledger_api=ledger_api,
+        request_signature=request_event_signature,
     )
     print(f"Created on-chain request with ID {request_id}")
     if confirmation_type == ConfirmationType.OFF_CHAIN:
@@ -328,6 +438,7 @@ def interact(
         data_url = watch_for_data_url_from_wss_sync(
             request_id=request_id,
             wss=wss,
+            deliver_signature=deliver_event_signature,
             mech_contract=mech_contract,
             ledger_api=ledger_api,
         )
@@ -336,6 +447,7 @@ def interact(
             request_id=request_id,
             wss=wss,
             mech_contract=mech_contract,
+            deliver_signature=deliver_event_signature,
             ledger_api=ledger_api,
             crypto=crypto,
         )

{mech_client-0.2.8 → mech_client-0.2.10}/mech_client/subgraph.py

@@ -37,16 +37,22 @@ AGENT_QUERY_TEMPLATE = Template(
 )
 
 
-def query_agent_address(agent_id: int) -> Optional[str]:
+def query_agent_address(
+    agent_id: int, timeout: Optional[float] = None
+) -> Optional[str]:
     """
     Query agent address from subgraph.
 
     :param agent_id: The ID of the agent.
+    :param timeout: Timeout for the request.
     :type agent_id: int
     :return: The agent address if found, None otherwise.
     :rtype: Optional[str]
     """
-    client = Client(transport=AIOHTTPTransport(url=MECH_SUBGRAPH_URL))
+    client = Client(
+        transport=AIOHTTPTransport(url=MECH_SUBGRAPH_URL),
+        execute_timeout=timeout or 30.0,
+    )
     response = client.execute(
         document=gql(
             request_string=AGENT_QUERY_TEMPLATE.substitute({"agent_id": agent_id})

{mech_client-0.2.8 → mech_client-0.2.10}/mech_client/wss.py

@@ -31,16 +31,12 @@ from aea_ledger_ethereum import EthereumApi
 from web3.contract import Contract as Web3Contract
 
 
-EVENT_SIGNATURE_REQUEST = (
-    "0x4bda649efe6b98b0f9c1d5e859c29e20910f45c66dabfe6fad4a4881f7faf9cc"
-)
-EVENT_SIGNATURE_DELIVER = (
-    "0x3ec84da2cdc1ce60c063642b69ff2e65f3b69787a2b90443457ba274e51e7c72"
-)
-
-
 def register_event_handlers(
-    wss: websocket.WebSocket, contract_address: str, crypto: Crypto
+    wss: websocket.WebSocket,
+    contract_address: str,
+    crypto: Crypto,
+    request_signature: str,
+    deliver_signature: str,
 ) -> None:
     """
     Register event handlers.
@@ -51,6 +47,10 @@ def register_event_handlers(
     :type contract_address: str
     :param crypto: The cryptographic object.
     :type crypto: Crypto
+    :param request_signature: Topic signature for Request event
+    :type request_signature: str
+    :param deliver_signature: Topic signature for Deliver event
+    :type deliver_signature: str
     """
 
     subscription_request = {
@@ -62,7 +62,7 @@ def register_event_handlers(
             {
                 "address": contract_address,
                 "topics": [
-                    EVENT_SIGNATURE_REQUEST,
+                    request_signature,
                     ["0x" + "0" * 24 + crypto.address[2:]],
                 ],
             },
@@ -79,7 +79,7 @@ def register_event_handlers(
         "method": "eth_subscribe",
         "params": [
             "logs",
-            {"address": contract_address, "topics": [EVENT_SIGNATURE_DELIVER]},
+            {"address": contract_address, "topics": [deliver_signature]},
         ],
     }
     content = bytes(json.dumps(subscription_deliver), "utf-8")
@@ -109,10 +109,11 @@ def wait_for_receipt(tx_hash: str, ledger_api: EthereumApi) -> Dict:
             time.sleep(1)
 
 
-def watch_for_request_id(
+def watch_for_request_id(  # pylint: disable=too-many-arguments
     wss: websocket.WebSocket,
     mech_contract: Web3Contract,
     ledger_api: EthereumApi,
+    request_signature: str,
 ) -> str:
     """
     Watches for events on mech.
@@ -124,6 +125,8 @@ def watch_for_request_id(
     :param ledger_api: The Ethereum API used for interacting with the ledger.
     :type ledger_api: EthereumApi
     :return: The requested ID.
+    :param request_signature: Topic signature for Request event
+    :type request_signature: str
     :rtype: str
     """
     while True:
@@ -132,7 +135,7 @@ def watch_for_request_id(
         tx_hash = data["params"]["result"]["transactionHash"]
         tx_receipt = wait_for_receipt(tx_hash=tx_hash, ledger_api=ledger_api)
         event_signature = tx_receipt["logs"][0]["topics"][0].hex()
-        if event_signature != EVENT_SIGNATURE_REQUEST:
+        if event_signature != request_signature:
             continue
 
         rich_logs = mech_contract.events.Request().process_receipt(tx_receipt)
@@ -140,10 +143,11 @@ def watch_for_request_id(
         return request_id
 
 
-async def watch_for_data_url_from_wss(
+async def watch_for_data_url_from_wss(  # pylint: disable=too-many-arguments
     request_id: str,
     wss: websocket.WebSocket,
     mech_contract: Web3Contract,
+    deliver_signature: str,
     ledger_api: EthereumApi,
     loop: asyncio.AbstractEventLoop,
 ) -> Any:
@@ -156,6 +160,8 @@ async def watch_for_data_url_from_wss(
     :type wss: websocket.WebSocket
     :param mech_contract: The mech contract instance.
     :type mech_contract: Web3Contract
+    :param deliver_signature: Topic signature for Deliver event
+    :type deliver_signature: str
     :param ledger_api: The Ethereum API used for interacting with the ledger.
     :type ledger_api: EthereumApi
     :param loop: The event loop used for asynchronous operations.
@@ -172,7 +178,7 @@ async def watch_for_data_url_from_wss(
                 executor, wait_for_receipt, tx_hash, ledger_api
             )
             event_signature = tx_receipt["logs"][0]["topics"][0].hex()
-            if event_signature != EVENT_SIGNATURE_DELIVER:
+            if event_signature != deliver_signature:
                 continue
 
             rich_logs = mech_contract.events.Deliver().process_receipt(tx_receipt)
@@ -186,6 +192,7 @@ def watch_for_data_url_from_wss_sync(
     request_id: str,
     wss: websocket.WebSocket,
     mech_contract: Web3Contract,
+    deliver_signature: str,
     ledger_api: EthereumApi,
 ) -> Any:
     """
@@ -197,6 +204,8 @@ def watch_for_data_url_from_wss_sync(
     :type wss: websocket.WebSocket
     :param mech_contract: The mech contract instance.
     :type mech_contract: Web3Contract
+    :param deliver_signature: Topic signature for Deliver event
+    :type deliver_signature: str
     :param ledger_api: The Ethereum API used for interacting with the ledger.
     :type ledger_api: EthereumApi
     :return: The data received from on-chain.
@@ -208,6 +217,7 @@ def watch_for_data_url_from_wss_sync(
             request_id=request_id,
             wss=wss,
             mech_contract=mech_contract,
+            deliver_signature=deliver_signature,
             ledger_api=ledger_api,
             loop=loop,
         )

{mech_client-0.2.8 → mech_client-0.2.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mech-client"
-version = "0.2.8"
+version = "0.2.10"
 description = "Basic client to interact with a mech"
 authors = ["David Minarsch <david.minarsch@googlemail.com>"]
 readme = "README.md"
@@ -26,20 +26,20 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-open-aea = {version = ">=1.42.0", extras = ["cli"]}
-open-aea-ledger-ethereum = ">=1.42.0"
-open-aea-cli-ipfs = ">=1.42.0"
+open-aea = {version = "==1.50.0", extras = ["cli"]}
+open-aea-ledger-ethereum = "==1.50.0"
+open-aea-cli-ipfs = "==1.50.0"
 websocket-client = ">=0.32.0,<1"
 gql = ">=3.4.1"
 asn1crypto = ">=1.4.0,<1.5.0"
-open-aea-ledger-cosmos = ">=1.42.0"
+open-aea-ledger-cosmos = "==1.50.0"
 
 [tool.poetry.scripts]
 mechx = "mech_client.cli:cli"
 
 [tool.poetry.group.dev.dependencies]
-open-autonomy = "==0.13.6"
-tomte = {extras = ["tox"], version = "==0.2.14"}
+open-autonomy = "==0.14.10"
+tomte = {version = "0.2.15", extras = ["tox"]}
 
 [build-system]
 requires = ["poetry-core"]

mech_client-0.2.8/mech_client/__init__.py

@@ -1,3 +0,0 @@
-"""Mech client."""
-
-__version__ = "0.2.8"