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

Updates ouroboros-network to fix PeerSharing #383

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Updates ouroboros-network to fix PeerSharing #383

merged 4 commits into from
Nov 13, 2023

Conversation

bolt12
Copy link
Contributor

@bolt12 bolt12 commented Oct 2, 2023

Description

This PR accommodates changes from IntersectMBO/ouroboros-network#4644.

@bolt12 bolt12 requested a review from a team as a code owner October 2, 2023 14:48
@nfrisby nfrisby self-assigned this Oct 3, 2023
nfrisby
nfrisby previously requested changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@nfrisby nfrisby left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thank you for opening an integration PR!

My only requested changes are:

  • I think a couple of the changelog fragments are incorrect, see my comments there.

  • I suspect at least one build-depends lower bound needs to be increased.

...s-consensus-cardano/changelog.d/20231002_154149_armandoifsantos_fix_peerSharing_handshake.md Outdated Show resolved Hide resolved
...s-consensus-cardano/changelog.d/20231002_154149_armandoifsantos_fix_peerSharing_handshake.md Outdated Show resolved Hide resolved
...sensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs Show resolved Hide resolved
@bolt12 bolt12 force-pushed the bolt12/fix-peerSharing-handshake branch from 7f88a80 to 76379d5 Compare October 11, 2023 10:06
@jasagredo jasagredo mentioned this pull request Nov 7, 2023
Closed
53 tasks
@bolt12 bolt12 force-pushed the bolt12/fix-peerSharing-handshake branch 2 times, most recently from 1aed1da to ff17159 Compare November 7, 2023 16:35
@bolt12
Copy link
Contributor Author

bolt12 commented Nov 7, 2023

I believe I need to wait for plutus to make a release using most recent version of nothunks, before merging

@jasagredo jasagredo enabled auto-merge November 10, 2023 10:01
@jasagredo jasagredo force-pushed the bolt12/fix-peerSharing-handshake branch from 833bbd2 to 52fa9de Compare November 10, 2023 13:21
@jasagredo jasagredo force-pushed the bolt12/fix-peerSharing-handshake branch from 52fa9de to 6c74d8b Compare November 10, 2023 14:22
@jasagredo jasagredo dismissed nfrisby’s stale review November 10, 2023 14:23

The changes have been addressed

@jasagredo jasagredo added this pull request to the merge queue Nov 13, 2023
Merged via the queue into main with commit 6d0427f Nov 13, 2023
13 checks passed
@jasagredo jasagredo deleted the bolt12/fix-peerSharing-handshake branch November 13, 2023 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasagredo jasagredo jasagredo approved these changes

@nfrisby nfrisby nfrisby left review comments

Assignees

@nfrisby nfrisby

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bolt12 @nfrisby @jasagredo