Merge pull request #155 from valory-xyz/fix/persist-cleaned

Persist the status of the clean operation for the redeeming round

packages/packages.json

@@ -1,13 +1,13 @@
 {
     "dev": {
         "skill/valory/market_manager_abci/0.1.0": "bafybeic7o4pclkhnugyn7js5g3asxuqhkxpvunlp3mpup7aovhg2fto22i",
-        "skill/valory/decision_maker_abci/0.1.0": "bafybeihhtnisaq3sx6r222fnsrsl4xf5cvonsebhuuyoje5v6eyczlzxii",
-        "skill/valory/trader_abci/0.1.0": "bafybeiffc6ellclyqx4ai4tteco5j72pe27spiozrj7ii3tcyga2q7eqza",
+        "skill/valory/decision_maker_abci/0.1.0": "bafybeiezxeb4vwsuzbfbka5emvzqlzs4zghcqyt6ilatdakokiuwqkejoy",
+        "skill/valory/trader_abci/0.1.0": "bafybeiaxrpftik5wf6x3avulcc5n4wvpis3kmroggjoet2bs4q7lbizr5e",
         "contract/valory/market_maker/0.1.0": "bafybeid5jnetbsusgxkpqzwyiqlwut55xktfbeloipxcemcuu5oopmqtl4",
-        "agent/valory/trader/0.1.0": "bafybeible6csd65omaekwyvt4ly2aza6elghjfsfwvca5th67hyae5lyhm",
-        "service/valory/trader/0.1.0": "bafybeibw3emqs2cy3zb7zceuhxfki6ed34uiabfx45fmbxptz6esujw5tq",
+        "agent/valory/trader/0.1.0": "bafybeibjajgtln64kas6o2nsxn4k5vf2akqyvlak3ugcpl2mbuvbserytq",
+        "service/valory/trader/0.1.0": "bafybeifux2exrevxmvwfxy6iazce7hvr3juvjitsx3nrlwsbtjy5utium4",
         "contract/valory/erc20/0.1.0": "bafybeiepg5ymxhtylgijs3mf3lezz6cwcsougbrv2gr4xcq3bp5wxusi64",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiewivhb2vcxcw5k2ltvqsyzjuthqahsnnopydo2smsqqoufgd2keu",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeig6pwr7zcou53qehlytced5rdltue7phfttt4ms55hk2bk3brfpve",
         "contract/valory/mech/0.1.0": "bafybeieo65rtidzgrx22la7z7azoqbisd35hnoqfw7l3xxctotvctjlkju",
         "contract/valory/realitio/0.1.0": "bafybeiejybwx4d3iwaxumxuox7vbub2syyzycqnxaflnjakrgcf4z5gcle",
         "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4",

packages/valory/agents/trader/aea-config.yaml

@@ -43,10 +43,10 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeiencz2uytz6fqj5wg7mcunevxjh4xg5gd6pqcgkshgqywhcimweyi
 - valory/termination_abci:0.1.0:bafybeigainmpy37gb33ogbrpggjbkuasodhthh5oz4vbzjdfjozerpf224
 - valory/transaction_settlement_abci:0.1.0:bafybeigk3debp6dswutqsuls2lqfvyj4ghe6kwjc2zfinnsvj6hujynxtq
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiewivhb2vcxcw5k2ltvqsyzjuthqahsnnopydo2smsqqoufgd2keu
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeig6pwr7zcou53qehlytced5rdltue7phfttt4ms55hk2bk3brfpve
 - valory/market_manager_abci:0.1.0:bafybeic7o4pclkhnugyn7js5g3asxuqhkxpvunlp3mpup7aovhg2fto22i
-- valory/decision_maker_abci:0.1.0:bafybeihhtnisaq3sx6r222fnsrsl4xf5cvonsebhuuyoje5v6eyczlzxii
-- valory/trader_abci:0.1.0:bafybeiffc6ellclyqx4ai4tteco5j72pe27spiozrj7ii3tcyga2q7eqza
+- valory/decision_maker_abci:0.1.0:bafybeiezxeb4vwsuzbfbka5emvzqlzs4zghcqyt6ilatdakokiuwqkejoy
+- valory/trader_abci:0.1.0:bafybeiaxrpftik5wf6x3avulcc5n4wvpis3kmroggjoet2bs4q7lbizr5e
 - valory/staking_abci:0.1.0:bafybeia3acxumkjg566dvgagv3swz7htf5xpvwq6ovmecvp5j2zdxdoabe
 default_ledger: ethereum
 required_ledgers:

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:bafybeible6csd65omaekwyvt4ly2aza6elghjfsfwvca5th67hyae5lyhm
+agent: valory/trader:0.1.0:bafybeibjajgtln64kas6o2nsxn4k5vf2akqyvlak3ugcpl2mbuvbserytq
 number_of_agents: 4
 deployment: {}
 ---

packages/valory/skills/decision_maker_abci/behaviours/reedem.py

@@ -788,14 +788,13 @@ def async_act(self) -> Generator:
                 self.context.logger.info(msg)
                 self._load_progress()
 
-            success = False
             if not self.redeeming_progress.check_finished:
-                success = yield from self._clean_redeem_info()
+                self.redeeming_progress.cleaned = yield from self._clean_redeem_info()
 
             agent = self.context.agent_address
             payload = RedeemPayload(agent)
 
-            if success:
+            if self.redeeming_progress.cleaned:
                 redeem_tx_hex = yield from self._prepare_safe_tx()
                 if redeem_tx_hex is not None:
                     tx_submitter = self.matching_round.auto_round_id()

packages/valory/skills/decision_maker_abci/models.py

@@ -84,6 +84,7 @@ class RedeemingProgress:
     check_started: bool = False
     check_from_block: BlockIdentifier = "earliest"
     check_to_block: BlockIdentifier = "latest"
+    cleaned: bool = False
     payouts: Dict[str, int] = field(default_factory=lambda: {})
     claim_started: bool = False
     claim_from_block: BlockIdentifier = "earliest"

packages/valory/skills/decision_maker_abci/skill.yaml

@@ -18,14 +18,14 @@ fingerprint:
   behaviours/decision_receive.py: bafybeifacce2ke7oltnwnpdjdqfd74eaaw5wxnjfzk6c5tqdsxsmbzjj3m
   behaviours/decision_request.py: bafybeievr7vae43e7jr4eqqhwe3emvgiih7ysa66jcb5g2oz5lbxua232q
   behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm
-  behaviours/reedem.py: bafybeifwtcnt37ikl6ai76pxlmp3aqn3xjryc7a7urzrk7hf6oo7viczjm
+  behaviours/reedem.py: bafybeidlyt2bie2luguptagq3u7xytdeftckdnmpql4gzqrzdkqjspuyp4
   behaviours/round_behaviour.py: bafybeig4tdktyu6hapoqymnxh2bgpds547st6a44heue657wkctwe4gjvm
   behaviours/sampling.py: bafybeifzhm4sspdvt227ksl5hjn26offgqpwempgbcwbr6dq7gyi2a46sm
   behaviours/tool_selection.py: bafybeigfr2frkljrxyfxs5p3j42equzehgaqtkyuxk6eiujyudr6ajqakm
   dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
   fsm_specification.yaml: bafybeifnob3ceim2mj7lqagtnpwqjqqxs5eg3oiwc73gwm6x5i2dvvlcya
   handlers.py: bafybeihj33szgrcxnpd73s4nvluyxwwsvhjum2cuq3ilhhe6vfola3k7vy
-  models.py: bafybeiafce43gq72ua5t5ingx3t5w4ngvxqsizlgb5oysx3q2otwuvi5h4
+  models.py: bafybeiathvz2s7bhc4w4gggjoxomzwdxqtdnziq7afc335k5z32kpswgle
   payloads.py: bafybeigcic4vewdglakzpyqevhfwsolh4ywnbvxo5bgned7gl5uo3jif7m
   policy.py: bafybeidpmx4ek3qze63zpuwixyf6t7bdv62ewgkzt3ljrzadiwdw64cueq
   redeem_info.py: bafybeibddfxwp3577c3dl2utaowwltquu5fg6crezpumoebw563wxpbfrm

packages/valory/skills/trader_abci/skill.yaml

@@ -25,8 +25,8 @@ skills:
 - valory/transaction_settlement_abci:0.1.0:bafybeigk3debp6dswutqsuls2lqfvyj4ghe6kwjc2zfinnsvj6hujynxtq
 - valory/termination_abci:0.1.0:bafybeigainmpy37gb33ogbrpggjbkuasodhthh5oz4vbzjdfjozerpf224
 - valory/market_manager_abci:0.1.0:bafybeic7o4pclkhnugyn7js5g3asxuqhkxpvunlp3mpup7aovhg2fto22i
-- valory/decision_maker_abci:0.1.0:bafybeihhtnisaq3sx6r222fnsrsl4xf5cvonsebhuuyoje5v6eyczlzxii
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiewivhb2vcxcw5k2ltvqsyzjuthqahsnnopydo2smsqqoufgd2keu
+- valory/decision_maker_abci:0.1.0:bafybeiezxeb4vwsuzbfbka5emvzqlzs4zghcqyt6ilatdakokiuwqkejoy
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeig6pwr7zcou53qehlytced5rdltue7phfttt4ms55hk2bk3brfpve
 - valory/staking_abci:0.1.0:bafybeia3acxumkjg566dvgagv3swz7htf5xpvwq6ovmecvp5j2zdxdoabe
 behaviours:
   main:

packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

@@ -21,7 +21,7 @@ protocols:
 - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeidau7loztcfy3mxvoqrv7otbpciemd2wf3lsxyjraq4dcvuvib25e
-- valory/decision_maker_abci:0.1.0:bafybeihhtnisaq3sx6r222fnsrsl4xf5cvonsebhuuyoje5v6eyczlzxii
+- valory/decision_maker_abci:0.1.0:bafybeiezxeb4vwsuzbfbka5emvzqlzs4zghcqyt6ilatdakokiuwqkejoy
 - valory/staking_abci:0.1.0:bafybeia3acxumkjg566dvgagv3swz7htf5xpvwq6ovmecvp5j2zdxdoabe
 behaviours:
   main: