From 3c0a7109b44bd3033af29ce34c55fd6d7235e0d8 Mon Sep 17 00:00:00 2001 From: Ari Rubinstein Date: Sun, 7 Aug 2022 01:20:56 -0700 Subject: [PATCH 1/2] fix(docs): typo in staking/state (#12834) (cherry picked from commit fe892125098a1aaa6b91a206940eeaf3098f7d88) # Conflicts: # x/staking/spec/01_state.md --- x/staking/spec/01_state.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x/staking/spec/01_state.md b/x/staking/spec/01_state.md index 9dacbb22fdec..c0ca0ed02263 100644 --- a/x/staking/spec/01_state.md +++ b/x/staking/spec/01_state.md @@ -30,7 +30,11 @@ Validators can have one of three statuses - `Unbonded`: The validator is not in the active set. They cannot sign blocks and do not earn rewards. They can receive delegations. +<<<<<<< HEAD - `Bonded`": Once the validator receives sufficient bonded tokens they automtically join the +======= +* `Bonded`: Once the validator receives sufficient bonded tokens they automtically join the +>>>>>>> fe8921250 (fix(docs): typo in staking/state (#12834)) active set during [`EndBlock`](./05_end_block.md#validator-set-changes) and their status is updated to `Bonded`. They are signing blocks and receiving rewards. They can receive further delegations. They can be slashed for misbehavior. Delegators to this validator who unbond their delegation From 3ab5952c8fd64adbee7a5227cf52b33ec2402392 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sun, 7 Aug 2022 10:59:33 +0200 Subject: [PATCH 2/2] updates --- x/staking/spec/01_state.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/x/staking/spec/01_state.md b/x/staking/spec/01_state.md index c0ca0ed02263..656862798b4d 100644 --- a/x/staking/spec/01_state.md +++ b/x/staking/spec/01_state.md @@ -30,11 +30,7 @@ Validators can have one of three statuses - `Unbonded`: The validator is not in the active set. They cannot sign blocks and do not earn rewards. They can receive delegations. -<<<<<<< HEAD -- `Bonded`": Once the validator receives sufficient bonded tokens they automtically join the -======= -* `Bonded`: Once the validator receives sufficient bonded tokens they automtically join the ->>>>>>> fe8921250 (fix(docs): typo in staking/state (#12834)) +- `Bonded`: Once the validator receives sufficient bonded tokens they automtically join the active set during [`EndBlock`](./05_end_block.md#validator-set-changes) and their status is updated to `Bonded`. They are signing blocks and receiving rewards. They can receive further delegations. They can be slashed for misbehavior. Delegators to this validator who unbond their delegation