diff --git a/packages/packages.json b/packages/packages.json index 225b63449..6a91885f5 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -15,15 +15,15 @@ "contract/valory/mech_activity/0.1.0": "bafybeibmqmle5fnal3gxlpdmcos2kogzra4q3pr3o5nh7shplxuilji3t4", "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", - "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeicx3vjswhjzgfa2ddl7zxqzncuqbvej3m2unseje5lsajdhio7mji", - "skill/valory/trader_abci/0.1.0": "bafybeiapf3qng7wczem3t7s5cysdlhzc3xign4sqkhyopro3p7x33hdugu", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeic7wcls7yvvnpqrl7vfrab3dt37vyoytu2hef7emmc5556puqjpri", + "skill/valory/market_manager_abci/0.1.0": "bafybeietjn4etkm3i436knxsp4oynqnap6ac4525gykeldwott77bhar4a", + "skill/valory/decision_maker_abci/0.1.0": "bafybeigepbmsaixc6v4qflr432vkt7r46vphdk3b7ohfpsmapc56arthqe", + "skill/valory/trader_abci/0.1.0": "bafybeia5w4aizvxw6fxkbep377miooaa37klv2ukc4rdorrtr6nqxssl44", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiewtytxrufenoxqspgbscyxz2ys74eocljs7fr4u7x5lf6wibqezi", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeieoklf7wjrnupyv4egny5hfn6mbxtrjwwtrqyznjoxodiy72cj3na", - "service/valory/trader/0.1.0": "bafybeidzaf6gytftigur646mo4fw2p5urq4cpvbf5t2gbw3fz5v6sseppq", - "service/valory/trader_pearl/0.1.0": "bafybeieqyhrucksqrxxhy2ad4blgsjd3iwhg4m6q3lgm2wlj2wlhz52xjq" + "agent/valory/trader/0.1.0": "bafybeifpej2m3dmon67woimsk2s4zb5d3kadlvsraqzlru3n57bnxa64ky", + "service/valory/trader/0.1.0": "bafybeihxcoriaxaziw34pcq6xy6bwp64ioi3ypk2wxz7cvliizxwwz3vxi", + "service/valory/trader_pearl/0.1.0": "bafybeif3gw4dftyeuituv6wjrodg2vxxidwoub7m4bjj35xp7sbzxnz6si" }, "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 97ed8ecb7..8130ac7d0 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -45,10 +45,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic7wcls7yvvnpqrl7vfrab3dt37vyoytu2hef7emmc5556puqjpri -- valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeicx3vjswhjzgfa2ddl7zxqzncuqbvej3m2unseje5lsajdhio7mji -- valory/trader_abci:0.1.0:bafybeiapf3qng7wczem3t7s5cysdlhzc3xign4sqkhyopro3p7x33hdugu +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiewtytxrufenoxqspgbscyxz2ys74eocljs7fr4u7x5lf6wibqezi +- valory/market_manager_abci:0.1.0:bafybeietjn4etkm3i436knxsp4oynqnap6ac4525gykeldwott77bhar4a +- valory/decision_maker_abci:0.1.0:bafybeigepbmsaixc6v4qflr432vkt7r46vphdk3b7ohfpsmapc56arthqe +- valory/trader_abci:0.1.0:bafybeia5w4aizvxw6fxkbep377miooaa37klv2ukc4rdorrtr6nqxssl44 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 883a95061..43968e124 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:bafybeieoklf7wjrnupyv4egny5hfn6mbxtrjwwtrqyznjoxodiy72cj3na +agent: valory/trader:0.1.0:bafybeifpej2m3dmon67woimsk2s4zb5d3kadlvsraqzlru3n57bnxa64ky number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml index de5cc2158..067ab95e5 100644 --- a/packages/valory/services/trader_pearl/service.yaml +++ b/packages/valory/services/trader_pearl/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeieoklf7wjrnupyv4egny5hfn6mbxtrjwwtrqyznjoxodiy72cj3na +agent: valory/trader:0.1.0:bafybeifpej2m3dmon67woimsk2s4zb5d3kadlvsraqzlru3n57bnxa64ky number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index ab453072d..e4a74fe65 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -38,7 +38,7 @@ fingerprint: redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm rounds.py: bafybeidky5eoxti37j3j6ue3uyna6ibljskzzfadhehyj6jqry2lwoi7ou states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy - states/base.py: bafybeifiqeedqo2etvp4s7owkza6ykepho4s3nvkf43rcwgh4pado2wdiy + states/base.py: bafybeicvdv33gxs6wu5jlikt5samidtsxwyw33z7zhdwipzvcpsixvoraa states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda states/blacklisting.py: bafybeiapelgjhbjjn4uq4z5gspyirqzwzgccg5anktrp5kxdwamfnfw5mi states/check_benchmarking.py: bafybeiabv6pq7q45jd3nkor5afmlycqgec5ctuwcfbdukkjjm4imesv4ni @@ -101,7 +101,7 @@ protocols: - valory/http:1.0.0:bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa +- valory/market_manager_abci:0.1.0:bafybeietjn4etkm3i436knxsp4oynqnap6ac4525gykeldwott77bhar4a - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: diff --git a/packages/valory/skills/decision_maker_abci/states/base.py b/packages/valory/skills/decision_maker_abci/states/base.py index 9608decfb..368a6b022 100644 --- a/packages/valory/skills/decision_maker_abci/states/base.py +++ b/packages/valory/skills/decision_maker_abci/states/base.py @@ -81,12 +81,12 @@ def sampled_bet_index(self) -> int: return int(self.db.get_strict("sampled_bet_index")) @property - def benchmarking_finished(self) -> int: + def benchmarking_finished(self) -> bool: """Get the flag of benchmarking finished.""" return int(self.db.get_strict("benchmarking_finished")) @property - def simulated_day(self) -> int: + def simulated_day(self) -> bool: """Get the flag of simulated_day.""" return int(self.db.get_strict("simulated_day")) diff --git a/packages/valory/skills/market_manager_abci/payloads.py b/packages/valory/skills/market_manager_abci/payloads.py index d7247c415..71615f2a5 100644 --- a/packages/valory/skills/market_manager_abci/payloads.py +++ b/packages/valory/skills/market_manager_abci/payloads.py @@ -30,3 +30,5 @@ class UpdateBetsPayload(BaseTxPayload): """A transaction payload for the updated bets.""" bets_hash: Optional[str] + benchmarking_finished: Optional[bool] + simulated_day: Optional[bool] diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index 44e6f05ad..84c59c8f5 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -23,12 +23,12 @@ fingerprint: graph_tooling/utils.py: bafybeig5hxhnqgyfn5ym3poc5nziqwpeozqbd6wa4s6c2hjn6iyedg3t3y handlers.py: bafybeihot2i2yvfkz2gcowvt66wdu6tkjbmv7hsmc4jzt4reqeaiuphbtu models.py: bafybeibjttnga54y4auz6f33ecfrngyw53b2xzpompm72drjsr4xoytmiy - payloads.py: bafybeicfymvvtdpkcgmkvthfzmb7dqakepkzslqrz6rcs7nxkz7qq3mrzy + payloads.py: bafybeigy6djmotdf4gl63yrcnahqvmw5nziyh4g5swe4urytelgfakarsi rounds.py: bafybeiflb2k6ritv5tlexlfxyg2okadtviijprqnc7sa7zxdlhr7nnqxfy tests/__init__.py: bafybeigaewntxawezvygss345kytjijo56bfwddjtfm6egzxfajsgojam4 tests/test_dialogues.py: bafybeiet646su5nsjmvruahuwg6un4uvwzyj2lnn2jvkye6cxooz22f3ja tests/test_handlers.py: bafybeiaz3idwevvlplcyieaqo5oeikuthlte6e2gi4ajw452ylvimwgiki - tests/test_payloads.py: bafybeidvld43p5c4wpwi7m6rfzontkheqqgxdchjnme5b54wmldojc5dmm + tests/test_payloads.py: bafybeifsh456c4r6jbpo7qsnilkqpsccfpvebu3v77soy3vko6w7pimsta tests/test_rounds.py: bafybeidahkavof43y3o4omnihh6yxdx7gqofio7kzukdydymxbebylempu fingerprint_ignore_patterns: [] connections: [] diff --git a/packages/valory/skills/market_manager_abci/tests/test_payloads.py b/packages/valory/skills/market_manager_abci/tests/test_payloads.py index 898c80b48..1dbd7b829 100644 --- a/packages/valory/skills/market_manager_abci/tests/test_payloads.py +++ b/packages/valory/skills/market_manager_abci/tests/test_payloads.py @@ -24,7 +24,12 @@ def test_update_bets_payload() -> None: """Test `UpdateBetsPayload`.""" - payload = UpdateBetsPayload(sender="sender", bets_hash="dummy bets hash") + payload = UpdateBetsPayload( + sender="sender", + bets_hash="dummy bets hash", + benchmarking_finished=False, + simulated_day=False, + ) assert payload.bets_hash == "dummy bets hash" assert UpdateBetsPayload.from_json(payload.json) == payload diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 20f14a299..3c7371545 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -26,9 +26,9 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm -- valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeicx3vjswhjzgfa2ddl7zxqzncuqbvej3m2unseje5lsajdhio7mji -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic7wcls7yvvnpqrl7vfrab3dt37vyoytu2hef7emmc5556puqjpri +- valory/market_manager_abci:0.1.0:bafybeietjn4etkm3i436knxsp4oynqnap6ac4525gykeldwott77bhar4a +- valory/decision_maker_abci:0.1.0:bafybeigepbmsaixc6v4qflr432vkt7r46vphdk3b7ohfpsmapc56arthqe +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiewtytxrufenoxqspgbscyxz2ys74eocljs7fr4u7x5lf6wibqezi - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index dbe1730b0..a1b339da8 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -23,7 +23,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni skills: - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u -- valory/decision_maker_abci:0.1.0:bafybeicx3vjswhjzgfa2ddl7zxqzncuqbvej3m2unseje5lsajdhio7mji +- valory/decision_maker_abci:0.1.0:bafybeigepbmsaixc6v4qflr432vkt7r46vphdk3b7ohfpsmapc56arthqe - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: