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

API PR part 1/2, necessary changes to bisq-exchange for the API to work #968

Merged
merged 840 commits into from
Oct 13, 2017

Conversation

mrosseel
Copy link
Contributor

  • updated dependencies are so they are consistent with dropwizard dependencies on those libraries. Not 100% necessary but always better.
  • Extracting certain methods from GUI classes to other classes so they're available to the API.

ManfredKarrer and others added 30 commits May 13, 2017 02:00
…ectedMailboxStorageEntry to StorageEntryHolder
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/TradableList.java
#	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
#	core/src/test/java/io/bisq/core/util/ProtoBufferUtilitiesTest.java
# Conflicts:
#	common/src/main/java/io/bisq/common/storage/FileManager.java
# Conflicts:
#	common/src/main/java/io/bisq/common/storage/FileManager.java
mrosseel and others added 26 commits September 5, 2017 16:29
This fixes an offer_make issue, but there is still one left.
General cleanup of model files/parameters no longer needed.
Remove offer_take savings_wallet param because it's always implied,
external wallets are not yet supported.

Signed-off-by: Mike Rosseel <[email protected]>
The JSON returned from trade_list was not correct, fixed by wrapping it
in [ ] and not generating the ',' character for the last position.

Signed-off-by: Mike Rosseel <[email protected]>
Using an environment variable called BISQ_API_PORT, it is now possible
to override the default API port of 8080 to whichever available port
desired.

This enables running the API on a machine where port 8080 is occupied,
it also enables running multiple Bisq instances side-by-side with their
respective API's enabled.

Signed-off-by: Mike Rosseel <[email protected]>
Use StringJoiner to sanely concatenate the list of trades.

Signed-off-by: Mike Rosseel <[email protected]>
Balances were not calculated correctly, now they are by copying the
code from GUI. This should be extracted in a common class in CORE,
has been noted in a TODO. Given the splitting of api in a separate
repository, I'm wary of adding extra changes to core/gui

Signed-off-by: Mike Rosseel <[email protected]>
Branch did not compile due to missing checkin of the OfferUtil file.

Signed-off-by: Mike Rosseel <[email protected]>
Remove slack notifications for now

Signed-off-by: Mike Rosseel <[email protected]>
There was a duplicate entry in the pom, now removed.

Signed-off-by: Mike Rosseel <[email protected]>
Instead of asking for a baseCurrency and a counterCurrency, the
method now just takes the market_pair (as returned in market_pair
method) and extracts the relevant currencies from that.

Signed-off-by: Mike Rosseel <[email protected]>
Signed-off-by: Mike Rosseel <[email protected]>
The API module will be hosted in a separate repo, so it shouldn't be
in this one. GUI module will reference the API artifact created by
that other repo to allow the command-line switch to function on
first checkout of the bisq project.
Conflicts:
	common/src/main/java/io/bisq/common/locale/LocaleUtil.java
The other changes in GUI, namely small refactoring to have the GUI
and the API use the same methods to calculate things have been
left in place.
@ManfredKarrer
Copy link
Contributor

That method is wrong:

public Coin getMakerFee(boolean isCurrencyForMakerFeeBtc) {
return OfferUtil.getMakerFee(bsqWalletService, preferences, amount.get(), marketPriceAvailable, marketPriceMargin);
}

Need to be:
public Coin getMakerFee(boolean isCurrencyForMakerFeeBtc) {
return OfferUtil.getMakerFee(isCurrencyForMakerFeeBtc, amount.get(), marketPriceAvailable, marketPriceMargin);
}

Otherwise the isCurrencyForMakerFeeBtc param gets ignored.

@ManfredKarrer ManfredKarrer merged commit 0d41170 into bisq-network:Development Oct 13, 2017
@mrosseel mrosseel deleted the api-pr1 branch October 16, 2017 07:24
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.

2 participants