From 896ae55bf09821fb00bcc1ad4c43b4d9b7c5ab12 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 16 Apr 2024 16:31:37 +0200 Subject: [PATCH 1/9] fix: consider pending reqs for credit check --- packages/packages.json | 18 +++--- packages/valory/agents/trader/aea-config.yaml | 12 ++-- packages/valory/services/trader/service.yaml | 2 +- .../skills/check_stop_trading_abci/skill.yaml | 2 +- .../decision_maker_abci/behaviours/base.py | 54 +++++++++--------- .../behaviours/order_subscription.py | 55 ++++++++++++++++++- .../skills/decision_maker_abci/skill.yaml | 8 +-- packages/valory/skills/trader_abci/skill.yaml | 8 +-- .../tx_settlement_multiplexer_abci/skill.yaml | 4 +- 9 files changed, 105 insertions(+), 58 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 27ad03efb..13c1096f8 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,15 +12,17 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je", - "skill/valory/trader_abci/0.1.0": "bafybeibss6panq224ec5eecn2jh5lqzyvptahnlrtxcfz6gvej5mdtdqei", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibcuvrm5fvmh7nuee4tmbof6debprdqzhvhdpzp2dbddtwva4wz3y", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq", + "skill/valory/trader_abci/0.1.0": "bafybeia3irgwcfhizkewv3vk26psv2wt5zesmf24vi2wi6yo5wx3qpobpq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeichy7op6d5wopef55k6tlgfii3w6a65lp4v3j5aa6tfr7352aqzmq", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", - "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii", - "agent/valory/trader/0.1.0": "bafybeieqcfsz3bgh5kkw5fg3zb7laznfv57riclspqfe4eooi4wkq5ds2e", - "service/valory/trader/0.1.0": "bafybeieqm5hdfk22mnqtw4onc3oyqccu6yydop7hdrmuqsucja7vvv55bq" + "skill/valory/check_stop_trading_abci/0.1.0": "bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4", + "skill/valory/mech_interact_abci/0.1.0": "bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4", + "agent/valory/trader/0.1.0": "bafybeie5lkjkpyjhftxghyn4i7x7z4dia4wjzb46w7cvkycioftqd62qam", + "service/valory/trader/0.1.0": "bafybeidpojpzdkmks3tltpkgkcrgtp76jbzbkuwz7thoih7vcjngxixplq" }, "third_party": { + "contract/valory/mech/0.1.0": "bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm", "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", "protocol/valory/abci/0.1.0": "bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u", "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i", @@ -31,7 +33,6 @@ "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm", "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74", "contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa", - "contract/valory/mech/0.1.0": "bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva", "contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "contract/valory/erc20/0.1.0": "bafybeigvftdxjgnlsoemst5d57cor36idywk7bwcfj2bjqijxdxo3xpurq", @@ -45,7 +46,6 @@ "skill/valory/registration_abci/0.1.0": "bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm", "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", - "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", - "skill/valory/mech_interact_abci/0.1.0": "bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq" + "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index b777d25e9..bf5f02619 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -20,7 +20,7 @@ contracts: - valory/service_registry:0.1.0:bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva +- valory/mech:0.1.0:bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -43,13 +43,13 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibcuvrm5fvmh7nuee4tmbof6debprdqzhvhdpzp2dbddtwva4wz3y +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichy7op6d5wopef55k6tlgfii3w6a65lp4v3j5aa6tfr7352aqzmq - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je -- valory/trader_abci:0.1.0:bafybeibss6panq224ec5eecn2jh5lqzyvptahnlrtxcfz6gvej5mdtdqei +- valory/decision_maker_abci:0.1.0:bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq +- valory/trader_abci:0.1.0:bafybeia3irgwcfhizkewv3vk26psv2wt5zesmf24vi2wi6yo5wx3qpobpq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii -- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq +- valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 +- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index f267fc119..8d9a4bdd6 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:bafybeieqcfsz3bgh5kkw5fg3zb7laznfv57riclspqfe4eooi4wkq5ds2e +agent: valory/trader:0.1.0:bafybeie5lkjkpyjhftxghyn4i7x7z4dia4wjzb46w7cvkycioftqd62qam number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/check_stop_trading_abci/skill.yaml b/packages/valory/skills/check_stop_trading_abci/skill.yaml index 39d491055..806e3279f 100644 --- a/packages/valory/skills/check_stop_trading_abci/skill.yaml +++ b/packages/valory/skills/check_stop_trading_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: - valory/service_staking_token:0.1.0:bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e -- valory/mech:0.1.0:bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva +- valory/mech:0.1.0:bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i diff --git a/packages/valory/skills/decision_maker_abci/behaviours/base.py b/packages/valory/skills/decision_maker_abci/behaviours/base.py index 36784a714..6a27f1485 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/base.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/base.py @@ -41,7 +41,7 @@ ) from packages.valory.protocols.contract_api import ContractApiMessage from packages.valory.protocols.ipfs import IpfsMessage -from packages.valory.skills.abstract_round_abci.base import BaseTxPayload +from packages.valory.skills.abstract_round_abci.base import BaseTxPayload, get_name from packages.valory.skills.abstract_round_abci.behaviour_utils import TimeoutException from packages.valory.skills.decision_maker_abci.io_.loader import ComponentPackageLoader from packages.valory.skills.decision_maker_abci.models import ( @@ -62,10 +62,8 @@ ) from packages.valory.skills.transaction_settlement_abci.rounds import TX_HASH_LENGTH - WaitableConditionType = Generator[None, None, bool] - # setting the safe gas to 0 means that all available gas will be used # which is what we want in most cases # more info here: https://safe-docs.dev.gnosisdev.com/safe/docs/contracts_tx_execution/ @@ -244,7 +242,7 @@ def is_wxdai(self) -> bool: @staticmethod def wei_to_native(wei: int) -> float: """Convert WEI to native token.""" - return wei / 10**18 + return wei / 10 ** 18 def _collateral_amount_info(self, amount: int) -> str: """Get a description of the collateral token's amount.""" @@ -286,7 +284,7 @@ def check_balance(self) -> WaitableConditionType: return True def send_message( - self, msg: Message, dialogue: Dialogue, callback: Callable + self, msg: Message, dialogue: Dialogue, callback: Callable ) -> None: """Send a message.""" self.context.outbox.put_message(message=msg) @@ -345,12 +343,12 @@ def download_strategies(self) -> Generator: yield from self.sleep(self.params.sleep_time) def get_bet_amount( - self, - win_probability: float, - confidence: float, - selected_type_tokens_in_pool: int, - other_tokens_in_pool: int, - bet_fee: int, + self, + win_probability: float, + confidence: float, + selected_type_tokens_in_pool: int, + other_tokens_in_pool: int, + bet_fee: int, ) -> Generator[None, None, int]: """Get the bet amount given a specified trading strategy.""" yield from self.download_strategies() @@ -391,9 +389,9 @@ def get_bet_amount( strategies_names = set(self.shared_state.strategies_executables) remaining_strategies = strategies_names - tried_strategies if ( - bet_amount > 0 - or len(remaining_strategies) == 0 - or not self.params.use_fallback_strategy + bet_amount > 0 + or len(remaining_strategies) == 0 + or not self.params.use_fallback_strategy ): break @@ -405,7 +403,7 @@ def get_bet_amount( return bet_amount def default_error( - self, contract_id: str, contract_callable: str, response_msg: ContractApiMessage + self, contract_id: str, contract_callable: str, response_msg: ContractApiMessage ) -> None: """Return a default contract interaction error message.""" self.context.logger.error( @@ -430,14 +428,14 @@ def _propagate_contract_messages(self, response_msg: ContractApiMessage) -> bool return False def contract_interact( - self, - performative: ContractApiMessage.Performative, - contract_address: str, - contract_public_id: PublicId, - contract_callable: str, - data_key: str, - placeholder: str, - **kwargs: Any, + self, + performative: ContractApiMessage.Performative, + contract_address: str, + contract_public_id: PublicId, + contract_callable: str, + data_key: str, + placeholder: str, + **kwargs: Any, ) -> WaitableConditionType: """Interact with a contract.""" contract_id = str(contract_public_id) @@ -463,7 +461,7 @@ def contract_interact( return True def _mech_contract_interact( - self, contract_callable: str, data_key: str, placeholder: str, **kwargs: Any + self, contract_callable: str, data_key: str, placeholder: str, **kwargs: Any ) -> WaitableConditionType: """Interact with the mech contract.""" status = yield from self.contract_interact( @@ -478,7 +476,7 @@ def _mech_contract_interact( return status def _build_multisend_data( - self, + self, ) -> WaitableConditionType: """Get the multisend tx.""" response_msg = yield from self.get_contract_api_response( @@ -544,9 +542,9 @@ def _build_multisend_safe_tx_hash(self) -> WaitableConditionType: return True def wait_for_condition_with_sleep( - self, - condition_gen: Callable[[], WaitableConditionType], - timeout: Optional[float] = None, + self, + condition_gen: Callable[[], WaitableConditionType], + timeout: Optional[float] = None, ) -> Generator[None, None, None]: """Wait for a condition to happen and sleep in-between checks. 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 eac6e4e8a..a0a8ea6ac 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -27,6 +27,7 @@ TransferNftCondition, ) from packages.valory.protocols.contract_api import ContractApiMessage +from packages.valory.skills.abstract_round_abci.base import get_name from packages.valory.skills.decision_maker_abci.behaviours.base import ( BaseSubscriptionBehaviour, WXDAI, @@ -65,6 +66,8 @@ def __init__(self, **kwargs: Any) -> None: self.approval_tx: str = "" self.balance: int = 0 self.agreement_id: str = "" + self.credits_per_req: int = 0 + self.pending_reqs: int = 0 def _get_condition_ids( self, agreement_id_seed: str, did_doc: Dict[str, Any] @@ -251,15 +254,61 @@ def _prepare_approval_tx( ) return True + + def _get_pending_requests(self) -> Generator[None, None, bool]: + """Get the required balance for the subscription.""" + result = yield from self._mech_contract_interact( + contract_callable="get_pending_requests", + data_key="pending_requests", + placeholder="pending_reqs", + ) + if not result: + self.context.logger.info("Could not get the required balance.") + return False + + return result + + def _get_nevermined_price(self) -> Generator[None, None, bool]: + """Get the price of the subscription.""" + result = yield from self._mech_contract_interact( + contract_callable="get_price", + data_key="price", + placeholder="credits_per_req", + ) + if not result: + self.context.logger.info("Could not get the price.") + return False + + return result + def _should_purchase(self) -> Generator[None, None, bool]: """Check if the subscription should be purchased.""" if not self.params.use_nevermined: self.context.logger.info("Nevermined subscriptions are turned off.") return False - has_balance = yield from self._has_positive_nft_balance() - # in case there is no balance on the safe, we purchase - return not has_balance + result = yield from self._get_nevermined_price() + if not result: + self.context.logger.info("Could not get the nevermined price.") + return False + + result = yield from self._get_pending_requests() + if not result: + self.context.logger.info("Could not get the pending requests.") + return False + + result = yield from self._get_nft_balance( + self.token_address, + self.synchronized_data.safe_contract_address, + zero_x_transformer(no_did_prefixed(self.did)), + ) + if not result: + self.context.logger.warning("Failed to get balance") + return False + + credits_required = (self.pending_reqs + 1) * self.credits_per_req + + return credits_required > self.balance def get_payload_content(self) -> Generator[None, None, str]: """Get the payload.""" diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 4630ee44f..1fac95227 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,14 +12,14 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeicg37b76cic7zuy2uvskhl7ohgv74o74w2fjbojwydhvh3hrywoz4 + behaviours/base.py: bafybeihlkb5n6vhwg6awy7ad5p4b3n4gidz34eyejbkyhxrhvvgmtl4pie behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeifygejified3yoza3gy4g7ina6m4lmz4pp2abtwfuwrmiwznnvrua + behaviours/order_subscription.py: bafybeigpfhuqgow4wtwee5hy4jhsvyxdyxds2szb4ar6gwt4lr6qk634ti behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q behaviours/reedem.py: bafybeihwe4azke5zbdu4rhhsx3bmjgnkagwkuowyowvkure2do2rg4ainy behaviours/round_behaviour.py: bafybeidrks62unrnoyp3jnbz2nozgnittfntyknymuuja7jwcsjuap4fve @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeigvftdxjgnlsoemst5d57cor36idywk7bwcfj2bjqijxdxo3xpurq - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva +- valory/mech:0.1.0:bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq +- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 7891429a4..51d1f1a41 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,11 +25,11 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibcuvrm5fvmh7nuee4tmbof6debprdqzhvhdpzp2dbddtwva4wz3y +- valory/decision_maker_abci:0.1.0:bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichy7op6d5wopef55k6tlgfii3w6a65lp4v3j5aa6tfr7352aqzmq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii -- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq +- valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 +- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 960e65895..ad5a13f83 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeibvq365gs7ibi7bkzoqyiirdcbpros2q7z3zpsqxhbcfy5d77y7je +- valory/decision_maker_abci:0.1.0:bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq +- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 behaviours: main: args: {} From 25bdbbca182a8e65adffc931f96ccd9eb5f3d570 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 16 Apr 2024 16:47:35 +0200 Subject: [PATCH 2/9] fix: add `sender_address` to `_get_pending_requests` --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/order_subscription.py | 1 + .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 13c1096f8..c520f2f26 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,17 +12,16 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq", - "skill/valory/trader_abci/0.1.0": "bafybeia3irgwcfhizkewv3vk26psv2wt5zesmf24vi2wi6yo5wx3qpobpq", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeichy7op6d5wopef55k6tlgfii3w6a65lp4v3j5aa6tfr7352aqzmq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq", + "skill/valory/trader_abci/0.1.0": "bafybeifwt4z2mgwj6nbojk6biesg3zmwlk63jwkjkcmh37ftpmugray56i", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigzo446pn7ek5napocvximdscfooqj6sg55g64om7in2uf5ccr2xy", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4", "skill/valory/mech_interact_abci/0.1.0": "bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4", - "agent/valory/trader/0.1.0": "bafybeie5lkjkpyjhftxghyn4i7x7z4dia4wjzb46w7cvkycioftqd62qam", - "service/valory/trader/0.1.0": "bafybeidpojpzdkmks3tltpkgkcrgtp76jbzbkuwz7thoih7vcjngxixplq" + "agent/valory/trader/0.1.0": "bafybeifnehe63dyxy3tg27mdff4jimee6vxgy2fkzrcrwmbae7bfuoef2q", + "service/valory/trader/0.1.0": "bafybeietaswpdzg252gmoafgvb2y5guyng37orlcr6cpkv3f4bmhkqd4s4" }, "third_party": { - "contract/valory/mech/0.1.0": "bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm", "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", "protocol/valory/abci/0.1.0": "bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u", "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i", @@ -31,6 +30,7 @@ "protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe", "protocol/valory/tendermint/0.1.0": "bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra", "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm", + "contract/valory/mech/0.1.0": "bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm", "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74", "contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa", "contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index bf5f02619..49e9794b6 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,10 +43,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichy7op6d5wopef55k6tlgfii3w6a65lp4v3j5aa6tfr7352aqzmq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigzo446pn7ek5napocvximdscfooqj6sg55g64om7in2uf5ccr2xy - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq -- valory/trader_abci:0.1.0:bafybeia3irgwcfhizkewv3vk26psv2wt5zesmf24vi2wi6yo5wx3qpobpq +- valory/decision_maker_abci:0.1.0:bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq +- valory/trader_abci:0.1.0:bafybeifwt4z2mgwj6nbojk6biesg3zmwlk63jwkjkcmh37ftpmugray56i - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 - valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 8d9a4bdd6..63b45c739 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:bafybeie5lkjkpyjhftxghyn4i7x7z4dia4wjzb46w7cvkycioftqd62qam +agent: valory/trader:0.1.0:bafybeifnehe63dyxy3tg27mdff4jimee6vxgy2fkzrcrwmbae7bfuoef2q number_of_agents: 4 deployment: {} --- 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 a0a8ea6ac..1bae692e7 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -261,6 +261,7 @@ def _get_pending_requests(self) -> Generator[None, None, bool]: contract_callable="get_pending_requests", data_key="pending_requests", placeholder="pending_reqs", + sender_address=self.synchronized_data.safe_contract_address, ) if not result: self.context.logger.info("Could not get the required balance.") diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 1fac95227..617aea7e3 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeigpfhuqgow4wtwee5hy4jhsvyxdyxds2szb4ar6gwt4lr6qk634ti + behaviours/order_subscription.py: bafybeifw66sp4sfvx65qikxjlehxbhgyvmwqaeoy43wsdepwte7oypsoie behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q behaviours/reedem.py: bafybeihwe4azke5zbdu4rhhsx3bmjgnkagwkuowyowvkure2do2rg4ainy behaviours/round_behaviour.py: bafybeidrks62unrnoyp3jnbz2nozgnittfntyknymuuja7jwcsjuap4fve diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 51d1f1a41..0699c272e 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichy7op6d5wopef55k6tlgfii3w6a65lp4v3j5aa6tfr7352aqzmq +- valory/decision_maker_abci:0.1.0:bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigzo446pn7ek5napocvximdscfooqj6sg55g64om7in2uf5ccr2xy - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 - valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index ad5a13f83..b732436f7 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeiacthncffkekdhrcdef7narsyjwmqxwycv5p6wi3djft6uyml2klq +- valory/decision_maker_abci:0.1.0:bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 behaviours: From 4d9e0826ebfbe35fa1c7c6ade8ff77cb9229ade9 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 16 Apr 2024 21:31:16 +0200 Subject: [PATCH 3/9] temp: mech interact fix --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index c520f2f26..19fb8f552 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,14 +12,14 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq", - "skill/valory/trader_abci/0.1.0": "bafybeifwt4z2mgwj6nbojk6biesg3zmwlk63jwkjkcmh37ftpmugray56i", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigzo446pn7ek5napocvximdscfooqj6sg55g64om7in2uf5ccr2xy", + "skill/valory/decision_maker_abci/0.1.0": "bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34", + "skill/valory/trader_abci/0.1.0": "bafybeievmr6mclc2mytlp6r4yhnbqtjzkjwfsn7vwoqjhfxrskrcn4vr4e", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeichsxv4cutr4tb4svdlaobxgk5ywvwrzhnwt2t743vwisjiwwlaoq", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4", - "skill/valory/mech_interact_abci/0.1.0": "bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4", - "agent/valory/trader/0.1.0": "bafybeifnehe63dyxy3tg27mdff4jimee6vxgy2fkzrcrwmbae7bfuoef2q", - "service/valory/trader/0.1.0": "bafybeietaswpdzg252gmoafgvb2y5guyng37orlcr6cpkv3f4bmhkqd4s4" + "skill/valory/mech_interact_abci/0.1.0": "bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe", + "agent/valory/trader/0.1.0": "bafybeiegfix7lv6ppjhghzxcekbw3jiifxqkgxb2cqgnet3d6wdsxob57a", + "service/valory/trader/0.1.0": "bafybeifbn3gdgw6p72haurssc7ishpwdltt76o6bafx5kxkkytxybzdhiu" }, "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 49e9794b6..34a290b33 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,13 +43,13 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigzo446pn7ek5napocvximdscfooqj6sg55g64om7in2uf5ccr2xy +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichsxv4cutr4tb4svdlaobxgk5ywvwrzhnwt2t743vwisjiwwlaoq - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq -- valory/trader_abci:0.1.0:bafybeifwt4z2mgwj6nbojk6biesg3zmwlk63jwkjkcmh37ftpmugray56i +- valory/decision_maker_abci:0.1.0:bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34 +- valory/trader_abci:0.1.0:bafybeievmr6mclc2mytlp6r4yhnbqtjzkjwfsn7vwoqjhfxrskrcn4vr4e - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 -- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 +- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 63b45c739..13ac03f31 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:bafybeifnehe63dyxy3tg27mdff4jimee6vxgy2fkzrcrwmbae7bfuoef2q +agent: valory/trader:0.1.0:bafybeiegfix7lv6ppjhghzxcekbw3jiifxqkgxb2cqgnet3d6wdsxob57a number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 617aea7e3..929663660 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 +- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 0699c272e..eced6af44 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,11 +25,11 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigzo446pn7ek5napocvximdscfooqj6sg55g64om7in2uf5ccr2xy +- valory/decision_maker_abci:0.1.0:bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichsxv4cutr4tb4svdlaobxgk5ywvwrzhnwt2t743vwisjiwwlaoq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 -- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 +- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index b732436f7..248ede9b5 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeigvoa3ts4olx3hhf5aruzcjqvgvmju4zba4wfkiwp5dlggspkyqyq +- valory/decision_maker_abci:0.1.0:bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34 - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/mech_interact_abci:0.1.0:bafybeidbgr4jvebtlc2eqzze2k4sgticc2y2tsl2q2vlubakuoefc5sme4 +- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe behaviours: main: args: {} From 9e41ffe7a2f5861dac33a8544fb2c01389035668 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 17 Apr 2024 15:24:45 +0200 Subject: [PATCH 4/9] fix: use new packages from `IEKit` --- packages/packages.json | 18 +++++++++--------- packages/valory/agents/trader/aea-config.yaml | 12 ++++++------ packages/valory/services/trader/service.yaml | 2 +- .../skills/check_stop_trading_abci/skill.yaml | 2 +- .../skills/decision_maker_abci/skill.yaml | 4 ++-- packages/valory/skills/trader_abci/skill.yaml | 8 ++++---- .../tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 19fb8f552..feacad11e 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,14 +12,13 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34", - "skill/valory/trader_abci/0.1.0": "bafybeievmr6mclc2mytlp6r4yhnbqtjzkjwfsn7vwoqjhfxrskrcn4vr4e", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeichsxv4cutr4tb4svdlaobxgk5ywvwrzhnwt2t743vwisjiwwlaoq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he", + "skill/valory/trader_abci/0.1.0": "bafybeifycot4htyqdeyh4hvs64dkokn5wcdf375s6pebd3rvc5iqxwhfcy", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeighdimm77bimlbmij62pakwop3gvfkjulfaajl4zexgrecz4wg2v4", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", - "skill/valory/check_stop_trading_abci/0.1.0": "bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4", - "skill/valory/mech_interact_abci/0.1.0": "bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe", - "agent/valory/trader/0.1.0": "bafybeiegfix7lv6ppjhghzxcekbw3jiifxqkgxb2cqgnet3d6wdsxob57a", - "service/valory/trader/0.1.0": "bafybeifbn3gdgw6p72haurssc7ishpwdltt76o6bafx5kxkkytxybzdhiu" + "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii", + "agent/valory/trader/0.1.0": "bafybeihsslqdadjm5crcs4yvxpbt4olzhlv5rq532iczf4f7qwdci34a6y", + "service/valory/trader/0.1.0": "bafybeictlmyjdpjmjo7i427c7tzwwwums7ig57jwcffgmikmrdiv3a6voe" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", @@ -30,9 +29,9 @@ "protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe", "protocol/valory/tendermint/0.1.0": "bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra", "protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm", - "contract/valory/mech/0.1.0": "bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm", "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeib6podeifufgmawvicm3xyz3uaplbcrsptjzz4unpseh7qtcpar74", "contract/valory/gnosis_safe/0.1.0": "bafybeibq77mgzhyb23blf2eqmia3kc6io5karedfzhntvpcebeqdzrgyqa", + "contract/valory/mech/0.1.0": "bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva", "contract/valory/service_registry/0.1.0": "bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "contract/valory/erc20/0.1.0": "bafybeigvftdxjgnlsoemst5d57cor36idywk7bwcfj2bjqijxdxo3xpurq", @@ -46,6 +45,7 @@ "skill/valory/registration_abci/0.1.0": "bafybeiek7zcsxbucjwzgqfftafhfrocvc7q4yxllh2q44jeemsjxg3rcfm", "skill/valory/abstract_round_abci/0.1.0": "bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i", "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq", - "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44" + "skill/valory/termination_abci/0.1.0": "bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44", + "skill/valory/mech_interact_abci/0.1.0": "bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq" } } \ No newline at end of file diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 34a290b33..f6b31abc5 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -20,7 +20,7 @@ contracts: - valory/service_registry:0.1.0:bafybeicbxmbzt757lbmyh6762lrkcrp3oeum6dk3z7pvosixasifsk6xlm - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm +- valory/mech:0.1.0:bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -43,13 +43,13 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichsxv4cutr4tb4svdlaobxgk5ywvwrzhnwt2t743vwisjiwwlaoq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighdimm77bimlbmij62pakwop3gvfkjulfaajl4zexgrecz4wg2v4 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34 -- valory/trader_abci:0.1.0:bafybeievmr6mclc2mytlp6r4yhnbqtjzkjwfsn7vwoqjhfxrskrcn4vr4e +- valory/decision_maker_abci:0.1.0:bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he +- valory/trader_abci:0.1.0:bafybeifycot4htyqdeyh4hvs64dkokn5wcdf375s6pebd3rvc5iqxwhfcy - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 -- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe +- valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq customs: - valory/mike_strat:0.1.0:bafybeihjiol7f4ch4piwfikurdtfwzsh6qydkbsztpbwbwb2yrqdqf726m - valory/bet_amount_per_threshold:0.1.0:bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 13ac03f31..a58530dc1 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:bafybeiegfix7lv6ppjhghzxcekbw3jiifxqkgxb2cqgnet3d6wdsxob57a +agent: valory/trader:0.1.0:bafybeihsslqdadjm5crcs4yvxpbt4olzhlv5rq532iczf4f7qwdci34a6y number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/check_stop_trading_abci/skill.yaml b/packages/valory/skills/check_stop_trading_abci/skill.yaml index 806e3279f..39d491055 100644 --- a/packages/valory/skills/check_stop_trading_abci/skill.yaml +++ b/packages/valory/skills/check_stop_trading_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint_ignore_patterns: [] connections: [] contracts: - valory/service_staking_token:0.1.0:bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e -- valory/mech:0.1.0:bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm +- valory/mech:0.1.0:bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 929663660..d69afdbd0 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -62,7 +62,7 @@ contracts: - valory/market_maker:0.1.0:bafybeihyi42hkmu2knrunfdbunjh6j3ibfrnwj7rmqw7mm7pmerzcwzfiq - valory/erc20:0.1.0:bafybeigvftdxjgnlsoemst5d57cor36idywk7bwcfj2bjqijxdxo3xpurq - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/mech:0.1.0:bafybeiayv7irtodu5hgaveixv7idkc5jva4gyfjcehkio7zfx7iiznc2bm +- valory/mech:0.1.0:bafybeiejkna5d7hllaxm6avsnffxfs6n4nx2lncmjz6iodkt2xhcy3mbva - valory/conditional_tokens:0.1.0:bafybeigucumqbsk74nj4rpm4p2cpiky4dj6uws7nfmgpimuviaxcamwqnu - valory/realitio:0.1.0:bafybeic5ie4oodetj4krdogydvbfxg4qggc3matpiflocah626tpevpreq - valory/realitio_proxy:0.1.0:bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4 @@ -76,7 +76,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: main: args: {} diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index eced6af44..2b190aa3b 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,11 +25,11 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeichsxv4cutr4tb4svdlaobxgk5ywvwrzhnwt2t743vwisjiwwlaoq +- valory/decision_maker_abci:0.1.0:bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighdimm77bimlbmij62pakwop3gvfkjulfaajl4zexgrecz4wg2v4 - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/check_stop_trading_abci:0.1.0:bafybeibry7nmbug5bdkl4gza537wolyn72ju52v2patsfxovqe6c7c4nf4 -- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe +- valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 248ede9b5..913752ba4 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,9 +21,9 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeifkxudani7palj3qieq77wlvfjk6abhh5b24abhd6g6ectplqbv34 +- valory/decision_maker_abci:0.1.0:bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 -- valory/mech_interact_abci:0.1.0:bafybeih2duydujs4gc4oakxa4ngwrjexgwyitnibro6pbdgeoxmbzimyfe +- valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: main: args: {} From 14d525910de286bbfb55a7bd74da3c08d8dd014b Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 17 Apr 2024 15:37:28 +0200 Subject: [PATCH 5/9] chore: lint --- packages/packages.json | 10 ++-- packages/valory/agents/trader/aea-config.yaml | 6 +-- packages/valory/services/trader/service.yaml | 2 +- .../decision_maker_abci/behaviours/base.py | 51 ++++++++++--------- .../behaviours/order_subscription.py | 1 - .../skills/decision_maker_abci/skill.yaml | 4 +- packages/valory/skills/trader_abci/skill.yaml | 4 +- .../tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index feacad11e..c1d9dca88 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,13 +12,13 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he", - "skill/valory/trader_abci/0.1.0": "bafybeifycot4htyqdeyh4hvs64dkokn5wcdf375s6pebd3rvc5iqxwhfcy", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeighdimm77bimlbmij62pakwop3gvfkjulfaajl4zexgrecz4wg2v4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi", + "skill/valory/trader_abci/0.1.0": "bafybeiewhitzypnck72sghzpz5lqhqkoxpzfxu2rsgmw5kuwl4mf2ylipm", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeih5kkptj6rpno4gp3o3vnfvq7nxz72okbzfyudtik7phqafvouedq", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii", - "agent/valory/trader/0.1.0": "bafybeihsslqdadjm5crcs4yvxpbt4olzhlv5rq532iczf4f7qwdci34a6y", - "service/valory/trader/0.1.0": "bafybeictlmyjdpjmjo7i427c7tzwwwums7ig57jwcffgmikmrdiv3a6voe" + "agent/valory/trader/0.1.0": "bafybeicizg4zcczsh2bmnkfvi5mbr75nwsnvr4hbmqyjgl52aqyheoej7q", + "service/valory/trader/0.1.0": "bafybeif7qansrtlb76xctaeansiwrgcj7vm727skq5ikijv3t4obvniiky" }, "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 f6b31abc5..054664b04 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,10 +43,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighdimm77bimlbmij62pakwop3gvfkjulfaajl4zexgrecz4wg2v4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5kkptj6rpno4gp3o3vnfvq7nxz72okbzfyudtik7phqafvouedq - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he -- valory/trader_abci:0.1.0:bafybeifycot4htyqdeyh4hvs64dkokn5wcdf375s6pebd3rvc5iqxwhfcy +- valory/decision_maker_abci:0.1.0:bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi +- valory/trader_abci:0.1.0:bafybeiewhitzypnck72sghzpz5lqhqkoxpzfxu2rsgmw5kuwl4mf2ylipm - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index a58530dc1..de70c123b 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:bafybeihsslqdadjm5crcs4yvxpbt4olzhlv5rq532iczf4f7qwdci34a6y +agent: valory/trader:0.1.0:bafybeicizg4zcczsh2bmnkfvi5mbr75nwsnvr4hbmqyjgl52aqyheoej7q number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/behaviours/base.py b/packages/valory/skills/decision_maker_abci/behaviours/base.py index 6a27f1485..643c6f690 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/base.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/base.py @@ -62,6 +62,7 @@ ) from packages.valory.skills.transaction_settlement_abci.rounds import TX_HASH_LENGTH + WaitableConditionType = Generator[None, None, bool] # setting the safe gas to 0 means that all available gas will be used @@ -242,7 +243,7 @@ def is_wxdai(self) -> bool: @staticmethod def wei_to_native(wei: int) -> float: """Convert WEI to native token.""" - return wei / 10 ** 18 + return wei / 10**18 def _collateral_amount_info(self, amount: int) -> str: """Get a description of the collateral token's amount.""" @@ -284,7 +285,7 @@ def check_balance(self) -> WaitableConditionType: return True def send_message( - self, msg: Message, dialogue: Dialogue, callback: Callable + self, msg: Message, dialogue: Dialogue, callback: Callable ) -> None: """Send a message.""" self.context.outbox.put_message(message=msg) @@ -343,12 +344,12 @@ def download_strategies(self) -> Generator: yield from self.sleep(self.params.sleep_time) def get_bet_amount( - self, - win_probability: float, - confidence: float, - selected_type_tokens_in_pool: int, - other_tokens_in_pool: int, - bet_fee: int, + self, + win_probability: float, + confidence: float, + selected_type_tokens_in_pool: int, + other_tokens_in_pool: int, + bet_fee: int, ) -> Generator[None, None, int]: """Get the bet amount given a specified trading strategy.""" yield from self.download_strategies() @@ -389,9 +390,9 @@ def get_bet_amount( strategies_names = set(self.shared_state.strategies_executables) remaining_strategies = strategies_names - tried_strategies if ( - bet_amount > 0 - or len(remaining_strategies) == 0 - or not self.params.use_fallback_strategy + bet_amount > 0 + or len(remaining_strategies) == 0 + or not self.params.use_fallback_strategy ): break @@ -403,7 +404,7 @@ def get_bet_amount( return bet_amount def default_error( - self, contract_id: str, contract_callable: str, response_msg: ContractApiMessage + self, contract_id: str, contract_callable: str, response_msg: ContractApiMessage ) -> None: """Return a default contract interaction error message.""" self.context.logger.error( @@ -428,14 +429,14 @@ def _propagate_contract_messages(self, response_msg: ContractApiMessage) -> bool return False def contract_interact( - self, - performative: ContractApiMessage.Performative, - contract_address: str, - contract_public_id: PublicId, - contract_callable: str, - data_key: str, - placeholder: str, - **kwargs: Any, + self, + performative: ContractApiMessage.Performative, + contract_address: str, + contract_public_id: PublicId, + contract_callable: str, + data_key: str, + placeholder: str, + **kwargs: Any, ) -> WaitableConditionType: """Interact with a contract.""" contract_id = str(contract_public_id) @@ -461,7 +462,7 @@ def contract_interact( return True def _mech_contract_interact( - self, contract_callable: str, data_key: str, placeholder: str, **kwargs: Any + self, contract_callable: str, data_key: str, placeholder: str, **kwargs: Any ) -> WaitableConditionType: """Interact with the mech contract.""" status = yield from self.contract_interact( @@ -476,7 +477,7 @@ def _mech_contract_interact( return status def _build_multisend_data( - self, + self, ) -> WaitableConditionType: """Get the multisend tx.""" response_msg = yield from self.get_contract_api_response( @@ -542,9 +543,9 @@ def _build_multisend_safe_tx_hash(self) -> WaitableConditionType: return True def wait_for_condition_with_sleep( - self, - condition_gen: Callable[[], WaitableConditionType], - timeout: Optional[float] = None, + self, + condition_gen: Callable[[], WaitableConditionType], + timeout: Optional[float] = None, ) -> Generator[None, None, None]: """Wait for a condition to happen and sleep in-between checks. 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 1bae692e7..04ba99c6e 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -254,7 +254,6 @@ def _prepare_approval_tx( ) return True - def _get_pending_requests(self) -> Generator[None, None, bool]: """Get the required balance for the subscription.""" result = yield from self._mech_contract_interact( diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index d69afdbd0..4df780e5e 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,14 +12,14 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeihlkb5n6vhwg6awy7ad5p4b3n4gidz34eyejbkyhxrhvvgmtl4pie + behaviours/base.py: bafybeiaotogef77xlg4oobziys64jk6nuclm2lhowlaas6qom6mr6xtm6y behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeifw66sp4sfvx65qikxjlehxbhgyvmwqaeoy43wsdepwte7oypsoie + behaviours/order_subscription.py: bafybeiayyuumbn7nwoi5xazqyexg347hlp3mmgj2ytj7tpcpbincid6ufa behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q behaviours/reedem.py: bafybeihwe4azke5zbdu4rhhsx3bmjgnkagwkuowyowvkure2do2rg4ainy behaviours/round_behaviour.py: bafybeidrks62unrnoyp3jnbz2nozgnittfntyknymuuja7jwcsjuap4fve diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 2b190aa3b..cb2f226b6 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeighdimm77bimlbmij62pakwop3gvfkjulfaajl4zexgrecz4wg2v4 +- valory/decision_maker_abci:0.1.0:bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5kkptj6rpno4gp3o3vnfvq7nxz72okbzfyudtik7phqafvouedq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 913752ba4..08033e3bd 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeift2k3pjrxf47ara62ueai2gbbghebtha4tqpntdxojjfyqfan5he +- valory/decision_maker_abci:0.1.0:bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: From 40e7ca601274d5fc27ffb68fc2691721d49ab84e Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 17 Apr 2024 15:43:43 +0200 Subject: [PATCH 6/9] chore: lint --- packages/valory/skills/decision_maker_abci/behaviours/base.py | 2 +- .../skills/decision_maker_abci/behaviours/order_subscription.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/valory/skills/decision_maker_abci/behaviours/base.py b/packages/valory/skills/decision_maker_abci/behaviours/base.py index 643c6f690..d009e305d 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/base.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/base.py @@ -41,7 +41,7 @@ ) from packages.valory.protocols.contract_api import ContractApiMessage from packages.valory.protocols.ipfs import IpfsMessage -from packages.valory.skills.abstract_round_abci.base import BaseTxPayload, get_name +from packages.valory.skills.abstract_round_abci.base import BaseTxPayload from packages.valory.skills.abstract_round_abci.behaviour_utils import TimeoutException from packages.valory.skills.decision_maker_abci.io_.loader import ComponentPackageLoader from packages.valory.skills.decision_maker_abci.models import ( 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 04ba99c6e..6072f9073 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -27,7 +27,6 @@ TransferNftCondition, ) from packages.valory.protocols.contract_api import ContractApiMessage -from packages.valory.skills.abstract_round_abci.base import get_name from packages.valory.skills.decision_maker_abci.behaviours.base import ( BaseSubscriptionBehaviour, WXDAI, From 55c520fbd7885b57991e11c4e595d808d1c2690e Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 17 Apr 2024 15:46:53 +0200 Subject: [PATCH 7/9] chore: generators --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- packages/valory/skills/decision_maker_abci/skill.yaml | 4 ++-- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index c1d9dca88..f066d6100 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,13 +12,13 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi", - "skill/valory/trader_abci/0.1.0": "bafybeiewhitzypnck72sghzpz5lqhqkoxpzfxu2rsgmw5kuwl4mf2ylipm", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeih5kkptj6rpno4gp3o3vnfvq7nxz72okbzfyudtik7phqafvouedq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4", + "skill/valory/trader_abci/0.1.0": "bafybeiewidlma3lyhzm3eawc43iknw4go4dzbhbtmc2ccy4epyxcqcaba4", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiceotqhhadsvmuf3xpv7jjm3mtqe5uy5o5mq5dhf6p33hshyerli4", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii", - "agent/valory/trader/0.1.0": "bafybeicizg4zcczsh2bmnkfvi5mbr75nwsnvr4hbmqyjgl52aqyheoej7q", - "service/valory/trader/0.1.0": "bafybeif7qansrtlb76xctaeansiwrgcj7vm727skq5ikijv3t4obvniiky" + "agent/valory/trader/0.1.0": "bafybeihgxw4h42apdhk5ddsgfqr36tlrmhrt5osgvdfl2m6ejw435yj56i", + "service/valory/trader/0.1.0": "bafybeiaqwuw4h6jdpix7nm4gehu2penq7l6qsxlgels3jodvj6ly6vjq2y" }, "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 054664b04..33d7d5c3c 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,10 +43,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5kkptj6rpno4gp3o3vnfvq7nxz72okbzfyudtik7phqafvouedq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiceotqhhadsvmuf3xpv7jjm3mtqe5uy5o5mq5dhf6p33hshyerli4 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi -- valory/trader_abci:0.1.0:bafybeiewhitzypnck72sghzpz5lqhqkoxpzfxu2rsgmw5kuwl4mf2ylipm +- valory/decision_maker_abci:0.1.0:bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4 +- valory/trader_abci:0.1.0:bafybeiewidlma3lyhzm3eawc43iknw4go4dzbhbtmc2ccy4epyxcqcaba4 - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index de70c123b..df65312c7 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:bafybeicizg4zcczsh2bmnkfvi5mbr75nwsnvr4hbmqyjgl52aqyheoej7q +agent: valory/trader:0.1.0:bafybeihgxw4h42apdhk5ddsgfqr36tlrmhrt5osgvdfl2m6ejw435yj56i number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 4df780e5e..266991896 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,14 +12,14 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeiaotogef77xlg4oobziys64jk6nuclm2lhowlaas6qom6mr6xtm6y + behaviours/base.py: bafybeidmbu5ymqjbxhnb6nu5zx3tnc77gq7tzwitjo7eq65hhpga3sj23q behaviours/bet_placement.py: bafybeib7jgq7iyfoyj3ur3xkj6knh7t7vr32kc743ztyjskkdevyh6l75q behaviours/blacklisting.py: bafybeid2kwsrq3ityeqsixalpaxwwiduo3lvqs5uzqhw5yfccqz5hqm6im behaviours/claim_subscription.py: bafybeihv5dg74deifzk46ppdwcvz6lgamgl6m7qr6sgqv2zie35j2576ca behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeiayyuumbn7nwoi5xazqyexg347hlp3mmgj2ytj7tpcpbincid6ufa + behaviours/order_subscription.py: bafybeihuxxr72bnpfz2foq6zqxa2tnejg4ewkypvynmtwa3jwvfwwauugm behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q behaviours/reedem.py: bafybeihwe4azke5zbdu4rhhsx3bmjgnkagwkuowyowvkure2do2rg4ainy behaviours/round_behaviour.py: bafybeidrks62unrnoyp3jnbz2nozgnittfntyknymuuja7jwcsjuap4fve diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index cb2f226b6..15ba4dc52 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeih5kkptj6rpno4gp3o3vnfvq7nxz72okbzfyudtik7phqafvouedq +- valory/decision_maker_abci:0.1.0:bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiceotqhhadsvmuf3xpv7jjm3mtqe5uy5o5mq5dhf6p33hshyerli4 - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 08033e3bd..4e7d52f8e 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeid6gycgprmua6alcb57eew2rwja6c7osrvjlhjby5tf5n5n2g6ggi +- valory/decision_maker_abci:0.1.0:bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4 - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: From f0d03fe6910906419e7577518d337446a5cd4e15 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 17 Apr 2024 20:42:30 +0200 Subject: [PATCH 8/9] chore: address comments --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/order_subscription.py | 3 +-- packages/valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index f066d6100..6aa7c1653 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,13 +12,13 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4", - "skill/valory/trader_abci/0.1.0": "bafybeiewidlma3lyhzm3eawc43iknw4go4dzbhbtmc2ccy4epyxcqcaba4", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiceotqhhadsvmuf3xpv7jjm3mtqe5uy5o5mq5dhf6p33hshyerli4", + "skill/valory/decision_maker_abci/0.1.0": "bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4", + "skill/valory/trader_abci/0.1.0": "bafybeiab5zrbmtuaobo43ravuabcun6jvhycdunnhysyluxwpx5a6ke2wq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidzkegvlo7wfn3uwvysd7vnjy7stgnj47s4fdz5smbw4y346p2vte", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii", - "agent/valory/trader/0.1.0": "bafybeihgxw4h42apdhk5ddsgfqr36tlrmhrt5osgvdfl2m6ejw435yj56i", - "service/valory/trader/0.1.0": "bafybeiaqwuw4h6jdpix7nm4gehu2penq7l6qsxlgels3jodvj6ly6vjq2y" + "agent/valory/trader/0.1.0": "bafybeidjmjrvtdqitarhyrrvddx4vfcts6oenulo3dxlwipwp3gqld2lka", + "service/valory/trader/0.1.0": "bafybeiadfh5t3yxk3r3tmqocnnwdnhyscbvkdisaibha4pnrbbjvgtnuci" }, "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 33d7d5c3c..5ce8693b8 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,10 +43,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiceotqhhadsvmuf3xpv7jjm3mtqe5uy5o5mq5dhf6p33hshyerli4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidzkegvlo7wfn3uwvysd7vnjy7stgnj47s4fdz5smbw4y346p2vte - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4 -- valory/trader_abci:0.1.0:bafybeiewidlma3lyhzm3eawc43iknw4go4dzbhbtmc2ccy4epyxcqcaba4 +- valory/decision_maker_abci:0.1.0:bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4 +- valory/trader_abci:0.1.0:bafybeiab5zrbmtuaobo43ravuabcun6jvhycdunnhysyluxwpx5a6ke2wq - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index df65312c7..b9d8e15b3 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:bafybeihgxw4h42apdhk5ddsgfqr36tlrmhrt5osgvdfl2m6ejw435yj56i +agent: valory/trader:0.1.0:bafybeidjmjrvtdqitarhyrrvddx4vfcts6oenulo3dxlwipwp3gqld2lka number_of_agents: 4 deployment: {} --- 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 6072f9073..35bf9176d 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -262,7 +262,7 @@ def _get_pending_requests(self) -> Generator[None, None, bool]: sender_address=self.synchronized_data.safe_contract_address, ) if not result: - self.context.logger.info("Could not get the required balance.") + self.context.logger.info("Could not get the pending requests.") return False return result @@ -288,7 +288,6 @@ def _should_purchase(self) -> Generator[None, None, bool]: result = yield from self._get_nevermined_price() if not result: - self.context.logger.info("Could not get the nevermined price.") return False result = yield from self._get_pending_requests() diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 266991896..f902bb44d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeihuxxr72bnpfz2foq6zqxa2tnejg4ewkypvynmtwa3jwvfwwauugm + behaviours/order_subscription.py: bafybeigb654rqowhbosxdh2uxfbvihac45tgubzlat4p3kkdldzuu6zvm4 behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q behaviours/reedem.py: bafybeihwe4azke5zbdu4rhhsx3bmjgnkagwkuowyowvkure2do2rg4ainy behaviours/round_behaviour.py: bafybeidrks62unrnoyp3jnbz2nozgnittfntyknymuuja7jwcsjuap4fve diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 15ba4dc52..e95e493e9 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiceotqhhadsvmuf3xpv7jjm3mtqe5uy5o5mq5dhf6p33hshyerli4 +- valory/decision_maker_abci:0.1.0:bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidzkegvlo7wfn3uwvysd7vnjy7stgnj47s4fdz5smbw4y346p2vte - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 4e7d52f8e..4160c8880 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeig6xh4lrb4qhr3stmjerqjbgs3htgviko24w3gzdqfgbofizfcbc4 +- valory/decision_maker_abci:0.1.0:bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4 - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: From b6b24529730457bc0c8eff2df543bc64da61ff55 Mon Sep 17 00:00:00 2001 From: Ardian Date: Thu, 18 Apr 2024 10:18:52 +0200 Subject: [PATCH 9/9] chore: remove unnecessary logs --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../behaviours/order_subscription.py | 1 - packages/valory/skills/decision_maker_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 4 ++-- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 6aa7c1653..4c3cd1983 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -12,13 +12,13 @@ "contract/valory/service_staking_token/0.1.0": "bafybeid44l7qekvkwkvmfl4kcqchnaktttacp7lbx464mzqqs5cnefj35e", "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4", - "skill/valory/trader_abci/0.1.0": "bafybeiab5zrbmtuaobo43ravuabcun6jvhycdunnhysyluxwpx5a6ke2wq", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidzkegvlo7wfn3uwvysd7vnjy7stgnj47s4fdz5smbw4y346p2vte", + "skill/valory/decision_maker_abci/0.1.0": "bafybeignpcrzh2kc6ocr5egdzqhz4ngu5nribh3iqrlyuqcfp6gazmj37e", + "skill/valory/trader_abci/0.1.0": "bafybeigs5lfin2xbs2ecmli6gqsi2aqmzzi35ka3j5xuqq75p5jd2rryxe", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeihisayejfjykvocyk36lgfkiwskqc5i5fma4efevt6rvke6nwsfqy", "skill/valory/staking_abci/0.1.0": "bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii", - "agent/valory/trader/0.1.0": "bafybeidjmjrvtdqitarhyrrvddx4vfcts6oenulo3dxlwipwp3gqld2lka", - "service/valory/trader/0.1.0": "bafybeiadfh5t3yxk3r3tmqocnnwdnhyscbvkdisaibha4pnrbbjvgtnuci" + "agent/valory/trader/0.1.0": "bafybeidhvaty4exupd4x2d757qprcnsnlxaqworv5co33zi2ibat3nlmri", + "service/valory/trader/0.1.0": "bafybeibrj3mit6ntdwtlb3m4iymvlrdlpg53sfncu7bzcbal7yqqvy523i" }, "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 5ce8693b8..1ca32a3a4 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,10 +43,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidzkegvlo7wfn3uwvysd7vnjy7stgnj47s4fdz5smbw4y346p2vte +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihisayejfjykvocyk36lgfkiwskqc5i5fma4efevt6rvke6nwsfqy - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4 -- valory/trader_abci:0.1.0:bafybeiab5zrbmtuaobo43ravuabcun6jvhycdunnhysyluxwpx5a6ke2wq +- valory/decision_maker_abci:0.1.0:bafybeignpcrzh2kc6ocr5egdzqhz4ngu5nribh3iqrlyuqcfp6gazmj37e +- valory/trader_abci:0.1.0:bafybeigs5lfin2xbs2ecmli6gqsi2aqmzzi35ka3j5xuqq75p5jd2rryxe - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index b9d8e15b3..058c2348e 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:bafybeidjmjrvtdqitarhyrrvddx4vfcts6oenulo3dxlwipwp3gqld2lka +agent: valory/trader:0.1.0:bafybeidhvaty4exupd4x2d757qprcnsnlxaqworv5co33zi2ibat3nlmri number_of_agents: 4 deployment: {} --- 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 35bf9176d..50bd2b2c0 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/order_subscription.py @@ -292,7 +292,6 @@ def _should_purchase(self) -> Generator[None, None, bool]: result = yield from self._get_pending_requests() if not result: - self.context.logger.info("Could not get the pending requests.") return False result = yield from self._get_nft_balance( diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index f902bb44d..8e1250ba1 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: behaviours/decision_receive.py: bafybeid35xch5vsuuvtebu2yqedzeybbvc3kbt4d7q62efevhribmzg5gq behaviours/decision_request.py: bafybeibtvdjisudxyj677b7yctxnyo3tnrqdugevbfs27fmqnbo23cfexe behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm - behaviours/order_subscription.py: bafybeigb654rqowhbosxdh2uxfbvihac45tgubzlat4p3kkdldzuu6zvm4 + behaviours/order_subscription.py: bafybeie47vysxtchiicqfqa3gwwq4s7542wqpmywdswvd6jsgwba6v6fxq behaviours/randomness.py: bafybeidmr33teizrs4uxlo5tdz766ds6os4pe5lttstm7jpmhgmjz5ti3q behaviours/reedem.py: bafybeihwe4azke5zbdu4rhhsx3bmjgnkagwkuowyowvkure2do2rg4ainy behaviours/round_behaviour.py: bafybeidrks62unrnoyp3jnbz2nozgnittfntyknymuuja7jwcsjuap4fve diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index e95e493e9..b0f0d2cca 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidzkegvlo7wfn3uwvysd7vnjy7stgnj47s4fdz5smbw4y346p2vte +- valory/decision_maker_abci:0.1.0:bafybeignpcrzh2kc6ocr5egdzqhz4ngu5nribh3iqrlyuqcfp6gazmj37e +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihisayejfjykvocyk36lgfkiwskqc5i5fma4efevt6rvke6nwsfqy - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/check_stop_trading_abci:0.1.0:bafybeiedpw6gudh7ddrcfpggnbxmbfaqn57a5geg645c2ymuzwy3rtckii - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 4160c8880..14aaaa5c7 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeih3enhagoql7kzpeyzzu2scpkif6y3ubakpralfnwxcvxexdyvy5i -- valory/decision_maker_abci:0.1.0:bafybeic6lqc42kgfcihyho4w6tllxlebujgwhnlawg3njz4jtfn47xnii4 +- valory/decision_maker_abci:0.1.0:bafybeignpcrzh2kc6ocr5egdzqhz4ngu5nribh3iqrlyuqcfp6gazmj37e - valory/staking_abci:0.1.0:bafybeicrp3dbvxcb2wa7kdgpkxu7aqji5fwq6icwcfw7anfcpqv26irsr4 - valory/mech_interact_abci:0.1.0:bafybeib3aytq2a5hk6vjsak3eznuilndx4p53utdylbyhcmt6ty7kk6euq behaviours: