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

Implement dynamic activation thresholds #3692

Merged
merged 8 commits into from
Sep 12, 2020
Merged

Implement dynamic activation thresholds #3692

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
421d022
Implement dynamic activation thresholds
UdjinM6 Sep 8, 2020
8b312d8
fix
UdjinM6 Sep 8, 2020
469eed1
Revert unrelated changes
UdjinM6 Sep 10, 2020
ce98c36
Clarify switching to/staying in LOCKED_IN state
UdjinM6 Sep 10, 2020
dc2232e
Fix signal function to work correctly with num_blocks=0
UdjinM6 Sep 10, 2020
cc3131b
Add simplified threshold calculation and use it in tests
UdjinM6 Sep 10, 2020
60ae186
Check that thresholds are decreasing, reach the min level and stay there
UdjinM6 Sep 10, 2020
3164b22
Drop `;`
UdjinM6 Sep 10, 2020
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: 1 addition & 1 deletion test/functional/feature_block_reward_reallocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def signal(self, num_blocks, expected_lockin):
assert_equal(get_bip9_status(self.nodes[0], 'realloc')['status'], 'started')

def threshold(self, attempt):
threshold_calc = 400 - attempt * attempt;
Copy link
Member

Choose a reason for hiding this comment

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

LOL :P :trollface:

threshold_calc = 400 - attempt * attempt
if threshold_calc < 300:
return 300
return threshold_calc
Expand Down