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

[2.x.x] "C32 phase out on hold" included in 2.x.x? #2967

Closed
antiochp opened this issue Jul 23, 2019 · 2 comments
Closed

[2.x.x] "C32 phase out on hold" included in 2.x.x? #2967

antiochp opened this issue Jul 23, 2019 · 2 comments
Labels
question
Milestone
tentative 3.0.0

Comments

@antiochp
Copy link
Member

antiochp commented Jul 23, 2019 •
edited
Loading

We "put phase outs of C32 and beyond on hold" in #2714

This was merged for 2.0.0 but I'm not sure we merged the corresponding changes to the 2.x.x branch.

We should confirm either way and make the appropriate changes for 2.x.x if necessary.
@antiochp antiochp added this to the 2.x.x milestone Jul 23, 2019
@quentinlesceller
Copy link
Member

quentinlesceller commented Jul 24, 2019 •
edited
Loading

Indeed #2714 was NOT merged on milestone/2.x.x.
https://github.com/mimblewimble/grin/blob/milestone/2.x.x/core/src/consensus.rs#L187

Is there a quick way to see which commit from master are missing in milestone/2.x.x ?

I just did manually and result is #2970.

@quentinlesceller quentinlesceller mentioned this issue Jul 24, 2019
Closed
@quentinlesceller
Copy link
Member

Fixed via 441e846.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
question
Projects
None yet
Milestone
tentative 3.0.0
Development

Successfully merging a pull request may close this issue.

[2.x.x] #2714 equivalent - Put phase outs of C32 and beyond on hold quentinlesceller/grin
2 participants
@quentinlesceller @antiochp