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 in preparation for cardano-node release 10.2.0 #687

Merged
merged 17 commits into from
Jan 10, 2025

Conversation

neilmayhew
Copy link
Contributor

@neilmayhew neilmayhew commented Nov 21, 2024

Changelog

- description: |
    Integrate `typed-protocols`, `ouroboros-network`, `cardano-ledger` and `ouroboros-consensus`
    in preparation for `cardano-node` release `10.2.0`
  type:
   - breaking
   - feature

Context

See IntersectMBO/cardano-node#6040 for overall progress and links to PRs in other repos

How to trust this PR

Similar changes have been made in ouroboros-consensus. Another commit is cherry-picked from #619.

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

@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 2 times, most recently from 0e65b4c to c00640c Compare November 21, 2024 21:34
@smelc smelc mentioned this pull request Nov 26, 2024
3 tasks
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 6 times, most recently from bd2afac to 6fea845 Compare December 4, 2024 20:39
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch 3 times, most recently from c3b0cc8 to 1aea55f Compare December 19, 2024 02:16
@neilmayhew neilmayhew force-pushed the neilmayhew/release-srp branch from a969b0b to 04ac6b3 Compare December 20, 2024 05:12
@neilmayhew
Copy link
Contributor Author

This will need to have the srp removed after new consensus packages are released to CHaP

@carbolymer carbolymer force-pushed the neilmayhew/release-srp branch from 68cc8b9 to 515eca0 Compare January 9, 2025 15:44
@carbolymer carbolymer force-pushed the neilmayhew/release-srp branch from 515eca0 to b274429 Compare January 9, 2025 15:47
@carbolymer carbolymer force-pushed the neilmayhew/release-srp branch from b274429 to f93b1cf Compare January 9, 2025 15:53
@carbolymer
Copy link
Contributor

@neilmayhew Maybe it's too granular. But I don't have a big problem with it, we can keep it that way.

@carbolymer carbolymer enabled auto-merge January 9, 2025 16:04
@neilmayhew
Copy link
Contributor Author

@neilmayhew Maybe it's too granular. But I don't have a big problem with it, we can keep it that way.

It's a matter of taste, I guess. My own style is to be very fine grained, but I need to be reminded once in a while that this doesn't work for everybody 😄

@carbolymer carbolymer added this pull request to the merge queue Jan 9, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jan 9, 2025
@carbolymer carbolymer added this pull request to the merge queue Jan 10, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jan 10, 2025
@carbolymer carbolymer merged commit 9386533 into master Jan 10, 2025
52 of 70 checks passed
@carbolymer carbolymer deleted the neilmayhew/release-srp branch January 10, 2025 07:36
@carbolymer
Copy link
Contributor

Force merging since garnix was stuck and blocked the merge.

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