From bec4516456d4d6116c51d81a3a970d91303e6603 Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Fri, 18 Oct 2024 08:45:33 +0000 Subject: [PATCH 1/7] WIP: only remove tasks if the previous tx was successful --- .../skills/task_submission_abci/behaviours.py | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/valory/skills/task_submission_abci/behaviours.py b/packages/valory/skills/task_submission_abci/behaviours.py index cace258f..39e646f5 100644 --- a/packages/valory/skills/task_submission_abci/behaviours.py +++ b/packages/valory/skills/task_submission_abci/behaviours.py @@ -156,8 +156,12 @@ class TaskPoolingBehaviour(TaskExecutionBaseBehaviour, ABC): def async_act(self) -> Generator: # pylint: disable=R0914,R0915 """Do the act, supporting asynchronous execution.""" with self.context.benchmark_tool.measure(self.behaviour_id).local(): - # clean up the queue based on the outcome of the previous period - self.handle_submitted_tasks() + + status = self.check_last_tx_status() + if status == True: + # clean up the queue based on the outcome of the previous period + self.handle_submitted_tasks() + # sync new tasks payload_content = yield from self.get_payload_content() sender = self.context.agent_address @@ -196,6 +200,22 @@ def handle_submitted_tasks(self) -> None: ) self.remove_tasks(submitted_tasks) + def check_last_tx_status(self) -> bool: + """Check if the tx in the last round was successful or not""" + # Try to fetch the final tx hash from the sync db + # If the value exists and is not None, we return True, else False + # ref: https://github.com/valory-xyz/open-autonomy/blob/main/packages/valory/skills/transaction_settlement_abci/rounds.py#L432-L434 + try: + final_tx_hash = self.synchronized_data.final_tx_hash + except Exception as e: + self.context.logger.error(e) + return False + else: + if final_tx_hash is not None: + return True + else: + return False + class DeliverBehaviour(TaskExecutionBaseBehaviour, ABC): """Behaviour for tracking task delivery by the agents.""" From adc2ced22a0a104444f8a5ccce4f7f6f329b24f4 Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Mon, 21 Oct 2024 06:58:25 +0000 Subject: [PATCH 2/7] refactor changes --- .../skills/task_submission_abci/behaviours.py | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/valory/skills/task_submission_abci/behaviours.py b/packages/valory/skills/task_submission_abci/behaviours.py index 39e646f5..67362ca5 100644 --- a/packages/valory/skills/task_submission_abci/behaviours.py +++ b/packages/valory/skills/task_submission_abci/behaviours.py @@ -156,11 +156,8 @@ class TaskPoolingBehaviour(TaskExecutionBaseBehaviour, ABC): def async_act(self) -> Generator: # pylint: disable=R0914,R0915 """Do the act, supporting asynchronous execution.""" with self.context.benchmark_tool.measure(self.behaviour_id).local(): - - status = self.check_last_tx_status() - if status == True: - # clean up the queue based on the outcome of the previous period - self.handle_submitted_tasks() + # clean up the queue based on the outcome of the previous period + self.handle_submitted_tasks() # sync new tasks payload_content = yield from self.get_payload_content() @@ -193,12 +190,17 @@ def get_done_tasks(self, timeout: float) -> Generator[None, None, List[Dict]]: def handle_submitted_tasks(self) -> None: """Handle tasks that have been already submitted before (in a prev. period).""" - submitted_tasks = cast(List[Dict[str, Any]], self.synchronized_data.done_tasks) - self.context.logger.info( - f"Tasks {submitted_tasks} has already been submitted. " - f"Removing them from the list of tasks to be processed." - ) - self.remove_tasks(submitted_tasks) + status = self.check_last_tx_status() + self.context.logger.info(f"Last tx status is: {status}") + if status: + submitted_tasks = cast( + List[Dict[str, Any]], self.synchronized_data.done_tasks + ) + self.context.logger.info( + f"Tasks {submitted_tasks} has already been submitted. " + f"Removing them from the list of tasks to be processed." + ) + self.remove_tasks(submitted_tasks) def check_last_tx_status(self) -> bool: """Check if the tx in the last round was successful or not""" From 7fa904b04f0f0f01f37ce5c6a0e92f78e67136d2 Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Mon, 21 Oct 2024 07:01:19 +0000 Subject: [PATCH 3/7] autonomy packages lock --- packages/packages.json | 8 ++++---- packages/valory/agents/mech/aea-config.yaml | 4 ++-- packages/valory/services/mech/service.yaml | 2 +- packages/valory/skills/mech_abci/skill.yaml | 2 +- packages/valory/skills/task_submission_abci/skill.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index c4c8345e..51e1a9d2 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -42,13 +42,13 @@ "contract/valory/mech_marketplace/0.1.0": "bafybeich3a3oh5w4u533w6y7ideojudqp2m5gxta7pqmsfiaohdhuw7yz4", "connection/valory/websocket_client/0.1.0": "bafybeic4ag3gqc7kd3k2o3pucddj2odck5yrfbgmwh5veqny7zao5qayli", "skill/valory/contract_subscription/0.1.0": "bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy", - "skill/valory/mech_abci/0.1.0": "bafybeidkwahhblv6d6shzrk665yguyfar3w6qbld5ryjolw4zibdwr73vi", - "skill/valory/task_submission_abci/0.1.0": "bafybeifkd76popxwociq2ryojbcjyesmxoagqyjrbs73qoyd5o4szz6cgu", + "skill/valory/mech_abci/0.1.0": "bafybeibqjzttobgszamrc2qe4qpxbhpy6oqo6thl3os4frbdcxy42mslbu", + "skill/valory/task_submission_abci/0.1.0": "bafybeiclhsgytk7z53npbvlofbzejpllxw6lqm5ysbg4neot2fmemock2e", "skill/valory/task_execution/0.1.0": "bafybeicg7rvme6dajqzwval3igq352mjor6k4lnw3tachrml66o7cm7mvm", "skill/valory/websocket_client/0.1.0": "bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m", "skill/valory/subscription_abci/0.1.0": "bafybeihtortmv4fqua5wrnshpnvqsbpaf52frwynrmpuv2uw5j7wkauhze", - "agent/valory/mech/0.1.0": "bafybeib4ptljwzt34isrcmbkloexgp2wdmbrinl5a57xxvgjqub2ikhzvm", - "service/valory/mech/0.1.0": "bafybeieetllbqkol5nsreusrra553diyc3ec5n3lw5p23d5sromggarsc4" + "agent/valory/mech/0.1.0": "bafybeif5e6fdpwfzqsqzb4crkwsr4w342vhreiwxvjsjopcfbwdxftbwvi", + "service/valory/mech/0.1.0": "bafybeibzarqu2osm6asd7ztudtiv42dv3f5vsjll7kqxgg5k5tb2wxf5tm" }, "third_party": { "protocol/valory/default/1.0.0": "bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index 3ba2b2cc..90fb98a5 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -39,12 +39,12 @@ skills: - valory/abstract_abci:0.1.0:bafybeihat4giyc4bz6zopvahcj4iw53356pbtwfn7p4d5yflwly2qhahum - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/contract_subscription:0.1.0:bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy -- valory/mech_abci:0.1.0:bafybeidkwahhblv6d6shzrk665yguyfar3w6qbld5ryjolw4zibdwr73vi +- valory/mech_abci:0.1.0:bafybeibqjzttobgszamrc2qe4qpxbhpy6oqo6thl3os4frbdcxy42mslbu - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/subscription_abci:0.1.0:bafybeihtortmv4fqua5wrnshpnvqsbpaf52frwynrmpuv2uw5j7wkauhze - valory/task_execution:0.1.0:bafybeicg7rvme6dajqzwval3igq352mjor6k4lnw3tachrml66o7cm7mvm -- valory/task_submission_abci:0.1.0:bafybeifkd76popxwociq2ryojbcjyesmxoagqyjrbs73qoyd5o4szz6cgu +- valory/task_submission_abci:0.1.0:bafybeiclhsgytk7z53npbvlofbzejpllxw6lqm5ysbg4neot2fmemock2e - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/websocket_client:0.1.0:bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index fa4bbf2f..b3cc5db6 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeib4ptljwzt34isrcmbkloexgp2wdmbrinl5a57xxvgjqub2ikhzvm +agent: valory/mech:0.1.0:bafybeif5e6fdpwfzqsqzb4crkwsr4w342vhreiwxvjsjopcfbwdxftbwvi number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/mech_abci/skill.yaml b/packages/valory/skills/mech_abci/skill.yaml index 3928a52c..dc2e7094 100644 --- a/packages/valory/skills/mech_abci/skill.yaml +++ b/packages/valory/skills/mech_abci/skill.yaml @@ -23,7 +23,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam -- valory/task_submission_abci:0.1.0:bafybeifkd76popxwociq2ryojbcjyesmxoagqyjrbs73qoyd5o4szz6cgu +- valory/task_submission_abci:0.1.0:bafybeiclhsgytk7z53npbvlofbzejpllxw6lqm5ysbg4neot2fmemock2e - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/subscription_abci:0.1.0:bafybeihtortmv4fqua5wrnshpnvqsbpaf52frwynrmpuv2uw5j7wkauhze diff --git a/packages/valory/skills/task_submission_abci/skill.yaml b/packages/valory/skills/task_submission_abci/skill.yaml index 15965371..62bb03cd 100644 --- a/packages/valory/skills/task_submission_abci/skill.yaml +++ b/packages/valory/skills/task_submission_abci/skill.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeiholqak7ltw6bbmn2c5tn3j7xgzkdlfzp3kcskiqsvmxoih6m4muq - behaviours.py: bafybeifgon5yuonrcpbwslwxbpd3cttqyj42llgpcwioyfmtx3uoxh7dnm + behaviours.py: bafybeifje2l3al5vjcd3wcsov2lskiosaqoztobu3s6t3w2bxmvz7walfu dialogues.py: bafybeibmac3m5u5h6ucoyjr4dazay72dyga656wvjl6z6saapluvjo54ne fsm_specification.yaml: bafybeidtmsmpunr3t77pshd3k2s6dd6hlvhze6inu3gj7xyvlg4wi3tnuu handlers.py: bafybeibe5n7my2vd2wlwo73sbma65epjqc7kxgtittewlylcmvnmoxtxzq From 2623afcbd90b1dc5c1754f3b2e86ff29fa967884 Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Mon, 21 Oct 2024 07:58:29 +0000 Subject: [PATCH 4/7] fix: check hashes --- packages/packages.json | 14 +++++++------- packages/valory/agents/mech/aea-config.yaml | 10 +++++----- packages/valory/services/mech/service.yaml | 2 +- packages/valory/skills/mech_abci/skill.yaml | 4 ++-- .../valory/skills/task_submission_abci/skill.yaml | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 51e1a9d2..d0a513df 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -36,19 +36,19 @@ "custom/dvilela/gemini_prediction/0.1.0": "bafybeigvwflupxzbjgmaxcxml5vkez3obl4fjo6bxzhquq56urnviq32u4", "protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq", "protocol/valory/websocket_client/0.1.0": "bafybeifjk254sy65rna2k32kynzenutujwqndap2r222afvr3zezi27mx4", - "contract/valory/agent_mech/0.1.0": "bafybeiah6b5epo2hlvzg5rr2cydgpp2waausoyrpnoarf7oa7bw33rex34", + "contract/valory/agent_mech/0.1.0": "bafybeifj253ojkdr75ckrzb55su3j2v2hyb3v2ppqjwvvqyzbxanptebne", "contract/valory/agent_registry/0.1.0": "bafybeiarzhzs2wm2sl47qg37tqoc3qok54enxlcj6vx3hldozg537uslnq", "contract/valory/hash_checkpoint/0.1.0": "bafybeicbycr6rxods7sg3f2qlhgkjqrbh7kymmy2yw7bewxdwjyp7ibtg4", "contract/valory/mech_marketplace/0.1.0": "bafybeich3a3oh5w4u533w6y7ideojudqp2m5gxta7pqmsfiaohdhuw7yz4", "connection/valory/websocket_client/0.1.0": "bafybeic4ag3gqc7kd3k2o3pucddj2odck5yrfbgmwh5veqny7zao5qayli", "skill/valory/contract_subscription/0.1.0": "bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy", - "skill/valory/mech_abci/0.1.0": "bafybeibqjzttobgszamrc2qe4qpxbhpy6oqo6thl3os4frbdcxy42mslbu", - "skill/valory/task_submission_abci/0.1.0": "bafybeiclhsgytk7z53npbvlofbzejpllxw6lqm5ysbg4neot2fmemock2e", - "skill/valory/task_execution/0.1.0": "bafybeicg7rvme6dajqzwval3igq352mjor6k4lnw3tachrml66o7cm7mvm", + "skill/valory/mech_abci/0.1.0": "bafybeic5cwrefbdsqu4v7n2q4z3yfgosrorxfwsdkzf7k66wjpjv2cwmbm", + "skill/valory/task_submission_abci/0.1.0": "bafybeifrs2ed2jmg3s5qzlvgojexuxzwzhylgum2v2u5vmbol75pgseny4", + "skill/valory/task_execution/0.1.0": "bafybeif7jsxbue6l7fhn5ahf7jbks5td6me55b42dy7k6s3j72zvu2p7ie", "skill/valory/websocket_client/0.1.0": "bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m", - "skill/valory/subscription_abci/0.1.0": "bafybeihtortmv4fqua5wrnshpnvqsbpaf52frwynrmpuv2uw5j7wkauhze", - "agent/valory/mech/0.1.0": "bafybeif5e6fdpwfzqsqzb4crkwsr4w342vhreiwxvjsjopcfbwdxftbwvi", - "service/valory/mech/0.1.0": "bafybeibzarqu2osm6asd7ztudtiv42dv3f5vsjll7kqxgg5k5tb2wxf5tm" + "skill/valory/subscription_abci/0.1.0": "bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa", + "agent/valory/mech/0.1.0": "bafybeigfsh2rl5jx544en4o5i7oqr6rszxf2l2uh4ktpkkfa4ecb3dhz4m", + "service/valory/mech/0.1.0": "bafybeigjfh2jbyxseqvut5hdc7qcunatlqipdhtjym25xzrksvly33pyfu" }, "third_party": { "protocol/valory/default/1.0.0": "bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index 90fb98a5..6a41a1aa 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -15,7 +15,7 @@ connections: - valory/p2p_libp2p_client:0.1.0:bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e - valory/websocket_client:0.1.0:bafybeic4ag3gqc7kd3k2o3pucddj2odck5yrfbgmwh5veqny7zao5qayli contracts: -- valory/agent_mech:0.1.0:bafybeiah6b5epo2hlvzg5rr2cydgpp2waausoyrpnoarf7oa7bw33rex34 +- valory/agent_mech:0.1.0:bafybeifj253ojkdr75ckrzb55su3j2v2hyb3v2ppqjwvvqyzbxanptebne - valory/agent_registry:0.1.0:bafybeiarzhzs2wm2sl47qg37tqoc3qok54enxlcj6vx3hldozg537uslnq - valory/gnosis_safe:0.1.0:bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa - valory/gnosis_safe_proxy_factory:0.1.0:bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74 @@ -39,12 +39,12 @@ skills: - valory/abstract_abci:0.1.0:bafybeihat4giyc4bz6zopvahcj4iw53356pbtwfn7p4d5yflwly2qhahum - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/contract_subscription:0.1.0:bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy -- valory/mech_abci:0.1.0:bafybeibqjzttobgszamrc2qe4qpxbhpy6oqo6thl3os4frbdcxy42mslbu +- valory/mech_abci:0.1.0:bafybeic5cwrefbdsqu4v7n2q4z3yfgosrorxfwsdkzf7k66wjpjv2cwmbm - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam -- valory/subscription_abci:0.1.0:bafybeihtortmv4fqua5wrnshpnvqsbpaf52frwynrmpuv2uw5j7wkauhze -- valory/task_execution:0.1.0:bafybeicg7rvme6dajqzwval3igq352mjor6k4lnw3tachrml66o7cm7mvm -- valory/task_submission_abci:0.1.0:bafybeiclhsgytk7z53npbvlofbzejpllxw6lqm5ysbg4neot2fmemock2e +- valory/subscription_abci:0.1.0:bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa +- valory/task_execution:0.1.0:bafybeif7jsxbue6l7fhn5ahf7jbks5td6me55b42dy7k6s3j72zvu2p7ie +- valory/task_submission_abci:0.1.0:bafybeifrs2ed2jmg3s5qzlvgojexuxzwzhylgum2v2u5vmbol75pgseny4 - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/websocket_client:0.1.0:bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index b3cc5db6..90c0c6ef 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeif5e6fdpwfzqsqzb4crkwsr4w342vhreiwxvjsjopcfbwdxftbwvi +agent: valory/mech:0.1.0:bafybeigfsh2rl5jx544en4o5i7oqr6rszxf2l2uh4ktpkkfa4ecb3dhz4m number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/mech_abci/skill.yaml b/packages/valory/skills/mech_abci/skill.yaml index dc2e7094..ffb73476 100644 --- a/packages/valory/skills/mech_abci/skill.yaml +++ b/packages/valory/skills/mech_abci/skill.yaml @@ -23,10 +23,10 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam -- valory/task_submission_abci:0.1.0:bafybeiclhsgytk7z53npbvlofbzejpllxw6lqm5ysbg4neot2fmemock2e +- valory/task_submission_abci:0.1.0:bafybeifrs2ed2jmg3s5qzlvgojexuxzwzhylgum2v2u5vmbol75pgseny4 - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/subscription_abci:0.1.0:bafybeihtortmv4fqua5wrnshpnvqsbpaf52frwynrmpuv2uw5j7wkauhze +- valory/subscription_abci:0.1.0:bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa behaviours: main: args: {} diff --git a/packages/valory/skills/task_submission_abci/skill.yaml b/packages/valory/skills/task_submission_abci/skill.yaml index 62bb03cd..c70423ce 100644 --- a/packages/valory/skills/task_submission_abci/skill.yaml +++ b/packages/valory/skills/task_submission_abci/skill.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeiholqak7ltw6bbmn2c5tn3j7xgzkdlfzp3kcskiqsvmxoih6m4muq - behaviours.py: bafybeifje2l3al5vjcd3wcsov2lskiosaqoztobu3s6t3w2bxmvz7walfu + behaviours.py: bafybeigdv2gcesycwjwoy62igcbhsr3cgszfzleb5fhl4lwmq7g57skntm dialogues.py: bafybeibmac3m5u5h6ucoyjr4dazay72dyga656wvjl6z6saapluvjo54ne fsm_specification.yaml: bafybeidtmsmpunr3t77pshd3k2s6dd6hlvhze6inu3gj7xyvlg4wi3tnuu handlers.py: bafybeibe5n7my2vd2wlwo73sbma65epjqc7kxgtittewlylcmvnmoxtxzq @@ -19,7 +19,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/agent_mech:0.1.0:bafybeiah6b5epo2hlvzg5rr2cydgpp2waausoyrpnoarf7oa7bw33rex34 +- valory/agent_mech:0.1.0:bafybeifj253ojkdr75ckrzb55su3j2v2hyb3v2ppqjwvvqyzbxanptebne - valory/agent_registry:0.1.0:bafybeiarzhzs2wm2sl47qg37tqoc3qok54enxlcj6vx3hldozg537uslnq - valory/gnosis_safe:0.1.0:bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y From 16841965c53d51f6d41fded03b24310a717f234b Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Mon, 21 Oct 2024 08:38:10 +0000 Subject: [PATCH 5/7] fix: attr-defined error --- packages/valory/skills/task_submission_abci/rounds.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/valory/skills/task_submission_abci/rounds.py b/packages/valory/skills/task_submission_abci/rounds.py index f06258a2..123cd763 100644 --- a/packages/valory/skills/task_submission_abci/rounds.py +++ b/packages/valory/skills/task_submission_abci/rounds.py @@ -67,6 +67,11 @@ def done_tasks(self) -> List[Dict[str, Any]]: """Done tasks.""" return cast(List[Dict[str, Any]], self.db.get("done_tasks", [])) + @property + def final_tx_hash(self) -> str: + """Get the verified tx hash.""" + return cast(str, self.db.get_strict("final_tx_hash")) + class TaskPoolingRound(CollectionRound): """TaskPoolingRound""" From aecb1ec0d9cecd3592706f703489d4aff03d5e86 Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Mon, 21 Oct 2024 08:40:54 +0000 Subject: [PATCH 6/7] autonomy packages lock --- packages/packages.json | 8 ++++---- packages/valory/agents/mech/aea-config.yaml | 4 ++-- packages/valory/services/mech/service.yaml | 2 +- packages/valory/skills/mech_abci/skill.yaml | 2 +- packages/valory/skills/task_submission_abci/skill.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index d0a513df..f4821bf6 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -42,13 +42,13 @@ "contract/valory/mech_marketplace/0.1.0": "bafybeich3a3oh5w4u533w6y7ideojudqp2m5gxta7pqmsfiaohdhuw7yz4", "connection/valory/websocket_client/0.1.0": "bafybeic4ag3gqc7kd3k2o3pucddj2odck5yrfbgmwh5veqny7zao5qayli", "skill/valory/contract_subscription/0.1.0": "bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy", - "skill/valory/mech_abci/0.1.0": "bafybeic5cwrefbdsqu4v7n2q4z3yfgosrorxfwsdkzf7k66wjpjv2cwmbm", - "skill/valory/task_submission_abci/0.1.0": "bafybeifrs2ed2jmg3s5qzlvgojexuxzwzhylgum2v2u5vmbol75pgseny4", + "skill/valory/mech_abci/0.1.0": "bafybeifrvixdffqiz4dog6nwvb4o3czcv34iw6lpte7ewzitlo6gu2tp5m", + "skill/valory/task_submission_abci/0.1.0": "bafybeif74odp45ksuuo443usqelusg2kd7gb6p45b4vvwzqnlel7gxj4ee", "skill/valory/task_execution/0.1.0": "bafybeif7jsxbue6l7fhn5ahf7jbks5td6me55b42dy7k6s3j72zvu2p7ie", "skill/valory/websocket_client/0.1.0": "bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m", "skill/valory/subscription_abci/0.1.0": "bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa", - "agent/valory/mech/0.1.0": "bafybeigfsh2rl5jx544en4o5i7oqr6rszxf2l2uh4ktpkkfa4ecb3dhz4m", - "service/valory/mech/0.1.0": "bafybeigjfh2jbyxseqvut5hdc7qcunatlqipdhtjym25xzrksvly33pyfu" + "agent/valory/mech/0.1.0": "bafybeiadlor73zctq6z6sohpoo3dogd3ziwl4s3lhdojrgi6nw7saijr6i", + "service/valory/mech/0.1.0": "bafybeignkn6s77cqyz7za6o22zluovrm6mptwaukvjbi4kn7udy67dkfoq" }, "third_party": { "protocol/valory/default/1.0.0": "bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index 6a41a1aa..c566733e 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -39,12 +39,12 @@ skills: - valory/abstract_abci:0.1.0:bafybeihat4giyc4bz6zopvahcj4iw53356pbtwfn7p4d5yflwly2qhahum - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/contract_subscription:0.1.0:bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy -- valory/mech_abci:0.1.0:bafybeic5cwrefbdsqu4v7n2q4z3yfgosrorxfwsdkzf7k66wjpjv2cwmbm +- valory/mech_abci:0.1.0:bafybeifrvixdffqiz4dog6nwvb4o3czcv34iw6lpte7ewzitlo6gu2tp5m - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/subscription_abci:0.1.0:bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa - valory/task_execution:0.1.0:bafybeif7jsxbue6l7fhn5ahf7jbks5td6me55b42dy7k6s3j72zvu2p7ie -- valory/task_submission_abci:0.1.0:bafybeifrs2ed2jmg3s5qzlvgojexuxzwzhylgum2v2u5vmbol75pgseny4 +- valory/task_submission_abci:0.1.0:bafybeif74odp45ksuuo443usqelusg2kd7gb6p45b4vvwzqnlel7gxj4ee - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/websocket_client:0.1.0:bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index 90c0c6ef..e8ad3592 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeigfsh2rl5jx544en4o5i7oqr6rszxf2l2uh4ktpkkfa4ecb3dhz4m +agent: valory/mech:0.1.0:bafybeiadlor73zctq6z6sohpoo3dogd3ziwl4s3lhdojrgi6nw7saijr6i number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/mech_abci/skill.yaml b/packages/valory/skills/mech_abci/skill.yaml index ffb73476..8c1026c8 100644 --- a/packages/valory/skills/mech_abci/skill.yaml +++ b/packages/valory/skills/mech_abci/skill.yaml @@ -23,7 +23,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam -- valory/task_submission_abci:0.1.0:bafybeifrs2ed2jmg3s5qzlvgojexuxzwzhylgum2v2u5vmbol75pgseny4 +- valory/task_submission_abci:0.1.0:bafybeif74odp45ksuuo443usqelusg2kd7gb6p45b4vvwzqnlel7gxj4ee - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/subscription_abci:0.1.0:bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa diff --git a/packages/valory/skills/task_submission_abci/skill.yaml b/packages/valory/skills/task_submission_abci/skill.yaml index c70423ce..909beb3b 100644 --- a/packages/valory/skills/task_submission_abci/skill.yaml +++ b/packages/valory/skills/task_submission_abci/skill.yaml @@ -14,7 +14,7 @@ fingerprint: handlers.py: bafybeibe5n7my2vd2wlwo73sbma65epjqc7kxgtittewlylcmvnmoxtxzq models.py: bafybeifkca4krpykazv4tar4nfgaefwplpcia34zrdlvkiijf5anrxzcmu payloads.py: bafybeia2yorri2u5rwh6vukb6iwdrbn53ygsuuhthns2txptvjipyb6f4e - rounds.py: bafybeiazzauhh5ddr6fkqckv7tiu7nek6k7deoaihwyspeywlrq46uemou + rounds.py: bafybeicqimk23sc7itxwcu372lyerwnqly4v7tv2pcl4krd53gdizdv6ae tasks.py: bafybeicu5t5cvfhbndgpxbbtmp4vbmtyb6fba6vsnlewftvuderxp5lwcy fingerprint_ignore_patterns: [] connections: [] From 7a7547886571bc9a54bfd099a2b19937cabece79 Mon Sep 17 00:00:00 2001 From: KahanMajmudar Date: Mon, 21 Oct 2024 09:26:26 +0000 Subject: [PATCH 7/7] fix: merge error --- packages/packages.json | 8 ++++---- packages/valory/agents/mech/aea-config.yaml | 4 ++-- packages/valory/services/mech/service.yaml | 2 +- packages/valory/skills/mech_abci/skill.yaml | 2 +- packages/valory/skills/task_submission_abci/skill.yaml | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index f4821bf6..80a28942 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -42,13 +42,13 @@ "contract/valory/mech_marketplace/0.1.0": "bafybeich3a3oh5w4u533w6y7ideojudqp2m5gxta7pqmsfiaohdhuw7yz4", "connection/valory/websocket_client/0.1.0": "bafybeic4ag3gqc7kd3k2o3pucddj2odck5yrfbgmwh5veqny7zao5qayli", "skill/valory/contract_subscription/0.1.0": "bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy", - "skill/valory/mech_abci/0.1.0": "bafybeifrvixdffqiz4dog6nwvb4o3czcv34iw6lpte7ewzitlo6gu2tp5m", - "skill/valory/task_submission_abci/0.1.0": "bafybeif74odp45ksuuo443usqelusg2kd7gb6p45b4vvwzqnlel7gxj4ee", + "skill/valory/mech_abci/0.1.0": "bafybeiajz42vtyvmm3bjmft7d6y3dodped2kh7h75zgqocym76twvpyejq", + "skill/valory/task_submission_abci/0.1.0": "bafybeigoda6koeghcboflmz5e6r7yluk7fanpjso64b4am3w2szo2a65w4", "skill/valory/task_execution/0.1.0": "bafybeif7jsxbue6l7fhn5ahf7jbks5td6me55b42dy7k6s3j72zvu2p7ie", "skill/valory/websocket_client/0.1.0": "bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m", "skill/valory/subscription_abci/0.1.0": "bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa", - "agent/valory/mech/0.1.0": "bafybeiadlor73zctq6z6sohpoo3dogd3ziwl4s3lhdojrgi6nw7saijr6i", - "service/valory/mech/0.1.0": "bafybeignkn6s77cqyz7za6o22zluovrm6mptwaukvjbi4kn7udy67dkfoq" + "agent/valory/mech/0.1.0": "bafybeib4wzpyfopo7curjyp5jvt35clri7mmpzyzbtmv5246bjxrkieelu", + "service/valory/mech/0.1.0": "bafybeic7uew3lt2kiely3a5jvizir5pcbnuuwzr6rmj75yydseiz744wqu" }, "third_party": { "protocol/valory/default/1.0.0": "bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index c566733e..7d5f2b24 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -39,12 +39,12 @@ skills: - valory/abstract_abci:0.1.0:bafybeihat4giyc4bz6zopvahcj4iw53356pbtwfn7p4d5yflwly2qhahum - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/contract_subscription:0.1.0:bafybeiefuemlp75obgpxrp6iuleb3hn6vcviwh5oetk5djbuprf4xsmgjy -- valory/mech_abci:0.1.0:bafybeifrvixdffqiz4dog6nwvb4o3czcv34iw6lpte7ewzitlo6gu2tp5m +- valory/mech_abci:0.1.0:bafybeiajz42vtyvmm3bjmft7d6y3dodped2kh7h75zgqocym76twvpyejq - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/subscription_abci:0.1.0:bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa - valory/task_execution:0.1.0:bafybeif7jsxbue6l7fhn5ahf7jbks5td6me55b42dy7k6s3j72zvu2p7ie -- valory/task_submission_abci:0.1.0:bafybeif74odp45ksuuo443usqelusg2kd7gb6p45b4vvwzqnlel7gxj4ee +- valory/task_submission_abci:0.1.0:bafybeigoda6koeghcboflmz5e6r7yluk7fanpjso64b4am3w2szo2a65w4 - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/websocket_client:0.1.0:bafybeif7rrvsu6z4evqkhblxj3u6wwv2eqou576hgkyoehxuj7cntw7o2m diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index e8ad3592..7ae966e7 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeiadlor73zctq6z6sohpoo3dogd3ziwl4s3lhdojrgi6nw7saijr6i +agent: valory/mech:0.1.0:bafybeib4wzpyfopo7curjyp5jvt35clri7mmpzyzbtmv5246bjxrkieelu number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/mech_abci/skill.yaml b/packages/valory/skills/mech_abci/skill.yaml index 8c1026c8..f4c2dca4 100644 --- a/packages/valory/skills/mech_abci/skill.yaml +++ b/packages/valory/skills/mech_abci/skill.yaml @@ -23,7 +23,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/registration_abci:0.1.0:bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam -- valory/task_submission_abci:0.1.0:bafybeif74odp45ksuuo443usqelusg2kd7gb6p45b4vvwzqnlel7gxj4ee +- valory/task_submission_abci:0.1.0:bafybeigoda6koeghcboflmz5e6r7yluk7fanpjso64b4am3w2szo2a65w4 - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/subscription_abci:0.1.0:bafybeicnum426c4te77enoalhmthqirrhvswvyunvanjbljlhs2cob6zsa diff --git a/packages/valory/skills/task_submission_abci/skill.yaml b/packages/valory/skills/task_submission_abci/skill.yaml index 909beb3b..29a01716 100644 --- a/packages/valory/skills/task_submission_abci/skill.yaml +++ b/packages/valory/skills/task_submission_abci/skill.yaml @@ -25,7 +25,6 @@ contracts: - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y - valory/service_registry:0.1.0:bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm - valory/hash_checkpoint:0.1.0:bafybeicbycr6rxods7sg3f2qlhgkjqrbh7kymmy2yw7bewxdwjyp7ibtg4 -- valory/mech_marketplace:0.1.0:bafybeich3a3oh5w4u533w6y7ideojudqp2m5gxta7pqmsfiaohdhuw7yz4 protocols: - valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq - valory/contract_api:1.0.0:bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i