From 051b82085cb5b04977f9460b0778df8e77412004 Mon Sep 17 00:00:00 2001 From: Adamantios Date: Fri, 28 Jul 2023 15:43:15 +0300 Subject: [PATCH 1/2] fix: blacklisting logic The comparison was incorrect. We need to keep a bet frozen, i.e., not update it, when the blacklisting expiration has not been reached yet. --- packages/valory/skills/market_manager_abci/behaviours.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/valory/skills/market_manager_abci/behaviours.py b/packages/valory/skills/market_manager_abci/behaviours.py index 184f2ebc7..0db18d33f 100644 --- a/packages/valory/skills/market_manager_abci/behaviours.py +++ b/packages/valory/skills/market_manager_abci/behaviours.py @@ -53,7 +53,7 @@ def __init__(self, **kwargs: Any) -> None: def is_frozen_bet(self, bet: Bet) -> bool: """Return if a bet should not be updated.""" return ( - bet.blacklist_expiration < self.synced_time + bet.blacklist_expiration > self.synced_time and bet.status == BetStatus.BLACKLISTED ) or bet.status == BetStatus.PROCESSED From d387ee4bf81c0949d89d229745f5fbdda54e7344 Mon Sep 17 00:00:00 2001 From: Adamantios Date: Fri, 28 Jul 2023 15:46:08 +0300 Subject: [PATCH 2/2] chore: run generators --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/skill.yaml | 2 +- .../valory/skills/market_manager_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 73f25b00a..df9192384 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,13 +1,13 @@ { "dev": { - "skill/valory/market_manager_abci/0.1.0": "bafybeibepyfidup5up5qdpzg5vbh6f3j24gez5mcjr4gplhvhuoe62prky", - "skill/valory/decision_maker_abci/0.1.0": "bafybeieifd2eitlvmhwkuneat4iocpjq7dlzrc5v4glvd7nxnwiq4sfjii", - "skill/valory/trader_abci/0.1.0": "bafybeiczaxwev4kndfelle2fan52xtwrtnddfl4sgeuqw4u7ccf4lv2kem", + "skill/valory/market_manager_abci/0.1.0": "bafybeids5us4cnfu2zboxfjjkyihxk2i4qmctwzbnrsk2uizzjl2gbjj4m", + "skill/valory/decision_maker_abci/0.1.0": "bafybeigo76utrglsm234zwlnktj2qoi66oyvnoh2ams2ltheccatzn6ow4", + "skill/valory/trader_abci/0.1.0": "bafybeiewtrmwvun7gg7qteyuq5ykdjiwwnwiirtbjc4fynkok5a5yjfsqi", "contract/valory/market_maker/0.1.0": "bafybeig3b2wfngntdypnixi2gphuqz3o6w7zba2rq6n6kepwdmth2mx3ni", - "agent/valory/trader/0.1.0": "bafybeicq7nr67hf72fd7dk4qtlkmguajfvdy4ohjahfiypaltnmkkzwfpe", - "service/valory/trader/0.1.0": "bafybeiebczz6xedfnu2zzf6u2lth6uugobfdbhvhbitambsjx6ffiyikfi", + "agent/valory/trader/0.1.0": "bafybeid2qo53p3c5rdq3at45elzm55odirwabipxspqrmf3ny64r2xhaue", + "service/valory/trader/0.1.0": "bafybeifhhrmls6ve2bgr3o6h62tivm45hhhy2blwm64aocifuyotiqrrba", "contract/valory/erc20/0.1.0": "bafybeict775c7iytqbhiv2tq6pdwtpyzr3p2wls3duvmrl3acee7pietwy", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibfrg7vh4shxhzk5r32fhyipeahxiaz43ppz2fbbekl3x7hcpfkry", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieby37xdqlqotwl3cdfvk4i4ng2uhaxmmhuopjylrqufbfkj54iem", "contract/valory/mech/0.1.0": "bafybeib3syh35usqjtqapqjjvobnkcxllkpjbxcb67g3vp3f566qsbhqgq" }, "third_party": { diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index f5e7b37c7..c6efb057d 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -38,10 +38,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeialcwck7fahrr23jckv5qjwg3cdq4ai2ihyjsofnbj44jzyl4cjmm - valory/termination_abci:0.1.0:bafybeifqsogqiar4yook5bu3j6z66dbdcizey7dr3e5oxeocdjijvfbaja - valory/transaction_settlement_abci:0.1.0:bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibfrg7vh4shxhzk5r32fhyipeahxiaz43ppz2fbbekl3x7hcpfkry -- valory/market_manager_abci:0.1.0:bafybeibepyfidup5up5qdpzg5vbh6f3j24gez5mcjr4gplhvhuoe62prky -- valory/decision_maker_abci:0.1.0:bafybeieifd2eitlvmhwkuneat4iocpjq7dlzrc5v4glvd7nxnwiq4sfjii -- valory/trader_abci:0.1.0:bafybeiczaxwev4kndfelle2fan52xtwrtnddfl4sgeuqw4u7ccf4lv2kem +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieby37xdqlqotwl3cdfvk4i4ng2uhaxmmhuopjylrqufbfkj54iem +- valory/market_manager_abci:0.1.0:bafybeids5us4cnfu2zboxfjjkyihxk2i4qmctwzbnrsk2uizzjl2gbjj4m +- valory/decision_maker_abci:0.1.0:bafybeigo76utrglsm234zwlnktj2qoi66oyvnoh2ams2ltheccatzn6ow4 +- valory/trader_abci:0.1.0:bafybeiewtrmwvun7gg7qteyuq5ykdjiwwnwiirtbjc4fynkok5a5yjfsqi default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index d9d3199f5..0e01391a6 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:bafybeicq7nr67hf72fd7dk4qtlkmguajfvdy4ohjahfiypaltnmkkzwfpe +agent: valory/trader:0.1.0:bafybeid2qo53p3c5rdq3at45elzm55odirwabipxspqrmf3ny64r2xhaue number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 0a73fd97b..10a329af9 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -42,7 +42,7 @@ protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: - valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i -- valory/market_manager_abci:0.1.0:bafybeibepyfidup5up5qdpzg5vbh6f3j24gez5mcjr4gplhvhuoe62prky +- valory/market_manager_abci:0.1.0:bafybeids5us4cnfu2zboxfjjkyihxk2i4qmctwzbnrsk2uizzjl2gbjj4m - valory/transaction_settlement_abci:0.1.0:bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle behaviours: main: diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index afa03d676..4d3d7ebeb 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeie6miwn67uin3bphukmf7qgiifh4xtm42i5v3nuyqxzxtehxsqvcq __init__.py: bafybeigrtedqzlq5mtql2ssjsdriw76ml3666m4e2c3fay6vmyzofl6v6e - behaviours.py: bafybeibe4dl5hdqpykgkgegdyhlbcbe6ftd5pzgqro3zu7oippbig75lqa + behaviours.py: bafybeig4wbudfwtjcxm3n4qnbjf2czr5jffaiuvnx7vbotsv5vdm3zkhom bets.py: bafybeibkmrktcj3ld5kypdjulf6gwzj6ft6qeh2iokm4yqjzzyv3ry6ga4 dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeic5cvwfbiu5pywyp3h5s2elvu7jqdrcwayay7o3v3ow47vu2jw53q diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index b3ddb2b2d..7b3d2cf9f 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -24,9 +24,9 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeialcwck7fahrr23jckv5qjwg3cdq4ai2ihyjsofnbj44jzyl4cjmm - valory/transaction_settlement_abci:0.1.0:bafybeiacwr7p4nhhufoey7uz2jqkegrlykdrmc7mm3rzkvh2mslu66gyle - valory/termination_abci:0.1.0:bafybeifqsogqiar4yook5bu3j6z66dbdcizey7dr3e5oxeocdjijvfbaja -- valory/market_manager_abci:0.1.0:bafybeibepyfidup5up5qdpzg5vbh6f3j24gez5mcjr4gplhvhuoe62prky -- valory/decision_maker_abci:0.1.0:bafybeieifd2eitlvmhwkuneat4iocpjq7dlzrc5v4glvd7nxnwiq4sfjii -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibfrg7vh4shxhzk5r32fhyipeahxiaz43ppz2fbbekl3x7hcpfkry +- valory/market_manager_abci:0.1.0:bafybeids5us4cnfu2zboxfjjkyihxk2i4qmctwzbnrsk2uizzjl2gbjj4m +- valory/decision_maker_abci:0.1.0:bafybeigo76utrglsm234zwlnktj2qoi66oyvnoh2ams2ltheccatzn6ow4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieby37xdqlqotwl3cdfvk4i4ng2uhaxmmhuopjylrqufbfkj54iem behaviours: main: args: {} diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 14edee1ae..a56db4fa0 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -20,7 +20,7 @@ contracts: [] protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeiaseziuvbzh3trjggl5hx2tv3fduqrpiwiyksudaf6nvuxmwrg74i -- valory/decision_maker_abci:0.1.0:bafybeieifd2eitlvmhwkuneat4iocpjq7dlzrc5v4glvd7nxnwiq4sfjii +- valory/decision_maker_abci:0.1.0:bafybeigo76utrglsm234zwlnktj2qoi66oyvnoh2ams2ltheccatzn6ow4 behaviours: main: args: {}