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

Integrate Ledger and Consensus for 8.5 #270

Merged
merged 4 commits into from Sep 29, 2023
Merged

Integrate Ledger and Consensus for 8.5 #270

merged 4 commits into from Sep 29, 2023

Conversation

amesgen
Copy link
Member

@amesgen amesgen commented Sep 26, 2023

Changelog

- description: |
    Add support for conway era protocol parameters.
    Adapted `GenesisCardano` to upstream Ledger/Consensus changes.
# 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
  # - improvement    # QoL changes e.g. refactoring
  # - 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

Contains a cherry-picked a commit from #252

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • The change log section in the PR description has been filled in
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • round trip tests
    • integration tests
      See Running tests for more details
  • The version bounds in .cabal files are updated
  • CI passes. See note on CI. The following CI checks are required:
    • Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
    • Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
    • Code builds on Linux, MacOS and Windows for ghc-8.10.7 and ghc-9.2.7
  • Self-reviewed the diff

Copy link
Contributor

@Jimbo4350 Jimbo4350 left a comment

Choose a reason for hiding this comment

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

LGTM but please undo the code alignment

cardano-api/internal/Cardano/Api/Orphans.hs Outdated Show resolved Hide resolved
@@ -244,85 +244,91 @@ lastMappend a b = Ledger.maybeToStrictMaybe . getLast $ strictMaybeToLast a <> s
strictMaybeToLast :: StrictMaybe a -> Last a
strictMaybeToLast = Last . strictMaybeToMaybe

lastMappendWith :: (a -> StrictMaybe b) -> a -> a -> StrictMaybe b
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@carbolymer carbolymer added this pull request to the merge queue Sep 29, 2023
@carbolymer carbolymer removed this pull request from the merge queue due to a manual request Sep 29, 2023
@carbolymer carbolymer merged commit 904e04f into main Sep 29, 2023
20 checks passed
@carbolymer carbolymer deleted the amesgen/releng-8.5 branch September 29, 2023 18:15
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.

None yet

4 participants