diff --git a/.github/workflows/common_checks.yaml b/.github/workflows/common_checks.yaml index 2812c3bc3..e3aa0ba92 100644 --- a/.github/workflows/common_checks.yaml +++ b/.github/workflows/common_checks.yaml @@ -63,7 +63,7 @@ jobs: - name: Install dependencies run: pip install tomte[tox,cli]==0.2.14 - name: Check copyright headers - run: tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part protocols --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part websocket_client --exclude-part contract_subscription --exclude-part mech --exclude-part mech_interact_abci + run: tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part protocols --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part websocket_client --exclude-part contract_subscription --exclude-part mech --exclude-part mech_interact_abci --exclude-part http_server - name: License compatibility check run: tox -e liccheck - name: Check dependencies diff --git a/Makefile b/Makefile index 404642f7b..5235a487a 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ generators: clean-cache fix-abci-app-specs .PHONY: common-checks-1 common-checks-1: - tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part protocols --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part websocket_client --exclude-part contract_subscription --exclude-part mech --exclude-part mech_interact_abci + tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part protocols --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part websocket_client --exclude-part contract_subscription --exclude-part mech --exclude-part mech_interact_abci --exclude-part http_server tomte check-doc-links tox -p -e check-hash -e check-packages -e check-doc-hashes -e analyse-service diff --git a/packages/packages.json b/packages/packages.json index 31e8f8c69..842f0f72b 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -13,13 +13,13 @@ "contract/valory/transfer_nft_condition/0.1.0": "bafybeicgpoag2lymofz3vnen76q7gtig5hzimn32o57php4uerr6t25em4", "contract/valory/relayer/0.1.0": "bafybeiaabvxim4blp5fxb6qjlzjivtvkme3fk24h5jte7w6vr6rsx72j6u", "skill/valory/market_manager_abci/0.1.0": "bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiek2dhqqv7xpscf4tz3g2hlmacd4co4ksawhnrwyuqce4iqudiuz4", - "skill/valory/trader_abci/0.1.0": "bafybeihcrbwscyikxfaerhmbigqpp7vd2g7b4fgjpjv3cgbz53l5dnzcci", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifzwxm4xrwf2xectoycrlebpecoew2scgo53z76ohefn3gfydnpti", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiawd5mlqbjnxojf6yhaplo4gnid6xly6cysrjxb5n4bzbvwi32sem", + "skill/valory/trader_abci/0.1.0": "bafybeibyogaropi7fugm6ahmtkapizrwdqhcp2lzvgpmoxskwy7imtdu2a", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeigdo4dxmwsr5a3gtafbpawirly7b3abaa3rdofq4thma6mq3andby", "skill/valory/staking_abci/0.1.0": "bafybeicsydq6fdansf7qrmrygzchl3h6rtkdw5rmx2jyrwecj4laj5nehy", "skill/valory/check_stop_trading_abci/0.1.0": "bafybeidyc5fvw5wosbc3anxxxog5b67cfmvrsrltjh3cfllye3bb43r3z4", - "agent/valory/trader/0.1.0": "bafybeid6we52ey7unpjyxftuszir365gc4vfy5cwzleifjabzsajpb33aa", - "service/valory/trader/0.1.0": "bafybeiefjiyqd6xiktkwfx4zgrd3ax2srg3jvlky7eoeqz4ras2p6htzfe" + "agent/valory/trader/0.1.0": "bafybeibipcufi55mahfnldoy2xfgp54qhezrpogpqrcqdnlfevxdltafw4", + "service/valory/trader/0.1.0": "bafybeiea6n7nerf5sscxjakaddswa5vffjqrrjwsht5kapafblk3gmvun4" }, "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 6dff57195..df29070b6 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:bafybeidw4mbx3os3hmv7ley7b3g3gja7ydpitr7mxbjpwzxin2mzyt5yam - valory/termination_abci:0.1.0:bafybeihq6qtbwt6i53ayqym63vhjexkcppy26gguzhhjqywfmiuqghvv44 - valory/transaction_settlement_abci:0.1.0:bafybeigtzlk4uakmd54rxnznorcrstsr52kta474lgrnvx5ovr546vj7sq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifzwxm4xrwf2xectoycrlebpecoew2scgo53z76ohefn3gfydnpti +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigdo4dxmwsr5a3gtafbpawirly7b3abaa3rdofq4thma6mq3andby - valory/market_manager_abci:0.1.0:bafybeidygkw7mwhbk3ry3au5c5265vms5eti375v5jthd4be5dfnnoache -- valory/decision_maker_abci:0.1.0:bafybeiek2dhqqv7xpscf4tz3g2hlmacd4co4ksawhnrwyuqce4iqudiuz4 -- valory/trader_abci:0.1.0:bafybeihcrbwscyikxfaerhmbigqpp7vd2g7b4fgjpjv3cgbz53l5dnzcci +- valory/decision_maker_abci:0.1.0:bafybeiawd5mlqbjnxojf6yhaplo4gnid6xly6cysrjxb5n4bzbvwi32sem +- valory/trader_abci:0.1.0:bafybeibyogaropi7fugm6ahmtkapizrwdqhcp2lzvgpmoxskwy7imtdu2a - valory/staking_abci:0.1.0:bafybeicsydq6fdansf7qrmrygzchl3h6rtkdw5rmx2jyrwecj4laj5nehy - valory/check_stop_trading_abci:0.1.0:bafybeidyc5fvw5wosbc3anxxxog5b67cfmvrsrltjh3cfllye3bb43r3z4 - valory/mech_interact_abci:0.1.0:bafybeigkvcluq2kejpxdcb54iwqtvwhov5elg3cv4v2yomwjxyu5u7g7hi @@ -278,5 +278,5 @@ config: public_id: valory/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq type: connection config: - host: 0.0.0.0 + host: ${str:0.0.0.0} target_skill_id: valory/impact_evaluator_abci:0.1.0 diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index d39653838..8ab757408 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:bafybeid6we52ey7unpjyxftuszir365gc4vfy5cwzleifjabzsajpb33aa +agent: valory/trader:0.1.0:bafybeibipcufi55mahfnldoy2xfgp54qhezrpogpqrcqdnlfevxdltafw4 number_of_agents: 4 deployment: agent: @@ -504,3 +504,9 @@ cert_requests: public_key: ${ACN_NODE_PUBLIC_KEY:str:02d3a830c9d6ea1ae91936951430dee11f4662f33118b02190693be835359a9d77} save_path: .certs/acn_cosmos_11000.txt is_abstract: false +--- +public_id: valory/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq +type: connection +config: + host: ${HTTP_SERVER_HOST:str:0.0.0.0} + target_skill_id: valory/impact_evaluator_abci:0.1.0 diff --git a/packages/valory/skills/decision_maker_abci/behaviours/base.py b/packages/valory/skills/decision_maker_abci/behaviours/base.py index a7201d429..a789dbd78 100644 --- a/packages/valory/skills/decision_maker_abci/behaviours/base.py +++ b/packages/valory/skills/decision_maker_abci/behaviours/base.py @@ -518,7 +518,7 @@ def _build_multisend_data( expected_performative = ContractApiMessage.Performative.RAW_TRANSACTION if response_msg.performative != expected_performative: self.context.logger.error( - f"Couldn't compile the multisend tx. " + "Couldn't compile the multisend tx. " # type: ignore f"Expected response performative {expected_performative.value}, " # type: ignore f"received {response_msg.performative.value}: {response_msg}" ) @@ -552,7 +552,7 @@ def _build_multisend_safe_tx_hash(self) -> WaitableConditionType: if response_msg.performative != ContractApiMessage.Performative.STATE: self.context.logger.error( - "Couldn't get safe tx hash. Expected response performative " + "Couldn't get safe tx hash. Expected response performative " # type: ignore f"{ContractApiMessage.Performative.STATE.value}, " # type: ignore f"received {response_msg.performative.value}: {response_msg}." ) diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py index f4f8da53a..9831b4c21 100644 --- a/packages/valory/skills/decision_maker_abci/handlers.py +++ b/packages/valory/skills/decision_maker_abci/handlers.py @@ -154,6 +154,7 @@ def _get_handler(self, url: str, method: str) -> Tuple[Optional[Callable], Dict] where hostname is allowed to be localhost, 127.0.0.1 or the service_endpoint's hostname. :param url: the url to check + :param method: the method :returns: the handling method if the message is intended to be handled by this handler, None otherwise, and the regex captures """ # Check base url diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 7b193c181..f553500eb 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -12,7 +12,7 @@ fingerprint: README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky - behaviours/base.py: bafybeiap6bqx627tz775mdkppjude7az7yg6awwqfvrieq37hreiztscgy + behaviours/base.py: bafybeiepa4vqtyrvgbxqunwn76s2berznvlysqatxkfhh23gd6qrbsrqpq behaviours/bet_placement.py: bafybeia62an6dpkf6b46fzc4epcyh3zuvpvoge3ewmussclxbldjf3bdue behaviours/blacklisting.py: bafybeiaghjvhzyeltk6necqwqfwgwp6z4ckpgt3ee2yj3qhcneg5eorowi behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci @@ -28,7 +28,7 @@ fingerprint: behaviours/tool_selection.py: bafybeie7xhopohfoct7jggerk6nu3vkhlx7uhcowo3dfktoqmr7227j4ke dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm fsm_specification.yaml: bafybeif2kas4eho4aielucf3ihjzjsog32icccbxrvje6kkw7aw4m4zg6q - handlers.py: bafybeih7suwgcdv7jjcjlta6osjopxglk7tpmzfcloc2o5mxptsoxjtsue + handlers.py: bafybeielhwnfm2blt6clmwr557g2g3gddnt5bpb4cqul6p3wiwsfoksvlu io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa models.py: bafybeidvhapxg64o23h5nahlypnxfj7x6ltjwojlpxygjfeg5lagnrwify diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 18d7e2b19..d8b1e3579 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:bafybeiek2dhqqv7xpscf4tz3g2hlmacd4co4ksawhnrwyuqce4iqudiuz4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifzwxm4xrwf2xectoycrlebpecoew2scgo53z76ohefn3gfydnpti +- valory/decision_maker_abci:0.1.0:bafybeiawd5mlqbjnxojf6yhaplo4gnid6xly6cysrjxb5n4bzbvwi32sem +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeigdo4dxmwsr5a3gtafbpawirly7b3abaa3rdofq4thma6mq3andby - valory/staking_abci:0.1.0:bafybeicsydq6fdansf7qrmrygzchl3h6rtkdw5rmx2jyrwecj4laj5nehy - valory/check_stop_trading_abci:0.1.0:bafybeidyc5fvw5wosbc3anxxxog5b67cfmvrsrltjh3cfllye3bb43r3z4 - valory/mech_interact_abci:0.1.0:bafybeigkvcluq2kejpxdcb54iwqtvwhov5elg3cv4v2yomwjxyu5u7g7hi diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index ecaf41b39..5c9b13987 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:bafybeiek2dhqqv7xpscf4tz3g2hlmacd4co4ksawhnrwyuqce4iqudiuz4 +- valory/decision_maker_abci:0.1.0:bafybeiawd5mlqbjnxojf6yhaplo4gnid6xly6cysrjxb5n4bzbvwi32sem - valory/staking_abci:0.1.0:bafybeicsydq6fdansf7qrmrygzchl3h6rtkdw5rmx2jyrwecj4laj5nehy - valory/mech_interact_abci:0.1.0:bafybeigkvcluq2kejpxdcb54iwqtvwhov5elg3cv4v2yomwjxyu5u7g7hi behaviours: