Skip to content
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

Jump to bottom

BREAK CHANGE! Consensus: epoch_duration_target now affects epoch length in Dummy mode #4097

Merged
merged 8 commits into from
Aug 17, 2023
+141 −8
Merged

BREAK CHANGE! Consensus: epoch_duration_target now affects epoch length in Dummy mode #4097

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84d4bf9
Consensus: let `epoch_duration_target` affect epoch length
eval-exec Aug 11, 2023
c07182f
Consensus: neat epoch_length calculation in permanent difficulty mode
eval-exec Aug 11, 2023
6e572ef
Fix fmt
eval-exec Aug 11, 2023
7364dfb
Test: Add bats test for `epoch_length_in_dummy` param
eval-exec Aug 10, 2023
219eb75
chore: bats test should use `make prod`
eval-exec Aug 10, 2023
c9068ab
Fix `WithdrawDAO` usage of `epoch_duration_target`
eval-exec Aug 14, 2023
459e9ff
Fix `epoch_duration_target` usages in integration tests
eval-exec Aug 14, 2023
f0ab0a1
Fix integration test for `epoch_duration_target`
eval-exec Aug 15, 2023
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
8 changes: 8 additions & 0 deletions spec/src/consensus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,13 @@ impl Consensus {
let remainder_reward =
Capacity::shannons(primary_epoch_reward % epoch.length());

let mut next_epoch_length = epoch.length();
let epoch_length_from_param =
cmp::max(self.epoch_duration_target() / MIN_BLOCK_INTERVAL, 1);
if next_epoch_length != epoch_length_from_param {
next_epoch_length = self.epoch_duration_target() / MIN_BLOCK_INTERVAL;
}
eval-exec marked this conversation as resolved.
Show resolved Hide resolved

let dummy_epoch_ext = epoch
.clone()
.into_builder()
Expand All @@ -812,6 +819,7 @@ impl Consensus {
.number(epoch.number() + 1)
.last_block_hash_in_previous_epoch(header.hash())
.start_number(header.number() + 1)
.length(next_epoch_length)
.build();
NextBlockEpoch::HeadBlock(dummy_epoch_ext)
} else {
Expand Down
Loading