diff --git a/packages/packages.json b/packages/packages.json index 19eba122..2192cad8 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": "bafybeihhosfhw3725txnae7ouch3wixpuigv6litz2q7o7r5gznyinpsjy", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiew6klupqu7nnov2memmxzlkzyg36nyppgrxd4dazqxiwyuvdoozu", - "skill/valory/trader_abci/0.1.0": "bafybeifimdsxlcpxz7dzwugmikm6abkh66t7a2braixsiauxvu4khy4jay", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeihvwdkxgef5xv3grvtcmdzedkvelpcqaele6updsmvw65uutxuksq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeigb4wlva4chtnaxzi64hru5xdjgfausdwy5fm5oj5dra4igcugc4m", + "skill/valory/trader_abci/0.1.0": "bafybeifyykgkf42x3cfuan7qpcrgidvs4upmajb7hlnrg2lzqcke77kvyq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibdgjvtle45rayutuqcvvdlhg6sg5wwr3dxfe62kustpjrp242s2m", "skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini", - "agent/valory/trader/0.1.0": "bafybeig3x2v6nebc5tcdsveylb6pyfeya6nzzazzgnxm3bme5rnzeo6cze", - "service/valory/trader/0.1.0": "bafybeig3d2jex424ihzlhs5kuvrphwdzdzlz74x7ipi3gg5sgvy7yzpyk4", - "service/valory/trader_pearl/0.1.0": "bafybeiedxuveeytkrfoydyoaqr6454moevz4ynm5shl2wmn7qjvrs5bfjq" + "agent/valory/trader/0.1.0": "bafybeib6zqd3j4czgfjyca4qfleluozql7tfz2jkoz7d75wofb5yarr3hq", + "service/valory/trader/0.1.0": "bafybeigcb6ho2cztrwlhksda3m7hkm62bqovr5u5rkp5tqjsu6o3bqv2by", + "service/valory/trader_pearl/0.1.0": "bafybeibill74ifb5lclzuv4st5e4ydqilqyhpkd3f2nh55cdmdka4he6we" }, "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 eedb446d..7f0fa511 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:bafybeihvwdkxgef5xv3grvtcmdzedkvelpcqaele6updsmvw65uutxuksq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibdgjvtle45rayutuqcvvdlhg6sg5wwr3dxfe62kustpjrp242s2m - valory/market_manager_abci:0.1.0:bafybeihhosfhw3725txnae7ouch3wixpuigv6litz2q7o7r5gznyinpsjy -- valory/decision_maker_abci:0.1.0:bafybeiew6klupqu7nnov2memmxzlkzyg36nyppgrxd4dazqxiwyuvdoozu -- valory/trader_abci:0.1.0:bafybeifimdsxlcpxz7dzwugmikm6abkh66t7a2braixsiauxvu4khy4jay +- valory/decision_maker_abci:0.1.0:bafybeigb4wlva4chtnaxzi64hru5xdjgfausdwy5fm5oj5dra4igcugc4m +- valory/trader_abci:0.1.0:bafybeifyykgkf42x3cfuan7qpcrgidvs4upmajb7hlnrg2lzqcke77kvyq - 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 360c43b7..8011617e 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:bafybeig3x2v6nebc5tcdsveylb6pyfeya6nzzazzgnxm3bme5rnzeo6cze +agent: valory/trader:0.1.0:bafybeib6zqd3j4czgfjyca4qfleluozql7tfz2jkoz7d75wofb5yarr3hq 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 efe46285..4798c2fa 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:bafybeig3x2v6nebc5tcdsveylb6pyfeya6nzzazzgnxm3bme5rnzeo6cze +agent: valory/trader:0.1.0:bafybeib6zqd3j4czgfjyca4qfleluozql7tfz2jkoz7d75wofb5yarr3hq number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py index 2ace9415..55f7bf28 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_receive.py @@ -22,8 +22,8 @@ import csv import json from copy import deepcopy -from math import prod from datetime import datetime +from math import prod from typing import Any, Dict, Generator, List, Optional, Tuple, Union from packages.valory.skills.decision_maker_abci.behaviours.base import ( @@ -315,9 +315,9 @@ def _update_market_liquidity(self): self.shared_state.current_liquidity_prices = ( active_sampled_bet.outcomeTokenMarginalPrices ) - self.shared_state.liquidity_cache[question_id] = ( - active_sampled_bet.scaledLiquidityMeasure - ) + self.shared_state.liquidity_cache[ + question_id + ] = active_sampled_bet.scaledLiquidityMeasure return def _calculate_new_liquidity(self, net_bet_amount: int, vote: int) -> LiquidityInfo: @@ -387,11 +387,11 @@ def _update_liquidity_info(self, net_bet_amount: int, vote: int) -> LiquidityInf self.context.logger.info(log_message) # update the scaled liquidity Measure - self.shared_state.liquidity_cache[market_id] = ( - self._compute_scaled_liquidity_measure( - self.shared_state.current_liquidity_amounts, - self.shared_state.current_liquidity_prices, - ) + self.shared_state.liquidity_cache[ + market_id + ] = self._compute_scaled_liquidity_measure( + self.shared_state.current_liquidity_amounts, + self.shared_state.current_liquidity_prices, ) return liquidity_info diff --git a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py index cdb09d81..1a6d248e 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/decision_request.py @@ -22,7 +22,7 @@ import csv import json from dataclasses import asdict -from typing import Any, Dict, Generator, Optional, List +from typing import Any, Dict, Generator, List, Optional from uuid import uuid4 from packages.valory.skills.decision_maker_abci.behaviours.base import ( diff --git a/packages/valory/skills/decision_maker_abci/behaviours/sampling.py b/packages/valory/skills/decision_maker_abci/behaviours/sampling.py index 505b0591..460cf8ee 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/sampling.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/sampling.py @@ -20,8 +20,9 @@ """This module contains the behaviour for sampling a bet.""" import random -from typing import Any, Generator, List, Optional from datetime import datetime +from typing import Any, Generator, List, Optional + from packages.valory.skills.decision_maker_abci.behaviours.base import ( DecisionMakerBaseBehaviour, ) diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py index b95c6a03..952a2d85 100644 --- a/packages/valory/skills/decision_maker_abci/models.py +++ b/packages/valory/skills/decision_maker_abci/models.py @@ -20,8 +20,8 @@ """This module contains the models for the skill.""" import os -import time import re +import time from dataclasses import dataclass, field from datetime import datetime, timedelta from pathlib import Path @@ -58,11 +58,11 @@ from packages.valory.skills.decision_maker_abci.policy import EGreedyPolicy from packages.valory.skills.decision_maker_abci.redeem_info import Trade from packages.valory.skills.decision_maker_abci.rounds import DecisionMakerAbciApp +from packages.valory.skills.market_manager_abci.bets import Bet from packages.valory.skills.market_manager_abci.models import ( MarketManagerParams, Subgraph, ) -from packages.valory.skills.market_manager_abci.bets import Bet from packages.valory.skills.mech_interact_abci.models import ( Params as MechInteractParams, ) @@ -448,11 +448,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: "tool_punishment_multiplier", kwargs, int ) self.contract_timeout: float = self._ensure("contract_timeout", kwargs, float) - self.file_hash_to_strategies: Dict[str, List[str]] = ( - nested_list_todict_workaround( - kwargs, - "file_hash_to_strategies_json", - ) + self.file_hash_to_strategies: Dict[ + str, List[str] + ] = nested_list_todict_workaround( + kwargs, + "file_hash_to_strategies_json", ) self.strategies_kwargs: Dict[str, List[Any]] = nested_list_todict_workaround( kwargs, "strategies_kwargs" @@ -464,11 +464,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: ) self.use_nevermined = self._ensure("use_nevermined", kwargs, bool) self.rpc_sleep_time: int = self._ensure("rpc_sleep_time", kwargs, int) - self.mech_to_subscription_params: Dict[str, Any] = ( - nested_list_todict_workaround( - kwargs, - "mech_to_subscription_params", - ) + self.mech_to_subscription_params: Dict[ + str, Any + ] = nested_list_todict_workaround( + kwargs, + "mech_to_subscription_params", ) self.service_endpoint = self._ensure("service_endpoint", kwargs, str) self.safe_voting_range = self._ensure("safe_voting_range", kwargs, int) diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index fcf9f42e..82c05078 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -17,14 +17,14 @@ fingerprint: behaviours/blacklisting.py: bafybeifitqx2omj5qdwokizhqjkxvybtsyxo22dxkucbtxaocafzgbseku behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e - behaviours/decision_receive.py: bafybeibsn3fyec36ujaua2gzpxscvfibwukcizm2vgenok2x7vmzcnmg5e - behaviours/decision_request.py: bafybeiat7kfqdnqj5tne5aebw5d3opyptpy3hhllusjriezlsuqxylznve + behaviours/decision_receive.py: bafybeiclxrgjz55cdzh5wq45jvbmm5oukmk5cjbwrl62l4dijtfqeymvoa + behaviours/decision_request.py: bafybeieyi5zlitdfpz6uj4obc3tfwpkfjivvqnkrs76lpwbzxpprmqcfte behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm behaviours/order_subscription.py: bafybeicrmdvhci5prfldvuf3bclbbqi6j7lpv6hmphw3qwgmkmwat3od44 behaviours/randomness.py: bafybeiaoj3awyyg2onhpsdsn3dyczs23gr4smuzqcbw3e5ocljwxswjkce behaviours/reedem.py: bafybeiaxwp4lx62owcaqfp6xcqh6567f5yvwnl4rage2f5hmq4nltkzjjy behaviours/round_behaviour.py: bafybeih63hpia2bwwzu563hxs5yd3t5ycvxvkfnhvxbzghbyy3mw3xjl3i - behaviours/sampling.py: bafybeihdhegyzu4q7ej3s6jwqnsar4rxr3mfxgsiwpdo7troblp3nsgznu + behaviours/sampling.py: bafybeifwjpjsouuisrcdqo325ovhyuupjr7x3kdjapyj32xidjk2q3qssq behaviours/storage_manager.py: bafybeiez6daaj2bufxdcsghtmqybyrzdh74z26cc4ajsqsiy5krgjo2tla behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm @@ -32,7 +32,7 @@ fingerprint: handlers.py: bafybeigod6gbjrxy4mbmulbzsbokeaoycoqys64vqtxnumishfukzf73za io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa - models.py: bafybeibuekdwq77jtzqurtdf4cccvevtjhlkmnnnpqhoftzw2ldxyezmzi + models.py: bafybeih6hunm55p4opyi24tchenbig5efc56rij6rby653nfqymslif4ai payloads.py: bafybeihzwxhdc6a6ek2lvsyzkex4ypsl7fnahszal3dxtr7ce6wp7nmgmm policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4 redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm @@ -50,7 +50,7 @@ fingerprint: states/order_subscription.py: bafybeidrcef2op3nhq4tjgri3ct5hfhmc22xw2ep6dk4ro6tg7ob6cmioa states/randomness.py: bafybeiceoo4nx3t4dofpwczw3v5mclramwmzpwjs6hv7l56arodrjx4l5u states/redeem.py: bafybeica6cn4xg7shea2wjhbqnddgxe5zao2hkmceltze7qknxdhtsoaxe - states/sampling.py: bafybeigboydrzxzf2k5axqg55ce2cv66e73qodbdsbs5uqccs3kcaxbfiy + states/sampling.py: bafybeifaulyvqkbnavszg3yyejl7k3axgjcu5ss3hthitatui56tvpaxr4 states/tool_selection.py: bafybeiak5ihuie4nxh3sguiea6pcdgyxr4k4xyzvq6o2uj5xpf7urocawy tests/__init__.py: bafybeiakpi3k3kc7wrjj7hrluvjcj36lu2gezpmrctwiz5yg2fe7ggnf3i tests/behaviours/__init__.py: bafybeic7icz7lfhfepdkqkase7y7zn3a6pwdw6fx4ah2hajmgejawpolc4 diff --git a/packages/valory/skills/decision_maker_abci/states/sampling.py b/packages/valory/skills/decision_maker_abci/states/sampling.py index 3bdf4551..003a56ca 100644 --- a/packages/valory/skills/decision_maker_abci/states/sampling.py +++ b/packages/valory/skills/decision_maker_abci/states/sampling.py @@ -20,7 +20,7 @@ """This module contains the sampling state of the decision-making abci app.""" from enum import Enum -from typing import Any, cast, Optional, Tuple, Type +from typing import Any, Optional, Tuple, Type, cast from packages.valory.skills.abstract_round_abci.base import ( BaseSynchronizedData, diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index eda75f44..1f1714a9 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:bafybeihhosfhw3725txnae7ouch3wixpuigv6litz2q7o7r5gznyinpsjy -- valory/decision_maker_abci:0.1.0:bafybeiew6klupqu7nnov2memmxzlkzyg36nyppgrxd4dazqxiwyuvdoozu -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeihvwdkxgef5xv3grvtcmdzedkvelpcqaele6updsmvw65uutxuksq +- valory/decision_maker_abci:0.1.0:bafybeigb4wlva4chtnaxzi64hru5xdjgfausdwy5fm5oj5dra4igcugc4m +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibdgjvtle45rayutuqcvvdlhg6sg5wwr3dxfe62kustpjrp242s2m - 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 dd2d9258..5628259e 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:bafybeiew6klupqu7nnov2memmxzlkzyg36nyppgrxd4dazqxiwyuvdoozu +- valory/decision_maker_abci:0.1.0:bafybeigb4wlva4chtnaxzi64hru5xdjgfausdwy5fm5oj5dra4igcugc4m - valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm behaviours: