From 2ecb648a4d43f3dbf947ac5302ed9c32f0b9e405 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 15 Sep 2023 16:05:40 +0200 Subject: [PATCH 1/5] chore: Added further metadata to Omen query --- .../skills/market_manager_abci/graph_tooling/queries/omen.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py b/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py index d22846fc8..23be31d7b 100644 --- a/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py +++ b/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py @@ -81,6 +81,11 @@ question { id data + answers { + id + answer + bondAggregate + } } templateId } From 4959cda83aa0b428a09d7ecf1c94d47fc92b7039 Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 15 Sep 2023 18:02:05 +0200 Subject: [PATCH 2/5] fix: filtered markets with 2 answers on Reality --- packages/packages.json | 12 ++++++------ packages/valory/agents/trader/aea-config.yaml | 8 ++++---- packages/valory/services/trader/service.yaml | 2 +- .../valory/skills/decision_maker_abci/redeem_info.py | 1 + .../valory/skills/decision_maker_abci/skill.yaml | 4 ++-- .../graph_tooling/queries/omen.py | 2 ++ .../market_manager_abci/graph_tooling/requests.py | 6 +++++- .../valory/skills/market_manager_abci/skill.yaml | 4 ++-- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 10 files changed, 27 insertions(+), 20 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index c4eb35374..5db782d3f 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,13 +1,13 @@ { "dev": { - "skill/valory/market_manager_abci/0.1.0": "bafybeia3d2eri2fll6cu2ksg5riyhgn2i3ofn767sdj5xhwnfyidnaolpu", - "skill/valory/decision_maker_abci/0.1.0": "bafybeihyuoyu4dowmwf3ajkxgll5ysjvzfr6p27cxqqfdq7fvp2kwsq56y", - "skill/valory/trader_abci/0.1.0": "bafybeiaumqislfwbsswcpoid2pdq6psq5e77aihjhnmrn6ygx2k6dk2ehq", + "skill/valory/market_manager_abci/0.1.0": "bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a", + "skill/valory/decision_maker_abci/0.1.0": "bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se", + "skill/valory/trader_abci/0.1.0": "bafybeib2lotl5mzyd5h4glmdkzlrnyqgbzynbibyw3e65nsdrgmlehhity", "contract/valory/market_maker/0.1.0": "bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4", - "agent/valory/trader/0.1.0": "bafybeiefd67r3etu5xhgwxwjxsu2g6nfophralgvqldjbstlcwboy32gdi", - "service/valory/trader/0.1.0": "bafybeia66mugb3foqfh5gjrgjovgnyc4uvjiowkqrbikdekhs2veiszidi", + "agent/valory/trader/0.1.0": "bafybeialywy3upqhisoniv2w4aqgexdxtb7qwnh6rexnomisc5wknw564i", + "service/valory/trader/0.1.0": "bafybeifhemanhp4sjjqn6htt77qqf6ajcym7a667hndrgu4nts6lij7iq4", "contract/valory/erc20/0.1.0": "bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeicd7gho5rxde57tsjsu7puooxcogomrfd4fgfuoveos2l5lqtnnuu", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja", "contract/valory/mech/0.1.0": "bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai", "contract/valory/realitio/0.1.0": "bafybeigb722aznqhc5lsbt3dn4bpyaqe5hnl5onmnestqmzliwtvl3eaom", "contract/valory/realitio_proxy/0.1.0": "bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index cee5a5603..f1a9c4462 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -41,10 +41,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na - valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeicd7gho5rxde57tsjsu7puooxcogomrfd4fgfuoveos2l5lqtnnuu -- valory/market_manager_abci:0.1.0:bafybeia3d2eri2fll6cu2ksg5riyhgn2i3ofn767sdj5xhwnfyidnaolpu -- valory/decision_maker_abci:0.1.0:bafybeihyuoyu4dowmwf3ajkxgll5ysjvzfr6p27cxqqfdq7fvp2kwsq56y -- valory/trader_abci:0.1.0:bafybeiaumqislfwbsswcpoid2pdq6psq5e77aihjhnmrn6ygx2k6dk2ehq +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja +- valory/market_manager_abci:0.1.0:bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a +- valory/decision_maker_abci:0.1.0:bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se +- valory/trader_abci:0.1.0:bafybeib2lotl5mzyd5h4glmdkzlrnyqgbzynbibyw3e65nsdrgmlehhity default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 7c711175f..04b2e807b 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:bafybeiefd67r3etu5xhgwxwjxsu2g6nfophralgvqldjbstlcwboy32gdi +agent: valory/trader:0.1.0:bafybeialywy3upqhisoniv2w4aqgexdxtb7qwnh6rexnomisc5wknw564i number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/redeem_info.py b/packages/valory/skills/decision_maker_abci/redeem_info.py index 616900307..6e4a2a940 100644 --- a/packages/valory/skills/decision_maker_abci/redeem_info.py +++ b/packages/valory/skills/decision_maker_abci/redeem_info.py @@ -52,6 +52,7 @@ class Question: id: bytes data: str + answers: List def __post_init__(self) -> None: """Post initialization to adjust the values.""" diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index d671ea384..8627333f6 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -26,7 +26,7 @@ fingerprint: handlers.py: bafybeihj33szgrcxnpd73s4nvluyxwwsvhjum2cuq3ilhhe6vfola3k7vy models.py: bafybeibqou3ryuszu2vbwdp5b7fkj5oxmflgh3z3a7tuajbdxgzdolgmee payloads.py: bafybeifbnyviargcj5w5kbuuvc3o4y5sdogtuynd2b4ca4xsfbi3cqcwlm - redeem_info.py: bafybeie3s7syjr5dfwg33l4663zhkeiokvpulenndwboiyv4imzxr4bdyy + redeem_info.py: bafybeic7de4hrsgjmxbjht5ihasm5t7bykuonei5xxhpf3lpzq35fuxy74 rounds.py: bafybeihpstybessozkb3hjxhf3gvf323zw4d575ihmxrsuzcyhqtbsruoq states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeif42mqu6wu55iyjyqxto3poyta22gdsswgtus55lo4qpmv74wvlmm @@ -53,7 +53,7 @@ protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: - valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om -- valory/market_manager_abci:0.1.0:bafybeia3d2eri2fll6cu2ksg5riyhgn2i3ofn767sdj5xhwnfyidnaolpu +- valory/market_manager_abci:0.1.0:bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi behaviours: main: diff --git a/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py b/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py index 23be31d7b..65b9cccb0 100644 --- a/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py +++ b/packages/valory/skills/market_manager_abci/graph_tooling/queries/omen.py @@ -35,6 +35,7 @@ }, orderBy: creationTimestamp orderDirection: desc + first: 1000 ){ id title @@ -67,6 +68,7 @@ } orderBy: fpmm__creationTimestamp orderDirection: asc + first: 1000 ){ fpmm { answerFinalizedTimestamp diff --git a/packages/valory/skills/market_manager_abci/graph_tooling/requests.py b/packages/valory/skills/market_manager_abci/graph_tooling/requests.py index 78ba61b43..84e479231 100644 --- a/packages/valory/skills/market_manager_abci/graph_tooling/requests.py +++ b/packages/valory/skills/market_manager_abci/graph_tooling/requests.py @@ -208,7 +208,11 @@ def _fetch_redeem_info(self) -> Generator[None, None, Optional[list]]: res_context="trades", ) - return redeem_info + filtered_redeem_info = [ + entry for entry in redeem_info if len(entry.get("fpmm", {}).get("question", {}).get("answers", [])) == 1 + ] + + return filtered_redeem_info def _fetch_block_number( self, timestamp: int diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index f3122c505..77694d8d1 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -15,8 +15,8 @@ fingerprint: graph_tooling/__init__.py: bafybeigzo7nhbzafyq3fuhrlewksjvmzttiuk4vonrggtjtph4rw4ncpk4 graph_tooling/queries/__init__.py: bafybeihbybnl53i7k57ql5ujt5ru5n2eg324jfndh4lcnm4fk52mwbkjda graph_tooling/queries/network.py: bafybeigeq72ys2nrjqspj2uacaudrgljrne5a3o5jvzsktldxdq6m2xmeu - graph_tooling/queries/omen.py: bafybeihfppuyr6pth3vpd7iuqzqt567j37fgyegubttp4v2wo6r2knwuwe - graph_tooling/requests.py: bafybeibaghhrjesca7dbjxyjct6jaak6ozpa4ltzd6c5sxbq5nlq22ulkq + graph_tooling/queries/omen.py: bafybeiajk65gvqkxvxekywqqy2kob3vobjsealqlyxis3z6mpwhyng7hh4 + graph_tooling/requests.py: bafybeif6om3siuc54ridmqaz2x2nm7yvue7jcs6pgv5tuhhiwk3qjjegce handlers.py: bafybeihot2i2yvfkz2gcowvt66wdu6tkjbmv7hsmc4jzt4reqeaiuphbtu models.py: bafybeiaplszooak63fo3i6agaoyol4tpof4q4tvoj4j6f2cr2corajnl3a payloads.py: bafybeiamavgddfbzofpsjthmw6j7g2dyxm7fb6hvdb47kweyrx4w2ihcfi diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 213224abc..1150277c7 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:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi - valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu -- valory/market_manager_abci:0.1.0:bafybeia3d2eri2fll6cu2ksg5riyhgn2i3ofn767sdj5xhwnfyidnaolpu -- valory/decision_maker_abci:0.1.0:bafybeihyuoyu4dowmwf3ajkxgll5ysjvzfr6p27cxqqfdq7fvp2kwsq56y -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeicd7gho5rxde57tsjsu7puooxcogomrfd4fgfuoveos2l5lqtnnuu +- valory/market_manager_abci:0.1.0:bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a +- valory/decision_maker_abci:0.1.0:bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja 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 6b01e67bf..e5caf1066 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:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om -- valory/decision_maker_abci:0.1.0:bafybeihyuoyu4dowmwf3ajkxgll5ysjvzfr6p27cxqqfdq7fvp2kwsq56y +- valory/decision_maker_abci:0.1.0:bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se behaviours: main: args: {} From 74d56edd7396cd90c4e62612acc35be429c9d68d Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 15 Sep 2023 18:47:46 +0200 Subject: [PATCH 3/5] chore: change redemption transaction batch size --- packages/packages.json | 2 +- packages/valory/services/trader/service.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 5db782d3f..b904b3335 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -5,7 +5,7 @@ "skill/valory/trader_abci/0.1.0": "bafybeib2lotl5mzyd5h4glmdkzlrnyqgbzynbibyw3e65nsdrgmlehhity", "contract/valory/market_maker/0.1.0": "bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4", "agent/valory/trader/0.1.0": "bafybeialywy3upqhisoniv2w4aqgexdxtb7qwnh6rexnomisc5wknw564i", - "service/valory/trader/0.1.0": "bafybeifhemanhp4sjjqn6htt77qqf6ajcym7a667hndrgu4nts6lij7iq4", + "service/valory/trader/0.1.0": "bafybeih2cucf2bf4mcogtyajiyflcjakl2zu536ncunenm2morzoaodioy", "contract/valory/erc20/0.1.0": "bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe", "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja", "contract/valory/mech/0.1.0": "bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai", diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 04b2e807b..13ab870dd 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -101,7 +101,7 @@ type: skill conditional_tokens_address: ${CONDITIONAL_TOKENS_ADDRESS:str:0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce} realitio_proxy_address: ${REALITIO_PROXY_ADDRESS:str:0xAB16D643bA051C11962DA645f74632d3130c81E2} realitio_address: ${REALITIO_ADDRESS:str:0x79e32aE03fb27B07C89c0c568F80287C01ca2E57} - redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:5} + redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:1} slippage: ${SLIPPAGE:float:0.01} redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15} benchmark_tool: &id005 @@ -165,7 +165,7 @@ type: skill conditional_tokens_address: ${CONDITIONAL_TOKENS_ADDRESS:str:0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce} realitio_proxy_address: ${REALITIO_PROXY_ADDRESS:str:0xAB16D643bA051C11962DA645f74632d3130c81E2} realitio_address: ${REALITIO_ADDRESS:str:0x79e32aE03fb27B07C89c0c568F80287C01ca2E57} - redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:5} + redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:1} slippage: ${SLIPPAGE:float:0.01} redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15} benchmark_tool: *id005 @@ -227,7 +227,7 @@ type: skill conditional_tokens_address: ${CONDITIONAL_TOKENS_ADDRESS:str:0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce} realitio_proxy_address: ${REALITIO_PROXY_ADDRESS:str:0xAB16D643bA051C11962DA645f74632d3130c81E2} realitio_address: ${REALITIO_ADDRESS:str:0x79e32aE03fb27B07C89c0c568F80287C01ca2E57} - redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:5} + redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:1} slippage: ${SLIPPAGE:float:0.01} redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15} benchmark_tool: *id005 @@ -289,7 +289,7 @@ type: skill conditional_tokens_address: ${CONDITIONAL_TOKENS_ADDRESS:str:0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce} realitio_proxy_address: ${REALITIO_PROXY_ADDRESS:str:0xAB16D643bA051C11962DA645f74632d3130c81E2} realitio_address: ${REALITIO_ADDRESS:str:0x79e32aE03fb27B07C89c0c568F80287C01ca2E57} - redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:5} + redeeming_batch_size: ${REDEEMING_BATCH_SIZE:int:1} slippage: ${SLIPPAGE:float:0.01} redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15} benchmark_tool: *id005 From 8e8f1a64b60637641084c25ffc472ce19d406c7f Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 15 Sep 2023 19:47:12 +0200 Subject: [PATCH 4/5] chore: deactivate redeem functionality --- 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 +- .../market_manager_abci/graph_tooling/requests.py | 7 ++++++- .../valory/skills/market_manager_abci/skill.yaml | 2 +- packages/valory/skills/trader_abci/skill.yaml | 6 +++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index b904b3335..10565cb46 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,13 +1,13 @@ { "dev": { - "skill/valory/market_manager_abci/0.1.0": "bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a", - "skill/valory/decision_maker_abci/0.1.0": "bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se", - "skill/valory/trader_abci/0.1.0": "bafybeib2lotl5mzyd5h4glmdkzlrnyqgbzynbibyw3e65nsdrgmlehhity", + "skill/valory/market_manager_abci/0.1.0": "bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli", + "skill/valory/decision_maker_abci/0.1.0": "bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa", + "skill/valory/trader_abci/0.1.0": "bafybeid5bd6xabqttjotbqvqbdel4bnb3hti3yorebelzhlspkz2tyhbpa", "contract/valory/market_maker/0.1.0": "bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4", - "agent/valory/trader/0.1.0": "bafybeialywy3upqhisoniv2w4aqgexdxtb7qwnh6rexnomisc5wknw564i", - "service/valory/trader/0.1.0": "bafybeih2cucf2bf4mcogtyajiyflcjakl2zu536ncunenm2morzoaodioy", + "agent/valory/trader/0.1.0": "bafybeihbf2ot5pynnwnfls7cmtfhyglcie5v2s76ecqzi2ireqq3ethity", + "service/valory/trader/0.1.0": "bafybeicq55yhhtih7vlym6y7gb7bycnkmfhhs6zdyiw6i7nbuag6jfiipq", "contract/valory/erc20/0.1.0": "bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieg3nm4w2q3vsj7um5z6pmxyvepza6lr3ot3td3dj3fnn2jbuyaiq", "contract/valory/mech/0.1.0": "bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai", "contract/valory/realitio/0.1.0": "bafybeigb722aznqhc5lsbt3dn4bpyaqe5hnl5onmnestqmzliwtvl3eaom", "contract/valory/realitio_proxy/0.1.0": "bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index f1a9c4462..b723fb65f 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -41,10 +41,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na - valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja -- valory/market_manager_abci:0.1.0:bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a -- valory/decision_maker_abci:0.1.0:bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se -- valory/trader_abci:0.1.0:bafybeib2lotl5mzyd5h4glmdkzlrnyqgbzynbibyw3e65nsdrgmlehhity +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieg3nm4w2q3vsj7um5z6pmxyvepza6lr3ot3td3dj3fnn2jbuyaiq +- valory/market_manager_abci:0.1.0:bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli +- valory/decision_maker_abci:0.1.0:bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa +- valory/trader_abci:0.1.0:bafybeid5bd6xabqttjotbqvqbdel4bnb3hti3yorebelzhlspkz2tyhbpa default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 13ab870dd..d2896b3ba 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:bafybeialywy3upqhisoniv2w4aqgexdxtb7qwnh6rexnomisc5wknw564i +agent: valory/trader:0.1.0:bafybeihbf2ot5pynnwnfls7cmtfhyglcie5v2s76ecqzi2ireqq3ethity 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 8627333f6..c2124df9d 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -53,7 +53,7 @@ protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: - valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om -- valory/market_manager_abci:0.1.0:bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a +- valory/market_manager_abci:0.1.0:bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi behaviours: main: diff --git a/packages/valory/skills/market_manager_abci/graph_tooling/requests.py b/packages/valory/skills/market_manager_abci/graph_tooling/requests.py index 84e479231..6bae79a4c 100644 --- a/packages/valory/skills/market_manager_abci/graph_tooling/requests.py +++ b/packages/valory/skills/market_manager_abci/graph_tooling/requests.py @@ -209,9 +209,14 @@ def _fetch_redeem_info(self) -> Generator[None, None, Optional[list]]: ) filtered_redeem_info = [ - entry for entry in redeem_info if len(entry.get("fpmm", {}).get("question", {}).get("answers", [])) == 1 + entry + for entry in redeem_info # type: ignore[union-attr] + if len(entry.get("fpmm", {}).get("question", {}).get("answers", [])) == 1 ] + # FIXME Redeem functionality deactivated temporarily + filtered_redeem_info = [] + return filtered_redeem_info def _fetch_block_number( diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index 77694d8d1..3ecf15979 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -16,7 +16,7 @@ fingerprint: graph_tooling/queries/__init__.py: bafybeihbybnl53i7k57ql5ujt5ru5n2eg324jfndh4lcnm4fk52mwbkjda graph_tooling/queries/network.py: bafybeigeq72ys2nrjqspj2uacaudrgljrne5a3o5jvzsktldxdq6m2xmeu graph_tooling/queries/omen.py: bafybeiajk65gvqkxvxekywqqy2kob3vobjsealqlyxis3z6mpwhyng7hh4 - graph_tooling/requests.py: bafybeif6om3siuc54ridmqaz2x2nm7yvue7jcs6pgv5tuhhiwk3qjjegce + graph_tooling/requests.py: bafybeigykj4iphekrtnvx5j4bt2d2kpxogv435uv4wfkfwlmpwq5rwfacu handlers.py: bafybeihot2i2yvfkz2gcowvt66wdu6tkjbmv7hsmc4jzt4reqeaiuphbtu models.py: bafybeiaplszooak63fo3i6agaoyol4tpof4q4tvoj4j6f2cr2corajnl3a payloads.py: bafybeiamavgddfbzofpsjthmw6j7g2dyxm7fb6hvdb47kweyrx4w2ihcfi diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 1150277c7..bf0b678e3 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:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi - valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu -- valory/market_manager_abci:0.1.0:bafybeiewxh5wcmmuzzlk2d2bcyyoilbawokcgc2elle3u33vjta5q3v53a -- valory/decision_maker_abci:0.1.0:bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiexiryecvv7fe6veshnkqx6p3rahkir3klata2ynjo7vk7kosbeja +- valory/market_manager_abci:0.1.0:bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli +- valory/decision_maker_abci:0.1.0:bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieg3nm4w2q3vsj7um5z6pmxyvepza6lr3ot3td3dj3fnn2jbuyaiq 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 e5caf1066..78e03c5a1 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:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om -- valory/decision_maker_abci:0.1.0:bafybeihgrzhstkblhfhf5an3k5luou7j3nndadwdrctex6g7l4vxdki2se +- valory/decision_maker_abci:0.1.0:bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa behaviours: main: args: {} From 0ec2c1eae4737da6fd57574de64f50704d4dca9c Mon Sep 17 00:00:00 2001 From: jmoreira-valory Date: Fri, 15 Sep 2023 20:15:18 +0200 Subject: [PATCH 5/5] fix: hashes --- 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 10565cb46..0611aa45b 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,13 +1,13 @@ { "dev": { - "skill/valory/market_manager_abci/0.1.0": "bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli", - "skill/valory/decision_maker_abci/0.1.0": "bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa", - "skill/valory/trader_abci/0.1.0": "bafybeid5bd6xabqttjotbqvqbdel4bnb3hti3yorebelzhlspkz2tyhbpa", + "skill/valory/market_manager_abci/0.1.0": "bafybeibqn2lx7dcechwemvwja2kacoj6qkhqc2mt33p3f3i2unmgbecizq", + "skill/valory/decision_maker_abci/0.1.0": "bafybeigf7ud7qmjnawrauedmpuicl72mswj3uoxcblr6ptirkq3zbdwsr4", + "skill/valory/trader_abci/0.1.0": "bafybeiattymx6pnxq7uldd7tzo266jklmh73fcar2h26czmlgzmcwyvdsy", "contract/valory/market_maker/0.1.0": "bafybeiftimqgvrbval2lxp7au6y72amioo4gtcdth2dflrbwa47i6opyb4", - "agent/valory/trader/0.1.0": "bafybeihbf2ot5pynnwnfls7cmtfhyglcie5v2s76ecqzi2ireqq3ethity", - "service/valory/trader/0.1.0": "bafybeicq55yhhtih7vlym6y7gb7bycnkmfhhs6zdyiw6i7nbuag6jfiipq", + "agent/valory/trader/0.1.0": "bafybeie7r2wjgutkp26ds4dc2lgjt6bpjqeade2vuwkvdo5lvndwyqshkq", + "service/valory/trader/0.1.0": "bafybeiequfmdbxpd7vjyexebgk74piexhqetvd537wmwt7kbmsaprwwpri", "contract/valory/erc20/0.1.0": "bafybeifjwr6rwklgg2uk2zkfysn55qqy7dfi4jx7sek6lzdup37fynhpxe", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeieg3nm4w2q3vsj7um5z6pmxyvepza6lr3ot3td3dj3fnn2jbuyaiq", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeignhaagzdmmflsqk4kz5m7wkom5gv6idzld6qnat5h3n4teizi4qu", "contract/valory/mech/0.1.0": "bafybeie753wdqks6k4x5fqlpo7tgll2avutjcaodpwlptqvzefsi5xbvai", "contract/valory/realitio/0.1.0": "bafybeigb722aznqhc5lsbt3dn4bpyaqe5hnl5onmnestqmzliwtvl3eaom", "contract/valory/realitio_proxy/0.1.0": "bafybeibvndq6756qck7forgeavhdbn6ykgqs2ufyg7n5g6qdfpveatxuwy", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index b723fb65f..1fcab2044 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -41,10 +41,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na - valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieg3nm4w2q3vsj7um5z6pmxyvepza6lr3ot3td3dj3fnn2jbuyaiq -- valory/market_manager_abci:0.1.0:bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli -- valory/decision_maker_abci:0.1.0:bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa -- valory/trader_abci:0.1.0:bafybeid5bd6xabqttjotbqvqbdel4bnb3hti3yorebelzhlspkz2tyhbpa +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeignhaagzdmmflsqk4kz5m7wkom5gv6idzld6qnat5h3n4teizi4qu +- valory/market_manager_abci:0.1.0:bafybeibqn2lx7dcechwemvwja2kacoj6qkhqc2mt33p3f3i2unmgbecizq +- valory/decision_maker_abci:0.1.0:bafybeigf7ud7qmjnawrauedmpuicl72mswj3uoxcblr6ptirkq3zbdwsr4 +- valory/trader_abci:0.1.0:bafybeiattymx6pnxq7uldd7tzo266jklmh73fcar2h26czmlgzmcwyvdsy default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index d2896b3ba..b1daada9f 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:bafybeihbf2ot5pynnwnfls7cmtfhyglcie5v2s76ecqzi2ireqq3ethity +agent: valory/trader:0.1.0:bafybeie7r2wjgutkp26ds4dc2lgjt6bpjqeade2vuwkvdo5lvndwyqshkq 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 c2124df9d..df2aa7a31 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -53,7 +53,7 @@ protocols: - valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa skills: - valory/abstract_round_abci:0.1.0:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om -- valory/market_manager_abci:0.1.0:bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli +- valory/market_manager_abci:0.1.0:bafybeibqn2lx7dcechwemvwja2kacoj6qkhqc2mt33p3f3i2unmgbecizq - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi behaviours: main: diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml index 3ecf15979..fa11eeb21 100644 --- a/packages/valory/skills/market_manager_abci/skill.yaml +++ b/packages/valory/skills/market_manager_abci/skill.yaml @@ -16,7 +16,7 @@ fingerprint: graph_tooling/queries/__init__.py: bafybeihbybnl53i7k57ql5ujt5ru5n2eg324jfndh4lcnm4fk52mwbkjda graph_tooling/queries/network.py: bafybeigeq72ys2nrjqspj2uacaudrgljrne5a3o5jvzsktldxdq6m2xmeu graph_tooling/queries/omen.py: bafybeiajk65gvqkxvxekywqqy2kob3vobjsealqlyxis3z6mpwhyng7hh4 - graph_tooling/requests.py: bafybeigykj4iphekrtnvx5j4bt2d2kpxogv435uv4wfkfwlmpwq5rwfacu + graph_tooling/requests.py: bafybeics4oueh3nemdvl366vqgnf3ltea2ab443qtfaoqgl63tmct227qa handlers.py: bafybeihot2i2yvfkz2gcowvt66wdu6tkjbmv7hsmc4jzt4reqeaiuphbtu models.py: bafybeiaplszooak63fo3i6agaoyol4tpof4q4tvoj4j6f2cr2corajnl3a payloads.py: bafybeiamavgddfbzofpsjthmw6j7g2dyxm7fb6hvdb47kweyrx4w2ihcfi diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index bf0b678e3..8512c8f10 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:bafybeifoihgilpfr76hc5skzspm6qehkwivx7ld2cy3veipcsi4gr2c7na - valory/transaction_settlement_abci:0.1.0:bafybeiglsnh2hvfau5gab7requh34k4sbqwbjvrhhqjpes4hakcwq46cpi - valory/termination_abci:0.1.0:bafybeigcsls72uosoui2y5ppmnvsljjhnxakkeh3fdohklcg66aqq4g7xu -- valory/market_manager_abci:0.1.0:bafybeidzdb5fqrlbyzgqxx3rar3lrdnn3d6xk2dpbizg56zwctodsovlli -- valory/decision_maker_abci:0.1.0:bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeieg3nm4w2q3vsj7um5z6pmxyvepza6lr3ot3td3dj3fnn2jbuyaiq +- valory/market_manager_abci:0.1.0:bafybeibqn2lx7dcechwemvwja2kacoj6qkhqc2mt33p3f3i2unmgbecizq +- valory/decision_maker_abci:0.1.0:bafybeigf7ud7qmjnawrauedmpuicl72mswj3uoxcblr6ptirkq3zbdwsr4 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeignhaagzdmmflsqk4kz5m7wkom5gv6idzld6qnat5h3n4teizi4qu 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 78e03c5a1..866f5d2fd 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:bafybeif3cqkks5qx3lqi6nwwhebcirhazt2vidw3sueeqsyxvjeszjt3om -- valory/decision_maker_abci:0.1.0:bafybeiedhdyho7kqjczge7tlycamhgjmonvtgssatys2rpwoqxj7s6eixa +- valory/decision_maker_abci:0.1.0:bafybeigf7ud7qmjnawrauedmpuicl72mswj3uoxcblr6ptirkq3zbdwsr4 behaviours: main: args: {}