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.

Sign up for GitHub

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

Jump to bottom

Update ledger and consensus #99

Merged
merged 9 commits into from
Jul 7, 2023
Merged

Update ledger and consensus #99

merged 9 commits into from
Jul 7, 2023

Conversation

carbolymer
Copy link
Contributor

@carbolymer carbolymer commented Jul 5, 2023 •
edited by newhoggy
Loading

Changelog

- description: |
    -  Update to the latest ledger and consensus
    -  Introduce CommitteeKey
  compatibility: breaking
  type: feature

Context

Update to the latest ledger.

Requires:

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
    • roundtrip tests
  • 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
  • The changelog section in the PR is updated to describe the change
  • Self-reviewed the diff

Note on CI

If your PR is from a fork, the necessary CI jobs won't trigger automatically for security reasons.
You will need to get someone with write privileges. Please contact IOG node developers to do this
for you.

@carbolymer carbolymer mentioned this pull request Jul 5, 2023
Closed
@carbolymer carbolymer force-pushed the mgalazyn/chore/update-ledger branch 5 times, most recently from 30fc0cb to f3738af Compare July 6, 2023 15:09
@disassembler disassembler force-pushed the mgalazyn/chore/update-ledger branch from 3a0b123 to ce2d0c3 Compare July 7, 2023 04:05
@carbolymer carbolymer force-pushed the mgalazyn/chore/update-ledger branch from e54c15f to 58065eb Compare July 7, 2023 12:21
@Jimbo4350 Jimbo4350 force-pushed the mgalazyn/chore/update-ledger branch from 67a089a to d677991 Compare July 7, 2023 13:27
@Jimbo4350 Jimbo4350 marked this pull request as ready for review July 7, 2023 13:28
@Jimbo4350 Jimbo4350 force-pushed the mgalazyn/chore/update-ledger branch from d677991 to 6bdb471 Compare July 7, 2023 13:45
@Jimbo4350 Jimbo4350 changed the title Update ledger Update ledger and consensus Jul 7, 2023
@Jimbo4350 Jimbo4350 force-pushed the mgalazyn/chore/update-ledger branch 2 times, most recently from 68c2bbf to 1ff60d1 Compare July 7, 2023 14:07
@disassembler disassembler force-pushed the mgalazyn/chore/update-ledger branch from 7dd594c to 92563d2 Compare July 7, 2023 15:20
carbolymer
carbolymer commented Jul 7, 2023
View reviewed changes
cardano-api/internal/Cardano/Api/SerialiseJSON.hs Outdated
@@ -66,6 +66,5 @@ writeFileJSON :: ToJSON a
-> IO (Either (FileError ()) ())
writeFileJSON path x =
runExceptT $
handleIOExceptT (FileIOError path) $
BS.writeFile path (serialiseToJSON x)
fileIOExceptT path (`BS.writeFile` serialiseToJSON x)
Copy link
Contributor Author

@carbolymer carbolymer Jul 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This will throw an error (throwError) when path does not exist - fileIOExceptT can't be used here

bolt12 and others added 6 commits July 7, 2023 11:37
@bolt12 @disassembler
Accommodate ouroboros-consensus API changes
be9fdb1
@bolt12 @disassembler
ProtocolInfoArgs does not use 'm' type variable
dd477ca
@bolt12 @disassembler
Added SomeBlockType and reflBlockType
28b14c7
@bolt12 @disassembler
Added FileDoesNotExistError constructor
f494185 
Improves the error situation when dealing with file paths. Before all IO
related errors where wrapped around the constructor FileIOError. Now the
existence of the file is checked and if it does not exist a
FileDoesNotExistError is thrown.

Added `fileIOExceptT` function that abstracts away this existence check,
so we can get read of all the FileIOError wraps.
@disassembler
cardano-ledger-conway: renames for 1.5.0.0
4ebc58b 
(cherry picked from commit 8de46ea)
@aniketd @disassembler
Query: add constitution hash ledger query
066c6de 
(cherry picked from commit 4cd2216)
@disassembler disassembler force-pushed the mgalazyn/chore/update-ledger branch from 92563d2 to 82d68db Compare July 7, 2023 15:38
@disassembler disassembler force-pushed the mgalazyn/chore/update-ledger branch from 82d68db to 3902e8c Compare July 7, 2023 15:45
@carbolymer @Jimbo4350
Parameterize VoteType on the era and include the respective voting
511ea88 
credentials
Remove voting credential parameter from createVotingProcedure
@Jimbo4350 Jimbo4350 force-pushed the mgalazyn/chore/update-ledger branch from 3902e8c to 511ea88 Compare July 7, 2023 16:15
@Jimbo4350 Jimbo4350 enabled auto-merge July 7, 2023 16:16
@Jimbo4350 Jimbo4350 added this pull request to the merge queue Jul 7, 2023
@Jimbo4350 Jimbo4350 removed this pull request from the merge queue due to a manual request Jul 7, 2023
@Jimbo4350 Jimbo4350 added this pull request to the merge queue Jul 7, 2023
Merged via the queue into main with commit 33f92b4 Jul 7, 2023
@Jimbo4350 Jimbo4350 deleted the mgalazyn/chore/update-ledger branch July 7, 2023 17:15
@bolt12 bolt12 mentioned this pull request Jul 10, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@disassembler disassembler disassembler approved these changes

@Jimbo4350 Jimbo4350 Jimbo4350 approved these changes

@dcoutts dcoutts Awaiting requested review from dcoutts

@erikd erikd Awaiting requested review from erikd

@newhoggy newhoggy Awaiting requested review from newhoggy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@carbolymer @disassembler @Jimbo4350 @bolt12 @aniketd