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 chaps & integration #5243

Merged
merged 11 commits into from
Jun 1, 2023
Merged

update chaps & integration #5243

merged 11 commits into from
Jun 1, 2023

Conversation

JaredCorduan
Copy link
Contributor

@JaredCorduan JaredCorduan commented May 12, 2023 •
edited
Loading

Description

I have updated CHaPs and done the following integration work (with help from others!):

  • workaround plutus-tx-plugin expecting GHC9
  • Change ledger bounds in cardano-api, cardano-cli.
  • Add Plutus V3 support to cardano-api, only available in the conway ledger era.
  • PState is now parametric in era, not crypto.
  • Adjust for new conway era certificates.
    Note that the certificate design is currently wrong in ledger,
    making the conway support in cardano-api type-checking but broken.
  • Ledger UMapCompact is now UMap
  • Ledger types with names involving DState are renamed to CertState.
  • Handle the the addition of handshake queries

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • roundtrip tests
    • integration tests
      See Runnings tests for more details
  • Any changes are noted in the CHANGELOG.md for affected package
  • 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

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.

@JaredCorduan JaredCorduan force-pushed the jc/update-chaps branch 2 times, most recently from 893a6cb to 9cb1fa2 Compare May 12, 2023 19:50
@JaredCorduan JaredCorduan force-pushed the jc/update-chaps branch 2 times, most recently from 127b522 to 6436dd5 Compare May 12, 2023 21:09
@JaredCorduan JaredCorduan mentioned this pull request May 18, 2023
Closed
@newhoggy newhoggy force-pushed the jc/update-chaps branch 2 times, most recently from 3d13e4d to 298178b Compare May 29, 2023 12:58
@coot
Copy link
Contributor

coot commented May 30, 2023

We'll need to merge #5275.

@JaredCorduan JaredCorduan marked this pull request as ready for review May 30, 2023 16:34
@coot coot mentioned this pull request May 30, 2023
Closed
Jimbo4350
Jimbo4350 approved these changes May 31, 2023
View reviewed changes
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

cardano-cli/CHANGELOG.md Outdated
@@ -2,7 +2,8 @@

## 8.1.0

-
- Updated ledger dependency bounds
- Support for query flag in `Ping` parser
Copy link
Contributor

Choose a reason for hiding this comment

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

Where can I find more documentation regarding this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Perhaps @coot or @jprider63 knows?

Copy link
Contributor

Choose a reason for hiding this comment

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

Here is the corresponding issue and initial PR.

Copy link
Contributor

@Jimbo4350 Jimbo4350 May 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks. Can you update the CHANGELOG following the format of the other entries? @jprider63 your team should provide something to @JaredCorduan that he can simply copy paste.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, I changed them, do they look okay now?

mgmeier and others added 6 commits May 31, 2023 13:52
@mgmeier @disassembler
bench: workaround plutus-tx-plugin expecting GHC9
cd14e88
@disassembler
update CHaPs
dcd2727 
* Change ledger bounds in cardano-api, cardano-cli.
* Add Plutus V3 support to cardano-api, only available in the conway ledger era.
* PState is now parametric in era, not crypto.
* Adjust for new conway era certificates.
  Note that the certificate design is currently wrong in ledger,
  making the conway support in cardano-api type-checking but broken.
* Ledger UMapCompact is now UMap
* Ledger types with names involving DState are renamed to CertState.
* Add the new query flag to the CLI ping.
@jprider63 @disassembler
Updates due to the addition of handshake queries
43f9303
@disassembler
integration work
e6a5043
@newhoggy @disassembler
chainSyncServerHeaderTracer
97979f2
@Jimbo4350 @disassembler
Builds on 9.2.7
5e42439
@Jimbo4350 Jimbo4350 mentioned this pull request May 31, 2023
Merged
9 tasks
newhoggy
newhoggy reviewed Jun 1, 2023
View reviewed changes
nix/haskell.nix
in
''
export CARDANO_NODE_SRC=${filteredProjectBase}
'';
Copy link
Contributor

Choose a reason for hiding this comment

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

CARDANO_NODE_SRC fix

@disassembler disassembler added this pull request to the merge queue Jun 1, 2023
@disassembler disassembler mentioned this pull request Jun 1, 2023
Merged
9 tasks
Merged via the queue into master with commit 6fff7d8 Jun 1, 2023
@iohk-bors iohk-bors bot deleted the jc/update-chaps branch June 1, 2023 14:10
@coot coot mentioned this pull request Nov 7, 2023
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@newhoggy newhoggy newhoggy approved these changes

@coot coot coot left review comments

@jprider63 jprider63 jprider63 left review comments

@Jimbo4350 Jimbo4350 Jimbo4350 approved these changes

@carbolymer carbolymer carbolymer approved these changes

@disassembler disassembler disassembler approved these changes

@mgmeier mgmeier mgmeier approved these changes

@deepfire deepfire Awaiting requested review from deepfire

@jutaro jutaro Awaiting requested review from jutaro

@fmaste fmaste Awaiting requested review from fmaste

@cleverca22 cleverca22 Awaiting requested review from cleverca22

@dcoutts dcoutts Awaiting requested review from dcoutts

@erikd erikd Awaiting requested review from erikd

@CarlosLopezDeLara CarlosLopezDeLara Awaiting requested review from CarlosLopezDeLara

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

Successfully merging this pull request may close these issues.
8 participants
@JaredCorduan @coot @newhoggy @carbolymer @disassembler @jprider63 @mgmeier @Jimbo4350