Merge pull request #198 from valory-xyz/feat/contract-calls

fix: update activity calls

docs/index.md

@@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit:
 2. Fetch the IEKit.
 
     ```bash
-    autonomy fetch valory/impact_evaluator:0.1.0:bafybeihxgdje37wxwufxg2n6vcch34isv3m7baocnaadzqfeb4ckb2mgkm --service
+    autonomy fetch valory/impact_evaluator:0.1.0:bafybeib67v5yrsfmv2kkupr34fqgbbfzrgc22nlvozebjwt36zra2tctji --service
     ```
 
 3. Build the Docker image of the service agents

packages/packages.json

@@ -10,28 +10,28 @@
         "contract/valory/veolas_delegation/0.1.0": "bafybeieicrbkito2hglwvd4j2cbq3etxpm3rrzfyx5kqqe34fu7q5aftye",
         "contract/valory/erc20/0.1.0": "bafybeid2p2jyvjjlcsqugnawksdzsca6ljghpqbp2kfi3cxuxoy2233dbi",
         "contract/valory/mech_marketplace/0.1.0": "bafybeiba7kh3wygwtpyf7oo3sili6givzo2gyadhbb66rvwsokswsywvuu",
-        "contract/valory/staking/0.1.0": "bafybeicaxc4vvc4ytopmr5cgbhgmpmg5qczr5trasdcezolm7ryinlwcpm",
+        "contract/valory/staking/0.1.0": "bafybeicuaiml5d5riwdmspcoiij5cdrdclgp3pabf6nnueg3dx5jyrp7sm",
         "connection/valory/twitter/0.1.0": "bafybeidcalgczvpoq6l2uh7kkfblwxmytm6bicmsxub7pevu2k46sp7mky",
         "connection/valory/openai/0.1.0": "bafybeigyehjbahya5mp7vyp5tjvn36rey4btvzskp3ql3mgxp3zu6gwq5a",
         "connection/valory/farcaster/0.1.0": "bafybeibbdas7lxbipksodaphjms3uop7vnzjqkroktjq2g6wbvgtlldaxi",
-        "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiasrv3tx6failm73zwo4wwzw7bee4f4ypod5zoosppjjlhwpevvay",
-        "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiclxf23jmu5qll6cmluoari63p5fjsyyebjtd2kryenlthfnqerl4",
+        "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiblwwxl3zg3ctjxijaouhygddzywhhiqupm4b6p6ionboelcwgai4",
+        "skill/valory/twitter_scoring_abci/0.1.0": "bafybeieskndevywsjfbch3mw2l63vn76ufugtgx5pneqotng64ihtbfghy",
         "skill/valory/ceramic_read_abci/0.1.0": "bafybeiede3ehp4bfpbk23gncj52goq62rd3rm5wwlbyaexxrfohucdcpia",
         "skill/valory/ceramic_write_abci/0.1.0": "bafybeiemid3ipekyqupbqpfw55g7b2wwx56g2ita73rjalk6fyqgneroam",
-        "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiaqct2mmgr6bs7mdecseirxnojqrmz2ro5gpiugdg7mlvvowwrdiq",
-        "skill/valory/generic_scoring_abci/0.1.0": "bafybeicesheeji3rxwpphquthazqy75uuuuur36ctsncerxvbzqc6in35a",
+        "skill/valory/impact_evaluator_abci/0.1.0": "bafybeieg4uiwnhgfayvxrj7crfjclfzwt7d4pkqrmxzwdv72dqp6fk4zp4",
+        "skill/valory/generic_scoring_abci/0.1.0": "bafybeihjdgcsmand23dlrea2oga4ootolpe6ddv256qb2qcm3foko7zo6e",
         "skill/valory/twitter_write_abci/0.1.0": "bafybeid377kr5f3dmb5nyhvucglyaaqkuhthxkfosgl54zskwmsuwz56ie",
         "skill/valory/llm_abci/0.1.0": "bafybeibmckwphs5zqdfnutktwgq7bxfw2auhsxezoopkep5dadkuwqvwgy",
-        "skill/valory/decision_making_abci/0.1.0": "bafybeicxtxczon2cupzklsnjgpssg6bgppgvxvwkxowfmf7k24sdycjffm",
-        "skill/valory/olas_week_abci/0.1.0": "bafybeiaratytbfjtot3ggp75ck4ae2rusuzxj2vewa6upwjeqwzxskff7u",
+        "skill/valory/decision_making_abci/0.1.0": "bafybeigrcet4dsg4s2mbr7arkmljkhob2v5lydoqir5jgghex3u7qaavp4",
+        "skill/valory/olas_week_abci/0.1.0": "bafybeid6tqp6pynbjnyyhuzcfjdllpfp5ppcwrprddsej52hvjnxhi6xhu",
         "skill/valory/mech_interact_abci/0.1.0": "bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm",
         "skill/valory/farcaster_write_abci/0.1.0": "bafybeihiayft7ovmijrstdo6m7fd5pqnqi7z2mximljpeskambbgo6476q",
         "skill/valory/farcaster_test_abci/0.1.0": "bafybeidkrbog6z54364dor5irf5tlebhaxy4btnmb2cgobpswqfh6cfk5i",
-        "skill/valory/staking_abci/0.1.0": "bafybeifrx27rachlkmugqyspf64xvctn6ettrqvzp4y7v2atklilbrhiie",
-        "agent/valory/impact_evaluator/0.1.0": "bafybeifxiahpjrfcfmg6knvkbwqspzesowbd77pefjh2tydm6fvwgznaei",
+        "skill/valory/staking_abci/0.1.0": "bafybeibecgbedfhwalzumwiynqrwvaolh7iy4cw4imuxgkltbvcvvabvmi",
+        "agent/valory/impact_evaluator/0.1.0": "bafybeiemwuqr2xp352vj3s5qvdodkvj6jwmoffruc2wfaoxotne5blkxke",
         "agent/valory/farcaster_test/0.1.0": "bafybeihelkwq4ocgpdkiglclwhigklp67clhjkaabg7dkiduw5apb6zwbe",
-        "service/valory/impact_evaluator/0.1.0": "bafybeihxgdje37wxwufxg2n6vcch34isv3m7baocnaadzqfeb4ckb2mgkm",
-        "service/valory/impact_evaluator_local/0.1.0": "bafybeigc5dqfra4jxygj53jxxpaitatmm36ztjfssqgf5p4n2r2nf5jvmq"
+        "service/valory/impact_evaluator/0.1.0": "bafybeib67v5yrsfmv2kkupr34fqgbbfzrgc22nlvozebjwt36zra2tctji",
+        "service/valory/impact_evaluator_local/0.1.0": "bafybeidzn2u6hzwdjx6mg2pvrv5tb3gtwv7rslmps6mdfookyjicfiulbm"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",

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

@@ -44,22 +44,22 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeieeaseuy5rbbw465knz27vccvpkfge43q7isl7fkdlfapwd7bpi24
 - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u
-- valory/impact_evaluator_abci:0.1.0:bafybeiaqct2mmgr6bs7mdecseirxnojqrmz2ro5gpiugdg7mlvvowwrdiq
-- valory/generic_scoring_abci:0.1.0:bafybeicesheeji3rxwpphquthazqy75uuuuur36ctsncerxvbzqc6in35a
-- valory/twitter_scoring_abci:0.1.0:bafybeiclxf23jmu5qll6cmluoari63p5fjsyyebjtd2kryenlthfnqerl4
+- valory/impact_evaluator_abci:0.1.0:bafybeieg4uiwnhgfayvxrj7crfjclfzwt7d4pkqrmxzwdv72dqp6fk4zp4
+- valory/generic_scoring_abci:0.1.0:bafybeihjdgcsmand23dlrea2oga4ootolpe6ddv256qb2qcm3foko7zo6e
+- valory/twitter_scoring_abci:0.1.0:bafybeieskndevywsjfbch3mw2l63vn76ufugtgx5pneqotng64ihtbfghy
 - valory/ceramic_read_abci:0.1.0:bafybeiede3ehp4bfpbk23gncj52goq62rd3rm5wwlbyaexxrfohucdcpia
 - valory/ceramic_write_abci:0.1.0:bafybeiemid3ipekyqupbqpfw55g7b2wwx56g2ita73rjalk6fyqgneroam
