mech-client 0.2.18__tar.gz → 0.2.20__tar.gz

{mech_client-0.2.18 → mech_client-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.2.18
+Version: 0.2.20
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch

mech_client-0.2.20/mech_client/__init__.py

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

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/configs/mechs.json

@@ -58,8 +58,9 @@
             "default_gas_price_strategy": "eip1559",
             "is_gas_estimation_enabled": false
         },
-        "gas_limit": 100000,
-        "contract_abi_url": "https://api.basescan.org/api?module=contract&action=getabi&address={contract_address}",
+        "gas_limit": 250000,
+        "price": 3000000000000,
+        "contract_abi_url": "https://api.basescan.org/api?module=contract&action=getabi&address={contract_address}&apikey={api_key}",
         "transaction_url": "https://basescan.org/tx/{transaction_digest}",
         "subgraph_url": ""
     },

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/acn/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/acn/dialogues.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/acn/message.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/acn/protocol.yaml

@@ -8,13 +8,13 @@ license: Apache-2.0
 aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   README.md: bafybeie7paijucvzemlfhwfmmhorypwuhzbeimgoitlkokdio5c3ne4pjq
-  __init__.py: bafybeie6wesz6wnihjwdlbkhso6gtnpa4dkqdseb7susz2qseprlmcccam
+  __init__.py: bafybeicqlp4gkeeef5osp6zopjztlgat24nxrzq43cy7wbwxk5omf2sc2m
   acn.proto: bafybeidkun7o75sxpyk2sixt7dsykgty62f6dnixnes2irbunyamilqsh4
   acn_pb2.py: bafybeialafz3yomunwa3g5xgrdqwodzl7zg5dncvzuetv7xoew4zhw76ni
   custom_types.py: bafybeigpueuq6mdeyjyayzv3menkmemutfgfiwlozlpl64t67cfnnom24q
-  dialogues.py: bafybeih2kwxi34hcrxbb3cmhtpo5k5fc4hlgsb3qnifpyeefou63c4qc2a
-  message.py: bafybeibkjeytosfqptmqph3xwdcnmokgoen2xw2s44736potgrjr43vlmy
-  serialization.py: bafybeibbs5uepy6s5jb5eyzdav6i2hejy26zkocqe236kxmoknkqpsi7iu
+  dialogues.py: bafybeidjpyk7s3getyfegjdrgrt5blf2yutzqclohaktjehwcj3sqx2ole
+  message.py: bafybeiai7kond3rcbtwnr5xgpwzuauf5tusuep6ikopi4cqvp2wa5qfz3e
+  serialization.py: bafybeidu7fzixk6sm3iprhph4shbiq5qgvg56lg4yiryfaf3unuqk34bwi
   tests/__init__.py: bafybeidteufp2npjd77ekcftk5e4gbaquq3gike5nxtk5xfmnusls56keu
   tests/test_acn.py: bafybeignjgdtlfdnj25hc5necmg7zl3kvngsmzkjgcwfm5qg36liqa63ki
   tests/test_acn_dialogues.py: bafybeia2kndutaokjpogo4wlb5pf4gkqacvcbngqromf4g4mzu6wyetz7q

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/acn/serialization.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023 valory
+#   Copyright 2024 valory
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/p2p_libp2p_client/connection.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2022-2023 Valory AG
+#   Copyright 2022-2024 Valory AG
 #   Copyright 2018-2019 Fetch.AI Limited
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -279,6 +279,7 @@ class P2PLibp2pClientConnection(Connection):
     connection_id = PUBLIC_ID
 
     DEFAULT_CONNECT_RETRIES = 3
+    DEFAULT_RESEND_ENVELOPE_RETRY = 1
     DEFAULT_TLS_CONNECTION_SIGNATURE_TIMEOUT = 5.0
 
     def __init__(self, **kwargs: Any) -> None:
@@ -292,6 +293,9 @@ class P2PLibp2pClientConnection(Connection):
         self.connect_retries = self.configuration.config.get(
             "connect_retries", self.DEFAULT_CONNECT_RETRIES
         )
+        self.resend_envelope_retry = self.configuration.config.get(
+            "resend_envelope_retry", self.DEFAULT_RESEND_ENVELOPE_RETRY
+        )
         ledger_id = self.configuration.config.get("ledger_id", DEFAULT_LEDGER)
         if ledger_id not in SUPPORTED_LEDGER_IDS:
             raise ValueError(  # pragma: nocover
@@ -386,11 +390,17 @@ class P2PLibp2pClientConnection(Connection):
             )
             await asyncio.shield(self.disconnect())
 
-    async def _send_envelope_with_node_client(self, envelope: Envelope) -> None:
+    async def _send_envelope_with_node_client(
+        self, envelope: Envelope, retry_counter: int = 0
+    ) -> None:
         """Send envelope with node client, reconnect and retry on fail."""
         if not self._node_client:  # pragma: nocover
             raise ValueError("Connection not connected to node!")
-
+        if retry_counter > self.resend_envelope_retry:
+            self.logger.warning(
+                f"Dropping envelope {envelope}. It failed after retry. "
+            )
+            return
         self._ensure_valid_envelope_for_external_comms(envelope)
         try:
             await self._node_client.send_envelope(envelope)
@@ -399,7 +409,7 @@ class P2PLibp2pClientConnection(Connection):
                 "Exception raised on message send. Try reconnect and send again."
             )
             await self._perform_connection_to_node()
