Use a single protocol version across all eras #1224
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amesgen
reviewed
Aug 22, 2024
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Protocol/Praos.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/ProtocolInfo.hs
Outdated
Show resolved
Hide resolved
...boros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Cardano.hs
Outdated
Show resolved
Hide resolved
dnadales
commented
Aug 22, 2024
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
Outdated
Show resolved
Hide resolved
dnadales
commented
Aug 22, 2024
ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Protocol/Praos.hs
Outdated
Show resolved
Hide resolved
dnadales
commented
Aug 22, 2024
ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Node/Protocol/Cardano.hs
Outdated
Show resolved
Hide resolved
dnadales
commented
Aug 22, 2024
ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/Cardano.hs
Outdated
Show resolved
Hide resolved
amesgen
changed the title
dnadales
force-pushed
the
dnadales/324-simplify-protver-arguments
branch
2 times, most recently
from
023d299
to
ad3deca
Compare
dnadales
requested review from
nfrisby,
jasagredo,
fraser-iohk and
RenateEilers
as code owners
dnadales
force-pushed
the
dnadales/324-simplify-protver-arguments
branch
from
46f3bca
to
280aa95
Compare
amesgen
approved these changes
Aug 23, 2024
ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/ProtocolInfo.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/Cardano.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
Outdated
Show resolved
Hide resolved
...nsensus-cardano/changelog.d/20240823_131440_damian.nadales_324_simplify_protver_arguments.md
Show resolved
Hide resolved
...boros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/DBAnalyser/Block/Cardano.hs
Outdated
Show resolved
Hide resolved
dnadales
force-pushed
the
dnadales/324-simplify-protver-arguments
branch
from
72bc92f
to
dc5a78f
Compare
amesgen
approved these changes
Aug 26, 2024
jasagredo
reviewed
Aug 26, 2024
Comment on lines
128
to
129
| -- TODO: could be simplified once we implement something like | ||
| -- ouroboros-network#4115. |
There was a problem hiding this comment.
I think this TODO is done?
There was a problem hiding this comment.
I'm not sure. I wanted to discuss this with @jorisdral, but leave it there until then. I'd be in favour of creating a new issue if we identify concrete simplifications.
| -- but they're currently unused, and they're irrelevant for the | ||
| -- consensus logic. | ||
| -- | ||
| -- For Cardano mainnet, the Shelley era has major protocol verison |
There was a problem hiding this comment.
Suggested change
| -- For Cardano mainnet, the Shelley era has major protocol verison | |
| -- For Cardano mainnet, the Shelley era has major protocol version |
- Add an extra field `cardanoProtocolVersion` to `ProtocolParamsCardano` - Remove `shelleyProtVer` from `ProtocolParamsShelley`. The corresponding comment was moved to `ProtocolParamsCardano`. - Remove eras protocol parameters, except for Byron, which is still used. - Remove `ProtocolParams` data family and `PerEraProtocolParams`. - Remove protocol versions from the `HardForkSpec`. - Expand the comments of 'MaxMajorProtVer'
dnadales
force-pushed
the
dnadales/324-simplify-protver-arguments
branch
from
dc5a78f
to
d57d4e5
Compare
9 tasks
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While giving us flexibility, using different protocol versions for all eras increased the level of complexity and led to several errors in the past. This PR removes this flexibility by using a single protocol version, which determines the maximum protocol version Consensus supports.
See #324 for more background.
Closes #324.
Closes #276.
TODOs:
FIXMEs.