Fix blocking behaviour on Pearl agent #271

jmoreira-valory · 2024-06-10T14:32:33Z

This PR fixes several issues that prevent the Pearl agent starting normally.

Several fixes to the staking interaction.
- Wrong contracts being called
- Wrong computation of minimum number of mech requests
- Issue with StakingState: duplicate class name in different packages

Remove override from service.yaml in trader_omen_gnosis (used in Perl)

The reason for this change is that the environment exports of strategies_kwargs is causing issues in the definition of export variables on Perl; it is producing variables with a period, which is not a valid variable name in bash.

    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_0": "[\"bet_kelly_fraction\",1]",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_1": "[\"floor_balance\",500000000000000000]",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_0": "bet_amount_per_threshold",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.0": "0",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.1": "0",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.2": "0",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.3": "0",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.4": "0",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.5": "0",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.6": "60000000000000000",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.7": "80000000000000000",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.8": "160000000000000000",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_0.9": "1000000000000000000",
    "SKILL_TRADER_ABCI_MODELS_PARAMS_ARGS_STRATEGIES_KWARGS_2_1_1.0": "1000000000000000000",

jmoreira-valory · 2024-06-15T13:53:51Z

packages/valory/skills/staking_abci/behaviours.py

+
+        # The class StakingState is redefined in several packages.
+        # This conversion is required to use a single representation.
+        if not isinstance(state, StakingState):
+            state = StakingState(state.value)
+


Review this approach

@Adamantios please validate this approach

Can you elaborate? Why is this necessary? It is only specified in the contract from where you imported it.

service_staking_state is initialized with StakingState defined in

https://github.com/valory-xyz/trader/blob/main/packages/valory/contracts/service_staking_token/contract.py#L30

and

https://github.com/valory-xyz/trader/blob/feat/new-staking/packages/valory/contracts/staking_token/contract.py#L30

deppending of which of the 2 contracts is being used. These are 2 different classes and when service_staking_state is compared, it will fail if it's not the class defined in this file. For this reason, this patch here ensures that it always uses StakingState imported in this file.

So I think the best approach here would be to revert back to #209 (comment), i.e., revert 93b7dc8.

This branch has already been tested.
I added an issue to ammend on the base branch before merging to main. #280

packages/valory/skills/staking_abci/behaviours.py

jmoreira-valory · 2024-06-17T11:18:59Z

packages/valory/services/trader_omen_gnosis/service.yaml

@@ -79,7 +79,6 @@ models:
      redeem_round_timeout: 3600.0
      contract_timeout: 300.0
      file_hash_to_strategies_json: ${FILE_HASH_TO_STRATEGIES_JSON:list:[["bafybeihufqu2ra7vud4h6g2nwahx7mvdido7ff6prwnib2tdlc4np7dw24",["bet_amount_per_threshold"]],["bafybeif55cu7cf6znyma7kxus4wxa2doarhau2xmndo57iegshxorivwmq",["kelly_criterion"]]]}
-      strategies_kwargs: ${STRATEGIES_KWARGS:list:[["bet_kelly_fraction",1],["floor_balance",500000000000000000],["bet_amount_per_threshold",{"0.0":0,"0.1":0,"0.2":0,"0.3":0,"0.4":0,"0.5":0,"0.6":60000000000000000,"0.7":80000000000000000,"0.8":160000000000000000,"0.9":1000000000000000000,"1.0":1000000000000000000}]]}


@Adamantios This export is causing issues on Pearl when exporting variables. Perhaps open an issue on Open Autonomy. The approach to make it work is to remove the service override and use directly the agent configuration.

As long as it is not removed from the main service file it's fine. Yes, please open an issue too.

Are you sure you can even use overrides on Pearl? From #221 (comment) I understand that it is not possible.

Pearls seems to be using a custom method for overrides, but it's failing for STRATEGIES_KWARGS.

So why are you using FILE_HASH_TO_STRATEGIES_JSON and STRATEGIES_KWARGS above?

These work fine. The problem with STRATEGIES_KWARGS is explained in the description of this PR. #271 (comment)

Let me rephrase. Why are you not using overrides everywhere and effectively duplicating everything (#221 (review))? If the answer is that this approach does not work on Pearl (#221 (comment)), why are you using FILE_HASH_TO_STRATEGIES_JSON and STRATEGIES_KWARGS?

jmoreira-valory added 6 commits June 10, 2024 16:28

chore: remove override from service.yaml

e081c52

chore: remove override from service.yaml

37a9eaf

fix: health check port

64e70c7

chore: fix contract address

6b6c0d5

fix: fix duplicate StakingState issue

88d8e12

fix: staking

6536af4

jmoreira-valory changed the title ~~Remove override from service.yaml~~ Staking fixes and remove override from service.yaml Jun 15, 2024

jmoreira-valory changed the title ~~Staking fixes and remove override from service.yaml~~ Fix blocking behaviour on Pearl agent Jun 15, 2024

chore: minor fixes

742831a

jmoreira-valory commented Jun 15, 2024

View reviewed changes

0xArdi approved these changes Jun 17, 2024

View reviewed changes

jmoreira-valory commented Jun 17, 2024

View reviewed changes

packages/valory/skills/staking_abci/behaviours.py Show resolved Hide resolved

jmoreira-valory commented Jun 17, 2024

View reviewed changes

chore: linters

d094bf0

jmoreira-valory mentioned this pull request Jun 17, 2024

Remove duplication of StakingState #280

Open

Adamantios approved these changes Jun 17, 2024

View reviewed changes

jmoreira-valory merged commit c26b5be into feat/new-staking Jun 17, 2024
5 of 6 checks passed

jmoreira-valory deleted the fix/exported_variables branch June 17, 2024 14:37

This was referenced Jun 18, 2024

Feat/ new staking support #264

Merged

Issue with dictionary exports with keys containing periods valory-xyz/open-autonomy#2243

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix blocking behaviour on Pearl agent #271

Fix blocking behaviour on Pearl agent #271

jmoreira-valory commented Jun 10, 2024 •

edited

Loading

jmoreira-valory Jun 15, 2024

jmoreira-valory Jun 17, 2024

Adamantios Jun 17, 2024

jmoreira-valory Jun 17, 2024

Adamantios Jun 17, 2024 •

edited

Loading

jmoreira-valory Jun 17, 2024

jmoreira-valory Jun 17, 2024

Adamantios Jun 17, 2024

Adamantios Jun 17, 2024 •

edited

Loading

jmoreira-valory Jun 17, 2024

Adamantios Jun 17, 2024

jmoreira-valory Jun 17, 2024

Adamantios Jun 17, 2024

Fix blocking behaviour on Pearl agent #271

Fix blocking behaviour on Pearl agent #271

Conversation

jmoreira-valory commented Jun 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Adamantios Jun 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Adamantios Jun 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jmoreira-valory commented Jun 10, 2024 •

edited

Loading

Adamantios Jun 17, 2024 •

edited

Loading

Adamantios Jun 17, 2024 •

edited

Loading