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

Get rid of consensus.fPowAllowMinDifficultyBlocks. #2766

Merged
merged 1 commit into from Nov 27, 2017
Merged

Get rid of consensus.fPowAllowMinDifficultyBlocks. #2766

merged 1 commit into from Nov 27, 2017

Conversation

syd0
Copy link
Contributor

@syd0 syd0 commented Nov 23, 2017

This closes #1380

daira
daira approved these changes Nov 24, 2017
View reviewed changes
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

utACK

@daira
Copy link
Contributor

daira commented Nov 24, 2017

@zkbot try

@zkbot
Copy link
Contributor

zkbot commented Nov 24, 2017

⌛ Trying commit dffc025 with merge 5e1c4ef51e283a3732ff97d9e6b28b2ae3076f52...

@zkbot
Copy link
Contributor

zkbot commented Nov 24, 2017

💔 Test failed - pr-try

@daira
Copy link
Contributor

daira commented Nov 25, 2017

Strange git failure. @zkbot retry

@zkbot
Copy link
Contributor

zkbot commented Nov 25, 2017

⌛ Trying commit dffc025 with merge bcf2d993bac0f7218b18fa24f538cb19b096fa45...

@zkbot
Copy link
Contributor

zkbot commented Nov 25, 2017

☀️ Test successful - pr-try
State: approved= try=True

@daira daira added this to 1.0.14 Cleanups in Release planning Nov 25, 2017
str4d
str4d approved these changes Nov 27, 2017
View reviewed changes
Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

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

utACK

@str4d
Copy link
Contributor

str4d commented Nov 27, 2017

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Nov 27, 2017

📌 Commit dffc025 has been approved by str4d

@str4d str4d added this to the 1.0.14 milestone Nov 27, 2017
zkbot added a commit that referenced this pull request Nov 27, 2017
@zkbot
Auto merge of #2766 - syd0:remove-fPowAllowMinDifficultyBlocks, r=str4d
9ce4859 
Get rid of consensus.fPowAllowMinDifficultyBlocks.

This closes #1380
@zkbot
Copy link
Contributor

zkbot commented Nov 27, 2017

⌛ Testing commit dffc025 with merge 9ce4859...

@zkbot
Copy link
Contributor

zkbot commented Nov 27, 2017

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 9ce4859 to master...

@zkbot zkbot merged commit dffc025 into zcash:master Nov 27, 2017
@zkbot zkbot added this to Complete in Continuous Improvement via automation Nov 27, 2017
@zkbot zkbot mentioned this pull request Nov 27, 2017
Merged
@syd0 syd0 deleted the remove-fPowAllowMinDifficultyBlocks branch November 28, 2017 20:32
@str4d str4d mentioned this pull request Oct 3, 2018
Merged
zkbot added a commit that referenced this pull request Oct 5, 2018
@zkbot
Auto merge of #3559 - str4d:3552-testnet-min-difficulty-blocks, r=bit…
aede10d 
…cartel

Allow minimum-difficulty blocks on testnet

This is a consensus rule change on testnet that will result in a chain split (leaving the stuck chain, as desired).

Reverts #2766 and part of #1338.
Closes #3552.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daira daira daira approved these changes

@str4d str4d str4d approved these changes

@bitcartel bitcartel Awaiting requested review from bitcartel

@arcalinea arcalinea Awaiting requested review from arcalinea

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Continuous Improvement
  
Complete
Milestone
v1.0.14
Development

Successfully merging this pull request may close these issues.

Remove fPowAllowMinDifficultyBlocks
4 participants
@syd0 @daira @zkbot @str4d