Fix unstaking flows #342

jmoreira-valory · 2024-08-23T15:29:05Z

This PR contains several improvements in terms of updating the staking/unstaking flow:

Ensures that the agent bond on chain matches the selected staking contract.
Collects metadata from staking programs on-chain.
Fixes the staking/unstaking flow to match the discussions in the working document.
Fixes computation of balance on run_service.sh
Removes unused contract ABI JSONs from the folder /contracts and uses the files already available on the packages folder.
Removes the update_service.py script and uses the built-in autonomy command.

jmoreira-valory · 2024-08-24T20:08:24Z

scripts/utils.py

@@ -69,7 +69,7 @@
 GAS_PARAMS = {
    "maxFeePerGas": 30_000_000_000,
    "maxPriorityFeePerGas": 3_000_000_000,
-    "gas": 500_000,
+    "gas": 5_000_000,


This gives issues on Tenderly sometimes. Discuss if this should be increased

@0xArdi "gas": 500_000 has caused issues sometimes on Tenderly when sending the unstake transaction. I suspect it usually runs out of gas due to being executed when several checkpoints have not been called (thus it needs to do extra work). This seems not happening on mainnet, where the checkpoint is periodically called. What do you suggest to do here?

Ideally we do this using automatic gas estimation. Let's keep it as-is for now, the middleware doesnt have this problem, and is supposed to be the long-term solution for this.

Yes, but in this script we are not doing it. So what should we do? keep it asi it is 500.000 ? increase it?

jmoreira-valory · 2024-08-25T11:36:48Z

scripts/service_hash.py

+SERVICE_ID_PATH = Path(STORE_PATH, "service_id.txt")
+PACKAGES_PATH = Path(SCRIPT_PATH, "..", "trader", "packages")
+
+REGISTRY_JSON = PACKAGES_PATH / "valory" / "contracts" / "service_registry" / "build" / "ServiceRegistryL2.json"


Remove redundant file from contracts (ServiceRegistryL2.json)

jmoreira-valory · 2024-08-25T11:38:22Z

scripts/utils.py

@@ -61,7 +61,6 @@
 DEFAULT_ON_CHAIN_INTERACT_SLEEP = 6.0


-ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"


Already imported

jmoreira-valory · 2024-08-25T11:39:07Z

terminate_on_chain_service.sh

-if [ "${USE_STAKING}" = true ]; then
-    poetry run python "../scripts/staking.py" "$service_id" "$CUSTOM_SERVICE_REGISTRY_ADDRESS" "$CUSTOM_STAKING_ADDRESS" "../$operator_pkey_path" "$rpc" "$unstake";
-fi
+# Unstake if applicable


The script already takes care if the service is staked or not.

jmoreira-valory · 2024-08-25T11:39:48Z

contracts/AgentMech.json

Not used anymore. It was used when the mech events were retrieved through the RPC. Now they are retrieved through the Subgraph.

jmoreira-valory · 2024-08-25T11:40:16Z

contracts/ServiceRegistryL2.json

Already available on the packages folder of the service.

jmoreira-valory · 2024-08-25T11:40:50Z

run_service.sh

+# Display information of the Git repository
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+latest_commit_hash=$(git rev-parse HEAD)
+echo "Current branch: $current_branch"
+echo "Commit hash: $latest_commit_hash"
+


Help identify commit user is running when users request help.

jmoreira-valory · 2024-08-25T11:42:14Z

run_service.sh

+    cost_of_bonding=$MIN_STAKING_BOND_XDAI
+fi
+
+if [ "$local_service_hash" != "$remote_service_hash" ] || [ "$on_chain_agent_id" != "$AGENT_ID" ] || [ "$on_chain_agent_bond" != "$cost_of_bonding" ]; then


If hash, agent_id or bond don't match the expected values, it requires an on-chain service update.

jmoreira-valory · 2024-08-25T11:43:11Z

run_service.sh

+          cmd="poetry run autonomy mint \
+              --retries $RPC_RETRIES \
+              --timeout $RPC_TIMEOUT_SECONDS \
+              --use-custom-chain \
+              service packages/valory/services/trader/ \
+              --key \"../$operator_pkey_path\" $password_argument \
+              --nft $nft \
+              -a $AGENT_ID \
+              -n $n_agents \
+              --threshold $n_agents \
+              --update \"$service_id\""
+
          if [ "${USE_STAKING}" = true ]; then
              cost_of_bonding=$MIN_STAKING_BOND_OLAS
-              poetry run python "../scripts/update_service.py" "../$operator_pkey_path" "$nft" "$AGENT_ID" "$service_id" "$CUSTOM_OLAS_ADDRESS" "$cost_of_bonding" "packages/valory/services/trader/" "$rpc" $password_argument
+              cmd+=" -c $cost_of_bonding --token $CUSTOM_OLAS_ADDRESS"
          else
              cost_of_bonding=$MIN_STAKING_BOND_XDAI
-              cmd="poetry run autonomy mint \
-                  --retries $RPC_RETRIES \
-                  --timeout $RPC_TIMEOUT_SECONDS \
-                  --use-custom-chain \
-                  service packages/valory/services/trader/ \
-                  --key \"../$operator_pkey_path\" $password_argument \
-                  --nft $nft \
-                  -a $AGENT_ID \
-                  -n $n_agents \
-                  -c $cost_of_bonding \
-                  --threshold $n_agents \
-                  --update \"$service_id\""
+              cmd+=" -c $cost_of_bonding"


Use the already available autonomy command (--token option was not available and a custom script was created)

jmoreira-valory · 2024-08-25T11:43:51Z

scripts/choose_staking.py

+    NO_STAKING_PROGRAM_ID: ZERO_ADDRESS,
+    "quickstart_beta_hobbyist": "0x389B46c259631Acd6a69Bde8B6cEe218230bAE8C",
+    "quickstart_beta_expert": "0x5344B7DD311e5d3DdDd46A4f71481bD7b05AAA3e",


Simplified this data structure - we only need the contract address. All remaining information can be fetch on-chain.

jmoreira-valory · 2024-08-25T13:16:19Z

Resolves #151

jmoreira-valory added 4 commits August 23, 2024 17:28

fix: unstaking flows

c99d633

chore: update script

2095388

chore: fixes on staking flow

fbb3832

chore: fix bond computation

3aed8d8

jmoreira-valory commented Aug 24, 2024

View reviewed changes

jmoreira-valory added 6 commits August 25, 2024 11:21

fix: balance computation

3104456

chore: minor script fixes

646e07f

chore: display git information on script

be0158f

chore: fix message

87915d0

chore: remove duplicate code

8abc802

chore: remove unused file

a7084a6

jmoreira-valory commented Aug 25, 2024

View reviewed changes

contracts/ServiceRegistryL2.json Outdated

Copy link

Collaborator Author

jmoreira-valory Aug 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already available on the packages folder of the service.

jmoreira-valory commented Aug 25, 2024

View reviewed changes

chore: remove duplicate code

effa924

jmoreira-valory linked an issue Aug 25, 2024 that may be closed by this pull request

Use CLI to update staking services #151

Open

Adamantios approved these changes Aug 26, 2024

View reviewed changes

0xArdi approved these changes Aug 26, 2024

View reviewed changes

dagacha merged commit d79b74d into develop Aug 27, 2024

Adamantios deleted the fix/unstaking branch August 28, 2024 08:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix unstaking flows #342

Fix unstaking flows #342

jmoreira-valory commented Aug 23, 2024 •

edited

Loading

jmoreira-valory Aug 24, 2024 •

edited

Loading

jmoreira-valory Aug 26, 2024

0xArdi Aug 26, 2024 •

edited

Loading

jmoreira-valory Aug 26, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory Aug 25, 2024

jmoreira-valory commented Aug 25, 2024

		@@ -61,7 +61,6 @@
		DEFAULT_ON_CHAIN_INTERACT_SLEEP = 6.0


		ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"

Fix unstaking flows #342

Fix unstaking flows #342

Conversation

jmoreira-valory commented Aug 23, 2024 • edited Loading

jmoreira-valory Aug 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xArdi Aug 26, 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

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

Choose a reason for hiding this comment

jmoreira-valory commented Aug 25, 2024

jmoreira-valory commented Aug 23, 2024 •

edited

Loading

jmoreira-valory Aug 24, 2024 •

edited

Loading

0xArdi Aug 26, 2024 •

edited

Loading