From cb34a600c74baa484297a7474557b958eaa64136 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Wed, 31 Jan 2024 17:17:16 +0530 Subject: [PATCH 1/2] fix: define termination_from_block parameter --- packages/packages.json | 6 +++--- packages/valory/agents/trader/aea-config.yaml | 3 ++- packages/valory/services/trader/service.yaml | 6 +++++- packages/valory/skills/trader_abci/skill.yaml | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index ee1a2b22f..9cd7254ee 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -2,10 +2,10 @@ "dev": { "skill/valory/market_manager_abci/0.1.0": "bafybeib72jm7aznzhmtxnmwlpnse23xutnurexml57ovkn2zpr2gsmpvni", "skill/valory/decision_maker_abci/0.1.0": "bafybeihlcywns6e6dbclae3odpyn4v2bpv7pl35htgszsb6z4qphecldim", - "skill/valory/trader_abci/0.1.0": "bafybeidvz2heofjhximr4i6peat2unqydfx5bzotefutdidwiqbrz5bgxq", + "skill/valory/trader_abci/0.1.0": "bafybeievgkfgkhxdwcwrkjnmtcvhxjoypctlku3qmobhfbkegeu5rncwtq", "contract/valory/market_maker/0.1.0": "bafybeihtjp5z2v6ax3fieu2hnwajlzlfpiadgmrsm24pd4rr2tjq33xt3i", - "agent/valory/trader/0.1.0": "bafybeiduzlvp2pz2rw2lhzxlcye3c7nygephmcknkuqzioqol2ejviw4yq", - "service/valory/trader/0.1.0": "bafybeiebqhzed6uhy4xgnliuezrnneafjtkipyiduf54yu45uouz4m224y", + "agent/valory/trader/0.1.0": "bafybeia3cfvngm4z4dv3nnbhnoc3lme6vj4xrbfuekqqzok2pgvbvihtl4", + "service/valory/trader/0.1.0": "bafybeigt734q4z22khysf22p5wbs4hzko3qfhwxcz3r37ahdneuc7mp5em", "contract/valory/erc20/0.1.0": "bafybeihy56fit7nc5e5f2h7bp7b2dvthibldyinynuxfzxvalhfo2zhvji", "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia6fnbxilcocfyupl6x7pid6fwkjpyc3ovr6nnfyl7v2bzaktpw3q", "contract/valory/mech/0.1.0": "bafybeid26bj6twv6he62gulrhixs2t2jsaxzhmpnysh3sywwankb74ngvu", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index e0cc23d1f..f57623703 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -47,7 +47,7 @@ skills: - valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia6fnbxilcocfyupl6x7pid6fwkjpyc3ovr6nnfyl7v2bzaktpw3q - valory/market_manager_abci:0.1.0:bafybeib72jm7aznzhmtxnmwlpnse23xutnurexml57ovkn2zpr2gsmpvni - valory/decision_maker_abci:0.1.0:bafybeihlcywns6e6dbclae3odpyn4v2bpv7pl35htgszsb6z4qphecldim -- valory/trader_abci:0.1.0:bafybeidvz2heofjhximr4i6peat2unqydfx5bzotefutdidwiqbrz5bgxq +- valory/trader_abci:0.1.0:bafybeievgkfgkhxdwcwrkjnmtcvhxjoypctlku3qmobhfbkegeu5rncwtq - valory/staking_abci:0.1.0:bafybeidgivibaeant53uef3j2virsxlgr5kpd6lsenr7pjdhqktwbqxfye default_ledger: ethereum required_ledgers: @@ -156,6 +156,7 @@ models: sleep_time: ${int:10} tendermint_p2p_url: ${str:localhost:26656} termination_sleep: ${int:900} + termination_from_block: ${int:0} use_termination: ${bool:false} on_chain_service_id: ${int:null} creator_per_subgraph: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index c6592a0ea..8a52cd198 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:bafybeiduzlvp2pz2rw2lhzxlcye3c7nygephmcknkuqzioqol2ejviw4yq +agent: valory/trader:0.1.0:bafybeia3cfvngm4z4dv3nnbhnoc3lme6vj4xrbfuekqqzok2pgvbvihtl4 number_of_agents: 4 deployment: {} --- @@ -68,6 +68,7 @@ type: skill termination_sleep: ${TERMINATION_SLEEP:int:900} tx_timeout: ${TX_TIMEOUT:float:10.0} use_termination: ${USE_TERMINATION:bool:false} + termination_from_block: ${TERMINATION_FROM_BLOCK:int:0} validate_timeout: ${VALIDATE_TIMEOUT:int:1205} history_check_timeout: ${HISTORY_CHECK_TIMEOUT:int:1205} creator_per_subgraph: &id003 @@ -163,6 +164,7 @@ type: skill termination_sleep: ${TERMINATION_SLEEP:int:900} tx_timeout: ${TX_TIMEOUT:float:10.0} use_termination: ${USE_TERMINATION:bool:false} + termination_from_block: ${TERMINATION_FROM_BLOCK:int:0} validate_timeout: ${VALIDATE_TIMEOUT:int:1205} history_check_timeout: ${HISTORY_CHECK_TIMEOUT:int:1205} creator_per_subgraph: *id003 @@ -255,6 +257,7 @@ type: skill termination_sleep: ${TERMINATION_SLEEP:int:900} tx_timeout: ${TX_TIMEOUT:float:10.0} use_termination: ${USE_TERMINATION:bool:false} + termination_from_block: ${TERMINATION_FROM_BLOCK:int:0} validate_timeout: ${VALIDATE_TIMEOUT:int:1205} history_check_timeout: ${HISTORY_CHECK_TIMEOUT:int:1205} creator_per_subgraph: *id003 @@ -347,6 +350,7 @@ type: skill termination_sleep: ${TERMINATION_SLEEP:int:900} tx_timeout: ${TX_TIMEOUT:float:10.0} use_termination: ${USE_TERMINATION:bool:false} + termination_from_block: ${TERMINATION_FROM_BLOCK:int:0} validate_timeout: ${VALIDATE_TIMEOUT:int:1205} history_check_timeout: ${HISTORY_CHECK_TIMEOUT:int:1205} creator_per_subgraph: *id003 diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index eab8e6d91..22527f9b1 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -135,6 +135,7 @@ models: termination_sleep: 900 tx_timeout: 10.0 use_termination: false + termination_from_block: 0 validate_timeout: 1205 creator_per_subgraph: omen_subgraph: [] From dc7028e9269c3b6854cfadc871f94a07d0e3efed Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Wed, 31 Jan 2024 17:19:33 +0530 Subject: [PATCH 2/2] fix: add lock check to workflow --- .github/workflows/common_checks.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/common_checks.yaml b/.github/workflows/common_checks.yaml index 5f363ff66..a84c2d950 100644 --- a/.github/workflows/common_checks.yaml +++ b/.github/workflows/common_checks.yaml @@ -37,6 +37,8 @@ jobs: virtualenvs-in-project: false virtualenvs-path: ~/my-custom-path installer-parallel: true + - name: Check if dependencies can be locked + run: poetry lock - name: Poetry install requirements and check they can be locked run: poetry install --all-extras --no-interaction -vvv