Merge pull request #257 from valory-xyz/fix/mech_interact

Fix/mech interact
valory-xyz · Feb 10, 2025 · e0d9dae · e0d9dae
2 parents e004a0e + d2dda72
commit e0d9dae
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 28 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit:
 2. Fetch the IEKit.
 
     ```bash
-    autonomy fetch valory/impact_evaluator:0.1.0:bafybeiduzst6maqg5tu3bynkuflsy2nlmif3swuqebryh3jcpufczvehtm --service
+    autonomy fetch valory/impact_evaluator:0.1.0:bafybeif3dnkjvhi6efo72v6gtqsjhzxyaix426rnypsjbrurfdnuf75y6q --service
     ```
 
 3. Build the Docker image of the service agents

diff --git a/packages/packages.json b/packages/packages.json
@@ -16,23 +16,23 @@
         "connection/valory/openai/0.1.0": "bafybeiaryip2lbiluf7vjsdq6r5qiqdesmhqevrzekfrxpugfypqja6gae",
         "connection/valory/farcaster/0.1.0": "bafybeibbdas7lxbipksodaphjms3uop7vnzjqkroktjq2g6wbvgtlldaxi",
         "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiazddjnjowzhaybm2czfixxbjge4bifeeplrw3xkl57to6im6rgmq",
-        "skill/valory/twitter_scoring_abci/0.1.0": "bafybeicb77zwvi64byh2ri4hd3qlhmdubxkzyvaej5bqaocqkywmshv6iu",
+        "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiexwgaefrkjwzd64mp6x5d6jsbfg4rvbmgx54nlqgp2a7lfvcop24",
         "skill/valory/ceramic_read_abci/0.1.0": "bafybeiav4vpzizk4m4ik55rasyahydwn5r6z6vnhcqxjjb4h6gzzwsmt4q",
         "skill/valory/ceramic_write_abci/0.1.0": "bafybeib6p3rklvxs3pwobdkprj7wnp3gio2bw2ks6pmmplcz3wkvd4pz7e",
-        "skill/valory/impact_evaluator_abci/0.1.0": "bafybeifi2ye3lt4tc6ee55dy75jmftpnfohu5dlsolbisnjbvqrfhrfcbi",
+        "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiaktsqeqxtaqcbcimr2thdcrmwexzu2n4tvqk3ocnbahshfdst7o4",
         "skill/valory/generic_scoring_abci/0.1.0": "bafybeie4gbp7cicaw2zogp6q7yeimzv6bkfqft3wcusdhkam4523dltyhq",
         "skill/valory/twitter_write_abci/0.1.0": "bafybeig7umkllcnvzrd7pxhvjedpr7hldm5hfww5vyrtd6nxaf4te6mu2u",
         "skill/valory/llm_abci/0.1.0": "bafybeihhwdrkcffycpv3ymr7otvyydjles7fj5imrcbjz25lcpx2ualimu",
         "skill/valory/decision_making_abci/0.1.0": "bafybeibcrauqsiksggwn2q2tky2rnd3sw4x64ov5vmt537hv3sacwn4elm",
         "skill/valory/olas_week_abci/0.1.0": "bafybeihrrozraw3dy2ieh5u4xyhce525visiwwpjm3yhba5qzuhya5cpbq",
-        "skill/valory/mech_interact_abci/0.1.0": "bafybeiclgsetw4inupuaynou332ckp65s6bxdgmfpsxps4i3nldw3lbsnu",
+        "skill/valory/mech_interact_abci/0.1.0": "bafybeianm7zyik46dbnelnyktvx2j4qwcdxjbtncbyxo2tamp4qymb6jry",
         "skill/valory/farcaster_write_abci/0.1.0": "bafybeie3vvo3grvc3od5rffofnmtoujp7i25j5pknd4hggl54uhdzh2dga",
         "skill/valory/farcaster_test_abci/0.1.0": "bafybeidps543tlj4hwfc4ntdjndeofbkgi3xhuho6zxn75vy2rottbojzm",
         "skill/valory/staking_abci/0.1.0": "bafybeiakep6bigsf5ciomspvb4huka3zyzw4jk6skd5tn7lsmzgiivoigq",
-        "agent/valory/impact_evaluator/0.1.0": "bafybeib74hopztpntaoephb43evvit6f7fw2oben2boho2qc3sjg5d6fey",
+        "agent/valory/impact_evaluator/0.1.0": "bafybeiausnrki5cllz3tnhsjbpfvnak3lkmzedwryw56uhhqvzmxdjl3w4",
         "agent/valory/farcaster_test/0.1.0": "bafybeigbrhiyeabgbs4o3ryd5lub3xzk2cpqf3zhmuy3wwpep2cxp65t7m",
-        "service/valory/impact_evaluator/0.1.0": "bafybeiduzst6maqg5tu3bynkuflsy2nlmif3swuqebryh3jcpufczvehtm",
-        "service/valory/impact_evaluator_local/0.1.0": "bafybeigtx5jxninixqlzvtkrrdhv67olfe3domr53ht46fqsq5fiqofene"
+        "service/valory/impact_evaluator/0.1.0": "bafybeif3dnkjvhi6efo72v6gtqsjhzxyaix426rnypsjbrurfdnuf75y6q",
+        "service/valory/impact_evaluator_local/0.1.0": "bafybeig52sr66zrizk7nulfiu76aeoatcjiquktvhju3h3s3xg6ut2fhgu"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeig2d36zxy65vd7fwhs7scotuktydcarm74aprmrb5nioiymr3yixm",

diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml
@@ -46,9 +46,9 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeifv2dynqo3o57nr6jntsvdkduytz3f6i52csv2bjwrr4qhi4mkm7i
 - valory/abstract_round_abci:0.1.0:bafybeiba3zhx5drsf7ailfboeuvwykocmkffs2j426u4q7d4erig67lyhm
-- valory/impact_evaluator_abci:0.1.0:bafybeifi2ye3lt4tc6ee55dy75jmftpnfohu5dlsolbisnjbvqrfhrfcbi
+- valory/impact_evaluator_abci:0.1.0:bafybeiaktsqeqxtaqcbcimr2thdcrmwexzu2n4tvqk3ocnbahshfdst7o4
 - valory/generic_scoring_abci:0.1.0:bafybeie4gbp7cicaw2zogp6q7yeimzv6bkfqft3wcusdhkam4523dltyhq
-- valory/twitter_scoring_abci:0.1.0:bafybeicb77zwvi64byh2ri4hd3qlhmdubxkzyvaej5bqaocqkywmshv6iu
+- valory/twitter_scoring_abci:0.1.0:bafybeiexwgaefrkjwzd64mp6x5d6jsbfg4rvbmgx54nlqgp2a7lfvcop24
 - valory/ceramic_read_abci:0.1.0:bafybeiav4vpzizk4m4ik55rasyahydwn5r6z6vnhcqxjjb4h6gzzwsmt4q
 - valory/ceramic_write_abci:0.1.0:bafybeib6p3rklvxs3pwobdkprj7wnp3gio2bw2ks6pmmplcz3wkvd4pz7e
 - valory/dynamic_nft_abci:0.1.0:bafybeiazddjnjowzhaybm2czfixxbjge4bifeeplrw3xkl57to6im6rgmq
@@ -60,7 +60,7 @@ skills:
 - valory/decision_making_abci:0.1.0:bafybeibcrauqsiksggwn2q2tky2rnd3sw4x64ov5vmt537hv3sacwn4elm
 - valory/llm_abci:0.1.0:bafybeihhwdrkcffycpv3ymr7otvyydjles7fj5imrcbjz25lcpx2ualimu
 - valory/olas_week_abci:0.1.0:bafybeihrrozraw3dy2ieh5u4xyhce525visiwwpjm3yhba5qzuhya5cpbq
-- valory/mech_interact_abci:0.1.0:bafybeiclgsetw4inupuaynou332ckp65s6bxdgmfpsxps4i3nldw3lbsnu
+- valory/mech_interact_abci:0.1.0:bafybeianm7zyik46dbnelnyktvx2j4qwcdxjbtncbyxo2tamp4qymb6jry
 - valory/staking_abci:0.1.0:bafybeiakep6bigsf5ciomspvb4huka3zyzw4jk6skd5tn7lsmzgiivoigq
 default_ledger: ethereum
 required_ledgers:

diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
 fingerprint_ignore_patterns: []
-agent: valory/impact_evaluator:0.1.0:bafybeib74hopztpntaoephb43evvit6f7fw2oben2boho2qc3sjg5d6fey
+agent: valory/impact_evaluator:0.1.0:bafybeiausnrki5cllz3tnhsjbpfvnak3lkmzedwryw56uhhqvzmxdjl3w4
 number_of_agents: 4
 deployment:
   agent:

diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
 fingerprint_ignore_patterns: []
-agent: valory/impact_evaluator:0.1.0:bafybeib74hopztpntaoephb43evvit6f7fw2oben2boho2qc3sjg5d6fey
+agent: valory/impact_evaluator:0.1.0:bafybeiausnrki5cllz3tnhsjbpfvnak3lkmzedwryw56uhhqvzmxdjl3w4
 number_of_agents: 1
 deployment:
   agent:

diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml
@@ -26,7 +26,7 @@ skills:
 - valory/abstract_round_abci:0.1.0:bafybeiba3zhx5drsf7ailfboeuvwykocmkffs2j426u4q7d4erig67lyhm
 - valory/ceramic_read_abci:0.1.0:bafybeiav4vpzizk4m4ik55rasyahydwn5r6z6vnhcqxjjb4h6gzzwsmt4q
 - valory/generic_scoring_abci:0.1.0:bafybeie4gbp7cicaw2zogp6q7yeimzv6bkfqft3wcusdhkam4523dltyhq
-- valory/twitter_scoring_abci:0.1.0:bafybeicb77zwvi64byh2ri4hd3qlhmdubxkzyvaej5bqaocqkywmshv6iu
+- valory/twitter_scoring_abci:0.1.0:bafybeiexwgaefrkjwzd64mp6x5d6jsbfg4rvbmgx54nlqgp2a7lfvcop24
 - valory/ceramic_write_abci:0.1.0:bafybeib6p3rklvxs3pwobdkprj7wnp3gio2bw2ks6pmmplcz3wkvd4pz7e
 - valory/dynamic_nft_abci:0.1.0:bafybeiazddjnjowzhaybm2czfixxbjge4bifeeplrw3xkl57to6im6rgmq
 - valory/registration_abci:0.1.0:bafybeigp2g6uhhgjlkqyhjlk4abfjuecmulnwlki6acbpfu45thslqujlu
@@ -37,7 +37,7 @@ skills:
 - valory/llm_abci:0.1.0:bafybeihhwdrkcffycpv3ymr7otvyydjles7fj5imrcbjz25lcpx2ualimu
 - valory/twitter_write_abci:0.1.0:bafybeig7umkllcnvzrd7pxhvjedpr7hldm5hfww5vyrtd6nxaf4te6mu2u
 - valory/olas_week_abci:0.1.0:bafybeihrrozraw3dy2ieh5u4xyhce525visiwwpjm3yhba5qzuhya5cpbq
-- valory/mech_interact_abci:0.1.0:bafybeiclgsetw4inupuaynou332ckp65s6bxdgmfpsxps4i3nldw3lbsnu
+- valory/mech_interact_abci:0.1.0:bafybeianm7zyik46dbnelnyktvx2j4qwcdxjbtncbyxo2tamp4qymb6jry
 - valory/staking_abci:0.1.0:bafybeiakep6bigsf5ciomspvb4huka3zyzw4jk6skd5tn7lsmzgiivoigq
 behaviours:
   main:

diff --git a/packages/valory/skills/mech_interact_abci/behaviours/base.py b/packages/valory/skills/mech_interact_abci/behaviours/base.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------------------------
 #
-#   Copyright 2023-2024 Valory AG
+#   Copyright 2023-2025 Valory AG
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -163,7 +163,7 @@ def _mech_marketplace_contract_interact(
         status = yield from self.contract_interact(
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,  # type: ignore
             contract_address=self.params.mech_marketplace_config.mech_marketplace_address,
-            contract_public_id=AgentRegistryContract.contract_id,
+            contract_public_id=MechMarketplace.contract_id,
             contract_callable=contract_callable,
             data_key=data_key,
             placeholder=placeholder,
@@ -182,7 +182,7 @@ def agent_registry_contract_interact(
         status = yield from self.contract_interact(
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,  # type: ignore
             contract_address=self.params.agent_registry_address,
-            contract_public_id=MechMarketplace.contract_id,
+            contract_public_id=AgentRegistryContract.contract_id,
             contract_callable=contract_callable,
             data_key=data_key,
             placeholder=placeholder,

diff --git a/packages/valory/skills/mech_interact_abci/behaviours/request.py b/packages/valory/skills/mech_interact_abci/behaviours/request.py
@@ -468,11 +468,17 @@ def async_act(self) -> Generator:
         """Do the action."""
 
         with self.context.benchmark_tool.measure(self.behaviour_id).local():
-            agent_address = self.context.agent_address
             if not self._mech_requests:
-                n_params = len(MechRequestPayload.__annotations__)
-                empty_payload_params = (None,) * n_params
-                payload = MechRequestPayload(agent_address, *empty_payload_params)
+                payload = MechRequestPayload(
+                    self.context.agent_address,
+                    self.matching_round.auto_round_id(),
+                    None,
+                    None,
+                    self.params.mech_chain_id,
+                    self.synchronized_data.safe_contract_address,
+                    None,
+                    None,
+                )
             else:
                 self.context.logger.info(
                     f"Preparing mech requests: {self._mech_requests}"
@@ -483,11 +489,10 @@ def async_act(self) -> Generator:
                     for data in (self._mech_requests, self._pending_responses)
                 )
                 self.context.logger.info(
-                    f"Preparing mech request:\ntx_hex: {self.tx_hex}\nprice: {self.price}\n"
-                    f"serialized_data: {serialized_data}"
+                    f"Preparing mech request:\ntx_hex: {self.tx_hex}\nprice: {self.price}\nserialized_data: {serialized_data}\n"
                 )
                 payload = MechRequestPayload(
-                    agent_address,
+                    self.context.agent_address,
                     self.matching_round.auto_round_id(),
                     self.tx_hex,
                     self.price,

diff --git a/packages/valory/skills/mech_interact_abci/skill.yaml b/packages/valory/skills/mech_interact_abci/skill.yaml
@@ -9,8 +9,8 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   __init__.py: bafybeidf3nlv5fpvfy4libtscayhirdw64shgmhfmvjiftjmjkmhu7auxq
   behaviours/__init__.py: bafybeie3zsi6p3yanz5mqwpkdrcgywaqvkit3hdintsb4awnvalgxpxa4i
-  behaviours/base.py: bafybeibrl2rniag7qf6fpn5rgbv5bagnyyps7tm6kb3yjz3ilz56lzfz74
-  behaviours/request.py: bafybeiev7bp6mtzdhn66cj4rqj65gfrpc4ebkdy77pjbdt4k4pb3qahizm
+  behaviours/base.py: bafybeicdcyujafl765anhijisytsyjhdiyacvaeempjyhclvrrogbkjzgq
+  behaviours/request.py: bafybeig57mey7h7uyifiavugjwqw4esdvgiaxcj6uzw6kb7qr3vialxgr4
   behaviours/response.py: bafybeicmcsl5ubv6qcsunfk2e3dn4i5nk2xaioioigzamvybmijftftxu4
   behaviours/round_behaviour.py: bafybeib33inrpyzzlx7k7i3okkslsx4p46dgdaww2m5k7rno57o5nndage
   dialogues.py: bafybeicgtxsrzld6uyi2n455temnz6mj55irmxqxw55jxo4b6ud4rt7nsm
@@ -22,7 +22,7 @@ fingerprint:
   states/__init__.py: bafybeie34wx5znr2hxwh3gs2fchmbeuzjcfnraymdvtzjaxaq5zsiw233q
   states/base.py: bafybeidclvpox4adidod36l2gorv4qtnsunmpzgnvqnm3xvqbqdreqjojy
   states/final_states.py: bafybeihjntrbc666blxj4viz74y4p2hfc5e4vijs3bqng2k4vqbwkud7sq
-  states/request.py: bafybeif3ydxbum5svwkpkk4fjjko4om3evma4csemryycucd3tbmx5kpdi
+  states/request.py: bafybeibo7mxxbqao75zqjale5gjqa3nmt6fgdiwbthdczvd2ybdg4pdts4
   states/response.py: bafybeibaxnp2oxwjptoq7qzm6o7ww2qrdj2vnxzg2qt523vz2ftqzx5hyi
   tests/__init__.py: bafybeifojfnffwlsv6aiku25nwyjwm7h4m45yci3fgmaawpeoyoogzonum
   tests/test_behaviours.py: bafybeidj7git7zaego7k75eejtxlr3usj6wnnqisu7urqwvalpwh5w7nyq

diff --git a/packages/valory/skills/mech_interact_abci/states/request.py b/packages/valory/skills/mech_interact_abci/states/request.py
@@ -32,6 +32,7 @@ class MechRequestRound(MechInteractionRound):
     """A round for performing requests to a Mech."""
 
     payload_class = MechRequestPayload
+
     selection_key = (
         get_name(SynchronizedData.tx_submitter),
         get_name(SynchronizedData.most_voted_tx_hash),

diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml
@@ -33,7 +33,7 @@ protocols:
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeiba3zhx5drsf7ailfboeuvwykocmkffs2j426u4q7d4erig67lyhm
 - valory/decision_making_abci:0.1.0:bafybeibcrauqsiksggwn2q2tky2rnd3sw4x64ov5vmt537hv3sacwn4elm
-- valory/mech_interact_abci:0.1.0:bafybeiclgsetw4inupuaynou332ckp65s6bxdgmfpsxps4i3nldw3lbsnu
+- valory/mech_interact_abci:0.1.0:bafybeianm7zyik46dbnelnyktvx2j4qwcdxjbtncbyxo2tamp4qymb6jry
 behaviours:
   main:
     args: {}