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

Merge Optimistic and Universal modes into ILP #44

Merged
merged 4 commits into from
Jul 11, 2016

Conversation

emschwartz
Copy link
Member

See #28

emschwartz and others added 4 commits July 11, 2016 13:14
Since Optimistic, Universal, and Atomic were not true "transport
protocols", we decided to combine Optimistic and Universal back into
the core Interledger Protocol. Atomic has been removed because its
implementation will be specific to groups based on commonly trusted
notaries.

resolves #28
resolves #20
resolves #21
resolves #22
@justmoon
Copy link
Member

LGTM

@emschwartz emschwartz merged commit c13ce3b into master Jul 11, 2016
@emschwartz emschwartz deleted the merge-ilp-optimistic-universal branch July 11, 2016 11:53
emschwartz added a commit to interledger-deprecated/five-bells-shared that referenced this pull request Jul 21, 2016
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.

None yet

2 participants