diff --git a/packages/packages.json b/packages/packages.json index fbac3ead..7be53a48 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,14 +16,14 @@ "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy", "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4", "skill/valory/market_manager_abci/0.1.0": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiacajivyvherplozxhidx2l2alnhdycyucrrggcxjhbpzwtq2hqoy", - "skill/valory/trader_abci/0.1.0": "bafybeihdy7xepwv44cq3v7guhd4wh7gnaeumhfrc5t4rlmkd7vyzpytnqy", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiez7ikabpovbyv3a7trkv3q5vliypkxztw6nufx7722j2w7exn2ri", + "skill/valory/decision_maker_abci/0.1.0": "bafybeif4gm5haemydji6vtovzqxm2uzdyydfuyxt4j533vzgoxv5hyg7g4", + "skill/valory/trader_abci/0.1.0": "bafybeif2qsehq3orfrrdd7wilpajnnakqs3diiy5tiwtseg4eghsnjsqzm", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia63dlxjvohtogbglcgk42qkg7v356rst27xcm27bvryypr2dzhka", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeig4tozmrxo47ck7uaruiyrhrd3yq4rf2owipo3nxutbih7apubjaq", - "service/valory/trader/0.1.0": "bafybeibtuhcfjuhjv5splirbdk6uiyahyb4ipzzb6f5n7thyhnupj2amiu", - "service/valory/trader_pearl/0.1.0": "bafybeicumlwc6zjh4kq3a6cqgl4lxpu2tugy3zdyfjsme5wi7i3elxwfva" + "agent/valory/trader/0.1.0": "bafybeia7dlk5e7swrwz37mmzmwwazeuw6d3bz7skvqsvt25jyzhaksm3re", + "service/valory/trader/0.1.0": "bafybeiaums4lcyrvahjoh3kdcddqbiybqynmkiwrvo2ikgcugaxsiiyhxi", + "service/valory/trader_pearl/0.1.0": "bafybeid6l6jflqhfzx2xhxiqjbr55rajx6tvgtjomp6njxfdeyag2t5xvm" }, "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 3d8170b6..f1d0d5cd 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:bafybeiez7ikabpovbyv3a7trkv3q5vliypkxztw6nufx7722j2w7exn2ri +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia63dlxjvohtogbglcgk42qkg7v356rst27xcm27bvryypr2dzhka - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiacajivyvherplozxhidx2l2alnhdycyucrrggcxjhbpzwtq2hqoy -- valory/trader_abci:0.1.0:bafybeihdy7xepwv44cq3v7guhd4wh7gnaeumhfrc5t4rlmkd7vyzpytnqy +- valory/decision_maker_abci:0.1.0:bafybeif4gm5haemydji6vtovzqxm2uzdyydfuyxt4j533vzgoxv5hyg7g4 +- valory/trader_abci:0.1.0:bafybeif2qsehq3orfrrdd7wilpajnnakqs3diiy5tiwtseg4eghsnjsqzm - 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 34639bb7..b87ad530 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:bafybeig4tozmrxo47ck7uaruiyrhrd3yq4rf2owipo3nxutbih7apubjaq +agent: valory/trader:0.1.0:bafybeia7dlk5e7swrwz37mmzmwwazeuw6d3bz7skvqsvt25jyzhaksm3re 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 9566839a..f5dd94d3 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:bafybeig4tozmrxo47ck7uaruiyrhrd3yq4rf2owipo3nxutbih7apubjaq +agent: valory/trader:0.1.0:bafybeia7dlk5e7swrwz37mmzmwwazeuw6d3bz7skvqsvt25jyzhaksm3re number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index ec1252a6..72a5062c 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -96,7 +96,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): - no op: 20. - blacklist: 20. 1. BenchmarkingRandomnessRound - - done: 6. + - done: 3. - round timeout: 1. - no majority: 1. 2. RandomnessRound @@ -107,7 +107,9 @@ class DecisionMakerAbciApp(AbciApp[Event]): - done: 4. - none: 16. - no majority: 3. - - round timeout: 3. + - new simulated resample: 3. + - benchmarking enabled: 6. + - benchmarking finished: 21. - fetch error: 20. 4. SubscriptionRound - done: 18. @@ -142,7 +144,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): - round timeout: 8. 9. BlacklistingRound - done: 16. - - mock tx: 6. + - mock tx: 16. - none: 20. - no majority: 9. - round timeout: 9. @@ -156,7 +158,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): - none: 20. 11. RedeemRound - done: 13. - - mock tx: 6. + - mock tx: 3. - no redeeming: 17. - no majority: 11. - redeem round timeout: 17. @@ -175,9 +177,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): 20. ImpossibleRound 21. BenchmarkingDoneRound - Final states: {BenchmarkingDoneRound, BenchmarkingModeDisabledRound, FinishedDecisionMakerRound, - FinishedDecisionRequestRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, - FinishedWithoutRedeemingRound, ImpossibleRound, RefillRequiredRound} + Final states: {BenchmarkingDoneRound, BenchmarkingModeDisabledRound, FinishedDecisionMakerRound, FinishedDecisionRequestRound, FinishedSubscriptionRound, FinishedWithoutDecisionRound, FinishedWithoutRedeemingRound, ImpossibleRound, RefillRequiredRound} Timeouts: round timeout: 30.0 @@ -199,7 +199,8 @@ class DecisionMakerAbciApp(AbciApp[Event]): Event.BENCHMARKING_DISABLED: BenchmarkingModeDisabledRound, Event.NO_MAJORITY: CheckBenchmarkingModeRound, Event.ROUND_TIMEOUT: CheckBenchmarkingModeRound, - # added because of `autonomy analyse fsm-specs` falsely reporting them as missing from the transition + # added because of `autonomy analyse fsm-specs` + # falsely reporting them as missing from the transition Event.NO_OP: ImpossibleRound, Event.BLACKLIST: ImpossibleRound, }, @@ -220,7 +221,8 @@ class DecisionMakerAbciApp(AbciApp[Event]): Event.NEW_SIMULATED_RESAMPLE: SamplingRound, Event.BENCHMARKING_ENABLED: ToolSelectionRound, Event.BENCHMARKING_FINISHED: BenchmarkingDoneRound, - # this is here because of `autonomy analyse fsm-specs` falsely reporting it as missing from the transition + # this is here because of `autonomy analyse fsm-specs` + # falsely reporting it as missing from the transition MarketManagerEvent.FETCH_ERROR: ImpossibleRound, }, SubscriptionRound: { @@ -259,25 +261,30 @@ class DecisionMakerAbciApp(AbciApp[Event]): Event.NO_MAJORITY: DecisionReceiveRound, Event.TIE: BlacklistingRound, Event.UNPROFITABLE: BlacklistingRound, - Event.ROUND_TIMEOUT: DecisionReceiveRound, # loop on the same state until Mech deliver is received + # loop on the same state until Mech deliver is received + Event.ROUND_TIMEOUT: DecisionReceiveRound, }, BlacklistingRound: { Event.DONE: FinishedWithoutDecisionRound, Event.MOCK_TX: FinishedWithoutDecisionRound, - Event.NONE: ImpossibleRound, # degenerate round on purpose, should never have reached here + # degenerate round on purpose, should never have reached here + Event.NONE: ImpossibleRound, Event.NO_MAJORITY: BlacklistingRound, Event.ROUND_TIMEOUT: BlacklistingRound, - # this is here because of `autonomy analyse fsm-specs` falsely reporting it as missing from the transition + # this is here because of `autonomy analyse fsm-specs` + # falsely reporting it as missing from the transition MarketManagerEvent.FETCH_ERROR: ImpossibleRound, }, BetPlacementRound: { Event.DONE: FinishedDecisionMakerRound, # skip the bet placement tx Event.MOCK_TX: RedeemRound, - Event.INSUFFICIENT_BALANCE: RefillRequiredRound, # degenerate round on purpose, owner must refill the safe + # degenerate round on purpose, owner must refill the safe + Event.INSUFFICIENT_BALANCE: RefillRequiredRound, Event.NO_MAJORITY: BetPlacementRound, Event.ROUND_TIMEOUT: BetPlacementRound, - # this is here because of `autonomy analyse fsm-specs` falsely reporting it as missing from the transition + # this is here because of `autonomy analyse fsm-specs` + # falsely reporting it as missing from the transition Event.NONE: ImpossibleRound, }, RedeemRound: { @@ -286,9 +293,11 @@ class DecisionMakerAbciApp(AbciApp[Event]): Event.NO_REDEEMING: FinishedWithoutRedeemingRound, Event.NO_MAJORITY: RedeemRound, # in case of a round timeout, there likely is something wrong with redeeming - # it could be the RPC, or some other issue. We don't want to be stuck trying to redeem. + # it could be the RPC, or some other issue. + # We don't want to be stuck trying to redeem. Event.REDEEM_ROUND_TIMEOUT: FinishedWithoutRedeemingRound, - # this is here because of `autonomy analyse fsm-specs` falsely reporting it as missing from the transition + # this is here because of `autonomy analyse fsm-specs` falsely + # reporting it as missing from the transition Event.NONE: ImpossibleRound, }, HandleFailedTxRound: { diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 837ef64a..18d4a05e 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -36,7 +36,7 @@ fingerprint: payloads.py: bafybeihzwxhdc6a6ek2lvsyzkex4ypsl7fnahszal3dxtr7ce6wp7nmgmm policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm - rounds.py: bafybeiaxoq5fhm2mn52vicv4fxpauhiptuwvzwnqmr6bfguna2g3mg3j4i + rounds.py: bafybeidky5eoxti37j3j6ue3uyna6ibljskzzfadhehyj6jqry2lwoi7ou states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeifiqeedqo2etvp4s7owkza6ykepho4s3nvkf43rcwgh4pado2wdiy states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index a73bff92..350cc4a8 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -27,8 +27,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm - valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa -- valory/decision_maker_abci:0.1.0:bafybeiacajivyvherplozxhidx2l2alnhdycyucrrggcxjhbpzwtq2hqoy -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiez7ikabpovbyv3a7trkv3q5vliypkxztw6nufx7722j2w7exn2ri +- valory/decision_maker_abci:0.1.0:bafybeif4gm5haemydji6vtovzqxm2uzdyydfuyxt4j533vzgoxv5hyg7g4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia63dlxjvohtogbglcgk42qkg7v356rst27xcm27bvryypr2dzhka - 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 0db9f092..3500fe44 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:bafybeiacajivyvherplozxhidx2l2alnhdycyucrrggcxjhbpzwtq2hqoy +- valory/decision_maker_abci:0.1.0:bafybeif4gm5haemydji6vtovzqxm2uzdyydfuyxt4j533vzgoxv5hyg7g4 - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: