Skip to content

Commit

Permalink
Merge branch 'refs/heads/v0.17.0' into feat/update-accuracy
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/packages.json
#	packages/valory/agents/trader/aea-config.yaml
#	packages/valory/services/trader/service.yaml
#	packages/valory/services/trader_pearl/service.yaml
#	packages/valory/skills/trader_abci/skill.yaml
#	packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
  • Loading branch information
Adamantios committed Jul 19, 2024
2 parents 1fbd510 + 9ba7979 commit 92e1b85
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ states:
transition_func:
(BetPlacementRound, DONE): FinishedDecisionMakerRound
(BetPlacementRound, INSUFFICIENT_BALANCE): RefillRequiredRound
(BetPlacementRound, MOCK_TX): RedeemRound
(BetPlacementRound, MOCK_TX): RandomnessRound
(BetPlacementRound, NONE): ImpossibleRound
(BetPlacementRound, NO_MAJORITY): BetPlacementRound
(BetPlacementRound, ROUND_TIMEOUT): BetPlacementRound
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/skills/decision_maker_abci/rounds.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class DecisionMakerAbciApp(AbciApp[Event]):
- fetch error: 19.
9. BetPlacementRound
- done: 12.
- mock tx: 10.
- mock tx: 4.
- insufficient balance: 18.
- no majority: 9.
- round timeout: 9.
Expand Down
4 changes: 2 additions & 2 deletions packages/valory/skills/decision_maker_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ fingerprint:
behaviours/storage_manager.py: bafybeifelwjwstg5dwrnzeav5mumz47kqrlmv4crfn27a3vliomychd2x4
behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke
dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
fsm_specification.yaml: bafybeicvrvzcjt4hg5jyr2eleoajpbb7q2fbq2bopmbnwy33fsjdblzygu
fsm_specification.yaml: bafybeif2kas4eho4aielucf3ihjzjsog32icccbxrvje6kkw7aw4m4zg6q
handlers.py: bafybeigod6gbjrxy4mbmulbzsbokeaoycoqys64vqtxnumishfukzf73za
io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq
io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa
models.py: bafybeiafif3kzzyvvme2t6eck4sbpz6saam26jzjg46as2bqm5r5gvd4fq
payloads.py: bafybeia32ds4ks5g3rhd43w6siy74vi5inaheuxhswiy5ndykxtgncoeu4
policy.py: bafybeifwmav2bfp5caypvirvwd5tbf7gijavno4i7km5dizpsgcgpdfqk4
redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm
rounds.py: bafybeieffmnu3sivnagmhrhcufnh5zun6pxligc6wp26me43u6cjy2y3xi
rounds.py: bafybeic6w6ik2y6ylja5hr7o6hqruhjqydddkxyunquwircofeh6rvjaa4
states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy
states/base.py: bafybeiayitlxvdnl3pcm54l3zt5z5bcexbxixchrwtrmbhwoimm4555p7m
states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/skills/trader_abci/fsm_specification.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ states:
transition_func:
(BetPlacementRound, DONE): PreTxSettlementRound
(BetPlacementRound, INSUFFICIENT_BALANCE): ResetAndPauseRound
(BetPlacementRound, MOCK_TX): RedeemRound
(BetPlacementRound, MOCK_TX): RandomnessRound
(BetPlacementRound, NONE): ImpossibleRound
(BetPlacementRound, NO_MAJORITY): BetPlacementRound
(BetPlacementRound, ROUND_TIMEOUT): BetPlacementRound
Expand Down
Loading

0 comments on commit 92e1b85

Please sign in to comment.