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

Use the real Allegra and Mary era tags #2679

Merged
merged 3 commits into from
Nov 9, 2020
Merged

Conversation

mrBliss
Copy link
Contributor

@mrBliss mrBliss commented Oct 9, 2020

Fixes #2668.

Previously, the Allegra and Mary eras were exactly the same as the Shelley era,
so no translations between the eras were needed.

In this commit, we use the actual, different AllegraEra and ShelleyEra tags.
This means we need translations between the eras.

@mrBliss mrBliss added the consensus issues related to ouroboros-consensus label Oct 9, 2020
@mrBliss mrBliss requested a review from edsko October 9, 2020 11:01
@mrBliss
Copy link
Contributor Author

mrBliss commented Oct 9, 2020

Draft because this depends on IntersectMBO/cardano-ledger#1902.

@mrBliss
Copy link
Contributor Author

mrBliss commented Oct 29, 2020

Rebased and nearly ready. This includes #2716 until merged.

The implementation is done, but the tests are still blocked by one thing (AFAIK, unless the current compile errors are hiding other problems): the generators for the serialisation tests in the ledger only work for the Shelley era, not for the Allegra and Mary eras.

Because of how our generators are written (see #2709), it is PITA to try to work around this. Let's wait for CAD-2119 (we actually only need the easiest subtask of that issue).

Copy link
Contributor

@edsko edsko left a comment

Choose a reason for hiding this comment

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

Just waiting for @uroboros 🙄 😬

iohk-bors bot added a commit that referenced this pull request Oct 29, 2020
2716: Update the ledger and improve the compile time of Shelley.Ledger.Query r=mrBliss a=mrBliss

See the individual commits for more details. This is preparation for #2679.

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

Just waiting for @uroboros 🙄 😬

coming soon! ish!

Comment on lines +21 to +25
arbitrary = arbitraryBoundedEnum

shrink v
| v == minBound = []
| otherwise = [pred v]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This way it's future-proof

@mrBliss mrBliss linked an issue Nov 2, 2020 that may be closed by this pull request
@mrBliss mrBliss force-pushed the mrBliss/real-era-tags branch 2 times, most recently from 72a89f2 to 57d0069 Compare November 6, 2020 16:28
The ledger state format changed because of
IntersectMBO/cardano-ledger#1968 The decoder is
backwards-compatible, so the ledger doesn't break binary compatibility.

The other visible change is
IntersectMBO/cardano-ledger#1966
Fixes #2668, #2677.

Previously, the Allegra and Mary eras were exactly the same as the Shelley era,
so no translations between the eras were needed.

In this commit, we use the actual, different `AllegraEra` and `ShelleyEra` tags.
This means we need translations between the eras.
@mrBliss mrBliss linked an issue Nov 9, 2020 that may be closed by this pull request
@mrBliss mrBliss marked this pull request as ready for review November 9, 2020 09:36
Fixes #2670.

Without these new versions, nodes forked to Allegra or Mary can no longer
communicate with other nodes or clients.
@mrBliss
Copy link
Contributor Author

mrBliss commented Nov 9, 2020

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Nov 9, 2020

@iohk-bors iohk-bors bot merged commit c1f326c into master Nov 9, 2020
@iohk-bors iohk-bors bot deleted the mrBliss/real-era-tags branch November 9, 2020 10:46
mrBliss added a commit that referenced this pull request Nov 13, 2020
Unrelated to this PR, but spotted during review. This was forgotten in #2679.
mrBliss added a commit that referenced this pull request Nov 13, 2020
Unrelated to this PR, but spotted during review. This was forgotten in #2679.
coot pushed a commit that referenced this pull request May 16, 2022
2716: Update the ledger and improve the compile time of Shelley.Ledger.Query r=mrBliss a=mrBliss

See the individual commits for more details. This is preparation for #2679.

Co-authored-by: Thomas Winant <thomas@well-typed.com>
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
3 participants