mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

check that the corrent paymentaccount is used for this offer

Browse source
This commit is contained in:
Mike Rosseel 2017-09-04 19:59:40 +02:00
parent d826efc984
commit 68a7e7c9c5
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/src/main/java/io/bisq/api/BisqProxy.java
View file

@ -166,6 +166,12 @@ public class BisqProxy {
public Optional<BisqProxyError> offerMake(String accountId, OfferPayload.Direction direction, BigDecimal amount, BigDecimal minAmount,
boolean useMarketBasedPrice, Double marketPriceMargin, String baseCurrencyCode, String counterCurrencyCode, String fiatPrice) {
// exception from gui code is not clear enough, so this check is added. Missing money is another possible check but that's clear in the gui exception.
if(user.getAcceptedArbitratorAddresses().size() == 0) {
return BisqProxyError.getOptional("No arbitrator has been chosen");
}
// Checked that if fixed we have a fixed price, if percentage we have a percentage
if (marketPriceMargin == null && useMarketBasedPrice) {
return BisqProxyError.getOptional("When choosing PERCENTAGE price, fill in percentage_from_market_price");
@ -267,6 +273,9 @@ public class BisqProxy {
Offer offer = new Offer(offerPayload);
offer.setPriceFeedService(priceFeedService);
if(!PaymentAccountUtil.isPaymentAccountValidForOffer(offer, paymentAccount)) {
return BisqProxyError.getOptional("PaymentAccount is not valid for offer");
}
// use countdownlatch to block this method until there's a success/error callback call
CountDownLatch loginLatch = new CountDownLatch(1);

8
gui/src/main/java/io/bisq/gui/app/BisqApp.java
View file

@ -176,6 +176,10 @@ public class BisqApp extends Application {
injector = Guice.createInjector(bisqAppModule);
injector.getInstance(InjectorViewFactory.class).setInjector(injector);
if(Boolean.valueOf(bisqEnvironment.getRequiredProperty(AppOptionKeys.ENABLE_API))) {
injector.getInstance(DropwizardApplication.class).run("server", "bisq-api.yml");
}
// All classes which are persisting objects need to be added here
// Maintain order!
ArrayList<PersistedDataHost> persistedDataHosts = new ArrayList<>();
@ -215,10 +219,6 @@ public class BisqApp extends Application {
mainView.setPersistedFilesCorrupted(corruptedDatabaseFiles);
});
if(Boolean.valueOf(bisqEnvironment.getRequiredProperty(AppOptionKeys.ENABLE_API))) {
injector.getInstance(DropwizardApplication.class).run("server", "bisq-api.yml");
}
// load the main view and create the main scene
CachingViewLoader viewLoader = injector.getInstance(CachingViewLoader.class);
mainView = (MainView) viewLoader.load(MainView.class);