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

Revert: Remove settle secondary (#351) #400

Merged
merged 9 commits into from
Feb 20, 2024

Conversation

sophia1ch
Copy link
Contributor

This PR is linked to hyperledger-labs/perun-eth-backend#47 and reverts commit be6e072.

@iljabvh iljabvh self-requested a review February 20, 2024 13:39
RmbRT and others added 7 commits February 20, 2024 14:47
This allows including `wire.proto` in other projects and generates the correct include paths in .proto modules including it.

Signed-off-by: Steffen Rattay <[email protected]>
Signed-off-by: Steffen Rattay <[email protected]>
@sophia1ch sophia1ch force-pushed the feat-secondary-settle branch from bfc51ff to f40c671 Compare February 20, 2024 13:56
Chore: Add author for this commit.

Signed-off-by: Sophia Koehler <[email protected]>

chore: update NOTICE.

Signed-off-by: Sophia Koehler <[email protected]>
@sophia1ch sophia1ch force-pushed the feat-secondary-settle branch from 15e04a6 to 35ed061 Compare February 20, 2024 15:10
Copy link
Contributor

@iljabvh iljabvh left a comment

Choose a reason for hiding this comment

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

This PR restores the option to wait for the peer to call concludeFinal first. It is compatible with the Eth-Backend that has this option reactivated as well, found here.

@iljabvh iljabvh merged commit ba09048 into hyperledger-labs:main Feb 20, 2024
6 checks passed
@iljabvh iljabvh deleted the feat-secondary-settle branch February 20, 2024 15:34
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.

5 participants