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

UTxO-HD targeting main #1011

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

UTxO-HD targeting main #1011

wants to merge 10 commits into from

Conversation

jasagredo
Copy link
Contributor

@jasagredo jasagredo commented Jan 9, 2025

Changelog

- description: |
    Implement changes needed for UTxO-HD Consensus feature.
    - Minor adjust on number of parameters of `AnyNewEpochState`.
# uncomment types applicable to the change:
  type:
  # - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
  # - refactoring    # QoL changes
  # - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  # - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

See the cardano-api PR

How to trust this PR

Highlight important bits of the PR that will make the review faster. If there are commands the reviewer can run to observe the new behavior, describe them.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff

@jasagredo jasagredo force-pushed the utxo-hd-main branch 2 times, most recently from f717421 to e3b99e7 Compare January 10, 2025 11:12
cabal.project Outdated
if os(windows)
constraints: time ^>=1.14
allow-newer: *:time

constraints: any.text source
-- Temporary workaround for problem with cabal-doctest
Copy link
Contributor

Choose a reason for hiding this comment

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

Points for the comment 👍. Which repo is having issues with cabal-doctest?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah that is from @neilmayhew's commits. Mine is just the last one. But I think it is consensus the one that had this problem. https://github.com/IntersectMBO/ouroboros-consensus/blob/main/cabal.project#L48-L49

Copy link
Contributor

Choose a reason for hiding this comment

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

The problem occurred in api, cli and node as well as consensus. I think the problem arises because of the extra-packages: Cabal line. This allows a newer version of Cabal than would otherwise be chosen by the solver, which breaks cabal-doctest. However, there's been a release of cabal-doctest since I made this change, so it may be possible to drop it now.

Copy link
Contributor

@neilmayhew neilmayhew Jan 10, 2025

Choose a reason for hiding this comment

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

I tested this, and the constraint can be taken out in consensus, api and cli. However, it can't be taken out in node because it depends (indirectly) on entropy which uses a custom Setup.hs that isn't compatible with Cabal-3.14 when built with ghc8107.

Copy link
Contributor

@neilmayhew neilmayhew Jan 10, 2025

Choose a reason for hiding this comment

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

Actually, that isn't correct. It's a haskell.nix problem. The cabal file for entropy has setup-depends: Cabal >= 1.10 && < 3.13 and when building with cabal outside of haskell.nix it uses Cabal-3.12.1.0 as expected, with both ghc8 and ghc9. However, haskell.nix uses Cabal-3.14.1.0 for both.

However, this affects only node (⟶ systemduuidentropy) so the constraint can be removed in consensus, api and cli.

It needs to be retained in node, but I'll push a commit that changes the comment.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've pushed a commit to my branch in cli that removes the constraint. You can just rebase on that.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've discovered that the problem can be worked around more cleanly in node by updating the Hackage index, because entropy was updated to be compatible with Cabal-3.14 on Jan 1.

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

Successfully merging this pull request may close these issues.

4 participants