chore: run generators

valory-xyz · Nov 17, 2023 · ded4c4c · ded4c4c
1 parent ac1f252
commit ded4c4c
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 37 deletions.
diff --git a/packages/packages.json b/packages/packages.json
@@ -1,13 +1,13 @@
 {
     "dev": {
         "skill/valory/market_manager_abci/0.1.0": "bafybeibrjre5yka3sbvb6lsefgc5yutovb6h4ffzrpecplfkjwtl5i36te",
-        "skill/valory/decision_maker_abci/0.1.0": "bafybeighimm45dlkagx5uig2i4wa7ikmiajlcyqkpms64amm5osxrnzroi",
-        "skill/valory/trader_abci/0.1.0": "bafybeihss6lmdt3khxktp2jzuuxsargspa3wb46jpdty6nqrwhxrq5ktde",
+        "skill/valory/decision_maker_abci/0.1.0": "bafybeiejunyhbfzk3tqn22xmyvpyn75xyjsbeg7grjrywhecak3phbwwem",
+        "skill/valory/trader_abci/0.1.0": "bafybeiemxg64onagmbttfwepmtsb4u66fs7xzqporg3udls5vf6ynr4oom",
         "contract/valory/market_maker/0.1.0": "bafybeif4mm2s3gxtvp227yypkcnna5ftec7vajcftvtbdmqddh7nprah5m",
-        "agent/valory/trader/0.1.0": "bafybeigt2t6okczlbwsx7vwydq7c4cqniettxmmtidvdibvjkngadpk2wa",
-        "service/valory/trader/0.1.0": "bafybeiee5x6fx2rhzizmpcnuzwcgia2iu4qwzzfbegiwqh4okda6edlwg4",
+        "agent/valory/trader/0.1.0": "bafybeig3omqzkg527piqyesmmdlblteiosbmjxaf6p43iifln2ftll2gbq",
+        "service/valory/trader/0.1.0": "bafybeibqb4t7dx5e32msfmt45efhdabpeddunhin4ylyzmmknwe3tcmplq",
         "contract/valory/erc20/0.1.0": "bafybeieqj7dea4tcv6z2yqkgtmhd23vbiycsr5trhwxdvlbwulpl6vhmam",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidaamjhhyayxprfi6pgoijmjhbybnlmhjugegm2pb4kj6ax623bna",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeig6khajjeh5fhgvn5xm7zfvk6o6izfyarrfkfprg7eet6t45lghgi",
         "contract/valory/mech/0.1.0": "bafybeihvc6btuk3nvernzcx4qpezvuhiw2wwnagqj5nkeljvszghv7mq64",
         "contract/valory/realitio/0.1.0": "bafybeiamgkwwqhray4fs2hlipwxkq7mosmi7ev7jut4vneetaaycc4ruji",
         "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4",

diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml
@@ -43,10 +43,10 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe
 - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy
 - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidaamjhhyayxprfi6pgoijmjhbybnlmhjugegm2pb4kj6ax623bna
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeig6khajjeh5fhgvn5xm7zfvk6o6izfyarrfkfprg7eet6t45lghgi
 - valory/market_manager_abci:0.1.0:bafybeibrjre5yka3sbvb6lsefgc5yutovb6h4ffzrpecplfkjwtl5i36te
-- valory/decision_maker_abci:0.1.0:bafybeighimm45dlkagx5uig2i4wa7ikmiajlcyqkpms64amm5osxrnzroi
-- valory/trader_abci:0.1.0:bafybeihss6lmdt3khxktp2jzuuxsargspa3wb46jpdty6nqrwhxrq5ktde
+- valory/decision_maker_abci:0.1.0:bafybeiejunyhbfzk3tqn22xmyvpyn75xyjsbeg7grjrywhecak3phbwwem
+- valory/trader_abci:0.1.0:bafybeiemxg64onagmbttfwepmtsb4u66fs7xzqporg3udls5vf6ynr4oom
 - valory/staking_abci:0.1.0:bafybeifdxywwwtwgfmtufkvvjvepil6qwetbldftf5eab5v2r3b3zh574q
 default_ledger: ethereum
 required_ledgers:

diff --git a/packages/valory/skills/trader_abci/fsm_specification.yaml b/packages/valory/skills/trader_abci/fsm_specification.yaml
@@ -1,6 +1,7 @@
 alphabet_in:
 - BET_PLACEMENT_DONE
 - BLACKLIST
+- CHECKS_PASSED
 - CHECK_HISTORY
 - CHECK_LATE_ARRIVING_MESSAGE
 - CHECK_TIMEOUT
@@ -20,6 +21,7 @@ alphabet_in:
 - NO_OP
 - NO_REDEEMING
 - REDEEMING_DONE
+- REFILL_REQUIRED
 - RESET_AND_PAUSE_TIMEOUT
 - RESET_TIMEOUT
 - ROUND_TIMEOUT
@@ -53,6 +55,7 @@ states:
 - HandleFailedTxRound
 - ImpossibleRound
 - PostTxSettlementRound
+- PreTxSettlementRound
 - RandomnessTransactionSubmissionRound
 - RedeemRound
 - RegistrationRound
@@ -68,7 +71,7 @@ states:
 - UpdateBetsRound
 - ValidateTransactionRound
 transition_func:
-    (BetPlacementRound, DONE): RandomnessTransactionSubmissionRound
+    (BetPlacementRound, DONE): PreTxSettlementRound
     (BetPlacementRound, INSUFFICIENT_BALANCE): ResetAndPauseRound
     (BetPlacementRound, NONE): ImpossibleRound
     (BetPlacementRound, NO_MAJORITY): BetPlacementRound
@@ -78,7 +81,7 @@ transition_func:
     (BlacklistingRound, NONE): ImpossibleRound
     (BlacklistingRound, NO_MAJORITY): BlacklistingRound
     (BlacklistingRound, ROUND_TIMEOUT): BlacklistingRound
-    (CallCheckpointRound, DONE): RandomnessTransactionSubmissionRound
+    (CallCheckpointRound, DONE): PreTxSettlementRound
     (CallCheckpointRound, NEXT_CHECKPOINT_NOT_REACHED_YET): ResetAndPauseRound
     (CallCheckpointRound, NO_MAJORITY): CallCheckpointRound
     (CallCheckpointRound, ROUND_TIMEOUT): CallCheckpointRound
@@ -104,7 +107,7 @@ transition_func:
     (DecisionReceiveRound, ROUND_TIMEOUT): DecisionReceiveRound
     (DecisionReceiveRound, TIE): BlacklistingRound
     (DecisionReceiveRound, UNPROFITABLE): BlacklistingRound
-    (DecisionRequestRound, DONE): RandomnessTransactionSubmissionRound
+    (DecisionRequestRound, DONE): PreTxSettlementRound
     (DecisionRequestRound, NONE): ImpossibleRound
     (DecisionRequestRound, NO_MAJORITY): DecisionRequestRound
     (DecisionRequestRound, ROUND_TIMEOUT): DecisionRequestRound
@@ -124,10 +127,14 @@ transition_func:
     (PostTxSettlementRound, ROUND_TIMEOUT): PostTxSettlementRound
     (PostTxSettlementRound, STAKING_DONE): ResetAndPauseRound
     (PostTxSettlementRound, UNRECOGNIZED): FailedMultiplexerRound
+    (PreTxSettlementRound, CHECKS_PASSED): RandomnessTransactionSubmissionRound
+    (PreTxSettlementRound, NO_MAJORITY): PreTxSettlementRound
+    (PreTxSettlementRound, REFILL_REQUIRED): PreTxSettlementRound
+    (PreTxSettlementRound, ROUND_TIMEOUT): PreTxSettlementRound
     (RandomnessTransactionSubmissionRound, DONE): SelectKeeperTransactionSubmissionARound
     (RandomnessTransactionSubmissionRound, NO_MAJORITY): RandomnessTransactionSubmissionRound
     (RandomnessTransactionSubmissionRound, ROUND_TIMEOUT): RandomnessTransactionSubmissionRound
-    (RedeemRound, DONE): RandomnessTransactionSubmissionRound
+    (RedeemRound, DONE): PreTxSettlementRound
     (RedeemRound, NONE): ImpossibleRound
     (RedeemRound, NO_MAJORITY): RedeemRound
     (RedeemRound, NO_REDEEMING): CallCheckpointRound

diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: bafybeiab4xgadptz4mhvno4p6xvkh7p4peg7iuhotabydriu74dmj6ljga
   __init__.py: bafybeido7wa33h4dtleap57vzgyb4fsofk4vindsqcekyfo5i56i2rll2a
   behaviours.py: bafybeieesrefrpo5c5upzztgm5fwfrmxeagilacuau5nacobhsfvgpbzby
-  composition.py: bafybeif4gsc2kfpsyy7rol74v3ir6ckgrm76jygy3rrcnjt3pen32pgcoi
+  composition.py: bafybeifakbd6n3lqvmxhb2svdst7wbagrplw23yf45zdexw34abtglxqke
   dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm
-  fsm_specification.yaml: bafybeihh7qkvge7srvrc25hvo6qwtezhewjcegbrqk5rukwpbrx4a2fq3m
+  fsm_specification.yaml: bafybeifduigketlvdwyhn47jfwf77otixljibl45firz5ijyhdgilhcyja
   handlers.py: bafybeicamc6vmozij5dwvkxmbxjazsgf3sacojhstbjtq7vfggszxugvey
-  models.py: bafybeifrz6dfncsxksvyh4jhbl4am2uzivfv6fyqs5mhw4qdpy5ruik7fm
+  models.py: bafybeifxiptjrnv4hbw5l3mfxvb7hksmxf726kvab5lcms5btuc3vaahem
 fingerprint_ignore_patterns: []
 connections: []
 contracts: []
@@ -25,8 +25,8 @@ skills:
 - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy
 - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy
 - valory/market_manager_abci:0.1.0:bafybeibrjre5yka3sbvb6lsefgc5yutovb6h4ffzrpecplfkjwtl5i36te
-- valory/decision_maker_abci:0.1.0:bafybeighimm45dlkagx5uig2i4wa7ikmiajlcyqkpms64amm5osxrnzroi
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidaamjhhyayxprfi6pgoijmjhbybnlmhjugegm2pb4kj6ax623bna
+- valory/decision_maker_abci:0.1.0:bafybeiejunyhbfzk3tqn22xmyvpyn75xyjsbeg7grjrywhecak3phbwwem
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeig6khajjeh5fhgvn5xm7zfvk6o6izfyarrfkfprg7eet6t45lghgi
 - valory/staking_abci:0.1.0:bafybeifdxywwwtwgfmtufkvvjvepil6qwetbldftf5eab5v2r3b3zh574q
 behaviours:
   main:

diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/fsm_specification.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/fsm_specification.yaml
@@ -1,12 +1,16 @@
 alphabet_in:
 - BET_PLACEMENT_DONE
+- CHECKS_PASSED
 - DECISION_REQUESTING_DONE
+- NO_MAJORITY
 - REDEEMING_DONE
+- REFILL_REQUIRED
 - ROUND_TIMEOUT
 - STAKING_DONE
 - UNRECOGNIZED
-default_start_state: PostTxSettlementRound
+default_start_state: PreTxSettlementRound
 final_states:
+- ChecksPassedRound
 - FailedMultiplexerRound
 - FinishedBetPlacementTxRound
 - FinishedDecisionRequestTxRound
@@ -15,17 +19,24 @@ final_states:
 label: TxSettlementMultiplexerAbciApp
 start_states:
 - PostTxSettlementRound
+- PreTxSettlementRound
 states:
+- ChecksPassedRound
 - FailedMultiplexerRound
 - FinishedBetPlacementTxRound
 - FinishedDecisionRequestTxRound
 - FinishedRedeemingTxRound
 - FinishedStakingTxRound
 - PostTxSettlementRound
+- PreTxSettlementRound
 transition_func:
     (PostTxSettlementRound, BET_PLACEMENT_DONE): FinishedBetPlacementTxRound
     (PostTxSettlementRound, DECISION_REQUESTING_DONE): FinishedDecisionRequestTxRound
     (PostTxSettlementRound, REDEEMING_DONE): FinishedRedeemingTxRound
     (PostTxSettlementRound, ROUND_TIMEOUT): PostTxSettlementRound
     (PostTxSettlementRound, STAKING_DONE): FinishedStakingTxRound
     (PostTxSettlementRound, UNRECOGNIZED): FailedMultiplexerRound
+    (PreTxSettlementRound, CHECKS_PASSED): ChecksPassedRound
+    (PreTxSettlementRound, NO_MAJORITY): PreTxSettlementRound
+    (PreTxSettlementRound, REFILL_REQUIRED): PreTxSettlementRound
+    (PreTxSettlementRound, ROUND_TIMEOUT): PreTxSettlementRound
diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py b/packages/valory/skills/tx_settlement_multiplexer_abci/rounds.py
@@ -132,25 +132,31 @@ class FailedMultiplexerRound(DegenerateRound):
 class TxSettlementMultiplexerAbciApp(AbciApp[Event]):
     """TxSettlementMultiplexerAbciApp
 
-    Initial round: PostTxSettlementRound
+    Initial round: PreTxSettlementRound
 
-    Initial states: {PostTxSettlementRound}
+    Initial states: {PostTxSettlementRound, PreTxSettlementRound}
 
     Transition states:
-        0. PostTxSettlementRound
-            - decision requesting done: 1.
-            - bet placement done: 2.
-            - redeeming done: 3.
-            - staking done: 4.
+        0. PreTxSettlementRound
+            - checks passed: 2.
+            - refill required: 0.
+            - no majority: 0.
             - round timeout: 0.
-            - unrecognized: 5.
-        1. FinishedDecisionRequestTxRound
-        2. FinishedBetPlacementTxRound
-        3. FinishedRedeemingTxRound
-        4. FinishedStakingTxRound
-        5. FailedMultiplexerRound
-
-    Final states: {FailedMultiplexerRound, FinishedBetPlacementTxRound, FinishedDecisionRequestTxRound, FinishedRedeemingTxRound, FinishedStakingTxRound}
+        1. PostTxSettlementRound
+            - decision requesting done: 3.
+            - bet placement done: 4.
+            - redeeming done: 5.
+            - staking done: 6.
+            - round timeout: 1.
+            - unrecognized: 7.
+        2. ChecksPassedRound
+        3. FinishedDecisionRequestTxRound
+        4. FinishedBetPlacementTxRound
+        5. FinishedRedeemingTxRound
+        6. FinishedStakingTxRound
+        7. FailedMultiplexerRound
+
+    Final states: {ChecksPassedRound, FailedMultiplexerRound, FinishedBetPlacementTxRound, FinishedDecisionRequestTxRound, FinishedRedeemingTxRound, FinishedStakingTxRound}
 
     Timeouts:
         round timeout: 30.0

diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
@@ -8,12 +8,12 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   README.md: bafybeiegcjg2wjrsqhrmvyulioch3d67rnbzkx5af3ztkaw7kxathjreda
   __init__.py: bafybeide6k22zk4f3hyzhpapaoddsnxpw5elqcfvrxxj4nfvpzctv6jqhu
-  behaviours.py: bafybeiafrhq7vtj2nrhrcvwi4d4r6w4pn4yoq2ria7lfakn6x4p4dcne4m
+  behaviours.py: bafybeihmhpvorg4tgdhrhtv6ks6uxza4k5qxvnxanfhil75t54rfb5ykta
   dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm
-  fsm_specification.yaml: bafybeigv7xvetjboivqebq7wrfg3vp4kvhoxfadyvwyayphkh5g54x7rxe
+  fsm_specification.yaml: bafybeidwxjna36auqbtqlehx73kyb6o74suhzj5bothgtiapcj35b7gzve
   handlers.py: bafybeiafbqr7ojfcbwohvee7x4zzswad3ymfrrbjlfz7uuuttmn3qdfs6q
-  models.py: bafybeiahojnn52s762zitwx6k5s4ef5qw7hwjf3orlklqwuz3zi7k2o7bi
-  rounds.py: bafybeiezpvap43sl2acpym6cccdm3wh2mqb4ad2dwt34ij4nchy655wjma
+  models.py: bafybeigtmxoecoow663hgqnyinxarlrttyyt5ghpbdamdv4tc4kikcfx3a
+  rounds.py: bafybeihb3cnxd4zdlrrxkdzjmtgdozr6evkhvm7ndqry4lzkdisqanusie
 fingerprint_ignore_patterns: []
 connections: []
 contracts: []