Skip to content

Fix the withdraw delay #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
Jun 4, 2019
Merged

Fix the withdraw delay #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions core/src/consensus/stake/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,6 @@ pub fn on_term_close(state: &mut TopLevelState, current_term: u64) -> StateResul
}
candidates.save_to_state(state)?;

// TODO: auto_withdraw(pending_rewards)

let mut jailed = Jail::load_from_state(&state)?;
let released = jailed.drain_released_prisoners(current_term);
for prisoner in &released {
Expand Down
13 changes: 5 additions & 8 deletions spec/Dynamic-Validator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
| **NOMINATION_EXPIRATION** | 24 **TERM**s |
| **CUSTODY_PERIOD** | 24 **TERM**s |
| **RELEASE_PERIOD** | 240 **TERM**s |
| **WITHDRAW_DELAY** | 1 **TERM** |
| **MAX_NUM_OF_VALIDATORS** | 30 |
| **MIN_NUM_OF_VALIDATORS** | 4 |
| **DELEGATION_THRESHOLD** | 100,000 |
Expand Down Expand Up @@ -105,7 +104,7 @@ The block is valid only if the sum of voting power is more than 2/3 of the total

## Validator Reward
The block proposer gets the express fee of the blocks at the end of a term.
Validators get the reward after **WITHDRAW_DELAY** terms; however, the proposers cannot get all the reward if they are not loyal to their duty.
Validators get the reward after 1 term; however, the proposers cannot get all the reward if they are not loyal to their duty.
The reward is decreased according to the rate of the blocks the validator misses to sign.

The reward is decreased when a validator doesn't sign blocks proposed by others.
Expand Down Expand Up @@ -142,7 +141,7 @@ for validators in total_validators {
The remaining rewards as a result of the additional reward algorithm are burned.
At the worst case, **MAX_NUM_OF_VALIDATORS** CCC can be burned every term.

The rewards the validators earn are paid after **WITHDRAW_DELAY**.
The rewards the validators earn are paid after 1 term.

## Punishment for Validators
### Downtime
Expand Down Expand Up @@ -202,8 +201,8 @@ The transaction fails when the delegator revokes more than it delegates.
* sig2

This is a transaction that reports malicious validator.
The **REPORT_DOUBLE_VOTE** should be reported during **WITHDRAW_DELAY**.
The transaction that reports a double vote have occurred before **WITHDRAW_DELAY** fails.
The **REPORT_DOUBLE_VOTE** should be reported before 1 term passes.
The transaction that reports a double vote have occurred before 1 term passes fails.

The criminal loses all his deposit and rewards and is banned immediately; it is the only case where a validator set is changed during the term.

Expand All @@ -221,7 +220,6 @@ stakeholders = [ address+ ], address asc
balance(address) = quantity
delegation(delegator) = [ [delegatee, quantity]+ ], delegatee asc
candidates = [ [pubkey, deposits, nominate_end_at]+ ], pubkey asc
pending_rewards = [ [withdraw_at, address, quantity]+ ], [withdraw_at, address] asc
banned = [ address+ ], address asc
jailed = [ [address, deposits, custody_until, released_at]+ ], address asc
term_id = [ the last block number of the previous term, the current term id ]
Expand All @@ -232,5 +230,4 @@ intermediate_rewards = [ [ address, rewards ]+ address asc, [ address, rewards ]
1. Update `term_id` to the current block number and the next term id
3. Remove the expired candidates and give back the deposits
3. Remove the jailed accounts if the current term is greater than `released_at` and give back the deposits
4. Pay the pending rewards
5. Calculate rewards and update `pending_rewards`
4. Calculate rewards of the previous block and update `intermediate_rewards`