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.

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

feat/remove-pox-sunset #3129

Merged
merged 1 commit into from
May 9, 2022
Merged

feat/remove-pox-sunset #3129

merged 1 commit into from
May 9, 2022

Conversation

jcnelson
Copy link
Member

@jcnelson jcnelson commented May 6, 2022

This PR partially fixes #2613 by removing the PoX sunset altogether. It does not attempt to gate the PoX sunset code. If we can merge next to master before Bitcoin block 766050 (which is in just over 200 days), then no gating will be needed, since the sunset code will never be reached.

This PR does not address capping discount mining, which is the other part of #2613. I'll work on that as a branch off of this branch. I'm just trying to get this fix into next ASAP.

@codecov
Copy link

codecov bot commented May 6, 2022

Codecov Report

Merging #3129 (5cb33c4) into next (2747901) will decrease coverage by 53.34%.
The diff coverage is 4.75%.

@@             Coverage Diff             @@
##             next    #3129       +/-   ##
===========================================
- Coverage   83.75%   30.41%   -53.35%     
===========================================
  Files         265      267        +2     
  Lines      207954   209115     +1161     
===========================================
- Hits       174166    63595   -110571     
- Misses      33788   145520   +111732     
Impacted Files Coverage Δ
clarity/src/vm/analysis/arithmetic_checker/mod.rs 64.23% <0.00%> (-28.42%) ⬇️
clarity/src/vm/analysis/errors.rs 22.11% <0.00%> (-47.89%) ⬇️
clarity/src/vm/analysis/read_only_checker/mod.rs 77.57% <ø> (-8.88%) ⬇️
clarity/src/vm/analysis/type_checker/mod.rs 74.00% <ø> (-19.70%) ⬇️
...larity/src/vm/analysis/type_checker/natives/mod.rs 51.77% <0.00%> (-44.42%) ⬇️
clarity/src/vm/analysis/type_checker/tests/mod.rs 0.00% <0.00%> (-98.89%) ⬇️
clarity/src/vm/database/clarity_db.rs 68.38% <0.00%> (-21.54%) ⬇️
clarity/src/vm/database/clarity_store.rs 61.81% <0.00%> (-18.19%) ⬇️
clarity/src/vm/database/key_value_wrapper.rs 95.56% <ø> (-0.95%) ⬇️
clarity/src/vm/docs/mod.rs 0.00% <0.00%> (-85.61%) ⬇️
... and 284 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cef2f5d...5cb33c4. Read the comment docs.

@@ -622,20 +591,16 @@ impl LeaderBlockCommitOp {

fn check_single_burn_output(&self) -> Result<(), op_error> {
if self.commit_outs.len() != 1 {
warn!("Invalid post-sunset block commit, should have 1 commit out");
warn!("Invalid block commit, should have 1 commit out");
Copy link
Contributor

Choose a reason for hiding this comment

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

Invalid prepare phase block commit

Copy link
Member

@kantai kantai left a comment

Choose a reason for hiding this comment

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

LGTM

@gregorycoppola gregorycoppola removed their request for review May 9, 2022 17:55
@jcnelson jcnelson merged commit 4e84127 into next May 9, 2022
@blockstack-devops
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Nov 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants