mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove OpenOffer, remove offerIsAvailable handling form trade protocol

Browse Source
This commit is contained in:
Manfred Karrer 2015-03-17 19:11:10 +01:00
parent 831c001fb4
commit b10b6ff203
34 changed files with 327 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/io/bitsquare/common/taskrunner/Task.java
View File

@ -51,7 +51,8 @@ public abstract class Task<T extends SharedModel> {
abstract protected void doRun() throws WalletException, TransactionVerificationException, SigningException;
abstract protected void updateStateOnFault();
protected void updateStateOnFault() {
}
private void interceptBeforeRun() {
if (getClass() == taskToInterceptBeforeRun)

21
core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
View File

@ -17,6 +17,9 @@
package io.bitsquare.gui.main.debug;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityProtocol;
import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage;
import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable;
@ -28,11 +31,9 @@ import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer;
import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererProtocol;
import io.bitsquare.trade.protocol.trade.offerer.tasks.GetOffererDepositTxInputs;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestTakeOfferMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestDepositPayment;
import io.bitsquare.trade.protocol.trade.offerer.tasks.RespondToTakeOfferRequest;
import io.bitsquare.trade.protocol.trade.offerer.tasks.SendBankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxIdToTaker;
import io.bitsquare.trade.protocol.trade.offerer.tasks.SetupListenerForBlockChainConfirmation;
@ -47,19 +48,14 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessBankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRequestDepositPaymentMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRespondToTakeOfferRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.RequestTakeOffer;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.InitializableView;
import java.util.Arrays;
@ -106,9 +102,6 @@ public class DebugView extends InitializableView {
/*---- Protocol ----*/
BuyerAsOffererProtocol.class,
ProcessRequestTakeOfferMessage.class,
RespondToTakeOfferRequest.class,
ProcessRequestDepositTxInputsMessage.class,
GetOffererDepositTxInputs.class,
RequestDepositPayment.class,
@ -130,10 +123,6 @@ public class DebugView extends InitializableView {
/*---- Protocol ----*/
SellerAsTakerProtocol.class,
io.bitsquare.trade.protocol.trade.taker.tasks.GetPeerAddress.class,
RequestTakeOffer.class,
ProcessRespondToTakeOfferRequestMessage.class,
CreateTakeOfferFeeTx.class,
SendRequestDepositTxInputsMessage.class,

14
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OpenOfferListItem.java → core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OfferListItem.java
View File

@ -17,20 +17,20 @@
package io.bitsquare.gui.main.portfolio.offer;
import io.bitsquare.offer.OpenOffer;
import io.bitsquare.offer.Offer;
/**
* We could remove that wrapper if it is not needed for additional UI only fields.
*/
class OpenOfferListItem {
class OfferListItem {
private final OpenOffer openOffer;
private final Offer offer;
public OpenOfferListItem(OpenOffer openOffer) {
this.openOffer = openOffer;
public OfferListItem(Offer offer) {
this.offer = offer;
}
public OpenOffer getOpenOffer() {
return openOffer;
public Offer getOffer() {
return offer;
}
}

26
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
View File

@ -17,15 +17,14 @@
package io.bitsquare.gui.main.portfolio.offer;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.offer.OpenOffer;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User;
import com.google.inject.Inject;
@ -44,8 +43,8 @@ class OffersDataModel implements Activatable, DataModel {
private final TradeManager tradeManager;
private final User user;
private final ObservableList<OpenOfferListItem> list = FXCollections.observableArrayList();
private final MapChangeListener<String, OpenOffer> offerMapChangeListener;
private final ObservableList<OfferListItem> list = FXCollections.observableArrayList();
private final MapChangeListener<String, Offer> offerMapChangeListener;
@Inject
@ -55,19 +54,19 @@ class OffersDataModel implements Activatable, DataModel {
this.offerMapChangeListener = change -> {
if (change.wasAdded())
list.add(new OpenOfferListItem(change.getValueAdded()));
list.add(new OfferListItem(change.getValueAdded()));
else if (change.wasRemoved())
list.removeIf(e -> e.getOpenOffer().getId().equals(change.getValueRemoved().getId()));
list.removeIf(e -> e.getOffer().getId().equals(change.getValueRemoved().getId()));
};
}
@Override
public void activate() {
list.clear();
list.addAll(tradeManager.getOpenOffers().values().stream().map(OpenOfferListItem::new).collect(Collectors.toList()));
list.addAll(tradeManager.getOpenOffers().values().stream().map(OfferListItem::new).collect(Collectors.toList()));
// we sort by date, earliest first
list.sort((o1, o2) -> o2.getOpenOffer().getOffer().getCreationDate().compareTo(o1.getOpenOffer().getOffer().getCreationDate()));
list.sort((o1, o2) -> o2.getOffer().getCreationDate().compareTo(o1.getOffer().getCreationDate()));
tradeManager.getOpenOffers().addListener(offerMapChangeListener);
}
@ -82,12 +81,11 @@ class OffersDataModel implements Activatable, DataModel {
}
public ObservableList<OpenOfferListItem> getList() {
public ObservableList<OfferListItem> getList() {
return list;
}
public Direction getDirection(OpenOffer openOffer) {
Offer offer = openOffer.getOffer();
public Direction getDirection(Offer offer) {
return offer.getMessagePublicKey().equals(user.getNetworkPubKey()) ?
offer.getDirection() : offer.getMirroredDirection();
}

90
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
View File

@ -35,8 +35,8 @@ import javafx.util.Callback;
@FxmlView
public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewModel> {
@FXML TableView<OpenOfferListItem> table;
@FXML TableColumn<OpenOfferListItem, OpenOfferListItem> priceColumn, amountColumn, volumeColumn,
@FXML TableView<OfferListItem> table;
@FXML TableColumn<OfferListItem, OfferListItem> priceColumn, amountColumn, volumeColumn,
directionColumn, dateColumn, offerIdColumn, removeItemColumn;
@Inject
@ -67,10 +67,10 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
model.removeOpenOffer(offer);
}
private void openOfferDetails(OpenOfferListItem item) {
private void openOfferDetails(OfferListItem item) {
// TODO Open popup with details view
log.debug("openOfferDetails " + item);
Utilities.copyToClipboard(item.getOpenOffer().getId());
Utilities.copyToClipboard(item.getOffer().getId());
Popups.openWarningPopup("Under construction",
"The offer ID was copied to the clipboard. " +
"Use that to identify your trading peer in the IRC chat room \n\n" +
@ -80,16 +80,16 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setOfferIdColumnCellFactory() {
offerIdColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
offerIdColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem, OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem, OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOfferListItem,
OpenOfferListItem> column) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(TableColumn<OfferListItem,
OfferListItem> column) {
return new TableCell<OfferListItem, OfferListItem>() {
private Hyperlink hyperlink;
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty) {
@ -112,14 +112,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setDateColumnCellFactory() {
dateColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
dateColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(
TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(
TableColumn<OfferListItem, OfferListItem> column) {
return new TableCell<OfferListItem, OfferListItem>() {
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null)
setText(model.getDate(item));
@ -134,14 +134,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setAmountColumnCellFactory() {
amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
amountColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(
TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(
TableColumn<OfferListItem, OfferListItem> column) {
return new TableCell<OfferListItem, OfferListItem>() {
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
setText(model.getAmount(item));
}
@ -153,14 +153,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setPriceColumnCellFactory() {
priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
priceColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(
TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(
TableColumn<OfferListItem, OfferListItem> column) {
return new TableCell<OfferListItem, OfferListItem>() {
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
setText(model.getPrice(item));
}
@ -172,14 +172,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setVolumeColumnCellFactory() {
volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
volumeColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(
TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(
TableColumn<OfferListItem, OfferListItem> column) {
return new TableCell<OfferListItem, OfferListItem>() {
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null)
setText(model.getVolume(item));
@ -194,14 +194,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setDirectionColumnCellFactory() {
directionColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
directionColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(
TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(
TableColumn<OfferListItem, OfferListItem> column) {
return new TableCell<OfferListItem, OfferListItem>() {
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
setText(model.getDirectionLabel(item));
}
@ -213,11 +213,11 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
private void setRemoveColumnCellFactory() {
removeItemColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
removeItemColumn.setCellFactory(
new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem, OpenOfferListItem>>() {
new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem, OfferListItem>>() {
@Override
public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOfferListItem,
OpenOfferListItem> directionColumn) {
return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
public TableCell<OfferListItem, OfferListItem> call(TableColumn<OfferListItem,
OfferListItem> directionColumn) {
return new TableCell<OfferListItem, OfferListItem>() {
final ImageView iconView = new ImageView();
final Button button = new Button();
@ -229,11 +229,11 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
}
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null) {
button.setOnAction(event -> removeOpenOffer(item.getOpenOffer().getOffer()));
button.setOnAction(event -> removeOpenOffer(item.getOffer()));
setGraphic(button);
}
else {

26
core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
View File

@ -56,32 +56,32 @@ class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implemen
});
}
public ObservableList<OpenOfferListItem> getList() {
public ObservableList<OfferListItem> getList() {
return dataModel.getList();
}
String getTradeId(OpenOfferListItem item) {
return item.getOpenOffer().getId();
String getTradeId(OfferListItem item) {
return item.getOffer().getId();
}
String getAmount(OpenOfferListItem item) {
return (item != null) ? formatter.formatAmountWithMinAmount(item.getOpenOffer().getOffer()) : "";
String getAmount(OfferListItem item) {
return (item != null) ? formatter.formatAmountWithMinAmount(item.getOffer()) : "";
}
String getPrice(OpenOfferListItem item) {
return (item != null) ? formatter.formatFiat(item.getOpenOffer().getOffer().getPrice()) : "";
String getPrice(OfferListItem item) {
return (item != null) ? formatter.formatFiat(item.getOffer().getPrice()) : "";
}
String getVolume(OpenOfferListItem item) {
return (item != null) ? formatter.formatVolumeWithMinVolume(item.getOpenOffer().getOffer()) : "";
String getVolume(OfferListItem item) {
return (item != null) ? formatter.formatVolumeWithMinVolume(item.getOffer()) : "";
}
String getDirectionLabel(OpenOfferListItem item) {
return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getOpenOffer())) : "";
String getDirectionLabel(OfferListItem item) {
return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getOffer())) : "";
}
String getDate(OpenOfferListItem item) {
return formatter.formatDateTime(item.getOpenOffer().getOffer().getCreationDate());
String getDate(OfferListItem item) {
return formatter.formatDateTime(item.getOffer().getCreationDate());
}
}

3
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
View File

@ -277,8 +277,7 @@ class PendingTradesDataModel implements Activatable, DataModel {
log.trace("updateConfidence getTrade().getState() " + getTrade().getState());
if (confidence != null &&
confidence.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING
&& (getTrade().getState() == Trade.State.DEPOSIT_PUBLISHED ||
getTrade().getState() == Trade.State.OFFERER_ACCEPTED)) {
&& getTrade().getState() == Trade.State.DEPOSIT_PUBLISHED) {
// only set it once when actual state is DEPOSIT_PUBLISHED, and remove listener afterwards
getTrade().setState(Trade.State.DEPOSIT_CONFIRMED);
walletService.removeTxConfidenceListener(txConfidenceListener);

2
core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
View File

@ -217,8 +217,6 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
log.trace("tradeState " + tradeState);
if (tradeState != null) {
switch (tradeState) {
// TODO Check why OFFERER_ACCEPTED can happen, refactor state handling
case OFFERER_ACCEPTED:
case DEPOSIT_PUBLISHED:
state.set(dataModel.isOfferer() ? State.OFFERER_BUYER_WAIT_TX_CONF : State.TAKER_SELLER_WAIT_TX_CONF);
break;

10
core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
View File

@ -17,6 +17,8 @@
package io.bitsquare.gui.main.trade.offerbook;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.OverlayManager;
import io.bitsquare.gui.components.InputTextField;
@ -33,8 +35,6 @@ import io.bitsquare.gui.util.validation.OptionalFiatValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
import io.bitsquare.common.viewfx.view.FxmlView;
import java.util.ArrayList;
import java.util.List;
@ -220,10 +220,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
private void takeOffer(Offer offer) {
if (model.isRegistered()) {
if (offer.getDirection() == Direction.BUY) {
// reset available state
if (offer.getState() != Offer.State.REMOVED)
offer.setState(Offer.State.UNKNOWN);
offerActionHandler.takeOffer(model.getAmountAsCoin(), model.getPriceAsCoin(), offer);
}
else {
@ -527,7 +523,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
iconView.setId("image-offer_state_available");
break;
case OFFERER_OFFLINE:
case NOT_AVAILABLE:
case RESERVED:
case FAULT:
case REMOVED:
iconView.setId("image-offer_state_not_available");

6
core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
View File

@ -25,8 +25,8 @@ import io.bitsquare.common.viewfx.model.Activatable;
import io.bitsquare.common.viewfx.model.DataModel;
import io.bitsquare.offer.Offer;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
import io.bitsquare.trade.handlers.TradeResultHandler;
import io.bitsquare.user.Preferences;
import org.bitcoinj.core.Coin;
@ -128,8 +128,8 @@ class TakeOfferDataModel implements Activatable, DataModel {
tradeManager.checkOfferAvailability(offer);
}
Trade takeOffer() {
return tradeManager.takeOffer(amountAsCoin.get(), offer);
void takeOffer(TradeResultHandler handler) {
tradeManager.requestTakeOffer(amountAsCoin.get(), offer, (trade) -> handler.handleTradeResult(trade));
}
void calculateVolume() {

122
core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
View File

@ -26,7 +26,6 @@ import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.locale.BSResources;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
@ -152,10 +151,25 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
switch (newValue) {
case UNKNOWN:
log.error("Must not happen.");
break;
case AVAILABLE:
state.set(State.AMOUNT_SCREEN);
break;
case RESERVED:
if (takeOfferRequested)
errorMessage.set("Take offer request failed because offer is not available anymore. " +
"Maybe another trader has taken the offer in the meantime.");
else
errorMessage.set("You cannot take that offer because the offer was already taken by another trader.");
takeOfferRequested = false;
break;
case REMOVED:
if (!takeOfferRequested)
errorMessage.set("You cannot take that offer because the offer has been removed in the meantime.");
takeOfferRequested = false;
break;
case OFFERER_OFFLINE:
if (takeOfferRequested)
errorMessage.set("Take offer request failed because offerer is not online anymore.");
@ -163,26 +177,12 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
errorMessage.set("You cannot take that offer because the offerer is offline.");
takeOfferRequested = false;
break;
case NOT_AVAILABLE:
if (takeOfferRequested)
errorMessage.set("Take offer request failed because offer is not available anymore. " +
"Maybe another trader has taken the offer in the meantime.");
else
errorMessage.set("You cannot take that offer because the offer was already taken by another trader.");
takeOfferRequested = false;
break;
case FAULT:
if (takeOfferRequested)
errorMessage.set("Take offer request failed.");
else
errorMessage.set("The check for the offer availability failed.");
takeOfferRequested = false;
break;
case REMOVED:
if (!takeOfferRequested)
errorMessage.set("You cannot take that offer because the offer has been removed in the meantime.");
takeOfferRequested = false;
break;
default:
@ -207,59 +207,53 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
isTakeOfferSpinnerVisible.set(true);
Trade trade = dataModel.takeOffer();
dataModel.takeOffer((trade) -> {
trade.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
String msg = "";
if (newValue.getErrorMessage() != null)
msg = "\nError message: " + newValue.getErrorMessage();
trade.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
String msg = "";
if (newValue.getErrorMessage() != null)
msg = "\nError message: " + newValue.getErrorMessage();
switch (newValue) {
case OPEN:
break;
case TAKE_OFFER_FEE_TX_CREATED:
break;
case DEPOSIT_PUBLISHED:
case DEPOSIT_CONFIRMED:
transactionId.set(trade.getDepositTx().getHashAsString());
applyTakeOfferRequestResult(true);
break;
case FIAT_PAYMENT_STARTED:
break;
case TAKE_OFFER_FEE_PUBLISH_FAILED:
errorMessage.set("An error occurred when paying the trade fee." + msg);
takeOfferRequested = false;
break;
case MESSAGE_SENDING_FAILED:
errorMessage.set("An error occurred when sending a message to the offerer. Maybe there are connection problems. " +
"Please try later again." + msg);
takeOfferRequested = false;
break;
case PAYOUT_PUBLISHED:
break;
case FAULT:
errorMessage.set(msg);
takeOfferRequested = false;
break;
default:
log.error("Unhandled trade state: " + newValue);
break;
}
switch (newValue) {
case OPEN:
break;
case OFFERER_ACCEPTED:
break;
case OFFERER_REJECTED:
errorMessage.set("Your take offer request got rejected. Maybe another trader has taken the offer in the meantime.");
takeOfferRequested = false;
break;
case TAKE_OFFER_FEE_TX_CREATED:
break;
case DEPOSIT_PUBLISHED:
case DEPOSIT_CONFIRMED:
transactionId.set(trade.getDepositTx().getHashAsString());
applyTakeOfferRequestResult(true);
break;
case FIAT_PAYMENT_STARTED:
break;
case TAKE_OFFER_FEE_PUBLISH_FAILED:
errorMessage.set("An error occurred when paying the trade fee." + msg);
takeOfferRequested = false;
break;
case MESSAGE_SENDING_FAILED:
errorMessage.set("An error occurred when sending a message to the offerer. Maybe there are connection problems. " +
"Please try later again." + msg);
takeOfferRequested = false;
break;
case PAYOUT_PUBLISHED:
break;
case FAULT:
errorMessage.set(msg);
takeOfferRequested = false;
break;
default:
log.error("Unhandled trade state: " + newValue);
break;
}
if (errorMessage.get() != null) {
isAmountAndPriceValidAndWalletFunded = false;
isTakeOfferSpinnerVisible.set(false);
}
});
if (errorMessage.get() != null) {
isAmountAndPriceValidAndWalletFunded = false;
isTakeOfferSpinnerVisible.set(false);
}
evaluateState();
});
evaluateState();
}
void securityDepositInfoDisplayed() {

24
core/src/main/java/io/bitsquare/offer/Offer.java
View File

@ -18,8 +18,8 @@
package io.bitsquare.offer;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.btc.Restrictions;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.locale.Country;
import org.bitcoinj.core.Coin;
@ -51,21 +51,11 @@ public class Offer implements Serializable {
public enum State {
UNKNOWN,
OFFERER_OFFLINE,
AVAILABLE,
NOT_AVAILABLE,
FAULT,
REMOVED;
private String errorMessage;
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
public String getErrorMessage() {
return errorMessage;
}
RESERVED,
REMOVED,
OFFERER_OFFLINE,
FAULT
}
// key attributes for lookup
@ -92,9 +82,9 @@ public class Offer implements Serializable {
// Mutable property. Has to be set before offer is save in DHT as it changes the objects hash!
private String offerFeePaymentTxID;
private State state;
// Those state properties are transient and only used at runtime!
private transient State state;
// don't access directly as it might be null; use getStateProperty() which creates an object if not instantiated
private transient ObjectProperty<State> stateProperty;

78
core/src/main/java/io/bitsquare/offer/OpenOffer.java
View File

@ -1,78 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.offer;
import java.io.Serializable;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// Offerer has his own offers wrapped in that OpenOffer object. Taker never has an OpenOffer object.
public class OpenOffer implements Serializable {
private static final long serialVersionUID = -7523483764145982933L;
private static final Logger log = LoggerFactory.getLogger(OpenOffer.class);
///////////////////////////////////////////////////////////////////////////////////////////
// Enum
///////////////////////////////////////////////////////////////////////////////////////////
public static enum State {
OPEN,
OFFER_ACCEPTED
}
private final Offer offer;
private State state;
transient private ObjectProperty<State> _state;
public OpenOffer(Offer offer) {
this.offer = offer;
state = State.OPEN;
}
public Offer getOffer() {
return offer;
}
public String getId() {
return offer.getId();
}
public void setState(State state) {
this.state = state;
stateProperty().set(state);
}
public State getState() {
return state;
}
public ObjectProperty<State> stateProperty() {
if (_state == null)
_state = new SimpleObjectProperty<>(state);
return _state;
}
}

2
core/src/main/java/io/bitsquare/trade/Trade.java
View File

@ -40,8 +40,6 @@ public class Trade implements Serializable {
public static enum State {
OPEN,
OFFERER_ACCEPTED,
OFFERER_REJECTED, /* For taker only*/
TAKE_OFFER_FEE_PUBLISH_FAILED,
TAKE_OFFER_FEE_TX_CREATED,
DEPOSIT_PUBLISHED,

172
core/src/main/java/io/bitsquare/trade/TradeManager.java
View File

@ -28,8 +28,8 @@ import io.bitsquare.network.Peer;
import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer;
import io.bitsquare.offer.OfferBookService;
import io.bitsquare.offer.OpenOffer;
import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.handlers.TradeResultHandler;
import io.bitsquare.trade.handlers.TransactionResultHandler;
import io.bitsquare.trade.listeners.SendMessageListener;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
@ -77,7 +77,7 @@ public class TradeManager {
private final Map<String, BuyerAsOffererProtocol> buyerAcceptsOfferProtocolMap = new HashMap<>();
private final Map<String, CheckOfferAvailabilityProtocol> checkOfferAvailabilityProtocolMap = new HashMap<>();
private final ObservableMap<String, OpenOffer> openOffers = FXCollections.observableHashMap();
private final ObservableMap<String, Offer> openOffers = FXCollections.observableHashMap();
private final ObservableMap<String, Trade> pendingTrades = FXCollections.observableHashMap();
private final ObservableMap<String, Trade> closedTrades = FXCollections.observableHashMap();
@ -104,7 +104,7 @@ public class TradeManager {
Object openOffersObject = persistence.read(this, "openOffers");
if (openOffersObject instanceof Map<?, ?>) {
openOffers.putAll((Map<String, OpenOffer>) openOffersObject);
openOffers.putAll((Map<String, Offer>) openOffersObject);
}
Object pendingTradesObject = persistence.read(this, "pendingTrades");
@ -122,9 +122,12 @@ public class TradeManager {
// When all services are initialized we create the protocols for our open offers (which will listen for take offer requests)
public void onAllServicesInitialized() {
for (Map.Entry<String, OpenOffer> entry : openOffers.entrySet()) {
for (Map.Entry<String, Offer> entry : openOffers.entrySet()) {
createBuyerAcceptsOfferProtocol(entry.getValue());
}
/* for (Map.Entry<String, Trade> entry : pendingTrades.entrySet()) {
createBuyerAcceptsOfferProtocol(entry.getValue().getOffer());
}*/
}
@ -134,13 +137,13 @@ public class TradeManager {
public void checkOfferAvailability(Offer offer) {
if (!checkOfferAvailabilityProtocolMap.containsKey(offer.getId())) {
CheckOfferAvailabilityModel model = new CheckOfferAvailabilityModel(
offer,
tradeMessageService,
() -> disposeCheckOfferAvailabilityRequest(offer));
tradeMessageService);
CheckOfferAvailabilityProtocol protocol = new CheckOfferAvailabilityProtocol(model);
CheckOfferAvailabilityProtocol protocol = new CheckOfferAvailabilityProtocol(model,
() -> disposeCheckOfferAvailabilityRequest(offer),
(errorMessage) -> disposeCheckOfferAvailabilityRequest(offer));
checkOfferAvailabilityProtocolMap.put(offer.getId(), protocol);
protocol.checkOfferAvailability();
}
@ -183,8 +186,9 @@ public class TradeManager {
PlaceOfferProtocol placeOfferProtocol = new PlaceOfferProtocol(
model,
(transaction) -> {
OpenOffer openOffer = createOpenOffer(offer);
createBuyerAcceptsOfferProtocol(openOffer);
openOffers.put(offer.getId(), offer);
persistOpenOffers();
createBuyerAcceptsOfferProtocol(offer);
resultHandler.handleResult(transaction);
},
(message) -> errorMessageHandler.handleErrorMessage(message)
@ -197,41 +201,33 @@ public class TradeManager {
removeOpenOffer(offer, resultHandler, errorMessageHandler, true);
}
public Trade takeOffer(Coin amount, Offer offer) {
public void requestTakeOffer(Coin amount, Offer offer, TradeResultHandler tradeResultHandler) {
CheckOfferAvailabilityModel model = new CheckOfferAvailabilityModel(
offer,
tradeMessageService);
CheckOfferAvailabilityProtocol protocol = new CheckOfferAvailabilityProtocol(model,
() -> {
disposeCheckOfferAvailabilityRequest(offer);
if (offer.getState() == Offer.State.AVAILABLE) {
Trade trade = takeAvailableOffer(amount, offer, model.getPeer());
tradeResultHandler.handleTradeResult(trade);
}
},
(errorMessage) -> disposeCheckOfferAvailabilityRequest(offer));
checkOfferAvailabilityProtocolMap.put(offer.getId(), protocol);
protocol.checkOfferAvailability();
}
private Trade takeAvailableOffer(Coin amount, Offer offer, Peer peer) {
Trade trade = createTrade(offer);
trade.setTradeAmount(amount);
offer.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
switch (newValue) {
case UNKNOWN:
break;
case AVAILABLE:
break;
case OFFERER_OFFLINE:
case NOT_AVAILABLE:
case FAULT:
removeFailedTrade(trade);
break;
case REMOVED:
if (oldValue != Offer.State.AVAILABLE) {
removeFailedTrade(trade);
}
break;
default:
log.error("Unhandled trade state: " + newValue);
break;
}
});
// TODO check
trade.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
switch (newValue) {
case OPEN:
break;
case OFFERER_ACCEPTED:
case TAKE_OFFER_FEE_TX_CREATED:
case DEPOSIT_PUBLISHED:
case DEPOSIT_CONFIRMED:
@ -240,7 +236,6 @@ public class TradeManager {
case PAYOUT_PUBLISHED:
persistPendingTrades();
break;
case OFFERER_REJECTED:
case MESSAGE_SENDING_FAILED:
case FAULT:
removeFailedTrade(trade);
@ -253,6 +248,7 @@ public class TradeManager {
SellerAsTakerModel model = new SellerAsTakerModel(
trade,
peer,
tradeMessageService,
walletService,
blockChainService,
@ -261,8 +257,7 @@ public class TradeManager {
SellerAsTakerProtocol sellerTakesOfferProtocol = new SellerAsTakerProtocol(model);
sellerAsTakerProtocolMap.put(trade.getId(), sellerTakesOfferProtocol);
sellerTakesOfferProtocol.takeOffer();
sellerTakesOfferProtocol.takeAvailableOffer();
return trade;
}
@ -325,12 +320,6 @@ public class TradeManager {
// Private
///////////////////////////////////////////////////////////////////////////////////////////
private OpenOffer createOpenOffer(Offer offer) {
OpenOffer openOffer = new OpenOffer(offer);
openOffers.put(openOffer.getId(), openOffer);
persistOpenOffers();
return openOffer;
}
private void removeOpenOffer(Offer offer,
ResultHandler resultHandler,
@ -340,8 +329,8 @@ public class TradeManager {
offerBookService.removeOffer(offer,
() -> {
if (openOffers.containsKey(offerId)) {
OpenOffer openOffer = openOffers.remove(offerId);
disposeCheckOfferAvailabilityRequest(openOffer.getOffer());
openOffers.remove(offerId);
disposeCheckOfferAvailabilityRequest(offer);
persistOpenOffers();
if (removeFromBuyerAcceptsOfferProtocolMap && buyerAcceptsOfferProtocolMap.containsKey(offerId)) {
buyerAcceptsOfferProtocolMap.get(offerId).cleanup();
@ -371,70 +360,64 @@ public class TradeManager {
return trade;
}
private void createBuyerAcceptsOfferProtocol(OpenOffer openOffer) {
private void createBuyerAcceptsOfferProtocol(Offer offer) {
BuyerAsOffererModel model = new BuyerAsOffererModel(
openOffer,
offer,
tradeMessageService,
walletService,
blockChainService,
signatureService,
user);
if (pendingTrades.containsKey(openOffer.getId()))
model.setTrade(pendingTrades.get(openOffer.getId()));
Trade trade;
if (pendingTrades.containsKey(offer.getId())) {
trade = pendingTrades.get(offer.getId());
openOffer.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("openOffer state = " + newValue);
}
else {
trade = new Trade(offer);
pendingTrades.put(trade.getId(), trade);
persistPendingTrades();
}
model.setTrade(trade);
currentPendingTrade = trade;
// TODO check, remove listener
trade.stateProperty().addListener((ov, oldValue, newValue) -> {
log.debug("trade state = " + newValue);
switch (newValue) {
case OPEN:
break;
case OFFER_ACCEPTED:
removeOpenOffer(openOffer.getOffer(),
case TAKE_OFFER_FEE_TX_CREATED:
persistPendingTrades();
break;
case DEPOSIT_PUBLISHED:
removeOpenOffer(offer,
() -> log.debug("remove offer was successful"),
(message) -> log.error(message),
false);
Trade trade = model.getTrade();
pendingTrades.put(trade.getId(), trade);
persistPendingTrades();
currentPendingTrade = trade;
// TODO check, remove listener
trade.stateProperty().addListener((ov2, oldValue2, newValue2) -> {
log.debug("trade state = " + newValue);
switch (newValue2) {
case OPEN:
break;
case OFFERER_ACCEPTED: // only taker side
case TAKE_OFFER_FEE_TX_CREATED:
case DEPOSIT_PUBLISHED:
case DEPOSIT_CONFIRMED:
case FIAT_PAYMENT_STARTED:
case FIAT_PAYMENT_RECEIVED:
case PAYOUT_PUBLISHED:
persistPendingTrades();
break;
case OFFERER_REJECTED:
case TAKE_OFFER_FEE_PUBLISH_FAILED:
case MESSAGE_SENDING_FAILED:
case FAULT:
removeFailedTrade(trade);
buyerAcceptsOfferProtocolMap.get(trade.getId()).cleanup();
break;
default:
log.error("Unhandled trade state: " + newValue);
break;
}
});
break;
case DEPOSIT_CONFIRMED:
case FIAT_PAYMENT_STARTED:
case FIAT_PAYMENT_RECEIVED:
case PAYOUT_PUBLISHED:
persistPendingTrades();
break;
case TAKE_OFFER_FEE_PUBLISH_FAILED:
case MESSAGE_SENDING_FAILED:
case FAULT:
removeFailedTrade(trade);
buyerAcceptsOfferProtocolMap.get(trade.getId()).cleanup();
break;
default:
log.error("Unhandled openOffer state: " + newValue);
log.error("Unhandled trade state: " + newValue);
break;
}
});
BuyerAsOffererProtocol buyerAcceptsOfferProtocol = new BuyerAsOffererProtocol(model);
buyerAcceptsOfferProtocolMap.put(openOffer.getId(), buyerAcceptsOfferProtocol);
buyerAcceptsOfferProtocolMap.put(offer.getId(), buyerAcceptsOfferProtocol);
}
private void removeFailedTrade(Trade trade) {
@ -478,14 +461,16 @@ public class TradeManager {
boolean isOfferOpen(String offerId) {
// Don't use openOffers as the offer gets removed async from DHT, but is added sync to pendingTrades
return !pendingTrades.containsKey(offerId) && !closedTrades.containsKey(offerId);
return openOffers.containsKey(offerId)
&& (openOffers.get(offerId).getState() == Offer.State.UNKNOWN
|| openOffers.get(offerId).getState() == Offer.State.AVAILABLE);
}
///////////////////////////////////////////////////////////////////////////////////////////
// Getters
///////////////////////////////////////////////////////////////////////////////////////////
public ObservableMap<String, OpenOffer> getOpenOffers() {
public ObservableMap<String, Offer> getOpenOffers() {
return openOffers;
}
@ -507,7 +492,7 @@ public class TradeManager {
///////////////////////////////////////////////////////////////////////////////////////////
private void persistOpenOffers() {
persistence.write(this, "openOffers", (Map<String, OpenOffer>) new HashMap<>(openOffers));
persistence.write(this, "openOffers", (Map<String, Offer>) new HashMap<>(openOffers));
}
private void persistPendingTrades() {
@ -517,5 +502,4 @@ public class TradeManager {
private void persistClosedTrades() {
persistence.write(this, "closedTrades", (Map<String, Trade>) new HashMap<>(closedTrades));
}
}

22
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java → core/src/main/java/io/bitsquare/trade/handlers/OfferStateResultHandler.java
View File

@ -15,25 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.taker.messages;
package io.bitsquare.trade.handlers;
import io.bitsquare.trade.protocol.trade.TradeMessage;
import java.io.Serializable;
public class RequestTakeOfferMessage implements Serializable, TradeMessage {
private static final long serialVersionUID = 4660151440192191798L;
private final String tradeId;
public RequestTakeOfferMessage(String tradeId) {
this.tradeId = tradeId;
}
@Override
public String getTradeId() {
return tradeId;
}
import io.bitsquare.offer.Offer;
public interface OfferStateResultHandler {
void handleStateResult(Offer.State state);
}

25
core/src/main/java/io/bitsquare/trade/handlers/TradeResultHandler.java Normal file
View File

@ -0,0 +1,25 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.handlers;
import io.bitsquare.trade.Trade;
public interface TradeResultHandler {
void handleTradeResult(Trade trade);
}

11
core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
View File

@ -17,12 +17,11 @@
package io.bitsquare.trade.protocol.availability;
import io.bitsquare.common.taskrunner.SharedModel;
import io.bitsquare.network.Peer;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.TradeMessageService;
import io.bitsquare.trade.protocol.trade.OfferMessage;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.common.taskrunner.SharedModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -32,15 +31,13 @@ public class CheckOfferAvailabilityModel extends SharedModel {
private final Offer offer;
private final TradeMessageService tradeMessageService;
private final ResultHandler resultHandler;
private Peer peer;
private OfferMessage message;
public CheckOfferAvailabilityModel(Offer offer, TradeMessageService tradeMessageService, ResultHandler resultHandler) {
public CheckOfferAvailabilityModel(Offer offer, TradeMessageService tradeMessageService) {
this.offer = offer;
this.tradeMessageService = tradeMessageService;
this.resultHandler = resultHandler;
}
// getter/setter
@ -67,8 +64,4 @@ public class CheckOfferAvailabilityModel extends SharedModel {
public OfferMessage getMessage() {
return message;
}
public ResultHandler getResultHandler() {
return resultHandler;
}
}

16
core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
View File

@ -17,6 +17,8 @@
package io.bitsquare.trade.protocol.availability;
import io.bitsquare.common.handlers.ErrorMessageHandler;
import io.bitsquare.common.handlers.ResultHandler;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.Message;
import io.bitsquare.network.Peer;
@ -26,8 +28,6 @@ import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress;
import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage;
import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable;
import javafx.application.Platform;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -35,6 +35,8 @@ public class CheckOfferAvailabilityProtocol {
private static final Logger log = LoggerFactory.getLogger(CheckOfferAvailabilityProtocol.class);
private final CheckOfferAvailabilityModel model;
private final ResultHandler resultHandler;
private ErrorMessageHandler errorMessageHandler;
private final MessageHandler messageHandler;
private boolean isCanceled;
@ -45,14 +47,15 @@ public class CheckOfferAvailabilityProtocol {
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
public CheckOfferAvailabilityProtocol(CheckOfferAvailabilityModel model) {
public CheckOfferAvailabilityProtocol(CheckOfferAvailabilityModel model, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
this.model = model;
this.resultHandler = resultHandler;
this.errorMessageHandler = errorMessageHandler;
messageHandler = this::handleMessage;
}
public void cleanup() {
// Cannot remove listener in same execution cycle, so we delay it
Platform.runLater(() -> model.getTradeMessageService().removeMessageHandler(messageHandler));
model.getTradeMessageService().removeMessageHandler(messageHandler);
}
@ -101,10 +104,11 @@ public class CheckOfferAvailabilityProtocol {
taskRunner = new TaskRunner<>(model,
() -> {
log.debug("sequence at handleReportOfferAvailabilityMessage completed");
model.getResultHandler().handleResult();
resultHandler.handleResult();
},
(errorMessage) -> {
log.error(errorMessage);
errorMessageHandler.handleErrorMessage(errorMessage);
}
);
taskRunner.addTasks(ProcessReportOfferAvailabilityMessage.class);

39
core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
View File

@ -17,12 +17,12 @@
package io.bitsquare.trade.protocol.availability.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.Peer;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.listeners.GetPeerAddressListener;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -38,26 +38,27 @@ public class GetPeerAddress extends Task<CheckOfferAvailabilityModel> {
@Override
protected void doRun() {
model.getTradeMessageService().getPeerAddress(model.getOffer().getMessagePublicKey(), new GetPeerAddressListener() {
@Override
public void onResult(Peer peer) {
log.trace("Found peer: " + peer.toString());
try {
model.getTradeMessageService().getPeerAddress(model.getOffer().getMessagePublicKey(), new GetPeerAddressListener() {
@Override
public void onResult(Peer peer) {
model.setPeer(peer);
model.setPeer(peer);
complete();
}
complete();
}
@Override
public void onFailed() {
model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
failed();
}
});
} catch (Throwable t) {
model.getOffer().setState(Offer.State.FAULT);
@Override
public void onFailed() {
failed();
}
});
}
@Override
protected void updateStateOnFault() {
model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
failed(t);
}
}
}

10
core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
View File

@ -26,7 +26,7 @@ import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailability
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.bitsquare.util.Validator.nonEmptyStringOf;
import static com.google.inject.internal.util.$Preconditions.checkState;
public class ProcessReportOfferAvailabilityMessage extends Task<CheckOfferAvailabilityModel> {
private static final Logger log = LoggerFactory.getLogger(ProcessReportOfferAvailabilityMessage.class);
@ -39,13 +39,13 @@ public class ProcessReportOfferAvailabilityMessage extends Task<CheckOfferAvaila
protected void doRun() {
try {
ReportOfferAvailabilityMessage reportOfferAvailabilityMessage = (ReportOfferAvailabilityMessage) model.getMessage();
nonEmptyStringOf(reportOfferAvailabilityMessage.getOfferId());
checkState(model.getOffer().getId().equals(reportOfferAvailabilityMessage.getOfferId()));
if (model.getOffer().getState() != Offer.State.REMOVED) {
if (reportOfferAvailabilityMessage.isOfferOpen())
model.getOffer().setState(Offer.State.AVAILABLE);
else
model.getOffer().setState(Offer.State.NOT_AVAILABLE);
model.getOffer().setState(Offer.State.RESERVED);
}
complete();
@ -55,8 +55,4 @@ public class ProcessReportOfferAvailabilityMessage extends Task<CheckOfferAvaila
failed(t);
}
}
@Override
protected void updateStateOnFault() {
}
}

6
core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
View File

@ -47,7 +47,7 @@ public class RequestIsOfferAvailable extends Task<CheckOfferAvailabilityModel> {
@Override
public void handleFault() {
model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
failed();
}
});
@ -57,9 +57,5 @@ public class RequestIsOfferAvailable extends Task<CheckOfferAvailabilityModel> {
failed(t);
}
}
@Override
protected void updateStateOnFault() {
}
}

16
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
View File

@ -17,12 +17,12 @@
package io.bitsquare.trade.protocol.trade.offerer;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.btc.BlockChainService;
import io.bitsquare.btc.WalletService;
import io.bitsquare.crypto.SignatureService;
import io.bitsquare.fiat.FiatAccount;
import io.bitsquare.network.Peer;
import io.bitsquare.offer.OpenOffer;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeMessageService;
import io.bitsquare.trade.protocol.trade.OfferSharedModel;
@ -44,9 +44,6 @@ public class BuyerAsOffererModel extends OfferSharedModel {
private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererModel.class);
// provided
private final OpenOffer openOffer;
// derived
private final byte[] offererPubKey;
@ -78,19 +75,18 @@ public class BuyerAsOffererModel extends OfferSharedModel {
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
public BuyerAsOffererModel(OpenOffer openOffer,
public BuyerAsOffererModel(Offer offer,
TradeMessageService tradeMessageService,
WalletService walletService,
BlockChainService blockChainService,
SignatureService signatureService,
User user) {
super(openOffer.getOffer(),
super(offer,
tradeMessageService,
walletService,
blockChainService,
signatureService,
user);
this.openOffer = openOffer;
offererPubKey = getAddressEntry().getPubKey();
}
@ -112,10 +108,6 @@ public class BuyerAsOffererModel extends OfferSharedModel {
this.offererOutputs = offererOutputs;
}
public OpenOffer getOpenOffer() {
return openOffer;
}
public Peer getTaker() {
return taker;
}

37
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
View File

@ -24,11 +24,9 @@ import io.bitsquare.trade.handlers.MessageHandler;
import io.bitsquare.trade.protocol.trade.TradeMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.GetOffererDepositTxInputs;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestTakeOfferMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessRequestOffererPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.RequestDepositPayment;
import io.bitsquare.trade.protocol.trade.offerer.tasks.RespondToTakeOfferRequest;
import io.bitsquare.trade.protocol.trade.offerer.tasks.SendBankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.SendDepositTxIdToTaker;
import io.bitsquare.trade.protocol.trade.offerer.tasks.SetupListenerForBlockChainConfirmation;
@ -38,9 +36,8 @@ import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyAndSignContract;
import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakeOfferFeePayment;
import io.bitsquare.trade.protocol.trade.offerer.tasks.VerifyTakerAccount;
import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage;
import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage;
import io.bitsquare.trade.protocol.trade.taker.messages.RequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionConfidence;
@ -53,7 +50,6 @@ import org.slf4j.LoggerFactory;
import static io.bitsquare.util.Validator.nonEmptyStringOf;
public class BuyerAsOffererProtocol {
private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererProtocol.class);
private final BuyerAsOffererModel model;
@ -84,27 +80,9 @@ public class BuyerAsOffererProtocol {
// Incoming message handling
///////////////////////////////////////////////////////////////////////////////////////////
private void handleRequestTakeOfferMessage(RequestTakeOfferMessage tradeMessage, Peer peer) {
model.setTradeMessage(tradeMessage);
model.setTaker(peer);
BuyerAsOffererTaskRunner<BuyerAsOffererModel> taskRunner = new BuyerAsOffererTaskRunner<>(model,
() -> {
log.debug("sequence at handleRequestTakeOfferMessage completed");
},
(errorMessage) -> {
log.error(errorMessage);
}
);
taskRunner.addTasks(
ProcessRequestTakeOfferMessage.class,
RespondToTakeOfferRequest.class
);
taskRunner.run();
}
private void handleRequestDepositTxInputsMessage(RequestDepositTxInputsMessage tradeMessage) {
private void handleRequestDepositTxInputsMessage(RequestDepositTxInputsMessage tradeMessage, Peer taker) {
model.setTradeMessage(tradeMessage);
model.setTaker(taker);
BuyerAsOffererTaskRunner<BuyerAsOffererModel> taskRunner = new BuyerAsOffererTaskRunner<>(model,
() -> {
@ -213,11 +191,8 @@ public class BuyerAsOffererProtocol {
nonEmptyStringOf(tradeMessage.getTradeId());
if (tradeMessage.getTradeId().equals(model.getOffer().getId())) {
if (tradeMessage instanceof RequestTakeOfferMessage) {
handleRequestTakeOfferMessage((RequestTakeOfferMessage) tradeMessage, peer);
}
else if (tradeMessage instanceof RequestDepositTxInputsMessage) {
handleRequestDepositTxInputsMessage((RequestDepositTxInputsMessage) tradeMessage);
if (tradeMessage instanceof RequestDepositTxInputsMessage) {
handleRequestDepositTxInputsMessage((RequestDepositTxInputsMessage) tradeMessage, peer);
}
else if (tradeMessage instanceof RequestOffererPublishDepositTxMessage) {

43
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
View File

@ -1,43 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.offerer.messages;
import io.bitsquare.trade.protocol.trade.TradeMessage;
import java.io.Serializable;
public class RespondToTakeOfferRequestMessage implements Serializable, TradeMessage {
private static final long serialVersionUID = 6177387534087739018L;
private final String tradeId;
private final boolean offerIsAvailable;
public RespondToTakeOfferRequestMessage(String tradeId, boolean offerIsAvailable) {
this.tradeId = tradeId;
this.offerIsAvailable = offerIsAvailable;
}
@Override
public String getTradeId() {
return tradeId;
}
public boolean isOfferIsAvailable() {
return offerIsAvailable;
}
}

51
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
View File

@ -1,51 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.bitsquare.util.Validator.checkTradeId;
public class ProcessRequestTakeOfferMessage extends Task<BuyerAsOffererModel> {
private static final Logger log = LoggerFactory.getLogger(ProcessRequestTakeOfferMessage.class);
public ProcessRequestTakeOfferMessage(TaskRunner taskHandler, BuyerAsOffererModel model) {
super(taskHandler, model);
}
@Override
protected void doRun() {
try {
checkTradeId(model.getOffer().getId(), model.getTradeMessage());
complete();
} catch (Throwable t) {
failed(t);
}
}
@Override
protected void updateStateOnFault() {
// do nothing
}
}

73
core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
View File

@ -1,73 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.offerer.tasks;
import io.bitsquare.offer.OpenOffer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.listeners.SendMessageListener;
import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RespondToTakeOfferRequest extends Task<BuyerAsOffererModel> {
private static final Logger log = LoggerFactory.getLogger(RespondToTakeOfferRequest.class);
private boolean offerIsAvailable;
public RespondToTakeOfferRequest(TaskRunner taskHandler, BuyerAsOffererModel model) {
super(taskHandler, model);
}
@Override
protected void doRun() {
offerIsAvailable = model.getOpenOffer().getState() == OpenOffer.State.OPEN;
if (offerIsAvailable) {
Trade trade = new Trade(model.getOpenOffer().getOffer());
model.setTrade(trade);
model.getOpenOffer().setState(OpenOffer.State.OFFER_ACCEPTED);
}
else {
log.info("Received take offer request but the offer not marked as open anymore.");
}
RespondToTakeOfferRequestMessage tradeMessage = new RespondToTakeOfferRequestMessage(model.getOpenOffer().getId(), offerIsAvailable);
model.getTradeMessageService().sendMessage(model.getTaker(), tradeMessage, new SendMessageListener() {
@Override
public void handleResult() {
complete();
}
@Override
public void handleFault() {
failed();
}
});
}
@Override
protected void updateStateOnFault() {
if (offerIsAvailable && model.getOpenOffer().getState() == OpenOffer.State.OFFER_ACCEPTED) {
model.setTrade(null);
model.getOpenOffer().setState(OpenOffer.State.OPEN);
}
}
}

10
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
View File

@ -42,13 +42,12 @@ public class SellerAsTakerModel extends OfferSharedModel {
// provided
private final Trade trade;
private final Peer offerer;
// derived
private final byte[] takerPubKey;
// written/read by task
private Peer offerer;
private Transaction depositTx;
private Transaction payoutTx;
private Coin takerPayoutAmount;
@ -67,6 +66,7 @@ public class SellerAsTakerModel extends OfferSharedModel {
private Transaction takeOfferFeeTx;
public SellerAsTakerModel(Trade trade,
Peer offerer,
TradeMessageService tradeMessageService,
WalletService walletService,
BlockChainService blockChainService,
@ -80,6 +80,7 @@ public class SellerAsTakerModel extends OfferSharedModel {
user);
this.trade = trade;
this.offerer = offerer;
takerPubKey = getAddressEntry().getPubKey();
}
@ -116,10 +117,6 @@ public class SellerAsTakerModel extends OfferSharedModel {
return offerer;
}
public void setOfferer(Peer offerer) {
this.offerer = offerer;
}
public Transaction getPayoutTx() {
return payoutTx;
}
@ -227,4 +224,5 @@ public class SellerAsTakerModel extends OfferSharedModel {
public Transaction getTakeOfferFeeTx() {
return takeOfferFeeTx;
}
}

60
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
View File

@ -19,23 +19,18 @@ package io.bitsquare.trade.protocol.trade.taker;
import io.bitsquare.network.Message;
import io.bitsquare.network.Peer;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.handlers.MessageHandler;
import io.bitsquare.trade.protocol.trade.TradeMessage;
import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage;
import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.BroadcastTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignContract;
import io.bitsquare.trade.protocol.trade.taker.tasks.CreateTakeOfferFeeTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.GetPeerAddress;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessBankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRequestDepositPaymentMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRespondToTakeOfferRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.RequestTakeOffer;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendRequestDepositTxInputsMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTx;
@ -63,6 +58,7 @@ public class SellerAsTakerProtocol {
private final MessageHandler messageHandler;
private AnimationTimer timeoutTimer;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
///////////////////////////////////////////////////////////////////////////////////////////
@ -70,63 +66,28 @@ public class SellerAsTakerProtocol {
public SellerAsTakerProtocol(SellerAsTakerModel model) {
this.model = model;
messageHandler = this::handleMessage;
model.getTradeMessageService().addMessageHandler(messageHandler);
}
///////////////////////////////////////////////////////////////////////////////////////////
// Called from UI
// Public methods
///////////////////////////////////////////////////////////////////////////////////////////
public void cleanup() {
model.getTradeMessageService().removeMessageHandler(messageHandler);
}
public void takeOffer() {
model.getTradeMessageService().addMessageHandler(messageHandler);
public void takeAvailableOffer() {
SellerAsTakerTaskRunner<SellerAsTakerModel> taskRunner = new SellerAsTakerTaskRunner<>(model,
() -> {
log.debug("taskRunner at takeOffer completed");
startTimeout(animationTimer -> {
Offer.State offerState = Offer.State.FAULT;
offerState.setErrorMessage("We did not get any reply for the take offer request. " +
"Seems that there are connection problems to your peer.");
model.getOffer().setState(Offer.State.FAULT);
return null;
});
log.debug("taskRunner at takeAvailableOffer completed");
},
(errorMessage) -> {
log.error(errorMessage);
}
);
taskRunner.addTasks(
GetPeerAddress.class,
RequestTakeOffer.class
);
taskRunner.run();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Incoming message handling
///////////////////////////////////////////////////////////////////////////////////////////
private void handleRespondToTakeOfferRequestMessage(RespondToTakeOfferRequestMessage tradeMessage) {
stopTimeout();
model.setTradeMessage(tradeMessage);
SellerAsTakerTaskRunner<SellerAsTakerModel> taskRunner = new SellerAsTakerTaskRunner<>(model,
() -> {
log.debug("taskRunner at handleRespondToTakeOfferRequestMessage completed");
},
(errorMessage) -> {
log.error(errorMessage);
}
);
taskRunner.addTasks(
ProcessRespondToTakeOfferRequestMessage.class,
CreateTakeOfferFeeTx.class,
BroadcastTakeOfferFeeTx.class,
SendRequestDepositTxInputsMessage.class
@ -134,6 +95,10 @@ public class SellerAsTakerProtocol {
taskRunner.run();
}
///////////////////////////////////////////////////////////////////////////////////////////
// Incoming message handling
///////////////////////////////////////////////////////////////////////////////////////////
private void handleRequestDepositPaymentMessage(RequestDepositPaymentMessage tradeMessage) {
model.setTradeMessage(tradeMessage);
@ -222,11 +187,8 @@ public class SellerAsTakerProtocol {
TradeMessage tradeMessage = (TradeMessage) message;
nonEmptyStringOf(tradeMessage.getTradeId());
if (tradeMessage.getTradeId().equals(model.getOffer().getId())) {
if (tradeMessage instanceof RespondToTakeOfferRequestMessage) {
handleRespondToTakeOfferRequestMessage((RespondToTakeOfferRequestMessage) tradeMessage);
}
else if (tradeMessage instanceof RequestDepositPaymentMessage) {
if (tradeMessage.getTradeId().equals(model.getId())) {
if (tradeMessage instanceof RequestDepositPaymentMessage) {
handleRequestDepositPaymentMessage((RequestDepositPaymentMessage) tradeMessage);
}
else if (tradeMessage instanceof DepositTxPublishedMessage) {

67
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
View File

@ -1,67 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.network.Peer;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.listeners.GetPeerAddressListener;
import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class GetPeerAddress extends Task<SellerAsTakerModel> {
private static final Logger log = LoggerFactory.getLogger(GetPeerAddress.class);
public GetPeerAddress(TaskRunner taskHandler, SellerAsTakerModel model) {
super(taskHandler, model);
errorMessage = "DHT lookup for peer address failed. Maybe the offerer was offline for too long time.";
}
@Override
protected void doRun() {
try {
model.getTradeMessageService().getPeerAddress(model.getOffer().getMessagePublicKey(), new GetPeerAddressListener() {
@Override
public void onResult(Peer peer) {
model.setOfferer(peer);
complete();
}
@Override
public void onFailed() {
model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
failed();
}
});
} catch (Throwable t) {
model.getOffer().setState(Offer.State.FAULT);
failed(t);
}
}
@Override
protected void updateStateOnFault() {
}
}

67
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
View File

@ -1,67 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.bitsquare.util.Validator.checkTradeId;
public class ProcessRespondToTakeOfferRequestMessage extends Task<SellerAsTakerModel> {
private static final Logger log = LoggerFactory.getLogger(ProcessRespondToTakeOfferRequestMessage.class);
public ProcessRespondToTakeOfferRequestMessage(TaskRunner taskHandler, SellerAsTakerModel model) {
super(taskHandler, model);
}
@Override
protected void doRun() {
try {
checkTradeId(model.getId(), model.getTradeMessage());
if (((RespondToTakeOfferRequestMessage) model.getTradeMessage()).isOfferIsAvailable()) {
model.getOffer().setState(Offer.State.AVAILABLE);
model.getTrade().setState(Trade.State.OFFERER_ACCEPTED);
complete();
}
else {
model.getOffer().setState(Offer.State.NOT_AVAILABLE);
model.getTrade().setState(Trade.State.OFFERER_REJECTED);
failed("Requested offer rejected because it is not available anymore.");
}
} catch (Throwable t) {
model.getOffer().setState(Offer.State.FAULT);
model.getTrade().setState(Trade.State.FAULT);
failed(t);
}
}
@Override
protected void updateStateOnFault() {
}
}

64
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
View File

@ -1,64 +0,0 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.trade.protocol.trade.taker.tasks;
import io.bitsquare.common.taskrunner.Task;
import io.bitsquare.common.taskrunner.TaskRunner;
import io.bitsquare.offer.Offer;
import io.bitsquare.trade.listeners.SendMessageListener;
import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RequestTakeOffer extends Task<SellerAsTakerModel> {
private static final Logger log = LoggerFactory.getLogger(RequestTakeOffer.class);
public RequestTakeOffer(TaskRunner taskHandler, SellerAsTakerModel model) {
super(taskHandler, model);
}
@Override
protected void doRun() {
try {
model.getTradeMessageService().sendMessage(model.getOfferer(), new RequestTakeOfferMessage(model.getId()),
new SendMessageListener() {
@Override
public void handleResult() {
complete();
}
@Override
public void handleFault() {
model.getOffer().setState(Offer.State.OFFERER_OFFLINE);
failed();
}
});
} catch (Throwable t) {
model.getOffer().setState(Offer.State.FAULT);
failed(t);
}
}
@Override
protected void updateStateOnFault() {
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java
View File

@ -58,7 +58,7 @@ public class SendRequestDepositTxInputsMessage extends Task<SellerAsTakerModel>
// We try to repeat once and if that fails as well we persist the state for a later retry.
if (retryCounter == 0) {
retryCounter++;
doRun();
// doRun();
}
else {
failed();

4
core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
View File

@ -28,8 +28,8 @@ import io.bitsquare.trade.listeners.SendMessageListener;
import java.security.PublicKey;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executor;
import net.tomp2p.dht.FutureGet;
@ -55,7 +55,7 @@ public class TomP2PTradeMessageService implements TradeMessageService {
private static final Logger log = LoggerFactory.getLogger(TomP2PTradeMessageService.class);
private final TomP2PNode tomP2PNode;
private final List<MessageHandler> messageHandlers = new ArrayList<>();
private final List<MessageHandler> messageHandlers = new CopyOnWriteArrayList<>();
private Executor executor;