-            await self._node_client.send_envelope(envelope)
+            await self._send_envelope_with_node_client(envelope, retry_counter + 1)
 
     async def connect(self) -> None:
         """Set up the connection."""
@@ -584,9 +594,14 @@ class P2PLibp2pClientConnection(Connection):
             envelope = await self._read_envelope_from_node()
             if self._in_queue is None:
                 raise ValueError("Input queue not initialized.")  # pragma: nocover
-            self._in_queue.put_nowait(envelope)
+            self.logger.debug(f"Received envelope: {envelope}")
             if envelope is None:
-                break  # pragma: no cover
+                # give it time to recover
+                # twice the amount what we wait for ACK timeouts
+                timeout = NodeClient.ACN_ACK_TIMEOUT * 2
+                await asyncio.sleep(timeout)
+                continue  # pragma: no cover
+            self._in_queue.put_nowait(envelope)
 
 
 class TCPSocketChannelClientTLS(TCPSocketChannelClient):

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/helpers/p2p_libp2p_client/connection.yaml

@@ -10,14 +10,15 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   README.md: bafybeiaf5kdnfdc2jifojgniib76zl2c4utnx7ofewc3szqkrxsby62ulu
   __init__.py: bafybeid2azroxglu6fl7bxdfcsv3j77vyzgpikjnfwpxg73zeb5orez6ju
-  connection.py: bafybeiauso3ectgdvbhkt5j6wstfev5mnxiuj6hrkczyqgxurnvva3loqm
+  connection.py: bafybeihcwyo5nhxmsjxw7qrrvkvp7qu6izbgzgipmmnrpdvc6jtwmw7vgy
 fingerprint_ignore_patterns: []
 connections: []
 protocols:
-- valory/acn:1.1.0:bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu
+- valory/acn:1.1.0:bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe
 class_name: P2PLibp2pClientConnection
 config:
   connect_retries: 3
+  resend_envelope_retry: 1
   ledger_id: cosmos
   nodes:
   - uri: acn.staging.autonolas.tech:9005
@@ -29,15 +30,15 @@ cert_requests:
 - identifier: acn
   ledger_id: ethereum
   message_format: '{public_key}'
-  not_after: '2024-01-01'
-  not_before: '2023-01-01'
+  not_after: '2025-01-01'
+  not_before: '2024-01-01'
   public_key: 02d3a830c9d6ea1ae91936951430dee11f4662f33118b02190693be835359a9d77
   save_path: .certs/acn_cosmos_9005.txt
 - identifier: acn
   ledger_id: ethereum
   message_format: '{public_key}'
-  not_after: '2024-01-01'
-  not_before: '2023-01-01'
+  not_after: '2025-01-01'
+  not_before: '2024-01-01'
   public_key: 02e741c62d706e1dcf6986bf37fa74b98681bc32669623ac9ee6ff72488d4f59e8
   save_path: .certs/acn_cosmos_9006.txt
 excluded_protocols: []

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/interact.py

@@ -112,6 +112,7 @@ class MechConfig:  # pylint: disable=too-many-instance-attributes
     contract_abi_url: str
     transaction_url: str
     subgraph_url: str
+    price: int
 
     def __post_init__(self) -> None:
         """Post initialization to override with environment variables."""
@@ -143,6 +144,13 @@ class MechConfig:  # pylint: disable=too-many-instance-attributes
         if subgraph_url:
             self.subgraph_url = subgraph_url
 
+        api_key = os.getenv("MECHX_API_KEY")
+        if api_key:
+            updated_contract_abi_url = self.contract_abi_url.replace(
+                "{api_key}", api_key
+            )
+            self.contract_abi_url = updated_contract_abi_url
+
 
 class ConfirmationType(Enum):
     """Verification type."""
@@ -587,11 +595,13 @@ def interact(  # pylint: disable=too-many-arguments,too-many-locals
         deliver_signature=deliver_event_signature,
     )
     print("Sending Mech request...")
+    price = mech_config.price or 10_000_000_000_000_000
     transaction_digest = send_request(
         crypto=crypto,
         ledger_api=ledger_api,
         mech_contract=mech_contract,
         gas_limit=mech_config.gas_limit,
+        price=price,
         prompt=prompt,
         tool=tool,
         extra_attributes=extra_attributes,

{mech_client-0.2.18 → mech_client-0.2.20}/mech_client/subgraph.py

@@ -70,8 +70,12 @@ def query_agent_address(  # pylint: disable=too-many-return-statements
     :rtype: Optional[str]
     """
     # temporary hard coded until subgraph present
+    if chain_config == "base" and agent_id == 1:
+        return "0x37C484cc34408d0F827DB4d7B6e54b8837Bf8BDA"
     if chain_config == "base" and agent_id == 2:
         return "0x111D7DB1B752AB4D2cC0286983D9bd73a49bac6c"
+    if chain_config == "base" and agent_id == 3:
+        return "0x111D7DB1B752AB4D2cC0286983D9bd73a49bac6c"
     if chain_config == "arbitrum" and agent_id == 2:
         return "0x1FDAD3a5af5E96e5a64Fc0662B1814458F114597"
     if chain_config == "polygon" and agent_id == 2:

{mech_client-0.2.18 → mech_client-0.2.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mech-client"
-version = "0.2.18"
+version = "0.2.20"
 description = "Basic client to interact with a mech"
 authors = ["David Minarsch <david.minarsch@googlemail.com>"]
 readme = "README.md"

mech_client-0.2.18/mech_client/__init__.py

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