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

Add a new Module for the Liquidity Pool project(s) #56

Closed
wants to merge 10 commits into from
Closed

Add a new Module for the Liquidity Pool project(s) #56

wants to merge 10 commits into from

Conversation

chrislemaire
Copy link

@chrislemaire chrislemaire commented Feb 15, 2021 •
edited
Loading

In this pull request we propose a module for trading currencies through a liquidity pool.

@chrislemaire chrislemaire force-pushed the 5996-module-create branch 2 times, most recently from 5fee8e0 to 050ef5e Compare February 15, 2021 11:24
@chrislemaire
Copy link
Author

Ah finally got it to pass, turns out Intellij tried to give me a new and improved version of some library, but the tests didn't like that...

Tim-W
Tim-W reviewed Feb 15, 2021
View reviewed changes
liquidity-pool/build.gradle Outdated
implementation project(':common')
implementation project(':ipv8-android')

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
Copy link
Contributor

Choose a reason for hiding this comment

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

Apart from the first two

    implementation project(':common')
    implementation project(':ipv8-android')

Please look into what plugins/modules actually need for your project. (You may not need ttorrent, bitcoinj, mp3 library etc)

Copy link
Author

Choose a reason for hiding this comment

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

We're not exactly sure what we'll need for now, so I'll just strip it to the bare minimum for now then.

Copy link
Author

Choose a reason for hiding this comment

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

I don't really understand what is making these tests fail now. It seems something is wrong with currencyii, but as far as I can find I didn't change anything regarding it or in its module?

@chrislemaire
Copy link
Author

@Tim-W Could you take another look?

xoriole
xoriole reviewed Apr 16, 2021
View reviewed changes
Copy link
Contributor

@xoriole xoriole left a comment

Choose a reason for hiding this comment

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

Looking at the commit history, there are quite some repeated commits (maybe because of other merges). Could you please rebase the PR and squash appropriate commits to clean the commit history?

@devos50 devos50 mentioned this pull request Apr 16, 2021
Closed
@EmielBoss EmielBoss mentioned this pull request Apr 16, 2021
Closed
@chrislemaire chrislemaire force-pushed the 5996-module-create branch 3 times, most recently from b987ea4 to d90c32d Compare April 19, 2021 12:33
@devos50
Copy link
Contributor

devos50 commented Apr 19, 2021

@xoriole could you please close Tribler/tribler#5988, Tribler/tribler#5996 and Tribler/tribler#6001 after merging this PR? 👍

xoriole
xoriole suggested changes Apr 22, 2021
View reviewed changes
Copy link
Contributor

@xoriole xoriole left a comment

Choose a reason for hiding this comment

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

Nice!

Some comments:

  • Please extract out some the mentioned hardcoded values
  • Remove commented out code
  • Remove .DS_Store and add it to .gitignore

liquidity-pool/src/main/java/nl/tudelft/trustchain/liquidity/ui/PoolFragment.kt Outdated Show resolved Hide resolved
liquidity-pool/src/main/java/nl/tudelft/trustchain/liquidity/ui/PoolFragment.kt Outdated Show resolved Hide resolved
liquidity-pool/src/main/java/nl/tudelft/trustchain/liquidity/data/EthereumGethMultiSigWallet.kt Outdated Show resolved Hide resolved
liquidity-pool/src/main/java/nl/tudelft/trustchain/liquidity/data/EthereumGethMultiSigWallet.kt Outdated Show resolved Hide resolved
eurotoken/src/main/java/nl/tudelft/trustchain/eurotoken/ui/settings/DefaultGateway.kt Outdated Show resolved Hide resolved
@chrislemaire chrislemaire requested a review from xoriole May 4, 2021 09:44
@xoriole
Copy link
Contributor

xoriole commented May 18, 2021

@chrislemaire Could you please rebase the PR?

Chris Lemaire and others added 10 commits May 23, 2021 14:21
Setup a starter Liquidity Pool project
b664ea8 
This liquidity pool project is so far just a plain copy
of the musicdao project with the name replaced with Liquidity
Pool.

We will further build on this module in the future.
Add an initial setup for joining and trading
a4296f0 
This initial setup is not fully functional yet but contains
the building blocks of performing a trade and joining a pool
as a liquidity provider.
@vstam1
Finish the trade and join functionalities
e63cfdd 
These functionalities should now both be functional.
@kchong97
Cleanup some of the code involved in liquidity pooling
302b2d3 
We found a few small bugs that needed fixing. We also did some
cleaning up of the code and layouts.
@kchong97
Add a README describing the LP project and future work
995246d
@mmelas
Update Eurotoken implementations with Master
8b192ee
@daandeheij
Rename group 2 readme
801e2a0
@EmielBoss
BTC/ETH liquidity pool with multisignature wallets; by Group 1
d27dae1
@thversfelt
Added bitcoin-ethereum multi-sig liquidity pool
5da60e5 
By group 1: Emiel Bos, Daan de Heij, and Thijs Versfelt
Fix some minor issues such as magic strings
c8cd547 
Some magic strings got extracted to a constant in the gradle build
config.
@chrislemaire
Copy link
Author

chrislemaire commented May 23, 2021 •
edited
Loading

I rebased and checked the error. Looks like the error has to do with a dependency that we didn't use nor alter in the common module, so this might well be a problem that needs to be fixed in master, rather than this branch. This might understandably take some time. Since this has nothing to do with our project and we have moved on to different courses and activities since then, I propose that someone more actively involved with the superapp makes a copy of this branch to continue the Pull Request. @xoriole

@devos50
Copy link
Contributor

devos50 commented May 24, 2021 •
edited
Loading

What went wrong:
Could not determine the dependencies of task ':app:lint'.
Could not resolve all artifacts for configuration ':app:releaseRuntimeClasspath'.
Could not find com.goterl.lazycode:lazysodium-android:4.1.0.

Yes, this is a known issue and not related to your PR (also related to #71). Bintray stopped offering their free service tier and the superapp pulls various of its dependencies from Bintray.

@thversfelt
Copy link
Contributor

thversfelt commented May 24, 2021 •
edited
Loading

I will leave this here, since then all project members and supervisors can see (I don't have all e-mail addresses): I am speaking on behalf of both Liquidity Pool project contributors. We noticed that our project grades are missing on https://my.tudelft.nl/. Would it be possible to add our grades, considering that this PR can basically be merged since the checks fail for reasons unrelated to this PR?

Thank you in advance!

@synctext
Copy link
Member

+6,311 lines of re-basing, that will take our staff a full day or more. OK.
Bintray issue is now documented here, it disrupted our workflow significantly: Tribler/tribler#5914 (comment)
All clouds are fragile
(all students seemed to have finished, grades will be finalised)

@xoriole xoriole mentioned this pull request Jun 3, 2021
Merged
@xoriole xoriole closed this in c66fd08 Jun 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kchong97 kchong97 kchong97 left review comments

@Tim-W Tim-W Tim-W left review comments

@xoriole xoriole Awaiting requested review from xoriole

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.