-- valory/dynamic_nft_abci:0.1.0:bafybeiasrv3tx6failm73zwo4wwzw7bee4f4ypod5zoosppjjlhwpevvay
+- valory/dynamic_nft_abci:0.1.0:bafybeiblwwxl3zg3ctjxijaouhygddzywhhiqupm4b6p6ionboelcwgai4
 - valory/registration_abci:0.1.0:bafybeibc7duasoaw5b4ene5oxfba2dmdzstsrws6ipi57ymgdtoxjadn54
 - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba
 - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm
 - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
 - valory/twitter_write_abci:0.1.0:bafybeid377kr5f3dmb5nyhvucglyaaqkuhthxkfosgl54zskwmsuwz56ie
-- valory/decision_making_abci:0.1.0:bafybeicxtxczon2cupzklsnjgpssg6bgppgvxvwkxowfmf7k24sdycjffm
+- valory/decision_making_abci:0.1.0:bafybeigrcet4dsg4s2mbr7arkmljkhob2v5lydoqir5jgghex3u7qaavp4
 - valory/llm_abci:0.1.0:bafybeibmckwphs5zqdfnutktwgq7bxfw2auhsxezoopkep5dadkuwqvwgy
-- valory/olas_week_abci:0.1.0:bafybeiaratytbfjtot3ggp75ck4ae2rusuzxj2vewa6upwjeqwzxskff7u
+- valory/olas_week_abci:0.1.0:bafybeid6tqp6pynbjnyyhuzcfjdllpfp5ppcwrprddsej52hvjnxhi6xhu
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
-- valory/staking_abci:0.1.0:bafybeifrx27rachlkmugqyspf64xvctn6ettrqvzp4y7v2atklilbrhiie
+- valory/staking_abci:0.1.0:bafybeibecgbedfhwalzumwiynqrwvaolh7iy4cw4imuxgkltbvcvvabvmi
 default_ledger: ethereum
 required_ledgers:
 - ethereum
@@ -270,7 +270,7 @@ models:
         priority_mech_service_id: ${int:0}
         requester_staking_instance_address: ${str:0x0000000000000000000000000000000000000000}
         response_timeout: ${int:300}
-      checkpoint_threshold_minutes: ${int:60}
+      checkpoint_threshold_minutes: ${int:120}
       staking_activity_threshold: ${int:5}
       staking_contract_address: ${str:0x0000000000000000000000000000000000000000}
       activity_contract_address: ${str:0x0000000000000000000000000000000000000000}

packages/valory/contracts/staking/contract.py

@@ -54,5 +54,5 @@ def build_activity_update_tx(
     ) -> Dict[str, bytes]:
         """Build an ERC20 approval."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("update", args=(updates,))
+        data = contract_instance.encodeABI("increaseActivity", args=(updates,))
         return {"data": bytes.fromhex(data[2:])}

packages/valory/contracts/staking/contract.yaml

@@ -9,7 +9,7 @@ fingerprint:
   README.md: bafybeiclvbed42bmvsm3qqxosfu4kxbc6vuhxaant2od2hmszpkznh3z74
   __init__.py: bafybeif5vpc3dfrlxlch7brbhmdwksabyzddpfqgm56vdbbkek3t3br6ke
   build/staking.json: bafybeiemn5b5nszuss7xj6lmvmjuendltp6wz7ubihdvd7c6wqw4bohbpa
-  contract.py: bafybeia7pbadkoagullommqgvedhrsqvvikakiktqpim63vctqlot4wave
+  contract.py: bafybeierpng4cpxau4mw4i5yolw725qs4pb6bjoj3heyuyjcsq2prix2ze
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: Staking

packages/valory/services/impact_evaluator/service.yaml

@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
 fingerprint_ignore_patterns: []
-agent: valory/impact_evaluator:0.1.0:bafybeifxiahpjrfcfmg6knvkbwqspzesowbd77pefjh2tydm6fvwgznaei
+agent: valory/impact_evaluator:0.1.0:bafybeiemwuqr2xp352vj3s5qvdodkvj6jwmoffruc2wfaoxotne5blkxke
 number_of_agents: 4
 deployment:
   agent:
@@ -140,7 +140,7 @@ extra:
           priority_mech_service_id: ${PRIORITY_MECH_SERVICE_ID:int:0}
           requester_staking_instance_address: ${REQUESTER_STAKING_INSTANCE_ADDRESS:str:0x0000000000000000000000000000000000000000}
           response_timeout: ${RESPONSE_TIMEOUT:int:300}
-        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:60}
+        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:120}
         staking_activity_threshold: ${STAKING_ACTIVITY_THRESHOLD:int:5}
         staking_contract_address: ${STAKING_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
         activity_contract_address: ${ACTIVITY_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
@@ -239,7 +239,7 @@ extra:
           priority_mech_service_id: ${PRIORITY_MECH_SERVICE_ID:int:0}
           requester_staking_instance_address: ${REQUESTER_STAKING_INSTANCE_ADDRESS:str:0x0000000000000000000000000000000000000000}
           response_timeout: ${RESPONSE_TIMEOUT:int:300}
-        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:60}
+        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:120}
         staking_activity_threshold: ${STAKING_ACTIVITY_THRESHOLD:int:5}
         staking_contract_address: ${STAKING_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
         activity_contract_address: ${ACTIVITY_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
@@ -338,7 +338,7 @@ extra:
           priority_mech_service_id: ${PRIORITY_MECH_SERVICE_ID:int:0}
           requester_staking_instance_address: ${REQUESTER_STAKING_INSTANCE_ADDRESS:str:0x0000000000000000000000000000000000000000}
           response_timeout: ${RESPONSE_TIMEOUT:int:300}
-        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:60}
+        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:120}
         staking_activity_threshold: ${STAKING_ACTIVITY_THRESHOLD:int:5}
         staking_contract_address: ${STAKING_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
         activity_contract_address: ${ACTIVITY_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
@@ -441,7 +441,7 @@ extra:
           priority_mech_service_id: ${PRIORITY_MECH_SERVICE_ID:int:0}
           requester_staking_instance_address: ${REQUESTER_STAKING_INSTANCE_ADDRESS:str:0x0000000000000000000000000000000000000000}
           response_timeout: ${RESPONSE_TIMEOUT:int:300}
-        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:60}
+        checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:120}
         staking_activity_threshold: ${STAKING_ACTIVITY_THRESHOLD:int:5}
         staking_contract_address: ${STAKING_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
         activity_contract_address: ${ACTIVITY_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}

packages/valory/services/impact_evaluator_local/service.yaml

@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
 fingerprint_ignore_patterns: []
-agent: valory/impact_evaluator:0.1.0:bafybeifxiahpjrfcfmg6knvkbwqspzesowbd77pefjh2tydm6fvwgznaei
+agent: valory/impact_evaluator:0.1.0:bafybeiemwuqr2xp352vj3s5qvdodkvj6jwmoffruc2wfaoxotne5blkxke
 number_of_agents: 1
 deployment:
   agent:
@@ -134,7 +134,7 @@ models:
         priority_mech_service_id: ${PRIORITY_MECH_SERVICE_ID:int:0}
         requester_staking_instance_address: ${REQUESTER_STAKING_INSTANCE_ADDRESS:str:0x0000000000000000000000000000000000000000}
         response_timeout: ${RESPONSE_TIMEOUT:int:300}
-      checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:60}
+      checkpoint_threshold_minutes: ${CHECKPOINT_THRESHOLD_MINUTES:int:120}
       staking_activity_threshold: ${STAKING_ACTIVITY_THRESHOLD:int:5}
       staking_contract_address: ${STAKING_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}
       activity_contract_address: ${ACTIVITY_CONTRACT_ADDRESS:str:0x0000000000000000000000000000000000000000}

packages/valory/skills/decision_making_abci/skill.yaml

@@ -20,7 +20,7 @@ fingerprint:
   tasks/read_stream_preparation.py: bafybeicmjasiyecopfweobodzbmn3tbluu5q724uzzqkit6urn3lb5q354
   tasks/score_preparations.py: bafybeie7cfot24zcyod5becz6t5lasvva77httfkw57qmvgjk35d3qluxa
   tasks/signature_validation.py: bafybeihbwrv72hnh3ytko2i5oszqgdky2j6h2wse45wvuhf2j32lo2tsjy
-  tasks/staking.py: bafybeiax6feu4oi66lqlqfr77l6ra5krysvnhgrxyfz3gi4t2qn6hgosnq
+  tasks/staking.py: bafybeiegtol6kukeawtrkf7dtdoy5owdetuxluciu75ivhqj6kcngosg5m
   tasks/task_preparations.py: bafybeibcddfroaabxljtqpg53z2yy2fqdb6e4uiwuwvykpkj4msqjgybmi
   tasks/tweet_validation_preparation.py: bafybeif3wbfskiyuij7unx72euklms7owrzwzgdu462xatvypalm6xrgca
   tasks/twitter_preparation.py: bafybeicn7stcvmd6oex55dwptwxpikpssbcwnj2d3xkercikg5nlzqh4k4

packages/valory/skills/decision_making_abci/tasks/staking.py

@@ -42,6 +42,9 @@ def check_extra_conditions(self):
         if minutes_since_last_run > self.params.checkpoint_threshold_minutes:
             return True
 
+        # If the epoch is about to end, we run the staking skill
+        # TODO
+
         return False
 
     def _pre_task(self):
@@ -75,7 +78,7 @@ def check_extra_conditions(self):
         """Check user staking threshold"""
         yield
 
-        # If enough users have passed the rewards threshold, we run the activity update
+        # If enough users have pending updates, we run the activity update
         pending_updates = self.count_pending_updates()
         if pending_updates > self.params.staking_activity_threshold:
             return True

packages/valory/skills/dynamic_nft_abci/skill.yaml

@@ -31,7 +31,7 @@ protocols:
 - valory/http:1.0.0:bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u
-- valory/decision_making_abci:0.1.0:bafybeicxtxczon2cupzklsnjgpssg6bgppgvxvwkxowfmf7k24sdycjffm
+- valory/decision_making_abci:0.1.0:bafybeigrcet4dsg4s2mbr7arkmljkhob2v5lydoqir5jgghex3u7qaavp4
 behaviours:
   main:
     args: {}

packages/valory/skills/generic_scoring_abci/skill.yaml

@@ -28,7 +28,7 @@ contracts: []
 protocols: []
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u
-- valory/decision_making_abci:0.1.0:bafybeicxtxczon2cupzklsnjgpssg6bgppgvxvwkxowfmf7k24sdycjffm
+- valory/decision_making_abci:0.1.0:bafybeigrcet4dsg4s2mbr7arkmljkhob2v5lydoqir5jgghex3u7qaavp4
 behaviours:
   main:
     args: {}

packages/valory/skills/impact_evaluator_abci/composition.py

@@ -71,8 +71,11 @@
     DecisionMakingAbci.FinishedDecisionMakingActivityRound: StakingAbci.ActivityScoreRound,
     DecisionMakingAbci.FinishedDecisionMakingCheckpointRound: StakingAbci.CheckpointPreparationRound,
     DecisionMakingAbci.FinishedPostMechResponseRound: MechResponseStates.MechResponseRound,
-    DecisionMakingAbci.FinishedPostActivityUpdateRound: StakingAbci.ActiviyUpdatePreparationRound,
+    DecisionMakingAbci.FinishedPostActivityUpdateRound: StakingAbci.ActivityScoreRound,
     DecisionMakingAbci.FinishedPostCheckpointRound: DecisionMakingAbci.DecisionMakingRound,
+    StakingAbci.FinishedActivityRound: DecisionMakingAbci.DecisionMakingRound,
+    StakingAbci.FinishedActiviyUpdatePreparationRound: TxSettlementAbci.RandomnessTransactionSubmissionRound,
+    StakingAbci.FinishedCheckpointPreparationRound: TxSettlementAbci.RandomnessTransactionSubmissionRound,
     MechFinalStates.FinishedMechResponseRound: TwitterScoringAbci.TwitterDecisionMakingRound,
     MechFinalStates.FinishedMechRequestSkipRound: TwitterScoringAbci.TwitterDecisionMakingRound,
     MechFinalStates.FinishedMechResponseTimeoutRound: MechResponseStates.MechResponseRound,

packages/valory/skills/impact_evaluator_abci/fsm_specification.yaml

@@ -5,7 +5,6 @@ alphabet_in:
 - CHECK_LATE_ARRIVING_MESSAGE
 - CHECK_TIMEOUT
 - CONTINUE
-- CONTINUE_UPDATING
 - CONTRACT_ERROR
 - DAILY_ORBIS
 - DAILY_TWEET
@@ -36,6 +35,7 @@ alphabet_in:
 - POST_TX_CHECKPOINT
 - POST_TX_MECH
 - PRE_MECH
+- PROCESS_UPDATES
 - READ_CENTAURS
 - READ_CONTRIBUTE_DB
 - READ_MANUAL_POINTS
@@ -62,10 +62,7 @@ alphabet_in:
 - WEEK_IN_OLAS_CREATE
 - WRITE_CONTRIBUTE_DB
 default_start_state: RegistrationStartupRound
-final_states:
-- FinishedActiviyUpdatePreparationContinueRound
-- FinishedActiviyUpdatePreparationEndRound
-- FinishedCheckpointPreparationRound
+final_states: []
 label: ImpactEvaluatorSkillAbciApp
 start_states:
 - RegistrationRound
@@ -80,9 +77,6 @@ states:
 - DBUpdateRound
 - DecisionMakingRound
 - FinalizationRound
-- FinishedActiviyUpdatePreparationContinueRound
-- FinishedActiviyUpdatePreparationEndRound
-- FinishedCheckpointPreparationRound
 - GenericScoringRound
 - LLMRandomnessRound
 - LLMRound
@@ -123,11 +117,11 @@ states:
 - ValidateTransactionRound
 - VerificationRound
 transition_func:
-    (ActivityScoreRound, DONE): ActiviyUpdatePreparationRound
+    (ActivityScoreRound, DONE): DecisionMakingRound
     (ActivityScoreRound, NO_MAJORITY): ActivityScoreRound
+    (ActivityScoreRound, PROCESS_UPDATES): ActiviyUpdatePreparationRound
     (ActivityScoreRound, ROUND_TIMEOUT): ActivityScoreRound
-    (ActiviyUpdatePreparationRound, CONTINUE_UPDATING): FinishedActiviyUpdatePreparationContinueRound
-    (ActiviyUpdatePreparationRound, DONE): FinishedActiviyUpdatePreparationEndRound
+    (ActiviyUpdatePreparationRound, DONE): RandomnessTransactionSubmissionRound
     (ActiviyUpdatePreparationRound, NO_MAJORITY): ActiviyUpdatePreparationRound
     (ActiviyUpdatePreparationRound, ROUND_TIMEOUT): ActiviyUpdatePreparationRound
     (CheckLateTxHashesRound, CHECK_LATE_ARRIVING_MESSAGE): SynchronizeLateMessagesRound
@@ -142,7 +136,7 @@ transition_func:
     (CheckTransactionHistoryRound, NEGATIVE): SelectKeeperTransactionSubmissionBRound
     (CheckTransactionHistoryRound, NONE): MechRequestRound
     (CheckTransactionHistoryRound, NO_MAJORITY): CheckTransactionHistoryRound
-    (CheckpointPreparationRound, DONE): FinishedCheckpointPreparationRound
+    (CheckpointPreparationRound, DONE): RandomnessTransactionSubmissionRound
     (CheckpointPreparationRound, NO_MAJORITY): CheckpointPreparationRound
     (CheckpointPreparationRound, ROUND_TIMEOUT): CheckpointPreparationRound
     (CollectSignatureRound, DONE): FinalizationRound
@@ -228,7 +222,7 @@ transition_func:
     (PostMechRequestRound, ROUND_TIMEOUT): PreMechRequestRound
     (PostTxDecisionMakingRound, DONE): PostTxDecisionMakingRound
     (PostTxDecisionMakingRound, NO_MAJORITY): PostTxDecisionMakingRound
-    (PostTxDecisionMakingRound, POST_TX_ACTIVITY_UPDATE): ActiviyUpdatePreparationRound
+    (PostTxDecisionMakingRound, POST_TX_ACTIVITY_UPDATE): ActivityScoreRound
     (PostTxDecisionMakingRound, POST_TX_CHECKPOINT): DecisionMakingRound
     (PostTxDecisionMakingRound, POST_TX_MECH): MechResponseRound
     (PreMechRequestRound, DONE): MechRequestRound