Skip to content

Revert: Remove settle secondary (#351) #400

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
Merged
merged 9 commits into from
Feb 20, 2024
Merged

Revert: Remove settle secondary (#351) #400

merged 9 commits into from
Feb 20, 2024
+49 −25

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
@RmbRT @sophia1ch
wire.proto: use absolute module path
fdfb864 
This allows including `wire.proto` in other projects and generates the correct include paths in .proto modules including it.

Signed-off-by: Steffen Rattay <steffen@perun.network>
@RmbRT @sophia1ch
Expose protobuf converters
5694197 
Signed-off-by: Steffen Rattay <steffen@perun.network>
@iljabvh @sophia1ch
README: Update backend compatibility list and link the backend reposi…
643e286 
…tories

Signed-off-by: Ilja von Hoessle <ilja@perun.network>
@iljabvh @sophia1ch
doc: Add MAINTAINERS.md file, add Jens to NOTICE
1f0c6d3 
Signed-off-by: Ilja von Hoessle <ilja@perun.network>
@iljabvh @sophia1ch
doc(MAINTAINERS.md): Fix iljabvh Github handle
40f6013 
Signed-off-by: Ilja von Hoessle <ilja@perun.network>
@NhoxxKienn @sophia1ch
fix(internal_tests): fix failing unit tests
e08ee0b 
Signed-off-by: Minh Huy Tran <huy@perun.network>
@janbormet @sophia1ch
wire/protobuf: Add conversion functions between protbuf types and go-…
0b444cb 
…perun types

Signed-off-by: Jan Bormet <jan.bormet@bormet.info>
@sophia1ch sophia1ch force-pushed the feat-secondary-settle branch from bfc51ff to f40c671 Compare February 20, 2024 13:56
@sophia1ch
Revert: Remove settle secondary (hyperledger-labs#351)
35ed061 
Chore: Add author for this commit.

Signed-off-by: Sophia Koehler <sophia@perun.network>

chore: update NOTICE.

Signed-off-by: Sophia Koehler <sophia@perun.network>
@sophia1ch sophia1ch force-pushed the feat-secondary-settle branch from 15e04a6 to 35ed061 Compare February 20, 2024 15:10
@sophia1ch
Merge branch 'main' into feat-secondary-settle
9a2e2ca 
Signed-off-by: Sophia <sophia@perun.network>
iljabvh
iljabvh approved these changes Feb 20, 2024
View reviewed changes
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
@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

Reviewers

@iljabvh iljabvh iljabvh approved these changes

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

@sophia1ch @iljabvh @RmbRT @NhoxxKienn @janbormet