Merge pull request #79 from valory-xyz/fix/temporary_patch_redemption

Temporary fix for redemption
valory-xyz · Sep 15, 2023 · 4ad7f4b · 4ad7f4b
2 parents 3384c2a + 0ec2c1e
commit 4ad7f4b
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 24 deletions.
diff --git 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": "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": "bafybeiefd67r3etu5xhgwxwjxsu2g6nfophralgvqldjbstlcwboy32gdi",
-        "service/valory/trader/0.1.0": "bafybeia66mugb3foqfh5gjrgjovgnyc4uvjiowkqrbikdekhs2veiszidi",
+        "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": "bafybeicd7gho5rxde57tsjsu7puooxcogomrfd4fgfuoveos2l5lqtnnuu",
+        "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
@@ -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: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
@@ -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:bafybeie7r2wjgutkp26ds4dc2lgjt6bpjqeade2vuwkvdo5lvndwyqshkq
 number_of_agents: 4
 deployment: {}
 ---
@@ -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

diff --git 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
@@ -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:bafybeibqn2lx7dcechwemvwja2kacoj6qkhqc2mt33p3f3i2unmgbecizq
 - 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
@@ -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
@@ -81,6 +83,11 @@
           question {
             id
             data
+            answers {
+              id
+              answer
+              bondAggregate
+            }
           }
           templateId
         }

diff --git 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,16 @@ 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  # 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(
         self, timestamp: int

diff --git 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: 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
@@ -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: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
@@ -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:bafybeigf7ud7qmjnawrauedmpuicl72mswj3uoxcblr6ptirkq3zbdwsr4
 behaviours:
   main:
     args: {}