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

Add a pure Mary mode #2754

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Add a pure Mary mode #2754

merged 1 commit into from
Nov 24, 2020

Conversation

mrBliss
Copy link
Contributor

@mrBliss mrBliss commented Nov 17, 2020

Note that this mode is not tested by consensus like the others, i.e., we only
test the Mary era as part of the Cardano blockchain, not on its own.

@mrBliss mrBliss added the consensus issues related to ouroboros-consensus label Nov 17, 2020
@mrBliss
Copy link
Contributor Author

mrBliss commented Nov 17, 2020

Draft because this depends on #2753.

All commits in this branch except for the last were created for other reasons. Only the last commit was needed to add a pure Mary mode. @deepfire as you can see, the changes in consensus are trivial. All the hard work will have to be done in the node by yourself or the node team.

UPDATE: merged.

@mrBliss mrBliss force-pushed the mrBliss/pure-mary-mode branch 2 times, most recently from 156d084 to 25d2c3d Compare November 23, 2020 12:41
mrBliss added a commit to IntersectMBO/cardano-node that referenced this pull request Nov 23, 2020
Notable changes:

* Share a single set of credentials for all Shelley-based eras:
  IntersectMBO/ouroboros-network#2753
* Add a pure Mary mode
  IntersectMBO/ouroboros-network#2754
Note that this mode is not tested by consensus like the others, i.e., we only
test the Mary era as part of the Cardano blockchain, not on its own.
@mrBliss mrBliss marked this pull request as ready for review November 24, 2020 07:22
@mrBliss mrBliss requested a review from edsko November 24, 2020 07:24
@mrBliss
Copy link
Contributor Author

mrBliss commented Nov 24, 2020

bors merge

mrBliss added a commit to IntersectMBO/cardano-node that referenced this pull request Nov 24, 2020
Notable changes:

* Share a single set of credentials for all Shelley-based eras:
  IntersectMBO/ouroboros-network#2753
* Add a pure Mary mode
  IntersectMBO/ouroboros-network#2754
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Nov 24, 2020

@iohk-bors iohk-bors bot merged commit 57ab004 into master Nov 24, 2020
@iohk-bors iohk-bors bot deleted the mrBliss/pure-mary-mode branch November 24, 2020 07:54
iohk-bors bot added a commit to IntersectMBO/cardano-node that referenced this pull request Nov 24, 2020
2114: Update dependency on ouroboros-network r=mrBliss a=mrBliss

Notable changes:

* Share a single set of credentials for all Shelley-based eras:
  IntersectMBO/ouroboros-network#2753
* Add a pure Mary mode
  IntersectMBO/ouroboros-network#2754

Co-authored-by: Thomas Winant <thomas@well-typed.com>
@deepfire
Copy link
Contributor

Thank you @mrBliss !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
consensus issues related to ouroboros-consensus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants