From 9deaf167b3f9f9fe31470c490996ebb74b783f04 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 28 Nov 2024 13:28:41 +0000 Subject: [PATCH 01/16] add has required funds metric --- .../behaviours/bet_placement.py | 13 +++++++++--- .../behaviours/order_subscription.py | 1 + .../skills/decision_maker_abci/handlers.py | 13 ++++++++++++ .../skills/decision_maker_abci/models.py | 3 +++ .../skills/decision_maker_abci/payloads.py | 8 ++++++++ .../skills/decision_maker_abci/skill.yaml | 1 + .../skills/decision_maker_abci/states/base.py | 5 +++++ .../states/bet_placement.py | 20 +++++++++++++++++++ .../states/order_subscription.py | 3 ++- 9 files changed, 63 insertions(+), 4 deletions(-) diff --git a/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py b/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py index efcd346a0..0f1cdcf46 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py @@ -35,7 +35,10 @@ remove_fraction_wei, ) from packages.valory.skills.decision_maker_abci.models import MultisendBatch -from packages.valory.skills.decision_maker_abci.payloads import MultisigTxPayload +from packages.valory.skills.decision_maker_abci.payloads import ( + BetPlacementPayload, + MultisigTxPayload, +) from packages.valory.skills.decision_maker_abci.states.bet_placement import ( BetPlacementRound, ) @@ -228,8 +231,12 @@ def async_act(self) -> Generator: tx_submitter = self.matching_round.auto_round_id() betting_tx_hex = yield from self._prepare_safe_tx() - payload = MultisigTxPayload( - agent, tx_submitter, betting_tx_hex, mocking_mode + payload = BetPlacementPayload( + agent, + tx_submitter, + betting_tx_hex, + mocking_mode, + wallet_balance=self.wallet_balance, ) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py index 6a5d123c3..531485dde 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -376,5 +376,6 @@ def async_act(self) -> Generator: tx_submitter=SubscriptionRound.auto_round_id(), tx_hash=payload_data, agreement_id=self.agreement_id, + wallet_balance=self.wallet_balance, ) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py index 155a5715e..e98a2ae9c 100644 --- a/packages/valory/skills/decision_maker_abci/handlers.py +++ b/packages/valory/skills/decision_maker_abci/handlers.py @@ -266,9 +266,12 @@ def _handle_get_health( is_transitioning_fast = None current_round = None rounds = None + has_required_funds = None round_sequence = cast(SharedState, self.context.state).round_sequence + has_required_funds = self._check_required_funds() + if round_sequence._last_round_transition_timestamp: is_tm_unhealthy = cast( SharedState, self.context.state @@ -299,6 +302,9 @@ def _handle_get_health( "reset_pause_duration": self.context.params.reset_pause_duration, "rounds": rounds, "is_transitioning_fast": is_transitioning_fast, + "agent_health": { + "has_required_funds": has_required_funds, + }, } self._send_ok_response(http_msg, http_dialogue, data) @@ -337,3 +343,10 @@ def _send_not_found_response( # Send response self.context.logger.info("Responding with: {}".format(http_response)) self.context.outbox.put_message(message=http_response) + + def _check_required_funds(self) -> bool: + """Check the agent has enough funds.""" + return ( + self.synchronized_data.wallet_balance + > self.context.params.agent_balance_threshold + ) diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index 7b6b3a7c0..a06a09b4e 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -416,6 +416,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: self.policy_store_update_offset = self._ensure( "policy_store_update_offset", kwargs, int ) + self.agent_balance_threshold: int = self._ensure( + "agent_balance_threshold", kwargs, int + ) super().__init__(*args, **kwargs) @property diff --git a/packages/valory/skills/decision_maker_abci/payloads.py b/packages/valory/skills/decision_maker_abci/payloads.py index fdfe8d2b5..47062f127 100644 --- a/packages/valory/skills/decision_maker_abci/payloads.py +++ b/packages/valory/skills/decision_maker_abci/payloads.py @@ -77,6 +77,7 @@ class SubscriptionPayload(MultisigTxPayload): """Represents a transaction payload for subscribing.""" agreement_id: str = "" + wallet_balance: Optional[int] = None @dataclass(frozen=True) @@ -108,3 +109,10 @@ class ToolSelectionPayload(BaseTxPayload): policy: Optional[str] utilized_tools: Optional[str] selected_tool: Optional[str] + + +@dataclass(frozen=True) +class BetPlacementPayload(MultisigTxPayload): + """Represents a transaction payload for placing a bet.""" + + wallet_balance: Optional[int] = None diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index e395f6f39..878bb7637 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -314,6 +314,7 @@ models: priority_mech_service_id: 0 requester_staking_instance_address: '0x0000000000000000000000000000000000000000' response_timeout: 300 + agent_balance_threshold: 10000000000000000 class_name: DecisionMakerParams benchmarking_mode: args: diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index 320457259..b2fdcd7e7 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -230,6 +230,11 @@ def mech_responses(self) -> List[MechInteractionResponse]: responses = json.loads(serialized) return [MechInteractionResponse(**response_item) for response_item in responses] + @property + def wallet_balance(self) -> int: + """Get the balance of the wallet.""" + return int(self.db.get_strict("wallet_balance")) + class TxPreparationRound(CollectSameUntilThresholdRound): """A round for preparing a transaction.""" diff --git a/packages/valory/skills/decision_maker_abci/states/bet_placement.py b/packages/valory/skills/decision_maker_abci/states/bet_placement.py index 521333e99..80d565dff 100644 --- a/packages/valory/skills/decision_maker_abci/states/bet_placement.py +++ b/packages/valory/skills/decision_maker_abci/states/bet_placement.py @@ -18,7 +18,14 @@ # ------------------------------------------------------------------------------ """This module contains the sampling state of the decision-making abci app.""" +from enum import Enum +from typing import Optional, Tuple, Type +from packages.valory.skills.abstract_round_abci.base import BaseSynchronizedData +from packages.valory.skills.decision_maker_abci.payloads import ( + BetPlacementPayload, + MultisigTxPayload, +) from packages.valory.skills.decision_maker_abci.states.base import ( Event, TxPreparationRound, @@ -28,4 +35,17 @@ class BetPlacementRound(TxPreparationRound): """A round for placing a bet.""" + payload_class: Type[MultisigTxPayload] = BetPlacementPayload + none_event = Event.INSUFFICIENT_BALANCE + + def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: + """Process the end of the block.""" + update = super().end_block() + if update is None: + return None + + sync_data, event = update + wallet_balance = self.most_voted_payload_values[4] + sync_data = sync_data.update(wallet_balance=wallet_balance) + return sync_data, event diff --git a/packages/valory/skills/decision_maker_abci/states/order_subscription.py b/packages/valory/skills/decision_maker_abci/states/order_subscription.py index d4b80aa11..5c5831bd7 100644 --- a/packages/valory/skills/decision_maker_abci/states/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/states/order_subscription.py @@ -68,7 +68,8 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: sync_data, event = update agreement_id = self.most_voted_payload_values[3] + wallet_balance = self.most_voted_payload_values[4] sync_data = sync_data.update( - agreement_id=agreement_id, + agreement_id=agreement_id, wallet_balance=wallet_balance ) return sync_data, event From 8f76d584027e36926e23cd219c6329a625884230 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 28 Nov 2024 14:21:18 +0000 Subject: [PATCH 02/16] chore: generators --- packages/packages.json | 12 +++--- packages/valory/agents/trader/aea-config.yaml | 8 ++-- packages/valory/services/trader/service.yaml | 4 +- .../valory/services/trader_pearl/service.yaml | 2 +- .../skills/decision_maker_abci/skill.yaml | 38 +++++++++---------- .../states/bet_placement.py | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +-- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 35 insertions(+), 39 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index f29e6b605..3d40b554e 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiffnd7vlryxtfenwcbbvx7qzszkko4oop2n2e6jg2ahdm3zholxsq", - "skill/valory/trader_abci/0.1.0": "bafybeigygq76epkhl67uuvrjlrall65r4ilcwna2jokgjunrzg45gf2ihy", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeie4rfme364fp2m3oo447622mc75tfk4hqftiebau2tpycftd5iffe", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4", + "skill/valory/trader_abci/0.1.0": "bafybeicaeqnd6v47f7zpprojld5koerkpvnkmwyocxg47gj6bhvl5xf2iu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigfrd7mf3my7suk3qunjqkzcwzw6snkmivna3yvnel7gp6tecttfy", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeibhv5pummw2ngrag6sk6a7phnffp2dfsswhvtxayzizqthea52kru", - "service/valory/trader/0.1.0": "bafybeiey356lnc35rxky3gvikcpcwerdjycyb6nmrw4qlpucar3ykd2jmm", - "service/valory/trader_pearl/0.1.0": "bafybeiezfz7h5g26qimscimnawyeeo3qwgm6smszc7jgwrxest7bgqoq5q" + "agent/valory/trader/0.1.0": "bafybeidtrbpp2o4yyibrbp6dziirf4xtabup3znuiwfsimzn5wkmpij3tm", + "service/valory/trader/0.1.0": "bafybeidy4aod56as547mfnxgvon2ukzmn5mfh6vunwgkkjohm6gm4so7zu", + "service/valory/trader_pearl/0.1.0": "bafybeibiz7yjsoss4ocmfn5x4hy4q4kvig632qfgo7yztd4mtwxu235zrm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 439aa089e..352380ade 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeie4rfme364fp2m3oo447622mc75tfk4hqftiebau2tpycftd5iffe +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfrd7mf3my7suk3qunjqkzcwzw6snkmivna3yvnel7gp6tecttfy - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiffnd7vlryxtfenwcbbvx7qzszkko4oop2n2e6jg2ahdm3zholxsq -- valory/trader_abci:0.1.0:bafybeigygq76epkhl67uuvrjlrall65r4ilcwna2jokgjunrzg45gf2ihy +- valory/decision_maker_abci:0.1.0:bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4 +- valory/trader_abci:0.1.0:bafybeicaeqnd6v47f7zpprojld5koerkpvnkmwyocxg47gj6bhvl5xf2iu - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm @@ -252,8 +252,6 @@ models: collateral_balance: ${int:10000000000000000000} mech_cost: ${int:10000000000000000} pool_fee: ${int:20000000000000000} - outcome_token_amounts: ${list:[11000000000000000000,9000000000000000000]} - outcome_token_marginal_prices: ${list:[0.4,0.6]} sep: ${str:,} dataset_filename: ${str:benchmark_data.csv} question_field: ${str:question} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 17f90c3ea..365affd20 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibhv5pummw2ngrag6sk6a7phnffp2dfsswhvtxayzizqthea52kru +agent: valory/trader:0.1.0:bafybeidtrbpp2o4yyibrbp6dziirf4xtabup3znuiwfsimzn5wkmpij3tm number_of_agents: 4 deployment: agent: @@ -155,8 +155,6 @@ type: skill collateral_balance: ${BENCHMARKING_MODE_COLLATERAL_BALANCE:int:10000000000000000000} mech_cost: ${BENCHMARKING_MODE_MECH_COST:int:10000000000000000} pool_fee: ${BENCHMARKING_MODE_POOL_FEE:int:20000000000000000} - outcome_token_amounts: ${OUTCOME_TOKEN_AMOUNTS:list:[11000000000000000000,9000000000000000000]} - outcome_token_marginal_prices: ${OUTCOME_TOKEN_MARGINAL_PRICES:list:[0.55,0.45]} sep: ${BENCHMARKING_MODE_SEP:str:,} dataset_filename: ${BENCHMARKING_MODE_DATASET_FILENAME:str:benchmark_data.csv} question_field: ${BENCHMARKING_MODE_QUESTION_FIELD:str:question} diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 21c758135..1502e291f 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibhv5pummw2ngrag6sk6a7phnffp2dfsswhvtxayzizqthea52kru +agent: valory/trader:0.1.0:bafybeidtrbpp2o4yyibrbp6dziirf4xtabup3znuiwfsimzn5wkmpij3tm number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 878bb7637..265dc41f6 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,45 +12,45 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeidjmsljdaw7y5chzzkub63mzf5ydpauch5ugojds5jwpeyvovkq3y - behaviours/bet_placement.py: bafybeihmia64t2payxfqcnfdqg675ui2yp3hnyfwb2xhj2hn7wl237b4re - behaviours/blacklisting.py: bafybeicqwj7o4l7qcym5xjqwq45jngqkhyf44mn6qise2ysyfnlnwz7pdy + behaviours/base.py: bafybeifjgxzhwzxiky3okgtv4ojumm7fj7bom6qe3ysdvs3cpu32w446g4 + behaviours/bet_placement.py: bafybeibkssszgm5e5sjiugjhfnzikj53kx2jrm5p6nkymj3j4mcx35ebsq + behaviours/blacklisting.py: bafybeifitqx2omj5qdwokizhqjkxvybtsyxo22dxkucbtxaocafzgbseku behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e - behaviours/decision_receive.py: bafybeifb7aeu6g4xzmiyfc5ltipigsikfot3foux55gw5oaz2o5u5a4ume - behaviours/decision_request.py: bafybeiabjzzcwcfbfmtoftjhewmkgbhxfnigbc5cwmmxl6cob5gv64jwwa + behaviours/decision_receive.py: bafybeiga2eddrkbwnqcvzonbens4kj3i3fvfkdngoml5neoob23jgxtcpy + behaviours/decision_request.py: bafybeia22omb7tvocyfe3z2ucn5au5mcas7dg37ha42u7znefzrewjpk7y behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeicrmdvhci5prfldvuf3bclbbqi6j7lpv6hmphw3qwgmkmwat3od44 + behaviours/order_subscription.py: bafybeib3maqohhx35wzryy4otdcjp5thkr4sbp27ksvwidy3pwm444itra behaviours/randomness.py: bafybeiaoj3awyyg2onhpsdsn3dyczs23gr4smuzqcbw3e5ocljwxswjkce behaviours/reedem.py: bafybeiaxwp4lx62owcaqfp6xcqh6567f5yvwnl4rage2f5hmq4nltkzjjy behaviours/round_behaviour.py: bafybeih63hpia2bwwzu563hxs5yd3t5ycvxvkfnhvxbzghbyy3mw3xjl3i - behaviours/sampling.py: bafybeie6ab5pdwal5glhg75am2637lijz5kwqx4ctk2lgqjyllmnw335ca + behaviours/sampling.py: bafybeidrcyeecrh2wzw3n56iwyon56rommc7nyjnlcdzhldpvoh25sfeoe behaviours/storage_manager.py: bafybeiez6daaj2bufxdcsghtmqybyrzdh74z26cc4ajsqsiy5krgjo2tla behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm - fsm_specification.yaml: bafybeiabt2fonv63hozgr7bt4d5auom76iufzh6etpnmbwekktckz7644a - handlers.py: bafybeigod6gbjrxy4mbmulbzsbokeaoycoqys64vqtxnumishfukzf73za + fsm_specification.yaml: bafybeiaokkmrfs5dewl5vmfeqwfqrwgzjhjml4t5o6krdellcqprrdxyqq + handlers.py: bafybeifyljdellczdghalgm562iuiqmuh57hhp45rz4z4ufzsiizm5raly io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeifhmwxoix5fqka4phtmv6324osei52zwirg3ogziondvlq33brnby - payloads.py: bafybeicloiy4ax7dlipwp4czlueflgjgtlev4a6vhn2m7ztoehnemiiko4 + models.py: bafybeiff5nwcobgdqfifub4qttsxudhkybpbpykfecom4xfpven5y5fy5u + payloads.py: bafybeid2uzjhqilqog3nzsgygpw3e7jhhdal2otnvxb2d6kck6xa3ra4wi policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeihczrvkid4lqoai7myqqs4f3g5diqsnjotxtqhxhm5c7oowzifbqy + rounds.py: bafybeidky5eoxti37j3j6ue3uyna6ibljskzzfadhehyj6jqry2lwoi7ou states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeicrzw6p4dq52adkdjlduplt3expzajqmd3nkcpsw5yalfc3dwv75q - states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda + states/base.py: bafybeicocysx4kvngrw2f6hr3g2l7jbx6egqqx5srzlcr2qad6jqpm7nu4 + states/bet_placement.py: bafybeicqoxrodifowl4wkwsymuw2wpyurcmb5qrjt53vhr2ciw77tpouve states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeicr7bxjbgzo4thqlsczsyebabhplfztkd3c3og3wm6cxhv56pad5q + states/decision_receive.py: bafybeifalcb4oxenrz63at3c267eqvo2ntfwsc6lur2jgm2damc7foegoa states/decision_request.py: bafybeiarv3r5j7cfvxmudki2llbdl2pvf24p5mvsva6bdgrylnwdyag5xy states/final_states.py: bafybeicjrrojo3gmfaxzicwloyorlnqgzl6a2avevo4nvhoh424zwzmbti states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm - states/order_subscription.py: bafybeidrcef2op3nhq4tjgri3ct5hfhmc22xw2ep6dk4ro6tg7ob6cmioa + states/order_subscription.py: bafybeihl3pwrbccaitiukbigygd5u3weyih34pvzql3c6n5k7gjj47f2be states/randomness.py: bafybeiceoo4nx3t4dofpwczw3v5mclramwmzpwjs6hv7l56arodrjx4l5u states/redeem.py: bafybeica6cn4xg7shea2wjhbqnddgxe5zao2hkmceltze7qknxdhtsoaxe - states/sampling.py: bafybeihriyyskmlupjiwytx2pdpftms7plkjku5bip64c3ztx7oi3n43ci + states/sampling.py: bafybeihnziujwxmxl623id7zrkaefzs3tvb2vdxjujcyyn3gcun3k2gcdu states/tool_selection.py: bafybeiak5ihuie4nxh3sguiea6pcdgyxr4k4xyzvq6o2uj5xpf7urocawy tests/__init__.py: bafybeiakpi3k3kc7wrjj7hrluvjcj36lu2gezpmrctwiz5yg2fe7ggnf3i tests/behaviours/__init__.py: bafybeic7icz7lfhfepdkqkase7y7zn3a6pwdw6fx4ah2hajmgejawpolc4 @@ -71,11 +71,11 @@ fingerprint: tests/states/test_order_subscription.py: bafybeiag37uk5mitjm4yadcpr67icfmmzeucdlgvqoct4y4jeyhnebyyoi tests/states/test_randomness.py: bafybeib3eqjv6mhlprzda7d4viddn5alrfqteq6juyg3ccejseoywcsbey tests/states/test_redeem.py: bafybeiezdnfrxukb2xpwffrr357g2anmdkwy7wo3nphvlggipq5xrdzr7a - tests/states/test_sampling.py: bafybeibyglipxdl6f25qfxf36v2n3kckrpmwyuqcenfeqzhjujpwon6o2u + tests/states/test_sampling.py: bafybeifvbzikke6wtex2p5j7fsnpdbj4qqxl5vh2lm2m2apgvuqdonoyzm tests/states/test_tool_selection.py: bafybeib7js3dj7647t33o5ybfqftwytxktwrvhbri5yuyymg6znj6y7xxa tests/test_dialogues.py: bafybeibulo64tgfrq4e5qbcqnmifrlehkqciwuavublints353zaj2mlpa tests/test_handlers.py: bafybeihpkgtjjm3uegpup6zkznpoaxqpu6kmp3ujiggrzbe73p5fzlq7im - tests/test_payloads.py: bafybeifc2os3orozmsxbrcfp4c4vrweojo6g4ebxinr5ilescraw6qm6sa + tests/test_payloads.py: bafybeicqrk7f4gpn3snddjpebwgnzbj3uu4rl3pni2tuihc3db2y2jgfam tests/test_rounds.py: bafybeigifftusd4ew42tyvyrr55o2uehhcik2gdq3atkpjwwlqdeskedty utils/__init__.py: bafybeiazrfg3kwfdl5q45azwz6b6mobqxngxpf4hazmrnkhinpk4qhbbf4 utils/nevermined.py: bafybeigallaqxhqopznhjhefr6bukh4ojkz5vdtqyzod5dksshrf24fjgi diff --git a/packages/valory/skills/decision_maker_abci/states/bet_placement.py b/packages/valory/skills/decision_maker_abci/states/bet_placement.py index 80d565dff..91c810ff6 100644 --- a/packages/valory/skills/decision_maker_abci/states/bet_placement.py +++ b/packages/valory/skills/decision_maker_abci/states/bet_placement.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023 Valory AG +# Copyright 2024 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 73b509fc0..cfe70826f 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -11,7 +11,7 @@ fingerprint: behaviours.py: bafybeigc6hszbu66ccajny5eh7thfgsrlr36je4mzziwp4mupgvtaeu6aa composition.py: bafybeifxerfvssuhodqmtvkz6umlmrmdqjv5ptpszhnwlavzxaavdpdyly dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm - fsm_specification.yaml: bafybeibgm4crhqny63ax36447cglnycvlwnwuwse62bob64zbya4vjfgnm + fsm_specification.yaml: bafybeicbwdpl7w65yljzuyvx4y5kaoon5cqsiskxtg5r25mc5r7ggqnqyi handlers.py: bafybeibbxybbi66em63ad33cllymypr3za3f5xvor3m2krhuxoyxnqjnxu models.py: bafybeih2vkf4ln7n7ar27iemho7w7sdr4clmhbnhbcznmsri6mc2skkky4 tests/__init__.py: bafybeiadatapyjh3e7ucg2ehz77oms3ihrbutwb2cs2tkjehy54utwvuyi @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiffnd7vlryxtfenwcbbvx7qzszkko4oop2n2e6jg2ahdm3zholxsq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeie4rfme364fp2m3oo447622mc75tfk4hqftiebau2tpycftd5iffe +- valory/decision_maker_abci:0.1.0:bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfrd7mf3my7suk3qunjqkzcwzw6snkmivna3yvnel7gp6tecttfy - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index e69087ff1..025d49416 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeiffnd7vlryxtfenwcbbvx7qzszkko4oop2n2e6jg2ahdm3zholxsq +- valory/decision_maker_abci:0.1.0:bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From e5053c14f847e71becfc67335f9eb7cf5fa19fcf Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 28 Nov 2024 15:19:09 +0000 Subject: [PATCH 03/16] fix: remove agent_balance_threshold from decision maker params --- packages/valory/skills/decision_maker_abci/models.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index a06a09b4e..7b6b3a7c0 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -416,9 +416,6 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: self.policy_store_update_offset = self._ensure( "policy_store_update_offset", kwargs, int ) - self.agent_balance_threshold: int = self._ensure( - "agent_balance_threshold", kwargs, int - ) super().__init__(*args, **kwargs) @property From ee5e269a379799d12cbe95d04ce2e9c2d91b0a77 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Thu, 28 Nov 2024 15:19:20 +0000 Subject: [PATCH 04/16] chore: generators --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/services/trader_pearl/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 6 +++--- .../valory/skills/decision_maker_abci/states/base.py | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 3d40b554e..ff8a47b2c 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4", - "skill/valory/trader_abci/0.1.0": "bafybeicaeqnd6v47f7zpprojld5koerkpvnkmwyocxg47gj6bhvl5xf2iu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigfrd7mf3my7suk3qunjqkzcwzw6snkmivna3yvnel7gp6tecttfy", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom", + "skill/valory/trader_abci/0.1.0": "bafybeigenchxftajjwi2chvhq5ko2g4ehshugbo5zlloh5wt53pbx7y2tu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifxhahaxskqtz5xqsx3p3yn7c2arnvbk46we2eakpku3kzji763uy", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeidtrbpp2o4yyibrbp6dziirf4xtabup3znuiwfsimzn5wkmpij3tm", - "service/valory/trader/0.1.0": "bafybeidy4aod56as547mfnxgvon2ukzmn5mfh6vunwgkkjohm6gm4so7zu", - "service/valory/trader_pearl/0.1.0": "bafybeibiz7yjsoss4ocmfn5x4hy4q4kvig632qfgo7yztd4mtwxu235zrm" + "agent/valory/trader/0.1.0": "bafybeicbwhwypth5s3karnjerjtzsjfrqusaulufavfebei7zwo3gdqtle", + "service/valory/trader/0.1.0": "bafybeifjrcn6fo4gvtbpq43ilsf4iavn5om7hrh7xjvnsi23eei4bubqmq", + "service/valory/trader_pearl/0.1.0": "bafybeicy7qa57tpq7ebqsoqiykrw4qlzv24n7cbknunpvwatcdq6ty7wiq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 352380ade..4eb6284f7 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfrd7mf3my7suk3qunjqkzcwzw6snkmivna3yvnel7gp6tecttfy +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifxhahaxskqtz5xqsx3p3yn7c2arnvbk46we2eakpku3kzji763uy - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4 -- valory/trader_abci:0.1.0:bafybeicaeqnd6v47f7zpprojld5koerkpvnkmwyocxg47gj6bhvl5xf2iu +- valory/decision_maker_abci:0.1.0:bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom +- valory/trader_abci:0.1.0:bafybeigenchxftajjwi2chvhq5ko2g4ehshugbo5zlloh5wt53pbx7y2tu - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 365affd20..6d2ce6b4c 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeidtrbpp2o4yyibrbp6dziirf4xtabup3znuiwfsimzn5wkmpij3tm +agent: valory/trader:0.1.0:bafybeicbwhwypth5s3karnjerjtzsjfrqusaulufavfebei7zwo3gdqtle number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 1502e291f..cbf810777 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeidtrbpp2o4yyibrbp6dziirf4xtabup3znuiwfsimzn5wkmpij3tm +agent: valory/trader:0.1.0:bafybeicbwhwypth5s3karnjerjtzsjfrqusaulufavfebei7zwo3gdqtle number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 265dc41f6..eb9e9068d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -32,14 +32,14 @@ fingerprint: handlers.py: bafybeifyljdellczdghalgm562iuiqmuh57hhp45rz4z4ufzsiizm5raly io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeiff5nwcobgdqfifub4qttsxudhkybpbpykfecom4xfpven5y5fy5u + models.py: bafybeieqknkktfrs5e4maq4cosevabkbneszw4dp44sz7mavr4hpdy6yem payloads.py: bafybeid2uzjhqilqog3nzsgygpw3e7jhhdal2otnvxb2d6kck6xa3ra4wi policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm rounds.py: bafybeidky5eoxti37j3j6ue3uyna6ibljskzzfadhehyj6jqry2lwoi7ou states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeicocysx4kvngrw2f6hr3g2l7jbx6egqqx5srzlcr2qad6jqpm7nu4 - states/bet_placement.py: bafybeicqoxrodifowl4wkwsymuw2wpyurcmb5qrjt53vhr2ciw77tpouve + states/base.py: bafybeiazvwqptove4xl4bnqfccnqu3franliifbsv747o7mclssusgj74y + states/bet_placement.py: bafybeieq3bi2m4m5vclg4nmczqi62hlfp7ftixpamao22wuh4ulx4emlai states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index b2fdcd7e7..c6fe8ee9e 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -233,7 +233,7 @@ def mech_responses(self) -> List[MechInteractionResponse]: @property def wallet_balance(self) -> int: """Get the balance of the wallet.""" - return int(self.db.get_strict("wallet_balance")) + return int(self.db.get("wallet_balance", 0)) class TxPreparationRound(CollectSameUntilThresholdRound): diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index cfe70826f..3a0e37593 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigfrd7mf3my7suk3qunjqkzcwzw6snkmivna3yvnel7gp6tecttfy +- valory/decision_maker_abci:0.1.0:bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifxhahaxskqtz5xqsx3p3yn7c2arnvbk46we2eakpku3kzji763uy - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 025d49416..9d664d229 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeiaurag756syc7vclk5vjyozo3iehenn3gthx6rmhghfrabkmv25w4 +- valory/decision_maker_abci:0.1.0:bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From 8f480dad0f42db81dadfeaeb88d98d9e04693761 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 10:51:30 +0000 Subject: [PATCH 05/16] feat: add changes for healthcheck endpoint --- .../skills/check_stop_trading_abci/rounds.py | 17 ++++++++++++++++- .../behaviours/decision_receive.py | 1 + .../skills/decision_maker_abci/handlers.py | 19 ++++++++++++++++--- .../skills/decision_maker_abci/payloads.py | 1 + .../skills/decision_maker_abci/states/base.py | 16 ++++++++++++++++ .../states/decision_receive.py | 5 +++++ 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/packages/valory/skills/check_stop_trading_abci/rounds.py b/packages/valory/skills/check_stop_trading_abci/rounds.py index 5086fae3b..3b0c56939 100644 --- a/packages/valory/skills/check_stop_trading_abci/rounds.py +++ b/packages/valory/skills/check_stop_trading_abci/rounds.py @@ -21,7 +21,7 @@ from abc import ABC from enum import Enum -from typing import Dict, Set, Type +from typing import Dict, Optional, Set, Tuple, Type from packages.valory.skills.abstract_round_abci.base import ( AbciApp, @@ -61,6 +61,10 @@ def _get_deserialized(self, key: str) -> DeserializedCollection: serialized = self.db.get_strict(key) return CollectionRound.deserialize_collection(serialized) + def is_staking_kpi_met(self) -> bool: + """Get the status of the staking kpi.""" + return bool(self.db.get("is_staking_kpi_met", False)) + class CheckStopTradingRound(VotingRound): """A round for checking stop trading conditions.""" @@ -73,6 +77,17 @@ class CheckStopTradingRound(VotingRound): no_majority_event = Event.NO_MAJORITY collection_key = get_name(SynchronizedData.participant_to_votes) + def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: + """Process the end of the block.""" + res = super().end_block() + + sync_data, event = res + + is_staking_kpi_met = self.positive_vote_threshold_reached + sync_data = self.synchronized_data.update(is_staking_kpi_met=is_staking_kpi_met) + + return sync_data, event + class FinishedCheckStopTradingRound(DegenerateRound, ABC): """A round that represents check stop trading has finished.""" diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index 4c0636dc7..13eaa76c0 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -516,6 +516,7 @@ def async_act(self) -> Generator: prediction_response.confidence if prediction_response else None, bet_amount, next_mock_data_row, + self.synced_timestamp, ) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py index e98a2ae9c..7c42404b7 100644 --- a/packages/valory/skills/decision_maker_abci/handlers.py +++ b/packages/valory/skills/decision_maker_abci/handlers.py @@ -266,12 +266,13 @@ def _handle_get_health( is_transitioning_fast = None current_round = None rounds = None - has_required_funds = None + has_required_funds = self._check_required_funds() + is_receiving_mech_responses = self._check_is_receiving_mech_responses() + is_staking_kpi_met = self.synchronized_data.is_staking_kpi_met + is_staked = self.synchronized_data.service_staking_state round_sequence = cast(SharedState, self.context.state).round_sequence - has_required_funds = self._check_required_funds() - if round_sequence._last_round_transition_timestamp: is_tm_unhealthy = cast( SharedState, self.context.state @@ -303,7 +304,10 @@ def _handle_get_health( "rounds": rounds, "is_transitioning_fast": is_transitioning_fast, "agent_health": { + "is_making_on_chain_transactions": is_receiving_mech_responses, + "is_staking_kpi_met": is_staking_kpi_met, "has_required_funds": has_required_funds, + "is_staked": is_staked, }, } @@ -350,3 +354,12 @@ def _check_required_funds(self) -> bool: self.synchronized_data.wallet_balance > self.context.params.agent_balance_threshold ) + + def _check_is_receiving_mech_responses(self) -> bool: + """Check the agent is making on chain transactions.""" + # Checks the most recent decision receive timestamp, which can only be returned after making a mech call + # (an on chain transaction) + return ( + self.synchronized_data.decision_receive_timestamp + < 2 * self.context.params.reset_pause_duration + ) diff --git a/packages/valory/skills/decision_maker_abci/payloads.py b/packages/valory/skills/decision_maker_abci/payloads.py index 47062f127..4b0eda03f 100644 --- a/packages/valory/skills/decision_maker_abci/payloads.py +++ b/packages/valory/skills/decision_maker_abci/payloads.py @@ -35,6 +35,7 @@ class DecisionReceivePayload(UpdateBetsPayload): confidence: Optional[float] bet_amount: Optional[int] next_mock_data_row: Optional[int] + decision_received_timestamp: Optional[int] @dataclass(frozen=True) diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index c6fe8ee9e..0b360d1c9 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -38,6 +38,7 @@ MechInteractionResponse, MechMetadata, ) +from packages.valory.skills.staking_abci.rounds import StakingState from packages.valory.skills.transaction_settlement_abci.rounds import ( SynchronizedData as TxSettlementSyncedData, ) @@ -235,6 +236,21 @@ def wallet_balance(self) -> int: """Get the balance of the wallet.""" return int(self.db.get("wallet_balance", 0)) + @property + def decision_receive_timestamp(self) -> int: + """Get the timestamp of the mech decision.""" + return int(self.db.get("decision_receive_timestamp", 0)) + + @property + def is_staking_kpi_met(self) -> bool: + """Get the status of the staking kpi.""" + return bool(self.db.get("is_staking_kpi_met", False)) + + @property + def service_staking_state(self) -> StakingState: + """Get the service's staking state.""" + return StakingState(self.db.get("service_staking_state", 0)) + class TxPreparationRound(CollectSameUntilThresholdRound): """A round for preparing a transaction.""" diff --git a/packages/valory/skills/decision_maker_abci/states/decision_receive.py b/packages/valory/skills/decision_maker_abci/states/decision_receive.py index c5a17ecda..6f764b62a 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_receive.py @@ -59,6 +59,11 @@ def end_block(self) -> Optional[Tuple[SynchronizedData, Enum]]: return None synced_data, event = cast(Tuple[SynchronizedData, Enum], res) + decision_receive_timestamp = self.most_voted_payload_values[7] + + synced_data = synced_data.update( + decision_receive_timestamp=decision_receive_timestamp + ) if event == Event.DONE and synced_data.vote is None: return synced_data, Event.TIE From fea9c7f4c20531e7263b5ca9105a8bca043044a1 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 11:31:20 +0000 Subject: [PATCH 06/16] feat: changes after code check --- .../valory/skills/check_stop_trading_abci/rounds.py | 3 +++ .../valory/skills/decision_maker_abci/states/base.py | 10 ++++++++-- .../decision_maker_abci/states/decision_receive.py | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/valory/skills/check_stop_trading_abci/rounds.py b/packages/valory/skills/check_stop_trading_abci/rounds.py index 3b0c56939..17be48154 100644 --- a/packages/valory/skills/check_stop_trading_abci/rounds.py +++ b/packages/valory/skills/check_stop_trading_abci/rounds.py @@ -81,6 +81,9 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: """Process the end of the block.""" res = super().end_block() + if res is None: + return None + sync_data, event = res is_staking_kpi_met = self.positive_vote_threshold_reached diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index 0b360d1c9..7f0c221a4 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -234,12 +234,18 @@ def mech_responses(self) -> List[MechInteractionResponse]: @property def wallet_balance(self) -> int: """Get the balance of the wallet.""" - return int(self.db.get("wallet_balance", 0)) + wallet_balance = self.db.get("wallet_balance", 0) + if wallet_balance is None: + return 0 + return int(wallet_balance) @property def decision_receive_timestamp(self) -> int: """Get the timestamp of the mech decision.""" - return int(self.db.get("decision_receive_timestamp", 0)) + decision_receive_timestamp = self.db.get("decision_receive_timestamp", 0) + if decision_receive_timestamp is None: + return 0 + return int(decision_receive_timestamp) @property def is_staking_kpi_met(self) -> bool: diff --git a/packages/valory/skills/decision_maker_abci/states/decision_receive.py b/packages/valory/skills/decision_maker_abci/states/decision_receive.py index 6f764b62a..b37d0cb1d 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_receive.py @@ -61,9 +61,9 @@ def end_block(self) -> Optional[Tuple[SynchronizedData, Enum]]: synced_data, event = cast(Tuple[SynchronizedData, Enum], res) decision_receive_timestamp = self.most_voted_payload_values[7] - synced_data = synced_data.update( + synced_data = cast(SynchronizedData, synced_data.update( decision_receive_timestamp=decision_receive_timestamp - ) + )) if event == Event.DONE and synced_data.vote is None: return synced_data, Event.TIE From 08ad92d8bb6ec48abaf0ce9aeb4aff23ef3f3802 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 11:45:39 +0000 Subject: [PATCH 07/16] chore:generators --- packages/packages.json | 14 ++++----- packages/valory/agents/trader/aea-config.yaml | 8 ++--- packages/valory/services/trader/service.yaml | 2 +- .../valory/services/trader_pearl/service.yaml | 2 +- .../skills/check_stop_trading_abci/skill.yaml | 2 +- .../skills/decision_maker_abci/skill.yaml | 30 +++++++++---------- packages/valory/skills/trader_abci/skill.yaml | 8 ++--- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index ff8a47b2c..b52573d8f 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom", - "skill/valory/trader_abci/0.1.0": "bafybeigenchxftajjwi2chvhq5ko2g4ehshugbo5zlloh5wt53pbx7y2tu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifxhahaxskqtz5xqsx3p3yn7c2arnvbk46we2eakpku3kzji763uy", + "skill/valory/decision_maker_abci/0.1.0": "bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm", + "skill/valory/trader_abci/0.1.0": "bafybeiejwrkjs4reutvee3hyw3ffqhrbzo6uv7mhbkgsa54tkpce7dwf6m", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidjbujyhajhc4zhqavdorodqklk2m7cxmewzudg3j32zszqtw32iu", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", - "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeicbwhwypth5s3karnjerjtzsjfrqusaulufavfebei7zwo3gdqtle", - "service/valory/trader/0.1.0": "bafybeifjrcn6fo4gvtbpq43ilsf4iavn5om7hrh7xjvnsi23eei4bubqmq", - "service/valory/trader_pearl/0.1.0": "bafybeicy7qa57tpq7ebqsoqiykrw4qlzv24n7cbknunpvwatcdq6ty7wiq" + "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm", + "agent/valory/trader/0.1.0": "bafybeieo63xyqjen5llyb4wqzierraz3d2uod5myzb5a5u5zyfq4ddazke", + "service/valory/trader/0.1.0": "bafybeify64n6euvtil7gg74xeo6sa2xyzxl577klkk4oupq5bgpmvbtcf4", + "service/valory/trader_pearl/0.1.0": "bafybeidqklh4ionz3pcjuu7qnbguz4egzllsdnapnnyaansbl2zlucqxra" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 4eb6284f7..ef1dded15 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,12 +45,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifxhahaxskqtz5xqsx3p3yn7c2arnvbk46we2eakpku3kzji763uy +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidjbujyhajhc4zhqavdorodqklk2m7cxmewzudg3j32zszqtw32iu - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom -- valory/trader_abci:0.1.0:bafybeigenchxftajjwi2chvhq5ko2g4ehshugbo5zlloh5wt53pbx7y2tu +- valory/decision_maker_abci:0.1.0:bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm +- valory/trader_abci:0.1.0:bafybeiejwrkjs4reutvee3hyw3ffqhrbzo6uv7mhbkgsa54tkpce7dwf6m - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne -- valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini +- valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 6d2ce6b4c..710b7add0 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeicbwhwypth5s3karnjerjtzsjfrqusaulufavfebei7zwo3gdqtle +agent: valory/trader:0.1.0:bafybeieo63xyqjen5llyb4wqzierraz3d2uod5myzb5a5u5zyfq4ddazke number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index cbf810777..80dec4b33 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeicbwhwypth5s3karnjerjtzsjfrqusaulufavfebei7zwo3gdqtle +agent: valory/trader:0.1.0:bafybeieo63xyqjen5llyb4wqzierraz3d2uod5myzb5a5u5zyfq4ddazke number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/check_stop_trading_abci/skill.yaml b/packages/valory/skills/check_stop_trading_abci/skill.yaml index efa30ee22..c20f983a3 100644 --- a/packages/valory/skills/check_stop_trading_abci/skill.yaml +++ b/packages/valory/skills/check_stop_trading_abci/skill.yaml @@ -14,7 +14,7 @@ fingerprint: handlers.py: bafybeiard64fwxib3rtyp67ymhf222uongcyqhfhdyttpsyqkmyh5ajipu models.py: bafybeigwdhgianx5rizlb7ebmm6pdtkixh4uehbvu5c24ysvyvojs74dfq payloads.py: bafybeidh5bqywun4chrbsci2xbcrnnzuys5sswxwbxq3yl2ksawi3xsi5q - rounds.py: bafybeigqkzikghmzjj2ceqrnvmiiagtris3livgvn6r5z5ossk73xcfqfy + rounds.py: bafybeid2nu2uv2aa4mhmxde2ar3q35ziartegngqzymp3gmpmjqnseztd4 tests/__init__.py: bafybeihv2cjk4va5bc5ncqtppqg2xmmxcro34bma36trtvk32gtmhdycxu tests/test_dialogues.py: bafybeia5ac27w7ijx2nyx5dqyrnv4troo4572gjq7nrcxdncexoxucnqti tests/test_handlers.py: bafybeigpmtx2hyunzn6nxk2x4bvvybek7jvuhbk34fqlj7fgfsszcoqhxy diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index eb9e9068d..293e9b493 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,45 +12,45 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeifjgxzhwzxiky3okgtv4ojumm7fj7bom6qe3ysdvs3cpu32w446g4 + behaviours/base.py: bafybeidjmsljdaw7y5chzzkub63mzf5ydpauch5ugojds5jwpeyvovkq3y behaviours/bet_placement.py: bafybeibkssszgm5e5sjiugjhfnzikj53kx2jrm5p6nkymj3j4mcx35ebsq - behaviours/blacklisting.py: bafybeifitqx2omj5qdwokizhqjkxvybtsyxo22dxkucbtxaocafzgbseku + behaviours/blacklisting.py: bafybeicqwj7o4l7qcym5xjqwq45jngqkhyf44mn6qise2ysyfnlnwz7pdy behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e - behaviours/decision_receive.py: bafybeiga2eddrkbwnqcvzonbens4kj3i3fvfkdngoml5neoob23jgxtcpy - behaviours/decision_request.py: bafybeia22omb7tvocyfe3z2ucn5au5mcas7dg37ha42u7znefzrewjpk7y + behaviours/decision_receive.py: bafybeiei3nvzmkr5trx5lubnxh6pyiojd252cw6syuanfif6sqfdgm5kza + behaviours/decision_request.py: bafybeiabjzzcwcfbfmtoftjhewmkgbhxfnigbc5cwmmxl6cob5gv64jwwa behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeib3maqohhx35wzryy4otdcjp5thkr4sbp27ksvwidy3pwm444itra behaviours/randomness.py: bafybeiaoj3awyyg2onhpsdsn3dyczs23gr4smuzqcbw3e5ocljwxswjkce behaviours/reedem.py: bafybeiaxwp4lx62owcaqfp6xcqh6567f5yvwnl4rage2f5hmq4nltkzjjy behaviours/round_behaviour.py: bafybeih63hpia2bwwzu563hxs5yd3t5ycvxvkfnhvxbzghbyy3mw3xjl3i - behaviours/sampling.py: bafybeidrcyeecrh2wzw3n56iwyon56rommc7nyjnlcdzhldpvoh25sfeoe + behaviours/sampling.py: bafybeie6ab5pdwal5glhg75am2637lijz5kwqx4ctk2lgqjyllmnw335ca behaviours/storage_manager.py: bafybeiez6daaj2bufxdcsghtmqybyrzdh74z26cc4ajsqsiy5krgjo2tla behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm - fsm_specification.yaml: bafybeiaokkmrfs5dewl5vmfeqwfqrwgzjhjml4t5o6krdellcqprrdxyqq - handlers.py: bafybeifyljdellczdghalgm562iuiqmuh57hhp45rz4z4ufzsiizm5raly + fsm_specification.yaml: bafybeiabt2fonv63hozgr7bt4d5auom76iufzh6etpnmbwekktckz7644a + handlers.py: bafybeibhzwz7gmwxqyd2wprnslmwdggq3d5qko62ykvyymsa53ve2iqqge io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeieqknkktfrs5e4maq4cosevabkbneszw4dp44sz7mavr4hpdy6yem - payloads.py: bafybeid2uzjhqilqog3nzsgygpw3e7jhhdal2otnvxb2d6kck6xa3ra4wi + models.py: bafybeifhmwxoix5fqka4phtmv6324osei52zwirg3ogziondvlq33brnby + payloads.py: bafybeiflpde45x6zbthxv7c6p6kasju6j2ueqinr66gappc52gwz54vh5e policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeidky5eoxti37j3j6ue3uyna6ibljskzzfadhehyj6jqry2lwoi7ou + rounds.py: bafybeihczrvkid4lqoai7myqqs4f3g5diqsnjotxtqhxhm5c7oowzifbqy states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeiazvwqptove4xl4bnqfccnqu3franliifbsv747o7mclssusgj74y + states/base.py: bafybeihjq3t43od4sf64rtsuwkrzrjqpngf3ekbefwyeoax5g6eg5sal2m states/bet_placement.py: bafybeieq3bi2m4m5vclg4nmczqi62hlfp7ftixpamao22wuh4ulx4emlai states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeifalcb4oxenrz63at3c267eqvo2ntfwsc6lur2jgm2damc7foegoa + states/decision_receive.py: bafybeigfch3mzpu5sex63yioffbbhqc2ejnayumk7cptdxpmzhhooxybca states/decision_request.py: bafybeiarv3r5j7cfvxmudki2llbdl2pvf24p5mvsva6bdgrylnwdyag5xy states/final_states.py: bafybeicjrrojo3gmfaxzicwloyorlnqgzl6a2avevo4nvhoh424zwzmbti states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm states/order_subscription.py: bafybeihl3pwrbccaitiukbigygd5u3weyih34pvzql3c6n5k7gjj47f2be states/randomness.py: bafybeiceoo4nx3t4dofpwczw3v5mclramwmzpwjs6hv7l56arodrjx4l5u states/redeem.py: bafybeica6cn4xg7shea2wjhbqnddgxe5zao2hkmceltze7qknxdhtsoaxe - states/sampling.py: bafybeihnziujwxmxl623id7zrkaefzs3tvb2vdxjujcyyn3gcun3k2gcdu + states/sampling.py: bafybeihriyyskmlupjiwytx2pdpftms7plkjku5bip64c3ztx7oi3n43ci states/tool_selection.py: bafybeiak5ihuie4nxh3sguiea6pcdgyxr4k4xyzvq6o2uj5xpf7urocawy tests/__init__.py: bafybeiakpi3k3kc7wrjj7hrluvjcj36lu2gezpmrctwiz5yg2fe7ggnf3i tests/behaviours/__init__.py: bafybeic7icz7lfhfepdkqkase7y7zn3a6pwdw6fx4ah2hajmgejawpolc4 @@ -71,11 +71,11 @@ fingerprint: tests/states/test_order_subscription.py: bafybeiag37uk5mitjm4yadcpr67icfmmzeucdlgvqoct4y4jeyhnebyyoi tests/states/test_randomness.py: bafybeib3eqjv6mhlprzda7d4viddn5alrfqteq6juyg3ccejseoywcsbey tests/states/test_redeem.py: bafybeiezdnfrxukb2xpwffrr357g2anmdkwy7wo3nphvlggipq5xrdzr7a - tests/states/test_sampling.py: bafybeifvbzikke6wtex2p5j7fsnpdbj4qqxl5vh2lm2m2apgvuqdonoyzm + tests/states/test_sampling.py: bafybeibyglipxdl6f25qfxf36v2n3kckrpmwyuqcenfeqzhjujpwon6o2u tests/states/test_tool_selection.py: bafybeib7js3dj7647t33o5ybfqftwytxktwrvhbri5yuyymg6znj6y7xxa tests/test_dialogues.py: bafybeibulo64tgfrq4e5qbcqnmifrlehkqciwuavublints353zaj2mlpa tests/test_handlers.py: bafybeihpkgtjjm3uegpup6zkznpoaxqpu6kmp3ujiggrzbe73p5fzlq7im - tests/test_payloads.py: bafybeicqrk7f4gpn3snddjpebwgnzbj3uu4rl3pni2tuihc3db2y2jgfam + tests/test_payloads.py: bafybeifc2os3orozmsxbrcfp4c4vrweojo6g4ebxinr5ilescraw6qm6sa tests/test_rounds.py: bafybeigifftusd4ew42tyvyrr55o2uehhcik2gdq3atkpjwwlqdeskedty utils/__init__.py: bafybeiazrfg3kwfdl5q45azwz6b6mobqxngxpf4hazmrnkhinpk4qhbbf4 utils/nevermined.py: bafybeigallaqxhqopznhjhefr6bukh4ojkz5vdtqyzod5dksshrf24fjgi diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 3a0e37593..917087d3c 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -11,7 +11,7 @@ fingerprint: behaviours.py: bafybeigc6hszbu66ccajny5eh7thfgsrlr36je4mzziwp4mupgvtaeu6aa composition.py: bafybeifxerfvssuhodqmtvkz6umlmrmdqjv5ptpszhnwlavzxaavdpdyly dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm - fsm_specification.yaml: bafybeicbwdpl7w65yljzuyvx4y5kaoon5cqsiskxtg5r25mc5r7ggqnqyi + fsm_specification.yaml: bafybeibgm4crhqny63ax36447cglnycvlwnwuwse62bob64zbya4vjfgnm handlers.py: bafybeibbxybbi66em63ad33cllymypr3za3f5xvor3m2krhuxoyxnqjnxu models.py: bafybeih2vkf4ln7n7ar27iemho7w7sdr4clmhbnhbcznmsri6mc2skkky4 tests/__init__.py: bafybeiadatapyjh3e7ucg2ehz77oms3ihrbutwb2cs2tkjehy54utwvuyi @@ -27,10 +27,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifxhahaxskqtz5xqsx3p3yn7c2arnvbk46we2eakpku3kzji763uy +- valory/decision_maker_abci:0.1.0:bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidjbujyhajhc4zhqavdorodqklk2m7cxmewzudg3j32zszqtw32iu - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne -- valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini +- valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: main: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 9d664d229..9b14bc845 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeiar2m542ipjarvn6zm5uby5rqovkj2puemfuleypyklo6jcwmhiom +- valory/decision_maker_abci:0.1.0:bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From efcd623d79f9cdcd4f4fe9ba795cdef2f477119a Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 12:09:39 +0000 Subject: [PATCH 08/16] chore: generators --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/services/trader_pearl/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 3 ++- .../decision_maker_abci/states/decision_receive.py | 7 ++++--- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index b52573d8f..b0eecb1a7 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm", - "skill/valory/trader_abci/0.1.0": "bafybeiejwrkjs4reutvee3hyw3ffqhrbzo6uv7mhbkgsa54tkpce7dwf6m", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidjbujyhajhc4zhqavdorodqklk2m7cxmewzudg3j32zszqtw32iu", + "skill/valory/decision_maker_abci/0.1.0": "bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei", + "skill/valory/trader_abci/0.1.0": "bafybeib2tk4q4f3gcjgiicv2s2ay7mdhucgu7w5v7hdxsd6qwtk7adj4le", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeih5ce6o2mpkwegvm3vpb5qjn2twvxijx44nt5x276tpyw3ip6b72e", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm", - "agent/valory/trader/0.1.0": "bafybeieo63xyqjen5llyb4wqzierraz3d2uod5myzb5a5u5zyfq4ddazke", - "service/valory/trader/0.1.0": "bafybeify64n6euvtil7gg74xeo6sa2xyzxl577klkk4oupq5bgpmvbtcf4", - "service/valory/trader_pearl/0.1.0": "bafybeidqklh4ionz3pcjuu7qnbguz4egzllsdnapnnyaansbl2zlucqxra" + "agent/valory/trader/0.1.0": "bafybeiaddxmetkwwtdtsiidxs2gizxbz3ar5ryv7jby4eeqiluptouauue", + "service/valory/trader/0.1.0": "bafybeihp3343hodscgi7xw7uqbzqhbizhw4bpk4ee65yvhsdky5l2tq55m", + "service/valory/trader_pearl/0.1.0": "bafybeihl4caozvpy6yf2wvalpx53odtzutgfsvfmcowx3g2uti3xngptju" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index ef1dded15..7b155253c 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidjbujyhajhc4zhqavdorodqklk2m7cxmewzudg3j32zszqtw32iu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5ce6o2mpkwegvm3vpb5qjn2twvxijx44nt5x276tpyw3ip6b72e - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm -- valory/trader_abci:0.1.0:bafybeiejwrkjs4reutvee3hyw3ffqhrbzo6uv7mhbkgsa54tkpce7dwf6m +- valory/decision_maker_abci:0.1.0:bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei +- valory/trader_abci:0.1.0:bafybeib2tk4q4f3gcjgiicv2s2ay7mdhucgu7w5v7hdxsd6qwtk7adj4le - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 710b7add0..b3cffd56f 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeieo63xyqjen5llyb4wqzierraz3d2uod5myzb5a5u5zyfq4ddazke +agent: valory/trader:0.1.0:bafybeiaddxmetkwwtdtsiidxs2gizxbz3ar5ryv7jby4eeqiluptouauue number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 80dec4b33..2a25a8550 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeieo63xyqjen5llyb4wqzierraz3d2uod5myzb5a5u5zyfq4ddazke +agent: valory/trader:0.1.0:bafybeiaddxmetkwwtdtsiidxs2gizxbz3ar5ryv7jby4eeqiluptouauue number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 293e9b493..1bdaafc22 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -43,7 +43,7 @@ fingerprint: states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeigfch3mzpu5sex63yioffbbhqc2ejnayumk7cptdxpmzhhooxybca + states/decision_receive.py: bafybeihgqcqd73isaf355kb5feq5pvaigq7gvxup5tknhmmc66o3smvs7m states/decision_request.py: bafybeiarv3r5j7cfvxmudki2llbdl2pvf24p5mvsva6bdgrylnwdyag5xy states/final_states.py: bafybeicjrrojo3gmfaxzicwloyorlnqgzl6a2avevo4nvhoh424zwzmbti states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm @@ -104,6 +104,7 @@ skills: - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm +- valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne behaviours: main: args: {} diff --git a/packages/valory/skills/decision_maker_abci/states/decision_receive.py b/packages/valory/skills/decision_maker_abci/states/decision_receive.py index b37d0cb1d..d084e7f42 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_receive.py @@ -61,9 +61,10 @@ def end_block(self) -> Optional[Tuple[SynchronizedData, Enum]]: synced_data, event = cast(Tuple[SynchronizedData, Enum], res) decision_receive_timestamp = self.most_voted_payload_values[7] - synced_data = cast(SynchronizedData, synced_data.update( - decision_receive_timestamp=decision_receive_timestamp - )) + synced_data = cast( + SynchronizedData, + synced_data.update(decision_receive_timestamp=decision_receive_timestamp), + ) if event == Event.DONE and synced_data.vote is None: return synced_data, Event.TIE diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 917087d3c..a24b82b39 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidjbujyhajhc4zhqavdorodqklk2m7cxmewzudg3j32zszqtw32iu +- valory/decision_maker_abci:0.1.0:bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5ce6o2mpkwegvm3vpb5qjn2twvxijx44nt5x276tpyw3ip6b72e - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 9b14bc845..d1a55a40e 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeicfcuttcxsc3xpxyw62jzu5mkambeio4vjfb46xbplku5g4qvqzqm +- valory/decision_maker_abci:0.1.0:bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From 68a5641bc86ac3211b17bce6fd411d20e25f11d1 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 14:05:15 +0000 Subject: [PATCH 09/16] fix: non serializeable staking state --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/services/trader_pearl/service.yaml | 2 +- .../valory/skills/decision_maker_abci/handlers.py | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index b0eecb1a7..01efd4d85 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei", - "skill/valory/trader_abci/0.1.0": "bafybeib2tk4q4f3gcjgiicv2s2ay7mdhucgu7w5v7hdxsd6qwtk7adj4le", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeih5ce6o2mpkwegvm3vpb5qjn2twvxijx44nt5x276tpyw3ip6b72e", + "skill/valory/decision_maker_abci/0.1.0": "bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza", + "skill/valory/trader_abci/0.1.0": "bafybeihvrxidyuskfvwsyb7tu26zm2y6yb2iyvtzco6kn5ybujnnl67mr4", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieobe2tythge3eqsyqlpzyavxaejrwirgp42i4yaqkwia2qso36ei", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm", - "agent/valory/trader/0.1.0": "bafybeiaddxmetkwwtdtsiidxs2gizxbz3ar5ryv7jby4eeqiluptouauue", - "service/valory/trader/0.1.0": "bafybeihp3343hodscgi7xw7uqbzqhbizhw4bpk4ee65yvhsdky5l2tq55m", - "service/valory/trader_pearl/0.1.0": "bafybeihl4caozvpy6yf2wvalpx53odtzutgfsvfmcowx3g2uti3xngptju" + "agent/valory/trader/0.1.0": "bafybeige5jy7wn5m4njn5uylndfh75sykshsmfan3bnb44htjfrp26edky", + "service/valory/trader/0.1.0": "bafybeiez6n4u6ifuvb4pm4px7luoul7uegfchireik2f6kdftl66i755re", + "service/valory/trader_pearl/0.1.0": "bafybeianl4izcal5x2bgyv7tmmmzchooxxfayz7r7fdma6hvfxmpplrfgq" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 7b155253c..530800ce6 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5ce6o2mpkwegvm3vpb5qjn2twvxijx44nt5x276tpyw3ip6b72e +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieobe2tythge3eqsyqlpzyavxaejrwirgp42i4yaqkwia2qso36ei - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei -- valory/trader_abci:0.1.0:bafybeib2tk4q4f3gcjgiicv2s2ay7mdhucgu7w5v7hdxsd6qwtk7adj4le +- valory/decision_maker_abci:0.1.0:bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza +- valory/trader_abci:0.1.0:bafybeihvrxidyuskfvwsyb7tu26zm2y6yb2iyvtzco6kn5ybujnnl67mr4 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index b3cffd56f..1d6c5af62 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeiaddxmetkwwtdtsiidxs2gizxbz3ar5ryv7jby4eeqiluptouauue +agent: valory/trader:0.1.0:bafybeige5jy7wn5m4njn5uylndfh75sykshsmfan3bnb44htjfrp26edky number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 2a25a8550..2eece2d50 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeiaddxmetkwwtdtsiidxs2gizxbz3ar5ryv7jby4eeqiluptouauue +agent: valory/trader:0.1.0:bafybeige5jy7wn5m4njn5uylndfh75sykshsmfan3bnb44htjfrp26edky number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py index 7c42404b7..4d9b8936b 100644 --- a/packages/valory/skills/decision_maker_abci/handlers.py +++ b/packages/valory/skills/decision_maker_abci/handlers.py @@ -269,7 +269,7 @@ def _handle_get_health( has_required_funds = self._check_required_funds() is_receiving_mech_responses = self._check_is_receiving_mech_responses() is_staking_kpi_met = self.synchronized_data.is_staking_kpi_met - is_staked = self.synchronized_data.service_staking_state + is_staked = self.synchronized_data.service_staking_state.name.lower() round_sequence = cast(SharedState, self.context.state).round_sequence diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 1bdaafc22..7414f1c0b 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -29,7 +29,7 @@ fingerprint: behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm fsm_specification.yaml: bafybeiabt2fonv63hozgr7bt4d5auom76iufzh6etpnmbwekktckz7644a - handlers.py: bafybeibhzwz7gmwxqyd2wprnslmwdggq3d5qko62ykvyymsa53ve2iqqge + handlers.py: bafybeih6gosyjogsqymzk64z3h6qfm3ma3747yarznyogdhqgv4sbmdc5y io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa models.py: bafybeifhmwxoix5fqka4phtmv6324osei52zwirg3ogziondvlq33brnby diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index a24b82b39..97dbe9fda 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5ce6o2mpkwegvm3vpb5qjn2twvxijx44nt5x276tpyw3ip6b72e +- valory/decision_maker_abci:0.1.0:bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieobe2tythge3eqsyqlpzyavxaejrwirgp42i4yaqkwia2qso36ei - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index d1a55a40e..7728fbd5c 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeignxzvj3so5wgjfts4jmkx3curhl77v2aqstkgrnl2g7hntcenmei +- valory/decision_maker_abci:0.1.0:bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From 982a519653a981bb4facf162e51714438586d37c Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 14:13:13 +0000 Subject: [PATCH 10/16] change is_staked to staking_status --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/services/trader_pearl/service.yaml | 2 +- .../valory/skills/decision_maker_abci/handlers.py | 4 ++-- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 01efd4d85..41c53628b 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza", - "skill/valory/trader_abci/0.1.0": "bafybeihvrxidyuskfvwsyb7tu26zm2y6yb2iyvtzco6kn5ybujnnl67mr4", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieobe2tythge3eqsyqlpzyavxaejrwirgp42i4yaqkwia2qso36ei", + "skill/valory/decision_maker_abci/0.1.0": "bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e", + "skill/valory/trader_abci/0.1.0": "bafybeidh7pjnhbbz2pdxoozl4e67sox72btbqcz5g7np44kv57ehyzguou", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigc3jronndik2wj3c7of46h2oljbuk4evadzropktqkwelsqgkkku", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm", - "agent/valory/trader/0.1.0": "bafybeige5jy7wn5m4njn5uylndfh75sykshsmfan3bnb44htjfrp26edky", - "service/valory/trader/0.1.0": "bafybeiez6n4u6ifuvb4pm4px7luoul7uegfchireik2f6kdftl66i755re", - "service/valory/trader_pearl/0.1.0": "bafybeianl4izcal5x2bgyv7tmmmzchooxxfayz7r7fdma6hvfxmpplrfgq" + "agent/valory/trader/0.1.0": "bafybeibqpzvby7wc67ivaxumztwhtaf2g7lmv3agtxaqoqbwvl5twgi53y", + "service/valory/trader/0.1.0": "bafybeig6v5gjuvt7ygvxwmsr7rph3227txnuced3p722hufl5vmlhyr4ye", + "service/valory/trader_pearl/0.1.0": "bafybeihu6j7chemi64srs4q57xcf4bfibigx27e3nvd7cqtwo4jhfo3mx4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 530800ce6..db1c3f992 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieobe2tythge3eqsyqlpzyavxaejrwirgp42i4yaqkwia2qso36ei +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigc3jronndik2wj3c7of46h2oljbuk4evadzropktqkwelsqgkkku - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza -- valory/trader_abci:0.1.0:bafybeihvrxidyuskfvwsyb7tu26zm2y6yb2iyvtzco6kn5ybujnnl67mr4 +- valory/decision_maker_abci:0.1.0:bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e +- valory/trader_abci:0.1.0:bafybeidh7pjnhbbz2pdxoozl4e67sox72btbqcz5g7np44kv57ehyzguou - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 1d6c5af62..30fd192e9 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeige5jy7wn5m4njn5uylndfh75sykshsmfan3bnb44htjfrp26edky +agent: valory/trader:0.1.0:bafybeibqpzvby7wc67ivaxumztwhtaf2g7lmv3agtxaqoqbwvl5twgi53y number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 2eece2d50..1268a42ad 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeige5jy7wn5m4njn5uylndfh75sykshsmfan3bnb44htjfrp26edky +agent: valory/trader:0.1.0:bafybeibqpzvby7wc67ivaxumztwhtaf2g7lmv3agtxaqoqbwvl5twgi53y number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py index 4d9b8936b..08fae57e4 100644 --- a/packages/valory/skills/decision_maker_abci/handlers.py +++ b/packages/valory/skills/decision_maker_abci/handlers.py @@ -269,7 +269,7 @@ def _handle_get_health( has_required_funds = self._check_required_funds() is_receiving_mech_responses = self._check_is_receiving_mech_responses() is_staking_kpi_met = self.synchronized_data.is_staking_kpi_met - is_staked = self.synchronized_data.service_staking_state.name.lower() + staking_status = self.synchronized_data.service_staking_state.name.lower() round_sequence = cast(SharedState, self.context.state).round_sequence @@ -307,7 +307,7 @@ def _handle_get_health( "is_making_on_chain_transactions": is_receiving_mech_responses, "is_staking_kpi_met": is_staking_kpi_met, "has_required_funds": has_required_funds, - "is_staked": is_staked, + "staking_status": staking_status, }, } diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 7414f1c0b..7030d482a 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -29,7 +29,7 @@ fingerprint: behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm fsm_specification.yaml: bafybeiabt2fonv63hozgr7bt4d5auom76iufzh6etpnmbwekktckz7644a - handlers.py: bafybeih6gosyjogsqymzk64z3h6qfm3ma3747yarznyogdhqgv4sbmdc5y + handlers.py: bafybeie7rhzjgbrmlc3iu6v4rkwkxpix3metov3pzutbkzc5uwcrt47mqq io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa models.py: bafybeifhmwxoix5fqka4phtmv6324osei52zwirg3ogziondvlq33brnby diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 97dbe9fda..6713767bb 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieobe2tythge3eqsyqlpzyavxaejrwirgp42i4yaqkwia2qso36ei +- valory/decision_maker_abci:0.1.0:bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigc3jronndik2wj3c7of46h2oljbuk4evadzropktqkwelsqgkkku - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 7728fbd5c..9a9ae3022 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeifvz4szxfz7ngffj4tpveu6oppmzcm6aqodqhspmsjdmqcykkbcza +- valory/decision_maker_abci:0.1.0:bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From 118182812a22a66a79144eb04961debe25f29afd Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 14:42:32 +0000 Subject: [PATCH 11/16] fix: index out of range --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/services/trader_pearl/service.yaml | 2 +- .../behaviours/decision_receive.py | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 4 ++-- .../decision_maker_abci/states/decision_receive.py | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 41c53628b..bf9fa2be0 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e", - "skill/valory/trader_abci/0.1.0": "bafybeidh7pjnhbbz2pdxoozl4e67sox72btbqcz5g7np44kv57ehyzguou", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigc3jronndik2wj3c7of46h2oljbuk4evadzropktqkwelsqgkkku", + "skill/valory/decision_maker_abci/0.1.0": "bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i", + "skill/valory/trader_abci/0.1.0": "bafybeigon2bq6bjuy5rs4ljrjm3omz4aj2wxjmqbpotkklupwpyvhcxd2m", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeie5yy23nkp3k64imugryuv2znb6swo53funveyzu7trmr4fuwklgu", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm", - "agent/valory/trader/0.1.0": "bafybeibqpzvby7wc67ivaxumztwhtaf2g7lmv3agtxaqoqbwvl5twgi53y", - "service/valory/trader/0.1.0": "bafybeig6v5gjuvt7ygvxwmsr7rph3227txnuced3p722hufl5vmlhyr4ye", - "service/valory/trader_pearl/0.1.0": "bafybeihu6j7chemi64srs4q57xcf4bfibigx27e3nvd7cqtwo4jhfo3mx4" + "agent/valory/trader/0.1.0": "bafybeie5esogmznsouimpx4g5tbr66tfws22pensrsm7jy6lpi3hghffyi", + "service/valory/trader/0.1.0": "bafybeic6qvmy3vtg6yxjutm4zoygbuo2oz76rd277fyvz5jcoush2phe5y", + "service/valory/trader_pearl/0.1.0": "bafybeieaiwhk6lwkc25mlz2ggww24kicrh52rcwg2jfxr7wmh76dnwmjra" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index db1c3f992..10fc8702c 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigc3jronndik2wj3c7of46h2oljbuk4evadzropktqkwelsqgkkku +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeie5yy23nkp3k64imugryuv2znb6swo53funveyzu7trmr4fuwklgu - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e -- valory/trader_abci:0.1.0:bafybeidh7pjnhbbz2pdxoozl4e67sox72btbqcz5g7np44kv57ehyzguou +- valory/decision_maker_abci:0.1.0:bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i +- valory/trader_abci:0.1.0:bafybeigon2bq6bjuy5rs4ljrjm3omz4aj2wxjmqbpotkklupwpyvhcxd2m - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 30fd192e9..ceb5e0597 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibqpzvby7wc67ivaxumztwhtaf2g7lmv3agtxaqoqbwvl5twgi53y +agent: valory/trader:0.1.0:bafybeie5esogmznsouimpx4g5tbr66tfws22pensrsm7jy6lpi3hghffyi number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 1268a42ad..d0bfb1681 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeibqpzvby7wc67ivaxumztwhtaf2g7lmv3agtxaqoqbwvl5twgi53y +agent: valory/trader:0.1.0:bafybeie5esogmznsouimpx4g5tbr66tfws22pensrsm7jy6lpi3hghffyi number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index 13eaa76c0..aad67a287 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -516,7 +516,7 @@ def async_act(self) -> Generator: prediction_response.confidence if prediction_response else None, bet_amount, next_mock_data_row, - self.synced_timestamp, + decision_received_timestamp=self.synced_timestamp, ) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 7030d482a..607190c40 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: behaviours/blacklisting.py: bafybeicqwj7o4l7qcym5xjqwq45jngqkhyf44mn6qise2ysyfnlnwz7pdy behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e - behaviours/decision_receive.py: bafybeiei3nvzmkr5trx5lubnxh6pyiojd252cw6syuanfif6sqfdgm5kza + behaviours/decision_receive.py: bafybeibj32a7vvaolcevth2vw4heug5gpagar25zrd74lv467h4332yww4 behaviours/decision_request.py: bafybeiabjzzcwcfbfmtoftjhewmkgbhxfnigbc5cwmmxl6cob5gv64jwwa behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeib3maqohhx35wzryy4otdcjp5thkr4sbp27ksvwidy3pwm444itra @@ -43,7 +43,7 @@ fingerprint: states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeihgqcqd73isaf355kb5feq5pvaigq7gvxup5tknhmmc66o3smvs7m + states/decision_receive.py: bafybeid6b5dw2tqdojteezx4l23ahkxvqxtx4bqefaqb4dufmhp2a5yc4e states/decision_request.py: bafybeiarv3r5j7cfvxmudki2llbdl2pvf24p5mvsva6bdgrylnwdyag5xy states/final_states.py: bafybeicjrrojo3gmfaxzicwloyorlnqgzl6a2avevo4nvhoh424zwzmbti states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm diff --git a/packages/valory/skills/decision_maker_abci/states/decision_receive.py b/packages/valory/skills/decision_maker_abci/states/decision_receive.py index d084e7f42..e14247eb0 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_receive.py @@ -59,7 +59,7 @@ def end_block(self) -> Optional[Tuple[SynchronizedData, Enum]]: return None synced_data, event = cast(Tuple[SynchronizedData, Enum], res) - decision_receive_timestamp = self.most_voted_payload_values[7] + decision_receive_timestamp = self.most_voted_payload_values[-1] synced_data = cast( SynchronizedData, diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 6713767bb..0435a1b20 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigc3jronndik2wj3c7of46h2oljbuk4evadzropktqkwelsqgkkku +- valory/decision_maker_abci:0.1.0:bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeie5yy23nkp3k64imugryuv2znb6swo53funveyzu7trmr4fuwklgu - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 9a9ae3022..46839d6eb 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeico6osuoslie3plxwlvhiuflysupynrg4hv336kjpwkdcxx75yx4e +- valory/decision_maker_abci:0.1.0:bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From be1bbf747ba6f9f4bb8062aaef2608655a837c64 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 15:43:02 +0000 Subject: [PATCH 12/16] fix: replace accidentally removed params --- packages/valory/agents/trader/aea-config.yaml | 2 ++ packages/valory/services/trader/service.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 10fc8702c..85aad799a 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -252,6 +252,8 @@ models: collateral_balance: ${int:10000000000000000000} mech_cost: ${int:10000000000000000} pool_fee: ${int:20000000000000000} + outcome_token_amounts: ${list:[11000000000000000000,9000000000000000000]} + outcome_token_marginal_prices: ${list:[0.4,0.6]} sep: ${str:,} dataset_filename: ${str:benchmark_data.csv} question_field: ${str:question} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index ceb5e0597..4ac40ba2d 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -155,6 +155,8 @@ type: skill collateral_balance: ${BENCHMARKING_MODE_COLLATERAL_BALANCE:int:10000000000000000000} mech_cost: ${BENCHMARKING_MODE_MECH_COST:int:10000000000000000} pool_fee: ${BENCHMARKING_MODE_POOL_FEE:int:20000000000000000} + outcome_token_amounts: ${OUTCOME_TOKEN_AMOUNTS:list:[11000000000000000000,9000000000000000000]} + outcome_token_marginal_prices: ${OUTCOME_TOKEN_MARGINAL_PRICES:list:[0.55,0.45]} sep: ${BENCHMARKING_MODE_SEP:str:,} dataset_filename: ${BENCHMARKING_MODE_DATASET_FILENAME:str:benchmark_data.csv} question_field: ${BENCHMARKING_MODE_QUESTION_FIELD:str:question} From 66f127233b7ae779b0f06ef2a4c068be09fac196 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 16:32:18 +0000 Subject: [PATCH 13/16] fix: make requested changes --- packages/valory/services/trader/service.yaml | 1 + .../valory/skills/check_stop_trading_abci/rounds.py | 6 ++---- .../decision_maker_abci/behaviours/bet_placement.py | 7 ++++--- .../behaviours/decision_receive.py | 4 +++- .../valory/skills/decision_maker_abci/handlers.py | 2 +- packages/valory/skills/decision_maker_abci/models.py | 3 +++ .../valory/skills/decision_maker_abci/skill.yaml | 1 + .../decision_maker_abci/states/bet_placement.py | 2 +- .../decision_maker_abci/states/decision_receive.py | 12 +++++++----- packages/valory/skills/trader_abci/skill.yaml | 1 + 10 files changed, 24 insertions(+), 15 deletions(-) diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 4ac40ba2d..be7d35a2a 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -145,6 +145,7 @@ type: skill rebet_chance: ${REBET_CHANCE:float:0.6} mech_interaction_sleep_time: ${MECH_INTERACTION_SLEEP_TIME:int:10} policy_store_update_offset: ${POLICY_STORE_UPDATE_OFFSET:int:259200} + expected_mech_response_time: ${EXPECTED_MECH_RESPONSE_TIME:int:300} benchmark_tool: &id004 args: log_dir: ${LOG_DIR:str:/benchmarks} diff --git a/packages/valory/skills/check_stop_trading_abci/rounds.py b/packages/valory/skills/check_stop_trading_abci/rounds.py index 17be48154..21b93e89b 100644 --- a/packages/valory/skills/check_stop_trading_abci/rounds.py +++ b/packages/valory/skills/check_stop_trading_abci/rounds.py @@ -84,12 +84,10 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: if res is None: return None - sync_data, event = res - is_staking_kpi_met = self.positive_vote_threshold_reached - sync_data = self.synchronized_data.update(is_staking_kpi_met=is_staking_kpi_met) + self.synchronized_data.update(is_staking_kpi_met=is_staking_kpi_met) - return sync_data, event + return res class FinishedCheckStopTradingRound(DegenerateRound, ABC): diff --git a/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py b/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py index 0f1cdcf46..0d9e0e0d2 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/bet_placement.py @@ -212,12 +212,12 @@ def async_act(self) -> Generator: if self.benchmarking_mode.enabled: # simulate the bet placement with self.context.benchmark_tool.measure(self.behaviour_id).local(): - payload = MultisigTxPayload(agent, None, None, True) + payload = BetPlacementPayload(agent, None, None, True, self.wallet_balance) yield from self.finish_behaviour(payload) with self.context.benchmark_tool.measure(self.behaviour_id).local(): yield from self.wait_for_condition_with_sleep(self.check_balance) - tx_submitter = betting_tx_hex = mocking_mode = None + tx_submitter = betting_tx_hex = mocking_mode = wallet_balance = None can_exchange = ( self.is_wxdai @@ -230,13 +230,14 @@ def async_act(self) -> Generator: if self.token_balance >= self.investment_amount or can_exchange: tx_submitter = self.matching_round.auto_round_id() betting_tx_hex = yield from self._prepare_safe_tx() + wallet_balance = self.wallet_balance payload = BetPlacementPayload( agent, tx_submitter, betting_tx_hex, mocking_mode, - wallet_balance=self.wallet_balance, + wallet_balance, ) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index aad67a287..3b5244198 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -485,10 +485,12 @@ def async_act(self) -> Generator: bet_amount = None next_mock_data_row = None bets_hash = None + decision_received_timestamp = None if prediction_response is not None and prediction_response.vote is not None: is_profitable, bet_amount = yield from self._is_profitable( prediction_response ) + decision_received_timestamp = self.synced_timestamp if is_profitable: self.store_bets() bets_hash = self.hash_stored_bets() @@ -516,7 +518,7 @@ def async_act(self) -> Generator: prediction_response.confidence if prediction_response else None, bet_amount, next_mock_data_row, - decision_received_timestamp=self.synced_timestamp, + decision_received_timestamp, ) yield from self.finish_behaviour(payload) diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py index 08fae57e4..c46644e52 100644 --- a/packages/valory/skills/decision_maker_abci/handlers.py +++ b/packages/valory/skills/decision_maker_abci/handlers.py @@ -361,5 +361,5 @@ def _check_is_receiving_mech_responses(self) -> bool: # (an on chain transaction) return ( self.synchronized_data.decision_receive_timestamp - < 2 * self.context.params.reset_pause_duration + < int(datetime.utcnow().timestamp()) - self.context.params.expected_mech_response_time ) diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index 7b6b3a7c0..5875aac6d 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -416,6 +416,9 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: self.policy_store_update_offset = self._ensure( "policy_store_update_offset", kwargs, int ) + self.expected_mech_response_time = self._ensure( + "expected_mech_response_time", kwargs, int + ) super().__init__(*args, **kwargs) @property diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 607190c40..66f543897 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -316,6 +316,7 @@ models: requester_staking_instance_address: '0x0000000000000000000000000000000000000000' response_timeout: 300 agent_balance_threshold: 10000000000000000 + expected_mech_response_time: 300 class_name: DecisionMakerParams benchmarking_mode: args: diff --git a/packages/valory/skills/decision_maker_abci/states/bet_placement.py b/packages/valory/skills/decision_maker_abci/states/bet_placement.py index 91c810ff6..35e7c63f1 100644 --- a/packages/valory/skills/decision_maker_abci/states/bet_placement.py +++ b/packages/valory/skills/decision_maker_abci/states/bet_placement.py @@ -46,6 +46,6 @@ def end_block(self) -> Optional[Tuple[BaseSynchronizedData, Enum]]: return None sync_data, event = update - wallet_balance = self.most_voted_payload_values[4] + wallet_balance = self.most_voted_payload_values[-1] sync_data = sync_data.update(wallet_balance=wallet_balance) return sync_data, event diff --git a/packages/valory/skills/decision_maker_abci/states/decision_receive.py b/packages/valory/skills/decision_maker_abci/states/decision_receive.py index e14247eb0..3acd31f3f 100644 --- a/packages/valory/skills/decision_maker_abci/states/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/states/decision_receive.py @@ -59,12 +59,14 @@ def end_block(self) -> Optional[Tuple[SynchronizedData, Enum]]: return None synced_data, event = cast(Tuple[SynchronizedData, Enum], res) - decision_receive_timestamp = self.most_voted_payload_values[-1] - synced_data = cast( - SynchronizedData, - synced_data.update(decision_receive_timestamp=decision_receive_timestamp), - ) + if event == Event.DONE: + decision_receive_timestamp = self.most_voted_payload_values[-1] + + synced_data = cast( + SynchronizedData, + synced_data.update(decision_receive_timestamp=decision_receive_timestamp), + ) if event == Event.DONE and synced_data.vote is None: return synced_data, Event.TIE diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 0435a1b20..4427275e3 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -256,6 +256,7 @@ models: priority_mech_service_id: 0 requester_staking_instance_address: '0x0000000000000000000000000000000000000000' response_timeout: 300 + expected_mech_response_time: 300 class_name: TraderParams benchmarking_mode: args: From fb5ef36f54a4b4a393b7ef5cd800def9df95eb7f Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 16:32:59 +0000 Subject: [PATCH 14/16] chore: generators --- packages/packages.json | 14 +++++++------- packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- packages/valory/services/trader_pearl/service.yaml | 2 +- .../skills/check_stop_trading_abci/skill.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 12 ++++++------ packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index bf9fa2be0..bc5f0bda4 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i", - "skill/valory/trader_abci/0.1.0": "bafybeigon2bq6bjuy5rs4ljrjm3omz4aj2wxjmqbpotkklupwpyvhcxd2m", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeie5yy23nkp3k64imugryuv2znb6swo53funveyzu7trmr4fuwklgu", + "skill/valory/decision_maker_abci/0.1.0": "bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e", + "skill/valory/trader_abci/0.1.0": "bafybeidenttu34mxf73ueng7wvqrtc73ro265i4vwso65ieusp7ei3r4nu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeic6jixxyxa46rrhq75z6yunv265vruqeaban6tix2xsugwi2ttnh4", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", - "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm", - "agent/valory/trader/0.1.0": "bafybeie5esogmznsouimpx4g5tbr66tfws22pensrsm7jy6lpi3hghffyi", - "service/valory/trader/0.1.0": "bafybeic6qvmy3vtg6yxjutm4zoygbuo2oz76rd277fyvz5jcoush2phe5y", - "service/valory/trader_pearl/0.1.0": "bafybeieaiwhk6lwkc25mlz2ggww24kicrh52rcwg2jfxr7wmh76dnwmjra" + "skill/valory/check_stop_trading_abci/0.1.0": "bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54", + "agent/valory/trader/0.1.0": "bafybeietthlkk27crqqghrqke567ehz4rgtnghmcr56dmcsbqedtppuuxe", + "service/valory/trader/0.1.0": "bafybeicpain222b7acyxcwqvpjpiakajdlura6cn277kgvsgygzjipo5re", + "service/valory/trader_pearl/0.1.0": "bafybeiahb5thh5sdrdh4qru4fuucyoa23f7b27rcwn2sdiboanozbox6dm" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 85aad799a..87b8b2769 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,12 +45,12 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeie5yy23nkp3k64imugryuv2znb6swo53funveyzu7trmr4fuwklgu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic6jixxyxa46rrhq75z6yunv265vruqeaban6tix2xsugwi2ttnh4 - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i -- valory/trader_abci:0.1.0:bafybeigon2bq6bjuy5rs4ljrjm3omz4aj2wxjmqbpotkklupwpyvhcxd2m +- valory/decision_maker_abci:0.1.0:bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e +- valory/trader_abci:0.1.0:bafybeidenttu34mxf73ueng7wvqrtc73ro265i4vwso65ieusp7ei3r4nu - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne -- valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm +- valory/check_stop_trading_abci:0.1.0:bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index be7d35a2a..f46587c7f 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeie5esogmznsouimpx4g5tbr66tfws22pensrsm7jy6lpi3hghffyi +agent: valory/trader:0.1.0:bafybeietthlkk27crqqghrqke567ehz4rgtnghmcr56dmcsbqedtppuuxe number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index d0bfb1681..805d8c497 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeie5esogmznsouimpx4g5tbr66tfws22pensrsm7jy6lpi3hghffyi +agent: valory/trader:0.1.0:bafybeietthlkk27crqqghrqke567ehz4rgtnghmcr56dmcsbqedtppuuxe number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/check_stop_trading_abci/skill.yaml b/packages/valory/skills/check_stop_trading_abci/skill.yaml index c20f983a3..45c3db5eb 100644 --- a/packages/valory/skills/check_stop_trading_abci/skill.yaml +++ b/packages/valory/skills/check_stop_trading_abci/skill.yaml @@ -14,7 +14,7 @@ fingerprint: handlers.py: bafybeiard64fwxib3rtyp67ymhf222uongcyqhfhdyttpsyqkmyh5ajipu models.py: bafybeigwdhgianx5rizlb7ebmm6pdtkixh4uehbvu5c24ysvyvojs74dfq payloads.py: bafybeidh5bqywun4chrbsci2xbcrnnzuys5sswxwbxq3yl2ksawi3xsi5q - rounds.py: bafybeid2nu2uv2aa4mhmxde2ar3q35ziartegngqzymp3gmpmjqnseztd4 + rounds.py: bafybeift7b2afck4e5so2cpgyoywa76t6el6d4qwfoitvfdjw6kgf4fwie tests/__init__.py: bafybeihv2cjk4va5bc5ncqtppqg2xmmxcro34bma36trtvk32gtmhdycxu tests/test_dialogues.py: bafybeia5ac27w7ijx2nyx5dqyrnv4troo4572gjq7nrcxdncexoxucnqti tests/test_handlers.py: bafybeigpmtx2hyunzn6nxk2x4bvvybek7jvuhbk34fqlj7fgfsszcoqhxy diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 66f543897..ee8f8dbaa 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -13,11 +13,11 @@ fingerprint: __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky behaviours/base.py: bafybeidjmsljdaw7y5chzzkub63mzf5ydpauch5ugojds5jwpeyvovkq3y - behaviours/bet_placement.py: bafybeibkssszgm5e5sjiugjhfnzikj53kx2jrm5p6nkymj3j4mcx35ebsq + behaviours/bet_placement.py: bafybeif3blpj45w4y2ppw5lxkxndsc5crhghevagifuh4fcoofej36bq34 behaviours/blacklisting.py: bafybeicqwj7o4l7qcym5xjqwq45jngqkhyf44mn6qise2ysyfnlnwz7pdy behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e - behaviours/decision_receive.py: bafybeibj32a7vvaolcevth2vw4heug5gpagar25zrd74lv467h4332yww4 + behaviours/decision_receive.py: bafybeigodaemp7zzcnhbeyozagy4refbrj4k5vd4x4cp7p7ekvufwu4byq behaviours/decision_request.py: bafybeiabjzzcwcfbfmtoftjhewmkgbhxfnigbc5cwmmxl6cob5gv64jwwa behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeib3maqohhx35wzryy4otdcjp5thkr4sbp27ksvwidy3pwm444itra @@ -29,21 +29,21 @@ fingerprint: behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm fsm_specification.yaml: bafybeiabt2fonv63hozgr7bt4d5auom76iufzh6etpnmbwekktckz7644a - handlers.py: bafybeie7rhzjgbrmlc3iu6v4rkwkxpix3metov3pzutbkzc5uwcrt47mqq + handlers.py: bafybeiafuc7vtyhrv2phep56maadpd4lubipdzw2sszv62r2tz7hzjmsdi io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeifhmwxoix5fqka4phtmv6324osei52zwirg3ogziondvlq33brnby + models.py: bafybeibxobygshi3pjfodt526qzmlgfefk4hs4vkytngv2bbcedt2mwduq payloads.py: bafybeiflpde45x6zbthxv7c6p6kasju6j2ueqinr66gappc52gwz54vh5e policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm rounds.py: bafybeihczrvkid4lqoai7myqqs4f3g5diqsnjotxtqhxhm5c7oowzifbqy states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeihjq3t43od4sf64rtsuwkrzrjqpngf3ekbefwyeoax5g6eg5sal2m - states/bet_placement.py: bafybeieq3bi2m4m5vclg4nmczqi62hlfp7ftixpamao22wuh4ulx4emlai + states/bet_placement.py: bafybeih5eopyxubczys5u5t3bdxbxpc7mmfdyqrpqsbm2uha5jc2phza4i states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeid6b5dw2tqdojteezx4l23ahkxvqxtx4bqefaqb4dufmhp2a5yc4e + states/decision_receive.py: bafybeifit7auc4onoxjwh2xo4rjcxsbjgthbllnhnlymm2sikf6rspej24 states/decision_request.py: bafybeiarv3r5j7cfvxmudki2llbdl2pvf24p5mvsva6bdgrylnwdyag5xy states/final_states.py: bafybeicjrrojo3gmfaxzicwloyorlnqgzl6a2avevo4nvhoh424zwzmbti states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 4427275e3..f3f361f61 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,10 +27,10 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeie5yy23nkp3k64imugryuv2znb6swo53funveyzu7trmr4fuwklgu +- valory/decision_maker_abci:0.1.0:bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic6jixxyxa46rrhq75z6yunv265vruqeaban6tix2xsugwi2ttnh4 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne -- valory/check_stop_trading_abci:0.1.0:bafybeidlfobaw7p7y5qquy5k2nyalwhmqngwebvmejx6c5muhofulasepm +- valory/check_stop_trading_abci:0.1.0:bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: main: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 46839d6eb..637eee333 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeihdqsjign6jmhtshada3sdbdmu2fp4ipfmbmfz6t3eb6nqtdjbv4i +- valory/decision_maker_abci:0.1.0:bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: From e39c5db887774df76176097dcca8958a6a669378 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Fri, 29 Nov 2024 19:15:02 +0000 Subject: [PATCH 15/16] add expected_mech_response_time to agent config file --- packages/packages.json | 6 +++--- packages/valory/agents/trader/aea-config.yaml | 1 + packages/valory/services/trader/service.yaml | 5 ++++- packages/valory/services/trader_pearl/service.yaml | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index bc5f0bda4..2c4a7baa2 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -21,9 +21,9 @@ "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeic6jixxyxa46rrhq75z6yunv265vruqeaban6tix2xsugwi2ttnh4", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54", - "agent/valory/trader/0.1.0": "bafybeietthlkk27crqqghrqke567ehz4rgtnghmcr56dmcsbqedtppuuxe", - "service/valory/trader/0.1.0": "bafybeicpain222b7acyxcwqvpjpiakajdlura6cn277kgvsgygzjipo5re", - "service/valory/trader_pearl/0.1.0": "bafybeiahb5thh5sdrdh4qru4fuucyoa23f7b27rcwn2sdiboanozbox6dm" + "agent/valory/trader/0.1.0": "bafybeihzj2misk5stgbayf6ohc7ajpziha3fviryhj3ldwuhrcs77a52re", + "service/valory/trader/0.1.0": "bafybeia763ce4ln2hr4d6jqnmiqvpvpmtmna57xtstwsjit4s3kmcwugdy", + "service/valory/trader_pearl/0.1.0": "bafybeig7pxsh7ncvlqn53detpd74wat6ytqbrxjj227ufzx3higwdls2ny" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 87b8b2769..ffbc2c16a 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -245,6 +245,7 @@ models: priority_mech_service_id: ${int:0} requester_staking_instance_address: ${str:0x0000000000000000000000000000000000000000} response_timeout: ${int:300} + expected_mech_response_time: 300 benchmarking_mode: args: enabled: ${bool:false} diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index f46587c7f..4ae2ac07c 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeietthlkk27crqqghrqke567ehz4rgtnghmcr56dmcsbqedtppuuxe +agent: valory/trader:0.1.0:bafybeihzj2misk5stgbayf6ohc7ajpziha3fviryhj3ldwuhrcs77a52re number_of_agents: 4 deployment: agent: @@ -369,6 +369,7 @@ type: skill rebet_chance: ${REBET_CHANCE:float:0.6} mech_interaction_sleep_time: ${MECH_INTERACTION_SLEEP_TIME:int:10} policy_store_update_offset: ${POLICY_STORE_UPDATE_OFFSET:int:259200} + expected_mech_response_time: ${EXPECTED_MECH_RESPONSE_TIME:int:300} benchmark_tool: *id004 acc_info_fields: *id005 network_subgraph: *id006 @@ -486,6 +487,7 @@ type: skill rebet_chance: ${REBET_CHANCE:float:0.6} mech_interaction_sleep_time: ${MECH_INTERACTION_SLEEP_TIME:int:10} policy_store_update_offset: ${POLICY_STORE_UPDATE_OFFSET:int:259200} + expected_mech_response_time: ${EXPECTED_MECH_RESPONSE_TIME:int:300} benchmark_tool: *id004 acc_info_fields: *id005 network_subgraph: *id006 @@ -603,6 +605,7 @@ type: skill rebet_chance: ${REBET_CHANCE:float:0.6} mech_interaction_sleep_time: ${MECH_INTERACTION_SLEEP_TIME:int:10} policy_store_update_offset: ${POLICY_STORE_UPDATE_OFFSET:int:259200} + expected_mech_response_time: ${EXPECTED_MECH_RESPONSE_TIME:int:300} benchmark_tool: *id004 acc_info_fields: *id005 network_subgraph: *id006 diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 805d8c497..6ede73ba1 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeietthlkk27crqqghrqke567ehz4rgtnghmcr56dmcsbqedtppuuxe +agent: valory/trader:0.1.0:bafybeihzj2misk5stgbayf6ohc7ajpziha3fviryhj3ldwuhrcs77a52re number_of_agents: 1 deployment: agent: From 06de47c10ea9172516b75bddacdfb017f26cb764 Mon Sep 17 00:00:00 2001 From: Anna Sambrook Date: Mon, 2 Dec 2024 10:22:38 +0000 Subject: [PATCH 16/16] chore: generators --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../valory/services/trader_pearl/service.yaml | 2 +- .../skills/decision_maker_abci/skill.yaml | 18 +++++++++--------- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 2c4a7baa2..41797ca71 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e", - "skill/valory/trader_abci/0.1.0": "bafybeidenttu34mxf73ueng7wvqrtc73ro265i4vwso65ieusp7ei3r4nu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeic6jixxyxa46rrhq75z6yunv265vruqeaban6tix2xsugwi2ttnh4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeicvz65mfxtxbqizsvd3r3sy7fwyutjfj5a2xu2d5uz7b2fq7xdpp4", + "skill/valory/trader_abci/0.1.0": "bafybeieop75gnpbriiltwvvbwi4p6q242xhnlts7yjur5sgrk5jvi6sr74", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeif23c7z5kfuarlu2ivcw3nbbchrnze3y2nemznnsynghis7w3scky", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54", - "agent/valory/trader/0.1.0": "bafybeihzj2misk5stgbayf6ohc7ajpziha3fviryhj3ldwuhrcs77a52re", - "service/valory/trader/0.1.0": "bafybeia763ce4ln2hr4d6jqnmiqvpvpmtmna57xtstwsjit4s3kmcwugdy", - "service/valory/trader_pearl/0.1.0": "bafybeig7pxsh7ncvlqn53detpd74wat6ytqbrxjj227ufzx3higwdls2ny" + "agent/valory/trader/0.1.0": "bafybeibrpyaz6l4rdcfkdmngh54kmqkxxfkb35clukyccvhupvqs5qcixq", + "service/valory/trader/0.1.0": "bafybeibmmbkop2wroton4tsmhxuxh7uzj6rjcksfowwpl5yuxws7fjl6xy", + "service/valory/trader_pearl/0.1.0": "bafybeidzq7nqxvdvkyjamxrvohrmu7ll2l5ptzo3lgpcnxsiickb2v2gv4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 8258f40bc..15c023a15 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic6jixxyxa46rrhq75z6yunv265vruqeaban6tix2xsugwi2ttnh4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeif23c7z5kfuarlu2ivcw3nbbchrnze3y2nemznnsynghis7w3scky - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e -- valory/trader_abci:0.1.0:bafybeidenttu34mxf73ueng7wvqrtc73ro265i4vwso65ieusp7ei3r4nu +- valory/decision_maker_abci:0.1.0:bafybeicvz65mfxtxbqizsvd3r3sy7fwyutjfj5a2xu2d5uz7b2fq7xdpp4 +- valory/trader_abci:0.1.0:bafybeieop75gnpbriiltwvvbwi4p6q242xhnlts7yjur5sgrk5jvi6sr74 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index bf44b1023..039006831 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeihzj2misk5stgbayf6ohc7ajpziha3fviryhj3ldwuhrcs77a52re +agent: valory/trader:0.1.0:bafybeibrpyaz6l4rdcfkdmngh54kmqkxxfkb35clukyccvhupvqs5qcixq number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index 6ede73ba1..8174168cb 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeihzj2misk5stgbayf6ohc7ajpziha3fviryhj3ldwuhrcs77a52re +agent: valory/trader:0.1.0:bafybeibrpyaz6l4rdcfkdmngh54kmqkxxfkb35clukyccvhupvqs5qcixq number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index c6a936b9a..187549599 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,13 +12,13 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeidjmsljdaw7y5chzzkub63mzf5ydpauch5ugojds5jwpeyvovkq3y + behaviours/base.py: bafybeifjgxzhwzxiky3okgtv4ojumm7fj7bom6qe3ysdvs3cpu32w446g4 behaviours/bet_placement.py: bafybeif3blpj45w4y2ppw5lxkxndsc5crhghevagifuh4fcoofej36bq34 - behaviours/blacklisting.py: bafybeicqwj7o4l7qcym5xjqwq45jngqkhyf44mn6qise2ysyfnlnwz7pdy + behaviours/blacklisting.py: bafybeifitqx2omj5qdwokizhqjkxvybtsyxo22dxkucbtxaocafzgbseku behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e - behaviours/decision_receive.py: bafybeigodaemp7zzcnhbeyozagy4refbrj4k5vd4x4cp7p7ekvufwu4byq - behaviours/decision_request.py: bafybeiabjzzcwcfbfmtoftjhewmkgbhxfnigbc5cwmmxl6cob5gv64jwwa + behaviours/decision_receive.py: bafybeiaph3ft4j3br4k7bddymzv5ffcexmlup2l4prk5rvhqlilxtq57oa + behaviours/decision_request.py: bafybeia22omb7tvocyfe3z2ucn5au5mcas7dg37ha42u7znefzrewjpk7y behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeib3maqohhx35wzryy4otdcjp5thkr4sbp27ksvwidy3pwm444itra behaviours/randomness.py: bafybeiaoj3awyyg2onhpsdsn3dyczs23gr4smuzqcbw3e5ocljwxswjkce @@ -28,22 +28,22 @@ fingerprint: behaviours/storage_manager.py: bafybeiez6daaj2bufxdcsghtmqybyrzdh74z26cc4ajsqsiy5krgjo2tla behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm - fsm_specification.yaml: bafybeiabt2fonv63hozgr7bt4d5auom76iufzh6etpnmbwekktckz7644a + fsm_specification.yaml: bafybeigwlvvi6fav72wg4wz22xjekegenzjnub5efwz5xu6qsrjnxluspq handlers.py: bafybeiafuc7vtyhrv2phep56maadpd4lubipdzw2sszv62r2tz7hzjmsdi io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeibxobygshi3pjfodt526qzmlgfefk4hs4vkytngv2bbcedt2mwduq - payloads.py: bafybeiflpde45x6zbthxv7c6p6kasju6j2ueqinr66gappc52gwz54vh5e + models.py: bafybeiemk4xiphf6sn7ei7rukn2veebeu2pg3j2xy5nqxcizelnkpvivqm + payloads.py: bafybeif3d4qgj635rbnp6a5lgwhgbyilta6mtytjcej2jccorckxbuaev4 policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm rounds.py: bafybeiazjcsukgefair52aw37hhvxzlopnzqqmi4ntqrinakljlcm4kt4a states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeihjq3t43od4sf64rtsuwkrzrjqpngf3ekbefwyeoax5g6eg5sal2m + states/base.py: bafybeifkip6bw3oacpnyhko7fi3i72nv2fc33ld6bkr2myaay4qa2ybcie states/bet_placement.py: bafybeih5eopyxubczys5u5t3bdxbxpc7mmfdyqrpqsbm2uha5jc2phza4i states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni states/claim_subscription.py: bafybeiampifhdoztggwj6gthl2hfzecmjcwnm6nic2o47q4je7j4x3ujne - states/decision_receive.py: bafybeifit7auc4onoxjwh2xo4rjcxsbjgthbllnhnlymm2sikf6rspej24 + states/decision_receive.py: bafybeicnqp4uf47btdkow7ivcozqxfue7u3p7efti3wggxf5iwc2uura3i states/decision_request.py: bafybeiarv3r5j7cfvxmudki2llbdl2pvf24p5mvsva6bdgrylnwdyag5xy states/final_states.py: bafybeicjrrojo3gmfaxzicwloyorlnqgzl6a2avevo4nvhoh424zwzmbti states/handle_failed_tx.py: bafybeihewm2vernvhktuorljdupjqcg2p5vs6wvsira2d62wkoyo5xlzjm diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 56b02ee4e..edd9e72f2 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeigef5xufpkcrwxpekw35zqtxcsliudhagg3bybcnfpgb3hcucwaxm -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeicex6xclnh3tduca2wydokodintbtfxx735fnuckmvtsns6xuyixy +- valory/decision_maker_abci:0.1.0:bafybeicvz65mfxtxbqizsvd3r3sy7fwyutjfj5a2xu2d5uz7b2fq7xdpp4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeif23c7z5kfuarlu2ivcw3nbbchrnze3y2nemznnsynghis7w3scky - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeib75qrimmvensqmskdp5kzki5ijjwolqk2ojekeommakaf64mzn54 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 637eee333..de3d88460 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeie5mnfvqj3aim33gh55sjh6k3n5wwcxn6e7qszmzie3rg4uuxoq3e +- valory/decision_maker_abci:0.1.0:bafybeicvz65mfxtxbqizsvd3r3sy7fwyutjfj5a2xu2d5uz7b2fq7xdpp4 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: